summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'metadata')
-rw-r--r--metadata/md5-cache/app-accessibility/emacspeak-ss-1.9.13
-rw-r--r--metadata/md5-cache/app-accessibility/espeak-1.48.04-r13
-rw-r--r--metadata/md5-cache/app-accessibility/julius-4.2.23
-rw-r--r--metadata/md5-cache/app-admin/analog-6.0.133
-rw-r--r--metadata/md5-cache/app-admin/chroot_safe-1.4-r13
-rw-r--r--metadata/md5-cache/app-admin/chrootuid-1.3-r23
-rw-r--r--metadata/md5-cache/app-admin/cpulimit-2.43
-rw-r--r--metadata/md5-cache/app-admin/doas-6.8.13
-rw-r--r--metadata/md5-cache/app-admin/entr-4.63
-rw-r--r--metadata/md5-cache/app-admin/fetchlog-1.4-r13
-rw-r--r--metadata/md5-cache/app-admin/filebeat-7.10.21
-rw-r--r--metadata/md5-cache/app-admin/filebeat-7.9.31
-rw-r--r--metadata/md5-cache/app-admin/gopass-1.11.01
-rw-r--r--metadata/md5-cache/app-admin/ide-smart-1.4-r23
-rw-r--r--metadata/md5-cache/app-admin/kube-bench-0.2.3-r11
-rw-r--r--metadata/md5-cache/app-admin/logsentry-1.1.1-r23
-rw-r--r--metadata/md5-cache/app-admin/mtail-3.0.0_rc351
-rw-r--r--metadata/md5-cache/app-admin/mtail-3.0.0_rc361
-rw-r--r--metadata/md5-cache/app-admin/paxtest-0.9.15-r13
-rw-r--r--metadata/md5-cache/app-admin/perl-cleaner-2.281
-rw-r--r--metadata/md5-cache/app-admin/pwcrypt-1.2.2-r23
-rw-r--r--metadata/md5-cache/app-admin/qpage-3.33
-rw-r--r--metadata/md5-cache/app-admin/selint-1.1.03
-rw-r--r--metadata/md5-cache/app-admin/su-exec-0.23
-rw-r--r--metadata/md5-cache/app-admin/terraform-0.14.51
-rw-r--r--metadata/md5-cache/app-admin/terraform-0.14.61
-rw-r--r--metadata/md5-cache/app-admin/terraform-0.14.71
-rw-r--r--metadata/md5-cache/app-admin/terraform-0.14.81
-rw-r--r--metadata/md5-cache/app-admin/xtail-2.1-r13
-rw-r--r--metadata/md5-cache/app-arch/afio-2.5.1-r23
-rw-r--r--metadata/md5-cache/app-arch/bsdsfv-1.18-r23
-rw-r--r--metadata/md5-cache/app-arch/cabextract-1.83
-rw-r--r--metadata/md5-cache/app-arch/cksfv-1.3.14-r13
-rw-r--r--metadata/md5-cache/app-arch/funzix-1.03
-rw-r--r--metadata/md5-cache/app-arch/hardlink-0.3.23
-rw-r--r--metadata/md5-cache/app-arch/lz5-2.03
-rw-r--r--metadata/md5-cache/app-arch/lzip-1.223
-rw-r--r--metadata/md5-cache/app-arch/lziprecover-1.223
-rw-r--r--metadata/md5-cache/app-arch/lzlib-1.113
-rw-r--r--metadata/md5-cache/app-arch/lzlib-1.123
-rw-r--r--metadata/md5-cache/app-arch/lzma-9.20-r13
-rw-r--r--metadata/md5-cache/app-arch/par2cmdline-0.7.33
-rw-r--r--metadata/md5-cache/app-arch/par2cmdline-0.7.43
-rw-r--r--metadata/md5-cache/app-arch/par2cmdline-0.8.03
-rw-r--r--metadata/md5-cache/app-arch/pdlzip-1.103
-rw-r--r--metadata/md5-cache/app-arch/pdlzip-1.113
-rw-r--r--metadata/md5-cache/app-arch/plzip-1.83
-rw-r--r--metadata/md5-cache/app-arch/plzip-1.93
-rw-r--r--metadata/md5-cache/app-arch/pxz-5.0_pre201510293
-rw-r--r--metadata/md5-cache/app-arch/qpress-1.13
-rw-r--r--metadata/md5-cache/app-arch/tapeutils-0.43
-rw-r--r--metadata/md5-cache/app-arch/tarsync-0.2.1-r13
-rw-r--r--metadata/md5-cache/app-arch/unrar-6.0.42
-rw-r--r--metadata/md5-cache/app-arch/unrar-6.0.52
-rw-r--r--metadata/md5-cache/app-arch/unrar-6.0.62
-rw-r--r--metadata/md5-cache/app-backup/cdbackup-0.7.1-r13
-rw-r--r--metadata/md5-cache/app-backup/cpdup-1.183
-rw-r--r--metadata/md5-cache/app-backup/flexbackup-1.2.1-r131
-rw-r--r--metadata/md5-cache/app-backup/luckybackup-0.5.03
-rw-r--r--metadata/md5-cache/app-backup/rdumpfs-0.11
-rw-r--r--metadata/md5-cache/app-backup/sarab-1.0.01
-rw-r--r--metadata/md5-cache/app-backup/synology-cloud-station-backup-44693
-rw-r--r--metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r23
-rw-r--r--metadata/md5-cache/app-benchmarks/hey-0.1.21
-rw-r--r--metadata/md5-cache/app-benchmarks/interbench-0.313
-rw-r--r--metadata/md5-cache/app-benchmarks/ioping-1.13
-rw-r--r--metadata/md5-cache/app-benchmarks/iozone-3.4713
-rw-r--r--metadata/md5-cache/app-benchmarks/iozone-3.4843
-rw-r--r--metadata/md5-cache/app-benchmarks/iozone-3.4873
-rw-r--r--metadata/md5-cache/app-benchmarks/iozone-3.4883
-rw-r--r--metadata/md5-cache/app-benchmarks/nbench-2.2.3-r13
-rw-r--r--metadata/md5-cache/app-benchmarks/tiobench-0.4.23
-rw-r--r--metadata/md5-cache/app-cdr/b5i2iso-0.2-r13
-rw-r--r--metadata/md5-cache/app-cdr/bchunk-1.2.23
-rw-r--r--metadata/md5-cache/app-cdr/bin2iso-19b-r23
-rw-r--r--metadata/md5-cache/app-cdr/cddetect-2.13
-rw-r--r--metadata/md5-cache/app-cdr/cuecue-0.2.2-r33
-rw-r--r--metadata/md5-cache/app-cdr/daa2iso-0.1.7e3
-rw-r--r--metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r33
-rw-r--r--metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r33
-rw-r--r--metadata/md5-cache/app-cdr/dvdisaster-0.79.53
-rw-r--r--metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p101
-rw-r--r--metadata/md5-cache/app-cdr/gaffitter-0.6.0-r13
-rw-r--r--metadata/md5-cache/app-cdr/isomaster-1.3.153
-rw-r--r--metadata/md5-cache/app-cdr/isomaster-1.3.163
-rw-r--r--metadata/md5-cache/app-cdr/nrg2iso-0.4-r23
-rw-r--r--metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r13
-rw-r--r--metadata/md5-cache/app-cdr/xfburn-0.6.21
-rw-r--r--metadata/md5-cache/app-crypt/age-1.0.0_beta_p71
-rw-r--r--metadata/md5-cache/app-crypt/age-1.0.0_rc11
-rw-r--r--metadata/md5-cache/app-crypt/asekey-3.73
-rw-r--r--metadata/md5-cache/app-crypt/ccid-1.4.333
-rw-r--r--metadata/md5-cache/app-crypt/ccid-1.4.343
-rw-r--r--metadata/md5-cache/app-crypt/certbot-apache-99992
-rw-r--r--metadata/md5-cache/app-crypt/cfssl-1.4.11
-rw-r--r--metadata/md5-cache/app-crypt/codegroup-20080907-r13
-rw-r--r--metadata/md5-cache/app-crypt/elettra-1.03
-rw-r--r--metadata/md5-cache/app-crypt/gifshuffle-2.0-r13
-rw-r--r--metadata/md5-cache/app-crypt/gpa-0.10.03
-rw-r--r--metadata/md5-cache/app-crypt/gpgstats-0.5-r13
-rw-r--r--metadata/md5-cache/app-crypt/jitterentropy-2.2.03
-rw-r--r--metadata/md5-cache/app-crypt/jitterentropy-3.0.13
-rw-r--r--metadata/md5-cache/app-crypt/kencfs-plasma-2.0.2_alpha3
-rw-r--r--metadata/md5-cache/app-crypt/libscrypt-1.213
-rw-r--r--metadata/md5-cache/app-crypt/md4sum-0.02.03-r23
-rw-r--r--metadata/md5-cache/app-crypt/moolticute-0.43.193
-rw-r--r--metadata/md5-cache/app-crypt/nasty-0.6-r13
-rw-r--r--metadata/md5-cache/app-crypt/nwipe-0.302
-rw-r--r--metadata/md5-cache/app-crypt/pdfcrack-0.193
-rw-r--r--metadata/md5-cache/app-crypt/signify-303
-rw-r--r--metadata/md5-cache/app-crypt/signing-party-2.10-r12
-rw-r--r--metadata/md5-cache/app-crypt/ssss-0.5.73
-rw-r--r--metadata/md5-cache/app-crypt/xor-analyze-0.5-r13
-rw-r--r--metadata/md5-cache/app-dicts/gwaei-3.6.23
-rw-r--r--metadata/md5-cache/app-dicts/myspell-af-200807011
-rw-r--r--metadata/md5-cache/app-dicts/myspell-bg-4.31
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ca-2.3.01
-rw-r--r--metadata/md5-cache/app-dicts/myspell-cs-201102241
-rw-r--r--metadata/md5-cache/app-dicts/myspell-cs-201810031
-rw-r--r--metadata/md5-cache/app-dicts/myspell-cy-201307081
-rw-r--r--metadata/md5-cache/app-dicts/myspell-da-2.31
-rw-r--r--metadata/md5-cache/app-dicts/myspell-de-2017.01.121
-rw-r--r--metadata/md5-cache/app-dicts/myspell-de_1901-201604031
-rw-r--r--metadata/md5-cache/app-dicts/myspell-el-0.91
-rw-r--r--metadata/md5-cache/app-dicts/myspell-en-201701011
-rw-r--r--metadata/md5-cache/app-dicts/myspell-en-201811011
-rw-r--r--metadata/md5-cache/app-dicts/myspell-en-201901011
-rw-r--r--metadata/md5-cache/app-dicts/myspell-en-20190101-r11
-rw-r--r--metadata/md5-cache/app-dicts/myspell-eo-1.0-r11
-rw-r--r--metadata/md5-cache/app-dicts/myspell-es-0.71
-rw-r--r--metadata/md5-cache/app-dicts/myspell-es-2.31
-rw-r--r--metadata/md5-cache/app-dicts/myspell-es-2.61
-rw-r--r--metadata/md5-cache/app-dicts/myspell-et-200306061
-rw-r--r--metadata/md5-cache/app-dicts/myspell-fo-0.4.21
-rw-r--r--metadata/md5-cache/app-dicts/myspell-fr-4.5-r11
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ga-201602131
-rw-r--r--metadata/md5-cache/app-dicts/myspell-gl-201310131
-rw-r--r--metadata/md5-cache/app-dicts/myspell-he-2012.08.151
-rw-r--r--metadata/md5-cache/app-dicts/myspell-hr-200808131
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ia-201405181
-rw-r--r--metadata/md5-cache/app-dicts/myspell-id-2.01
-rw-r--r--metadata/md5-cache/app-dicts/myspell-is-2012.09.011
-rw-r--r--metadata/md5-cache/app-dicts/myspell-kk-1.1.21
-rw-r--r--metadata/md5-cache/app-dicts/myspell-km-1.61
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ku-0.211
-rw-r--r--metadata/md5-cache/app-dicts/myspell-lt-1.31
-rw-r--r--metadata/md5-cache/app-dicts/myspell-lv-1.3.01
-rw-r--r--metadata/md5-cache/app-dicts/myspell-mi-20060316-r11
-rw-r--r--metadata/md5-cache/app-dicts/myspell-mk-200912111
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ms-201004071
-rw-r--r--metadata/md5-cache/app-dicts/myspell-nb-2.0.101
-rw-r--r--metadata/md5-cache/app-dicts/myspell-nl-2.10g-r11
-rw-r--r--metadata/md5-cache/app-dicts/myspell-nl-2.10g-r21
-rw-r--r--metadata/md5-cache/app-dicts/myspell-nn-2.0.101
-rw-r--r--metadata/md5-cache/app-dicts/myspell-pl-201303061
-rw-r--r--metadata/md5-cache/app-dicts/myspell-pt-201204201
-rw-r--r--metadata/md5-cache/app-dicts/myspell-pt-br-3.0.01
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ro-3.3.101
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ru-20150711-r21
-rw-r--r--metadata/md5-cache/app-dicts/myspell-ru-201806271
-rw-r--r--metadata/md5-cache/app-dicts/myspell-sk-201102241
-rw-r--r--metadata/md5-cache/app-dicts/myspell-sl-2012.01.041
-rw-r--r--metadata/md5-cache/app-dicts/myspell-sq-1.6.41
-rw-r--r--metadata/md5-cache/app-dicts/myspell-sv-2.141
-rw-r--r--metadata/md5-cache/app-dicts/myspell-sw-201101061
-rw-r--r--metadata/md5-cache/app-dicts/myspell-tn-200603161
-rw-r--r--metadata/md5-cache/app-dicts/myspell-uk-1.6.51
-rw-r--r--metadata/md5-cache/app-dicts/myspell-zu-201001261
-rw-r--r--metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r11
-rw-r--r--metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r11
-rw-r--r--metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-2BabDict-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-AB-1.3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ABP-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-ABPGRK-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-ACV-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-AKJV-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-Abbott-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-AbbottSmith-3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Afr1953-1.3.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Alb-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Aleppo-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-AmTract-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Anderson-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Antoniades-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-AraNAV-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ArmEastern-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ArmWestern-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Azeri-2.5.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BBE-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BWE-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Barnes-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BasHautin-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Bela-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BlaMat-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BretonNT-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BulVeren-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-BurCBCM-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-BurJudson-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-Burkitt-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-CBC-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-CPDV-2.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Calo-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Catena-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Cawdrey-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Chamorro-2.7.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-ChiUnL-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Clarke-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Common-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-Concord-2.4.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-CopNT-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-CopSahBible2-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-CopSahHorner-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-CopSahidica-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-CroSaric-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-CzeB21-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-CzeCEP-1.81
-rw-r--r--metadata/md5-cache/app-dicts/sword-CzeCSP-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-DBD-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-DRC-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-DTN-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.011
-rw-r--r--metadata/md5-cache/app-dicts/sword-Daily-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Dari-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Diaglott-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Dodson-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-DutKant-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-DutSVV-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-EMBReality-0.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-EMTV-2.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Easton-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Elzevir-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-Esperanto-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Est-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Etheridge-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Eusebian_num-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Family-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FarOPV-1.5.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FarTPV-1.1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FinBiblia-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FinPR-1.2.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FinPR92-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FinRK-1.8.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-Finney-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreBBB-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreBDM1707-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreBailly-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreCJE-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreCrampon-3.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreGBM-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreJND-1.241
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreKhan-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreLSN1872-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreLXX-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-FrePGR-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FrePilgrim-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreSegond1910-3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-Geez-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Geneva-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Geneva1599-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerAugustinus-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerElb1871-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerGruenewald-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerHfa2002-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerLut1545-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.71
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerNeUe-2.71
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerReinhardt-1.61
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerSch-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerTafel-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GerTextbibel-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Godbey-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-GodsWord-1.3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-GreekHebrew-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Haitian-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-HebModern-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-HebrewGreek-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Heretics-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Hitchcock-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-HunKar-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-HunUj-1.81
-rw-r--r--metadata/md5-cache/app-dicts/sword-ISBE-2.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-ISV-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-Imitation-1.7.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Institutes-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-ItDizGreco-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-ItaDio-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ItaRive-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-JCRHoliness-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-JEAffections-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-JESermons-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-JOChrist-0.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-JOCommGod-0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-JOGlory-0.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-JOMortSin-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-JPS-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-JST-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-JapBungo-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-JapKougo-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-JapMeiji-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-JapRaguet-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Josephus-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Jubilee2000-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-KD-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-KJV-2.91
-rw-r--r--metadata/md5-cache/app-dicts/sword-KJVA-3.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-KJVPCE-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-KLV-2.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Kaz-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Kekchi-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-KhmerNT-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-KorHKJV-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-KorRV-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-LITV-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-LO-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-LXX-2.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-Latvian-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-LawGospel-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Leeser-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Lightfoot-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-LtKBB-1.7.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Luther-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-LvGluck8-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-MAK-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-MHC-1.61
-rw-r--r--metadata/md5-cache/app-dicts/sword-MKJV-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-MLStrong-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Mal1910-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ManxGaelic-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Maori-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-MapM-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-MollColossians-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-MonKJV-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-Montgomery-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-MorphGNT-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Murdock-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-NETfree-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-NETtext-1.0.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-NHEB-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-NHEBJE-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-NHEBME-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Ndebele-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Nestle1904-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-NorBroed-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-NorSMB-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Norsk-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Noyes-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-OEB-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-OEBcth-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-OSHM-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-OrthJBC-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Orthodoxy-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-OxfordTR-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-PNT-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Packard-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Passion-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Personal-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Peshitta-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Phaistos-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Pilgrim-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-PohnOld-1.011
-rw-r--r--metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-PolGdanska-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-PorAR-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-PorCap-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-PorIBP-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-PotLykins-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Practice-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-QuotingPassages-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-RKJNT-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-RNKJV-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-RWP-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-RWebster-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-RecVer-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Rieger-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Robinson-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-RomCor-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Rotherham-1.71
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusCARS-4.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusCARSA-4.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusCARSDict-4.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusCARST-4.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusMakarij-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-RusVZh-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SAOA-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-SME-1.71
-rw-r--r--metadata/md5-cache/app-dicts/sword-SP-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SPDSS-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SPE-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SPMT-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SPVar-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Scofield-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Sentiment-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Shona-2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-SloOjacano-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SloStritar-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Smith-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-SomKQA-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Sorani-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-SpaRV-1.61
-rw-r--r--metadata/md5-cache/app-dicts/sword-SpaRV1865-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-SpaRVG-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-SpaTDP-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Spurious-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-StrongsGreek-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Swahili-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Swe1917-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Swe1917Of-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-SweFolk1998-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-SweKarlXII-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-TCR-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-TDavid-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-TFG-1.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-TNT-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-TR-2.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-TSK-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Tagalog-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Tausug-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ThaiKJV-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Tisch-2.51
-rw-r--r--metadata/md5-cache/app-dicts/sword-Torrey-1.31
-rw-r--r--metadata/md5-cache/app-dicts/sword-TurHADI-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-TurNTB-2.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Twenty-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Tyndale-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-UKJV-1.1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-UkrKulish-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Ukrainian-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-Uma-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-UyCyr-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-VarApp-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-VieRobinson-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Viet-1.4.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-VietLCCMN-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-VietNVB-1.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-VulgConte-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-WHNU-2.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-WLC-1.91
-rw-r--r--metadata/md5-cache/app-dicts/sword-Webster-1.21
-rw-r--r--metadata/md5-cache/app-dicts/sword-Webster1806-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Webster1913-2.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Wesley-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Westminster-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Westminster21-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-Weymouth-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Worsley-1.61
-rw-r--r--metadata/md5-cache/app-dicts/sword-Wulfila-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-Wycliffe-2.41
-rw-r--r--metadata/md5-cache/app-dicts/sword-YLT-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-ZhHanzi-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-ZhPinyin-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-alzat-1.01
-rw-r--r--metadata/md5-cache/app-dicts/sword-br_en-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-en_eu-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-f35-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-la_en-1.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.11
-rw-r--r--metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.11
-rw-r--r--metadata/md5-cache/app-doc/cantera-docs-2.4.01
-rw-r--r--metadata/md5-cache/app-doc/cantera-docs-2.5.13
-rw-r--r--metadata/md5-cache/app-doc/devmanual-0_pre202002071
-rw-r--r--metadata/md5-cache/app-doc/halibut-1.23
-rw-r--r--metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r21
-rw-r--r--metadata/md5-cache/app-editors/aee-2.2.213
-rw-r--r--metadata/md5-cache/app-editors/dav-0.8.5-r23
-rw-r--r--metadata/md5-cache/app-editors/e3-2.8.23
-rw-r--r--metadata/md5-cache/app-editors/ee-1.5.23
-rw-r--r--metadata/md5-cache/app-editors/ersatz-emacs-20060515-r13
-rw-r--r--metadata/md5-cache/app-editors/fe-2.03
-rw-r--r--metadata/md5-cache/app-editors/focuswriter-1.7.23
-rw-r--r--metadata/md5-cache/app-editors/ghostwriter-1.8.13
-rw-r--r--metadata/md5-cache/app-editors/gummi-0.8.11
-rw-r--r--metadata/md5-cache/app-editors/jedit-5.2.0-r12
-rw-r--r--metadata/md5-cache/app-editors/jove-4.16.0.73-r13
-rw-r--r--metadata/md5-cache/app-editors/leafpad-0.8.18.1-r13
-rw-r--r--metadata/md5-cache/app-editors/lpe-1.2.6.133
-rw-r--r--metadata/md5-cache/app-editors/mg-202007233
-rw-r--r--metadata/md5-cache/app-editors/notepadqq-2.0.0_beta3
-rw-r--r--metadata/md5-cache/app-editors/qemacs-0.4.1_pre201702253
-rw-r--r--metadata/md5-cache/app-editors/qxmledit-0.9.123
-rw-r--r--metadata/md5-cache/app-editors/scite-4.4.4-r103
-rw-r--r--metadata/md5-cache/app-editors/sublime-text-3_p3211-r11
-rw-r--r--metadata/md5-cache/app-editors/tea-47.0.03
-rw-r--r--metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p201801173
-rw-r--r--metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p201807193
-rw-r--r--metadata/md5-cache/app-editors/wily-1.0-r21
-rw-r--r--metadata/md5-cache/app-editors/zile-2.3.24-r23
-rw-r--r--metadata/md5-cache/app-editors/zile-2.4.153
-rw-r--r--metadata/md5-cache/app-emacs/lookup-1.99.96_pre201802092
-rw-r--r--metadata/md5-cache/app-emacs/rudel-0.3.12
-rw-r--r--metadata/md5-cache/app-emacs/undo-tree-0.6.62
-rw-r--r--metadata/md5-cache/app-emulation/cadvisor-0.36.01
-rw-r--r--metadata/md5-cache/app-emulation/coldfire-0.3.13
-rw-r--r--metadata/md5-cache/app-emulation/conmon-2.0.223
-rw-r--r--metadata/md5-cache/app-emulation/conmon-2.0.263
-rw-r--r--metadata/md5-cache/app-emulation/docker-19.03.152
-rw-r--r--metadata/md5-cache/app-emulation/docker-swarm-1.2.91
-rw-r--r--metadata/md5-cache/app-emulation/free42-2.5.243
-rw-r--r--metadata/md5-cache/app-emulation/free42-2.5.253
-rw-r--r--metadata/md5-cache/app-emulation/gxemul-0.6.23
-rw-r--r--metadata/md5-cache/app-emulation/kompose-1.22.01
-rw-r--r--metadata/md5-cache/app-emulation/s6-overlay-1.18.1.31
-rw-r--r--metadata/md5-cache/app-emulation/simh-3.11.13
-rw-r--r--metadata/md5-cache/app-emulation/uade-2.13-r13
-rw-r--r--metadata/md5-cache/app-emulation/umoci-0.4.61
-rw-r--r--metadata/md5-cache/app-emulation/vice-3.53
-rw-r--r--metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.1421421
-rw-r--r--metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.1438962
-rw-r--r--metadata/md5-cache/app-emulation/wine-desktop-common-20150204-r13
-rw-r--r--metadata/md5-cache/app-eselect/eselect-wxwidgets-201404231
-rw-r--r--metadata/md5-cache/app-forensics/chkrootkit-0.543
-rw-r--r--metadata/md5-cache/app-forensics/cmospwd-5.1-r13
-rw-r--r--metadata/md5-cache/app-forensics/foremost-1.5.7-r33
-rw-r--r--metadata/md5-cache/app-forensics/galleta-20040505_p13
-rw-r--r--metadata/md5-cache/app-forensics/honggfuzz-2.43
-rw-r--r--metadata/md5-cache/app-forensics/mac-robber-1.023
-rw-r--r--metadata/md5-cache/app-forensics/magicrescue-1.1.103
-rw-r--r--metadata/md5-cache/app-forensics/memdump-1.01-r13
-rw-r--r--metadata/md5-cache/app-forensics/pasco-20040505_p1-r13
-rw-r--r--metadata/md5-cache/app-forensics/radamsa-0.63
-rw-r--r--metadata/md5-cache/app-forensics/rifiuti-20040505_p13
-rw-r--r--metadata/md5-cache/app-forensics/unhide-201305263
-rw-r--r--metadata/md5-cache/app-i18n/canfep-1.0-r13
-rw-r--r--metadata/md5-cache/app-i18n/kakasi-2.3.4-r23
-rw-r--r--metadata/md5-cache/app-i18n/kanjipad-2.0.03
-rw-r--r--metadata/md5-cache/app-i18n/kcc-1.03
-rw-r--r--metadata/md5-cache/app-i18n/qkc-1.003
-rw-r--r--metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r13
-rw-r--r--metadata/md5-cache/app-laptop/msi-keyboard-1.03
-rw-r--r--metadata/md5-cache/app-laptop/spicctrl-1.9-r13
-rw-r--r--metadata/md5-cache/app-metrics/bind_exporter-0.3.01
-rw-r--r--metadata/md5-cache/app-metrics/consul_exporter-0.7.11
-rw-r--r--metadata/md5-cache/app-metrics/dnsmasq_exporter-0.2.0-r11
-rw-r--r--metadata/md5-cache/app-metrics/mongodb_exporter-0.11.11
-rw-r--r--metadata/md5-cache/app-metrics/mysqld_exporter-0.12.1_p202006221
-rw-r--r--metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r1003
-rw-r--r--metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.71
-rw-r--r--metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r11
-rw-r--r--metadata/md5-cache/app-metrics/openvpn_exporter-0.3.01
-rw-r--r--metadata/md5-cache/app-metrics/prom2json-1.3.01
-rw-r--r--metadata/md5-cache/app-misc/OpenRGB-0.43
-rw-r--r--metadata/md5-cache/app-misc/OpenRGB-0.53
-rw-r--r--metadata/md5-cache/app-misc/astrolog-5.40-r33
-rw-r--r--metadata/md5-cache/app-misc/beep-1.4.93
-rw-r--r--metadata/md5-cache/app-misc/bgrep-0_p20110121-r13
-rw-r--r--metadata/md5-cache/app-misc/birthday-1.6.2-r13
-rw-r--r--metadata/md5-cache/app-misc/bottlerocket-0.04c-r23
-rw-r--r--metadata/md5-cache/app-misc/btail-0.3-r13
-rw-r--r--metadata/md5-cache/app-misc/calendar-0.9.1-r13
-rw-r--r--metadata/md5-cache/app-misc/cdspeed-0.4-r23
-rw-r--r--metadata/md5-cache/app-misc/clockywock-0.3.1a3
-rw-r--r--metadata/md5-cache/app-misc/colordiff-1.0.181
-rw-r--r--metadata/md5-cache/app-misc/colordiff-1.0.191
-rw-r--r--metadata/md5-cache/app-misc/countrycodes-1.0.5-r33
-rw-r--r--metadata/md5-cache/app-misc/cpipe-3.0.33
-rw-r--r--metadata/md5-cache/app-misc/datovka-4.15.33
-rw-r--r--metadata/md5-cache/app-misc/detachtty-11.0.03
-rw-r--r--metadata/md5-cache/app-misc/detachtty-9-r13
-rw-r--r--metadata/md5-cache/app-misc/dvorakng-0.6.03
-rw-r--r--metadata/md5-cache/app-misc/egads-0.9.5-r11
-rw-r--r--metadata/md5-cache/app-misc/empty-0.6.21b3
-rw-r--r--metadata/md5-cache/app-misc/faq-0.0.61
-rw-r--r--metadata/md5-cache/app-misc/fdupes-2.1.23
-rw-r--r--metadata/md5-cache/app-misc/fslurp-2.1.43
-rw-r--r--metadata/md5-cache/app-misc/gcstar-1.7.1-r13
-rw-r--r--metadata/md5-cache/app-misc/geneweb-6.08.013
-rw-r--r--metadata/md5-cache/app-misc/glcdprocdriver-0.1.23
-rw-r--r--metadata/md5-cache/app-misc/go-jira-1.0.231
-rw-r--r--metadata/md5-cache/app-misc/go-jira-1.0.261
-rw-r--r--metadata/md5-cache/app-misc/go-jira-1.0.271
-rw-r--r--metadata/md5-cache/app-misc/grabcartoons-2.8.4_p201411121
-rw-r--r--metadata/md5-cache/app-misc/gtk-sunlight-0.4.2-r13
-rw-r--r--metadata/md5-cache/app-misc/hilite-1.5-r13
-rw-r--r--metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r23
-rw-r--r--metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r13
-rw-r--r--metadata/md5-cache/app-misc/ltunify-0.2-r23
-rw-r--r--metadata/md5-cache/app-misc/lxsplit-0.2.4-r13
-rw-r--r--metadata/md5-cache/app-misc/mepl-0.45-r13
-rw-r--r--metadata/md5-cache/app-misc/mkcert-1.4.11
-rw-r--r--metadata/md5-cache/app-misc/neofetch-7.1.01
-rw-r--r--metadata/md5-cache/app-misc/no-more-secrets-0.3.33
-rw-r--r--metadata/md5-cache/app-misc/ondir-0.2.43
-rw-r--r--metadata/md5-cache/app-misc/pal-0.4.3-r23
-rw-r--r--metadata/md5-cache/app-misc/pet-0.3.61
-rw-r--r--metadata/md5-cache/app-misc/pet-0.3.6-r11
-rw-r--r--metadata/md5-cache/app-misc/pipeworks-0.4-r13
-rw-r--r--metadata/md5-cache/app-misc/qcma-0.4.13
-rw-r--r--metadata/md5-cache/app-misc/qcma-0.4.2_pre201812273
-rw-r--r--metadata/md5-cache/app-misc/radeontop-1.3-r23
-rw-r--r--metadata/md5-cache/app-misc/rbutil-1.4.1-r23
-rw-r--r--metadata/md5-cache/app-misc/socnetv-2.23
-rw-r--r--metadata/md5-cache/app-misc/spire-0.10.01
-rw-r--r--metadata/md5-cache/app-misc/spire-0.11.11
-rw-r--r--metadata/md5-cache/app-misc/tpipe-1.6-r13
-rw-r--r--metadata/md5-cache/app-misc/transfolio-1.0.1-r13
-rw-r--r--metadata/md5-cache/app-misc/ttyload-0.5.33
-rw-r--r--metadata/md5-cache/app-misc/ttysnoop-0.12d3
-rw-r--r--metadata/md5-cache/app-misc/zygrib-8.0.1-r13
-rw-r--r--metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r13
-rw-r--r--metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r33
-rw-r--r--metadata/md5-cache/app-office/borg-1.7.4-r32
-rw-r--r--metadata/md5-cache/app-office/homebank-5.4.33
-rw-r--r--metadata/md5-cache/app-office/libreoffice-l10n-6.4.7.23
-rw-r--r--metadata/md5-cache/app-office/libreoffice-voikko-5.0-r11
-rw-r--r--metadata/md5-cache/app-office/plan-1.103
-rw-r--r--metadata/md5-cache/app-office/sc-7.16-r23
-rw-r--r--metadata/md5-cache/app-office/texmaker-5.0.33
-rw-r--r--metadata/md5-cache/app-office/texmaker-5.0.43
-rw-r--r--metadata/md5-cache/app-office/texstudio-3.0.5-r13
-rw-r--r--metadata/md5-cache/app-office/texstudio-3.1.0-r13
-rw-r--r--metadata/md5-cache/app-pda/ifuse-1.1.3-r11
-rw-r--r--metadata/md5-cache/app-pda/iripdb-0.1.3b3
-rw-r--r--metadata/md5-cache/app-portage/pgo-0.0.21
-rw-r--r--metadata/md5-cache/app-portage/pgo-0.0.31
-rw-r--r--metadata/md5-cache/app-portage/repo-commit-0.4.1-r11
-rw-r--r--metadata/md5-cache/app-shells/ccsh-0.0.4-r43
-rw-r--r--metadata/md5-cache/app-shells/pdmenu-1.3.63
-rw-r--r--metadata/md5-cache/app-shells/peco-0.5.71
-rw-r--r--metadata/md5-cache/app-shells/peco-0.5.81
-rw-r--r--metadata/md5-cache/app-shells/rrs-1.70-r23
-rw-r--r--metadata/md5-cache/app-shells/scsh-0.6.7-r23
-rw-r--r--metadata/md5-cache/app-shells/shish-0.7_pre3-r12
-rw-r--r--metadata/md5-cache/app-shells/smrsh-8.15.22
-rw-r--r--metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.11
-rw-r--r--metadata/md5-cache/app-text/agrep-2.04-r23
-rw-r--r--metadata/md5-cache/app-text/an-1.2_p63
-rw-r--r--metadata/md5-cache/app-text/ansifilter-2.173
-rw-r--r--metadata/md5-cache/app-text/ansifilter-2.183
-rw-r--r--metadata/md5-cache/app-text/bact-0.13-r13
-rw-r--r--metadata/md5-cache/app-text/bibclean-2.173
-rw-r--r--metadata/md5-cache/app-text/bibclean-3.043
-rw-r--r--metadata/md5-cache/app-text/c2ps-4.03
-rw-r--r--metadata/md5-cache/app-text/cb2bib-2.0.0-r13
-rw-r--r--metadata/md5-cache/app-text/chasen-2.4.4-r32
-rw-r--r--metadata/md5-cache/app-text/convertlit-1.8-r33
-rw-r--r--metadata/md5-cache/app-text/cwtext-0.96-r13
-rw-r--r--metadata/md5-cache/app-text/diffpdf-2.1.3-r23
-rw-r--r--metadata/md5-cache/app-text/ding-1.93
-rw-r--r--metadata/md5-cache/app-text/dos2unix-7.4.23
-rw-r--r--metadata/md5-cache/app-text/enchant-1.6.1-r11
-rw-r--r--metadata/md5-cache/app-text/epstool-3.093
-rw-r--r--metadata/md5-cache/app-text/expander-2.0.5-r23
-rw-r--r--metadata/md5-cache/app-text/fbpdf-0_p202006143
-rw-r--r--metadata/md5-cache/app-text/flpsed-0.7.33
-rw-r--r--metadata/md5-cache/app-text/gv-3.7.3.901
-rw-r--r--metadata/md5-cache/app-text/highlight-3.57-r1003
-rw-r--r--metadata/md5-cache/app-text/hnb-1.9.18-r13
-rw-r--r--metadata/md5-cache/app-text/html2text-1.3.2a-r23
-rw-r--r--metadata/md5-cache/app-text/html2text-2.0.03
-rw-r--r--metadata/md5-cache/app-text/html401-19991224-r41
-rw-r--r--metadata/md5-cache/app-text/htmlrecode-1.3.1-r13
-rw-r--r--metadata/md5-cache/app-text/htmltidy-20090325-r22
-rw-r--r--metadata/md5-cache/app-text/itex2mml-1.5.63
-rw-r--r--metadata/md5-cache/app-text/liblangtag-0.6.31
-rw-r--r--metadata/md5-cache/app-text/lout-3.403
-rw-r--r--metadata/md5-cache/app-text/mandoc-1.14.5-r13
-rw-r--r--metadata/md5-cache/app-text/mathtex-1.043
-rw-r--r--metadata/md5-cache/app-text/mpage-2.5.6-r13
-rw-r--r--metadata/md5-cache/app-text/o3read-0.0.43
-rw-r--r--metadata/md5-cache/app-text/odt2txt-0.53
-rw-r--r--metadata/md5-cache/app-text/par-1.53.03
-rw-r--r--metadata/md5-cache/app-text/pdf2html-1.43
-rw-r--r--metadata/md5-cache/app-text/psiconv-0.8.3-r13
-rw-r--r--metadata/md5-cache/app-text/pspresent-1.3-r13
-rw-r--r--metadata/md5-cache/app-text/psutils-1.17-r33
-rw-r--r--metadata/md5-cache/app-text/qpdfview-0.4.183
-rw-r--r--metadata/md5-cache/app-text/qpdfview-0.4.18_p13
-rw-r--r--metadata/md5-cache/app-text/scdoc-1.11.03
-rw-r--r--metadata/md5-cache/app-text/scdoc-1.11.13
-rw-r--r--metadata/md5-cache/app-text/sloccount-2.26-r33
-rw-r--r--metadata/md5-cache/app-text/tofrodos-1.7.133
-rw-r--r--metadata/md5-cache/app-text/u2ps-1.23
-rw-r--r--metadata/md5-cache/app-text/wscr-1.2-r23
-rw-r--r--metadata/md5-cache/app-text/xhtml1-20020801-r61
-rw-r--r--metadata/md5-cache/app-text/xhtml11-201011231
-rw-r--r--metadata/md5-cache/app-text/xml2doc-20030510-r13
-rw-r--r--metadata/md5-cache/dev-ada/gnatmem-2019-r12
-rw-r--r--metadata/md5-cache/dev-ada/gnatmem-20202
-rw-r--r--metadata/md5-cache/dev-ada/gprbuild-2017-r22
-rw-r--r--metadata/md5-cache/dev-ada/gprbuild-20202
-rw-r--r--metadata/md5-cache/dev-ada/gprbuild-2020-r12
-rw-r--r--metadata/md5-cache/dev-cpp/libodb-2.5.0_beta193
-rw-r--r--metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta193
-rw-r--r--metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.03
-rw-r--r--metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r21
-rw-r--r--metadata/md5-cache/dev-db/datadraw-3.1.13
-rw-r--r--metadata/md5-cache/dev-db/go-etcd-2.0.0-r11
-rw-r--r--metadata/md5-cache/dev-db/libzdb-3.1-r13
-rw-r--r--metadata/md5-cache/dev-db/libzdb-3.2.23
-rw-r--r--metadata/md5-cache/dev-db/rqlite-5.10.21
-rw-r--r--metadata/md5-cache/dev-db/tinycdb-0.77-r23
-rw-r--r--metadata/md5-cache/dev-db/tinycdb-0.783
-rw-r--r--metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r11
-rw-r--r--metadata/md5-cache/dev-embedded/avra-1.4.23
-rw-r--r--metadata/md5-cache/dev-embedded/avrdude-6.33
-rw-r--r--metadata/md5-cache/dev-embedded/cpik-0.7.4_p43
-rw-r--r--metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r13
-rw-r--r--metadata/md5-cache/dev-embedded/gputils-1.5.03
-rw-r--r--metadata/md5-cache/dev-embedded/icdprog-0.53
-rw-r--r--metadata/md5-cache/dev-embedded/libdisasm-0.233
-rw-r--r--metadata/md5-cache/dev-embedded/lpc21isp-1.851
-rw-r--r--metadata/md5-cache/dev-embedded/mspdebug-0.253
-rw-r--r--metadata/md5-cache/dev-embedded/openocd-0.10.0-r13
-rw-r--r--metadata/md5-cache/dev-embedded/parapin-1.5.03
-rw-r--r--metadata/md5-cache/dev-embedded/parapin-1.5.1_beta13
-rw-r--r--metadata/md5-cache/dev-embedded/picasm-1.143
-rw-r--r--metadata/md5-cache/dev-embedded/picp-0.6.83
-rw-r--r--metadata/md5-cache/dev-embedded/picprog-1.9.13
-rw-r--r--metadata/md5-cache/dev-embedded/stm32flash-0.53
-rw-r--r--metadata/md5-cache/dev-embedded/xa-2.3.103
-rw-r--r--metadata/md5-cache/dev-embedded/zmac-1.3-r13
-rw-r--r--metadata/md5-cache/dev-erlang/base64url-1.0.11
-rw-r--r--metadata/md5-cache/dev-erlang/cache_tab-1.0.231
-rw-r--r--metadata/md5-cache/dev-erlang/cache_tab-1.0.251
-rw-r--r--metadata/md5-cache/dev-erlang/eimp-1.0.151
-rw-r--r--metadata/md5-cache/dev-erlang/eimp-1.0.171
-rw-r--r--metadata/md5-cache/dev-erlang/eredis-1.0.81
-rw-r--r--metadata/md5-cache/dev-erlang/eredis-1.2.01
-rw-r--r--metadata/md5-cache/dev-erlang/esip-1.0.341
-rw-r--r--metadata/md5-cache/dev-erlang/esip-1.0.371
-rw-r--r--metadata/md5-cache/dev-erlang/ezlib-1.0.71
-rw-r--r--metadata/md5-cache/dev-erlang/ezlib-1.0.81
-rw-r--r--metadata/md5-cache/dev-erlang/fast_xml-1.1.411
-rw-r--r--metadata/md5-cache/dev-erlang/fast_xml-1.1.431
-rw-r--r--metadata/md5-cache/dev-erlang/fast_yaml-1.0.251
-rw-r--r--metadata/md5-cache/dev-erlang/fast_yaml-1.0.271
-rw-r--r--metadata/md5-cache/dev-erlang/goldrush-0.1.91
-rw-r--r--metadata/md5-cache/dev-erlang/goldrush-0.2.01
-rw-r--r--metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p201607091
-rw-r--r--metadata/md5-cache/dev-erlang/iconv-1.0.101
-rw-r--r--metadata/md5-cache/dev-erlang/idna-6.0.01
-rw-r--r--metadata/md5-cache/dev-erlang/jiffy-0.14.111
-rw-r--r--metadata/md5-cache/dev-erlang/jiffy-0.14.91
-rw-r--r--metadata/md5-cache/dev-erlang/jiffy-1.0.11
-rw-r--r--metadata/md5-cache/dev-erlang/jiffy-1.0.41
-rw-r--r--metadata/md5-cache/dev-erlang/jiffy-1.0.51
-rw-r--r--metadata/md5-cache/dev-erlang/jose-1.10.11
-rw-r--r--metadata/md5-cache/dev-erlang/jose-1.9.01
-rw-r--r--metadata/md5-cache/dev-erlang/lager-3.2.41
-rw-r--r--metadata/md5-cache/dev-erlang/lager-3.8.01
-rw-r--r--metadata/md5-cache/dev-erlang/lager-3.8.11
-rw-r--r--metadata/md5-cache/dev-erlang/luerl-0.21
-rw-r--r--metadata/md5-cache/dev-erlang/luerl-0.31
-rw-r--r--metadata/md5-cache/dev-erlang/meck-0.8.121
-rw-r--r--metadata/md5-cache/dev-erlang/meck-0.8.131
-rw-r--r--metadata/md5-cache/dev-erlang/meck-0.8.41
-rw-r--r--metadata/md5-cache/dev-erlang/mqtree-1.0.101
-rw-r--r--metadata/md5-cache/dev-erlang/mqtree-1.0.71
-rw-r--r--metadata/md5-cache/dev-erlang/p1_acme-1.0.51
-rw-r--r--metadata/md5-cache/dev-erlang/p1_acme-1.0.81
-rw-r--r--metadata/md5-cache/dev-erlang/p1_mysql-1.0.151
-rw-r--r--metadata/md5-cache/dev-erlang/p1_mysql-1.0.161
-rw-r--r--metadata/md5-cache/dev-erlang/p1_oauth2-0.6.61
-rw-r--r--metadata/md5-cache/dev-erlang/p1_oauth2-0.6.71
-rw-r--r--metadata/md5-cache/dev-erlang/p1_pgsql-1.1.101
-rw-r--r--metadata/md5-cache/dev-erlang/p1_pgsql-1.1.91
-rw-r--r--metadata/md5-cache/dev-erlang/p1_utils-1.0.191
-rw-r--r--metadata/md5-cache/dev-erlang/p1_utils-1.0.201
-rw-r--r--metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.11
-rw-r--r--metadata/md5-cache/dev-erlang/pkix-1.0.51
-rw-r--r--metadata/md5-cache/dev-erlang/pkix-1.0.61
-rw-r--r--metadata/md5-cache/dev-erlang/proper-1.21
-rw-r--r--metadata/md5-cache/dev-erlang/proper-1.31
-rw-r--r--metadata/md5-cache/dev-erlang/protobuffs-0.9.01
-rw-r--r--metadata/md5-cache/dev-erlang/riak_pb-2.2.0.21
-rw-r--r--metadata/md5-cache/dev-erlang/riakc-2.4.21
-rw-r--r--metadata/md5-cache/dev-erlang/sqlite3-1.1.71
-rw-r--r--metadata/md5-cache/dev-erlang/sqlite3-1.1.81
-rw-r--r--metadata/md5-cache/dev-erlang/stringprep-1.0.201
-rw-r--r--metadata/md5-cache/dev-erlang/stringprep-1.0.221
-rw-r--r--metadata/md5-cache/dev-erlang/stun-1.0.331
-rw-r--r--metadata/md5-cache/dev-erlang/stun-1.0.381
-rw-r--r--metadata/md5-cache/dev-erlang/xmpp-1.4.71
-rw-r--r--metadata/md5-cache/dev-erlang/xmpp-1.4.91
-rw-r--r--metadata/md5-cache/dev-erlang/yconf-1.0.11
-rw-r--r--metadata/md5-cache/dev-erlang/yconf-1.0.41
-rw-r--r--metadata/md5-cache/dev-erlang/yconf-1.0.71
-rw-r--r--metadata/md5-cache/dev-games/hawknl-1.68-r33
-rw-r--r--metadata/md5-cache/dev-games/irrlicht-headers-1.8.41
-rw-r--r--metadata/md5-cache/dev-games/libnw-1.30.023
-rw-r--r--metadata/md5-cache/dev-games/mygui-3.2.22
-rw-r--r--metadata/md5-cache/dev-games/paklib-0.33
-rw-r--r--metadata/md5-cache/dev-go/fuzzy-0.0.52
-rw-r--r--metadata/md5-cache/dev-go/get-ego-vendor-0.2.01
-rw-r--r--metadata/md5-cache/dev-go/go-bindata-3.1.31
-rw-r--r--metadata/md5-cache/dev-go/go-license-detector-3.1.01
-rw-r--r--metadata/md5-cache/dev-go/go-licenses-0_pre202005111
-rw-r--r--metadata/md5-cache/dev-go/go-md2man-2.0.01
-rw-r--r--metadata/md5-cache/dev-go/go-tour-0_pre202002011
-rw-r--r--metadata/md5-cache/dev-go/golicense-0.2.01
-rw-r--r--metadata/md5-cache/dev-go/golint-0_pre202003011
-rw-r--r--metadata/md5-cache/dev-go/gox-1.0.11
-rw-r--r--metadata/md5-cache/dev-go/licenseclassifier-0_pre202004021
-rw-r--r--metadata/md5-cache/dev-go/qt-0_pre20200904-r11
-rw-r--r--metadata/md5-cache/dev-java/android-util-4.1.1.42
-rw-r--r--metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r12
-rw-r--r--metadata/md5-cache/dev-java/batik-1.92
-rw-r--r--metadata/md5-cache/dev-java/byaccj-1.15-r23
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-1.8.1-r22
-rw-r--r--metadata/md5-cache/dev-java/commons-fileupload-1.32
-rw-r--r--metadata/md5-cache/dev-java/eclipse-ecj-4.5.12
-rw-r--r--metadata/md5-cache/dev-java/edtftpj-2.4.02
-rw-r--r--metadata/md5-cache/dev-java/ehcache-1.2.4-r42
-rw-r--r--metadata/md5-cache/dev-java/javacsv-2.12
-rw-r--r--metadata/md5-cache/dev-java/jdbc-mysql-5.1.262
-rw-r--r--metadata/md5-cache/dev-java/jflex-1.6.12
-rw-r--r--metadata/md5-cache/dev-java/jfreesvg-2.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jfreesvg-3.02
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-common-1.8.02
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r22
-rw-r--r--metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r12
-rw-r--r--metadata/md5-cache/dev-java/jid3-0.46-r22
-rw-r--r--metadata/md5-cache/dev-java/jlex-1.2.6-r22
-rw-r--r--metadata/md5-cache/dev-java/junitperf-1.9.1-r22
-rw-r--r--metadata/md5-cache/dev-java/metainf-services-1.62
-rw-r--r--metadata/md5-cache/dev-java/milton-api-2.7.1.32
-rw-r--r--metadata/md5-cache/dev-java/mojarra-2.2.12-r12
-rw-r--r--metadata/md5-cache/dev-java/nekohtml-1.9.18-r12
-rw-r--r--metadata/md5-cache/dev-java/pat-1.5.3-r12
-rw-r--r--metadata/md5-cache/dev-java/rundoc-0.11-r12
-rw-r--r--metadata/md5-cache/dev-java/saxon-9.2.0.6-r22
-rw-r--r--metadata/md5-cache/dev-java/skinlf-6.7-r12
-rw-r--r--metadata/md5-cache/dev-java/spin-1.5-r12
-rw-r--r--metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r12
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-4.0.82
-rw-r--r--metadata/md5-cache/dev-java/xml-security-1.5.7-r12
-rw-r--r--metadata/md5-cache/dev-java/xmlrpc-3.1.32
-rw-r--r--metadata/md5-cache/dev-lang/duktape-2.5.0-r11
-rw-r--r--metadata/md5-cache/dev-lang/duktape-2.6.02
-rw-r--r--metadata/md5-cache/dev-lang/execline-2.3.0.31
-rw-r--r--metadata/md5-cache/dev-lang/execline-2.3.0.41
-rw-r--r--metadata/md5-cache/dev-lang/f2c-20100827-r11
-rw-r--r--metadata/md5-cache/dev-lang/fpc-3.0.43
-rw-r--r--metadata/md5-cache/dev-lang/jwasm-2.133
-rw-r--r--metadata/md5-cache/dev-lang/lazarus-1.8.4-r21
-rw-r--r--metadata/md5-cache/dev-lang/lazarus-2.0.61
-rw-r--r--metadata/md5-cache/dev-lang/lfe-1.1.11
-rw-r--r--metadata/md5-cache/dev-lang/lisaac-0.13.1-r22
-rw-r--r--metadata/md5-cache/dev-lang/micropython-1.113
-rw-r--r--metadata/md5-cache/dev-lang/mmix-20160804-r11
-rw-r--r--metadata/md5-cache/dev-lang/snobol-1.4.1-r13
-rw-r--r--metadata/md5-cache/dev-lang/srf-1.0-r21
-rw-r--r--metadata/md5-cache/dev-lang/swig-4.0.02
-rw-r--r--metadata/md5-cache/dev-lang/swig-4.0.22
-rw-r--r--metadata/md5-cache/dev-lang/tcc-0.9.273
-rw-r--r--metadata/md5-cache/dev-lang/teyjus-2.1-r12
-rw-r--r--metadata/md5-cache/dev-lang/yasm-1.3.0-r13
-rw-r--r--metadata/md5-cache/dev-libs/argtable-2.13-r11
-rw-r--r--metadata/md5-cache/dev-libs/bcm2835-1.683
-rw-r--r--metadata/md5-cache/dev-libs/bglibs-2.04-r13
-rw-r--r--metadata/md5-cache/dev-libs/bglibs-2.04-r23
-rw-r--r--metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-201612053
-rw-r--r--metadata/md5-cache/dev-libs/cl-1.2.42
-rw-r--r--metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r13
-rw-r--r--metadata/md5-cache/dev-libs/crypto++-8.2.0-r23
-rw-r--r--metadata/md5-cache/dev-libs/crypto++-8.4.03
-rw-r--r--metadata/md5-cache/dev-libs/cvector-1.0.3.13
-rw-r--r--metadata/md5-cache/dev-libs/dotconf-1.3-r13
-rw-r--r--metadata/md5-cache/dev-libs/leveldb-1.201
-rw-r--r--metadata/md5-cache/dev-libs/libatasmart-0.19_p53
-rw-r--r--metadata/md5-cache/dev-libs/libbpf-0.0.63
-rw-r--r--metadata/md5-cache/dev-libs/libbpf-0.0.73
-rw-r--r--metadata/md5-cache/dev-libs/libbpf-0.0.83
-rw-r--r--metadata/md5-cache/dev-libs/libbpf-0.0.9-r13
-rw-r--r--metadata/md5-cache/dev-libs/libbulletml-0.0.63
-rw-r--r--metadata/md5-cache/dev-libs/libezV24-0.1.1-r13
-rw-r--r--metadata/md5-cache/dev-libs/libmaxminddb-1.5.23
-rw-r--r--metadata/md5-cache/dev-libs/libmoe-1.5.8-r33
-rw-r--r--metadata/md5-cache/dev-libs/libpfm-4.10.1-r13
-rw-r--r--metadata/md5-cache/dev-libs/librdkafka-1.4.43
-rw-r--r--metadata/md5-cache/dev-libs/libtomfloat-0.02-r13
-rw-r--r--metadata/md5-cache/dev-libs/libtompoly-0.04-r13
-rw-r--r--metadata/md5-cache/dev-libs/libutf8proc-2.4.03
-rw-r--r--metadata/md5-cache/dev-libs/libutf8proc-2.5.03
-rw-r--r--metadata/md5-cache/dev-libs/libx86emu-1.13
-rw-r--r--metadata/md5-cache/dev-libs/libxml2-2.9.12-r14
-rw-r--r--metadata/md5-cache/dev-libs/ntl-11.4.33
-rw-r--r--metadata/md5-cache/dev-libs/openspecfun-0.5.33
-rw-r--r--metadata/md5-cache/dev-libs/qcustomplot-2.0.13
-rw-r--r--metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r33
-rw-r--r--metadata/md5-cache/dev-libs/rasqal-0.9.333
-rw-r--r--metadata/md5-cache/dev-libs/serdisplib-2.02-r13
-rw-r--r--metadata/md5-cache/dev-libs/shhopt-1.1.7-r33
-rw-r--r--metadata/md5-cache/dev-libs/skalibs-2.3.2.01
-rw-r--r--metadata/md5-cache/dev-libs/skalibs-2.6.1.01
-rw-r--r--metadata/md5-cache/dev-libs/skalibs-2.6.3.01
-rw-r--r--metadata/md5-cache/dev-libs/skalibs-2.6.4.01
-rw-r--r--metadata/md5-cache/dev-libs/tre-0.8.0-r21
-rw-r--r--metadata/md5-cache/dev-libs/tvision-2.2.1.43
-rw-r--r--metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre11530593
-rw-r--r--metadata/md5-cache/dev-libs/zlog-1.2.14-r13
-rw-r--r--metadata/md5-cache/dev-lua/ldoc-1.4.6-r1003
-rw-r--r--metadata/md5-cache/dev-lua/luajson-1.3.4-r1003
-rw-r--r--metadata/md5-cache/dev-lua/lutok-0.4-r103
-rw-r--r--metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r1003
-rw-r--r--metadata/md5-cache/dev-ml/dune-2.8.21
-rw-r--r--metadata/md5-cache/dev-ml/ocamlweb-1.411
-rw-r--r--metadata/md5-cache/dev-perl/DelimMatch-1.06-r12
-rw-r--r--metadata/md5-cache/dev-perl/Email-Find-0.100.0-r12
-rw-r--r--metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r12
-rw-r--r--metadata/md5-cache/dev-perl/File-Sync-0.110.02
-rw-r--r--metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r12
-rw-r--r--metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.52
-rw-r--r--metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r12
-rw-r--r--metadata/md5-cache/dev-perl/Sane-0.50.0-r12
-rw-r--r--metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r12
-rw-r--r--metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r12
-rw-r--r--metadata/md5-cache/dev-perl/Test-Pod-1.510.02
-rw-r--r--metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r12
-rw-r--r--metadata/md5-cache/dev-php/onphp-1.0.11_pre201411241
-rw-r--r--metadata/md5-cache/dev-qt/qtchooser-663
-rw-r--r--metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p201710243
-rw-r--r--metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p201710243
-rw-r--r--metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r13
-rw-r--r--metadata/md5-cache/dev-ros/geometric_shapes-0.7.22
-rw-r--r--metadata/md5-cache/dev-ros/geometric_shapes-99992
-rw-r--r--metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.72
-rw-r--r--metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.22
-rw-r--r--metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.12
-rw-r--r--metadata/md5-cache/dev-ruby/activejob-6.1.3.12
-rw-r--r--metadata/md5-cache/dev-ruby/activemodel-6.1.2.12
-rw-r--r--metadata/md5-cache/dev-ruby/archive-tar-minitar-0.82
-rw-r--r--metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.52
-rw-r--r--metadata/md5-cache/dev-ruby/async_sinatra-1.3.02
-rw-r--r--metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.4.02
-rw-r--r--metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.52
-rw-r--r--metadata/md5-cache/dev-ruby/aws-partitions-1.297.02
-rw-r--r--metadata/md5-cache/dev-ruby/aws-partitions-1.298.02
-rw-r--r--metadata/md5-cache/dev-ruby/aws-sdk-2.11.4882
-rw-r--r--metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.4882
-rw-r--r--metadata/md5-cache/dev-ruby/barby-0.6.82
-rw-r--r--metadata/md5-cache/dev-ruby/base32-0.3.42
-rw-r--r--metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.12
-rw-r--r--metadata/md5-cache/dev-ruby/c21e-1.2.12
-rw-r--r--metadata/md5-cache/dev-ruby/childprocess-4.0.02
-rw-r--r--metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r12
-rw-r--r--metadata/md5-cache/dev-ruby/commander-4.5.22
-rw-r--r--metadata/md5-cache/dev-ruby/contracts-0.16.02
-rw-r--r--metadata/md5-cache/dev-ruby/daemons-1.3.12
-rw-r--r--metadata/md5-cache/dev-ruby/dalli-2.7.102
-rw-r--r--metadata/md5-cache/dev-ruby/ddplugin-1.0.22
-rw-r--r--metadata/md5-cache/dev-ruby/deep_merge-1.2.12
-rw-r--r--metadata/md5-cache/dev-ruby/dependor-1.0.12
-rw-r--r--metadata/md5-cache/dev-ruby/did_you_mean-1.3.12
-rw-r--r--metadata/md5-cache/dev-ruby/domain_name-0.5.201907012
-rw-r--r--metadata/md5-cache/dev-ruby/elasticsearch-6.8.12
-rw-r--r--metadata/md5-cache/dev-ruby/eventmachine-1.2.72
-rw-r--r--metadata/md5-cache/dev-ruby/execjs-2.8.02
-rw-r--r--metadata/md5-cache/dev-ruby/exifr-1.3.92
-rw-r--r--metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r22
-rw-r--r--metadata/md5-cache/dev-ruby/ffi-1.13.12
-rw-r--r--metadata/md5-cache/dev-ruby/ffi-1.15.02
-rw-r--r--metadata/md5-cache/dev-ruby/filesize-0.2.02
-rw-r--r--metadata/md5-cache/dev-ruby/hipchat-1.6.02
-rw-r--r--metadata/md5-cache/dev-ruby/http-3.3.02
-rw-r--r--metadata/md5-cache/dev-ruby/http-4.1.12
-rw-r--r--metadata/md5-cache/dev-ruby/httparty-0.17.32
-rw-r--r--metadata/md5-cache/dev-ruby/httparty-0.18.12
-rw-r--r--metadata/md5-cache/dev-ruby/idn-ruby-0.1.02
-rw-r--r--metadata/md5-cache/dev-ruby/jsobfu-0.4.22
-rw-r--r--metadata/md5-cache/dev-ruby/liquid-c-4.0.02
-rw-r--r--metadata/md5-cache/dev-ruby/loofah-2.8.02
-rw-r--r--metadata/md5-cache/dev-ruby/mercenary-0.4.02
-rw-r--r--metadata/md5-cache/dev-ruby/method_source-0.9.22
-rw-r--r--metadata/md5-cache/dev-ruby/minitar-0.92
-rw-r--r--metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r12
-rw-r--r--metadata/md5-cache/dev-ruby/mocha-1.12.02
-rw-r--r--metadata/md5-cache/dev-ruby/msgpack-1.3.32
-rw-r--r--metadata/md5-cache/dev-ruby/multipart-post-2.1.12
-rw-r--r--metadata/md5-cache/dev-ruby/oauth-0.5.52
-rw-r--r--metadata/md5-cache/dev-ruby/optimist-3.0.12
-rw-r--r--metadata/md5-cache/dev-ruby/parser-2.7.2.02
-rw-r--r--metadata/md5-cache/dev-ruby/parser-2.7.2.0-r12
-rw-r--r--metadata/md5-cache/dev-ruby/patron-0.13.1-r12
-rw-r--r--metadata/md5-cache/dev-ruby/patron-0.13.32
-rw-r--r--metadata/md5-cache/dev-ruby/pdf-core-0.8.12
-rw-r--r--metadata/md5-cache/dev-ruby/pg-1.2.22
-rw-r--r--metadata/md5-cache/dev-ruby/pkg-config-1.4.62
-rw-r--r--metadata/md5-cache/dev-ruby/plist-3.6.02
-rw-r--r--metadata/md5-cache/dev-ruby/pluggaloid-1.3.12
-rw-r--r--metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r12
-rw-r--r--metadata/md5-cache/dev-ruby/railties-6.1.2.12
-rw-r--r--metadata/md5-cache/dev-ruby/railties-6.1.3.12
-rw-r--r--metadata/md5-cache/dev-ruby/rbnacl-7.1.12
-rw-r--r--metadata/md5-cache/dev-ruby/rcairo-1.16.52
-rw-r--r--metadata/md5-cache/dev-ruby/rdiscount-2.2.0.22
-rw-r--r--metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r12
-rw-r--r--metadata/md5-cache/dev-ruby/redcarpet-3.5.12
-rw-r--r--metadata/md5-cache/dev-ruby/rexml-3.2.52
-rw-r--r--metadata/md5-cache/dev-ruby/roadie-4.0.02
-rw-r--r--metadata/md5-cache/dev-ruby/rqrcode-1.1.12
-rw-r--r--metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.02
-rw-r--r--metadata/md5-cache/dev-ruby/rspec-support-3.8.22
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r32
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.22
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-gettext-3.2.92
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-macho-2.2.02
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-odbc-0.999992
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-openid-2.9.22
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-prof-1.4.12
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-prof-1.4.22
-rw-r--r--metadata/md5-cache/dev-ruby/ruby2ruby-2.4.22
-rw-r--r--metadata/md5-cache/dev-ruby/rubygems-2.7.112
-rw-r--r--metadata/md5-cache/dev-ruby/rubytest-cli-0.2.02
-rw-r--r--metadata/md5-cache/dev-ruby/sanitize-5.2.22
-rw-r--r--metadata/md5-cache/dev-ruby/sexp_processor-4.15.22
-rw-r--r--metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.32
-rw-r--r--metadata/md5-cache/dev-ruby/slim-3.0.9-r12
-rw-r--r--metadata/md5-cache/dev-ruby/sprockets-4.0.22
-rw-r--r--metadata/md5-cache/dev-ruby/stringex-2.8.52
-rw-r--r--metadata/md5-cache/dev-ruby/term-ansicolor-1.7.12
-rw-r--r--metadata/md5-cache/dev-ruby/test-unit-3.3.92
-rw-r--r--metadata/md5-cache/dev-ruby/test_construct-2.0.22
-rw-r--r--metadata/md5-cache/dev-ruby/timers-4.3.02
-rw-r--r--metadata/md5-cache/dev-ruby/timers-4.3.22
-rw-r--r--metadata/md5-cache/dev-ruby/timers-4.3.32
-rw-r--r--metadata/md5-cache/dev-ruby/tty-prompt-0.23.12
-rw-r--r--metadata/md5-cache/dev-ruby/tzinfo-1.2.52
-rw-r--r--metadata/md5-cache/dev-ruby/vcard-0.2.162
-rw-r--r--metadata/md5-cache/dev-ruby/vcr-4.0.02
-rw-r--r--metadata/md5-cache/dev-ruby/websocket-1.2.82
-rw-r--r--metadata/md5-cache/dev-ruby/zeitwerk-2.3.12
-rw-r--r--metadata/md5-cache/dev-ruby/zentest-4.12.02
-rw-r--r--metadata/md5-cache/dev-scheme/chicken-4.13.0-r11
-rw-r--r--metadata/md5-cache/dev-scheme/slib-3.2.5-r11
-rw-r--r--metadata/md5-cache/dev-tcltk/tklib-0.6-r11
-rw-r--r--metadata/md5-cache/dev-tcltk/tklib-0.6-r21
-rw-r--r--metadata/md5-cache/dev-tcltk/tkpiechart-6.5-r21
-rw-r--r--metadata/md5-cache/dev-tcltk/vtcl-1.6.1_alpha11
-rw-r--r--metadata/md5-cache/dev-tex/abntex-0.9_beta2-r11
-rw-r--r--metadata/md5-cache/dev-tex/biblatex-3.141
-rw-r--r--metadata/md5-cache/dev-tex/biblatex-gost-1.171
-rw-r--r--metadata/md5-cache/dev-tex/culmus-latex-0.7-r11
-rw-r--r--metadata/md5-cache/dev-tex/dvi2gr-0.4-r13
-rw-r--r--metadata/md5-cache/dev-tex/frakturx-20070103-r11
-rw-r--r--metadata/md5-cache/dev-tex/hyphen_show-20000425-r13
-rw-r--r--metadata/md5-cache/dev-tex/ivritex-1.1.21
-rw-r--r--metadata/md5-cache/dev-tex/latex-calendar-3.11
-rw-r--r--metadata/md5-cache/dev-tex/latex2rtf-2.3.113
-rw-r--r--metadata/md5-cache/dev-tex/lgrind-3.67-r33
-rw-r--r--metadata/md5-cache/dev-tex/pscyr-0.4d_beta91
-rw-r--r--metadata/md5-cache/dev-tex/rail-1.2_p1-r13
-rw-r--r--metadata/md5-cache/dev-tex/tth-4.083
-rw-r--r--metadata/md5-cache/dev-tex/vc-0.61
-rw-r--r--metadata/md5-cache/dev-util/bdelta-0.3.1-r13
-rw-r--r--metadata/md5-cache/dev-util/bloaty-0_p201704203
-rw-r--r--metadata/md5-cache/dev-util/btyacc-3.0-r33
-rw-r--r--metadata/md5-cache/dev-util/build-0.3.101
-rw-r--r--metadata/md5-cache/dev-util/build2-0.13.03
-rw-r--r--metadata/md5-cache/dev-util/clair-2.1.31
-rw-r--r--metadata/md5-cache/dev-util/clair-2.1.41
-rw-r--r--metadata/md5-cache/dev-util/crash-7.2.93
-rw-r--r--metadata/md5-cache/dev-util/csup-20060318-r13
-rw-r--r--metadata/md5-cache/dev-util/cutils-1.6-r43
-rw-r--r--metadata/md5-cache/dev-util/dissembler-0.9-r13
-rw-r--r--metadata/md5-cache/dev-util/drone-cli-1.2.11
-rw-r--r--metadata/md5-cache/dev-util/duma-2.5.15-r23
-rw-r--r--metadata/md5-cache/dev-util/dwdiff-2.1.33
-rw-r--r--metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r23
-rw-r--r--metadata/md5-cache/dev-util/fuzz-0.6-r13
-rw-r--r--metadata/md5-cache/dev-util/geany-plugins-1.37-r1013
-rw-r--r--metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.01
-rw-r--r--metadata/md5-cache/dev-util/huc-0.1-r13
-rw-r--r--metadata/md5-cache/dev-util/jfrog-cli-1.35.31
-rw-r--r--metadata/md5-cache/dev-util/kubebuilder-2.3.11
-rw-r--r--metadata/md5-cache/dev-util/leaktracer-2.4-r33
-rw-r--r--metadata/md5-cache/dev-util/lockrun-20120508-r13
-rw-r--r--metadata/md5-cache/dev-util/makeheaders-0_p43
-rw-r--r--metadata/md5-cache/dev-util/mdds-99992
-rw-r--r--metadata/md5-cache/dev-util/peg-0.1.183
-rw-r--r--metadata/md5-cache/dev-util/plan9port-0_pre202005263
-rw-r--r--metadata/md5-cache/dev-util/premake-3.71
-rw-r--r--metadata/md5-cache/dev-util/premake-4.4_beta51
-rw-r--r--metadata/md5-cache/dev-util/premake-5.0.0_alpha121
-rw-r--r--metadata/md5-cache/dev-util/pretrace-0.4-r21
-rw-r--r--metadata/md5-cache/dev-util/promu-0.5.01
-rw-r--r--metadata/md5-cache/dev-util/promu-0.7.01
-rw-r--r--metadata/md5-cache/dev-util/pscan-20000721-r13
-rw-r--r--metadata/md5-cache/dev-util/qbs-1.16.03
-rw-r--r--metadata/md5-cache/dev-util/qbs-1.18.03
-rw-r--r--metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r23
-rw-r--r--metadata/md5-cache/dev-util/qstlink2-1.2.33
-rw-r--r--metadata/md5-cache/dev-util/sasm-3.10.13
-rw-r--r--metadata/md5-cache/dev-util/shards-0.14.13
-rw-r--r--metadata/md5-cache/dev-util/stubgen-2.083
-rw-r--r--metadata/md5-cache/dev-util/tinlink-1.0.0-r13
-rw-r--r--metadata/md5-cache/dev-util/trinity-1.93
-rw-r--r--metadata/md5-cache/dev-util/usb-robot-0.2.03
-rw-r--r--metadata/md5-cache/dev-util/vmtouch-1.3.03
-rw-r--r--metadata/md5-cache/dev-util/vmtouch-1.3.13
-rw-r--r--metadata/md5-cache/dev-util/vtable-dumper-1.23
-rw-r--r--metadata/md5-cache/dev-util/xmlindent-0.2.17-r23
-rw-r--r--metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r13
-rw-r--r--metadata/md5-cache/dev-vcs/colorcvs-1.4-r21
-rw-r--r--metadata/md5-cache/dev-vcs/cvsync-2014.08.24.0147063
-rw-r--r--metadata/md5-cache/dev-vcs/fossil-2.12.13
-rw-r--r--metadata/md5-cache/dev-vcs/fossil-2.133
-rw-r--r--metadata/md5-cache/dev-vcs/fossil-2.143
-rw-r--r--metadata/md5-cache/dev-vcs/git-lfs-2.11.01
-rw-r--r--metadata/md5-cache/dev-vcs/rcsi-0.53
-rw-r--r--metadata/md5-cache/dev-vcs/svn2git-1.0.163
-rw-r--r--metadata/md5-cache/dev-vcs/svn2git-1.0.173
-rw-r--r--metadata/md5-cache/dev-vcs/svn2git-1.0.183
-rw-r--r--metadata/md5-cache/dev-vcs/tkcvs-9.3.21
-rw-r--r--metadata/md5-cache/dev-vcs/vcsh-1.20151229.11
-rw-r--r--metadata/md5-cache/games-action/atanks-6.53
-rw-r--r--metadata/md5-cache/games-action/chickens-0.2.4-r11
-rw-r--r--metadata/md5-cache/games-action/formido-1.0.1-r23
-rw-r--r--metadata/md5-cache/games-action/gltron-0.70-r21
-rw-r--r--metadata/md5-cache/games-action/snipes-1.0.4-r13
-rw-r--r--metadata/md5-cache/games-action/transcend-0.3-r11
-rw-r--r--metadata/md5-cache/games-action/tuxkart-0.4.0-r23
-rw-r--r--metadata/md5-cache/games-arcade/abe-1.1-r13
-rw-r--r--metadata/md5-cache/games-arcade/alienwave-0.4.0-r13
-rw-r--r--metadata/md5-cache/games-arcade/amphetamine-0.8.10-r11
-rw-r--r--metadata/md5-cache/games-arcade/balloonchase-0.9.6-r13
-rw-r--r--metadata/md5-cache/games-arcade/circuslinux-1.0.3-r11
-rw-r--r--metadata/md5-cache/games-arcade/cob-0.9-r11
-rw-r--r--metadata/md5-cache/games-arcade/conveysdl-1.3-r13
-rw-r--r--metadata/md5-cache/games-arcade/defendguin-0.0.12-r11
-rw-r--r--metadata/md5-cache/games-arcade/digger-20140423-r11
-rw-r--r--metadata/md5-cache/games-arcade/excido-0.1.5c-r31
-rw-r--r--metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r21
-rw-r--r--metadata/md5-cache/games-arcade/komi-1.04-r11
-rw-r--r--metadata/md5-cache/games-arcade/late-0.1.0-r11
-rw-r--r--metadata/md5-cache/games-arcade/moleinvasion-0.4-r23
-rw-r--r--metadata/md5-cache/games-arcade/netris-0.52-r33
-rw-r--r--metadata/md5-cache/games-arcade/nibbles-0.0.4-r13
-rw-r--r--metadata/md5-cache/games-arcade/openbubbles-1.2-r11
-rw-r--r--metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r23
-rw-r--r--metadata/md5-cache/games-arcade/penguin-command-1.6.11-r11
-rw-r--r--metadata/md5-cache/games-arcade/sable-1.0-r11
-rw-r--r--metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r11
-rw-r--r--metadata/md5-cache/games-arcade/spacerider-0.13-r11
-rw-r--r--metadata/md5-cache/games-arcade/spout-1.3-r11
-rw-r--r--metadata/md5-cache/games-arcade/supertransball2-1.5-r11
-rw-r--r--metadata/md5-cache/games-arcade/syobon-1.0.1-r11
-rw-r--r--metadata/md5-cache/games-arcade/trailblazer-0.9-r13
-rw-r--r--metadata/md5-cache/games-arcade/tuxdash-0.8-r13
-rw-r--r--metadata/md5-cache/games-arcade/tuxpuck-0.8.2-r23
-rw-r--r--metadata/md5-cache/games-arcade/wop-0.4.3-r23
-rw-r--r--metadata/md5-cache/games-arcade/xbubble-0.5.8-r11
-rw-r--r--metadata/md5-cache/games-arcade/xrick-021212-r23
-rw-r--r--metadata/md5-cache/games-arcade/xsfcave-0.5-r11
-rw-r--r--metadata/md5-cache/games-arcade/xtux-20030306-r13
-rw-r--r--metadata/md5-cache/games-arcade/yarsrevenge-0.99-r11
-rw-r--r--metadata/md5-cache/games-board/camato-0.7.4-r11
-rw-r--r--metadata/md5-cache/games-board/fruit-2.1-r11
-rw-r--r--metadata/md5-cache/games-board/gnushogi-1.4.1-r11
-rw-r--r--metadata/md5-cache/games-board/gtkboard-0.11_pre0-r21
-rw-r--r--metadata/md5-cache/games-board/mah-jong-1.163
-rw-r--r--metadata/md5-cache/games-board/phalanx-22-r13
-rw-r--r--metadata/md5-cache/games-board/pokerth-1.1.23
-rw-r--r--metadata/md5-cache/games-board/simsu-1.3.93
-rw-r--r--metadata/md5-cache/games-board/stockfish-103
-rw-r--r--metadata/md5-cache/games-board/tetzle-2.1.33
-rw-r--r--metadata/md5-cache/games-emulation/desmume-0.9.11-r23
-rw-r--r--metadata/md5-cache/games-emulation/dosbox-0.74.32
-rw-r--r--metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r11
-rw-r--r--metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.93
-rw-r--r--metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r23
-rw-r--r--metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.93
-rw-r--r--metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.93
-rw-r--r--metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r23
-rw-r--r--metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r23
-rw-r--r--metadata/md5-cache/games-engines/dMagnetic-0.303
-rw-r--r--metadata/md5-cache/games-engines/frotz-2.523
-rw-r--r--metadata/md5-cache/games-engines/love-0.7.2-r1003
-rw-r--r--metadata/md5-cache/games-engines/love-0.8.0-r1003
-rw-r--r--metadata/md5-cache/games-engines/love-11.3-r1003
-rw-r--r--metadata/md5-cache/games-engines/qtads-3.0.03
-rw-r--r--metadata/md5-cache/games-engines/residualvm-0.3.1-r23
-rw-r--r--metadata/md5-cache/games-fps/redeclipse-1.6.0-r31
-rw-r--r--metadata/md5-cache/games-fps/redeclipse-2.0.0-r11
-rw-r--r--metadata/md5-cache/games-fps/worldofpadman-1.6-r11
-rw-r--r--metadata/md5-cache/games-fps/yamagi-quake2-7.451
-rw-r--r--metadata/md5-cache/games-kids/lletters-0.1.95-r41
-rw-r--r--metadata/md5-cache/games-misc/c++robots-0-r13
-rw-r--r--metadata/md5-cache/games-misc/gtklife-5.23
-rw-r--r--metadata/md5-cache/games-misc/sdljoytest-111020033
-rw-r--r--metadata/md5-cache/games-misc/wtf-202101301
-rw-r--r--metadata/md5-cache/games-puzzle/anagramarama-0.2-r13
-rw-r--r--metadata/md5-cache/games-puzzle/biniax2-1.30-r11
-rw-r--r--metadata/md5-cache/games-puzzle/color-lines-0.6-r11
-rw-r--r--metadata/md5-cache/games-puzzle/colorcode-0.8.53
-rw-r--r--metadata/md5-cache/games-puzzle/concentration-1.2-r21
-rw-r--r--metadata/md5-cache/games-puzzle/connectagram-1.2.113
-rw-r--r--metadata/md5-cache/games-puzzle/cutemaze-1.2.63
-rw-r--r--metadata/md5-cache/games-puzzle/einstein-2.1.11
-rw-r--r--metadata/md5-cache/games-puzzle/fbg-0.9-r21
-rw-r--r--metadata/md5-cache/games-puzzle/flobopuyo-0.20-r23
-rw-r--r--metadata/md5-cache/games-puzzle/freesweep-1.0.13
-rw-r--r--metadata/md5-cache/games-puzzle/galaxis-1.8-r13
-rw-r--r--metadata/md5-cache/games-puzzle/gemdropx-0.9-r21
-rw-r--r--metadata/md5-cache/games-puzzle/gottet-1.1.93
-rw-r--r--metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r21
-rw-r--r--metadata/md5-cache/games-puzzle/hangman-0.9.2-r11
-rw-r--r--metadata/md5-cache/games-puzzle/hexalate-1.1.63
-rw-r--r--metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r11
-rw-r--r--metadata/md5-cache/games-puzzle/lightsoff-40.0.12
-rw-r--r--metadata/md5-cache/games-puzzle/lpairs-1.0.4-r11
-rw-r--r--metadata/md5-cache/games-puzzle/magiccube4d-2.2-r11
-rw-r--r--metadata/md5-cache/games-puzzle/mindless-1.6-r11
-rw-r--r--metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r23
-rw-r--r--metadata/md5-cache/games-puzzle/penguzzle-1.0-r21
-rw-r--r--metadata/md5-cache/games-puzzle/quadra-1.2.0-r11
-rw-r--r--metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r23
-rw-r--r--metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r11
-rw-r--r--metadata/md5-cache/games-puzzle/tanglet-1.5.33
-rw-r--r--metadata/md5-cache/games-puzzle/tint-0.03b-r13
-rw-r--r--metadata/md5-cache/games-puzzle/tod-0-r21
-rw-r--r--metadata/md5-cache/games-puzzle/tong-1.2-r11
-rw-r--r--metadata/md5-cache/games-puzzle/torrent-0.8.2-r11
-rw-r--r--metadata/md5-cache/games-puzzle/twindistress-1.1.03
-rw-r--r--metadata/md5-cache/games-puzzle/wizznic-369-r11
-rw-r--r--metadata/md5-cache/games-puzzle/xpired-1.22-r11
-rw-r--r--metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.123
-rw-r--r--metadata/md5-cache/games-roguelike/tomenet-4.7.33
-rw-r--r--metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r13
-rw-r--r--metadata/md5-cache/games-rpg/deponia-doomsday-1.2.02671
-rw-r--r--metadata/md5-cache/games-rpg/deponia-tcj-3.3.01561
-rw-r--r--metadata/md5-cache/games-rpg/eternal-lands-1.9.5.83
-rw-r--r--metadata/md5-cache/games-rpg/hatoful-boyfriend-0-r11
-rw-r--r--metadata/md5-cache/games-server/steamcmd-1.0-r31
-rw-r--r--metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r11
-rw-r--r--metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r13
-rw-r--r--metadata/md5-cache/games-sports/bygfoot-2.3.2-r11
-rw-r--r--metadata/md5-cache/games-strategy/crimson-0.5.3-r11
-rw-r--r--metadata/md5-cache/games-strategy/dunelegacy-0.96.43
-rw-r--r--metadata/md5-cache/games-strategy/lgeneral-1.4.33
-rw-r--r--metadata/md5-cache/games-strategy/netherearth-0.52-r11
-rw-r--r--metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p13
-rw-r--r--metadata/md5-cache/games-strategy/uqm-0.7.0.13
-rw-r--r--metadata/md5-cache/games-strategy/wesnoth-1.14.142
-rw-r--r--metadata/md5-cache/games-util/eureka-1.27b3
-rw-r--r--metadata/md5-cache/games-util/fteqcc-25013
-rw-r--r--metadata/md5-cache/games-util/grfcodec-6.0.63
-rw-r--r--metadata/md5-cache/games-util/linux-wbfs-manager-0.1.123
-rw-r--r--metadata/md5-cache/games-util/mcrcon-0.7.13
-rw-r--r--metadata/md5-cache/games-util/wit-3.02a3
-rw-r--r--metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.21
-rw-r--r--metadata/md5-cache/gnome-extra/cinnamon-translations-4.8.31
-rw-r--r--metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r13
-rw-r--r--metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-283
-rw-r--r--metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-202007133
-rw-r--r--metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-202012113
-rw-r--r--metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-403
-rw-r--r--metadata/md5-cache/gnome-extra/pch-session-3.36.33
-rw-r--r--metadata/md5-cache/gnustep-apps/gemas-0.42
-rw-r--r--metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r12
-rw-r--r--metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r13
-rw-r--r--metadata/md5-cache/lxde-base/lxpanel-0.10.13
-rw-r--r--metadata/md5-cache/mail-client/aerc-0.5.21
-rw-r--r--metadata/md5-cache/mail-client/bower-0.121
-rw-r--r--metadata/md5-cache/mail-client/mailx-8.1.2.201808073
-rw-r--r--metadata/md5-cache/mail-filter/bmf-0.9.4-r33
-rw-r--r--metadata/md5-cache/mail-filter/libmilter-1.0.21
-rw-r--r--metadata/md5-cache/mail-filter/libmilter-1.0.2_p11
-rw-r--r--metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r13
-rw-r--r--metadata/md5-cache/mail-filter/milter-regex-2.73
-rw-r--r--metadata/md5-cache/mail-filter/normalizemime-1.193
-rw-r--r--metadata/md5-cache/mail-mta/msmtp-1.8.121
-rw-r--r--metadata/md5-cache/mail-mta/msmtp-1.8.141
-rw-r--r--metadata/md5-cache/mail-mta/msmtp-1.8.151
-rw-r--r--metadata/md5-cache/mate-base/mate-1.241
-rw-r--r--metadata/md5-cache/mate-base/mate-applets-meta-1.24.01
-rw-r--r--metadata/md5-cache/media-gfx/aaphoto-0.453
-rw-r--r--metadata/md5-cache/media-gfx/apng2gif-1.83
-rw-r--r--metadata/md5-cache/media-gfx/apngdis-2.93
-rw-r--r--metadata/md5-cache/media-gfx/apngopt-1.43
-rw-r--r--metadata/md5-cache/media-gfx/cellwriter-1.3.63
-rw-r--r--metadata/md5-cache/media-gfx/clockphoto-1.23
-rw-r--r--metadata/md5-cache/media-gfx/crwinfo-0.23
-rw-r--r--metadata/md5-cache/media-gfx/dawn-3.90b-r13
-rw-r--r--metadata/md5-cache/media-gfx/duhdraw-2.8.13-r13
-rw-r--r--metadata/md5-cache/media-gfx/ephoto-1.53
-rw-r--r--metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r13
-rw-r--r--metadata/md5-cache/media-gfx/farbfeld-43
-rw-r--r--metadata/md5-cache/media-gfx/fbgrab-1.33
-rw-r--r--metadata/md5-cache/media-gfx/fbgrab-1.3.33
-rw-r--r--metadata/md5-cache/media-gfx/fbida-2.14-r23
-rw-r--r--metadata/md5-cache/media-gfx/feh-3.63
-rw-r--r--metadata/md5-cache/media-gfx/feh-3.6.13
-rw-r--r--metadata/md5-cache/media-gfx/feh-3.6.23
-rw-r--r--metadata/md5-cache/media-gfx/figurine-1.0.5-r13
-rw-r--r--metadata/md5-cache/media-gfx/fotowall-1.03
-rw-r--r--metadata/md5-cache/media-gfx/gif2apng-1.9-r13
-rw-r--r--metadata/md5-cache/media-gfx/gif2png-2.5.143
-rw-r--r--metadata/md5-cache/media-gfx/grub-splashes-200911091
-rw-r--r--metadata/md5-cache/media-gfx/hp2xx-3.4.4-r13
-rw-r--r--metadata/md5-cache/media-gfx/iscan-data-1.39.0.13
-rw-r--r--metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r13
-rw-r--r--metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.23
-rw-r--r--metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r33
-rw-r--r--metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.13
-rw-r--r--metadata/md5-cache/media-gfx/jpeg2ps-1.9-r23
-rw-r--r--metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r13
-rw-r--r--metadata/md5-cache/media-gfx/jpegtoavi-1.53
-rw-r--r--metadata/md5-cache/media-gfx/libimagequant-2.12.33
-rw-r--r--metadata/md5-cache/media-gfx/mandelbulber-2.12-r13
-rw-r--r--metadata/md5-cache/media-gfx/metapixel-1.0.2-r13
-rw-r--r--metadata/md5-cache/media-gfx/monica-3.73
-rw-r--r--metadata/md5-cache/media-gfx/opencsg-1.4.2-r13
-rw-r--r--metadata/md5-cache/media-gfx/optipng-0.7.7-r13
-rw-r--r--metadata/md5-cache/media-gfx/panini-0.73.03
-rw-r--r--metadata/md5-cache/media-gfx/pencil-0.6.53
-rw-r--r--metadata/md5-cache/media-gfx/phototonic-2.13
-rw-r--r--metadata/md5-cache/media-gfx/pngcheck-3.0.23
-rw-r--r--metadata/md5-cache/media-gfx/pngquant-2.12.33
-rw-r--r--metadata/md5-cache/media-gfx/pngquant-2.12.63
-rw-r--r--metadata/md5-cache/media-gfx/pngrewrite-1.4.03
-rw-r--r--metadata/md5-cache/media-gfx/pngtoico-1.0.1-r13
-rw-r--r--metadata/md5-cache/media-gfx/potrace-1.153
-rw-r--r--metadata/md5-cache/media-gfx/potrace-1.163
-rw-r--r--metadata/md5-cache/media-gfx/qiv-2.3.2-r13
-rw-r--r--metadata/md5-cache/media-gfx/qvv-4.04.23
-rw-r--r--metadata/md5-cache/media-gfx/ristretto-0.10.01
-rw-r--r--metadata/md5-cache/media-gfx/ttygif-1.80_p201812183
-rw-r--r--metadata/md5-cache/media-gfx/valentina-0.6.1-r13
-rw-r--r--metadata/md5-cache/media-gfx/w3mimgfb-0.9.13
-rw-r--r--metadata/md5-cache/media-gfx/wings-2.2.6.13
-rw-r--r--metadata/md5-cache/media-gfx/xfig-3.2.7b3
-rw-r--r--metadata/md5-cache/media-gfx/zgv-5.93
-rw-r--r--metadata/md5-cache/media-libs/ganv-1.8.02
-rw-r--r--metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.13
-rw-r--r--metadata/md5-cache/media-libs/icclib-2.143
-rw-r--r--metadata/md5-cache/media-libs/libdvd-audio-1.0.03
-rw-r--r--metadata/md5-cache/media-libs/libhdhomerun-201906213
-rw-r--r--metadata/md5-cache/media-libs/libhdhomerun-202005213
-rw-r--r--metadata/md5-cache/media-libs/libjsw-1.5.83
-rw-r--r--metadata/md5-cache/media-libs/liblrdf-0.6.12
-rw-r--r--metadata/md5-cache/media-libs/libmp4v2-2.0.0-r23
-rw-r--r--metadata/md5-cache/media-libs/libmtp-1.1.183
-rw-r--r--metadata/md5-cache/media-libs/libnjb-2.2.73
-rw-r--r--metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1003
-rw-r--r--metadata/md5-cache/media-libs/libtgvoip-2.4.4_p202103022
-rw-r--r--metadata/md5-cache/media-libs/lsp-plugins-1.1.243
-rw-r--r--metadata/md5-cache/media-libs/lsp-plugins-1.1.293
-rw-r--r--metadata/md5-cache/media-libs/netpbm-10.86.212
-rw-r--r--metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.02
-rw-r--r--metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.12
-rw-r--r--metadata/md5-cache/media-libs/nv-codec-headers-11.0.10.02
-rw-r--r--metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.22
-rw-r--r--metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.12
-rw-r--r--metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.12
-rw-r--r--metadata/md5-cache/media-libs/stimg-0.1.03
-rw-r--r--metadata/md5-cache/media-libs/vamp-plugin-sdk-2.102
-rw-r--r--metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.23
-rw-r--r--metadata/md5-cache/media-libs/zita-convolver-4.0.33
-rw-r--r--metadata/md5-cache/media-plugins/g2reverb-0.7.11
-rw-r--r--metadata/md5-cache/media-plugins/gst-plugins-sndio-1.8.0.13
-rw-r--r--metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r13
-rw-r--r--metadata/md5-cache/media-plugins/rev-plugins-0.7.11
-rw-r--r--metadata/md5-cache/media-plugins/swh-lv2-1.0.163
-rw-r--r--metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.201212041
-rw-r--r--metadata/md5-cache/media-plugins/vco-plugins-0.3.0-r11
-rw-r--r--metadata/md5-cache/media-plugins/vdr-ddci2-1.0.52
-rw-r--r--metadata/md5-cache/media-sound/abcm2ps-8.14.113
-rw-r--r--metadata/md5-cache/media-sound/alac_decoder-0.2.0-r13
-rw-r--r--metadata/md5-cache/media-sound/alsamixer-app-0.1-r13
-rw-r--r--metadata/md5-cache/media-sound/ario-1.61
-rw-r--r--metadata/md5-cache/media-sound/aucatctl-0.13
-rw-r--r--metadata/md5-cache/media-sound/aucdtect-0.8.2-r13
-rw-r--r--metadata/md5-cache/media-sound/audacious-3.10.1-r13
-rw-r--r--metadata/md5-cache/media-sound/audacious-4.0.53
-rw-r--r--metadata/md5-cache/media-sound/audiocompress-2.03
-rw-r--r--metadata/md5-cache/media-sound/aylet-0.53
-rw-r--r--metadata/md5-cache/media-sound/bempc-0.11_p201602073
-rw-r--r--metadata/md5-cache/media-sound/bplay-0.9913
-rw-r--r--metadata/md5-cache/media-sound/brutefir-1.0k-r23
-rw-r--r--metadata/md5-cache/media-sound/cd-discid-1.43
-rw-r--r--metadata/md5-cache/media-sound/cdplay-1.03
-rw-r--r--metadata/md5-cache/media-sound/cmix-1.63
-rw-r--r--metadata/md5-cache/media-sound/combine_wave-0.3.1-r13
-rw-r--r--metadata/md5-cache/media-sound/coquillo-2.0.13
-rw-r--r--metadata/md5-cache/media-sound/dcd-0.953
-rw-r--r--metadata/md5-cache/media-sound/declick-0.6.5-r13
-rw-r--r--metadata/md5-cache/media-sound/dvda-author-10.06-r13
-rw-r--r--metadata/md5-cache/media-sound/erec-2.2.0.1-r13
-rw-r--r--metadata/md5-cache/media-sound/flac-image-1.003
-rw-r--r--metadata/md5-cache/media-sound/flake-0.113
-rw-r--r--metadata/md5-cache/media-sound/fmdrv-1.0.73
-rw-r--r--metadata/md5-cache/media-sound/fmit-1.0.15-r33
-rw-r--r--metadata/md5-cache/media-sound/gbsplay-0.0.91-r23
-rw-r--r--metadata/md5-cache/media-sound/glurp-0.12.31
-rw-r--r--metadata/md5-cache/media-sound/gmtp-1.3.11-r13
-rw-r--r--metadata/md5-cache/media-sound/gnomad-2.9.63
-rw-r--r--metadata/md5-cache/media-sound/gramofile-1.6_p93
-rw-r--r--metadata/md5-cache/media-sound/gtick-0.5.51
-rw-r--r--metadata/md5-cache/media-sound/gtkguitune-0.83
-rw-r--r--metadata/md5-cache/media-sound/helm-0.9.0-r13
-rw-r--r--metadata/md5-cache/media-sound/id3-0.15-r13
-rw-r--r--metadata/md5-cache/media-sound/id3ed-1.10.4-r13
-rw-r--r--metadata/md5-cache/media-sound/id3ted-1.03
-rw-r--r--metadata/md5-cache/media-sound/id3v2-0.1.12-r13
-rw-r--r--metadata/md5-cache/media-sound/litestream-1.3_rc33
-rw-r--r--metadata/md5-cache/media-sound/mcdp-0.4b3
-rw-r--r--metadata/md5-cache/media-sound/mhwaveedit-1.4.243
-rw-r--r--metadata/md5-cache/media-sound/mmix-0.3-r13
-rw-r--r--metadata/md5-cache/media-sound/mp3cat-0.53
-rw-r--r--metadata/md5-cache/media-sound/mp3diags-1.5.013
-rw-r--r--metadata/md5-cache/media-sound/mp3gain-1.6.23
-rw-r--r--metadata/md5-cache/media-sound/mpdas-0.4.23
-rw-r--r--metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.03
-rw-r--r--metadata/md5-cache/media-sound/mup-6.63
-rw-r--r--metadata/md5-cache/media-sound/musique-1.5-r13
-rw-r--r--metadata/md5-cache/media-sound/poc-0.4.13
-rw-r--r--metadata/md5-cache/media-sound/potamus-173
-rw-r--r--metadata/md5-cache/media-sound/ptabtools-0.5.03
-rw-r--r--metadata/md5-cache/media-sound/qmidiarp-0.6.53
-rw-r--r--metadata/md5-cache/media-sound/qtgain-1.0.03
-rw-r--r--metadata/md5-cache/media-sound/qtscrobbler-0.11_pre201301233
-rw-r--r--metadata/md5-cache/media-sound/quimup-1.4.43
-rw-r--r--metadata/md5-cache/media-sound/rcenter-0.6.23
-rw-r--r--metadata/md5-cache/media-sound/redoflacs-0.301
-rw-r--r--metadata/md5-cache/media-sound/rexima-1.4-r13
-rw-r--r--metadata/md5-cache/media-sound/ripperx-2.7.31
-rw-r--r--metadata/md5-cache/media-sound/setmixer-19941227_p13
-rw-r--r--metadata/md5-cache/media-sound/sexypsf-0.4.83
-rw-r--r--metadata/md5-cache/media-sound/shnflacverify-0.31
-rw-r--r--metadata/md5-cache/media-sound/smixer-1.0.43
-rw-r--r--metadata/md5-cache/media-sound/substract_wave-0.3-r13
-rw-r--r--metadata/md5-cache/media-sound/taginfo-1.2-r23
-rw-r--r--metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r23
-rw-r--r--metadata/md5-cache/media-sound/ttaenc-3.4.1-r13
-rw-r--r--metadata/md5-cache/media-sound/tudor-volumed-0_pre201104273
-rw-r--r--metadata/md5-cache/media-sound/vb2rip-1.43
-rw-r--r--metadata/md5-cache/media-sound/vkeybd-0.1.18d3
-rw-r--r--metadata/md5-cache/media-sound/vlevel-0.5-r13
-rw-r--r--metadata/md5-cache/media-sound/volwheel-0.2.8-r13
-rw-r--r--metadata/md5-cache/media-sound/wavegain-1.3.13
-rw-r--r--metadata/md5-cache/media-sound/wavsplit-1.2.1-r23
-rw-r--r--metadata/md5-cache/media-sound/xfmpc-0.3.01
-rw-r--r--metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r13
-rw-r--r--metadata/md5-cache/media-sound/xnoise-0.2.213
-rw-r--r--metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r13
-rw-r--r--metadata/md5-cache/media-tv/ivtv-utils-1.4.13
-rw-r--r--metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r13
-rw-r--r--metadata/md5-cache/media-tv/tvbrowser-bin-4.2.21
-rw-r--r--metadata/md5-cache/media-video/asfrecorder-1.1-r13
-rw-r--r--metadata/md5-cache/media-video/baka-mplayer-2.0.43
-rw-r--r--metadata/md5-cache/media-video/baka-mplayer-2.0.4-r13
-rw-r--r--metadata/md5-cache/media-video/blind-1.13
-rw-r--r--metadata/md5-cache/media-video/chaplin-1.10-r23
-rw-r--r--metadata/md5-cache/media-video/dvbackup-0.0.4-r23
-rw-r--r--metadata/md5-cache/media-video/flvstreamer-2.1c3
-rw-r--r--metadata/md5-cache/media-video/luvcview-0.2.6-r13
-rw-r--r--metadata/md5-cache/media-video/m2vrequantizer-0.0.2_pre20060306-r13
-rw-r--r--metadata/md5-cache/media-video/matroxset-0.43
-rw-r--r--metadata/md5-cache/media-video/mkclean-0.8.103
-rw-r--r--metadata/md5-cache/media-video/mkvalidator-0.5.23
-rw-r--r--metadata/md5-cache/media-video/nvidia_video_sdk-6.0.13
-rw-r--r--metadata/md5-cache/media-video/parole-4.16.01
-rw-r--r--metadata/md5-cache/media-video/pgmfindclip-1.133
-rw-r--r--metadata/md5-cache/media-video/rovclock-0.6e-r13
-rw-r--r--metadata/md5-cache/media-video/setpwc-1.33
-rw-r--r--metadata/md5-cache/media-video/shotcut-21.02.273
-rw-r--r--metadata/md5-cache/media-video/smplayer-20.6.03
-rw-r--r--metadata/md5-cache/media-video/submux-dvd-0.5.2-r13
-rw-r--r--metadata/md5-cache/media-video/subtitleripper-0.3.4-r43
-rw-r--r--metadata/md5-cache/media-video/ttcut-0.19.6_p1-r13
-rw-r--r--metadata/md5-cache/media-video/vamps-0.99.2-r23
-rw-r--r--metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r53
-rw-r--r--metadata/md5-cache/media-video/vobcopy-1.2.03
-rw-r--r--metadata/md5-cache/net-analyzer/arping-2.171
-rw-r--r--metadata/md5-cache/net-analyzer/arpoison-0.73
-rw-r--r--metadata/md5-cache/net-analyzer/bing-1.1.3-r23
-rw-r--r--metadata/md5-cache/net-analyzer/braa-0.82-r13
-rw-r--r--metadata/md5-cache/net-analyzer/ethloop-10-r43
-rw-r--r--metadata/md5-cache/net-analyzer/fping-5.01
-rw-r--r--metadata/md5-cache/net-analyzer/gensink-4.1-r23
-rw-r--r--metadata/md5-cache/net-analyzer/hexinject-1.6-r13
-rw-r--r--metadata/md5-cache/net-analyzer/hping-3_pre201412263
-rw-r--r--metadata/md5-cache/net-analyzer/ipband-0.8.1-r23
-rw-r--r--metadata/md5-cache/net-analyzer/ippl-1.4.14-r63
-rw-r--r--metadata/md5-cache/net-analyzer/iptstate-2.2.63
-rw-r--r--metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p202004123
-rw-r--r--metadata/md5-cache/net-analyzer/isic-0.07-r13
-rw-r--r--metadata/md5-cache/net-analyzer/knocker-0.7.1-r33
-rw-r--r--metadata/md5-cache/net-analyzer/masscan-1.3.23
-rw-r--r--metadata/md5-cache/net-analyzer/multipath-tcp-tools-2018_p12_p213
-rw-r--r--metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.43
-rw-r--r--metadata/md5-cache/net-analyzer/nagios-core-4.4.63
-rw-r--r--metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r12
-rw-r--r--metadata/md5-cache/net-analyzer/nagstamon-3.6.02
-rw-r--r--metadata/md5-cache/net-analyzer/netio-1.333
-rw-r--r--metadata/md5-cache/net-analyzer/netpipe-3.7.23
-rw-r--r--metadata/md5-cache/net-analyzer/odhcploc-20111021-r13
-rw-r--r--metadata/md5-cache/net-analyzer/opsgenie-lamp-2.5.1_p201811021
-rw-r--r--metadata/md5-cache/net-analyzer/ostinato-1.13
-rw-r--r--metadata/md5-cache/net-analyzer/p0f-3.09_beta3
-rw-r--r--metadata/md5-cache/net-analyzer/pathload-1.3.2-r13
-rw-r--r--metadata/md5-cache/net-analyzer/poink-2.033
-rw-r--r--metadata/md5-cache/net-analyzer/siphon-666-r23
-rw-r--r--metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r11
-rw-r--r--metadata/md5-cache/net-analyzer/tcping-1.3.63
-rw-r--r--metadata/md5-cache/net-analyzer/tcpreen-1.4.43
-rw-r--r--metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p13
-rw-r--r--metadata/md5-cache/net-analyzer/ttcp-1.12-r23
-rw-r--r--metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r23
-rw-r--r--metadata/md5-cache/net-analyzer/xprobe-0.3-r13
-rw-r--r--metadata/md5-cache/net-analyzer/zniper-1.0-r13
-rw-r--r--metadata/md5-cache/net-dialup/dwun-0.96e-r43
-rw-r--r--metadata/md5-cache/net-dialup/kpnadsl4linux-1.113
-rw-r--r--metadata/md5-cache/net-dialup/neocon-201102283
-rw-r--r--metadata/md5-cache/net-dialup/picocom-3.13
-rw-r--r--metadata/md5-cache/net-dialup/pptpclient-1.10.03
-rw-r--r--metadata/md5-cache/net-dialup/rp-l2tp-0.4-r43
-rw-r--r--metadata/md5-cache/net-dialup/wvdial-1.611
-rw-r--r--metadata/md5-cache/net-dns/coredns-1.6.91
-rw-r--r--metadata/md5-cache/net-dns/dnshijacker-1.3-r23
-rw-r--r--metadata/md5-cache/net-dns/dnssec-check-2.23
-rw-r--r--metadata/md5-cache/net-dns/mdns-repeater-1.113
-rw-r--r--metadata/md5-cache/net-dns/ndu-0.4-r43
-rw-r--r--metadata/md5-cache/net-dns/odsclient-1.03-r13
-rw-r--r--metadata/md5-cache/net-dns/rbldnsd-0.998b-r23
-rw-r--r--metadata/md5-cache/net-dns/s6-dns-2.2.0.11
-rw-r--r--metadata/md5-cache/net-dns/s6-dns-2.3.0.01
-rw-r--r--metadata/md5-cache/net-fs/mc-2021.03.06.22.16.441
-rw-r--r--metadata/md5-cache/net-fs/mc-2021.03.12.03.36.591
-rw-r--r--metadata/md5-cache/net-fs/smbnetfs-0.6.31
-rw-r--r--metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r33
-rw-r--r--metadata/md5-cache/net-ftp/pureadmin-0.4-r23
-rw-r--r--metadata/md5-cache/net-im/dianara-1.4.23
-rw-r--r--metadata/md5-cache/net-im/libcommuni-3.6.03
-rw-r--r--metadata/md5-cache/net-im/mcabber-1.1.21
-rw-r--r--metadata/md5-cache/net-im/psi-1.53
-rw-r--r--metadata/md5-cache/net-im/ricochet-1.1.43
-rw-r--r--metadata/md5-cache/net-irc/dccserver-0.5-r13
-rw-r--r--metadata/md5-cache/net-irc/eggdrop-1.8.4-r11
-rw-r--r--metadata/md5-cache/net-irc/emech-3.0.99_p33
-rw-r--r--metadata/md5-cache/net-irc/inspircd-3.8.13
-rw-r--r--metadata/md5-cache/net-irc/ircstats-1.23
-rw-r--r--metadata/md5-cache/net-irc/irssi-xmpp-0.543
-rw-r--r--metadata/md5-cache/net-irc/irssistats-0.75-r13
-rw-r--r--metadata/md5-cache/net-irc/rhapsody-0.28b3
-rw-r--r--metadata/md5-cache/net-irc/scrollz-2.33
-rw-r--r--metadata/md5-cache/net-irc/sic-1.2-r13
-rw-r--r--metadata/md5-cache/net-libs/accounts-qml-0.7-r13
-rw-r--r--metadata/md5-cache/net-libs/accounts-qt-1.163
-rw-r--r--metadata/md5-cache/net-libs/canlock-2b3
-rw-r--r--metadata/md5-cache/net-libs/cvm-0.973
-rw-r--r--metadata/md5-cache/net-libs/libbloom-1.5-r23
-rw-r--r--metadata/md5-cache/net-libs/libbloom-1.63
-rw-r--r--metadata/md5-cache/net-libs/libnatpmp-201506093
-rw-r--r--metadata/md5-cache/net-libs/libpri-1.6.03
-rw-r--r--metadata/md5-cache/net-libs/netwib-5.39.03
-rw-r--r--metadata/md5-cache/net-libs/signon-oauth2-0.253
-rw-r--r--metadata/md5-cache/net-libs/signon-ui-0.15_p20171022-r13
-rw-r--r--metadata/md5-cache/net-libs/signond-8.60-r23
-rw-r--r--metadata/md5-cache/net-libs/udns-0.43
-rw-r--r--metadata/md5-cache/net-mail/altermime-0.3.113
-rw-r--r--metadata/md5-cache/net-mail/eps-1.7-r13
-rw-r--r--metadata/md5-cache/net-mail/mailfront-2.223
-rw-r--r--metadata/md5-cache/net-mail/mairix-0.243
-rw-r--r--metadata/md5-cache/net-mail/mess822-0.58-r23
-rw-r--r--metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r33
-rw-r--r--metadata/md5-cache/net-mail/qmail-autoresponder-2.03
-rw-r--r--metadata/md5-cache/net-mail/qmail-notify-0.93-r23
-rw-r--r--metadata/md5-cache/net-mail/qtools-0.563
-rw-r--r--metadata/md5-cache/net-mail/ripmime-1.4.0.10-r13
-rw-r--r--metadata/md5-cache/net-mail/ripole-0.2.23
-rw-r--r--metadata/md5-cache/net-mail/safecat-1.133
-rw-r--r--metadata/md5-cache/net-mail/serialmail-0.75-r53
-rw-r--r--metadata/md5-cache/net-misc/aget-0.4.1-r23
-rw-r--r--metadata/md5-cache/net-misc/aggregate-1.63
-rw-r--r--metadata/md5-cache/net-misc/astmanproxy-1.28.23
-rw-r--r--metadata/md5-cache/net-misc/balance-3.573
-rw-r--r--metadata/md5-cache/net-misc/cmst-2020.11.013
-rw-r--r--metadata/md5-cache/net-misc/datapipe-1.0-r23
-rw-r--r--metadata/md5-cache/net-misc/efax-0.9a_p19_p13
-rw-r--r--metadata/md5-cache/net-misc/ethercard-diag-20050321.1g-r13
-rw-r--r--metadata/md5-cache/net-misc/fakeidentd-2.6-r13
-rw-r--r--metadata/md5-cache/net-misc/getdate-1.2-r23
-rw-r--r--metadata/md5-cache/net-misc/gwhois-20120626-r11
-rw-r--r--metadata/md5-cache/net-misc/hashcash-1.22-r23
-rw-r--r--metadata/md5-cache/net-misc/kafkacat-1.5.03
-rw-r--r--metadata/md5-cache/net-misc/minissdpd-1.5.202009283
-rw-r--r--metadata/md5-cache/net-misc/miniupnpd-2.2.03
-rw-r--r--metadata/md5-cache/net-misc/miniupnpd-2.2.13
-rw-r--r--metadata/md5-cache/net-misc/ncp-1.2.4-r23
-rw-r--r--metadata/md5-cache/net-misc/netevent-2.0_p202002173
-rw-r--r--metadata/md5-cache/net-misc/netkit-bootpd-2.4-r13
-rw-r--r--metadata/md5-cache/net-misc/netkit-telnetd-0.17-r123
-rw-r--r--metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r23
-rw-r--r--metadata/md5-cache/net-misc/netpipes-4.2-r23
-rw-r--r--metadata/md5-cache/net-misc/nicstat-1.953
-rw-r--r--metadata/md5-cache/net-misc/pimpd-0.8-r13
-rw-r--r--metadata/md5-cache/net-misc/pps-tools-1.0.23
-rw-r--r--metadata/md5-cache/net-misc/proxychains-4.143
-rw-r--r--metadata/md5-cache/net-misc/rinetd-0.62-r23
-rw-r--r--metadata/md5-cache/net-misc/s6-networking-2.3.0.21
-rw-r--r--metadata/md5-cache/net-misc/snarf-7.0-r43
-rw-r--r--metadata/md5-cache/net-misc/ssh-chain-201312171
-rw-r--r--metadata/md5-cache/net-misc/taptap-1.03
-rw-r--r--metadata/md5-cache/net-misc/tcpsound-0.3.1-r13
-rw-r--r--metadata/md5-cache/net-misc/ttytter-2.1.001
-rw-r--r--metadata/md5-cache/net-misc/ubridge-0.9.183
-rw-r--r--metadata/md5-cache/net-misc/uftp-4.10.13
-rw-r--r--metadata/md5-cache/net-misc/uftp-5.03
-rw-r--r--metadata/md5-cache/net-misc/utelnetd-0.1.11-r23
-rw-r--r--metadata/md5-cache/net-misc/vncsnapshot-1.2a3
-rw-r--r--metadata/md5-cache/net-misc/whatmask-1.2-r13
-rw-r--r--metadata/md5-cache/net-misc/wol-0.7.1-r23
-rw-r--r--metadata/md5-cache/net-misc/x2goclient-4.1.2.23
-rw-r--r--metadata/md5-cache/net-p2p/ncdc-1.22.13
-rw-r--r--metadata/md5-cache/net-p2p/qbittorrent-4.3.11
-rw-r--r--metadata/md5-cache/net-p2p/qbittorrent-4.3.31
-rw-r--r--metadata/md5-cache/net-print/foomatic-db-4.0.201703311
-rw-r--r--metadata/md5-cache/net-print/foomatic-db-4.0.201801261
-rw-r--r--metadata/md5-cache/net-print/foomatic-db-4.0.201902261
-rw-r--r--metadata/md5-cache/net-print/hplip-3.20.11-r14
-rw-r--r--metadata/md5-cache/net-print/hplip-3.21.24
-rw-r--r--metadata/md5-cache/net-print/mtink-1.0.16-r23
-rw-r--r--metadata/md5-cache/net-print/poster-20060221-r33
-rw-r--r--metadata/md5-cache/net-proxy/3proxy-0.9.03
-rw-r--r--metadata/md5-cache/net-proxy/microsocks-1.0.23
-rw-r--r--metadata/md5-cache/net-proxy/pingtunnel-0.723
-rw-r--r--metadata/md5-cache/net-proxy/rejik-3.2.103
-rw-r--r--metadata/md5-cache/net-proxy/squirm-1.26-r13
-rw-r--r--metadata/md5-cache/net-wireless/airtraf-1.1-r43
-rw-r--r--metadata/md5-cache/net-wireless/b43-fwcutter-0193
-rw-r--r--metadata/md5-cache/net-wireless/gobi_loader-0.7-r21
-rw-r--r--metadata/md5-cache/net-wireless/horst-5.13
-rw-r--r--metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r13
-rw-r--r--metadata/md5-cache/net-wireless/iw-5.93
-rw-r--r--metadata/md5-cache/net-wireless/iwgtk-0.43
-rw-r--r--metadata/md5-cache/net-wireless/linssid-3.6-r13
-rw-r--r--metadata/md5-cache/net-wireless/rfkill-0.5-r23
-rw-r--r--metadata/md5-cache/net-wireless/rfkill-0.5-r33
-rw-r--r--metadata/md5-cache/net-wireless/rfkill-1.03
-rw-r--r--metadata/md5-cache/net-wireless/sigdigger-0.1.03
-rw-r--r--metadata/md5-cache/net-wireless/suwidgets-0.1.0-r13
-rw-r--r--metadata/md5-cache/sci-astronomy/sofa_c-201704203
-rw-r--r--metadata/md5-cache/sci-astronomy/xephem-3.7.7-r13
-rw-r--r--metadata/md5-cache/sci-biology/STAR-2.5.3a3
-rw-r--r--metadata/md5-cache/sci-biology/augustus-2.5.53
-rw-r--r--metadata/md5-cache/sci-biology/blat-34-r23
-rw-r--r--metadata/md5-cache/sci-biology/bowtie-2.2.93
-rw-r--r--metadata/md5-cache/sci-biology/bwa-0.7.173
-rw-r--r--metadata/md5-cache/sci-biology/clustalw-1.83-r43
-rw-r--r--metadata/md5-cache/sci-biology/clustalw-mpi-0.13-r33
-rw-r--r--metadata/md5-cache/sci-biology/clustalx-2.1-r33
-rw-r--r--metadata/md5-cache/sci-biology/dialign-tx-1.0.2-r23
-rw-r--r--metadata/md5-cache/sci-biology/elph-1.0.1-r13
-rw-r--r--metadata/md5-cache/sci-biology/fasta-36.3.5e2
-rw-r--r--metadata/md5-cache/sci-biology/finchtv-1.3.1-r31
-rw-r--r--metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r13
-rw-r--r--metadata/md5-cache/sci-biology/infernal-1.0.2-r13
-rw-r--r--metadata/md5-cache/sci-biology/kalign-2.03-r23
-rw-r--r--metadata/md5-cache/sci-biology/lagan-2.0-r43
-rw-r--r--metadata/md5-cache/sci-biology/muscle-3.8.313
-rw-r--r--metadata/md5-cache/sci-biology/njplot-2.3-r23
-rw-r--r--metadata/md5-cache/sci-biology/pals-1.0-r13
-rw-r--r--metadata/md5-cache/sci-biology/paml-4.9j3
-rw-r--r--metadata/md5-cache/sci-biology/phrap-1.080812-r23
-rw-r--r--metadata/md5-cache/sci-biology/phred-071220-r13
-rw-r--r--metadata/md5-cache/sci-biology/phyml-2.4.5-r33
-rw-r--r--metadata/md5-cache/sci-biology/piler-1.0-r13
-rw-r--r--metadata/md5-cache/sci-biology/pilercr-1.0-r13
-rw-r--r--metadata/md5-cache/sci-biology/poa-2-r13
-rw-r--r--metadata/md5-cache/sci-biology/prank-1406033
-rw-r--r--metadata/md5-cache/sci-biology/primer3-2.3.73
-rw-r--r--metadata/md5-cache/sci-biology/prodigal-2.6.33
-rw-r--r--metadata/md5-cache/sci-biology/qrna-2.0.3c-r33
-rw-r--r--metadata/md5-cache/sci-biology/recon-1.083
-rw-r--r--metadata/md5-cache/sci-biology/rnaview-20040713-r43
-rw-r--r--metadata/md5-cache/sci-biology/samtools-0.1.20-r42
-rw-r--r--metadata/md5-cache/sci-biology/seaview-4.6-r13
-rw-r--r--metadata/md5-cache/sci-biology/sim4-20030921-r23
-rw-r--r--metadata/md5-cache/sci-biology/t-coffee-11.00-r23
-rw-r--r--metadata/md5-cache/sci-biology/tree-puzzle-5.23
-rw-r--r--metadata/md5-cache/sci-biology/wgs-assembler-7.0-r23
-rw-r--r--metadata/md5-cache/sci-calculators/pcalc-43
-rw-r--r--metadata/md5-cache/sci-chemistry/dssp-2.2.1-r13
-rw-r--r--metadata/md5-cache/sci-chemistry/elem-1.0.3-r23
-rw-r--r--metadata/md5-cache/sci-chemistry/gperiodic-3.0.33
-rw-r--r--metadata/md5-cache/sci-chemistry/ksdssp-040728-r13
-rw-r--r--metadata/md5-cache/sci-chemistry/moldy-2.16e-r23
-rw-r--r--metadata/md5-cache/sci-chemistry/molmol-2k_p2-r53
-rw-r--r--metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r13
-rw-r--r--metadata/md5-cache/sci-chemistry/probe-2.13.1109093
-rw-r--r--metadata/md5-cache/sci-chemistry/suitename-0.3.0706283
-rw-r--r--metadata/md5-cache/sci-chemistry/surf-1.03
-rw-r--r--metadata/md5-cache/sci-chemistry/threeV-1.2-r13
-rw-r--r--metadata/md5-cache/sci-chemistry/xyza2pipe-201210013
-rw-r--r--metadata/md5-cache/sci-electronics/fasthenry-3.0.20.07.173
-rw-r--r--metadata/md5-cache/sci-electronics/fritzing-0.9.4-r23
-rw-r--r--metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre201101243
-rw-r--r--metadata/md5-cache/sci-electronics/gtkwave-3.3.1063
-rw-r--r--metadata/md5-cache/sci-electronics/librepcb-0.1.33
-rw-r--r--metadata/md5-cache/sci-electronics/magic-8.0.2072
-rw-r--r--metadata/md5-cache/sci-electronics/voacapl-0.7.63
-rw-r--r--metadata/md5-cache/sci-electronics/xnec2c-4.1.11
-rw-r--r--metadata/md5-cache/sci-geosciences/gpxsee-8.13
-rw-r--r--metadata/md5-cache/sci-geosciences/gshhs-1.133
-rw-r--r--metadata/md5-cache/sci-libs/amd-2.4.63
-rw-r--r--metadata/md5-cache/sci-libs/buddy-2.4-r13
-rw-r--r--metadata/md5-cache/sci-libs/cholmod-3.0.133
-rw-r--r--metadata/md5-cache/sci-libs/cholmod-3.0.143
-rw-r--r--metadata/md5-cache/sci-libs/cmpfit-1.2-r13
-rw-r--r--metadata/md5-cache/sci-libs/coinor-clp-1.17.63
-rw-r--r--metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r13
-rw-r--r--metadata/md5-cache/sci-libs/coinor-utils-2.11.43
-rw-r--r--metadata/md5-cache/sci-libs/dsdp-5.8-r33
-rw-r--r--metadata/md5-cache/sci-libs/galib-2.4.7-r13
-rw-r--r--metadata/md5-cache/sci-libs/htslib-1.10.23
-rw-r--r--metadata/md5-cache/sci-libs/jama-1.2.51
-rw-r--r--metadata/md5-cache/sci-libs/libexcelformat-1010163
-rw-r--r--metadata/md5-cache/sci-libs/libpdb++-040728-r13
-rw-r--r--metadata/md5-cache/sci-libs/lrslib-0713
-rw-r--r--metadata/md5-cache/sci-libs/nfft-3.5.23
-rw-r--r--metadata/md5-cache/sci-libs/openlibm-0.7.43
-rw-r--r--metadata/md5-cache/sci-libs/taucs-2.2-r13
-rw-r--r--metadata/md5-cache/sci-libs/umfpack-5.7.93
-rw-r--r--metadata/md5-cache/sci-libs/xgks-pmel-2.5.53
-rw-r--r--metadata/md5-cache/sci-mathematics/coq-8.11.21
-rw-r--r--metadata/md5-cache/sci-mathematics/frobby-0.9.0-r23
-rw-r--r--metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r23
-rw-r--r--metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r13
-rw-r--r--metadata/md5-cache/sci-mathematics/mathematica-12.1.03
-rw-r--r--metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r13
-rw-r--r--metadata/md5-cache/sci-mathematics/mathmod-4.1-r13
-rw-r--r--metadata/md5-cache/sci-mathematics/minisat-2.2.0_p20130925-r13
-rw-r--r--metadata/md5-cache/sci-mathematics/normaliz-3.1.33
-rw-r--r--metadata/md5-cache/sci-mathematics/rngstreams-1.0.11
-rw-r--r--metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p11
-rw-r--r--metadata/md5-cache/sci-mathematics/sympow-2.023.63
-rw-r--r--metadata/md5-cache/sci-mathematics/unuran-1.8.11
-rw-r--r--metadata/md5-cache/sci-misc/cdfplayer-12.2.03
-rw-r--r--metadata/md5-cache/sci-misc/fitsverify-4.183
-rw-r--r--metadata/md5-cache/sci-physics/geant-data-4.10.6.32
-rw-r--r--metadata/md5-cache/sci-physics/geant-data-4.10.72
-rw-r--r--metadata/md5-cache/sci-physics/looptools-2.153
-rw-r--r--metadata/md5-cache/sci-physics/pythia-8.2.26-r13
-rw-r--r--metadata/md5-cache/sci-visualization/fig2sxd-0.22.13
-rw-r--r--metadata/md5-cache/sci-visualization/grace-5.1.25_p73
-rw-r--r--metadata/md5-cache/sci-visualization/grace-5.1.25_p93
-rw-r--r--metadata/md5-cache/sci-visualization/xyscan-4.3.03
-rw-r--r--metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r13
-rw-r--r--metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-android-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-at-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-games-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-git-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-java-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-links-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r21
-rw-r--r--metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r21
-rw-r--r--metadata/md5-cache/sys-apps/baselayout-2.7-r13
-rw-r--r--metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r11
-rw-r--r--metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r31
-rw-r--r--metadata/md5-cache/sys-apps/checkpolicy-3.13
-rw-r--r--metadata/md5-cache/sys-apps/chname-1.13
-rw-r--r--metadata/md5-cache/sys-apps/cinit-0.2.13
-rw-r--r--metadata/md5-cache/sys-apps/cpuid-202010063
-rw-r--r--metadata/md5-cache/sys-apps/darwin-miscutils-113
-rw-r--r--metadata/md5-cache/sys-apps/darwin-miscutils-123
-rw-r--r--metadata/md5-cache/sys-apps/dchroot-0.12.13
-rw-r--r--metadata/md5-cache/sys-apps/dog-1.7-r63
-rw-r--r--metadata/md5-cache/sys-apps/edid-decode-0_pre202012303
-rw-r--r--metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r23
-rw-r--r--metadata/md5-cache/sys-apps/grepcidr-2.03
-rw-r--r--metadata/md5-cache/sys-apps/hexdump-esr-1.83
-rw-r--r--metadata/md5-cache/sys-apps/hotplug2stdout-1.2.13
-rw-r--r--metadata/md5-cache/sys-apps/idle3-tools-0.9.3_pre20120123-r13
-rw-r--r--metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.03
-rw-r--r--metadata/md5-cache/sys-apps/iotools-1.53
-rw-r--r--metadata/md5-cache/sys-apps/lcdutils-0.2-r13
-rw-r--r--metadata/md5-cache/sys-apps/lsadb-0.1.3-r13
-rw-r--r--metadata/md5-cache/sys-apps/mawk-1.3.4_p20200106-r13
-rw-r--r--metadata/md5-cache/sys-apps/mcstrans-3.13
-rw-r--r--metadata/md5-cache/sys-apps/memtest86-bin-9.0_p20001
-rw-r--r--metadata/md5-cache/sys-apps/minised-1.153
-rw-r--r--metadata/md5-cache/sys-apps/moreutils-0.653
-rw-r--r--metadata/md5-cache/sys-apps/nawk-201808273
-rw-r--r--metadata/md5-cache/sys-apps/netkit-base-0.17-r93
-rw-r--r--metadata/md5-cache/sys-apps/netplug-1.2.9.2-r33
-rw-r--r--metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r11
-rw-r--r--metadata/md5-cache/sys-apps/opentmpfiles-0.3.11
-rw-r--r--metadata/md5-cache/sys-apps/pcsc-tools-1.5.63
-rw-r--r--metadata/md5-cache/sys-apps/pcsc-tools-1.5.73
-rw-r--r--metadata/md5-cache/sys-apps/pmount-gui-0_pre201308063
-rw-r--r--metadata/md5-cache/sys-apps/pnputils-0.13
-rw-r--r--metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r43
-rw-r--r--metadata/md5-cache/sys-apps/progress-0.153
-rw-r--r--metadata/md5-cache/sys-apps/qcontrol-0.4.2-r1003
-rw-r--r--metadata/md5-cache/sys-apps/rename-1.3-r23
-rw-r--r--metadata/md5-cache/sys-apps/restartd-0.2.2-r13
-rw-r--r--metadata/md5-cache/sys-apps/rkflashtool-6.13
-rw-r--r--metadata/md5-cache/sys-apps/s6-2.6.1.11
-rw-r--r--metadata/md5-cache/sys-apps/s6-2.7.0.01
-rw-r--r--metadata/md5-cache/sys-apps/s6-2.7.1.11
-rw-r--r--metadata/md5-cache/sys-apps/s6-rc-0.3.0.01
-rw-r--r--metadata/md5-cache/sys-apps/s6-rc-0.4.0.01
-rw-r--r--metadata/md5-cache/sys-apps/s6-rc-0.4.0.11
-rw-r--r--metadata/md5-cache/sys-apps/salinfo-1.23
-rw-r--r--metadata/md5-cache/sys-apps/secilc-3.13
-rw-r--r--metadata/md5-cache/sys-apps/semodule-utils-3.13
-rw-r--r--metadata/md5-cache/sys-apps/superiotool-66373
-rw-r--r--metadata/md5-cache/sys-apps/syslog-notify-0.21
-rw-r--r--metadata/md5-cache/sys-apps/uam-0.3.2-r13
-rw-r--r--metadata/md5-cache/sys-apps/ucspi-unix-1.03
-rw-r--r--metadata/md5-cache/sys-apps/usbmon-6.13
-rw-r--r--metadata/md5-cache/sys-apps/usermode-utilities-20070815-r43
-rw-r--r--metadata/md5-cache/sys-auth/docker_auth-1.5.01
-rw-r--r--metadata/md5-cache/sys-auth/pam_krb5-4.91
-rw-r--r--metadata/md5-cache/sys-block/cec-143
-rw-r--r--metadata/md5-cache/sys-block/di-4.502
-rw-r--r--metadata/md5-cache/sys-block/disktype-9-r13
-rw-r--r--metadata/md5-cache/sys-block/io-scheduler-udev-rules-13
-rw-r--r--metadata/md5-cache/sys-block/megacli-8.07.14-r33
-rw-r--r--metadata/md5-cache/sys-block/megactl-0.4.1-r33
-rw-r--r--metadata/md5-cache/sys-block/mpt-status-1.2.0-r13
-rw-r--r--metadata/md5-cache/sys-block/ms-sys-2.5.33
-rw-r--r--metadata/md5-cache/sys-block/ms-sys-2.7.03
-rw-r--r--metadata/md5-cache/sys-block/perccli-7.5.007.05293
-rw-r--r--metadata/md5-cache/sys-block/perccli-7.5.007.0529-r23
-rw-r--r--metadata/md5-cache/sys-block/sas2ircu-201
-rw-r--r--metadata/md5-cache/sys-block/sas3flash-151
-rw-r--r--metadata/md5-cache/sys-block/sas3flash-15-r11
-rw-r--r--metadata/md5-cache/sys-block/sas3flash-161
-rw-r--r--metadata/md5-cache/sys-block/sas3ircu-161
-rw-r--r--metadata/md5-cache/sys-block/tgt-1.0.793
-rw-r--r--metadata/md5-cache/sys-block/vblade-243
-rw-r--r--metadata/md5-cache/sys-block/whdd-3.0.13
-rw-r--r--metadata/md5-cache/sys-block/zram-init-10.51
-rw-r--r--metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r32
-rw-r--r--metadata/md5-cache/sys-boot/arcload-0.50-r33
-rw-r--r--metadata/md5-cache/sys-boot/cromwell-bin-2.40-r11
-rw-r--r--metadata/md5-cache/sys-boot/efibootmgr-143
-rw-r--r--metadata/md5-cache/sys-boot/efibootmgr-153
-rw-r--r--metadata/md5-cache/sys-boot/gnu-efi-3.0.122
-rw-r--r--metadata/md5-cache/sys-boot/os-prober-1.773
-rw-r--r--metadata/md5-cache/sys-boot/palo-2.143
-rw-r--r--metadata/md5-cache/sys-boot/raspberrypi-firmware-1.202010221
-rw-r--r--metadata/md5-cache/sys-boot/raspberrypi-firmware-1.202012011
-rw-r--r--metadata/md5-cache/sys-boot/raspberrypi-firmware-1.202101081
-rw-r--r--metadata/md5-cache/sys-boot/refind-0.11.43
-rw-r--r--metadata/md5-cache/sys-boot/refind-0.12.0-r13
-rw-r--r--metadata/md5-cache/sys-boot/sgibootcd-0.123
-rw-r--r--metadata/md5-cache/sys-cluster/hpl-2.0-r43
-rw-r--r--metadata/md5-cache/sys-cluster/k9scli-0.20.51
-rw-r--r--metadata/md5-cache/sys-cluster/k9scli-0.21.21
-rw-r--r--metadata/md5-cache/sys-cluster/k9scli-0.22.11
-rw-r--r--metadata/md5-cache/sys-cluster/kube-router-1.1.11
-rw-r--r--metadata/md5-cache/sys-cluster/kubeletctl-1.51
-rw-r--r--metadata/md5-cache/sys-cluster/kubeletctl-1.61
-rw-r--r--metadata/md5-cache/sys-cluster/minikube-1.10.11
-rw-r--r--metadata/md5-cache/sys-cluster/minikube-1.11.01
-rw-r--r--metadata/md5-cache/sys-cluster/minikube-1.13.11
-rw-r--r--metadata/md5-cache/sys-cluster/pconsole-1.0-r43
-rw-r--r--metadata/md5-cache/sys-devel/autoconf-2.711
-rw-r--r--metadata/md5-cache/sys-devel/dev86-0.16.21-r32
-rw-r--r--metadata/md5-cache/sys-devel/dwz-0.133
-rw-r--r--metadata/md5-cache/sys-devel/gdb-apple-17522
-rw-r--r--metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r21
-rw-r--r--metadata/md5-cache/sys-devel/qconf-2.53
-rw-r--r--metadata/md5-cache/sys-devel/smatch-1.603
-rw-r--r--metadata/md5-cache/sys-firmware/alsa-firmware-1.2.13
-rw-r--r--metadata/md5-cache/sys-firmware/alsa-firmware-1.2.43
-rw-r--r--metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r13
-rw-r--r--metadata/md5-cache/sys-firmware/ipxe-1.21.12
-rw-r--r--metadata/md5-cache/sys-fs/duperemove-0.11.23
-rw-r--r--metadata/md5-cache/sys-fs/e2tools-0.1.03
-rw-r--r--metadata/md5-cache/sys-fs/fatsort-1.6.3.6223
-rw-r--r--metadata/md5-cache/sys-fs/fuse-zip-0.7.03
-rw-r--r--metadata/md5-cache/sys-fs/go-mtpfs-1.0.01
-rw-r--r--metadata/md5-cache/sys-fs/lufis-0.33
-rw-r--r--metadata/md5-cache/sys-fs/lufis-0.3-r13
-rw-r--r--metadata/md5-cache/sys-fs/mergerfs-2.32.13
-rw-r--r--metadata/md5-cache/sys-fs/mergerfs-2.32.23
-rw-r--r--metadata/md5-cache/sys-fs/mergerfs-2.32.33
-rw-r--r--metadata/md5-cache/sys-fs/mergerfs-2.32.43
-rw-r--r--metadata/md5-cache/sys-fs/quotatool-1.6.23
-rw-r--r--metadata/md5-cache/sys-fs/reiser4progs-2.0.41
-rw-r--r--metadata/md5-cache/sys-fs/yaffs2utils-0.2.93
-rw-r--r--metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.1783
-rw-r--r--metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.513
-rw-r--r--metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p201902151
-rw-r--r--metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p201909251
-rw-r--r--metadata/md5-cache/sys-kernel/raspberrypi-image-5.10.11_p202102011
-rw-r--r--metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p202012011
-rw-r--r--metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r13
-rw-r--r--metadata/md5-cache/sys-libs/cygwin-crypt-1.43
-rw-r--r--metadata/md5-cache/sys-libs/db-5.3.28-r62
-rw-r--r--metadata/md5-cache/sys-libs/ldb-2.1.4-r12
-rw-r--r--metadata/md5-cache/sys-libs/ldb-2.1.52
-rw-r--r--metadata/md5-cache/sys-libs/ldb-2.2.0-r22
-rw-r--r--metadata/md5-cache/sys-libs/ldb-2.2.12
-rw-r--r--metadata/md5-cache/sys-libs/ldb-2.3.02
-rw-r--r--metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r33
-rw-r--r--metadata/md5-cache/sys-libs/libuuid-1.0.33
-rw-r--r--metadata/md5-cache/sys-libs/lwp-2.83
-rw-r--r--metadata/md5-cache/sys-libs/nss-usrfiles-2.18.13
-rw-r--r--metadata/md5-cache/sys-power/acpi_call-1.2.12
-rw-r--r--metadata/md5-cache/sys-power/athcool-0.3.123
-rw-r--r--metadata/md5-cache/sys-power/nvram-reboot-2004.10.03-r11
-rw-r--r--metadata/md5-cache/sys-power/powermgmt-base-1.31-r23
-rw-r--r--metadata/md5-cache/sys-power/powerstat-0.02.213
-rw-r--r--metadata/md5-cache/sys-power/powerstat-0.02.223
-rw-r--r--metadata/md5-cache/sys-process/anacron-2.3-r43
-rw-r--r--metadata/md5-cache/sys-process/cronutils-1.93
-rw-r--r--metadata/md5-cache/sys-process/ctop-0.7.31
-rw-r--r--metadata/md5-cache/sys-process/minit-0.10-r13
-rw-r--r--metadata/md5-cache/sys-process/pkill-darwin-1.03
-rw-r--r--metadata/md5-cache/sys-process/prll-0.6.43
-rw-r--r--metadata/md5-cache/sys-process/schedtool-1.3.0-r13
-rw-r--r--metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r13
-rw-r--r--metadata/md5-cache/virtual/rubygems-162
-rw-r--r--metadata/md5-cache/www-apache/modsec-flameeyes-201302161
-rw-r--r--metadata/md5-cache/www-apps/liquid_feedback_core-2.2.63
-rw-r--r--metadata/md5-cache/www-apps/liquid_feedback_core-3.0.43
-rw-r--r--metadata/md5-cache/www-apps/webdavcgi-1.1.23
-rw-r--r--metadata/md5-cache/www-client/luakit-2.2.1-r1003
-rw-r--r--metadata/md5-cache/www-client/uget-2.2.13
-rw-r--r--metadata/md5-cache/www-misc/bookmarksync-0.3.4-r33
-rw-r--r--metadata/md5-cache/www-misc/multisort-1.1-r23
-rw-r--r--metadata/md5-cache/www-misc/profile-sync-daemon-6.311
-rw-r--r--metadata/md5-cache/www-misc/visitors-0.7-r23
-rw-r--r--metadata/md5-cache/www-misc/wsmake-0.6.4-r13
-rw-r--r--metadata/md5-cache/www-plugins/browserpass-3.0.71
-rw-r--r--metadata/md5-cache/www-servers/caddy-2.0.01
-rw-r--r--metadata/md5-cache/www-servers/caddy-2.2.31
-rw-r--r--metadata/md5-cache/x11-apps/amlc-0.5.13
-rw-r--r--metadata/md5-cache/x11-apps/radeon-profile-202008243
-rw-r--r--metadata/md5-cache/x11-apps/radeon-profile-20200824-r13
-rw-r--r--metadata/md5-cache/x11-apps/xwarppointer-1-r23
-rw-r--r--metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.01
-rw-r--r--metadata/md5-cache/x11-libs/dnd-1.1-r33
-rw-r--r--metadata/md5-cache/x11-libs/libX11-1.7.02
-rw-r--r--metadata/md5-cache/x11-libs/libX11-1.7.12
-rw-r--r--metadata/md5-cache/x11-libs/libva-2.9.12
-rw-r--r--metadata/md5-cache/x11-libs/qwt-6.1.53
-rw-r--r--metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r23
-rw-r--r--metadata/md5-cache/x11-misc/alock-1.0.02
-rw-r--r--metadata/md5-cache/x11-misc/blockdpy-1-r13
-rw-r--r--metadata/md5-cache/x11-misc/dunst-1.4.13
-rw-r--r--metadata/md5-cache/x11-misc/dunst-1.5.03
-rw-r--r--metadata/md5-cache/x11-misc/evolvotron-0.7.1-r13
-rw-r--r--metadata/md5-cache/x11-misc/fpm2-0.903
-rw-r--r--metadata/md5-cache/x11-misc/fraqtive-0.4.8-r23
-rw-r--r--metadata/md5-cache/x11-misc/grsync-1.2.83
-rw-r--r--metadata/md5-cache/x11-misc/habak-0.2.5-r33
-rw-r--r--metadata/md5-cache/x11-misc/hsetroot-1.0.53
-rw-r--r--metadata/md5-cache/x11-misc/i3lock-2.133
-rw-r--r--metadata/md5-cache/x11-misc/i855crt-0.4-r13
-rw-r--r--metadata/md5-cache/x11-misc/kapow-1.5.103
-rw-r--r--metadata/md5-cache/x11-misc/kaqaz-1.2.0-r43
-rw-r--r--metadata/md5-cache/x11-misc/lsw-0.33
-rw-r--r--metadata/md5-cache/x11-misc/mixer_app-1.8.0-r13
-rw-r--r--metadata/md5-cache/x11-misc/mozo-1.24.02
-rw-r--r--metadata/md5-cache/x11-misc/netwmpager-2.053
-rw-r--r--metadata/md5-cache/x11-misc/obconf-2.0.41
-rw-r--r--metadata/md5-cache/x11-misc/qarma-13
-rw-r--r--metadata/md5-cache/x11-misc/qt5ct-1.13
-rw-r--r--metadata/md5-cache/x11-misc/qtfm-6.2.03
-rw-r--r--metadata/md5-cache/x11-misc/screen-message-0.263
-rw-r--r--metadata/md5-cache/x11-misc/set_opacity-1.03
-rw-r--r--metadata/md5-cache/x11-misc/spnavcfg-0.3.13
-rw-r--r--metadata/md5-cache/x11-misc/sprop-0.1-r13
-rw-r--r--metadata/md5-cache/x11-misc/sselp-0.2-r13
-rw-r--r--metadata/md5-cache/x11-misc/touchcal-0.803
-rw-r--r--metadata/md5-cache/x11-misc/trayer-srg-1.1.83
-rw-r--r--metadata/md5-cache/x11-misc/unclutter-8-r43
-rw-r--r--metadata/md5-cache/x11-misc/urxvtconfig-1.0-r13
-rw-r--r--metadata/md5-cache/x11-misc/vym-2.7.13
-rw-r--r--metadata/md5-cache/x11-misc/wmname-0.1-r13
-rw-r--r--metadata/md5-cache/x11-misc/xcape-1.23
-rw-r--r--metadata/md5-cache/x11-misc/xcb-2.4-r13
-rw-r--r--metadata/md5-cache/x11-misc/xdo-0.5.73
-rw-r--r--metadata/md5-cache/x11-misc/xfe-1.43.21
-rw-r--r--metadata/md5-cache/x11-misc/xfractint-20.04_p163
-rw-r--r--metadata/md5-cache/x11-misc/xkblayout-state-0_p201801183
-rw-r--r--metadata/md5-cache/x11-misc/xkbset-0.5_p7_p13
-rw-r--r--metadata/md5-cache/x11-misc/xmountains-2.9-r13
-rw-r--r--metadata/md5-cache/x11-misc/xosview-1.20-r13
-rw-r--r--metadata/md5-cache/x11-misc/xosview-1.223
-rw-r--r--metadata/md5-cache/x11-misc/xosview-1.233
-rw-r--r--metadata/md5-cache/x11-misc/xwit-3.4_p163
-rw-r--r--metadata/md5-cache/x11-plugins/allin1-0.5.0-r23
-rw-r--r--metadata/md5-cache/x11-plugins/asclock-2.0.12-r33
-rw-r--r--metadata/md5-cache/x11-plugins/ascpu-1.11-r13
-rw-r--r--metadata/md5-cache/x11-plugins/asmem-1.12-r13
-rw-r--r--metadata/md5-cache/x11-plugins/asmon-0.71-r13
-rw-r--r--metadata/md5-cache/x11-plugins/astime-2.8-r23
-rw-r--r--metadata/md5-cache/x11-plugins/bfm-0.6.4-r33
-rw-r--r--metadata/md5-cache/x11-plugins/cputnik-0.2.0-r13
-rw-r--r--metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.23
-rw-r--r--metadata/md5-cache/x11-plugins/lurch-0.6.8-r23
-rw-r--r--metadata/md5-cache/x11-plugins/pidgin-latex-1.5.03
-rw-r--r--metadata/md5-cache/x11-plugins/pidgin-led-notification-0.13
-rw-r--r--metadata/md5-cache/x11-plugins/pidgin-mbpurple-0.3.0-r23
-rw-r--r--metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.73
-rw-r--r--metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p201701073
-rw-r--r--metadata/md5-cache/x11-plugins/purple-hangouts-0_p201812023
-rw-r--r--metadata/md5-cache/x11-plugins/purple-hangouts-0_p202007103
-rw-r--r--metadata/md5-cache/x11-plugins/purple-mattermost-2.03
-rw-r--r--metadata/md5-cache/x11-plugins/wmCalClock-1.25-r33
-rw-r--r--metadata/md5-cache/x11-plugins/wmDownload-0.1.2a-r33
-rw-r--r--metadata/md5-cache/x11-plugins/wmMatrix-0.2-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmSun-1.05-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmXName-0.1-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmacpi-2.43
-rw-r--r--metadata/md5-cache/x11-plugins/wmail-2.0-r53
-rw-r--r--metadata/md5-cache/x11-plugins/wmail-2.23
-rw-r--r--metadata/md5-cache/x11-plugins/wmail-2.33
-rw-r--r--metadata/md5-cache/x11-plugins/wmamixer-1.03
-rw-r--r--metadata/md5-cache/x11-plugins/wmamixer-1.0-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmapm-3.1-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmbinclock-0.5-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmcalc-0.6-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmcalendar-0.5.2-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmcliphist-2.1-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmcp-1.2.8-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmcube-1.0.23
-rw-r--r--metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmfortune-0.241-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmfrog-0.3.1-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r21
-rw-r--r--metadata/md5-cache/x11-plugins/wmifinfo-0.10-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wminet-3.0.0-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmitime-0.5-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmload-0.9.7-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmmenu-1.3-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmmisc-1.23
-rw-r--r--metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r33
-rw-r--r--metadata/md5-cache/x11-plugins/wmppp-1.3.2-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmrack-1.4-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r23
-rw-r--r--metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmsysmon-0.7.83
-rw-r--r--metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmtime-1.4-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmtimer-2.92-r21
-rw-r--r--metadata/md5-cache/x11-plugins/wmtz-0.7_p201508161
-rw-r--r--metadata/md5-cache/x11-plugins/wmxkb-1.2.2-r13
-rw-r--r--metadata/md5-cache/x11-plugins/wmxres-1.2-r13
-rw-r--r--metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r23
-rw-r--r--metadata/md5-cache/x11-terms/mlterm-3.9.01
-rw-r--r--metadata/md5-cache/x11-terms/mlterm-3.9.11
-rw-r--r--metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.21
-rw-r--r--metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r13
-rw-r--r--metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r13
-rw-r--r--metadata/md5-cache/x11-themes/QGnomePlatform-0.7.03
-rw-r--r--metadata/md5-cache/x11-themes/claws-mail-themes-201406293
-rw-r--r--metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre200810313
-rw-r--r--metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.13
-rw-r--r--metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.23
-rw-r--r--metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r13
-rw-r--r--metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.73
-rw-r--r--metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r12
-rw-r--r--metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r13
-rw-r--r--metadata/md5-cache/x11-themes/human-icon-theme-0.363
-rw-r--r--metadata/md5-cache/x11-themes/nou-icon-theme-09.02.083
-rw-r--r--metadata/md5-cache/x11-themes/numix-icon-theme-19.09.203
-rw-r--r--metadata/md5-cache/x11-themes/numix-icon-theme-20.06.073
-rw-r--r--metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.203
-rw-r--r--metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.193
-rw-r--r--metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r13
-rw-r--r--metadata/md5-cache/x11-themes/papirus-icon-theme-202009013
-rw-r--r--metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r13
-rw-r--r--metadata/md5-cache/x11-themes/smplayer-themes-18.6.03
-rw-r--r--metadata/md5-cache/x11-themes/tangerine-icon-theme-0.273
-rw-r--r--metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r13
-rw-r--r--metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r13
-rw-r--r--metadata/md5-cache/x11-themes/zuki-themes-3.32.21
-rw-r--r--metadata/md5-cache/x11-wm/aewm++-1.1.5-r23
-rw-r--r--metadata/md5-cache/x11-wm/aewm-1.3.12-r13
-rw-r--r--metadata/md5-cache/x11-wm/bspwm-0.9.103
-rw-r--r--metadata/md5-cache/x11-wm/bspwm-0.9.93
-rw-r--r--metadata/md5-cache/x11-wm/cwm-6.63
-rw-r--r--metadata/md5-cache/x11-wm/evilwm-1.0.1-r13
-rw-r--r--metadata/md5-cache/x11-wm/evilwm-1.1.13
-rw-r--r--metadata/md5-cache/x11-wm/lumina-1.6.03
-rw-r--r--metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r13
-rw-r--r--metadata/md5-cache/x11-wm/notion-3_p2015061300-r1003
-rw-r--r--metadata/md5-cache/x11-wm/sithwm-1.2.33
-rw-r--r--metadata/md5-cache/x11-wm/treewm-0.4.5-r23
-rw-r--r--metadata/md5-cache/x11-wm/wmfs-201805203
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.11
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-dict-0.8.41
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.31
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.11
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.21
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.1.11
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.4.01
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.2.31
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.01
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.51
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.21
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.9.01
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.81
-rw-r--r--metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.21
-rw-r--r--metadata/timestamp.chk2
2427 files changed, 3548 insertions, 1353 deletions
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-ss-1.9.1 b/metadata/md5-cache/app-accessibility/emacspeak-ss-1.9.1
index 4b2de5ec8cfa..4356d9f80f3b 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-ss-1.9.1
+++ b/metadata/md5-cache/app-accessibility/emacspeak-ss-1.9.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=adds support for several speech synthesizers to emacspeak
EAPI=6
HOMEPAGE=http://leb.net/blinux/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=>=app-accessibility/emacspeak-18
SLOT=0
SRC_URI=http://leb.net/pub/blinux/emacspeak/blinux/emacspeak-ss-1.9.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=eac5db3e6889139ae2628c2d36dbcd0f
diff --git a/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1 b/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
index 57f927074792..ddc294271138 100644
--- a/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
+++ b/metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
@@ -3,11 +3,12 @@ DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-
DESCRIPTION=Speech synthesizer for English and other languages
EAPI=6
HOMEPAGE=http://espeak.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=portaudio pulseaudio
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
SLOT=0
SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ebab2c19206860b25f9ee4d4d7287e02
diff --git a/metadata/md5-cache/app-accessibility/julius-4.2.2 b/metadata/md5-cache/app-accessibility/julius-4.2.2
index 2ea48ec4be34..928b49c78941 100644
--- a/metadata/md5-cache/app-accessibility/julius-4.2.2
+++ b/metadata/md5-cache/app-accessibility/julius-4.2.2
@@ -3,6 +3,7 @@ DEPEND=dev-lang/perl dev-perl/Jcode sys-libs/readline:0 sys-libs/zlib alsa? ( me
DESCRIPTION=Large Vocabulary Continuous Speech Recognition Engine
EAPI=6
HOMEPAGE=https://github.com/julius-speech/julius
+INHERIT=toolchain-funcs
IUSE=+alsa l10n_ja oss portaudio pulseaudio sndfile
KEYWORDS=amd64 x86
LICENSE=julius
@@ -10,5 +11,5 @@ RDEPEND=dev-lang/perl dev-perl/Jcode sys-libs/readline:0 sys-libs/zlib alsa? ( m
REQUIRED_USE=^^ ( alsa oss portaudio pulseaudio )
SLOT=0
SRC_URI=mirror://sourceforge.jp/julius/56549/julius-4.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d0db5fe373cc72625719f8a92da5da9b
diff --git a/metadata/md5-cache/app-admin/analog-6.0.13 b/metadata/md5-cache/app-admin/analog-6.0.13
index c06885694676..319d4c5f0b8f 100644
--- a/metadata/md5-cache/app-admin/analog-6.0.13
+++ b/metadata/md5-cache/app-admin/analog-6.0.13
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=dev-libs/libpcre-3.4 >=media-libs/gd-1.8.4-r2[jpeg,png]
DESCRIPTION=A webserver log analyzer
EAPI=7
HOMEPAGE=https://www.c-amie.co.uk/software/analog/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=app-arch/unzip >=dev-libs/libpcre-3.4 >=media-libs/gd-1.8.4-r2[jpeg,png] sys-libs/zlib
SLOT=0
SRC_URI=http://www.c-amie.co.uk/static/analog/6013/analog-src-6013ce.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2f0c520e85a5f42421206b6744f31a36
diff --git a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1 b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
index d6ff63e69bd0..a8544bc12d34 100644
--- a/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
+++ b/metadata/md5-cache/app-admin/chroot_safe-1.4-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Chroot any dynamically linked application in a safe and sane manner
EAPI=7
HOMEPAGE=http://chrootsafe.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=MIT
SLOT=0
SRC_URI=mirror://sourceforge/chrootsafe/chroot_safe-1.4.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6a5c85aa7a2ed0e954af3f5651757fac
diff --git a/metadata/md5-cache/app-admin/chrootuid-1.3-r2 b/metadata/md5-cache/app-admin/chrootuid-1.3-r2
index 6991b7e84f4f..1999e4d5c61e 100644
--- a/metadata/md5-cache/app-admin/chrootuid-1.3-r2
+++ b/metadata/md5-cache/app-admin/chrootuid-1.3-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Run a network service at low privilege level and restricted file system access
EAPI=7
HOMEPAGE=ftp://ftp.porcupine.org/pub/security/index.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~ia64 ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=ftp://ftp.porcupine.org/pub/security/chrootuid1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=465324b24b748dc31cea9341e4b59e6d
diff --git a/metadata/md5-cache/app-admin/cpulimit-2.4 b/metadata/md5-cache/app-admin/cpulimit-2.4
index 7a3e44e5fcda..6f61c647cc07 100644
--- a/metadata/md5-cache/app-admin/cpulimit-2.4
+++ b/metadata/md5-cache/app-admin/cpulimit-2.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Limits the CPU usage of a process
EAPI=6
HOMEPAGE=http://cpulimit.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dbd596c281a1f0f34debc9de91a2d65a
diff --git a/metadata/md5-cache/app-admin/doas-6.8.1 b/metadata/md5-cache/app-admin/doas-6.8.1
index 3414d3b17dc9..6877001ae7e0 100644
--- a/metadata/md5-cache/app-admin/doas-6.8.1
+++ b/metadata/md5-cache/app-admin/doas-6.8.1
@@ -4,11 +4,12 @@ DEPEND=pam? ( sys-libs/pam )
DESCRIPTION=Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)
EAPI=7
HOMEPAGE=https://github.com/Duncaen/OpenDoas
+INHERIT=toolchain-funcs
IUSE=pam persist
KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=ISC
RDEPEND=pam? ( sys-libs/pam )
SLOT=0
SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.8.1.tar.gz -> OpenDoas-6.8.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6966ef5b28434d3c19b37cefd3412421
diff --git a/metadata/md5-cache/app-admin/entr-4.6 b/metadata/md5-cache/app-admin/entr-4.6
index f1066b5f6341..505e579784ad 100644
--- a/metadata/md5-cache/app-admin/entr-4.6
+++ b/metadata/md5-cache/app-admin/entr-4.6
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile configure test
DESCRIPTION=Run arbitrary commands when files change
EAPI=7
HOMEPAGE=http://entrproject.org
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
LICENSE=ISC
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://entrproject.org/code/entr-4.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e5187020d919e0467d8d467a9aa0fbe7
diff --git a/metadata/md5-cache/app-admin/fetchlog-1.4-r1 b/metadata/md5-cache/app-admin/fetchlog-1.4-r1
index 8c01594330f7..df8e4f2acc0a 100644
--- a/metadata/md5-cache/app-admin/fetchlog-1.4-r1
+++ b/metadata/md5-cache/app-admin/fetchlog-1.4-r1
@@ -2,11 +2,12 @@ DEFINED_PHASES=configure install preinst
DESCRIPTION=Displays the last new messages of a logfile
EAPI=6
HOMEPAGE=http://fetchlog.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=snmp
KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=snmp? ( >=dev-perl/Net-SNMP-4.0.1-r2 >=net-analyzer/net-snmp-5.0.6 )
SLOT=0
SRC_URI=mirror://sourceforge/fetchlog/fetchlog-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aba279ffba7cfe87b5217e20ab910041
diff --git a/metadata/md5-cache/app-admin/filebeat-7.10.2 b/metadata/md5-cache/app-admin/filebeat-7.10.2
index da4142b80150..e0ccac4b458b 100644
--- a/metadata/md5-cache/app-admin/filebeat-7.10.2
+++ b/metadata/md5-cache/app-admin/filebeat-7.10.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
EAPI=7
HOMEPAGE=https://www.elastic.co/products/beats
+INHERIT=go-module
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0 BSD-2 MIT
RESTRICT=test
diff --git a/metadata/md5-cache/app-admin/filebeat-7.9.3 b/metadata/md5-cache/app-admin/filebeat-7.9.3
index b3ecc86ac06d..77e2d16c29e1 100644
--- a/metadata/md5-cache/app-admin/filebeat-7.9.3
+++ b/metadata/md5-cache/app-admin/filebeat-7.9.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
EAPI=7
HOMEPAGE=https://www.elastic.co/products/beats
+INHERIT=go-module
KEYWORDS=amd64 ~x86
LICENSE=Apache-2.0 BSD-2 MIT
RESTRICT=test
diff --git a/metadata/md5-cache/app-admin/gopass-1.11.0 b/metadata/md5-cache/app-admin/gopass-1.11.0
index 8088f598dd7a..5b4b53a3f884 100644
--- a/metadata/md5-cache/app-admin/gopass-1.11.0
+++ b/metadata/md5-cache/app-admin/gopass-1.11.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-lang/go-1.11
DESCRIPTION=a simple but powerful password manager for the terminal
EAPI=7
HOMEPAGE=https://www.gopass.pw/
+INHERIT=go-module
KEYWORDS=amd64 ~ppc64 x86
LICENSE=MIT Apache-2.0 BSD MPL-2.0 BSD-2
RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
diff --git a/metadata/md5-cache/app-admin/ide-smart-1.4-r2 b/metadata/md5-cache/app-admin/ide-smart-1.4-r2
index 2f849ca8031f..af3e9b90d374 100644
--- a/metadata/md5-cache/app-admin/ide-smart-1.4-r2
+++ b/metadata/md5-cache/app-admin/ide-smart-1.4-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A tool to read SMART information from harddiscs
EAPI=6
HOMEPAGE=http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.linalco.com/ragnar/ide-smart-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5dd8f8fb80f351e9bd1e94d09b57a095
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.2.3-r1 b/metadata/md5-cache/app-admin/kube-bench-0.2.3-r1
index 3682f0c4947a..a521a436471e 100644
--- a/metadata/md5-cache/app-admin/kube-bench-0.2.3-r1
+++ b/metadata/md5-cache/app-admin/kube-bench-0.2.3-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
EAPI=7
HOMEPAGE=https://github.com/aquasecurity/kube-bench
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 MIT MPL-2.0 BSD BSD-2
RESTRICT=strip test
diff --git a/metadata/md5-cache/app-admin/logsentry-1.1.1-r2 b/metadata/md5-cache/app-admin/logsentry-1.1.1-r2
index 624cde153528..8b3305401c31 100644
--- a/metadata/md5-cache/app-admin/logsentry-1.1.1-r2
+++ b/metadata/md5-cache/app-admin/logsentry-1.1.1-r2
@@ -3,10 +3,11 @@ DEPEND=>=sys-apps/sed-4
DESCRIPTION=Automatically monitor system logs and mail security violations
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/sentrytools/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~mips ppc ~s390 sparc x86
LICENSE=GPL-2
RDEPEND=virtual/mailx
SLOT=0
SRC_URI=mirror://gentoo/logsentry-1.1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b9b027933f012e3200cb45538573d105
diff --git a/metadata/md5-cache/app-admin/mtail-3.0.0_rc35 b/metadata/md5-cache/app-admin/mtail-3.0.0_rc35
index 6c5020bdf8c8..e662780e4169 100644
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc35
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc35
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=A tool for extracting metrics from application logs
EAPI=7
HOMEPAGE=https://github.com/google/mtail
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 MPL-2.0 BSD BSD-2 MIT
RDEPEND=!app-misc/mtail
diff --git a/metadata/md5-cache/app-admin/mtail-3.0.0_rc36 b/metadata/md5-cache/app-admin/mtail-3.0.0_rc36
index 9cd2cb2ef3d9..68bfaeee2533 100644
--- a/metadata/md5-cache/app-admin/mtail-3.0.0_rc36
+++ b/metadata/md5-cache/app-admin/mtail-3.0.0_rc36
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=A tool for extracting metrics from application logs
EAPI=7
HOMEPAGE=https://github.com/google/mtail
+INHERIT=go-module
IUSE=examples
KEYWORDS=~amd64
LICENSE=Apache-2.0 MPL-2.0 BSD BSD-2 MIT
diff --git a/metadata/md5-cache/app-admin/paxtest-0.9.15-r1 b/metadata/md5-cache/app-admin/paxtest-0.9.15-r1
index 5b7ea3863010..6cce6751cd5b 100644
--- a/metadata/md5-cache/app-admin/paxtest-0.9.15-r1
+++ b/metadata/md5-cache/app-admin/paxtest-0.9.15-r1
@@ -3,10 +3,11 @@ DEPEND=sys-apps/paxctl
DESCRIPTION=PaX regression test suite
EAPI=6
HOMEPAGE=https://pax.grsecurity.net
+INHERIT=toolchain-funcs
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RESTRICT=strip
SLOT=0
SRC_URI=https://grsecurity.net/~spender/paxtest-0.9.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6c954bf44ec58bed56918aba8adf6dd3
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.28 b/metadata/md5-cache/app-admin/perl-cleaner-2.28
index 70bb84b43d58..fb62af6e6c88 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.28
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.28
@@ -2,6 +2,7 @@ DEFINED_PHASES=install prepare
DESCRIPTION=User land tool for cleaning up old perl installs
EAPI=6
HOMEPAGE=https://www.gentoo.org/proj/en/perl/
+INHERIT=prefix
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore )
diff --git a/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2 b/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
index 63366838cf44..193273aee855 100644
--- a/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
+++ b/metadata/md5-cache/app-admin/pwcrypt-1.2.2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=An improved version of cli-crypt (encrypts data sent to it from the cli)
EAPI=7
HOMEPAGE=http://xjack.org/pwcrypt/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://xjack.org/pwcrypt/downloads/pwcrypt-1.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4071c7abeb0e4b7f7fd07532a2baf920
diff --git a/metadata/md5-cache/app-admin/qpage-3.3 b/metadata/md5-cache/app-admin/qpage-3.3
index bbe22b2a2be6..2f934a76fe3e 100644
--- a/metadata/md5-cache/app-admin/qpage-3.3
+++ b/metadata/md5-cache/app-admin/qpage-3.3
@@ -3,11 +3,12 @@ DEPEND=tcpd? ( sys-apps/tcp-wrappers )
DESCRIPTION=Sends messages to an alphanumeric pager via TAP protocol
EAPI=6
HOMEPAGE=http://www.qpage.org/
+INHERIT=toolchain-funcs
IUSE=tcpd
KEYWORDS=~alpha amd64 x86
LICENSE=qpage
RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) virtual/mta
SLOT=0
SRC_URI=http://www.qpage.org/download/qpage-3.3.tar.Z
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=381fd6600b85492ea7d30a798a093403
diff --git a/metadata/md5-cache/app-admin/selint-1.1.0 b/metadata/md5-cache/app-admin/selint-1.1.0
index 92701b317c03..7f60e9bdc72a 100644
--- a/metadata/md5-cache/app-admin/selint-1.1.0
+++ b/metadata/md5-cache/app-admin/selint-1.1.0
@@ -3,6 +3,7 @@ DEPEND=dev-libs/confuse:= dev-libs/uthash test? ( dev-libs/check )
DESCRIPTION=Policy Analysis Tools for SELinux
EAPI=7
HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/confuse:= dev-libs/uthash
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.1.0/selint-1.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d28c9908d278541cce8ac21480b0646
diff --git a/metadata/md5-cache/app-admin/su-exec-0.2 b/metadata/md5-cache/app-admin/su-exec-0.2
index 89562a261237..f49d6dbf0e88 100644
--- a/metadata/md5-cache/app-admin/su-exec-0.2
+++ b/metadata/md5-cache/app-admin/su-exec-0.2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Switch user and group id and exec
EAPI=6
HOMEPAGE=https://github.com/ncopa/su-exec
+INHERIT=toolchain-funcs
IUSE=static
KEYWORDS=~amd64
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/ncopa/su-exec/archive/v0.2.tar.gz -> su-exec-0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=54b27b7199778b6d21ed0d4a35ecdedc
diff --git a/metadata/md5-cache/app-admin/terraform-0.14.5 b/metadata/md5-cache/app-admin/terraform-0.14.5
index ccfa0e7ecbe1..966e0c5ce5de 100644
--- a/metadata/md5-cache/app-admin/terraform-0.14.5
+++ b/metadata/md5-cache/app-admin/terraform-0.14.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A tool for building, changing, and combining infrastructure safely
EAPI=7
HOMEPAGE=https://www.terraform.io/
+INHERIT=go-module
KEYWORDS=amd64
LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
RESTRICT=test
diff --git a/metadata/md5-cache/app-admin/terraform-0.14.6 b/metadata/md5-cache/app-admin/terraform-0.14.6
index 71f713533ed2..03335048a487 100644
--- a/metadata/md5-cache/app-admin/terraform-0.14.6
+++ b/metadata/md5-cache/app-admin/terraform-0.14.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A tool for building, changing, and combining infrastructure safely
EAPI=7
HOMEPAGE=https://www.terraform.io/
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
RESTRICT=test
diff --git a/metadata/md5-cache/app-admin/terraform-0.14.7 b/metadata/md5-cache/app-admin/terraform-0.14.7
index 686b72bbfa8e..b8a6d7f49155 100644
--- a/metadata/md5-cache/app-admin/terraform-0.14.7
+++ b/metadata/md5-cache/app-admin/terraform-0.14.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A tool for building, changing, and combining infrastructure safely
EAPI=7
HOMEPAGE=https://www.terraform.io/
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
RESTRICT=test
diff --git a/metadata/md5-cache/app-admin/terraform-0.14.8 b/metadata/md5-cache/app-admin/terraform-0.14.8
index 4c92aa857304..140608f3f0e6 100644
--- a/metadata/md5-cache/app-admin/terraform-0.14.8
+++ b/metadata/md5-cache/app-admin/terraform-0.14.8
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A tool for building, changing, and combining infrastructure safely
EAPI=7
HOMEPAGE=https://www.terraform.io/
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode
RESTRICT=test
diff --git a/metadata/md5-cache/app-admin/xtail-2.1-r1 b/metadata/md5-cache/app-admin/xtail-2.1-r1
index cdf1d8e24844..e3b267387e76 100644
--- a/metadata/md5-cache/app-admin/xtail-2.1-r1
+++ b/metadata/md5-cache/app-admin/xtail-2.1-r1
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=Tail multiple logfiles at once, even if rotated
EAPI=6
HOMEPAGE=http://www.unicom.com/sw/xtail/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=http://www.unicom.com/sw/xtail/xtail-2.1.tar.gz http://www.unicom.com/files/20120219-patch-aalto.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=33a6a021442776d9deb17d86fd529faf
diff --git a/metadata/md5-cache/app-arch/afio-2.5.1-r2 b/metadata/md5-cache/app-arch/afio-2.5.1-r2
index 377037730f20..fcb73e03ff59 100644
--- a/metadata/md5-cache/app-arch/afio-2.5.1-r2
+++ b/metadata/md5-cache/app-arch/afio-2.5.1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Afio creates cpio-format archives.
EAPI=7
HOMEPAGE=http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ppc sparc x86
LICENSE=Artistic LGPL-2
SLOT=0
SRC_URI=http://members.chello.nl/k.holtman/afio-2.5.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9de3c39507018b360b57cbacc8cb45be
diff --git a/metadata/md5-cache/app-arch/bsdsfv-1.18-r2 b/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
index 77ec5817101b..82d03cdd46cc 100644
--- a/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
+++ b/metadata/md5-cache/app-arch/bsdsfv-1.18-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=all-in-one SFV checksum utility
EAPI=6
HOMEPAGE=http://bsdsfv.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~hppa ~m68k ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/bsdsfv/bsdsfv-1.18.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=98137dba6777aa3b3356ffbbbda7cd57
diff --git a/metadata/md5-cache/app-arch/cabextract-1.8 b/metadata/md5-cache/app-arch/cabextract-1.8
index 32fdaade4d67..c0e501c30c2f 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.8
+++ b/metadata/md5-cache/app-arch/cabextract-1.8
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Extracts files from Microsoft cabinet archive files
EAPI=7
HOMEPAGE=https://www.cabextract.org.uk/
+INHERIT=toolchain-funcs
IUSE=extras
KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=extras? ( dev-lang/perl )
SLOT=0
SRC_URI=https://www.cabextract.org.uk/cabextract-1.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a86efb3d74e6b4049d38be2b16ad39ca
diff --git a/metadata/md5-cache/app-arch/cksfv-1.3.14-r1 b/metadata/md5-cache/app-arch/cksfv-1.3.14-r1
index 7d9961426ccb..a9fcdea71847 100644
--- a/metadata/md5-cache/app-arch/cksfv-1.3.14-r1
+++ b/metadata/md5-cache/app-arch/cksfv-1.3.14-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=SFV checksum utility (simple file verification)
EAPI=7
HOMEPAGE=http://zakalwe.fi/~shd/foss/cksfv/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=595055fac50a7f9e1f2c032c8bbe5742
diff --git a/metadata/md5-cache/app-arch/funzix-1.0 b/metadata/md5-cache/app-arch/funzix-1.0
index 083eb3103cb5..20f129c25456 100644
--- a/metadata/md5-cache/app-arch/funzix-1.0
+++ b/metadata/md5-cache/app-arch/funzix-1.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=unpacker for the bogus ZIX format
EAPI=6
HOMEPAGE=http://funzix.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/funzix/funzix-1.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bd9fc3dcddce416fba01eb10ac689ebd
diff --git a/metadata/md5-cache/app-arch/hardlink-0.3.2 b/metadata/md5-cache/app-arch/hardlink-0.3.2
index c16326e4e805..3bbc81e313bb 100644
--- a/metadata/md5-cache/app-arch/hardlink-0.3.2
+++ b/metadata/md5-cache/app-arch/hardlink-0.3.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libpcre !>=sys-apps/util-linux-2.34[hardlink]
DESCRIPTION=A tool which replaces copies of a file with hardlinks
EAPI=7
HOMEPAGE=https://jak-linux.org/projects/hardlink/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ppc ppc64 x86
LICENSE=MIT
RDEPEND=dev-libs/libpcre !>=sys-apps/util-linux-2.34[hardlink]
SLOT=0
SRC_URI=https://salsa.debian.org/jak/hardlink/-/archive/0.3.2/hardlink-0.3.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0ca09447129d167f03532ba682ecc35a
diff --git a/metadata/md5-cache/app-arch/lz5-2.0 b/metadata/md5-cache/app-arch/lz5-2.0
index 04b7a55b7c33..866dc627583c 100644
--- a/metadata/md5-cache/app-arch/lz5-2.0
+++ b/metadata/md5-cache/app-arch/lz5-2.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=An efficient compressor with very fast decompression
EAPI=6
HOMEPAGE=https://github.com/inikep/lz5
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~amd64
LICENSE=GPL-2 BSD-2
SLOT=0/2
SRC_URI=https://github.com/inikep/lz5/archive/v2.0.tar.gz -> lz5-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cad5f5d2c2d03f59cd866c60be571192
diff --git a/metadata/md5-cache/app-arch/lzip-1.22 b/metadata/md5-cache/app-arch/lzip-1.22
index 03e2a7929877..4803ccc3842d 100644
--- a/metadata/md5-cache/app-arch/lzip-1.22
+++ b/metadata/md5-cache/app-arch/lzip-1.22
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=lossless data compressor based on the LZMA algorithm
EAPI=7
HOMEPAGE=https://www.nongnu.org/lzip/lzip.html
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzip-1.22.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d57ce0223b1c706444d2b3638e6bc1f9
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.22 b/metadata/md5-cache/app-arch/lziprecover-1.22
index 9c30febc6284..ed361064e312 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.22
+++ b/metadata/md5-cache/app-arch/lziprecover-1.22
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Lziprecover is a data recovery tool and decompressor for lzip compressed files
EAPI=7
HOMEPAGE=https://www.nongnu.org/lzip/lziprecover.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.22.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cb939e89ecd8071575cd3d5a9d79be3c
diff --git a/metadata/md5-cache/app-arch/lzlib-1.11 b/metadata/md5-cache/app-arch/lzlib-1.11
index 98edfce02f08..9e21a9700826 100644
--- a/metadata/md5-cache/app-arch/lzlib-1.11
+++ b/metadata/md5-cache/app-arch/lzlib-1.11
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Library for lzip compression
EAPI=6
HOMEPAGE=https://www.nongnu.org/lzip/lzlib.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=libstdc++
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d67bd2c5588ce3ea7d35f262166bd1fa
diff --git a/metadata/md5-cache/app-arch/lzlib-1.12 b/metadata/md5-cache/app-arch/lzlib-1.12
index 9f030cab0ab9..802e265425b5 100644
--- a/metadata/md5-cache/app-arch/lzlib-1.12
+++ b/metadata/md5-cache/app-arch/lzlib-1.12
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Library for lzip compression
EAPI=7
HOMEPAGE=https://www.nongnu.org/lzip/lzlib.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=libstdc++
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8e6d2107ccccd30d5cf3f08424de7480
diff --git a/metadata/md5-cache/app-arch/lzma-9.20-r1 b/metadata/md5-cache/app-arch/lzma-9.20-r1
index 4de6c1244447..27a46c31b7c4 100644
--- a/metadata/md5-cache/app-arch/lzma-9.20-r1
+++ b/metadata/md5-cache/app-arch/lzma-9.20-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=LZMA Stream Compressor from the SDK
EAPI=6
HOMEPAGE=https://www.7-zip.org/sdk.html
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/sevenzip/lzma920.tar.bz2 -> lzma-9.20.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f812a0611fb61c685cfe604aea534cbd
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.7.3 b/metadata/md5-cache/app-arch/par2cmdline-0.7.3
index 19471e08fb44..6592cd81f0a3 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.7.3
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.7.3
@@ -2,10 +2,11 @@ DEFINED_PHASES=pretend setup test
DESCRIPTION=A PAR-2.0 file verification and repair tool
EAPI=6
HOMEPAGE=https://github.com/Parchive/par2cmdline
+INHERIT=toolchain-funcs
IUSE=openmp
KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.7.3/par2cmdline-0.7.3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d8a07c57f99641f6da64a4ea20cb5a6d
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.7.4 b/metadata/md5-cache/app-arch/par2cmdline-0.7.4
index d1aebe5a5a0c..5488c7cdff6e 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.7.4
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.7.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=pretend setup test
DESCRIPTION=A PAR-2.0 file verification and repair tool
EAPI=6
HOMEPAGE=https://github.com/Parchive/par2cmdline
+INHERIT=toolchain-funcs
IUSE=openmp
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.7.4/par2cmdline-0.7.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a7127893d1a1a1400e3974e8c0eb6030
diff --git a/metadata/md5-cache/app-arch/par2cmdline-0.8.0 b/metadata/md5-cache/app-arch/par2cmdline-0.8.0
index 934293d6ff30..18ca1c1a373f 100644
--- a/metadata/md5-cache/app-arch/par2cmdline-0.8.0
+++ b/metadata/md5-cache/app-arch/par2cmdline-0.8.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=pretend setup test
DESCRIPTION=A PAR-2.0 file verification and repair tool
EAPI=6
HOMEPAGE=https://github.com/Parchive/par2cmdline
+INHERIT=toolchain-funcs
IUSE=openmp
KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/Parchive/par2cmdline/releases/download/v0.8.0/par2cmdline-0.8.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d8a07c57f99641f6da64a4ea20cb5a6d
diff --git a/metadata/md5-cache/app-arch/pdlzip-1.10 b/metadata/md5-cache/app-arch/pdlzip-1.10
index d8be00d4ac9c..f890e5f16cba 100644
--- a/metadata/md5-cache/app-arch/pdlzip-1.10
+++ b/metadata/md5-cache/app-arch/pdlzip-1.10
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Public-domain version of lzip compressor
EAPI=6
HOMEPAGE=https://www.nongnu.org/lzip/pdlzip.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~mips ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=58b39538c28984e9095baae9c2c083fa
diff --git a/metadata/md5-cache/app-arch/pdlzip-1.11 b/metadata/md5-cache/app-arch/pdlzip-1.11
index 36593d5d7cba..0ff3147d40f8 100644
--- a/metadata/md5-cache/app-arch/pdlzip-1.11
+++ b/metadata/md5-cache/app-arch/pdlzip-1.11
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Public-domain version of lzip compressor
EAPI=7
HOMEPAGE=https://www.nongnu.org/lzip/pdlzip.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~mips ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=45cc168e3e66bc56346291accee94ee0
diff --git a/metadata/md5-cache/app-arch/plzip-1.8 b/metadata/md5-cache/app-arch/plzip-1.8
index 250fd64cc774..101c1466175a 100644
--- a/metadata/md5-cache/app-arch/plzip-1.8
+++ b/metadata/md5-cache/app-arch/plzip-1.8
@@ -3,10 +3,11 @@ DEPEND=app-arch/lzlib:0=
DESCRIPTION=Parallel lzip compressor
EAPI=6
HOMEPAGE=https://www.nongnu.org/lzip/plzip.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=GPL-3
RDEPEND=app-arch/lzlib:0=
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fde61a925e08d575cf935f0955b1a2e8
diff --git a/metadata/md5-cache/app-arch/plzip-1.9 b/metadata/md5-cache/app-arch/plzip-1.9
index 984a1193f47e..c62ed50fe0cd 100644
--- a/metadata/md5-cache/app-arch/plzip-1.9
+++ b/metadata/md5-cache/app-arch/plzip-1.9
@@ -3,10 +3,11 @@ DEPEND=app-arch/lzlib:0=
DESCRIPTION=Parallel lzip compressor
EAPI=7
HOMEPAGE=https://www.nongnu.org/lzip/plzip.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=GPL-3
RDEPEND=app-arch/lzlib:0=
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e41dd7448ee47a1407467e9385b29a3b
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20151029 b/metadata/md5-cache/app-arch/pxz-5.0_pre20151029
index 3d1c28c6b51a..18729ed5a9cb 100644
--- a/metadata/md5-cache/app-arch/pxz-5.0_pre20151029
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20151029
@@ -3,10 +3,11 @@ DEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
DESCRIPTION=Parallel implementation of the XZ compression utility
EAPI=6
HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
+INHERIT=toolchain-funcs vcs-snapshot
KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=app-arch/xz-utils sys-devel/gcc:*[openmp]
SLOT=0
SRC_URI=https://github.com/jnovy/pxz/archive/fcfea93957d96b7661d1439cf4b767ecfd341eed.tar.gz -> pxz-5.0_pre20151029.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=a1994b8a849c798199b32db18039ec9f
diff --git a/metadata/md5-cache/app-arch/qpress-1.1 b/metadata/md5-cache/app-arch/qpress-1.1
index 6a30fc4f89fd..c1c5ec7b7e3f 100644
--- a/metadata/md5-cache/app-arch/qpress-1.1
+++ b/metadata/md5-cache/app-arch/qpress-1.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=A portable file archiver using QuickLZ algorithm
EAPI=7
HOMEPAGE=http://www.quicklz.com/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://www.quicklz.com/qpress-11-source.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=88a838eb4f3d16bccf0b1ff0102f0f12
diff --git a/metadata/md5-cache/app-arch/tapeutils-0.4 b/metadata/md5-cache/app-arch/tapeutils-0.4
index 3f554ff54f3c..855b48fc9249 100644
--- a/metadata/md5-cache/app-arch/tapeutils-0.4
+++ b/metadata/md5-cache/app-arch/tapeutils-0.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Utilities for manipulation of tapes and tape image files
EAPI=6
HOMEPAGE=http://www.brouhaha.com/~eric/software/tapeutils/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=!app-emulation/hercules
SLOT=0
SRC_URI=http://www.brouhaha.com/~eric/software/tapeutils/tapeutils-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=167d669f46e36cfa47b8184d1c79e5a9
diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.1-r1 b/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
index 6864485bd453..97b6f1e8d249 100644
--- a/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
+++ b/metadata/md5-cache/app-arch/tarsync-0.2.1-r1
@@ -3,10 +3,11 @@ DEPEND=>=dev-util/diffball-0.7
DESCRIPTION=Delta compression suite for using/generating binary patches
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=>=dev-util/diffball-0.7
SLOT=0
SRC_URI=mirror://gentoo/tarsync-0.2.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9caf67455a8aa693a8d6ed4234209f7f
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.4 b/metadata/md5-cache/app-arch/unrar-6.0.4
index 9a3447493966..44bc9d8411f3 100644
--- a/metadata/md5-cache/app-arch/unrar-6.0.4
+++ b/metadata/md5-cache/app-arch/unrar-6.0.4
@@ -8,5 +8,5 @@ LICENSE=unRAR
RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
SLOT=0/6
SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.4.tar.gz -> unrar-6.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9c7b01049806e318da2a4c216f0ea099
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.5 b/metadata/md5-cache/app-arch/unrar-6.0.5
index eacee5b5df06..d5e9efd7b291 100644
--- a/metadata/md5-cache/app-arch/unrar-6.0.5
+++ b/metadata/md5-cache/app-arch/unrar-6.0.5
@@ -8,5 +8,5 @@ LICENSE=unRAR
RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
SLOT=0/6
SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.5.tar.gz -> unrar-6.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=184803e0e0418618e5f7b5220ee8e3b3
diff --git a/metadata/md5-cache/app-arch/unrar-6.0.6 b/metadata/md5-cache/app-arch/unrar-6.0.6
index 3ac11c9b945d..8778d23fb23f 100644
--- a/metadata/md5-cache/app-arch/unrar-6.0.6
+++ b/metadata/md5-cache/app-arch/unrar-6.0.6
@@ -8,5 +8,5 @@ LICENSE=unRAR
RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
SLOT=0/6
SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.0.6.tar.gz -> unrar-6.0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=89a7ec9d68dea230693a41d9eacfceea
diff --git a/metadata/md5-cache/app-backup/cdbackup-0.7.1-r1 b/metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
index bfe88f0ef21e..9622df4f6b74 100644
--- a/metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
+++ b/metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s
EAPI=6
HOMEPAGE=http://www.muempf.de/index.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=>=app-cdr/cdrtools-1.11.28
SLOT=0
SRC_URI=http://www.muempf.de/down/cdbackup-0.7.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bf59857b392b2735ce902b0bc54dd0dc
diff --git a/metadata/md5-cache/app-backup/cpdup-1.18 b/metadata/md5-cache/app-backup/cpdup-1.18
index f95c5e33bd6c..cc5c896cc5ea 100644
--- a/metadata/md5-cache/app-backup/cpdup-1.18
+++ b/metadata/md5-cache/app-backup/cpdup-1.18
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=A comprehensive filesystem mirroring program
EAPI=6
HOMEPAGE=http://apollo.backplane.com/FreeSrc/
+INHERIT=toolchain-funcs
IUSE=userland_GNU threads
KEYWORDS=~amd64
LICENSE=BSD-2
SLOT=0
SRC_URI=http://apollo.backplane.com/FreeSrc/cpdup-1.18.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f03aa65c6d6ca296b69f41deee2aac8c
diff --git a/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13 b/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13
index ec3440464f98..87c078a91d89 100644
--- a/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13
+++ b/metadata/md5-cache/app-backup/flexbackup-1.2.1-r13
@@ -3,6 +3,7 @@ DEPEND=app-arch/mt-st
DESCRIPTION=Flexible backup script using perl
EAPI=6
HOMEPAGE=http://flexbackup.sourceforge.net/
+INHERIT=versionator
KEYWORDS=amd64 ~hppa ppc x86
LICENSE=GPL-2
RDEPEND=app-arch/mt-st
diff --git a/metadata/md5-cache/app-backup/luckybackup-0.5.0 b/metadata/md5-cache/app-backup/luckybackup-0.5.0
index 0a64fefe9105..9677a613fcf0 100644
--- a/metadata/md5-cache/app-backup/luckybackup-0.5.0
+++ b/metadata/md5-cache/app-backup/luckybackup-0.5.0
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=Powerful and flexible backup (and syncing) tool, using RSync and Qt
EAPI=7
HOMEPAGE=http://luckybackup.sourceforge.net/
+INHERIT=qmake-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-misc/rsync sys-auth/polkit
SLOT=0
SRC_URI=mirror://sourceforge/luckybackup/luckybackup-0.5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=be2c8f904bb7330a06a840b6de7733c1
diff --git a/metadata/md5-cache/app-backup/rdumpfs-0.1 b/metadata/md5-cache/app-backup/rdumpfs-0.1
index 43d578df0cd5..d8d14fa1e777 100644
--- a/metadata/md5-cache/app-backup/rdumpfs-0.1
+++ b/metadata/md5-cache/app-backup/rdumpfs-0.1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=a rsync-based dump file system backup tool
EAPI=5
HOMEPAGE=https://github.com/chneukirchen/rdumpfs
+INHERIT=vcs-snapshot
IUSE=+xattr
KEYWORDS=~amd64
LICENSE=CC0-1.0
diff --git a/metadata/md5-cache/app-backup/sarab-1.0.0 b/metadata/md5-cache/app-backup/sarab-1.0.0
index a9517b1bd112..9457bc9e7b3d 100644
--- a/metadata/md5-cache/app-backup/sarab-1.0.0
+++ b/metadata/md5-cache/app-backup/sarab-1.0.0
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=SaraB is a powerful and automated backup scheduling system based on DAR
EAPI=6
HOMEPAGE=http://sarab.sourceforge.net/
+INHERIT=readme.gentoo-r1
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=app-backup/dar virtual/mailx
diff --git a/metadata/md5-cache/app-backup/synology-cloud-station-backup-4469 b/metadata/md5-cache/app-backup/synology-cloud-station-backup-4469
index 2db4cb0466c6..0c0606550e99 100644
--- a/metadata/md5-cache/app-backup/synology-cloud-station-backup-4469
+++ b/metadata/md5-cache/app-backup/synology-cloud-station-backup-4469
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Back up your files from multiple client computers to a centralized Synology NAS
EAPI=7
HOMEPAGE=https://www.synology.com/en-global/releaseNote/CloudStationBackup
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=Synology
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64? ( https://global.download.synology.com/download/Tools/CloudStationBackup/4.3.3-4469/Ubuntu/Installer/x86_64/synology-cloud-station-backup-4469.x86_64.deb ) x86? ( https://global.download.synology.com/download/Tools/CloudStationBackup/4.3.3-4469/Ubuntu/Installer/i686/synology-cloud-station-backup-4469.i686.deb )
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=8734667159d7d2df0a6ba684c9b7e158
diff --git a/metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r2 b/metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r2
index 3c10d2775a7d..632aa062a439 100644
--- a/metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r2
+++ b/metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Performance Test of Filesystem I/O using standard C library calls
EAPI=6
HOMEPAGE=http://www.textuality.com/bonnie/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=bonnie
SLOT=0
SRC_URI=http://www.textuality.com/bonnie/bonnie.tar.gz -> bonnie-2.0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6066a941383285fd5d56c40e23423cb0
diff --git a/metadata/md5-cache/app-benchmarks/hey-0.1.2 b/metadata/md5-cache/app-benchmarks/hey-0.1.2
index 5a4891a500b0..aec423c68349 100644
--- a/metadata/md5-cache/app-benchmarks/hey-0.1.2
+++ b/metadata/md5-cache/app-benchmarks/hey-0.1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=HTTP load generator, ApacheBench (ab) replacement, formerly known as rakyll/boom
EAPI=7
HOMEPAGE=https://github.com/rakyll/hey
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD
RESTRICT=test
diff --git a/metadata/md5-cache/app-benchmarks/interbench-0.31 b/metadata/md5-cache/app-benchmarks/interbench-0.31
index 23271f5f081e..1f67fcb11d83 100644
--- a/metadata/md5-cache/app-benchmarks/interbench-0.31
+++ b/metadata/md5-cache/app-benchmarks/interbench-0.31
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=A Linux interactivity benchmark
EAPI=7
HOMEPAGE=https://github.com/ckolivas/interbench/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://github.com/ckolivas/interbench/archive/v0.31.tar.gz -> interbench-0.31.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dbe4f50c8ca4f68f7f6700f7338a042c
diff --git a/metadata/md5-cache/app-benchmarks/ioping-1.1 b/metadata/md5-cache/app-benchmarks/ioping-1.1
index 0909a014abb1..271953238bf0 100644
--- a/metadata/md5-cache/app-benchmarks/ioping-1.1
+++ b/metadata/md5-cache/app-benchmarks/ioping-1.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Simple disk I/0 latency measuring tool
EAPI=7
HOMEPAGE=https://github.com/koct9i/ioping
+INHERIT=toolchain-funcs
IUSE=netdata
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
SLOT=0
SRC_URI=https://github.com/koct9i/ioping/archive/v1.1.tar.gz -> ioping-1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b26ede2c4ea42c7ac3f0fdf526ef2c8e
diff --git a/metadata/md5-cache/app-benchmarks/iozone-3.471 b/metadata/md5-cache/app-benchmarks/iozone-3.471
index cc475903d1a6..55c75c9616d4 100644
--- a/metadata/md5-cache/app-benchmarks/iozone-3.471
+++ b/metadata/md5-cache/app-benchmarks/iozone-3.471
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Filesystem benchmarking program
EAPI=6
HOMEPAGE=http://www.iozone.org/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~ia64 ppc ppc64 ~sparc x86
LICENSE=freedist
SLOT=0
SRC_URI=http://www.iozone.org/src/current/iozone3_471.tar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2ac00e617231d5a861f9dee889d8868c
diff --git a/metadata/md5-cache/app-benchmarks/iozone-3.484 b/metadata/md5-cache/app-benchmarks/iozone-3.484
index d78d15b23a77..d0ee1a56e133 100644
--- a/metadata/md5-cache/app-benchmarks/iozone-3.484
+++ b/metadata/md5-cache/app-benchmarks/iozone-3.484
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Filesystem benchmarking program
EAPI=7
HOMEPAGE=http://www.iozone.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=freedist
SLOT=0
SRC_URI=http://www.iozone.org/src/current/iozone3_484.tar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4bae5cfe91847c1b1161325b0b3e5c03
diff --git a/metadata/md5-cache/app-benchmarks/iozone-3.487 b/metadata/md5-cache/app-benchmarks/iozone-3.487
index 22be4ce517d2..2478dd8c9c22 100644
--- a/metadata/md5-cache/app-benchmarks/iozone-3.487
+++ b/metadata/md5-cache/app-benchmarks/iozone-3.487
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Filesystem benchmarking program
EAPI=7
HOMEPAGE=http://www.iozone.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=freedist
SLOT=0
SRC_URI=http://www.iozone.org/src/current/iozone3_487.tar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=975a1ff65c692928dd720597ec542d5f
diff --git a/metadata/md5-cache/app-benchmarks/iozone-3.488 b/metadata/md5-cache/app-benchmarks/iozone-3.488
index 5f9cea6fdef1..9952be8af4cc 100644
--- a/metadata/md5-cache/app-benchmarks/iozone-3.488
+++ b/metadata/md5-cache/app-benchmarks/iozone-3.488
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Filesystem benchmarking program
EAPI=7
HOMEPAGE=http://www.iozone.org/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
LICENSE=freedist
SLOT=0
SRC_URI=http://www.iozone.org/src/current/iozone3_488.tar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a3ccda4110831422a756d48e4048696f
diff --git a/metadata/md5-cache/app-benchmarks/nbench-2.2.3-r1 b/metadata/md5-cache/app-benchmarks/nbench-2.2.3-r1
index 9253d5727d2b..5f87d927281b 100644
--- a/metadata/md5-cache/app-benchmarks/nbench-2.2.3-r1
+++ b/metadata/md5-cache/app-benchmarks/nbench-2.2.3-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark
EAPI=6
HOMEPAGE=http://www.tux.org/~mayer/linux/bmark.html
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86
LICENSE=freedist
SLOT=0
SRC_URI=http://www.tux.org/~mayer/linux/nbench-byte-2.2.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=06e64acf434efe8b76c258c70819f46f
diff --git a/metadata/md5-cache/app-benchmarks/tiobench-0.4.2 b/metadata/md5-cache/app-benchmarks/tiobench-0.4.2
index fda28933da52..e7aebd28e9cf 100644
--- a/metadata/md5-cache/app-benchmarks/tiobench-0.4.2
+++ b/metadata/md5-cache/app-benchmarks/tiobench-0.4.2
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl
DESCRIPTION=Portable, robust, fully-threaded I/O benchmark program
EAPI=6
HOMEPAGE=https://github.com/mkuoppal/tiobench
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=https://github.com/mkuoppal/tiobench/archive/v0.4.2.tar.gz -> tiobench-0.4.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3400c4263f990c6e3719486b6a2eba11
diff --git a/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1 b/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
index 567f18e09e12..344261690484 100644
--- a/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
+++ b/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Convert CD images from b5i (BlindWrite) to iso
EAPI=6
HOMEPAGE=https://web.archive.org/web/20100116120705/b5i2iso.berlios.de
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/b5i2iso-0.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7a995165c0aa9693487b570c86dc19dd
diff --git a/metadata/md5-cache/app-cdr/bchunk-1.2.2 b/metadata/md5-cache/app-cdr/bchunk-1.2.2
index 9759b7d39c2e..fe67640191cb 100644
--- a/metadata/md5-cache/app-cdr/bchunk-1.2.2
+++ b/metadata/md5-cache/app-cdr/bchunk-1.2.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Convert CD images from bin/cue to iso+wav/cdr
EAPI=7
HOMEPAGE=http://he.fi/bchunk/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://he.fi/bchunk/bchunk-1.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f2b01baab584f38ea3b80357a6b635d4
diff --git a/metadata/md5-cache/app-cdr/bin2iso-19b-r2 b/metadata/md5-cache/app-cdr/bin2iso-19b-r2
index 8b4c53915841..3e935785389a 100644
--- a/metadata/md5-cache/app-cdr/bin2iso-19b-r2
+++ b/metadata/md5-cache/app-cdr/bin2iso-19b-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=converts RAW format (.bin/.cue) files to ISO/WAV format
EAPI=6
HOMEPAGE=http://users.andara.com/~doiron/bin2iso/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://gentoo/bin2iso-19b.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=80f4001c9c9e2263d7dcbdffd88d0e96
diff --git a/metadata/md5-cache/app-cdr/cddetect-2.1 b/metadata/md5-cache/app-cdr/cddetect-2.1
index 69e6c3dc1d0e..43db38a0411b 100644
--- a/metadata/md5-cache/app-cdr/cddetect-2.1
+++ b/metadata/md5-cache/app-cdr/cddetect-2.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Tool for detecting the type of a CD/DVD without mounting it
EAPI=7
HOMEPAGE=http://www.bellut.net/projects.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.bellut.net/files/cddetect-2.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=71f235f1cb548261f93c5d4b24e4747f
diff --git a/metadata/md5-cache/app-cdr/cuecue-0.2.2-r3 b/metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
index 47669424cbd4..55fbc81b725b 100644
--- a/metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
+++ b/metadata/md5-cache/app-cdr/cuecue-0.2.2-r3
@@ -3,6 +3,7 @@ DEPEND=flac? ( media-libs/flac ) mp3? ( media-libs/libmad ) vorbis? ( media-libs
DESCRIPTION=Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
IUSE=flac mp3 +vorbis
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=flac? ( media-libs/flac ) mp3? ( media-libs/libmad ) vorbis? ( media-lib
REQUIRED_USE=|| ( flac mp3 vorbis )
SLOT=0
SRC_URI=mirror://gentoo/cuecue-0.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b417e7677ca2644d76ce77489c35625e
diff --git a/metadata/md5-cache/app-cdr/daa2iso-0.1.7e b/metadata/md5-cache/app-cdr/daa2iso-0.1.7e
index ebbf099928ff..7930f8c9191f 100644
--- a/metadata/md5-cache/app-cdr/daa2iso-0.1.7e
+++ b/metadata/md5-cache/app-cdr/daa2iso-0.1.7e
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=Program for converting the DAA and GBI files to ISO
EAPI=6
HOMEPAGE=http://aluigi.org/mytoolz.htm
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://aluigi.org/mytoolz/daa2iso.zip -> daa2iso-0.1.7e.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5bde800e410016a426a7a2be1c12b6ed
diff --git a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3 b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
index fa82595c84a2..c4fc794ac428 100644
--- a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
+++ b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
@@ -3,6 +3,7 @@ DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig test? ( dev-util/valgrin
DESCRIPTION=A tool to dump and debug bootable CD-like images
EAPI=6
HOMEPAGE=https://github.com/rhboot/dumpet
+INHERIT=toolchain-funcs vcs-snapshot
IUSE=test
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/popt
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/rhboot/dumpet/archive/8f47670dd582c96ad1b6dd3c9b9da0acebded5d8.tar.gz -> dumpet-2.1_p20140601.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=c6dee486f8683e4ddb0ca7677e468e8b
diff --git a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
index 679e060fd71c..f4732ba47116 100644
--- a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
+++ b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r3
@@ -3,10 +3,11 @@ DEPEND=app-cdr/cdrtools sys-devel/m4
DESCRIPTION=A set of tools for DVD+RW/-RW drives
EAPI=6
HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-cdr/cdrtools
SLOT=0
SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c58342e9e907a48cee247140321b9730
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5 b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
index 10b5f6861658..a03d9a6b0ca7 100644
--- a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 nls? ( virtual/libint
DESCRIPTION=Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)
EAPI=7
HOMEPAGE=http://dvdisaster.net/
+INHERIT=desktop toolchain-funcs xdg
IUSE=debug nls l10n_cs l10n_de l10n_it l10n_pt-BR l10n_ru l10n_sv
KEYWORDS=amd64 ppc x86
LICENSE=GPL-3+
RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 nls? ( virtual/libintl )
SLOT=0
SRC_URI=http://dvdisaster.net/downloads/dvdisaster-0.79.5.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=3513bd6917a9c6faaee7e608ab736c05
diff --git a/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10 b/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
index 823d5dcda950..4d7f3a052895 100644
--- a/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
+++ b/metadata/md5-cache/app-cdr/dvdshrink-2.6.1_p10
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=Scriptable DVD copy software
EAPI=6
HOMEPAGE=http://dvdshrink.sourceforge.net
+INHERIT=desktop
IUSE=gtk
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-cdr/gaffitter-0.6.0-r1 b/metadata/md5-cache/app-cdr/gaffitter-0.6.0-r1
index 9c5c634ab375..1a8b794ea207 100644
--- a/metadata/md5-cache/app-cdr/gaffitter-0.6.0-r1
+++ b/metadata/md5-cache/app-cdr/gaffitter-0.6.0-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Genetic Algorithm File Fitter
EAPI=6
HOMEPAGE=http://gaffitter.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=scripts
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://sourceforge/gaffitter/gaffitter-0.6.0.tar.bz2 scripts? ( mirror://sourceforge/gaffitter/scripts/0.1.0/scripts-0.1.0.tar.bz2 )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4491f39dcff410b6ed515a7af6998f95
diff --git a/metadata/md5-cache/app-cdr/isomaster-1.3.15 b/metadata/md5-cache/app-cdr/isomaster-1.3.15
index 7f1a9fc163b5..f901b5a62752 100644
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.15
+++ b/metadata/md5-cache/app-cdr/isomaster-1.3.15
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2 virtual/pkgconfig nls? ( >=sys
DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
EAPI=7
HOMEPAGE=http://littlesvr.ca/isomaster
+INHERIT=toolchain-funcs xdg-utils
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2
SLOT=0
SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.15.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f63debcb609cbedbeac5afcb6348d3d2
diff --git a/metadata/md5-cache/app-cdr/isomaster-1.3.16 b/metadata/md5-cache/app-cdr/isomaster-1.3.16
index 512be4a9ebb9..a595446444b1 100644
--- a/metadata/md5-cache/app-cdr/isomaster-1.3.16
+++ b/metadata/md5-cache/app-cdr/isomaster-1.3.16
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2 virtual/pkgconfig nls? ( >=sys
DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
EAPI=7
HOMEPAGE=http://littlesvr.ca/isomaster
+INHERIT=toolchain-funcs xdg-utils
IUSE=nls
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2
SLOT=0
SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.16.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5c7bb41f328a4e9674401447b2c6633b
diff --git a/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2 b/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
index efbde413eccd..6ee7ced2230f 100644
--- a/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
+++ b/metadata/md5-cache/app-cdr/nrg2iso-0.4-r2
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install test
DESCRIPTION=Convert CD images from nrg (Nero) to iso
EAPI=6
HOMEPAGE=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=GPL-2+
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso-0.4.tar.gz test? ( https://yegortimoshenko.s3.amazonaws.com/nrg2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/nrg2iso-test.nrg )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=13efb9f8f58666b7e7170588318d4330
diff --git a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1 b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
index a57d6caaadc5..2ed95f1256c3 100644
--- a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
+++ b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib app-arch/unzip
DESCRIPTION=Convert CD images from uif (MagicISO) to iso
EAPI=6
HOMEPAGE=http://aluigi.altervista.org/mytoolz.htm#uif2iso
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=sys-libs/zlib
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://gentoo/uif2iso-0.1.7c.zip test? ( https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.uif )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=88edaceac4e33b1a941f4ddbc5c3dd0e
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.6.2 b/metadata/md5-cache/app-cdr/xfburn-0.6.2
index 51aff91eb9e5..febb8b9699e6 100644
--- a/metadata/md5-cache/app-cdr/xfburn-0.6.2
+++ b/metadata/md5-cache/app-cdr/xfburn-0.6.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6
DESCRIPTION=GTK+ based CD and DVD burning application
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/applications/xfburn
+INHERIT=xdg-utils
IUSE=gstreamer +udev
KEYWORDS=amd64 arm ~ppc x86
LICENSE=GPL-2+
diff --git a/metadata/md5-cache/app-crypt/age-1.0.0_beta_p7 b/metadata/md5-cache/app-crypt/age-1.0.0_beta_p7
index e5dce59a9a21..7bd4c678d594 100644
--- a/metadata/md5-cache/app-crypt/age-1.0.0_beta_p7
+++ b/metadata/md5-cache/app-crypt/age-1.0.0_beta_p7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=A simple, modern and secure encryption tool (and Go library)
EAPI=7
HOMEPAGE=https://github.com/FiloSottile/age
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD
RESTRICT=strip
diff --git a/metadata/md5-cache/app-crypt/age-1.0.0_rc1 b/metadata/md5-cache/app-crypt/age-1.0.0_rc1
index 8f9b0920c703..0150dfd6688b 100644
--- a/metadata/md5-cache/app-crypt/age-1.0.0_rc1
+++ b/metadata/md5-cache/app-crypt/age-1.0.0_rc1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=A simple, modern and secure encryption tool (and Go library)
EAPI=7
HOMEPAGE=https://github.com/FiloSottile/age
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD
RESTRICT=strip
diff --git a/metadata/md5-cache/app-crypt/asekey-3.7 b/metadata/md5-cache/app-crypt/asekey-3.7
index ee60f7c93332..6332c407163b 100644
--- a/metadata/md5-cache/app-crypt/asekey-3.7
+++ b/metadata/md5-cache/app-crypt/asekey-3.7
@@ -4,10 +4,11 @@ DEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0
DESCRIPTION=ASEKey USB SIM Card Reader
EAPI=7
HOMEPAGE=https://www.athena-scs.com/
+INHERIT=udev
KEYWORDS=~amd64 ~x86
LICENSE=BSD LGPL-2.1
RDEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0
SLOT=0
SRC_URI=http://www.athena-scs.com/docs/reader-drivers/asekey-3-7-tar.bz2 -> asekey-3.7.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=26abbc7e078ea38ff884770cfb208461
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.33 b/metadata/md5-cache/app-crypt/ccid-1.4.33
index 604210ae0ef4..fce3aba6b088 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.33
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.33
@@ -4,11 +4,12 @@ DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
DESCRIPTION=CCID free software driver
EAPI=7
HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
+INHERIT=toolchain-funcs udev
IUSE=twinserial kobil-midentity +usb
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
SLOT=0
SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.33.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=51e0fd5c568689832a04662580059708
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.34 b/metadata/md5-cache/app-crypt/ccid-1.4.34
index f73d085aeb8d..bd102b941a38 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.34
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.34
@@ -4,11 +4,12 @@ DEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
DESCRIPTION=CCID free software driver
EAPI=7
HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
+INHERIT=toolchain-funcs udev
IUSE=twinserial kobil-midentity +usb
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
SLOT=0
SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.34.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=41afffaff522d4ac3726ee41b09f3315
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index 6a50d2c99515..1ac98e1db711 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-augeas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
-_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 f0ca511df3fddd316b783632b804e8fb git-r3 b8e8c92aa5fe8df7187e466138eb4e52
_md5_=447a7040ddfb997bdd9270b4c9a58fcb
diff --git a/metadata/md5-cache/app-crypt/cfssl-1.4.1 b/metadata/md5-cache/app-crypt/cfssl-1.4.1
index cceebf65ea5a..9037e6e1e4b9 100644
--- a/metadata/md5-cache/app-crypt/cfssl-1.4.1
+++ b/metadata/md5-cache/app-crypt/cfssl-1.4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Cloudflare's PKI and TLS toolkit
EAPI=7
HOMEPAGE=https://github.com/cloudflare/cfssl
+INHERIT=go-module
IUSE=hardened
KEYWORDS=amd64
LICENSE=Apache-2.0 BSD BSD-1 MIT MPL-2.0
diff --git a/metadata/md5-cache/app-crypt/codegroup-20080907-r1 b/metadata/md5-cache/app-crypt/codegroup-20080907-r1
index 2a18998e1004..44ee1c4048d6 100644
--- a/metadata/md5-cache/app-crypt/codegroup-20080907-r1
+++ b/metadata/md5-cache/app-crypt/codegroup-20080907-r1
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=encode / decode binary file as five letter codegroups
EAPI=6
HOMEPAGE=http://www.fourmilab.ch/codegroup/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://www.fourmilab.ch/codegroup/codegroup.zip -> codegroup-20080907.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3ee88048c2a35aea0e841a66ba7528e8
diff --git a/metadata/md5-cache/app-crypt/elettra-1.0 b/metadata/md5-cache/app-crypt/elettra-1.0
index d580c6bc5b46..56253ca3576c 100644
--- a/metadata/md5-cache/app-crypt/elettra-1.0
+++ b/metadata/md5-cache/app-crypt/elettra-1.0
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib app-crypt/mhash dev-libs/libmcrypt
DESCRIPTION=Plausible deniable file cryptography
EAPI=7
HOMEPAGE=https://www.winstonsmith.info/julia/elettra/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=WTFPL-2
RDEPEND=sys-libs/zlib app-crypt/mhash dev-libs/libmcrypt
SLOT=0
SRC_URI=https://www.winstonsmith.info/julia/elettra/elettra-src-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e0cf1eeecac0c36ea29b0205357f3919
diff --git a/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1 b/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
index 9ba62e91def2..58fb2202f0ff 100644
--- a/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
+++ b/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=GIF colourmap steganography
EAPI=6
HOMEPAGE=http://www.darkside.com.au/gifshuffle/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://www.darkside.com.au/gifshuffle/gifshuffle.tar.gz -> gifshuffle-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=01fbc080659bc721af3d2f58b251f9ef
diff --git a/metadata/md5-cache/app-crypt/gpa-0.10.0 b/metadata/md5-cache/app-crypt/gpa-0.10.0
index 989ae60272ec..6d7a5d7f81de 100644
--- a/metadata/md5-cache/app-crypt/gpa-0.10.0
+++ b/metadata/md5-cache/app-crypt/gpa-0.10.0
@@ -4,11 +4,12 @@ DEPEND=>=app-crypt/gnupg-2:= >=app-crypt/gpgme-1.11.1:= >=dev-libs/libassuan-1.1
DESCRIPTION=The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG
EAPI=7
HOMEPAGE=http://gpa.wald.intevation.org
+INHERIT=xdg
IUSE=nls
KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
LICENSE=GPL-3
RDEPEND=>=app-crypt/gnupg-2:= >=app-crypt/gpgme-1.11.1:= >=dev-libs/libassuan-1.1.0:= >=dev-libs/libgpg-error-1.4:= >=x11-libs/gtk+-2.10.0:2=
SLOT=0
SRC_URI=mirror://gnupg/gpa/gpa-0.10.0.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=fc3a900f25a1c9d141f54adcfaf04f2b
diff --git a/metadata/md5-cache/app-crypt/gpgstats-0.5-r1 b/metadata/md5-cache/app-crypt/gpgstats-0.5-r1
index 04aff872ff97..c65e80a02f50 100644
--- a/metadata/md5-cache/app-crypt/gpgstats-0.5-r1
+++ b/metadata/md5-cache/app-crypt/gpgstats-0.5-r1
@@ -3,10 +3,11 @@ DEPEND=app-crypt/gpgme
DESCRIPTION=GPGstats calculates statistics on the keys in your key-ring
EAPI=7
HOMEPAGE=http://www.vanheusden.com/gpgstats/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-crypt/gpgme
SLOT=0
SRC_URI=http://www.vanheusden.com/gpgstats/gpgstats-0.5.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aeaf96ecf9068f02dcac288761b32ea7
diff --git a/metadata/md5-cache/app-crypt/jitterentropy-2.2.0 b/metadata/md5-cache/app-crypt/jitterentropy-2.2.0
index 2524664017cb..bf3406ab1f7f 100644
--- a/metadata/md5-cache/app-crypt/jitterentropy-2.2.0
+++ b/metadata/md5-cache/app-crypt/jitterentropy-2.2.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Hardware RNG based on CPU timing jitter
EAPI=7
HOMEPAGE=https://github.com/smuellerDD/jitterentropy-library
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/smuellerDD/jitterentropy-library/archive/v2.2.0.tar.gz -> jitterentropy-2.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=50175da48169087b3634cd30a56d9623
diff --git a/metadata/md5-cache/app-crypt/jitterentropy-3.0.1 b/metadata/md5-cache/app-crypt/jitterentropy-3.0.1
index bf378bb9c4f7..1a8307256c90 100644
--- a/metadata/md5-cache/app-crypt/jitterentropy-3.0.1
+++ b/metadata/md5-cache/app-crypt/jitterentropy-3.0.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Hardware RNG based on CPU timing jitter
EAPI=7
HOMEPAGE=https://github.com/smuellerDD/jitterentropy-library
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
LICENSE=BSD
SLOT=0/3
SRC_URI=https://github.com/smuellerDD/jitterentropy-library/archive/v3.0.1.tar.gz -> jitterentropy-3.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=927e94a9ee6f84ff47362e8f7d682d61
diff --git a/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.2_alpha b/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.2_alpha
index 18d5fbd973ab..8f9e4537af7f 100644
--- a/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.2_alpha
+++ b/metadata/md5-cache/app-crypt/kencfs-plasma-2.0.2_alpha
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-
DESCRIPTION=GUI frontend for encfs
EAPI=7
HOMEPAGE=https://www.linux-apps.com/p/1170068/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/knotifications:5 kde-frameworks/kwallet:5 sys-fs/encfs
SLOT=0
SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kencfs-plasma-2.0.2a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=18a680106bebbf9c1c128f94c19c03fe
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.21 b/metadata/md5-cache/app-crypt/libscrypt-1.21
index c71f5ea7d1a5..6a44b8c23473 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.21
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.21
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile setup
DESCRIPTION=Shared library to impliment the scrypt algorithm
EAPI=6
HOMEPAGE=https://github.com/technion/libscrypt
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
LICENSE=BSD-2
SLOT=0
SRC_URI=https://github.com/technion/libscrypt/archive/v1.21.tar.gz -> libscrypt-1.21.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2729a2b007a876f4948fede0c7c4fbd1
diff --git a/metadata/md5-cache/app-crypt/md4sum-0.02.03-r2 b/metadata/md5-cache/app-crypt/md4sum-0.02.03-r2
index 28800d63402c..b3fb2802fc49 100644
--- a/metadata/md5-cache/app-crypt/md4sum-0.02.03-r2
+++ b/metadata/md5-cache/app-crypt/md4sum-0.02.03-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=md4 and edonkey hash algorithm tool
EAPI=7
HOMEPAGE=https://linux.xulin.de/c/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://linux.xulin.de/c/md4sum-0.02.03.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4aa887fbed06bcb45561f1ba43d11691
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.43.19 b/metadata/md5-cache/app-crypt/moolticute-0.43.19
index 2920c9fb1214..c92b5a6ed9ad 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.43.19
+++ b/metadata/md5-cache/app-crypt/moolticute-0.43.19
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install postinst postrm prepare
DESCRIPTION=Mooltipass crossplatform daemon/tools
EAPI=7
HOMEPAGE=https://github.com/mooltipass/moolticute
+INHERIT=xdg-utils qmake-utils udev
KEYWORDS=~amd64 ~arm
LICENSE=GPL-3
RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtdbus:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.43.19.tar.gz -> moolticute-0.43.19.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 udev 452708c3f55cf6e918b045adb949a9e6
_md5_=d2d9da048b975a9d0305271ad36e51c3
diff --git a/metadata/md5-cache/app-crypt/nasty-0.6-r1 b/metadata/md5-cache/app-crypt/nasty-0.6-r1
index d55b27384204..1b51fc813866 100644
--- a/metadata/md5-cache/app-crypt/nasty-0.6-r1
+++ b/metadata/md5-cache/app-crypt/nasty-0.6-r1
@@ -3,10 +3,11 @@ DEPEND=app-crypt/gpgme
DESCRIPTION=Proof-of-concept GPG passphrase recovery tool
EAPI=7
HOMEPAGE=http://www.vanheusden.com/nasty/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-crypt/gpgme
SLOT=0
SRC_URI=http://www.vanheusden.com/nasty/nasty-0.6.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=877f34cd1bb30fe8eac96245b9e06535
diff --git a/metadata/md5-cache/app-crypt/nwipe-0.30 b/metadata/md5-cache/app-crypt/nwipe-0.30
index 27f27c021b9f..4cd23a416dd0 100644
--- a/metadata/md5-cache/app-crypt/nwipe-0.30
+++ b/metadata/md5-cache/app-crypt/nwipe-0.30
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=sys-block/parted sys-libs/ncurses:=
SLOT=0
SRC_URI=https://github.com/martijnvanbrummelen/nwipe/archive/v0.30.tar.gz -> nwipe-0.30.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=38ac24e39df69520bddac084bcd5a6f4
diff --git a/metadata/md5-cache/app-crypt/pdfcrack-0.19 b/metadata/md5-cache/app-crypt/pdfcrack-0.19
index 7805b8166c50..010f947ac318 100644
--- a/metadata/md5-cache/app-crypt/pdfcrack-0.19
+++ b/metadata/md5-cache/app-crypt/pdfcrack-0.19
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Tool for recovering passwords and content from PDF-files
EAPI=7
HOMEPAGE=http://pdfcrack.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/pdfcrack/pdfcrack-0.19.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=98ebb446d2565c29dae8192f7168bd8d
diff --git a/metadata/md5-cache/app-crypt/signify-30 b/metadata/md5-cache/app-crypt/signify-30
index 00fedd163fe9..414d300fc610 100644
--- a/metadata/md5-cache/app-crypt/signify-30
+++ b/metadata/md5-cache/app-crypt/signify-30
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/libbsd-0.7
DESCRIPTION=Cryptographically sign and verify files
EAPI=7
HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD-1
RDEPEND=>=dev-libs/libbsd-0.7
SLOT=0
SRC_URI=https://github.com/aperezdc/signify/archive/v30.tar.gz -> signify-30.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=43f0389cb4764623ed26ea319a67b0c0
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.10-r1 b/metadata/md5-cache/app-crypt/signing-party-2.10-r1
index 3fec152d452e..88e64a44b531 100644
--- a/metadata/md5-cache/app-crypt/signing-party-2.10-r1
+++ b/metadata/md5-cache/app-crypt/signing-party-2.10-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl app-crypt/libmd >=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
SLOT=0
SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.10.orig.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=36cb5ed35450f5c42421357bed1d2412
diff --git a/metadata/md5-cache/app-crypt/ssss-0.5.7 b/metadata/md5-cache/app-crypt/ssss-0.5.7
index d73aa46ddb7e..2eb6184efc33 100644
--- a/metadata/md5-cache/app-crypt/ssss-0.5.7
+++ b/metadata/md5-cache/app-crypt/ssss-0.5.7
@@ -4,10 +4,11 @@ DEPEND=dev-libs/gmp:0=
DESCRIPTION=Shamir's Secret Sharing Scheme
EAPI=7
HOMEPAGE=https://github.com/MrJoy/ssss
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/gmp:0=
SLOT=0
SRC_URI=https://github.com/MrJoy/ssss/archive/releases/v0.5.7.tar.gz -> ssss-0.5.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3ae1e8afa377a553c2a77c973ae9513b
diff --git a/metadata/md5-cache/app-crypt/xor-analyze-0.5-r1 b/metadata/md5-cache/app-crypt/xor-analyze-0.5-r1
index ed394be0e174..2135b4d04d85 100644
--- a/metadata/md5-cache/app-crypt/xor-analyze-0.5-r1
+++ b/metadata/md5-cache/app-crypt/xor-analyze-0.5-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=program for cryptanalyzing xor 'encryption' with variable key length
EAPI=6
HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=xor-analyze
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.habets.pp.se/synscan/files/xor-analyze-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=358e8fca1643b17fd8bed6f6af42daeb
diff --git a/metadata/md5-cache/app-dicts/gwaei-3.6.2 b/metadata/md5-cache/app-dicts/gwaei-3.6.2
index 2eb5d97f3b8a..a17563bcc381 100644
--- a/metadata/md5-cache/app-dicts/gwaei-3.6.2
+++ b/metadata/md5-cache/app-dicts/gwaei-3.6.2
@@ -4,6 +4,7 @@ DEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app-
DESCRIPTION=Japanese-English Dictionary for GNOME
EAPI=7
HOMEPAGE=http://gwaei.sourceforge.net/
+INHERIT=gnome2-utils
IUSE=gtk hunspell nls mecab test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/gwaei/gwaei-3.6.2.tar.xz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=10f87eca237f48612b8ef8532116774a
diff --git a/metadata/md5-cache/app-dicts/myspell-af-20080701 b/metadata/md5-cache/app-dicts/myspell-af-20080701
index 2d76d73f0b99..5b0af9e462d2 100644
--- a/metadata/md5-cache/app-dicts/myspell-af-20080701
+++ b/metadata/md5-cache/app-dicts/myspell-af-20080701
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Afrikaans dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.services.openoffice.org/project/dict_af
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-3
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-bg-4.3 b/metadata/md5-cache/app-dicts/myspell-bg-4.3
index 130d9352b3c3..5962ac857a76 100644
--- a/metadata/md5-cache/app-dicts/myspell-bg-4.3
+++ b/metadata/md5-cache/app-dicts/myspell-bg-4.3
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Bulgarian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://bgoffice.sourceforge.net/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ca-2.3.0 b/metadata/md5-cache/app-dicts/myspell-ca-2.3.0
index b59bdb5fbe4d..d1fc2a976842 100644
--- a/metadata/md5-cache/app-dicts/myspell-ca-2.3.0
+++ b/metadata/md5-cache/app-dicts/myspell-ca-2.3.0
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Catalan dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.softcatala.org/wiki/Rebost:Corrector_ortogr%C3%A0fic_de_catal%C3%A0_%28general%29_per_a_l%27OpenOffice.org
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-cs-20110224 b/metadata/md5-cache/app-dicts/myspell-cs-20110224
index 8de5b56e2203..4a1405a19ef7 100644
--- a/metadata/md5-cache/app-dicts/myspell-cs-20110224
+++ b/metadata/md5-cache/app-dicts/myspell-cs-20110224
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Czech dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.liberix.cz/doplnky/slovniky/ooo/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=GPL-2 MIT
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-cs-20181003 b/metadata/md5-cache/app-dicts/myspell-cs-20181003
index 682c96a607c6..3c88b02098cd 100644
--- a/metadata/md5-cache/app-dicts/myspell-cs-20181003
+++ b/metadata/md5-cache/app-dicts/myspell-cs-20181003
@@ -3,6 +3,7 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Czech dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://extensions.libreoffice.org/extensions/czech-dictionaries
+INHERIT=myspell-r2
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
LICENSE=GPL-2 MIT
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-cy-20130708 b/metadata/md5-cache/app-dicts/myspell-cy-20130708
index 2f32ed410129..133c41ff736b 100644
--- a/metadata/md5-cache/app-dicts/myspell-cy-20130708
+++ b/metadata/md5-cache/app-dicts/myspell-cy-20130708
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Welsh dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/gwirydd-sillafu-cymraeg-welsh-language-spell-checker
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-da-2.3 b/metadata/md5-cache/app-dicts/myspell-da-2.3
index 2c6be396ebcd..4e889a35370a 100644
--- a/metadata/md5-cache/app-dicts/myspell-da-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-da-2.3
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Danish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12 b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
index 7fc55dfca9ee..9bf1b8d5fa61 100644
--- a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
+++ b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=German (AT,CH,DE) dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3 GPL-2 LGPL-3+
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-de_1901-20160403 b/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
index 546f15609789..2f102fd5d4a9 100644
--- a/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
+++ b/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=German (traditional orthography) dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.j3e.de/myspell/ http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=|| ( GPL-2 GPL-3 )
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-el-0.9 b/metadata/md5-cache/app-dicts/myspell-el-0.9
index 05d1f82848d5..2650f439d826 100644
--- a/metadata/md5-cache/app-dicts/myspell-el-0.9
+++ b/metadata/md5-cache/app-dicts/myspell-el-0.9
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Greek dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.elspell.gr/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20170101 b/metadata/md5-cache/app-dicts/myspell-en-20170101
index 1992489f1b1e..504d44600cfb 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20170101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20170101
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=English dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20181101 b/metadata/md5-cache/app-dicts/myspell-en-20181101
index 04f41455f8d1..54d54de33969 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20181101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20181101
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=English dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+INHERIT=myspell-r2
IUSE=l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=BSD MIT LGPL-3+
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20190101 b/metadata/md5-cache/app-dicts/myspell-en-20190101
index f99599351119..0c91aef0e403 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20190101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20190101
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=English dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+INHERIT=myspell-r2
IUSE=l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=BSD MIT LGPL-3+
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20190101-r1 b/metadata/md5-cache/app-dicts/myspell-en-20190101-r1
index d6c87e42ebd5..fdac16ce4808 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20190101-r1
+++ b/metadata/md5-cache/app-dicts/myspell-en-20190101-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=English dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+INHERIT=myspell-r2
IUSE=l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=BSD MIT LGPL-3+
diff --git a/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1 b/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1
index 6ab53ceae6b1..e09f073b1183 100644
--- a/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1
+++ b/metadata/md5-cache/app-dicts/myspell-eo-1.0-r1
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Esperanto dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://nlp.fi.muni.cz/projekty/esperanto_spell_checker/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-es-0.7 b/metadata/md5-cache/app-dicts/myspell-es-0.7
index bbe32718ff7c..0749b877ec6a 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-0.7
+++ b/metadata/md5-cache/app-dicts/myspell-es-0.7
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Spanish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://rla-es.forja.rediris.es/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=GPL-3 LGPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-es-2.3 b/metadata/md5-cache/app-dicts/myspell-es-2.3
index 9e8084dde5cd..d618dbc378d1 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-es-2.3
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Spanish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://github.com/sbosio/rla-es
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3 LGPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-es-2.6 b/metadata/md5-cache/app-dicts/myspell-es-2.6
index 04aaef4c514a..acc715c7c915 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-2.6
+++ b/metadata/md5-cache/app-dicts/myspell-es-2.6
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Spanish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://github.com/sbosio/rla-es
+INHERIT=myspell-r2
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
LICENSE=GPL-3 LGPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-et-20030606 b/metadata/md5-cache/app-dicts/myspell-et-20030606
index a557369d81c8..7d3d4da10c29 100644
--- a/metadata/md5-cache/app-dicts/myspell-et-20030606
+++ b/metadata/md5-cache/app-dicts/myspell-et-20030606
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Estonian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.meso.ee/~jjpp/speller/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-3
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-fo-0.4.2 b/metadata/md5-cache/app-dicts/myspell-fo-0.4.2
index 19c422ba7182..5b2203d4403f 100644
--- a/metadata/md5-cache/app-dicts/myspell-fo-0.4.2
+++ b/metadata/md5-cache/app-dicts/myspell-fo-0.4.2
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Faroese dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://fo.speling.org/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1 b/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
index c3baeee55f74..6319895de837 100644
--- a/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
+++ b/metadata/md5-cache/app-dicts/myspell-fr-4.5-r1
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=French dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extension-center/dictionnaires-francais
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ga-20160213 b/metadata/md5-cache/app-dicts/myspell-ga-20160213
index f3f842fdb863..ed91d8dc9abf 100644
--- a/metadata/md5-cache/app-dicts/myspell-ga-20160213
+++ b/metadata/md5-cache/app-dicts/myspell-ga-20160213
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Irish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/irish-language-spell-checker-thesaurus-and-hyphenation-patterns
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-gl-20131013 b/metadata/md5-cache/app-dicts/myspell-gl-20131013
index 0fe674f4c171..cc951d876780 100644
--- a/metadata/md5-cache/app-dicts/myspell-gl-20131013
+++ b/metadata/md5-cache/app-dicts/myspell-gl-20131013
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Galician dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/corrector-ortografico-hunspell-para-galego
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15 b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
index e50238ba0ea3..e9d02c1380d0 100644
--- a/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
+++ b/metadata/md5-cache/app-dicts/myspell-he-2012.08.15
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Hebrew dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-hr-20080813 b/metadata/md5-cache/app-dicts/myspell-hr-20080813
index 248956c8b3ee..8b33680059e7 100644
--- a/metadata/md5-cache/app-dicts/myspell-hr-20080813
+++ b/metadata/md5-cache/app-dicts/myspell-hr-20080813
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Croatian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/croatian-dictionary-and-hyphenation-patterns
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ia-20140518 b/metadata/md5-cache/app-dicts/myspell-ia-20140518
index 2066bbf8e975..701abb79139c 100644
--- a/metadata/md5-cache/app-dicts/myspell-ia-20140518
+++ b/metadata/md5-cache/app-dicts/myspell-ia-20140518
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Interlingua dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/interlingua-dictionario-orthographic-e-regulas-de-division-de-parolas
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-id-2.0 b/metadata/md5-cache/app-dicts/myspell-id-2.0
index 8ba75d2ca5a0..41a4f8091f0a 100644
--- a/metadata/md5-cache/app-dicts/myspell-id-2.0
+++ b/metadata/md5-cache/app-dicts/myspell-id-2.0
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Indonesian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-is-2012.09.01 b/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
index 26e2bdf8d3e0..8555dad5efdb 100644
--- a/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
+++ b/metadata/md5-cache/app-dicts/myspell-is-2012.09.01
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Icelandic dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=CC-BY-SA-3.0
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-kk-1.1.2 b/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
index 5faabc28c3fb..4d3f2ab1bb67 100644
--- a/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
+++ b/metadata/md5-cache/app-dicts/myspell-kk-1.1.2
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Kazakh dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://github.com/kergalym/myspell-kk
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2+ LGPL-2+
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-km-1.6 b/metadata/md5-cache/app-dicts/myspell-km-1.6
index 057ddea280eb..b1a7696dedea 100644
--- a/metadata/md5-cache/app-dicts/myspell-km-1.6
+++ b/metadata/md5-cache/app-dicts/myspell-km-1.6
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Khmer dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ku-0.21 b/metadata/md5-cache/app-dicts/myspell-ku-0.21
index 1f912d535f5c..86d84523a890 100644
--- a/metadata/md5-cache/app-dicts/myspell-ku-0.21
+++ b/metadata/md5-cache/app-dicts/myspell-ku-0.21
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Kurdish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://code.google.com/p/hunspell-ku/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3 LGPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-lt-1.3 b/metadata/md5-cache/app-dicts/myspell-lt-1.3
index 47d61f7908f9..6aa6bc415f41 100644
--- a/metadata/md5-cache/app-dicts/myspell-lt-1.3
+++ b/metadata/md5-cache/app-dicts/myspell-lt-1.3
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Lithuanian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://launchpad.net/ispell-lt
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=BSD LPPL-1.3b
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-lv-1.3.0 b/metadata/md5-cache/app-dicts/myspell-lv-1.3.0
index 77f58edf66d6..c3d5999530d0 100644
--- a/metadata/md5-cache/app-dicts/myspell-lv-1.3.0
+++ b/metadata/md5-cache/app-dicts/myspell-lv-1.3.0
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip app-arch/unzip
DESCRIPTION=Latvian dictionaries for myspell/hunspell
EAPI=5
HOMEPAGE=http://dict.dv.lv/home.php?prj=lv https://extensions.libreoffice.org/extensions/latviesu-valodas-pareizrakstibas-parbaudes-modulis
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1 b/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
index 3cc3fde573e5..f8368717adde 100644
--- a/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
+++ b/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Maori dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://lingucomponent.openoffice.org/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-mk-20091211 b/metadata/md5-cache/app-dicts/myspell-mk-20091211
index 4bb3c3f0e895..07bde970bb08 100644
--- a/metadata/md5-cache/app-dicts/myspell-mk-20091211
+++ b/metadata/md5-cache/app-dicts/myspell-mk-20091211
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Macedonian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/macedonian-spellchecker-dictionary
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ms-20100407 b/metadata/md5-cache/app-dicts/myspell-ms-20100407
index 3981042a710e..de0a7417ed3f 100644
--- a/metadata/md5-cache/app-dicts/myspell-ms-20100407
+++ b/metadata/md5-cache/app-dicts/myspell-ms-20100407
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Malay dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-malay-dictionary
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=FDL-1.2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-nb-2.0.10 b/metadata/md5-cache/app-dicts/myspell-nb-2.0.10
index ebf866ad8c30..f4067c22dba7 100644
--- a/metadata/md5-cache/app-dicts/myspell-nb-2.0.10
+++ b/metadata/md5-cache/app-dicts/myspell-nb-2.0.10
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Norwegian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://spell-norwegian.alioth.debian.org/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
index ca3a0ca4eb70..a088c13150ff 100644
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=Dutch dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://www.opentaal.org
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=BSD-2 CC-BY-3.0
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2 b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2
index f525012a362c..b3cac6795339 100644
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2
+++ b/metadata/md5-cache/app-dicts/myspell-nl-2.10g-r2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=Dutch dictionaries for myspell/hunspell
EAPI=7
HOMEPAGE=https://www.opentaal.org
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=BSD-2 CC-BY-3.0
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-nn-2.0.10 b/metadata/md5-cache/app-dicts/myspell-nn-2.0.10
index 84d2fdd745b9..1c56d7877e9f 100644
--- a/metadata/md5-cache/app-dicts/myspell-nn-2.0.10
+++ b/metadata/md5-cache/app-dicts/myspell-nn-2.0.10
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Norwegian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://spell-norwegian.alioth.debian.org/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-pl-20130306 b/metadata/md5-cache/app-dicts/myspell-pl-20130306
index 3b4fa81cc990..cfa7d72d6e9c 100644
--- a/metadata/md5-cache/app-dicts/myspell-pl-20130306
+++ b/metadata/md5-cache/app-dicts/myspell-pl-20130306
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Polish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.sjp.pl/slownik/en/ https://sourceforge.net/projects/synonimy/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-pt-20120420 b/metadata/md5-cache/app-dicts/myspell-pt-20120420
index eae6b4bc45fc..16a89ba915a8 100644
--- a/metadata/md5-cache/app-dicts/myspell-pt-20120420
+++ b/metadata/md5-cache/app-dicts/myspell-pt-20120420
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Portuguese dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main
+INHERIT=myspell-r2
IUSE=+preao
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 MIT
diff --git a/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0 b/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
index 5e630850f312..4dbed01fa315 100644
--- a/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
+++ b/metadata/md5-cache/app-dicts/myspell-pt-br-3.0.0
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Brazilian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-3 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ro-3.3.10 b/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
index 6cf004d68723..d3d2cd2545b3 100644
--- a/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
+++ b/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Romanian dictionaries for myspell/hunspell
EAPI=5
HOMEPAGE=https://rospell.wordpress.com
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2 b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
index b9c239cd13e0..a9989d798b69 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extensions/russian-dictionary-pack
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20180627 b/metadata/md5-cache/app-dicts/myspell-ru-20180627
index 654ecbd88c76..77c2dd3bf6f4 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20180627
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20180627
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
EAPI=7
HOMEPAGE=https://extensions.libreoffice.org/extensions/russian-dictionary-pack
+INHERIT=myspell-r2
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-sk-20110224 b/metadata/md5-cache/app-dicts/myspell-sk-20110224
index 49a684fcb877..dc4a214ffd0f 100644
--- a/metadata/md5-cache/app-dicts/myspell-sk-20110224
+++ b/metadata/md5-cache/app-dicts/myspell-sk-20110224
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Slovak dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.liberix.cz/doplnky/slovniky/ooo/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04 b/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
index ec5ea963c6e9..5c4224ca8a5b 100644
--- a/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
+++ b/metadata/md5-cache/app-dicts/myspell-sl-2012.01.04
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Slovenian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3 LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-sq-1.6.4 b/metadata/md5-cache/app-dicts/myspell-sq-1.6.4
index c4f3a1914c95..c7ffca8c84a0 100644
--- a/metadata/md5-cache/app-dicts/myspell-sq-1.6.4
+++ b/metadata/md5-cache/app-dicts/myspell-sq-1.6.4
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Albanian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://www.shkenca.org/k6i/albanian_dictionary_for_myspell_en.html
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-sv-2.14 b/metadata/md5-cache/app-dicts/myspell-sv-2.14
index 97f5ff188cf7..2e5e61087c3e 100644
--- a/metadata/md5-cache/app-dicts/myspell-sv-2.14
+++ b/metadata/md5-cache/app-dicts/myspell-sv-2.14
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Swedish dictionaries for myspell/hunspell
EAPI=5
HOMEPAGE=https://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan https://extensions.libreoffice.org/extension-center/swedish-hyphenation https://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=CC-BY-SA-3.0 GPL-2 LGPL-3
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-sw-20110106 b/metadata/md5-cache/app-dicts/myspell-sw-20110106
index 24c53db97ab4..d09392d52177 100644
--- a/metadata/md5-cache/app-dicts/myspell-sw-20110106
+++ b/metadata/md5-cache/app-dicts/myspell-sw-20110106
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Kiswahili dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/swahili-dictionary
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-tn-20060316 b/metadata/md5-cache/app-dicts/myspell-tn-20060316
index c7a97eb71d05..c3fc88b17643 100644
--- a/metadata/md5-cache/app-dicts/myspell-tn-20060316
+++ b/metadata/md5-cache/app-dicts/myspell-tn-20060316
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Setswana dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://lingucomponent.openoffice.org/
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-1.6.5 b/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
index 9409d1632125..1614a78dcdf9 100644
--- a/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
+++ b/metadata/md5-cache/app-dicts/myspell-uk-1.6.5
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=GPL-3 LGPL-2.1 MPL-1.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/myspell-zu-20100126 b/metadata/md5-cache/app-dicts/myspell-zu-20100126
index 1635265b587e..d25525f7f055 100644
--- a/metadata/md5-cache/app-dicts/myspell-zu-20100126
+++ b/metadata/md5-cache/app-dicts/myspell-zu-20100126
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Zulu dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=https://extensions.openoffice.org/en/project/zulu-spell-checker
+INHERIT=myspell-r2
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=LGPL-2.1
SLOT=0
diff --git a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
index 975b63cbfb89..b3695e41c1f1 100644
--- a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-big5-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_TW/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
index 5b9cdb77eff6..d4c837dacb89 100644
--- a/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cdict-en-zh-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
index 990d9d5dba91..7afe0c365dbf 100644
--- a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-big5-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_TW/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
index 1a806ed111da..4e83bbaa5225 100644
--- a/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-cedict-zh-en-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2 b/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
index 54101d061714..6eb8020f1a9b 100644
--- a/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-dictd-devils-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary for Dictd.org's Devil's Dictionary
EAPI=6
HOMEPAGE=http://download.huzheng.org/dict.org/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
index 3e0bac63587f..af275a733601 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-deu-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to German
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
index 2b8e52791992..4105fd708347 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-fra-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to French
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
index 133dbb1461ec..6237421ddefa 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-ita-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Italian
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
index 7e03b1ef2337..74afb74be446 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-lat-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Latin
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
index 4fdaed2321dc..2e5099cd3689 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-rus-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Russian
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
index 558471b93650..fa184f405006 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-spa-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Spanish
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
index f0bbdd2c85d4..268e3d39cd44 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-swe-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Swedish
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
index 61be7a55b779..3a660f486248 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-eng-tur-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Turkish
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
index 7118a2c9efae..6f2b0dbe461e 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-tur-deu-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Turkish to German
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2 b/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
index f4e01f09b39d..6ce8a8e6078c 100644
--- a/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-freedict-tur-eng-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Turkish to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/freedict.de/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1 b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
index 6441c32f3acb..09e7750a2870 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Japanese
EAPI=6
HOMEPAGE=http://download.huzheng.org/ja/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc sparc x86
LICENSE=GDLS
diff --git a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1 b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
index 5434fd400da6..22f9874c0dd3 100644
--- a/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
+++ b/metadata/md5-cache/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Japanese to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/ja/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc sparc x86
LICENSE=GDLS
diff --git a/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
index a27c5e5b3dba..1b6d1d0635a3 100644
--- a/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-langdao-en-zh-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
index 83cf1442917a..ecbff097349e 100644
--- a/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-langdao-zh-en-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ~ppc sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2 b/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
index 7893bad611b7..b41d8cd1d574 100644
--- a/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-mova-smiley-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary for Mova.org's Smiley Dictionary
EAPI=6
HOMEPAGE=http://download.huzheng.org/mova.org/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
index 01689f49a0cb..efb0de2be54a 100644
--- a/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-oxford-en-zh-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
index 59e735d1e585..53a43cc01342 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-eng-jpn-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Japanese Romaji
EAPI=6
HOMEPAGE=http://download.huzheng.org/Quick/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
index e83c63caf745..68a5486fb2f2 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-jpn-eng-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Japanese Romaji to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/Quick/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2 b/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
index 35b23d4e9598..c94af4ffd874 100644
--- a/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-quick-ru-en-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Quick but still useful Russian to English dictionary
EAPI=6
HOMEPAGE=http://download.huzheng.org/Quick/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=amd64 x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
index c989484c11ec..945354ba0bf1 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-big5-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_TW/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
index cf97f15f05fb..759d30787512 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-en-zh-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
index 3beb97ed1514..e1f170d892f5 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-big5-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_TW/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2 b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
index 6a59022bbeb6..24de4f6ea4d0 100644
--- a/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
+++ b/metadata/md5-cache/app-dicts/stardict-xdict-zh-en-gb-2.4.2
@@ -3,6 +3,7 @@ DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip?
DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
EAPI=6
HOMEPAGE=http://download.huzheng.org/zh_CN/
+INHERIT=stardict
IUSE=gzip
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/app-dicts/sword-2BabDict-1.0 b/metadata/md5-cache/app-dicts/sword-2BabDict-1.0
index 4daeef1d5810..75861702b825 100644
--- a/metadata/md5-cache/app-dicts/sword-2BabDict-1.0
+++ b/metadata/md5-cache/app-dicts/sword-2BabDict-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Definitions and Symbols from The Two Babylons
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=2BabDict
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-AB-1.3.1 b/metadata/md5-cache/app-dicts/sword-AB-1.3.1
index 4134ddc4def1..1b4bc820b8f0 100644
--- a/metadata/md5-cache/app-dicts/sword-AB-1.3.1
+++ b/metadata/md5-cache/app-dicts/sword-AB-1.3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Apostles' Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.8
diff --git a/metadata/md5-cache/app-dicts/sword-ABP-1.2 b/metadata/md5-cache/app-dicts/sword-ABP-1.2
index 177fdc1bbd2d..b5f3db0b862e 100644
--- a/metadata/md5-cache/app-dicts/sword-ABP-1.2
+++ b/metadata/md5-cache/app-dicts/sword-ABP-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Apostolic Bible Polyglot English Text
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2 b/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2
index 23f74b91dad9..5c2eef166bc5 100644
--- a/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2
+++ b/metadata/md5-cache/app-dicts/sword-ABPGRK-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Apostolic Bible Polyglot Greek Text
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABPGRK
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0 b/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0
index 980100f5426c..ebcb2e1108be 100644
--- a/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ABS_Essay_GoodSam_SWB-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Essays on The Good Samaritan: Violence on the Road, Social World of Bandits
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.3
diff --git a/metadata/md5-cache/app-dicts/sword-ACV-2.0 b/metadata/md5-cache/app-dicts/sword-ACV-2.0
index 494177e5d3be..f72b25fdceed 100644
--- a/metadata/md5-cache/app-dicts/sword-ACV-2.0
+++ b/metadata/md5-cache/app-dicts/sword-ACV-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=A Conservative Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-AKJV-1.4 b/metadata/md5-cache/app-dicts/sword-AKJV-1.4
index b86c6d8f7c9f..a61f94b58633 100644
--- a/metadata/md5-cache/app-dicts/sword-AKJV-1.4
+++ b/metadata/md5-cache/app-dicts/sword-AKJV-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=American King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Abbott-1.1 b/metadata/md5-cache/app-dicts/sword-Abbott-1.1
index e114caf4e3b6..20afd5156d49 100644
--- a/metadata/md5-cache/app-dicts/sword-Abbott-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Abbott-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Illustrated New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1 b/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1
index 03d12d7974ed..e1d410e22ce6 100644
--- a/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1
+++ b/metadata/md5-cache/app-dicts/sword-AbbottSmith-3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=G. Abbott-Smith's A Manual Greek Lexicon of the New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AbbottSmith
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1 b/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1
index ec57a642f578..fe4f87024dfa 100644
--- a/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1
+++ b/metadata/md5-cache/app-dicts/sword-AbbottSmithStrongs-3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=G. Abbott-Smith's A Manual Greek Lexicon of the New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AbbottSmithStrongs
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2 b/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2
index b7609717f1ab..c52476812347 100644
--- a/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2
+++ b/metadata/md5-cache/app-dicts/sword-Afr1953-1.3.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1933/1953 Afrikaans Bybel
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Alb-2.0 b/metadata/md5-cache/app-dicts/sword-Alb-2.0
index b2a2fd584b5c..12165dd1603b 100644
--- a/metadata/md5-cache/app-dicts/sword-Alb-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Alb-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Albanian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Aleppo-2.0 b/metadata/md5-cache/app-dicts/sword-Aleppo-2.0
index 1d4523ab0e02..8f476b19bf76 100644
--- a/metadata/md5-cache/app-dicts/sword-Aleppo-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Aleppo-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Aleppo Codex
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-AmTract-1.1 b/metadata/md5-cache/app-dicts/sword-AmTract-1.1
index 403e97759131..943b7bdce435 100644
--- a/metadata/md5-cache/app-dicts/sword-AmTract-1.1
+++ b/metadata/md5-cache/app-dicts/sword-AmTract-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=American Tract Society Bible Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Anderson-1.0 b/metadata/md5-cache/app-dicts/sword-Anderson-1.0
index 666d88c8e1c7..a8f6afad9fe2 100644
--- a/metadata/md5-cache/app-dicts/sword-Anderson-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Anderson-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Henry Tompkins Anderson's 1864 New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Anderson
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Antoniades-1.4 b/metadata/md5-cache/app-dicts/sword-Antoniades-1.4
index 12d492ae7a8f..95f76e1d7b0e 100644
--- a/metadata/md5-cache/app-dicts/sword-Antoniades-1.4
+++ b/metadata/md5-cache/app-dicts/sword-Antoniades-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Antoniades Patriarchal Edition (1904/1912)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Antoniades
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1 b/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1
index 08a617430b8e..26be04f984c7 100644
--- a/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-AraNAV-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=New Arabic Version (Ketab El Hayat)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraNAV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1 b/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1
index 591161807153..6213dc4ec0b1 100644
--- a/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1
+++ b/metadata/md5-cache/app-dicts/sword-ArmEastern-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Eastern Armenian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1 b/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1
index 78392fd72ac8..f141705199fc 100644
--- a/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1
+++ b/metadata/md5-cache/app-dicts/sword-ArmWestern-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1853 Western Armenian NT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1 b/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1
index 3499819f4aae..b9691b7a2029 100644
--- a/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1
+++ b/metadata/md5-cache/app-dicts/sword-Azeri-2.5.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Southern Azeri translation of the Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Azeri
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-BBE-1.3 b/metadata/md5-cache/app-dicts/sword-BBE-1.3
index 16a2233dcf01..f0fc765109a6 100644
--- a/metadata/md5-cache/app-dicts/sword-BBE-1.3
+++ b/metadata/md5-cache/app-dicts/sword-BBE-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible in Basic English (1949/1964)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1 b/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1
index d4ae8f169d24..fa745e983456 100644
--- a/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1
+++ b/metadata/md5-cache/app-dicts/sword-BDBGlosses_Strongs-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=BDB Glosses keyed to Strong's numbers
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BDBGlosses_Strongs
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-BWE-1.0 b/metadata/md5-cache/app-dicts/sword-BWE-1.0
index 5844e5b5c3bb..1570700fb692 100644
--- a/metadata/md5-cache/app-dicts/sword-BWE-1.0
+++ b/metadata/md5-cache/app-dicts/sword-BWE-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible in Worldwide English
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2 b/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2
index 6c03c2b324f1..ba6f481c18c9 100644
--- a/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-BaptistConfession1689-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Baptist Confession of Faith of 1689
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BaptistConfession1689
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Barnes-1.1 b/metadata/md5-cache/app-dicts/sword-Barnes-1.1
index 91aea2953eb7..5e2cea51179e 100644
--- a/metadata/md5-cache/app-dicts/sword-Barnes-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Barnes-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Barnes' New Testament Notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-BasHautin-1.5 b/metadata/md5-cache/app-dicts/sword-BasHautin-1.5
index c9723884f409..ae6f92698d6b 100644
--- a/metadata/md5-cache/app-dicts/sword-BasHautin-1.5
+++ b/metadata/md5-cache/app-dicts/sword-BasHautin-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1571 Navarro-Labourdin Basque NT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1 b/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1
index 77ebe719b99e..0e88167baebc 100644
--- a/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-BeaMRK-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Gospel of Mark in Beaver (Danezaa)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BeaMRK
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Bela-1.1 b/metadata/md5-cache/app-dicts/sword-Bela-1.1
index 1b56c7c5ee72..bc793ddcc547 100644
--- a/metadata/md5-cache/app-dicts/sword-Bela-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Bela-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Belarusian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Bela
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-BlaMat-1.1.1 b/metadata/md5-cache/app-dicts/sword-BlaMat-1.1.1
index b7429e103661..80eb38862218 100644
--- a/metadata/md5-cache/app-dicts/sword-BlaMat-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-BlaMat-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Gospel of Matthew in Blackfoot
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BlaMat
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1 b/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1
index 5e8169a3fa7d..b8e196567435 100644
--- a/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-BretonNT-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Breton New Testament (Koad 21)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BretonNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-BulVeren-1.1 b/metadata/md5-cache/app-dicts/sword-BulVeren-1.1
index cdc8a37a6ba1..2a884e259a6a 100644
--- a/metadata/md5-cache/app-dicts/sword-BulVeren-1.1
+++ b/metadata/md5-cache/app-dicts/sword-BulVeren-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Veren's Contemporary Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2 b/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2
index e5b985fbd7e4..9dabff4ace95 100644
--- a/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2
+++ b/metadata/md5-cache/app-dicts/sword-BurCBCM-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Catholic Myanmar Bible (CBCM)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurCBCM
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-BurJudson-1.3 b/metadata/md5-cache/app-dicts/sword-BurJudson-1.3
index 327f39108297..aca92fe824c4 100644
--- a/metadata/md5-cache/app-dicts/sword-BurJudson-1.3
+++ b/metadata/md5-cache/app-dicts/sword-BurJudson-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1835 Judson Burmese Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=media-fonts/sil-padauk >=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Burkitt-1.0 b/metadata/md5-cache/app-dicts/sword-Burkitt-1.0
index fcfc5183b14d..95e423b8b17a 100644
--- a/metadata/md5-cache/app-dicts/sword-Burkitt-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Burkitt-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Burkitt's Expository Notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Burkitt
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-CBC-1.1 b/metadata/md5-cache/app-dicts/sword-CBC-1.1
index ca4b85ab4fd9..525ac04deebb 100644
--- a/metadata/md5-cache/app-dicts/sword-CBC-1.1
+++ b/metadata/md5-cache/app-dicts/sword-CBC-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Condensed Biblical Cyclopedia
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1 b/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1
index 57afd44c0007..75d6c40ae4d9 100644
--- a/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1
+++ b/metadata/md5-cache/app-dicts/sword-CPDV-2.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Catholic Public Domain Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CPDV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1 b/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1
index 1fd531bf6703..cab1dea1b884 100644
--- a/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1
+++ b/metadata/md5-cache/app-dicts/sword-CSlElizabeth-1.5.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1757 Church Slavonic Elizabeth Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CSlElizabeth
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Calo-1.0 b/metadata/md5-cache/app-dicts/sword-Calo-1.0
index 5872e0a0d63c..4dca2df37f3b 100644
--- a/metadata/md5-cache/app-dicts/sword-Calo-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Calo-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Gospel of Luke in the Caló language
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Calo
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Catena-1.0 b/metadata/md5-cache/app-dicts/sword-Catena-1.0
index 752867d01b5b..58fe6b18d932 100644
--- a/metadata/md5-cache/app-dicts/sword-Catena-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Catena-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Catena Aurea (Thomas Aquinas)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Catena
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0 b/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0
index a297b1b89718..30515adadbd4 100644
--- a/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Cawdrey-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=A Table Alphabeticall by Robert Cawdrey (1604)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Cawdrey
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2 b/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2
index 7b79575c63d6..4c6cfec5d505 100644
--- a/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2
+++ b/metadata/md5-cache/app-dicts/sword-Chamorro-2.7.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Chamorro: Y Santa Biblia (1908)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0 b/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0
index d63fdcab139c..de3a02d1e8d4 100644
--- a/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ChiUnL-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Chinese Union Version of the Bible, classical (literary) script
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUnL
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-Clarke-1.0 b/metadata/md5-cache/app-dicts/sword-Clarke-1.0
index 25f1cda7edd0..a4103a916357 100644
--- a/metadata/md5-cache/app-dicts/sword-Clarke-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Clarke-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Adam Clarke's Commentary on the Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Common-1.3 b/metadata/md5-cache/app-dicts/sword-Common-1.3
index 21b12b829809..ef5a6cbfd0f9 100644
--- a/metadata/md5-cache/app-dicts/sword-Common-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Common-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Common Edition: New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Common
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Concord-2.4.1 b/metadata/md5-cache/app-dicts/sword-Concord-2.4.1
index 954822d99343..248e3c8b55c6 100644
--- a/metadata/md5-cache/app-dicts/sword-Concord-2.4.1
+++ b/metadata/md5-cache/app-dicts/sword-Concord-2.4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Book of Concord (Triglot Concordia): The Symbolical Books of the Ev. Lutheran Church
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Concord
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1 b/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1
index ddb21f41a46e..a59152ff88e9 100644
--- a/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-CopNT-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Coptic New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3 b/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3
index b6babd9c1cba..e718daf1cbe4 100644
--- a/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3
+++ b/metadata/md5-cache/app-dicts/sword-CopSahBible2-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sahidic Bible 2
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahBible2
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5 b/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5
index 6a5d79ec54c1..1e8fad67580c 100644
--- a/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5
+++ b/metadata/md5-cache/app-dicts/sword-CopSahHorner-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sahidic Coptic New Testament, ed. by G. W. Horner
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahHorner
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0 b/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0
index 659d4d868d8d..e6e4631c7ddb 100644
--- a/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0
+++ b/metadata/md5-cache/app-dicts/sword-CopSahidicMSS-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Sahidica Manuscripts
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahidicMSS
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0 b/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0
index f50e2e74c425..3ec821cadf78 100644
--- a/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0
+++ b/metadata/md5-cache/app-dicts/sword-CopSahidica-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sahidica - A New Edition of the New Testament in Sahidic Coptic
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CopSahidica
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-CroSaric-2.0 b/metadata/md5-cache/app-dicts/sword-CroSaric-2.0
index f0dbf9af045f..7c255ad363ee 100644
--- a/metadata/md5-cache/app-dicts/sword-CroSaric-2.0
+++ b/metadata/md5-cache/app-dicts/sword-CroSaric-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Croatian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CroSaric
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-CzeB21-1.5 b/metadata/md5-cache/app-dicts/sword-CzeB21-1.5
index 13ede561c9f6..d05d6b8ddc11 100644
--- a/metadata/md5-cache/app-dicts/sword-CzeB21-1.5
+++ b/metadata/md5-cache/app-dicts/sword-CzeB21-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Czech Bible, Překlad 21. století včetně deuterokanonických knih
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeB21
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1 b/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1
index ddec0b5d88b4..e3df2706ebd9 100644
--- a/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1
+++ b/metadata/md5-cache/app-dicts/sword-CzeBKR-1.3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Czech Bible Kralicka
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8 b/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8
index fa6aae46b6b2..1e345e9a1484 100644
--- a/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8
+++ b/metadata/md5-cache/app-dicts/sword-CzeCEP-1.8
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Czech Ekumenicky Cesky preklad
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4 b/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4
index e9356dc9ad84..9aa5aa646c77 100644
--- a/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4
+++ b/metadata/md5-cache/app-dicts/sword-CzeCSP-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Czech Český studijní překlad
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCSP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-ND-4.0
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-DBD-1.4 b/metadata/md5-cache/app-dicts/sword-DBD-1.4
index bc493b6edace..1bd43c44a74d 100644
--- a/metadata/md5-cache/app-dicts/sword-DBD-1.4
+++ b/metadata/md5-cache/app-dicts/sword-DBD-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Day By Day By Grace - Bob Hoekstra
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-DRC-2.0 b/metadata/md5-cache/app-dicts/sword-DRC-2.0
index 00cc6a7740eb..92f39677d93b 100644
--- a/metadata/md5-cache/app-dicts/sword-DRC-2.0
+++ b/metadata/md5-cache/app-dicts/sword-DRC-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Douay-Rheims Bible, Challoner Revision
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-DTN-1.0 b/metadata/md5-cache/app-dicts/sword-DTN-1.0
index b4b41fcd1014..ee35de5a5dc9 100644
--- a/metadata/md5-cache/app-dicts/sword-DTN-1.0
+++ b/metadata/md5-cache/app-dicts/sword-DTN-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Darby Translation Notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DTN
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1 b/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1
index 1f3924b12243..709873b4411f 100644
--- a/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-DaNT1819-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Danish New Testament from 1819 with original orthography
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaNT1819
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0 b/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0
index 8f0a93c7d133..6a823e9d930f 100644
--- a/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0
+++ b/metadata/md5-cache/app-dicts/sword-DaOT1871NT1907-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Danish OT1871 + NT1907 with original orthography
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaOT1871NT1907
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01 b/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01
index e364a6f36a7c..c9a03d24ab06 100644
--- a/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01
+++ b/metadata/md5-cache/app-dicts/sword-DaOT1931NT1907-1.01
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Danish OT1931 + NT1907 with original orthography
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DaOT1931NT1907
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-Daily-1.0 b/metadata/md5-cache/app-dicts/sword-Daily-1.0
index 64c9095bfe1a..67b9eca2b72b 100644
--- a/metadata/md5-cache/app-dicts/sword-Daily-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Daily-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Jonathan Bagster's Daily Light on the Daily Path
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Daily
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Dari-1.0.2 b/metadata/md5-cache/app-dicts/sword-Dari-1.0.2
index d6fe54477a78..e4c52c72ce57 100644
--- a/metadata/md5-cache/app-dicts/sword-Dari-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-Dari-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Dari Translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dari
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0 b/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0
index 93fd48d7c44c..c75f0506a7aa 100644
--- a/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0
+++ b/metadata/md5-cache/app-dicts/sword-DarkNightOfTheSoul-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION='The Dark Night of the Soul' by St. John of the Cross
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DarkNightOfTheSoul
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-Diaglott-1.1 b/metadata/md5-cache/app-dicts/sword-Diaglott-1.1
index 33479688e179..037220134895 100644
--- a/metadata/md5-cache/app-dicts/sword-Diaglott-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Diaglott-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Emphatic Diaglott
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Diaglott
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Dodson-1.0 b/metadata/md5-cache/app-dicts/sword-Dodson-1.0
index b9d840281d3c..b6d69dfac044 100644
--- a/metadata/md5-cache/app-dicts/sword-Dodson-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Dodson-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Dodson Greek-English Lexicon
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dodson
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-DutKant-1.1 b/metadata/md5-cache/app-dicts/sword-DutKant-1.1
index 053a4fedacab..639a6c9ba89b 100644
--- a/metadata/md5-cache/app-dicts/sword-DutKant-1.1
+++ b/metadata/md5-cache/app-dicts/sword-DutKant-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Kanttekeningen Statenvertaling
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKant
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-DutSVV-2.1 b/metadata/md5-cache/app-dicts/sword-DutSVV-2.1
index ac26e5d8a746..77026f548281 100644
--- a/metadata/md5-cache/app-dicts/sword-DutSVV-2.1
+++ b/metadata/md5-cache/app-dicts/sword-DutSVV-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Dutch Statenvertaling Bijbel, including footnotes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-EMBReality-0.5 b/metadata/md5-cache/app-dicts/sword-EMBReality-0.5
index 9838c013743d..e00668c88698 100644
--- a/metadata/md5-cache/app-dicts/sword-EMBReality-0.5
+++ b/metadata/md5-cache/app-dicts/sword-EMBReality-0.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Reality of Prayer by E.M. Bounds
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=EMBReality
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-EMTV-2.2 b/metadata/md5-cache/app-dicts/sword-EMTV-2.2
index 5a5ee99669a2..155ba0c9a011 100644
--- a/metadata/md5-cache/app-dicts/sword-EMTV-2.2
+++ b/metadata/md5-cache/app-dicts/sword-EMTV-2.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=English Majority Text Version, 2012 Edition with Greek Explanatory Notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Easton-2.0 b/metadata/md5-cache/app-dicts/sword-Easton-2.0
index 219ac62a9e72..f08521c65899 100644
--- a/metadata/md5-cache/app-dicts/sword-Easton-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Easton-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Easton's Bible Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Easton
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Elzevir-1.3 b/metadata/md5-cache/app-dicts/sword-Elzevir-1.3
index 94bc24ab0347..5f0df8226455 100644
--- a/metadata/md5-cache/app-dicts/sword-Elzevir-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Elzevir-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Elzevir Textus Receptus (1624)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Elzevir
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-Esperanto-2.1 b/metadata/md5-cache/app-dicts/sword-Esperanto-2.1
index dbfb7ff8e246..07e5a7258bca 100644
--- a/metadata/md5-cache/app-dicts/sword-Esperanto-2.1
+++ b/metadata/md5-cache/app-dicts/sword-Esperanto-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Esperanto Londona Biblio
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Est-1.1 b/metadata/md5-cache/app-dicts/sword-Est-1.1
index 261170d70489..3fe5cefffe1f 100644
--- a/metadata/md5-cache/app-dicts/sword-Est-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Est-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Estonian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Est
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.2
diff --git a/metadata/md5-cache/app-dicts/sword-Etheridge-1.1 b/metadata/md5-cache/app-dicts/sword-Etheridge-1.1
index e23152eef921..8749bc0a9cea 100644
--- a/metadata/md5-cache/app-dicts/sword-Etheridge-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Etheridge-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Peschito Syriac New Testament: Translated into English by John Wesley Etheridge
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Etheridge
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1 b/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1
index 06389e2cc16d..8b3401a66d80 100644
--- a/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Eusebian_num-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Eusebian Numbers
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Eusebian_num
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=!app-dicts/sword-Eusebian_vs >=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1 b/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1
index 0994c0d38c1b..f1ff4a8bafab 100644
--- a/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Eusebian_vs-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Eusebian Numbers By Verse
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Eusebian_vs
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=!app-dicts/sword-Eusebian_num >=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1 b/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1
index 6f9e23dff0ca..196370b2ae0c 100644
--- a/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-FVDPVietAnh-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=FVDP Vietnamese-English Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FVDPVietAnh
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-3+
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Family-1.1 b/metadata/md5-cache/app-dicts/sword-Family-1.1
index fc90f1b1432a..b0fcffd43d93 100644
--- a/metadata/md5-cache/app-dicts/sword-Family-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Family-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Family Bible Notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Family
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2 b/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2
index 0adc599d1e8d..32520c5a3fef 100644
--- a/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-FarHezareNoh-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Tarjumeh-ye Hezare Noh
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarHezareNoh
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.10
diff --git a/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1 b/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1
index 274ae66558d2..f3655ab6eaf9 100644
--- a/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1
+++ b/metadata/md5-cache/app-dicts/sword-FarOPV-1.5.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Persian Holy Bible (Tarjumeh-ye Ghadeem)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarOPV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2 b/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2
index ddd25ccf1b72..dcbd6b817f11 100644
--- a/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2
+++ b/metadata/md5-cache/app-dicts/sword-FarTPV-1.1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Today's Persian Version (Mojdeh Baraye Asre Jadid)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FarTPV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1 b/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1
index 66962dce6545..8aa32849f373 100644
--- a/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1
+++ b/metadata/md5-cache/app-dicts/sword-FinBiblia-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Finnish Biblia (1776)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinBiblia
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2 b/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2
index 2d711ce6f5c0..33892926cb1d 100644
--- a/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2
+++ b/metadata/md5-cache/app-dicts/sword-FinPR-1.2.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Finnish Pyhä Raamattu (1933/1938)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.2
diff --git a/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1 b/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1
index f890534a908e..eba349ed363b 100644
--- a/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-FinPR92-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Finnish Pyhä Raamattu (1992)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-FinRK-1.8.2 b/metadata/md5-cache/app-dicts/sword-FinRK-1.8.2
index 421e8531dc12..be5b3e90fe92 100644
--- a/metadata/md5-cache/app-dicts/sword-FinRK-1.8.2
+++ b/metadata/md5-cache/app-dicts/sword-FinRK-1.8.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Raamattu Kansalle (2012)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinRK
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3 b/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3
index 125907dd59e0..180c2d1b4f52 100644
--- a/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3
+++ b/metadata/md5-cache/app-dicts/sword-FinSTLK2017-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Pyhä Raamattu (STLK 2017)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FinSTLK2017
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-ND-4.0
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-Finney-1.1 b/metadata/md5-cache/app-dicts/sword-Finney-1.1
index 61ed494b7611..88b1115f73a0 100644
--- a/metadata/md5-cache/app-dicts/sword-Finney-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Finney-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sermons on Gospel Themes by Charles G. Finney (1792-1875)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Finney
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-FreBBB-1.3 b/metadata/md5-cache/app-dicts/sword-FreBBB-1.3
index ea67e1ca0a33..59206a6fbe85 100644
--- a/metadata/md5-cache/app-dicts/sword-FreBBB-1.3
+++ b/metadata/md5-cache/app-dicts/sword-FreBBB-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=French Bible Bovet Bonnet (1900)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1 b/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1
index 696e64a46a6f..7dbcc0151c84 100644
--- a/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1
+++ b/metadata/md5-cache/app-dicts/sword-FreBDM1707-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=French Bible David Martin (1707)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBDM1707
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreBailly-1.3 b/metadata/md5-cache/app-dicts/sword-FreBailly-1.3
index a23ae930689a..2c27e543228d 100644
--- a/metadata/md5-cache/app-dicts/sword-FreBailly-1.3
+++ b/metadata/md5-cache/app-dicts/sword-FreBailly-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Abbreviated Greek-French Dictionary by A. Bailly.
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBailly
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.9
diff --git a/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1 b/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1
index a2453df2bd62..302e194c7d8c 100644
--- a/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-FreCJE-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Chaque jour les Écritures
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCJE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0 b/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0
index 1d828503f480..1e3e802928d6 100644
--- a/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0
+++ b/metadata/md5-cache/app-dicts/sword-FreCrampon-3.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=La Bible Augustin Crampon 1923
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-FreGBM-1.0 b/metadata/md5-cache/app-dicts/sword-FreGBM-1.0
index 43ec3022cbc7..72342bb31cab 100644
--- a/metadata/md5-cache/app-dicts/sword-FreGBM-1.0
+++ b/metadata/md5-cache/app-dicts/sword-FreGBM-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Glossary of the Bible David Martin 1744
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreGBM
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3 b/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3
index b00983838059..61915484f6f9 100644
--- a/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3
+++ b/metadata/md5-cache/app-dicts/sword-FreGeneve1669-1.0.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Le Nouveau Testament de la Bible de Genève de 1669
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreGeneve1669
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreJND-1.24 b/metadata/md5-cache/app-dicts/sword-FreJND-1.24
index 78d39504f152..0c0b283a07d8 100644
--- a/metadata/md5-cache/app-dicts/sword-FreJND-1.24
+++ b/metadata/md5-cache/app-dicts/sword-FreJND-1.24
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible J.N.Darby en français (1975)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreJND
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2 b/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2
index f04b0200dacb..5f09e074c57b 100644
--- a/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-FreKhan-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=La Bible de Zadoc Khan
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreKhan
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0 b/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0
index 5922e8bce5da..df63fae65f78 100644
--- a/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0
+++ b/metadata/md5-cache/app-dicts/sword-FreLSN1872-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible de Lausanne (1872)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSN1872
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreLXX-1.1 b/metadata/md5-cache/app-dicts/sword-FreLXX-1.1
index 44157b450206..02db7e5d2e96 100644
--- a/metadata/md5-cache/app-dicts/sword-FreLXX-1.1
+++ b/metadata/md5-cache/app-dicts/sword-FreLXX-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Traduction de la LXX par P. GIGUET et autres traducteurs, 1872.
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLXX
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3 b/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3
index 20bf02949a97..10f51c711aa1 100644
--- a/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3
+++ b/metadata/md5-cache/app-dicts/sword-FreOltramare1874-1.0.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Le Nouveau Testament Version Oltramare 1874
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreOltramare1874
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-FrePGR-1.2 b/metadata/md5-cache/app-dicts/sword-FrePGR-1.2
index 563bc4257214..bf703d63e25d 100644
--- a/metadata/md5-cache/app-dicts/sword-FrePGR-1.2
+++ b/metadata/md5-cache/app-dicts/sword-FrePGR-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible Perret-Gentil et Rilliet
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FrePGR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0 b/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0
index 3a35af35fc16..1f1b3f418b70 100644
--- a/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0
+++ b/metadata/md5-cache/app-dicts/sword-FrePilgrim-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Pilgrim's Progress in French
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FrePilgrim
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1 b/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1
index b1fd960b7b2a..fa6251aafe67 100644
--- a/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1
+++ b/metadata/md5-cache/app-dicts/sword-FreSegond1910-3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=French Bible Louis Segond (1910)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond1910
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2 b/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2
index c2f153b2a928..497cf6279b15 100644
--- a/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-FreStapfer1889-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Le Nouveau Testament traduction de Stapfer - 1889
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreStapfer1889
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3 b/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3
index 470faf4f68b3..f26225f98e1c 100644
--- a/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3
+++ b/metadata/md5-cache/app-dicts/sword-FreSynodale1921-1.0.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Le Nouveau Testament Version Synodale 1921 et le livre des Psaumes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSynodale1921
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Geez-1.0.1 b/metadata/md5-cache/app-dicts/sword-Geez-1.0.1
index 6d77162136a1..7dea9c10f726 100644
--- a/metadata/md5-cache/app-dicts/sword-Geez-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-Geez-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Ge’ez Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geez
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Geneva-1.1 b/metadata/md5-cache/app-dicts/sword-Geneva-1.1
index 9cc2b43ab981..1b5274d9c655 100644
--- a/metadata/md5-cache/app-dicts/sword-Geneva-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Geneva-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Geneva Bible Translation Notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0 b/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0
index d24bc2cacc41..1f2b0394de6e 100644
--- a/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Geneva1599-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Geneva Bible (1599)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5 b/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
index ea74a11b86a6..0700731bb2ee 100644
--- a/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
+++ b/metadata/md5-cache/app-dicts/sword-GerAlbrecht-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Albrecht Neues Testament und Psalmen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAlbrecht
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5 b/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
index df1b2d559415..f905c86ae57e 100644
--- a/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
+++ b/metadata/md5-cache/app-dicts/sword-GerAugustinus-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Augustines Confessions (German)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerAugustinus
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.3
diff --git a/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2 b/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2
index fd21168c9744..feb982e56e13 100644
--- a/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2
+++ b/metadata/md5-cache/app-dicts/sword-GerElb1871-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Elberfelder (1871)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5 b/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
index 930bc63f5be5..a961d7788f80 100644
--- a/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
+++ b/metadata/md5-cache/app-dicts/sword-GerGruenewald-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1924 Grünewaldbibel
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerGruenewald
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1 b/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
index a06adde7f723..253b6d955a22 100644
--- a/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
+++ b/metadata/md5-cache/app-dicts/sword-GerHfa2002-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=Hoffnung fuer alle - Die Bibel
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfa2002
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=sword-GerHfa2002
RDEPEND=>=app-text/sword-1.5.6
diff --git a/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1 b/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
index 2500121ad348..35dc37000b1c 100644
--- a/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-GerHfaLex2002-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=Hoffnung fuer alle - Worterklaerungen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfaLex2002
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=sword-GerHfa2002
RDEPEND=>=app-text/sword-1.5.6
diff --git a/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1 b/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
index da067ce6c0c4..d6732ed1b9ba 100644
--- a/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
+++ b/metadata/md5-cache/app-dicts/sword-GerLeoNA28-1.2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Leonberger Bibel, NT (NA28)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoNA28
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-ND-4.0
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2 b/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
index 903fb0b3c9bf..781e86e95ee4 100644
--- a/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
+++ b/metadata/md5-cache/app-dicts/sword-GerLeoRP18-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Leonberger Bibel, NT (RP19)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLeoRP18
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-ND-4.0
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GerLut1545-2.0.1 b/metadata/md5-cache/app-dicts/sword-GerLut1545-2.0.1
index c1cba339a421..eee8e1752639 100644
--- a/metadata/md5-cache/app-dicts/sword-GerLut1545-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-GerLut1545-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Luther Übersetzung von 1545 (moderne Rechtschreibung)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut1545
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7 b/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
index 7c26f9c076f9..496f8c17ae83 100644
--- a/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
+++ b/metadata/md5-cache/app-dicts/sword-GerLutherpredigten-1.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Eine Sammlung von Lutherpredigten
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLutherpredigten
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.4
diff --git a/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7 b/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
index 6291a2146b5c..ff184f08f718 100644
--- a/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
+++ b/metadata/md5-cache/app-dicts/sword-GerNeUe-2.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Neue evangelistische Übersetzung der Bibel
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerNeUe
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6 b/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
index f99f5ef745fd..17781dcaee52 100644
--- a/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
+++ b/metadata/md5-cache/app-dicts/sword-GerReinhardt-1.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Reinhardt Evangelien
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerReinhardt
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1 b/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1
index b15327587405..d3140fc89810 100644
--- a/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-GerSch-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Schlachter Bibel (1951)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-GerTafel-1.1 b/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
index f8178873b2e6..298595441e63 100644
--- a/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
+++ b/metadata/md5-cache/app-dicts/sword-GerTafel-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Tafelbibel (1911)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTafel
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1 b/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
index 84d3b5cb3fce..1fc7f63b3cf3 100644
--- a/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
+++ b/metadata/md5-cache/app-dicts/sword-GerTextbibel-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=German Textbibel AT (1906)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerTextbibel
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Godbey-1.0 b/metadata/md5-cache/app-dicts/sword-Godbey-1.0
index ce8d3a8ad2d1..32b74e5cc155 100644
--- a/metadata/md5-cache/app-dicts/sword-Godbey-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Godbey-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1902 William Baxter Godbey NT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Godbey
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1 b/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
index a5b92b58dd38..11055b5c2667 100644
--- a/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
+++ b/metadata/md5-cache/app-dicts/sword-GodsWord-1.3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=God'S Word to the Nations
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GodsWord
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2 b/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
index 0e54c248b7f3..f790d889aee2 100644
--- a/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-GreVamvas-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Neophytos Vamvas's translation of the Holy Bible into modern Greek (1850)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreVamvas
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1 b/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1
index 3041050252b1..9c9516a44773 100644
--- a/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1
+++ b/metadata/md5-cache/app-dicts/sword-GreekHebrew-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Greek to Hebrew Dictionary of Septuagint Words
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GreekHebrew
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Haitian-1.5 b/metadata/md5-cache/app-dicts/sword-Haitian-1.5
index 65dcc6410273..cf2664de3235 100644
--- a/metadata/md5-cache/app-dicts/sword-Haitian-1.5
+++ b/metadata/md5-cache/app-dicts/sword-Haitian-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Haitian Creole Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Haitian
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2 b/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
index f0a682057fb1..02bd5c246f81 100644
--- a/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
+++ b/metadata/md5-cache/app-dicts/sword-HebDelitzsch-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Hebrew New Testament with Niqqud, based on Delitzsch's translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebDelitzsch
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-HebModern-1.2 b/metadata/md5-cache/app-dicts/sword-HebModern-1.2
index 93469c84980e..53cc96b9e0e1 100644
--- a/metadata/md5-cache/app-dicts/sword-HebModern-1.2
+++ b/metadata/md5-cache/app-dicts/sword-HebModern-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Modern Hebrew Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1 b/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1
index 0bfa26c12a2c..ebf23456a3ce 100644
--- a/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1
+++ b/metadata/md5-cache/app-dicts/sword-HebrewGreek-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Hebrew to Greek Dictionary of Septuagint Words
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HebrewGreek
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Heretics-1.1 b/metadata/md5-cache/app-dicts/sword-Heretics-1.1
index ccb5c876d359..b40f7ac41881 100644
--- a/metadata/md5-cache/app-dicts/sword-Heretics-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Heretics-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Heretics by Gilbert K. Chesterton (1874-1936)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Heretics
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3 b/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3
index fedcb9d08c28..80f1c519d417 100644
--- a/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Hitchcock-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Hitchcock's Bible Names
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Hitchcock
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-HunKar-2.0 b/metadata/md5-cache/app-dicts/sword-HunKar-2.0
index 2994ef508a37..125ffce277ce 100644
--- a/metadata/md5-cache/app-dicts/sword-HunKar-2.0
+++ b/metadata/md5-cache/app-dicts/sword-HunKar-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Karoli Bible revised version 1908
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-HunUj-1.8 b/metadata/md5-cache/app-dicts/sword-HunUj-1.8
index 5f13a4be47ad..8cc804f9e19c 100644
--- a/metadata/md5-cache/app-dicts/sword-HunUj-1.8
+++ b/metadata/md5-cache/app-dicts/sword-HunUj-1.8
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The New Translation Bible of the Hungarian Bible Society
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-ISBE-2.2 b/metadata/md5-cache/app-dicts/sword-ISBE-2.2
index d172c1ac0422..3768bbf1380e 100644
--- a/metadata/md5-cache/app-dicts/sword-ISBE-2.2
+++ b/metadata/md5-cache/app-dicts/sword-ISBE-2.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=International Standard Bible Encyclopedia
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ISBE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ISV-1.5 b/metadata/md5-cache/app-dicts/sword-ISV-1.5
index 7e317b24402a..352b7cbe87dc 100644
--- a/metadata/md5-cache/app-dicts/sword-ISV-1.5
+++ b/metadata/md5-cache/app-dicts/sword-ISV-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=International Standard Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ISV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1 b/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
index 992e84360d18..09c8318a3b06 100644
--- a/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
+++ b/metadata/md5-cache/app-dicts/sword-Imitation-1.7.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Imitation of Christ by Thomas a Kempis
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Imitation
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Institutes-1.2 b/metadata/md5-cache/app-dicts/sword-Institutes-1.2
index e8985c26c792..250d548de64c 100644
--- a/metadata/md5-cache/app-dicts/sword-Institutes-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Institutes-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Calvin's Institutes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0 b/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
index e081e3a1b5fd..cfbe99afba52 100644
--- a/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
+++ b/metadata/md5-cache/app-dicts/sword-IriODomhnuill-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=A modern Irish New Testament (Luke preview)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=IriODomhnuill
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2 b/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
index cc85f68ea11a..88c30806d5a6 100644
--- a/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
+++ b/metadata/md5-cache/app-dicts/sword-ItDizGreco-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Greek-Italian Dictionary of the New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItDizGreco
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0 b/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
index c713f9de0f51..6912c2e36e21 100644
--- a/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ItNomiBibbia-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Dizionario dei nomi della Bibbia
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItNomiBibbia
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.7.1
diff --git a/metadata/md5-cache/app-dicts/sword-ItaDio-1.1 b/metadata/md5-cache/app-dicts/sword-ItaDio-1.1
index 38019a9b33bf..0fa97cc9f472 100644
--- a/metadata/md5-cache/app-dicts/sword-ItaDio-1.1
+++ b/metadata/md5-cache/app-dicts/sword-ItaDio-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Italian Giovanni Diodati Bibbia 1649
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-ItaRive-1.1 b/metadata/md5-cache/app-dicts/sword-ItaRive-1.1
index 57d3659d6b9b..04f6270b60d5 100644
--- a/metadata/md5-cache/app-dicts/sword-ItaRive-1.1
+++ b/metadata/md5-cache/app-dicts/sword-ItaRive-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Italian Riveduta Bibbia (1927)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0 b/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
index 4486129d4c30..55179d2782b8 100644
--- a/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JCRHoliness-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Holiness by J. C. Ryle
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JCRHoliness
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-JEAffections-1.0 b/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
index 8b4eaff6df5e..4162e4d3604c 100644
--- a/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JEAffections-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Religious Affections by Jonathan Edwards
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JEAffections
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-JESermons-1.0 b/metadata/md5-cache/app-dicts/sword-JESermons-1.0
index de11797275d2..2c7bc0759455 100644
--- a/metadata/md5-cache/app-dicts/sword-JESermons-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JESermons-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Select Sermons of Jonathan Edwards
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JESermons
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-JOChrist-0.5 b/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
index 47481704b2e9..72b4d1736f5e 100644
--- a/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
+++ b/metadata/md5-cache/app-dicts/sword-JOChrist-0.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Christologia by John Owen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOChrist
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1 b/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
index e41d84d8a651..d518200e6bfd 100644
--- a/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
+++ b/metadata/md5-cache/app-dicts/sword-JOCommGod-0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Communion with God the Father, Son and Holy Ghost by John Owen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOCommGod
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-JOGlory-0.5 b/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
index 71afda9f9533..0c4658794de6 100644
--- a/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
+++ b/metadata/md5-cache/app-dicts/sword-JOGlory-0.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Glory of Christ by John Owen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOGlory
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0 b/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
index 9b00842cacd1..8139930d0106 100644
--- a/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JOMortSin-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Mortification of Sin by John Owen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JOMortSin
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-JPS-2.1 b/metadata/md5-cache/app-dicts/sword-JPS-2.1
index caf9b1e0572f..c2fa99cb86a2 100644
--- a/metadata/md5-cache/app-dicts/sword-JPS-2.1
+++ b/metadata/md5-cache/app-dicts/sword-JPS-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Jewish Publication Society Old Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JPS
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-JST-1.1 b/metadata/md5-cache/app-dicts/sword-JST-1.1
index d0b98e8edadc..2fa0041113d2 100644
--- a/metadata/md5-cache/app-dicts/sword-JST-1.1
+++ b/metadata/md5-cache/app-dicts/sword-JST-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Joseph Smith Translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JST
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-JapBungo-1.0 b/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
index a0201e0ed8be..abd1f5f37bfa 100644
--- a/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JapBungo-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Classical Japanese Bible (Bungo-yaku/Taisho-kaiyaku), 1950 edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapBungo
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.12
diff --git a/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1 b/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
index b61ee0957826..381bd213aff7 100644
--- a/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-JapDenmo-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Japanese Electronic Network Bible (Denmo)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapDenmo
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-JapKougo-1.1 b/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
index a373c41b77e0..75b858df1ae6 100644
--- a/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
+++ b/metadata/md5-cache/app-dicts/sword-JapKougo-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Colloquial Japanese Bible (Kougo-yaku), published 1954/1955
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapKougo
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.12
diff --git a/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0 b/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
index 20400812cbd9..6ce9759007d4 100644
--- a/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JapMeiji-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Japanese Bible translation from the Meiji period, version from 1953
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapMeiji
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.12
diff --git a/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0 b/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
index 35c65e14566a..c26552d11845 100644
--- a/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
+++ b/metadata/md5-cache/app-dicts/sword-JapRaguet-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Raguet-yaku - Japanese translation of the Bible by Emile Raguet (1910)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JapRaguet
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.12
diff --git a/metadata/md5-cache/app-dicts/sword-Josephus-1.1 b/metadata/md5-cache/app-dicts/sword-Josephus-1.1
index 5321908c73cf..cffd530b0fbf 100644
--- a/metadata/md5-cache/app-dicts/sword-Josephus-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Josephus-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Josephus: The Complete Works
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus
+INHERIT=sword-module
KEYWORDS=amd64 ~ppc x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.3
diff --git a/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1 b/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1
index cb5d8c248ba0..2b893c760e8c 100644
--- a/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Jubilee2000-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=English Jubilee 2000 Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Jubilee2000
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-KD-1.0 b/metadata/md5-cache/app-dicts/sword-KD-1.0
index ba652bb0573a..33e4fc6e55fb 100644
--- a/metadata/md5-cache/app-dicts/sword-KD-1.0
+++ b/metadata/md5-cache/app-dicts/sword-KD-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Keil and Delitzsch Biblical Commentary on the Old Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KD
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-KJV-2.9 b/metadata/md5-cache/app-dicts/sword-KJV-2.9
index 5cdb27debe3e..5ca839f76010 100644
--- a/metadata/md5-cache/app-dicts/sword-KJV-2.9
+++ b/metadata/md5-cache/app-dicts/sword-KJV-2.9
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=King James Version (1769) with Strongs Numbers and Morphology
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV
+INHERIT=sword-module
KEYWORDS=amd64 ~ppc x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1 b/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
index 9bec5b7ee58f..4adef557ab25 100644
--- a/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
+++ b/metadata/md5-cache/app-dicts/sword-KJVA-3.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=King James Version (1769) incl. Apocrypha, with Strongs Numbers and Morphology
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVA
+INHERIT=sword-module
KEYWORDS=amd64 ~ppc x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0 b/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
index 63568177598d..6788a9ada886 100644
--- a/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
+++ b/metadata/md5-cache/app-dicts/sword-KJVPCE-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=King James Version: Pure Cambridge Edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVPCE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-KLV-2.2 b/metadata/md5-cache/app-dicts/sword-KLV-2.2
index a65a4fc301fd..d2d898e981b8 100644
--- a/metadata/md5-cache/app-dicts/sword-KLV-2.2
+++ b/metadata/md5-cache/app-dicts/sword-KLV-2.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Klingon Language Version of the World English Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1 b/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1
index d1273fa87d00..300ef1af6822 100644
--- a/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1
+++ b/metadata/md5-cache/app-dicts/sword-KLVen_iklingon-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Klingon Language Version English to Klingon mapping lexicon
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLVen_iklingon
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1 b/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1
index 8148361fa44d..95294a2eceeb 100644
--- a/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1
+++ b/metadata/md5-cache/app-dicts/sword-KLViklingon_en-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Klingon Language Version Klingon to English mapping lexicon
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1 b/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
index 395751b920b6..bc32a4cb01ef 100644
--- a/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-Kapingamarangi-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The New Testament in the Kapingamarangi language
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kapingamarangi
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1 b/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
index 0920779490b2..665da699718b 100644
--- a/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-Kaz-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible translation into Kazakh
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kaz
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-Kekchi-1.5 b/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
index 3099161ecd94..f5bd344c0ea3 100644
--- a/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
+++ b/metadata/md5-cache/app-dicts/sword-Kekchi-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=K'ekchi' Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1 b/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
index acf4b1d8d6fb..a651c8441996 100644
--- a/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
+++ b/metadata/md5-cache/app-dicts/sword-KhmerNT-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Khmer Christian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KhmerNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0 b/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
index d4539f36765f..74502ecfe4af 100644
--- a/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
+++ b/metadata/md5-cache/app-dicts/sword-KorHKJV-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Korean Hangul King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorHKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1 b/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
index be0ba3942f24..a8703c37a5b7 100644
--- a/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-KorRV-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Korean Revised Version 1952/1961
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KorRV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-LITV-1.4 b/metadata/md5-cache/app-dicts/sword-LITV-1.4
index 1bb9bbd74431..843cb02393d6 100644
--- a/metadata/md5-cache/app-dicts/sword-LITV-1.4
+++ b/metadata/md5-cache/app-dicts/sword-LITV-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Green's Literal Translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-LO-1.1 b/metadata/md5-cache/app-dicts/sword-LO-1.1
index 445b9e50755f..db98833da8d8 100644
--- a/metadata/md5-cache/app-dicts/sword-LO-1.1
+++ b/metadata/md5-cache/app-dicts/sword-LO-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Living Oracles NT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LO
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-LXX-2.5 b/metadata/md5-cache/app-dicts/sword-LXX-2.5
index e1a231b7da3b..5e2a2065e79c 100644
--- a/metadata/md5-cache/app-dicts/sword-LXX-2.5
+++ b/metadata/md5-cache/app-dicts/sword-LXX-2.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Septuagint, Morphologically Tagged Rahlfs'
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LXX
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Latvian-1.4 b/metadata/md5-cache/app-dicts/sword-Latvian-1.4
index ec490b56841d..7d78f7b7c882 100644
--- a/metadata/md5-cache/app-dicts/sword-Latvian-1.4
+++ b/metadata/md5-cache/app-dicts/sword-Latvian-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Latvian New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-LawGospel-2.1 b/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
index 85dd816ea5a8..0a0ebf15fe69 100644
--- a/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
+++ b/metadata/md5-cache/app-dicts/sword-LawGospel-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Walther's Law and Gospel
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LawGospel
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.10
diff --git a/metadata/md5-cache/app-dicts/sword-Leeser-1.2 b/metadata/md5-cache/app-dicts/sword-Leeser-1.2
index e0149ec5fc8a..0f101e118e5a 100644
--- a/metadata/md5-cache/app-dicts/sword-Leeser-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Leeser-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1853 Leeser Old Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Leeser
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0 b/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0
index b9b1b0a1f57e..d4788b7eddf0 100644
--- a/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Lightfoot-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=John Lightfoot Commentary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Lightfoot
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2 b/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
index ab42efa87942..2f1bf0ed0d25 100644
--- a/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
+++ b/metadata/md5-cache/app-dicts/sword-LtKBB-1.7.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Lithuanian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LtKBB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Luther-1.1 b/metadata/md5-cache/app-dicts/sword-Luther-1.1
index 54433f42f127..a9f577ebf8a1 100644
--- a/metadata/md5-cache/app-dicts/sword-Luther-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Luther-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Luther's Commentary on Galatians
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Luther
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1 b/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
index 9abed3e78941..af8233b79c1e 100644
--- a/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
+++ b/metadata/md5-cache/app-dicts/sword-LvGluck8-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Latvian Glück 8th edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LvGluck8
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-MAK-1.0 b/metadata/md5-cache/app-dicts/sword-MAK-1.0
index 28ac8f1965ad..aebf9d60c0e8 100644
--- a/metadata/md5-cache/app-dicts/sword-MAK-1.0
+++ b/metadata/md5-cache/app-dicts/sword-MAK-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Matthias Ansorgs Kommentar
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MAK
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-MHC-1.6 b/metadata/md5-cache/app-dicts/sword-MHC-1.6
index 1f68dca792e8..679ebdd52d26 100644
--- a/metadata/md5-cache/app-dicts/sword-MHC-1.6
+++ b/metadata/md5-cache/app-dicts/sword-MHC-1.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Matthew Henry's Complete Commentary on the Whole Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MHC
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-MKJV-1.4 b/metadata/md5-cache/app-dicts/sword-MKJV-1.4
index 445c69ce05da..cd87e59eaaf8 100644
--- a/metadata/md5-cache/app-dicts/sword-MKJV-1.4
+++ b/metadata/md5-cache/app-dicts/sword-MKJV-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Green's Modern King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1 b/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
index f56569f70376..d86fef5ec3cd 100644
--- a/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-MLStrong-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=An Intermediate Greek-English Lexicon Keyed to Strong's Numbers
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MLStrong
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1 b/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
index 8d1ac49c45af..b116a410e530 100644
--- a/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-Mal1910-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sathyavedapusthakam (Malayalam Bible) published in 1910
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mal1910
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1 b/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1
index 9cae6108593a..9e2d61d9ae16 100644
--- a/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1
+++ b/metadata/md5-cache/app-dicts/sword-ManxGaelic-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Manx Gaelic Scripture Portions
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Maori-1.1 b/metadata/md5-cache/app-dicts/sword-Maori-1.1
index 5318380a0f6e..cba05227ee4b 100644
--- a/metadata/md5-cache/app-dicts/sword-Maori-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Maori-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Maori Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-MapM-1.0 b/metadata/md5-cache/app-dicts/sword-MapM-1.0
index 01fae0c188a0..f11108ecad7d 100644
--- a/metadata/md5-cache/app-dicts/sword-MapM-1.0
+++ b/metadata/md5-cache/app-dicts/sword-MapM-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Miqra according to the Mesorah
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MapM
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-MollColossians-1.0 b/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
index ea2692964bc3..a688de058074 100644
--- a/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
+++ b/metadata/md5-cache/app-dicts/sword-MollColossians-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Paul's Letter to the Believers at Colosse - A Series of Devotions by Pastor Randy Moll
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MollColossians
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-MonKJV-1.4 b/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
index 58400edbfe1b..a5470a50ac9c 100644
--- a/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
+++ b/metadata/md5-cache/app-dicts/sword-MonKJV-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Mongolian King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MonKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Montgomery-1.3 b/metadata/md5-cache/app-dicts/sword-Montgomery-1.3
index 1ab3c43082fa..bfd9ed547a09 100644
--- a/metadata/md5-cache/app-dicts/sword-Montgomery-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Montgomery-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Montgomery New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0 b/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
index c41f3bd30604..ac2990d001ba 100644
--- a/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
+++ b/metadata/md5-cache/app-dicts/sword-MorphGNT-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Morphologically Parsed Greek New Testament based on the SBLGNT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MorphGNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Murdock-1.2 b/metadata/md5-cache/app-dicts/sword-Murdock-1.2
index 1ff4867ee359..3907963a8d68 100644
--- a/metadata/md5-cache/app-dicts/sword-Murdock-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Murdock-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=James Murdock's Translation of the Syriac Peshitta
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1 b/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
index aedd55a9ff59..6ae673bccaab 100644
--- a/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-NETfree-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Free version of New English Translation with limited notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETfree
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1 b/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
index 1746e0c9e780..6132d926ff62 100644
--- a/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-NETnotesfree-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Free version of NET Bible Footnotes with limited notes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETnotesfree
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0 b/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
index d7d0efa78e4a..87f3238b6200 100644
--- a/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
+++ b/metadata/md5-cache/app-dicts/sword-NETtext-1.0.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=New English Translation text only with footnote markers
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NETtext
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-NHEB-2.1 b/metadata/md5-cache/app-dicts/sword-NHEB-2.1
index f723dc0fdc48..249ee8a16ffd 100644
--- a/metadata/md5-cache/app-dicts/sword-NHEB-2.1
+++ b/metadata/md5-cache/app-dicts/sword-NHEB-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=New Heart English Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1 b/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
index b635cf9e1f2d..e56cdf6dffb0 100644
--- a/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
+++ b/metadata/md5-cache/app-dicts/sword-NHEBJE-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=New Heart English Bible: Jehovah Edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBJE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-NHEBME-2.1 b/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
index e3385c174dfc..eb229e9c3f0b 100644
--- a/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
+++ b/metadata/md5-cache/app-dicts/sword-NHEBME-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=New Heart English Bible: Messianic Edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NHEBME
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Ndebele-1.2 b/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
index 7c48461977a5..a6a9e688d513 100644
--- a/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Ndebele-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Ndebele Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ndebele
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=FDL-1.3+
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3 b/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
index bdf1584b05dc..b0ba99047865 100644
--- a/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Nestle1904-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Nestle GNT 1904
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nestle1904
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0 b/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
index 8f32dfc0441a..c2e7b88bddcf 100644
--- a/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
+++ b/metadata/md5-cache/app-dicts/sword-NlCanisius1939-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Petrus Canisius Translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NlCanisius1939
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1 b/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
index 75fb205b2193..7092f7bb242b 100644
--- a/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-NorBroed-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bread Norwegian NT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorBroed
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-NorSMB-1.0 b/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
index 4a70b7c30cab..1cffa2161c34 100644
--- a/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
+++ b/metadata/md5-cache/app-dicts/sword-NorSMB-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Studentmållagsbibelen, first complete Nynorsk Bible translation (1921)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorSMB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Norsk-2.0 b/metadata/md5-cache/app-dicts/sword-Norsk-2.0
index ed8245bd53c6..736c5dd6f37b 100644
--- a/metadata/md5-cache/app-dicts/sword-Norsk-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Norsk-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Den Norske Bibelen
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Norsk
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1 b/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
index 9b2072c5d6cc..a15b0c77c83b 100644
--- a/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-NorthernAzeri-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Northern Azeri Translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=NorthernAzeri
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.10
diff --git a/metadata/md5-cache/app-dicts/sword-Noyes-1.2 b/metadata/md5-cache/app-dicts/sword-Noyes-1.2
index 60002171f2bd..f444f9e85f51 100644
--- a/metadata/md5-cache/app-dicts/sword-Noyes-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Noyes-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1869 Noyes Translation
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Noyes
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-OEB-1.1 b/metadata/md5-cache/app-dicts/sword-OEB-1.1
index d5c2e1d72459..8c950894617d 100644
--- a/metadata/md5-cache/app-dicts/sword-OEB-1.1
+++ b/metadata/md5-cache/app-dicts/sword-OEB-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Open English Bible (US Spelling)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC0-1.0
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-OEBcth-1.1 b/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
index 4960635b82fc..89c809a2f3e9 100644
--- a/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
+++ b/metadata/md5-cache/app-dicts/sword-OEBcth-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Open English Bible (Commonwealth Spelling)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OEBcth
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC0-1.0
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-OSHM-1.4 b/metadata/md5-cache/app-dicts/sword-OSHM-1.4
index 820584ea1fbf..9d064030851d 100644
--- a/metadata/md5-cache/app-dicts/sword-OSHM-1.4
+++ b/metadata/md5-cache/app-dicts/sword-OSHM-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Open Scriptures Hebrew Morphology Key
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHM
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-4.0
RDEPEND=>=app-text/sword-1.7.4
diff --git a/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1 b/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
index 39c8846d7d96..d0f395e48555 100644
--- a/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
+++ b/metadata/md5-cache/app-dicts/sword-OrthJBC-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Orthodox Jewish Brit Chadasha
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OrthJBC
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0 b/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0
index 323f272a6d21..ca8cb610a332 100644
--- a/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Orthodoxy-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Orthodoxy by Gilbert K. Chesterton (1874-1936)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Orthodoxy
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0 b/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
index c2e609355895..ff535a5ee42d 100644
--- a/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
+++ b/metadata/md5-cache/app-dicts/sword-OxfordTR-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1873 Oxford Textus Receptus Gospel of John
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OxfordTR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-PNT-1.1 b/metadata/md5-cache/app-dicts/sword-PNT-1.1
index a03e156f156c..da82625047e5 100644
--- a/metadata/md5-cache/app-dicts/sword-PNT-1.1
+++ b/metadata/md5-cache/app-dicts/sword-PNT-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The People's New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Packard-1.2 b/metadata/md5-cache/app-dicts/sword-Packard-1.2
index da40ec4f9fd5..e4126a7b96d5 100644
--- a/metadata/md5-cache/app-dicts/sword-Packard-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Packard-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Packard's Morphological Analysis Codes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Packard
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Passion-1.0 b/metadata/md5-cache/app-dicts/sword-Passion-1.0
index 2c0ddff711cf..a9ea7c7745ec 100644
--- a/metadata/md5-cache/app-dicts/sword-Passion-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Passion-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Dolorous Passion of Our Lord Jesus Christ
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Passion
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Personal-1.0 b/metadata/md5-cache/app-dicts/sword-Personal-1.0
index 2fa22e501c79..b3cd9c51fe2c 100644
--- a/metadata/md5-cache/app-dicts/sword-Personal-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Personal-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Personal Commentary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Peshitta-2.0 b/metadata/md5-cache/app-dicts/sword-Peshitta-2.0
index a8f9851d147f..317d60c86171 100644
--- a/metadata/md5-cache/app-dicts/sword-Peshitta-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Peshitta-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Syriac Peshitta
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Peshitta
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Phaistos-1.0 b/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
index ddeaf15adbca..781387206fd3 100644
--- a/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Phaistos-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Phaistos Disk
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Phaistos
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0 b/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0
index 35dd659cbdc2..f3c4cbd233c4 100644
--- a/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Pilgrim-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Pilgrim's Progress by John Bunyan (1628-1688)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pilgrim
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-PohnOld-1.01 b/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
index 16fb07a80bfe..fe894ab964f4 100644
--- a/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
+++ b/metadata/md5-cache/app-dicts/sword-PohnOld-1.01
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Old Public Domain Pohnpeian Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PohnOld
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1 b/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
index e49775113953..6537bb65755d 100644
--- a/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-Pohnpeian-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible in Pohnpeian language
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Pohnpeian
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0 b/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
index ef2c701ce9ff..b30b90697992 100644
--- a/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
+++ b/metadata/md5-cache/app-dicts/sword-PolGdanska-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Polish Biblia Gdanska (1881)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolGdanska
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1 b/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
index a66ffc1b68b3..7a7b63292e74 100644
--- a/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
+++ b/metadata/md5-cache/app-dicts/sword-PolUGdanska-2.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Updated Polish Gdansk Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PolUGdanska
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-PorAR-1.3 b/metadata/md5-cache/app-dicts/sword-PorAR-1.3
index ea97b68c3797..e3e549be09c0 100644
--- a/metadata/md5-cache/app-dicts/sword-PorAR-1.3
+++ b/metadata/md5-cache/app-dicts/sword-PorAR-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bíblia Almeida Recebida (AR)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-ND-4.0
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2 b/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
index 891f38a1e94f..f98c1e2eaaf5 100644
--- a/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
+++ b/metadata/md5-cache/app-dicts/sword-PorAlmeida1911-0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=De 1911 Biblia Sagrada Traduzida em Portuguez Por João Ferreeira D'Almeida
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorAlmeida1911
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1 b/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
index b5eb6fef1531..81d5e9327389 100644
--- a/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-PorBLivre-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bíblia Livre
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivre
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-3.0
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1 b/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
index e9233687354f..b5926a7f1a59 100644
--- a/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-PorBLivreTR-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bíblia Livre - Textus Receptus
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorBLivreTR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-3.0
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1 b/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
index 364955568379..4bab5049c0df 100644
--- a/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-PorCap-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bíblia Sagrada (Capuchinhos)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorCap
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire free-noncomm
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-PorIBP-1.0 b/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
index 44f09fc945cb..792bd50bb558 100644
--- a/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
+++ b/metadata/md5-cache/app-dicts/sword-PorIBP-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Índice Bíblico-Pastoral da Bíblia dos Capuchinhos
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PorIBP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.1
diff --git a/metadata/md5-cache/app-dicts/sword-PotLykins-1.0 b/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
index 7bdf900c2377..ece3c93ede58 100644
--- a/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
+++ b/metadata/md5-cache/app-dicts/sword-PotLykins-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1833 Potawatomi Matthew and Acts
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=PotLykins
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Practice-1.0 b/metadata/md5-cache/app-dicts/sword-Practice-1.0
index 9d259d9b1bd9..3501f739dd02 100644
--- a/metadata/md5-cache/app-dicts/sword-Practice-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Practice-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Practice of the Presence of God: The Best Rule of Holy Life
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Practice
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2 b/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
index 205c08cc82b8..6cd722d10f98 100644
--- a/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
+++ b/metadata/md5-cache/app-dicts/sword-QuotingPassages-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Scripture Passages Quoting Scripture
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=QuotingPassages
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-RKJNT-1.0 b/metadata/md5-cache/app-dicts/sword-RKJNT-1.0
index 87004e2c7c86..e7aa1082b492 100644
--- a/metadata/md5-cache/app-dicts/sword-RKJNT-1.0
+++ b/metadata/md5-cache/app-dicts/sword-RKJNT-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Revised King James New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RKJNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-RNKJV-1.5 b/metadata/md5-cache/app-dicts/sword-RNKJV-1.5
index a6ee88cfc1d0..13b62d77d12c 100644
--- a/metadata/md5-cache/app-dicts/sword-RNKJV-1.5
+++ b/metadata/md5-cache/app-dicts/sword-RNKJV-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Restored Name King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-RWP-2.0 b/metadata/md5-cache/app-dicts/sword-RWP-2.0
index 37b995352a98..b1ee6c29024b 100644
--- a/metadata/md5-cache/app-dicts/sword-RWP-2.0
+++ b/metadata/md5-cache/app-dicts/sword-RWP-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Robertson's Word Pictures
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-RWebster-1.3 b/metadata/md5-cache/app-dicts/sword-RWebster-1.3
index 42a6bd68c7e4..0ddd443d24fd 100644
--- a/metadata/md5-cache/app-dicts/sword-RWebster-1.3
+++ b/metadata/md5-cache/app-dicts/sword-RWebster-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Revised Webster Version (1833)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-RecVer-1.0 b/metadata/md5-cache/app-dicts/sword-RecVer-1.0
index 35980a740693..3566a2afd686 100644
--- a/metadata/md5-cache/app-dicts/sword-RecVer-1.0
+++ b/metadata/md5-cache/app-dicts/sword-RecVer-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Text Only Recovery Version (no outlines)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RecVer
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-Rieger-1.0 b/metadata/md5-cache/app-dicts/sword-Rieger-1.0
index f75ef560c891..45bd511a3c99 100644
--- a/metadata/md5-cache/app-dicts/sword-Rieger-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Rieger-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Carl Heinrich Riegers Kommentar
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rieger
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.2
diff --git a/metadata/md5-cache/app-dicts/sword-Robinson-2.1 b/metadata/md5-cache/app-dicts/sword-Robinson-2.1
index df4dbc94c9f5..b656f647129b 100644
--- a/metadata/md5-cache/app-dicts/sword-Robinson-2.1
+++ b/metadata/md5-cache/app-dicts/sword-Robinson-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Robinson's Morphological Analysis Codes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-RomCor-2.1 b/metadata/md5-cache/app-dicts/sword-RomCor-2.1
index 7e98db96cbbc..2dfd128450ed 100644
--- a/metadata/md5-cache/app-dicts/sword-RomCor-2.1
+++ b/metadata/md5-cache/app-dicts/sword-RomCor-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Cornilescu Bible in Romanian language
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Rotherham-1.7 b/metadata/md5-cache/app-dicts/sword-Rotherham-1.7
index f9ceca236895..7602d28e2a9c 100644
--- a/metadata/md5-cache/app-dicts/sword-Rotherham-1.7
+++ b/metadata/md5-cache/app-dicts/sword-Rotherham-1.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Emphasized Bible by J. B. Rotherham
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Rotherham
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1 b/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
index eb76d4fbef79..5bb257b40c22 100644
--- a/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
+++ b/metadata/md5-cache/app-dicts/sword-RusCARS-4.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Смысловой перевод Таурата, Книги Пророков, Забура и Инджила
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARS
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
index 3cbcf31d8e96..ecea3f883e36 100644
--- a/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSA-4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Смысловой перевод Таурата, Книги Пророков, Забура и Инджила
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSA
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
index e0a91be7459d..53edcd91f3dd 100644
--- a/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSADICT-4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARSA
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSADICT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0 b/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
index 889ac8aa7a44..5024290cf515 100644
--- a/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSDict-4.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARS
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSDict
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARST-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
index 58ddfafd350d..ac79966d30ae 100644
--- a/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
+++ b/metadata/md5-cache/app-dicts/sword-RusCARST-4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Смысловой перевод Таврота, Книги Пророков, Забура и Инджила
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARST
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1 b/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
index e9e506cd77a7..dc37a5dd296b 100644
--- a/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
+++ b/metadata/md5-cache/app-dicts/sword-RusCARSTDICT-4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=A dictionary companion to app-dicts/sword-RusCARST
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusCARSTDICT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0 b/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0
index 0ab903facbce..7c9aab8c05bf 100644
--- a/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0
+++ b/metadata/md5-cache/app-dicts/sword-RusMakarij-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Pentateuch of Moses in Russian
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2 b/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
index 907f7c9f726a..4142fe04d0e0 100644
--- a/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-RusSynodalLIO-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Russian Synodal Bible, Licht im Osten Edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodalLIO
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-RusVZh-1.0 b/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
index cdd90d20ccc8..d2198962668d 100644
--- a/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
+++ b/metadata/md5-cache/app-dicts/sword-RusVZh-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Russian New Testament with Strong's Numbers under edition of Victor R. Zhuromsky
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusVZh
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.3
diff --git a/metadata/md5-cache/app-dicts/sword-SAOA-1.0 b/metadata/md5-cache/app-dicts/sword-SAOA-1.0
index d4461ddddb1b..94da8dab2c74 100644
--- a/metadata/md5-cache/app-dicts/sword-SAOA-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SAOA-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Scripture Alphabet Of Animals
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SAOA
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1 b/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
index 15cc2c73c0ef..ba73fc17394b 100644
--- a/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
+++ b/metadata/md5-cache/app-dicts/sword-SBLGNT-1.3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Greek New Testament: SBL Edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3 b/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
index cccad1459c5b..4e1dba0047a6 100644
--- a/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
+++ b/metadata/md5-cache/app-dicts/sword-SBLGNTApp-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Greek New Testament: SBL Edition, Apparatus
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SBLGNTApp
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SME-1.7 b/metadata/md5-cache/app-dicts/sword-SME-1.7
index 608db1722e1c..40b9e4f721a2 100644
--- a/metadata/md5-cache/app-dicts/sword-SME-1.7
+++ b/metadata/md5-cache/app-dicts/sword-SME-1.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=C. H. Spurgeon's Morning and Evening: Daily Readins
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SME
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-SP-1.0 b/metadata/md5-cache/app-dicts/sword-SP-1.0
index f76235fc29f1..c25bfb29f0e6 100644
--- a/metadata/md5-cache/app-dicts/sword-SP-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SP-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Samaritan Pentateuch
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.6.3
diff --git a/metadata/md5-cache/app-dicts/sword-SPDSS-1.0 b/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
index 4d7278bb032d..370cca1b4d1a 100644
--- a/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SPDSS-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Dead Sea Scrolls variants parallel to the Samaritan Pentateuch
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPDSS
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.6.3
diff --git a/metadata/md5-cache/app-dicts/sword-SPE-1.0 b/metadata/md5-cache/app-dicts/sword-SPE-1.0
index 7f3003823bb2..9d2f1948b0a1 100644
--- a/metadata/md5-cache/app-dicts/sword-SPE-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SPE-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Samaritan Pentateuch in English
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPE
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-SPMT-1.0 b/metadata/md5-cache/app-dicts/sword-SPMT-1.0
index 32363f060bbb..60c55245e938 100644
--- a/metadata/md5-cache/app-dicts/sword-SPMT-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SPMT-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Masoretic Text parallel to the Samaritan Pentateuch
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPMT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.6.3
diff --git a/metadata/md5-cache/app-dicts/sword-SPVar-1.0 b/metadata/md5-cache/app-dicts/sword-SPVar-1.0
index 269d47037136..87384855db8f 100644
--- a/metadata/md5-cache/app-dicts/sword-SPVar-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SPVar-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Samaritan Pentateuch with variant readings
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SPVar
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1 b/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
index ec5f80469c71..b072438faa08 100644
--- a/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-SahidicBible-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sahidic Bible - Askeland / Schulz
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SahidicBible
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-Scofield-1.0 b/metadata/md5-cache/app-dicts/sword-Scofield-1.0
index 03eb36ee1f20..88beea1fa90d 100644
--- a/metadata/md5-cache/app-dicts/sword-Scofield-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Scofield-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Scofield Reference Notes, 1917 Edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield
+INHERIT=sword-module
KEYWORDS=amd64 ~ppc x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2 b/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2
index a891e61e13cf..bb968ba62f4e 100644
--- a/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2
+++ b/metadata/md5-cache/app-dicts/sword-ScotsGaelic-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Scots Gaelic Gospel of Mark
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Sentiment-1.0 b/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
index e49d57810040..d0849fd4d568 100644
--- a/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Sentiment-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Sentiment Analysis of the Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sentiment
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-4.0
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-Shona-2.1 b/metadata/md5-cache/app-dicts/sword-Shona-2.1
index 930a217316e3..15d0792aa780 100644
--- a/metadata/md5-cache/app-dicts/sword-Shona-2.1
+++ b/metadata/md5-cache/app-dicts/sword-Shona-2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Shona Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Shona
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=FDL-1.3+
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0 b/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
index b7e7d9557fad..e38a94dd22e9 100644
--- a/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SloOjacano-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Ojačano Sveto pismo (Ps + Gal)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloOjacano
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-SloStritar-1.1 b/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
index d66ff49abf61..a0d46ebe450d 100644
--- a/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
+++ b/metadata/md5-cache/app-dicts/sword-SloStritar-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Novi testament in Psalmi Davidovi Josipa Stritarja (1882)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloStritar
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6
diff --git a/metadata/md5-cache/app-dicts/sword-Smith-1.3 b/metadata/md5-cache/app-dicts/sword-Smith-1.3
index 4eda63a5f396..bf45e0cf5973 100644
--- a/metadata/md5-cache/app-dicts/sword-Smith-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Smith-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Smith's Bible Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Smith
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-SomKQA-2.0 b/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
index 1e581c59da33..c683a45a4bd4 100644
--- a/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
+++ b/metadata/md5-cache/app-dicts/sword-SomKQA-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Kitaabka Quduuska Ah (Somali Bible)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SomKQA
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1 b/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
index 08286ff20696..9a3bfe78ca47 100644
--- a/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-Sorani-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bible in Sorani Kurdish language
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Sorani
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV-1.6 b/metadata/md5-cache/app-dicts/sword-SpaRV-1.6
index 2decab2086f1..424963a3c6c2 100644
--- a/metadata/md5-cache/app-dicts/sword-SpaRV-1.6
+++ b/metadata/md5-cache/app-dicts/sword-SpaRV-1.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Spanish Biblia Reina-Valera (1909)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1 b/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
index b7c0c5fd36e0..e5a1da0ff20c 100644
--- a/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
+++ b/metadata/md5-cache/app-dicts/sword-SpaRV1865-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Spanish Reina-Valera Bible (1865) with updated orthography
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1865
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1 b/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
index 77450bf64807..8a8ecf9f9ccf 100644
--- a/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-SpaRV1909-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Spanish Reina-Valera 1909 with Strong's numbers
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV1909
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3 b/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3
index 7d98cee753b8..51f33e85b024 100644
--- a/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3
+++ b/metadata/md5-cache/app-dicts/sword-SpaRVG-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Spanish Reina Valera Gomez Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRVG
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-ND-3.0
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0 b/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
index 47b6b46a7df2..4fcf26c921bc 100644
--- a/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SpaTDP-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Spanish Traducción de dominio público (Mateo a Romanos)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaTDP
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1 b/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1
index bc72c5d34dae..3e4a7a906ab2 100644
--- a/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1
+++ b/metadata/md5-cache/app-dicts/sword-SpaVNT-1.2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Spanish 1858 Reina Valera New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Spurious-1.0 b/metadata/md5-cache/app-dicts/sword-Spurious-1.0
index 066cfe29459c..f1f97d2b90a9 100644
--- a/metadata/md5-cache/app-dicts/sword-Spurious-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Spurious-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Tischendorf's Spurious Passages of the GNT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Spurious
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0 b/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
index c02dd74b004f..d399d2cd57ef 100644
--- a/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SrKDEkavski-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Serbian Bible Daničić-Karadžić Ekavski, NRSV versification
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDEkavski
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0 b/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
index 1144a4467638..bb154f9f8dce 100644
--- a/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SrKDIjekav-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Serbian Bible Daničić-Karadžić Ijekavski, Calvin versification
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SrKDIjekav
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.8.0
diff --git a/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2 b/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
index 4bee3717efbe..d130d05a7d6a 100644
--- a/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
+++ b/metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Strong's Greek Bible Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek
+INHERIT=sword-module
KEYWORDS=amd64 ~ppc x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2 b/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2
index 5968501bcef5..817dbc924f9a 100644
--- a/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2
+++ b/metadata/md5-cache/app-dicts/sword-StrongsHebrew-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Strong's Hebrew Bible Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsHebrew
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Swahili-1.1 b/metadata/md5-cache/app-dicts/sword-Swahili-1.1
index b24d9f6aff7c..85a058e45d47 100644
--- a/metadata/md5-cache/app-dicts/sword-Swahili-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Swahili-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Swahili New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swahili
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Swe1917-2.0 b/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
index c2c64343fd19..93f6af43c1a8 100644
--- a/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Swe1917-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Swedish Bible (1917)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1 b/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
index c8723c2e9aff..6235cbd9e0de 100644
--- a/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Swe1917Of-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Ordförklaringar och sakupplysningar från 1917 års översättning av bibeln
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Swe1917Of
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2 b/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
index 069097bb4324..30462844d5c9 100644
--- a/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
+++ b/metadata/md5-cache/app-dicts/sword-SweFolk1998-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Svenska Folkbibeln (1998)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweFolk1998
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0 b/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
index eeaef133cc85..554cf4f07b26 100644
--- a/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SweKarlXII-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Svenska Karl XII:s Bibel (1703)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0 b/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
index 441d4217f159..928ede4fa3af 100644
--- a/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
+++ b/metadata/md5-cache/app-dicts/sword-SweKarlXII1873-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Svenska Karl XII:s Bibel (1873)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SweKarlXII1873
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-TCR-1.1 b/metadata/md5-cache/app-dicts/sword-TCR-1.1
index 140ccfebe6c0..3db194600e80 100644
--- a/metadata/md5-cache/app-dicts/sword-TCR-1.1
+++ b/metadata/md5-cache/app-dicts/sword-TCR-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Thompson Chain Topics
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TCR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-TDavid-1.1 b/metadata/md5-cache/app-dicts/sword-TDavid-1.1
index ce17d7b29b22..bbdd0abd06c4 100644
--- a/metadata/md5-cache/app-dicts/sword-TDavid-1.1
+++ b/metadata/md5-cache/app-dicts/sword-TDavid-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=C. H. Spurgeon's Treasury of David
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TDavid
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-TFG-1.5 b/metadata/md5-cache/app-dicts/sword-TFG-1.5
index 830bf2728280..d01c1a16c7a1 100644
--- a/metadata/md5-cache/app-dicts/sword-TFG-1.5
+++ b/metadata/md5-cache/app-dicts/sword-TFG-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Fourfold Gospel and Commentary on Acts of Apostles
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TFG
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-TNT-2.0 b/metadata/md5-cache/app-dicts/sword-TNT-2.0
index c3929ed75cbe..4523f6b3f500 100644
--- a/metadata/md5-cache/app-dicts/sword-TNT-2.0
+++ b/metadata/md5-cache/app-dicts/sword-TNT-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Tregelles' Greek New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-SA-4.0
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-TR-2.4 b/metadata/md5-cache/app-dicts/sword-TR-2.4
index ded197999671..29fe2e3932a1 100644
--- a/metadata/md5-cache/app-dicts/sword-TR-2.4
+++ b/metadata/md5-cache/app-dicts/sword-TR-2.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Textus Receptus (1550/1894)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TR
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-TSK-1.4 b/metadata/md5-cache/app-dicts/sword-TSK-1.4
index 69cbf538fbf1..7c20d7d0b9c1 100644
--- a/metadata/md5-cache/app-dicts/sword-TSK-1.4
+++ b/metadata/md5-cache/app-dicts/sword-TSK-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Treasury of Scripture Knowledge
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TSK
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2 b/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
index b0a614181a4e..29c7a3653588 100644
--- a/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
+++ b/metadata/md5-cache/app-dicts/sword-TagAngBiblia-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION='Ang Biblia' in Tagalog by Philippine Bible Society, 1905
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TagAngBiblia
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Tagalog-1.1 b/metadata/md5-cache/app-dicts/sword-Tagalog-1.1
index def310f798ee..f0af43b51941 100644
--- a/metadata/md5-cache/app-dicts/sword-Tagalog-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Tagalog-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Tagalog (John & James)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tagalog
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Tausug-1.1 b/metadata/md5-cache/app-dicts/sword-Tausug-1.1
index 2c7fc046a5e6..8c8f67083f6f 100644
--- a/metadata/md5-cache/app-dicts/sword-Tausug-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Tausug-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Tausug Kitab Injil
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tausug
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-ND-3.0
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0 b/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
index 5daa671e8387..bd1493a3d005 100644
--- a/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
+++ b/metadata/md5-cache/app-dicts/sword-ThaiKJV-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Thai King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ThaiKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Tisch-2.5 b/metadata/md5-cache/app-dicts/sword-Tisch-2.5
index 7c957275b568..9a20414f9063 100644
--- a/metadata/md5-cache/app-dicts/sword-Tisch-2.5
+++ b/metadata/md5-cache/app-dicts/sword-Tisch-2.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Tischendorf's 8th edition GNT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tisch
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Torrey-1.3 b/metadata/md5-cache/app-dicts/sword-Torrey-1.3
index 7e6e82ccb13e..debe5cdae5c2 100644
--- a/metadata/md5-cache/app-dicts/sword-Torrey-1.3
+++ b/metadata/md5-cache/app-dicts/sword-Torrey-1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=R. A. Torrey's New Topical Textbook
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Torrey
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1 b/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
index 7261b8bbaec8..a36b86a592f0 100644
--- a/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-TurHADI-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Turkish Easy-to-Read Translation (HADI)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurHADI
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1 b/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
index 22053c09880f..37bff3285429 100644
--- a/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
+++ b/metadata/md5-cache/app-dicts/sword-TurNTB-2.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Kutsal Kitap (New Turkish Bible)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=TurNTB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-dicts/sword-Twenty-1.1 b/metadata/md5-cache/app-dicts/sword-Twenty-1.1
index 9380c05470f3..15a5ecfa0921 100644
--- a/metadata/md5-cache/app-dicts/sword-Twenty-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Twenty-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Twentieth Century New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Tyndale-1.0 b/metadata/md5-cache/app-dicts/sword-Tyndale-1.0
index fa3bfe0514b1..095cd5fc80a3 100644
--- a/metadata/md5-cache/app-dicts/sword-Tyndale-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Tyndale-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=William Tyndale Bible (1525/1530)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1 b/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1
index 6ac80ca68dab..e303819b687d 100644
--- a/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-UKJV-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Updated King James Version
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.6
diff --git a/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1 b/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
index 010eaa5555c6..46190d477eeb 100644
--- a/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
+++ b/metadata/md5-cache/app-dicts/sword-UkrKulish-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Ukrainian New Testament translated by P. Kulish (1871)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UkrKulish
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4 b/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4
index c25e289ff817..a05c2dab9838 100644
--- a/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4
+++ b/metadata/md5-cache/app-dicts/sword-Ukrainian-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Ivan Ogienko Ukrainian Bible, 1930
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Ukrainian
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Uma-1.2 b/metadata/md5-cache/app-dicts/sword-Uma-1.2
index 5113e52b1b53..34ff094b1934 100644
--- a/metadata/md5-cache/app-dicts/sword-Uma-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Uma-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Uma New Testament
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Uma
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-UyCyr-1.1 b/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
index 333dd36b9b67..a722977e7168 100644
--- a/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
+++ b/metadata/md5-cache/app-dicts/sword-UyCyr-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Modern Uyghur Cyrillic translation of the Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UyCyr
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-VarApp-1.0 b/metadata/md5-cache/app-dicts/sword-VarApp-1.0
index 01afa81d5e27..d709f25877b4 100644
--- a/metadata/md5-cache/app-dicts/sword-VarApp-1.0
+++ b/metadata/md5-cache/app-dicts/sword-VarApp-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=NT Manuscript Variant Apparatus
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VarApp
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC0-1.0
RDEPEND=>=app-text/sword-1.6.2
diff --git a/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0 b/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0
index f3d92ed110d3..8c0db3349dfc 100644
--- a/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0
+++ b/metadata/md5-cache/app-dicts/sword-VieRobinson-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Vietnamese translation of Robinson's Morphological Codes
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VieRobinson
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1 b/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1
index 0f7a52b16960..c8cac5842609 100644
--- a/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1
+++ b/metadata/md5-cache/app-dicts/sword-VieStrongsGreek-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Richard Helleme’s Greek-English-Vietnamese Dictionary in Vietnamese
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VieStrongsGreek
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-Viet-1.4.1 b/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
index 39952e16dae2..93476e7ee1db 100644
--- a/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
+++ b/metadata/md5-cache/app-dicts/sword-Viet-1.4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Vietnamese Bible (1934)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Viet
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.2
diff --git a/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0 b/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
index 0f4b7e9c7eed..e3f41cf3c780 100644
--- a/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
+++ b/metadata/md5-cache/app-dicts/sword-VietLCCMN-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Lời Chúa Cho Mọi Người
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMN
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0 b/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
index ce1f179be1a1..83c9671ae666 100644
--- a/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
+++ b/metadata/md5-cache/app-dicts/sword-VietLCCMNCT-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Lời Chúa Cho Mọi Người Chú Thích
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietLCCMNCT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-VietNVB-1.4 b/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
index 9f80a894fcd8..bf612bcbce8f 100644
--- a/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
+++ b/metadata/md5-cache/app-dicts/sword-VietNVB-1.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=New Vietnamese Bible (2002)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VietNVB
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=crosswire
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1 b/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
index 49c7fd91a648..91e73c47a7c8 100644
--- a/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
+++ b/metadata/md5-cache/app-dicts/sword-VulgClementine-2.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Clementine Vulgate
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgClementine
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
index d9de62bd0615..80e824cd1fa8 100644
--- a/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-VulgConte-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Vulgata Clementina, Conte editore
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgConte
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1 b/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
index e706491c2d37..e70ccef938be 100644
--- a/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-VulgGlossa-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Glossa ordinaria, ed. Migne
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgGlossa
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
index f57eb9dfbaf3..6d367cfecef6 100644
--- a/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-VulgHetzenauer-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Vulgata Clementina, Hetzenauer editore
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgHetzenauer
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2 b/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
index 5439eb96d140..1df06506bb88 100644
--- a/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
+++ b/metadata/md5-cache/app-dicts/sword-VulgSistine-1.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Vulgata Sistina
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=VulgSistine
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1 b/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1
index 03bde820b683..4770200840d9 100644
--- a/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Vulgate_HebPs-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Latin Vulgate Psalms from Hebrew
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-WHNU-2.4 b/metadata/md5-cache/app-dicts/sword-WHNU-2.4
index 31d05101c68b..adca9e1a1b4f 100644
--- a/metadata/md5-cache/app-dicts/sword-WHNU-2.4
+++ b/metadata/md5-cache/app-dicts/sword-WHNU-2.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Westcott-Hort with NA27/UBS4 variants (1881)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-WLC-1.9 b/metadata/md5-cache/app-dicts/sword-WLC-1.9
index 8fad373a63cb..6e93ce1eea5d 100644
--- a/metadata/md5-cache/app-dicts/sword-WLC-1.9
+++ b/metadata/md5-cache/app-dicts/sword-WLC-1.9
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Westminster Leningrad Codex
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.7.0
diff --git a/metadata/md5-cache/app-dicts/sword-Webster-1.2 b/metadata/md5-cache/app-dicts/sword-Webster-1.2
index 375ab92648ad..cb0fb2059079 100644
--- a/metadata/md5-cache/app-dicts/sword-Webster-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Webster-1.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Webster Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Webster1806-1.0 b/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
index 980d58734349..a793206bb468 100644
--- a/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Webster1806-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Webster's 1806 A Compendious Dictionary of the English Language
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1806
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Webster1913-2.0 b/metadata/md5-cache/app-dicts/sword-Webster1913-2.0
index 8e7fa34aeb70..75940b56674f 100644
--- a/metadata/md5-cache/app-dicts/sword-Webster1913-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Webster1913-2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Webster's English Dictionary, 1913 edition
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster1913
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.11
diff --git a/metadata/md5-cache/app-dicts/sword-Wesley-1.1 b/metadata/md5-cache/app-dicts/sword-Wesley-1.1
index 318a9cef7ef7..d2a032baeadb 100644
--- a/metadata/md5-cache/app-dicts/sword-Wesley-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Wesley-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=John Wesley's Notes on the Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wesley
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1 b/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
index e0f17d16a375..a3d6ea205d10 100644
--- a/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-Westminster-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Westminster Confession & Catechisms
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.9
diff --git a/metadata/md5-cache/app-dicts/sword-Westminster21-1.0 b/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
index 474885e9239c..032bafc420bb 100644
--- a/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
+++ b/metadata/md5-cache/app-dicts/sword-Westminster21-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=The Westminster Standards translated into twenty-first century American English
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Westminster21
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=freedist
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Weymouth-1.1 b/metadata/md5-cache/app-dicts/sword-Weymouth-1.1
index 215fcdd82b34..19ef494433ad 100644
--- a/metadata/md5-cache/app-dicts/sword-Weymouth-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Weymouth-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Weymouth NT (1912)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Weymouth
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-Worsley-1.6 b/metadata/md5-cache/app-dicts/sword-Worsley-1.6
index 9ab8d4bd311b..51088da56d55 100644
--- a/metadata/md5-cache/app-dicts/sword-Worsley-1.6
+++ b/metadata/md5-cache/app-dicts/sword-Worsley-1.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=1770 John Worsley NT
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Worsley
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1 b/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1
index c67c2e53411c..5d7f40897a5d 100644
--- a/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-Wulfila-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Bishop Wulfila Gothic Bible
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4 b/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4
index 63afff94c142..7123b405390b 100644
--- a/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4
+++ b/metadata/md5-cache/app-dicts/sword-Wycliffe-2.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=John Wycliffe Bible (c. 1395)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-SA-4.0
RDEPEND=>=app-text/sword-1.6.1
diff --git a/metadata/md5-cache/app-dicts/sword-YLT-1.1 b/metadata/md5-cache/app-dicts/sword-YLT-1.1
index f5ae76b744d8..3b05cfe01cad 100644
--- a/metadata/md5-cache/app-dicts/sword-YLT-1.1
+++ b/metadata/md5-cache/app-dicts/sword-YLT-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Young's Literal Translation (1898)
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=app-text/sword
diff --git a/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1 b/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
index 20998b5d9f21..d0c5cd06cbde 100644
--- a/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-ZhEnglish-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=CEDICT English/Chinese Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhEnglish
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CEDICT
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0 b/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
index 7b0a73ac7988..aa2aaff4c97d 100644
--- a/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ZhHanzi-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=CEDICT Chinese (Hanzi)/English Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhHanzi
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CEDICT
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0 b/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
index 67633319d777..ec7cfb95994c 100644
--- a/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ZhPinyin-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=CEDICT Chinese (Pinyin)/English Dictionary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ZhPinyin
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CEDICT
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-alzat-1.0 b/metadata/md5-cache/app-dicts/sword-alzat-1.0
index 51e46f2985f8..ad46a6db5714 100644
--- a/metadata/md5-cache/app-dicts/sword-alzat-1.0
+++ b/metadata/md5-cache/app-dicts/sword-alzat-1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=الذات للبابا شنودة الثالث
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=alzat
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=free-noncomm
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-br_en-1.1 b/metadata/md5-cache/app-dicts/sword-br_en-1.1
index 5e0cfd31a420..e9bb475f198e 100644
--- a/metadata/md5-cache/app-dicts/sword-br_en-1.1
+++ b/metadata/md5-cache/app-dicts/sword-br_en-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Breton to English Glossary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-en_eu-1.1 b/metadata/md5-cache/app-dicts/sword-en_eu-1.1
index e792c4347048..116324afce2e 100644
--- a/metadata/md5-cache/app-dicts/sword-en_eu-1.1
+++ b/metadata/md5-cache/app-dicts/sword-en_eu-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=English to Basque Glossary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=en_eu
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-f35-1.0.1 b/metadata/md5-cache/app-dicts/sword-f35-1.0.1
index 3474e993b137..48af60408973 100644
--- a/metadata/md5-cache/app-dicts/sword-f35-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-f35-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Wilbur Pickering's Greek New Testament According to Family 35
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=f35
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-NC-SA-4.0
RDEPEND=>=app-text/sword-1.7.2
diff --git a/metadata/md5-cache/app-dicts/sword-la_en-1.1 b/metadata/md5-cache/app-dicts/sword-la_en-1.1
index c7fe483f7490..1028fd9a9337 100644
--- a/metadata/md5-cache/app-dicts/sword-la_en-1.1
+++ b/metadata/md5-cache/app-dicts/sword-la_en-1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Latin to English Glossary
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1 b/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
index 4277f3bc5614..8722009184fc 100644
--- a/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-sml_BL_2008-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Kitab Awal-Jaman maka Kitab Injil
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=sml_BL_2008
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CC-BY-ND-3.0
RDEPEND=>=app-text/sword-1.5.1a
diff --git a/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1 b/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
index 18a4e22a1c39..a4395d1c1afa 100644
--- a/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
+++ b/metadata/md5-cache/app-dicts/sword-vlsJoNT-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install
DESCRIPTION=Het Nieuwe Testament by Nicolaas De Jonge
EAPI=7
HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=vlsJoNT
+INHERIT=sword-module
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=>=app-text/sword-1.6.0
diff --git a/metadata/md5-cache/app-doc/cantera-docs-2.4.0 b/metadata/md5-cache/app-doc/cantera-docs-2.4.0
index 1bae7cc8d995..4a16f1639c91 100644
--- a/metadata/md5-cache/app-doc/cantera-docs-2.4.0
+++ b/metadata/md5-cache/app-doc/cantera-docs-2.4.0
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=Documentation API reference for Cantera package libraries
EAPI=6
HOMEPAGE=https://cantera.org
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=x11-misc/xdg-utils
diff --git a/metadata/md5-cache/app-doc/cantera-docs-2.5.1 b/metadata/md5-cache/app-doc/cantera-docs-2.5.1
index e1e8d5860867..b31fd7159ee7 100644
--- a/metadata/md5-cache/app-doc/cantera-docs-2.5.1
+++ b/metadata/md5-cache/app-doc/cantera-docs-2.5.1
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Documentation API reference for Cantera package libraries
EAPI=7
HOMEPAGE=https://cantera.org
+INHERIT=desktop xdg
KEYWORDS=~amd64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-2.5.1/cantera-docs-2.5.1_modified_menu.tar.xz -> cantera-docs-2.5.1.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=e5d750a9efb3666fad3e1d2ed2e62927
diff --git a/metadata/md5-cache/app-doc/devmanual-0_pre20200207 b/metadata/md5-cache/app-doc/devmanual-0_pre20200207
index 59daa8e934fe..bbd8fdf2a04f 100644
--- a/metadata/md5-cache/app-doc/devmanual-0_pre20200207
+++ b/metadata/md5-cache/app-doc/devmanual-0_pre20200207
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=The Gentoo Development Guide
EAPI=7
HOMEPAGE=https://devmanual.gentoo.org/
+INHERIT=readme.gentoo-r1
IUSE=+offline
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
LICENSE=CC-BY-SA-4.0
diff --git a/metadata/md5-cache/app-doc/halibut-1.2 b/metadata/md5-cache/app-doc/halibut-1.2
index 226da6148f9b..3600bdbf0f77 100644
--- a/metadata/md5-cache/app-doc/halibut-1.2
+++ b/metadata/md5-cache/app-doc/halibut-1.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=yet another free document preparation system
EAPI=6
HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/halibut/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=MIT
SLOT=0
SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-1.2/halibut-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=060a3cc37414c6ba5e8a5ebda5251f9a
diff --git a/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2 b/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2
index b8a37ab6925a..7ee126f3cb7f 100644
--- a/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2
+++ b/metadata/md5-cache/app-doc/motif-reference-manual-2.3.0-r2
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=Motif Reference Manual
EAPI=6
HOMEPAGE=http://www.motifzone.net/
+INHERIT=readme.gentoo-r1
KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=OPL
SLOT=0
diff --git a/metadata/md5-cache/app-editors/aee-2.2.21 b/metadata/md5-cache/app-editors/aee-2.2.21
index bbe401991ad5..9544a4c9dd69 100644
--- a/metadata/md5-cache/app-editors/aee-2.2.21
+++ b/metadata/md5-cache/app-editors/aee-2.2.21
@@ -4,11 +4,12 @@ DEPEND=X? ( x11-libs/libX11 )
DESCRIPTION=An easy to use text editor
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
IUSE=X
KEYWORDS=amd64 x86 ~amd64-linux
LICENSE=Artistic
RDEPEND=X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=mirror://gentoo/aee-2.2.21.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3e425edbea3d641ac13cc308ae131a9a
diff --git a/metadata/md5-cache/app-editors/dav-0.8.5-r2 b/metadata/md5-cache/app-editors/dav-0.8.5-r2
index 141ccbca28ab..cc4fe8571a15 100644
--- a/metadata/md5-cache/app-editors/dav-0.8.5-r2
+++ b/metadata/md5-cache/app-editors/dav-0.8.5-r2
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=A minimal console text editor
EAPI=7
HOMEPAGE=http://dav-text.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=http://dav-text.sourceforge.net/files/dav-0.8.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=472176d749a76dde3af6b1704d508a35
diff --git a/metadata/md5-cache/app-editors/e3-2.8.2 b/metadata/md5-cache/app-editors/e3-2.8.2
index 48feaffc097b..58be55e5f9d7 100644
--- a/metadata/md5-cache/app-editors/e3-2.8.2
+++ b/metadata/md5-cache/app-editors/e3-2.8.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings
EAPI=7
HOMEPAGE=https://sites.google.com/site/e3editor/
+INHERIT=toolchain-funcs
KEYWORDS=-* amd64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://sites.google.com/site/e3editor/Home/e3-2.82.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9a74d95605773e171c214d4eb0f576de
diff --git a/metadata/md5-cache/app-editors/ee-1.5.2 b/metadata/md5-cache/app-editors/ee-1.5.2
index 442870f2bddd..6a694dfe3cc7 100644
--- a/metadata/md5-cache/app-editors/ee-1.5.2
+++ b/metadata/md5-cache/app-editors/ee-1.5.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=An easy to use text editor. A subset of aee
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD-2
RDEPEND=!app-editors/ersatz-emacs
SLOT=0
SRC_URI=mirror://gentoo/ee-1.5.2.src.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7f915d6514c8f4319d282b421623bc89
diff --git a/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1 b/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
index dca348cb5042..f9b7840e2eaf 100644
--- a/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
+++ b/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=A very minimal imitation of the famous GNU Emacs editor
EAPI=7
HOMEPAGE=https://web.archive.org/web/20171126221613/http://hunter.apana.org.au/~cjb/Code/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
RDEPEND=sys-libs/ncurses:0= !app-editors/ee
SLOT=0
SRC_URI=mirror://gentoo/ersatz-emacs-20060515.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=65a572c9d6fcd5a93f9b920cbd26cad1
diff --git a/metadata/md5-cache/app-editors/fe-2.0 b/metadata/md5-cache/app-editors/fe-2.0
index 08dc0f61c392..adc1757c0a32 100644
--- a/metadata/md5-cache/app-editors/fe-2.0
+++ b/metadata/md5-cache/app-editors/fe-2.0
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
DESCRIPTION=A small and easy to use folding editor
EAPI=7
HOMEPAGE=http://www.moria.de/~michael/fe/
+INHERIT=toolchain-funcs
IUSE=sendmail
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0= sendmail? ( virtual/mta )
SLOT=0
SRC_URI=http://www.moria.de/~michael/fe/fe-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e821261e3a9575ef087bfe12c6734605
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.7.2 b/metadata/md5-cache/app-editors/focuswriter-1.7.2
index fc46c22484a1..2ae56a94dcf7 100644
--- a/metadata/md5-cache/app-editors/focuswriter-1.7.2
+++ b/metadata/md5-cache/app-editors/focuswriter-1.7.2
@@ -4,10 +4,11 @@ DEPEND=app-text/hunspell:= >=dev-qt/qtcore-5.11:5 >=dev-qt/qtgui-5.11:5 >=dev-qt
DESCRIPTION=Fullscreen and distraction-free word processor
EAPI=7
HOMEPAGE=https://gottcode.org/focuswriter/
+INHERIT=qmake-utils xdg
KEYWORDS=amd64 x86
LICENSE=GPL-3 LGPL-3
RDEPEND=app-text/hunspell:= >=dev-qt/qtcore-5.11:5 >=dev-qt/qtgui-5.11:5 >=dev-qt/qtmultimedia-5.11:5 >=dev-qt/qtprintsupport-5.11:5 dev-qt/qtsingleapplication[qt5(+),X] >=dev-qt/qtwidgets-5.11:5 sys-libs/zlib
SLOT=0
SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.7.2-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=26f8e226c7406b3ece55b890c56e767c
diff --git a/metadata/md5-cache/app-editors/ghostwriter-1.8.1 b/metadata/md5-cache/app-editors/ghostwriter-1.8.1
index 4faf36ef7e28..ed4f27f854ff 100644
--- a/metadata/md5-cache/app-editors/ghostwriter-1.8.1
+++ b/metadata/md5-cache/app-editors/ghostwriter-1.8.1
@@ -4,11 +4,12 @@ DEPEND=app-text/hunspell:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5
DESCRIPTION=Cross-platform, aesthetic, distraction-free markdown editor
EAPI=7
HOMEPAGE=https://wereturtle.github.io/ghostwriter/
+INHERIT=qmake-utils xdg-utils
IUSE=debug
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=app-text/hunspell:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://github.com/wereturtle/ghostwriter/archive/v1.8.1.tar.gz -> ghostwriter-1.8.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5a85f18e05d46bc5855b26ada2043100
diff --git a/metadata/md5-cache/app-editors/gummi-0.8.1 b/metadata/md5-cache/app-editors/gummi-0.8.1
index 9bdb11c52943..9a4a60c8f4f2 100644
--- a/metadata/md5-cache/app-editors/gummi-0.8.1
+++ b/metadata/md5-cache/app-editors/gummi-0.8.1
@@ -4,6 +4,7 @@ DEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/t
DESCRIPTION=Simple LaTeX editor for GTK+ users
EAPI=7
HOMEPAGE=https://github.com/alexandervdm/gummi
+INHERIT=xdg-utils
KEYWORDS=amd64 ~arm64 x86
LICENSE=MIT
RDEPEND=app-text/gtkspell:3 app-text/poppler[cairo] dev-libs/glib:2 dev-texlive/texlive-latex dev-texlive/texlive-latexextra x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 x11-libs/pango
diff --git a/metadata/md5-cache/app-editors/jedit-5.2.0-r1 b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
index acdcc6977d81..5a02363cbf3f 100644
--- a/metadata/md5-cache/app-editors/jedit-5.2.0-r1
+++ b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apa
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=60971ccb24560362fe0e3ee5e1e5130d
diff --git a/metadata/md5-cache/app-editors/jove-4.16.0.73-r1 b/metadata/md5-cache/app-editors/jove-4.16.0.73-r1
index e2cad57a358a..a30809f61191 100644
--- a/metadata/md5-cache/app-editors/jove-4.16.0.73-r1
+++ b/metadata/md5-cache/app-editors/jove-4.16.0.73-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings
EAPI=7
HOMEPAGE=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=amd64 ppc x86
LICENSE=JOVE
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/jove4.16.0.73.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0e048e1299ad161ef7950180847ee08a
diff --git a/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1 b/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1
index be6e8344765c..d9a0d0fa0d97 100644
--- a/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1
+++ b/metadata/md5-cache/app-editors/leafpad-0.8.18.1-r1
@@ -4,11 +4,12 @@ DEPEND=virtual/libintl x11-libs/gtk+:2 dev-util/desktop-file-utils x11-misc/shar
DESCRIPTION=Simple GTK2 text editor
EAPI=7
HOMEPAGE=http://tarot.freeshell.org/leafpad/
+INHERIT=xdg
IUSE=emacs
KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=virtual/libintl x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://nongnu/leafpad/leafpad-0.8.18.1.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=75f6fe34d075116e900f65adf54a7bc3
diff --git a/metadata/md5-cache/app-editors/lpe-1.2.6.13 b/metadata/md5-cache/app-editors/lpe-1.2.6.13
index e80c32f47683..0ea0c123b29c 100644
--- a/metadata/md5-cache/app-editors/lpe-1.2.6.13
+++ b/metadata/md5-cache/app-editors/lpe-1.2.6.13
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0= sys-libs/slang
DESCRIPTION=a lightweight programmers editor
EAPI=7
HOMEPAGE=https://packages.qa.debian.org/l/lpe.html
+INHERIT=toolchain-funcs
IUSE=nls
KEYWORDS=amd64 ppc sparc x86 ~x86-linux
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0= sys-libs/slang
SLOT=0
SRC_URI=mirror://debian/pool/main/l/lpe/lpe_1.2.6.13-0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f1865d6d0e771aa6f44f322a5422fac3
diff --git a/metadata/md5-cache/app-editors/mg-20200723 b/metadata/md5-cache/app-editors/mg-20200723
index 6b4a3947cc52..6a879ea89fd0 100644
--- a/metadata/md5-cache/app-editors/mg-20200723
+++ b/metadata/md5-cache/app-editors/mg-20200723
@@ -3,11 +3,12 @@ DEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 ) virtual/pk
DESCRIPTION=MicroGnuEmacs, a port from the BSDs
EAPI=7
HOMEPAGE=https://homepage.boetes.org/software/mg/
+INHERIT=toolchain-funcs
IUSE=livecd
KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86
LICENSE=public-domain
RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
SLOT=0
SRC_URI=https://github.com/hboetes/mg/archive/20200723.tar.gz -> mg-20200723.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4ebcddfb08deb5c16fbe8d426a496469
diff --git a/metadata/md5-cache/app-editors/notepadqq-2.0.0_beta b/metadata/md5-cache/app-editors/notepadqq-2.0.0_beta
index 555b691e42e4..84f864a53500 100644
--- a/metadata/md5-cache/app-editors/notepadqq-2.0.0_beta
+++ b/metadata/md5-cache/app-editors/notepadqq-2.0.0_beta
@@ -3,10 +3,11 @@ DEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-q
DESCRIPTION=Notepad++-like editor for Linux
EAPI=7
HOMEPAGE=https://notepadqq.com/s/
+INHERIT=qmake-utils xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://github.com/notepadqq/notepadqq/archive/v2.0.0-beta.tar.gz -> notepadqq-2.0.0_beta.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=c20b0035e360074b46b1d089a5d9c377
diff --git a/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225 b/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
index c3f12dec3aa2..161efce69204 100644
--- a/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
+++ b/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
@@ -3,6 +3,7 @@ DEPEND=gui? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >
DESCRIPTION=QEmacs is a very small but powerful UNIX editor
EAPI=6
HOMEPAGE=https://savannah.nongnu.org/projects/qemacs/
+INHERIT=toolchain-funcs
IUSE=gui png xv
KEYWORDS=amd64 arm ~ppc x86
LICENSE=LGPL-2.1+ GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=gui? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? (
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/qemacs-0.4.1_pre20170225.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=83048c15d76960e621090dab8a422cbc
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.12 b/metadata/md5-cache/app-editors/qxmledit-0.9.12
index 8ebcdd8b39f7..878d95ca9daf 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.12
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.12
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 d
DESCRIPTION=Simple Qt-based XML editor
EAPI=7
HOMEPAGE=https://qxmledit.org/
+INHERIT=desktop qmake-utils xdg-utils
KEYWORDS=amd64 x86
LICENSE=LGPL-2
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.12-src.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=089226600cb4968499747c7a7ee97f99
diff --git a/metadata/md5-cache/app-editors/scite-4.4.4-r10 b/metadata/md5-cache/app-editors/scite-4.4.4-r10
index ff1b5dfc76ec..f0b98b6bfa87 100644
--- a/metadata/md5-cache/app-editors/scite-4.4.4-r10
+++ b/metadata/md5-cache/app-editors/scite-4.4.4-r10
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-li
DESCRIPTION=A very powerful, highly configurable, small editor with syntax coloring
EAPI=7
HOMEPAGE=https://www.scintilla.org/SciTE.html
+INHERIT=lua-single toolchain-funcs xdg-utils
IUSE=lua +lua_single_target_lua5-1
KEYWORDS=amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=HPND lua? ( MIT )
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-l
REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
SLOT=0
SRC_URI=https://www.scintilla.org/scite444.tgz -> scite-4.4.4.tgz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=01eabc4aade0d1de85aa895b5283ed43
diff --git a/metadata/md5-cache/app-editors/sublime-text-3_p3211-r1 b/metadata/md5-cache/app-editors/sublime-text-3_p3211-r1
index 448e9ec66901..44ef0a1049af 100644
--- a/metadata/md5-cache/app-editors/sublime-text-3_p3211-r1
+++ b/metadata/md5-cache/app-editors/sublime-text-3_p3211-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm
DESCRIPTION=Sophisticated text editor for code, markup and prose
EAPI=7
HOMEPAGE=https://www.sublimetext.com
+INHERIT=desktop xdg-utils
IUSE=dbus
KEYWORDS=~amd64 ~x86
LICENSE=Sublime
diff --git a/metadata/md5-cache/app-editors/tea-47.0.0 b/metadata/md5-cache/app-editors/tea-47.0.0
index 8f6802d0037f..6c52491447cb 100644
--- a/metadata/md5-cache/app-editors/tea-47.0.0
+++ b/metadata/md5-cache/app-editors/tea-47.0.0
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5
DESCRIPTION=Small, lightweight Qt text editor
EAPI=7
HOMEPAGE=https://tea.ourproject.org/
+INHERIT=qmake-utils xdg
IUSE=aspell djvu hunspell pdf +qml
KEYWORDS=amd64 x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-libs/zlib aspell? ( app-text/aspell ) djvu? ( app-text/djvu ) hunspell? ( app-text/hunspell:= ) pdf? ( app-text/poppler[qt5] ) qml? ( dev-qt/qtdeclarative:5 )
SLOT=0
SRC_URI=https://tea.ourproject.org/dloads/tea-47.0.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=2f644f6dd9879e085e1c5b2845db84f1
diff --git a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117 b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
index 095fa69cdaeb..f8dcb4d6e410 100644
--- a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
+++ b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180117
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
DESCRIPTION=uEmacs/PK is an enhanced version of MicroEMACS
EAPI=6
HOMEPAGE=https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=free-noncomm
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/uemacs-4.0.15_p20180117.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9a9935dda2c7ee806584b5a7b89dab33
diff --git a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719 b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
index 35bc11f41c85..d32eddbb8d25 100644
--- a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
+++ b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=uEmacs/PK is an enhanced version of MicroEMACS
EAPI=7
HOMEPAGE=https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=free-noncomm
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/uemacs-4.0.15_p20180719.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b9f6a50363bc428744ec65b388fcfd9a
diff --git a/metadata/md5-cache/app-editors/wily-1.0-r2 b/metadata/md5-cache/app-editors/wily-1.0-r2
index 300958d7c005..6c23311500bb 100644
--- a/metadata/md5-cache/app-editors/wily-1.0-r2
+++ b/metadata/md5-cache/app-editors/wily-1.0-r2
@@ -3,6 +3,7 @@ DEPEND=dev-libs/9libs
DESCRIPTION=An emulation of ACME, Plan9's hybrid window system, shell and editor
EAPI=7
HOMEPAGE=https://www.netlib.org/research/9libs/
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=Artistic
RDEPEND=dev-libs/9libs
diff --git a/metadata/md5-cache/app-editors/zile-2.3.24-r2 b/metadata/md5-cache/app-editors/zile-2.3.24-r2
index b7fb6028e145..fa55bee8a573 100644
--- a/metadata/md5-cache/app-editors/zile-2.3.24-r2
+++ b/metadata/md5-cache/app-editors/zile-2.3.24-r2
@@ -3,6 +3,7 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig test? ( valgrind? ( dev-util/valgri
DESCRIPTION=Zile is a small Emacs clone
EAPI=6
HOMEPAGE=https://www.gnu.org/software/zile/
+INHERIT=toolchain-funcs
IUSE=test valgrind
KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=GPL-3+
@@ -10,5 +11,5 @@ RDEPEND=sys-libs/ncurses:0=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://gnu/zile/zile-2.3.24.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b7321719f58f4ba552afd0814d3a4781
diff --git a/metadata/md5-cache/app-editors/zile-2.4.15 b/metadata/md5-cache/app-editors/zile-2.4.15
index 6ab3926344fc..50e5d678fb48 100644
--- a/metadata/md5-cache/app-editors/zile-2.4.15
+++ b/metadata/md5-cache/app-editors/zile-2.4.15
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/boehm-gc-7.2:= sys-libs/ncurses:0= acl? ( virtual/acl )
DESCRIPTION=Zile is a small Emacs clone
EAPI=7
HOMEPAGE=https://www.gnu.org/software/zile/
+INHERIT=toolchain-funcs
IUSE=acl
KEYWORDS=~alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=GPL-3+
RDEPEND=>=dev-libs/boehm-gc-7.2:= sys-libs/ncurses:0= acl? ( virtual/acl )
SLOT=0
SRC_URI=mirror://gnu/zile/zile-2.4.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=29d3bbc8ca63eb0e94a7cd64ac8ad2da
diff --git a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209 b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
index ae4f1e9311c7..8d5d670d11bd 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
+++ b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
RDEPEND=>=app-editors/emacs-23.1:*
SLOT=0
SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 elisp 8d41193227fc27c56371b201ec7d861c
+_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 elisp 8d41193227fc27c56371b201ec7d861c gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=c43429b01f078f24a86c9009de00d3f9
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.1 b/metadata/md5-cache/app-emacs/rudel-0.3.1
index 9ff8df9a1253..023d2158035b 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3.1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
RDEPEND=>=app-editors/emacs-24:*
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.1.tar.xz
-_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 elisp 8d41193227fc27c56371b201ec7d861c
+_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 elisp 8d41193227fc27c56371b201ec7d861c readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=c1a209918a690f26dede24b956ebd6d8
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.6.6 b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
index 776f86794297..b358e709d3f5 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.6
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
RDEPEND=>=app-editors/emacs-24:*
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.6.el.xz
-_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 elisp 8d41193227fc27c56371b201ec7d861c
+_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 elisp 8d41193227fc27c56371b201ec7d861c readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=1ab3ccd61c2c1ac84c0473a469b00aca
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.36.0 b/metadata/md5-cache/app-emulation/cadvisor-0.36.0
index c0f149077259..e770c696683e 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.36.0
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.36.0
@@ -4,6 +4,7 @@ DEPEND=acct-group/cadvisor acct-user/cadvisor
DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
EAPI=7
HOMEPAGE=https://github.com/google/cadvisor
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 ISC MIT
RDEPEND=acct-group/cadvisor acct-user/cadvisor
diff --git a/metadata/md5-cache/app-emulation/coldfire-0.3.1 b/metadata/md5-cache/app-emulation/coldfire-0.3.1
index 891c15ca5dae..1df9b2fd65ee 100644
--- a/metadata/md5-cache/app-emulation/coldfire-0.3.1
+++ b/metadata/md5-cache/app-emulation/coldfire-0.3.1
@@ -3,9 +3,10 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
DESCRIPTION=Motorola Coldfire Emulator
EAPI=7
HOMEPAGE=http://www.slicer.ca/coldfire/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.slicer.ca/coldfire/files/coldfire-0.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b2e9aa59c9d65366d0308e9b04f7a95e
diff --git a/metadata/md5-cache/app-emulation/conmon-2.0.22 b/metadata/md5-cache/app-emulation/conmon-2.0.22
index ee6cb828f132..a9417d094d1b 100644
--- a/metadata/md5-cache/app-emulation/conmon-2.0.22
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.22
@@ -3,6 +3,7 @@ DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
DESCRIPTION=An OCI container runtime monitor
EAPI=7
HOMEPAGE=https://github.com/containers/conmon
+INHERIT=toolchain-funcs
IUSE=systemd
KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/containers/conmon/archive/9c34a8663b85e479e0c083801e89a2b2835228ed.tar.gz -> conmon-2.0.22.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=56afd9a7c1e09d86e0b3efe85c1da6de
diff --git a/metadata/md5-cache/app-emulation/conmon-2.0.26 b/metadata/md5-cache/app-emulation/conmon-2.0.26
index e05ee8c5c01b..38dd6de572df 100644
--- a/metadata/md5-cache/app-emulation/conmon-2.0.26
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.26
@@ -3,6 +3,7 @@ DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
DESCRIPTION=An OCI container runtime monitor
EAPI=7
HOMEPAGE=https://github.com/containers/conmon
+INHERIT=toolchain-funcs
IUSE=systemd
KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/containers/conmon/archive/0e155c83aa739ef0a0540ec9f9d265f57f68038b.tar.gz -> conmon-2.0.26.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6fefe9715aac8c42f0d73a8e410f5f14
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.15 b/metadata/md5-cache/app-emulation/docker-19.03.15
index b3148c539ab7..3c22b0b0112e 100644
--- a/metadata/md5-cache/app-emulation/docker-19.03.15
+++ b/metadata/md5-cache/app-emulation/docker-19.03.15
@@ -12,5 +12,5 @@ RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparm
RESTRICT=installsources strip test
SLOT=0
SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.15.tar.gz -> docker-19.03.15.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 udev 452708c3f55cf6e918b045adb949a9e6 golang-base b8fb27dacacea08140c53857f439fc7d golang-vcs-snapshot ff485cabd3f37b060f110b0be95092ec
+_eclasses_=golang-base b8fb27dacacea08140c53857f439fc7d golang-vcs-snapshot ff485cabd3f37b060f110b0be95092ec toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 udev 452708c3f55cf6e918b045adb949a9e6
_md5_=9aa99c4e0268b54ea65f6adca6b4eab9
diff --git a/metadata/md5-cache/app-emulation/docker-swarm-1.2.9 b/metadata/md5-cache/app-emulation/docker-swarm-1.2.9
index b96249399a92..0b08a54651d9 100644
--- a/metadata/md5-cache/app-emulation/docker-swarm-1.2.9
+++ b/metadata/md5-cache/app-emulation/docker-swarm-1.2.9
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Swarm Classic: a container clustering system
EAPI=7
HOMEPAGE=https://docs.docker.com/swarm
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2
RESTRICT=test
diff --git a/metadata/md5-cache/app-emulation/free42-2.5.24 b/metadata/md5-cache/app-emulation/free42-2.5.24
index 3e545261d5f7..5940a7d8275a 100644
--- a/metadata/md5-cache/app-emulation/free42-2.5.24
+++ b/metadata/md5-cache/app-emulation/free42-2.5.24
@@ -3,11 +3,12 @@ DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( m
DESCRIPTION=An HP-42S Calculator Simulator
EAPI=7
HOMEPAGE=https://thomasokken.com/free42/
+INHERIT=toolchain-funcs
IUSE=+alsa
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
SLOT=0
SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-2.5.24.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c816f2712ac316a31b63e0f23c39eb09
diff --git a/metadata/md5-cache/app-emulation/free42-2.5.25 b/metadata/md5-cache/app-emulation/free42-2.5.25
index bdf0d83cf263..7dbe7b8796f5 100644
--- a/metadata/md5-cache/app-emulation/free42-2.5.25
+++ b/metadata/md5-cache/app-emulation/free42-2.5.25
@@ -3,11 +3,12 @@ DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( m
DESCRIPTION=An HP-42S Calculator Simulator
EAPI=7
HOMEPAGE=https://thomasokken.com/free42/
+INHERIT=toolchain-funcs
IUSE=+alsa
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib )
SLOT=0
SRC_URI=https://thomasokken.com/free42/upstream/free42-nologo-2.5.25.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=01ba79849eed4a182cbed17e2faafe04
diff --git a/metadata/md5-cache/app-emulation/gxemul-0.6.2 b/metadata/md5-cache/app-emulation/gxemul-0.6.2
index b0f249534917..cfe21b486bea 100644
--- a/metadata/md5-cache/app-emulation/gxemul-0.6.2
+++ b/metadata/md5-cache/app-emulation/gxemul-0.6.2
@@ -3,11 +3,12 @@ DEPEND=X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
DESCRIPTION=A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
EAPI=7
HOMEPAGE=http://gxemul.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=debug X
KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86
LICENSE=BSD
RDEPEND=X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=mirror://sourceforge/project/gxemul/GXemul/0.6.2/gxemul-0.6.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f0e58539d71ceda51f5fe09c134ee969
diff --git a/metadata/md5-cache/app-emulation/kompose-1.22.0 b/metadata/md5-cache/app-emulation/kompose-1.22.0
index c49ed200f9ed..a85d6f0bedd0 100644
--- a/metadata/md5-cache/app-emulation/kompose-1.22.0
+++ b/metadata/md5-cache/app-emulation/kompose-1.22.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Tool to move from docker-compose to Kubernetes
EAPI=7
HOMEPAGE=https://github.com/kubernetes/kompose https://kompose.io
+INHERIT=go-module
IUSE=hardened
KEYWORDS=~amd64
LICENSE=Apache-2.0
diff --git a/metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3 b/metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
index b46c02fde0b3..ca02e976737c 100644
--- a/metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
+++ b/metadata/md5-cache/app-emulation/s6-overlay-1.18.1.3
@@ -2,6 +2,7 @@ DEFINED_PHASES=install unpack
DESCRIPTION=an s6-based init system for containers
EAPI=6
HOMEPAGE=https://github.com/just-containers/s6-overlay
+INHERIT=vcs-snapshot
KEYWORDS=~amd64
LICENSE=ISC
RDEPEND=sys-apps/s6 sys-apps/s6-portable-utils
diff --git a/metadata/md5-cache/app-emulation/simh-3.11.1 b/metadata/md5-cache/app-emulation/simh-3.11.1
index 1692867fe960..67e460eadaaf 100644
--- a/metadata/md5-cache/app-emulation/simh-3.11.1
+++ b/metadata/md5-cache/app-emulation/simh-3.11.1
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap
DESCRIPTION=a simulator for historical computers such as Vax, PDP-11 etc.)
EAPI=7
HOMEPAGE=http://simh.trailing-edge.com/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=MIT
RDEPEND=net-libs/libpcap
SLOT=0
SRC_URI=https://github.com/simh/simh/archive/v3.11-1.tar.gz -> simh-3.11.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8a985945af159fc6b5f8c12b837314cb
diff --git a/metadata/md5-cache/app-emulation/uade-2.13-r1 b/metadata/md5-cache/app-emulation/uade-2.13-r1
index 4ff417e69e16..c1d12a589278 100644
--- a/metadata/md5-cache/app-emulation/uade-2.13-r1
+++ b/metadata/md5-cache/app-emulation/uade-2.13-r1
@@ -4,10 +4,11 @@ DEPEND=media-libs/libao
DESCRIPTION=Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation
EAPI=7
HOMEPAGE=https://zakalwe.fi/uade
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2+ LGPL-2+
RDEPEND=media-libs/libao
SLOT=0
SRC_URI=https://zakalwe.fi/uade/uade2/uade-2.13.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=77410b33742555c4c0f96279f7f21b3d
diff --git a/metadata/md5-cache/app-emulation/umoci-0.4.6 b/metadata/md5-cache/app-emulation/umoci-0.4.6
index 60a047799ae7..ea444face86d 100644
--- a/metadata/md5-cache/app-emulation/umoci-0.4.6
+++ b/metadata/md5-cache/app-emulation/umoci-0.4.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Manipulation tool for OCI images
EAPI=7
HOMEPAGE=https://github.com/opencontainers/umoci
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip test
diff --git a/metadata/md5-cache/app-emulation/vice-3.5 b/metadata/md5-cache/app-emulation/vice-3.5
index ad34b1c78997..48837990f0b4 100644
--- a/metadata/md5-cache/app-emulation/vice-3.5
+++ b/metadata/md5-cache/app-emulation/vice-3.5
@@ -4,6 +4,7 @@ DEPEND=sys-libs/readline:0= virtual/libintl alsa? ( media-libs/alsa-lib ) ethern
DESCRIPTION=The Versatile Commodore Emulator
EAPI=7
HOMEPAGE=https://vice-emu.sourceforge.io/
+INHERIT=multibuild xdg
IUSE=alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio sdl zlib
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/readline:0= virtual/libintl alsa? ( media-libs/alsa-lib ) ether
REQUIRED_USE=|| ( gtk headless sdl ) gtk? ( zlib )
SLOT=0
SRC_URI=mirror://sourceforge/vice-emu/releases/vice-3.5.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=0454fce8bc5f89d443e1dbfce7ff1899
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142
index daa34bb30920..c01a9ff74670 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=PUEL extensions for VirtualBox
EAPI=7
HOMEPAGE=https://www.virtualbox.org/
+INHERIT=multilib
KEYWORDS=amd64
LICENSE=PUEL
RDEPEND==app-emulation/virtualbox-6.1.18*
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896
index 3e937e50c826..f196726e0784 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.20.143896
@@ -9,5 +9,5 @@ RDEPEND==app-emulation/virtualbox-6.1.20*
RESTRICT=bindist mirror strip
SLOT=0/6.1
SRC_URI=https://download.virtualbox.org/virtualbox/6.1.20/Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3b60ac2290951628b381f8f53b447e44
diff --git a/metadata/md5-cache/app-emulation/wine-desktop-common-20150204-r1 b/metadata/md5-cache/app-emulation/wine-desktop-common-20150204-r1
index a1637eb44131..d7c84c36e6e4 100644
--- a/metadata/md5-cache/app-emulation/wine-desktop-common-20150204-r1
+++ b/metadata/md5-cache/app-emulation/wine-desktop-common-20150204-r1
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Various desktop menu items and icons for wine
EAPI=7
HOMEPAGE=https://github.com/NP-Hardass/wine-desktop-common https://bazaar.launchpad.net/~ubuntu-wine/wine/ubuntu-debian-dir/files/head:/debian/
+INHERIT=xdg
KEYWORDS=-* amd64 x86
LICENSE=LGPL-2.1
PDEPEND=app-eselect/eselect-wine
RDEPEND=!app-emulation/wine:0
SLOT=0
SRC_URI=https://github.com/NP-Hardass/wine-desktop-common/archive/20150204.tar.gz -> wine-desktop-common-20150204.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=6b2a0429ad48067078533b4391d91e29
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
index 20b38bf35e9d..3a05ae5d1da2 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=Eselect module and wrappers for wxWidgets
EAPI=5
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=GPL-2
RDEPEND=app-admin/eselect
diff --git a/metadata/md5-cache/app-forensics/chkrootkit-0.54 b/metadata/md5-cache/app-forensics/chkrootkit-0.54
index 8a2dd3e12007..2c17e662007c 100644
--- a/metadata/md5-cache/app-forensics/chkrootkit-0.54
+++ b/metadata/md5-cache/app-forensics/chkrootkit-0.54
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=Tool to locally check for signs of a rootkit
EAPI=7
HOMEPAGE=http://www.chkrootkit.org/
+INHERIT=toolchain-funcs
IUSE=+cron
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
LICENSE=BSD-2
RDEPEND=cron? ( virtual/cron )
SLOT=0
SRC_URI=ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.54.tar.gz https://dev.gentoo.org/~polynomial-c/chkrootkit-0.54-gentoo.diff.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=77efd95076b9e8da058c9b4794cdff80
diff --git a/metadata/md5-cache/app-forensics/cmospwd-5.1-r1 b/metadata/md5-cache/app-forensics/cmospwd-5.1-r1
index f7510e66b39a..7a7ec743fd5c 100644
--- a/metadata/md5-cache/app-forensics/cmospwd-5.1-r1
+++ b/metadata/md5-cache/app-forensics/cmospwd-5.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=CmosPwd decrypts password stored in cmos used to access BIOS SETUP
EAPI=7
HOMEPAGE=https://www.cgsecurity.org/wiki/CmosPwd
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.cgsecurity.org/cmospwd-5.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=865ce67c7065de97f20fee2dc6c01594
diff --git a/metadata/md5-cache/app-forensics/foremost-1.5.7-r3 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
index 826a25ce96a7..3233c747a6ff 100644
--- a/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
+++ b/metadata/md5-cache/app-forensics/foremost-1.5.7-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Console program to recover files based on their headers and footers
EAPI=7
HOMEPAGE=http://foremost.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b977d04d187b535b970b92a0af634174
diff --git a/metadata/md5-cache/app-forensics/galleta-20040505_p1 b/metadata/md5-cache/app-forensics/galleta-20040505_p1
index 18882571e6da..9e210892f435 100644
--- a/metadata/md5-cache/app-forensics/galleta-20040505_p1
+++ b/metadata/md5-cache/app-forensics/galleta-20040505_p1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=IE Cookie Parser
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/odessa/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/odessa/galleta_20040505_1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a59cfcc213142c63d43bd86f4c6214fa
diff --git a/metadata/md5-cache/app-forensics/honggfuzz-2.4 b/metadata/md5-cache/app-forensics/honggfuzz-2.4
index ded0568f0c37..7b44cd46960a 100644
--- a/metadata/md5-cache/app-forensics/honggfuzz-2.4
+++ b/metadata/md5-cache/app-forensics/honggfuzz-2.4
@@ -3,11 +3,12 @@ DEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils cl
DESCRIPTION=A general purpose fuzzer with feedback support
EAPI=7
HOMEPAGE=https://google.github.io/honggfuzz/
+INHERIT=toolchain-funcs
IUSE=clang
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=>=sys-libs/binutils-libs-2.29:= sys-libs/libunwind:= app-arch/xz-utils clang? ( sys-libs/blocksruntime )
SLOT=0
SRC_URI=https://github.com/google/honggfuzz/archive/2.4.tar.gz -> honggfuzz-2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8b43d72ad89a0d5e6aaff23af17e8bd7
diff --git a/metadata/md5-cache/app-forensics/mac-robber-1.02 b/metadata/md5-cache/app-forensics/mac-robber-1.02
index 3deca186f41b..9c919e351c85 100644
--- a/metadata/md5-cache/app-forensics/mac-robber-1.02
+++ b/metadata/md5-cache/app-forensics/mac-robber-1.02
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=mac-robber is a digital forensics and incident response tool that collects data
EAPI=6
HOMEPAGE=http://www.sleuthkit.org/mac-robber/index.php
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/mac-robber/mac-robber-1.02.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=36d38ef18932ad7215e05aa6dad30508
diff --git a/metadata/md5-cache/app-forensics/magicrescue-1.1.10 b/metadata/md5-cache/app-forensics/magicrescue-1.1.10
index 810e23607569..9124f278befa 100644
--- a/metadata/md5-cache/app-forensics/magicrescue-1.1.10
+++ b/metadata/md5-cache/app-forensics/magicrescue-1.1.10
@@ -3,10 +3,11 @@ DEPEND=|| ( sys-libs/gdbm sys-libs/db:* )
DESCRIPTION=Find deleted files in block devices
EAPI=7
HOMEPAGE=https://github.com/jbj/magicrescue
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2+
RDEPEND=|| ( sys-libs/gdbm sys-libs/db:* ) !net-mail/safecat
SLOT=0
SRC_URI=https://github.com/jbj/magicrescue/archive/v1.1.10.tar.gz -> magicrescue-1.1.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=274cd7677fccd882e1bf63aaa463ac4b
diff --git a/metadata/md5-cache/app-forensics/memdump-1.01-r1 b/metadata/md5-cache/app-forensics/memdump-1.01-r1
index 8d96c0d2ffdb..d35b7f181cf8 100644
--- a/metadata/md5-cache/app-forensics/memdump-1.01-r1
+++ b/metadata/md5-cache/app-forensics/memdump-1.01-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=Simple memory dumper for UNIX-Like systems
EAPI=7
HOMEPAGE=http://www.porcupine.org/forensics
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=IBM
SLOT=0
SRC_URI=http://www.porcupine.org/forensics/memdump-1.01.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=12561acac6b608f1e1ad814ac36ff582
diff --git a/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1 b/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
index 5cb334b7f4c2..c22f7a23d9f3 100644
--- a/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
+++ b/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=IE Activity Parser
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/odessa/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/odessa/pasco_20040505_1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f1cc4eb83a553a5b79c9db818c7c9dec
diff --git a/metadata/md5-cache/app-forensics/radamsa-0.6 b/metadata/md5-cache/app-forensics/radamsa-0.6
index 857e59542ec5..14702de7214d 100644
--- a/metadata/md5-cache/app-forensics/radamsa-0.6
+++ b/metadata/md5-cache/app-forensics/radamsa-0.6
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
DESCRIPTION=A general purpose fuzzer
EAPI=7
HOMEPAGE=https://gitlab.com/akihe/radamsa
+INHERIT=toolchain-funcs vcs-snapshot
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RESTRICT=test
SLOT=0
SRC_URI=https://gitlab.com/akihe/radamsa/-/archive/v0.6/radamsa-0.6.tar.gz https://gitlab.com/akihe/radamsa/uploads/a2228910d0d3c68d19c09cee3943d7e5/radamsa-0.6.c.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=e30da0aaa03cda21605364fecf6c13d0
diff --git a/metadata/md5-cache/app-forensics/rifiuti-20040505_p1 b/metadata/md5-cache/app-forensics/rifiuti-20040505_p1
index c20a5b8fe62f..3a1896583c3c 100644
--- a/metadata/md5-cache/app-forensics/rifiuti-20040505_p1
+++ b/metadata/md5-cache/app-forensics/rifiuti-20040505_p1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Recycle Bin Analyzer
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/odessa/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/odessa/rifiuti_20040505_1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3b8036332bef4f39719eac92ad146835
diff --git a/metadata/md5-cache/app-forensics/unhide-20130526 b/metadata/md5-cache/app-forensics/unhide-20130526
index 2e996b07927a..6b45f2aacbe1 100644
--- a/metadata/md5-cache/app-forensics/unhide-20130526
+++ b/metadata/md5-cache/app-forensics/unhide-20130526
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A forensic tool to find hidden processes and TCP/UDP ports by rootkits/LKMs
EAPI=5
HOMEPAGE=http://www.unhide-forensics.info
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://sourceforge/unhide/files/unhide-20130526.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8028e044a016911f0fd845e91d781cb8
diff --git a/metadata/md5-cache/app-i18n/canfep-1.0-r1 b/metadata/md5-cache/app-i18n/canfep-1.0-r1
index a99330b94a97..35b31ba95fe1 100644
--- a/metadata/md5-cache/app-i18n/canfep-1.0-r1
+++ b/metadata/md5-cache/app-i18n/canfep-1.0-r1
@@ -4,11 +4,12 @@ DEPEND=app-i18n/canna sys-libs/ncurses:=
DESCRIPTION=Canna Japanese kana-kanji frontend processor on console
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
IUSE=unicode
KEYWORDS=~alpha amd64 ppc ~sparc x86
LICENSE=canfep
RDEPEND=app-i18n/canna sys-libs/ncurses:=
SLOT=0
SRC_URI=mirror://gentoo/canfep-1.0.tar.gz unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/canfep_utf8.diff )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=600cad60f0f5c354871f6539d02ab3ff
diff --git a/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2 b/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2
index 3e81b7efe7b3..df28d71bdc1a 100644
--- a/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2
+++ b/metadata/md5-cache/app-i18n/kakasi-2.3.4-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Converts Japanese text between kanji, kana, and romaji
EAPI=7
HOMEPAGE=http://kakasi.namazu.org/
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://kakasi.namazu.org/stable/kakasi-2.3.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1aca94b2a9ae04d87e13c990d1e0ec46
diff --git a/metadata/md5-cache/app-i18n/kanjipad-2.0.0 b/metadata/md5-cache/app-i18n/kanjipad-2.0.0
index 7c689be62998..486f3c0f356a 100644
--- a/metadata/md5-cache/app-i18n/kanjipad-2.0.0
+++ b/metadata/md5-cache/app-i18n/kanjipad-2.0.0
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig
DESCRIPTION=Japanese handwriting recognition tool
EAPI=6
HOMEPAGE=https://fishsoup.net/software/kanjipad/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
SLOT=0
SRC_URI=https://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8a17b0083fcf760760b1164b40b92c77
diff --git a/metadata/md5-cache/app-i18n/kcc-1.0 b/metadata/md5-cache/app-i18n/kcc-1.0
index 52cdb7629d7e..b35878fb7789 100644
--- a/metadata/md5-cache/app-i18n/kcc-1.0
+++ b/metadata/md5-cache/app-i18n/kcc-1.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=A Kanji code converter
EAPI=7
HOMEPAGE=http://www2s.biglobe.ne.jp/~Nori/ruby/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/kcc-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2c3eea674aba718d8a4a08d3bc423fc2
diff --git a/metadata/md5-cache/app-i18n/qkc-1.00 b/metadata/md5-cache/app-i18n/qkc-1.00
index 710bf21a40bc..cdee6f98ecf1 100644
--- a/metadata/md5-cache/app-i18n/qkc-1.00
+++ b/metadata/md5-cache/app-i18n/qkc-1.00
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Quick KANJI code Converter
EAPI=7
HOMEPAGE=http://hp.vector.co.jp/authors/VA000501/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
LICENSE=freedist
SLOT=0
SRC_URI=http://hp.vector.co.jp/authors/VA000501/qkcc100.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=77129fd88add5ad1b83487511e5243b9
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1 b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
index 45960970547c..cf72a1c0def2 100644
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= ) x11-base/xorg-proto
DESCRIPTION=Vietnamese input keyboard for X
EAPI=7
HOMEPAGE=http://xvnkb.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=spell xft
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11:= xft? ( x11-libs/libXft:= )
SLOT=0
SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.9a.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2076482ef0caa1846df6a06c0cd71e6f
diff --git a/metadata/md5-cache/app-laptop/msi-keyboard-1.0 b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
index 764f8f09349d..8d8b755c1403 100644
--- a/metadata/md5-cache/app-laptop/msi-keyboard-1.0
+++ b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
DESCRIPTION=Control backlight of MSI laptop keyboards
EAPI=7
HOMEPAGE=https://github.com/makkarpov/msi-keyboard
+INHERIT=udev
KEYWORDS=~amd64
LICENSE=GPL-3
RDEPEND=dev-libs/hidapi
SLOT=0
SRC_URI=https://github.com/makkarpov/msi-keyboard/archive/v1.0.tar.gz -> msi-keyboard-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=33a1217ab9ce1c71f6822f2712b6f052
diff --git a/metadata/md5-cache/app-laptop/spicctrl-1.9-r1 b/metadata/md5-cache/app-laptop/spicctrl-1.9-r1
index 9f2aa24bf141..4f11bd348a36 100644
--- a/metadata/md5-cache/app-laptop/spicctrl-1.9-r1
+++ b/metadata/md5-cache/app-laptop/spicctrl-1.9-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=tool for the sonypi-Device (found in Sony Vaio Notebooks)
EAPI=7
HOMEPAGE=http://www.popies.net/sonypi/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 -ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.popies.net/sonypi/spicctrl-1.9.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=020b9714b6022cdb92b741b8733c09a9
diff --git a/metadata/md5-cache/app-metrics/bind_exporter-0.3.0 b/metadata/md5-cache/app-metrics/bind_exporter-0.3.0
index ee1477a7bc8c..01ff65d199d4 100644
--- a/metadata/md5-cache/app-metrics/bind_exporter-0.3.0
+++ b/metadata/md5-cache/app-metrics/bind_exporter-0.3.0
@@ -4,6 +4,7 @@ DEPEND=acct-group/bind_exporter acct-user/bind_exporter
DESCRIPTION=Prometheus exporter for BIND
EAPI=7
HOMEPAGE=https://github.com/digitalocean/bind_exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD MIT
RDEPEND=acct-group/bind_exporter acct-user/bind_exporter
diff --git a/metadata/md5-cache/app-metrics/consul_exporter-0.7.1 b/metadata/md5-cache/app-metrics/consul_exporter-0.7.1
index f08d9b636e2f..5a7338a4f60e 100644
--- a/metadata/md5-cache/app-metrics/consul_exporter-0.7.1
+++ b/metadata/md5-cache/app-metrics/consul_exporter-0.7.1
@@ -4,6 +4,7 @@ DEPEND=acct-group/consul_exporter acct-user/consul_exporter
DESCRIPTION=Prometheus exporter for consul metrics
EAPI=7
HOMEPAGE=https://github.com/prometheus/consul_exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
RDEPEND=acct-group/consul_exporter acct-user/consul_exporter
diff --git a/metadata/md5-cache/app-metrics/dnsmasq_exporter-0.2.0-r1 b/metadata/md5-cache/app-metrics/dnsmasq_exporter-0.2.0-r1
index 00c49bfdbab9..3ae89054f594 100644
--- a/metadata/md5-cache/app-metrics/dnsmasq_exporter-0.2.0-r1
+++ b/metadata/md5-cache/app-metrics/dnsmasq_exporter-0.2.0-r1
@@ -4,6 +4,7 @@ DEPEND=acct-group/dnsmasq_exporter acct-user/dnsmasq_exporter
DESCRIPTION=prometheus exporter for dnsmasq
EAPI=7
HOMEPAGE=https://github.com/google/dnsmasq_exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD MIT Apache-2.0
RDEPEND=acct-group/dnsmasq_exporter acct-user/dnsmasq_exporter
diff --git a/metadata/md5-cache/app-metrics/mongodb_exporter-0.11.1 b/metadata/md5-cache/app-metrics/mongodb_exporter-0.11.1
index 8047912e5618..99458066960a 100644
--- a/metadata/md5-cache/app-metrics/mongodb_exporter-0.11.1
+++ b/metadata/md5-cache/app-metrics/mongodb_exporter-0.11.1
@@ -4,6 +4,7 @@ DEPEND=acct-group/mongodb_exporter acct-user/mongodb_exporter
DESCRIPTION=Prometheus exporter for MongoDB
EAPI=7
HOMEPAGE=https://github.com/percona/mongodb_exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 AGPL-3 BSD MIT
RDEPEND=acct-group/mongodb_exporter acct-user/mongodb_exporter
diff --git a/metadata/md5-cache/app-metrics/mysqld_exporter-0.12.1_p20200622 b/metadata/md5-cache/app-metrics/mysqld_exporter-0.12.1_p20200622
index aa3642b47c1f..fc14c1d4e1c0 100644
--- a/metadata/md5-cache/app-metrics/mysqld_exporter-0.12.1_p20200622
+++ b/metadata/md5-cache/app-metrics/mysqld_exporter-0.12.1_p20200622
@@ -4,6 +4,7 @@ DEPEND=acct-group/mysqld_exporter acct-user/mysqld_exporter
DESCRIPTION=Prometheus exporter for MySQL server metrics
EAPI=7
HOMEPAGE=https://github.com/prometheus/mysqld_exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
RDEPEND=acct-group/mysqld_exporter acct-user/mysqld_exporter
diff --git a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100 b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
index 58e27982f0e8..9a26d4cbd763 100644
--- a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
+++ b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= )
DESCRIPTION=Library that exports Nginx metrics to Prometheus
EAPI=7
HOMEPAGE=https://github.com/knyar/nginx-lua-prometheus
+INHERIT=lua-single
IUSE=+lua_single_target_luajit
KEYWORDS=~amd64
LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) www-servers/nginx[nginx_
REQUIRED_USE=^^ ( lua_single_target_luajit )
SLOT=0
SRC_URI=https://github.com/knyar/nginx-lua-prometheus/archive/0.1-20170610.tar.gz -> nginx-lua-prometheus-0.1_pre20170610.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=bc6e04e52b24e72df7cf82e41beb617d
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7
index e0299a585a01..4d9e3241dd2e 100644
--- a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7
+++ b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Nginx virtual host traffic stats exporter for Prometheus
EAPI=7
HOMEPAGE=https://github.com/hnlq715/nginx-vts-exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=MIT Apache-2.0 BSD
RESTRICT=strip
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1
index d2c9532ba07d..8784d7c57e62 100644
--- a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1
+++ b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1
@@ -4,6 +4,7 @@ DEPEND=acct-group/nginx-vts-exporter acct-user/nginx-vts-exporter
DESCRIPTION=Nginx virtual host traffic stats exporter for Prometheus
EAPI=7
HOMEPAGE=https://github.com/hnlq715/nginx-vts-exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=MIT Apache-2.0 BSD
RDEPEND=acct-group/nginx-vts-exporter acct-user/nginx-vts-exporter
diff --git a/metadata/md5-cache/app-metrics/openvpn_exporter-0.3.0 b/metadata/md5-cache/app-metrics/openvpn_exporter-0.3.0
index 270779c12878..c11d2d368f41 100644
--- a/metadata/md5-cache/app-metrics/openvpn_exporter-0.3.0
+++ b/metadata/md5-cache/app-metrics/openvpn_exporter-0.3.0
@@ -4,6 +4,7 @@ DEPEND=acct-user/openvpn_exporter acct-group/openvpn_exporter
DESCRIPTION=Prometheus Exporter for OpenVPN
EAPI=7
HOMEPAGE=https://github.com/kumina/openvpn_exporter
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD MIT
RDEPEND=acct-user/openvpn_exporter acct-group/openvpn_exporter
diff --git a/metadata/md5-cache/app-metrics/prom2json-1.3.0 b/metadata/md5-cache/app-metrics/prom2json-1.3.0
index f865d7789af1..ad78cf6af349 100644
--- a/metadata/md5-cache/app-metrics/prom2json-1.3.0
+++ b/metadata/md5-cache/app-metrics/prom2json-1.3.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=A tool to scrape a Prometheus client and dump the result as JSON
EAPI=7
HOMEPAGE=https://github.com/prometheus/prom2json
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/OpenRGB-0.4 b/metadata/md5-cache/app-misc/OpenRGB-0.4
index 8511075ce20d..9a7d135ff411 100644
--- a/metadata/md5-cache/app-misc/OpenRGB-0.4
+++ b/metadata/md5-cache/app-misc/OpenRGB-0.4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/hidapi:= dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= vi
DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
EAPI=7
HOMEPAGE=https://gitlab.com/CalcProgrammer1/OpenRGB/
+INHERIT=qmake-utils udev
IUSE=udev
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/hidapi:= dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= virtual/libusb:1
SLOT=0
SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.4/OpenRGB-release_0.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 udev 452708c3f55cf6e918b045adb949a9e6
_md5_=bae2c65fda2cf571f563485d7ab892b0
diff --git a/metadata/md5-cache/app-misc/OpenRGB-0.5 b/metadata/md5-cache/app-misc/OpenRGB-0.5
index 84f451682ed1..5f7ebf49010a 100644
--- a/metadata/md5-cache/app-misc/OpenRGB-0.5
+++ b/metadata/md5-cache/app-misc/OpenRGB-0.5
@@ -4,10 +4,11 @@ DEPEND=dev-libs/hidapi:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtu
DESCRIPTION=Open source RGB lighting control that doesn't depend on manufacturer software
EAPI=7
HOMEPAGE=https://gitlab.com/CalcProgrammer1/OpenRGB/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/hidapi:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/libusb:1
SLOT=0
SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.5/OpenRGB-release_0.5.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=e97182581959c93217b2abc1263bbb04
diff --git a/metadata/md5-cache/app-misc/astrolog-5.40-r3 b/metadata/md5-cache/app-misc/astrolog-5.40-r3
index b1d0802f64bf..9ab1cfcf1875 100644
--- a/metadata/md5-cache/app-misc/astrolog-5.40-r3
+++ b/metadata/md5-cache/app-misc/astrolog-5.40-r3
@@ -3,11 +3,12 @@ DEPEND=X? ( x11-libs/libX11 )
DESCRIPTION=A many featured astrology chart calculation program
EAPI=6
HOMEPAGE=http://www.astrolog.org/astrolog.htm
+INHERIT=toolchain-funcs
IUSE=X
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=astrolog
RDEPEND=X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=http://www.astrolog.org/ftp/ast54unx.shr
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7f220666147fc29b69eab88011b879a3
diff --git a/metadata/md5-cache/app-misc/beep-1.4.9 b/metadata/md5-cache/app-misc/beep-1.4.9
index 5526d67bf239..bdc568707f39 100644
--- a/metadata/md5-cache/app-misc/beep-1.4.9
+++ b/metadata/md5-cache/app-misc/beep-1.4.9
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=Advanced PC speaker beeper
EAPI=7
HOMEPAGE=https://github.com/spkr-beep
+INHERIT=toolchain-funcs
IUSE=suid
KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/spkr-beep/beep/archive/v1.4.9.tar.gz -> beep-1.4.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a49873b8acdf89b4c8e60d32f8c1d380
diff --git a/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1 b/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
index bfa19a1278ba..f4db155a06ce 100644
--- a/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
+++ b/metadata/md5-cache/app-misc/bgrep-0_p20110121-r1
@@ -3,11 +3,12 @@ DEPEND=test? ( dev-lang/perl )
DESCRIPTION=Grep-like tool to search for binary strings
EAPI=7
HOMEPAGE=https://github.com/tmbinc/bgrep/
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~amd64
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/tmbinc/bgrep/tarball/49b098be9548d174023ad05c10f6af9d02b8e18e -> tmbinc-bgrep-49b098b.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=37d829bef16dcd46d347fd6b03c3e628
diff --git a/metadata/md5-cache/app-misc/birthday-1.6.2-r1 b/metadata/md5-cache/app-misc/birthday-1.6.2-r1
index a30fd1f65520..d88d0e2156ed 100644
--- a/metadata/md5-cache/app-misc/birthday-1.6.2-r1
+++ b/metadata/md5-cache/app-misc/birthday-1.6.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=Displays a list of events happening in the near future
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/birthday/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/birthday/birthday-1.6.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2a90c05eb9db6d5033ddcbbbd717114a
diff --git a/metadata/md5-cache/app-misc/bottlerocket-0.04c-r2 b/metadata/md5-cache/app-misc/bottlerocket-0.04c-r2
index 87ee7760dc07..46bafa4cd7a0 100644
--- a/metadata/md5-cache/app-misc/bottlerocket-0.04c-r2
+++ b/metadata/md5-cache/app-misc/bottlerocket-0.04c-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install postinst prepare
DESCRIPTION=CLI interface to the X-10 Firecracker Kit
EAPI=7
HOMEPAGE=http://www.linuxha.com/bottlerocket/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=LGPL-2
SLOT=0
SRC_URI=http://www.linuxha.com/bottlerocket/bottlerocket-0.04c.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=81aa3f4bcb410d767c92b71b222ba99e
diff --git a/metadata/md5-cache/app-misc/btail-0.3-r1 b/metadata/md5-cache/app-misc/btail-0.3-r1
index 6c876987a3ed..9fda07244385 100644
--- a/metadata/md5-cache/app-misc/btail-0.3-r1
+++ b/metadata/md5-cache/app-misc/btail-0.3-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/gdbm
DESCRIPTION=Bayesian logfile filter
EAPI=7
HOMEPAGE=https://www.vanheusden.com/btail/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/gdbm
SLOT=0
SRC_URI=https://www.vanheusden.com/btail/btail-0.3.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f30c7efb6c79426dbffe1ad67d07c524
diff --git a/metadata/md5-cache/app-misc/calendar-0.9.1-r1 b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
index 17fc6240cddf..e4a2e54c1a67 100644
--- a/metadata/md5-cache/app-misc/calendar-0.9.1-r1
+++ b/metadata/md5-cache/app-misc/calendar-0.9.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Standard unix calendar program for Linux, ported from OpenBSD
EAPI=6
HOMEPAGE=http://bsdcalendar.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=http://bsdcalendar.sourceforge.net/calendar-0.9.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bdd94a7394cbccbced5ac8c058cb7def
diff --git a/metadata/md5-cache/app-misc/cdspeed-0.4-r2 b/metadata/md5-cache/app-misc/cdspeed-0.4-r2
index f8f961d26391..f88a8ccf6a7b 100644
--- a/metadata/md5-cache/app-misc/cdspeed-0.4-r2
+++ b/metadata/md5-cache/app-misc/cdspeed-0.4-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Change the speed of your CD drive
EAPI=7
HOMEPAGE=http://linuxfocus.org/~guido/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~mips ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://linuxfocus.org/~guido/cdspeed-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1c3058d384ae4010ba05156ba1f83609
diff --git a/metadata/md5-cache/app-misc/clockywock-0.3.1a b/metadata/md5-cache/app-misc/clockywock-0.3.1a
index 18e790cf58fd..4b9d35a32193 100644
--- a/metadata/md5-cache/app-misc/clockywock-0.3.1a
+++ b/metadata/md5-cache/app-misc/clockywock-0.3.1a
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
DESCRIPTION=ncurses based analog clock
EAPI=7
HOMEPAGE=https://soomka.com/clockywock
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://soomka.com/clockywock-0.3.1a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dcd5d84a40708de1ec28cdf8b0897707
diff --git a/metadata/md5-cache/app-misc/colordiff-1.0.18 b/metadata/md5-cache/app-misc/colordiff-1.0.18
index c2b6a01ed8b9..439ab9b76364 100644
--- a/metadata/md5-cache/app-misc/colordiff-1.0.18
+++ b/metadata/md5-cache/app-misc/colordiff-1.0.18
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Colorizes output of diff
EAPI=6
HOMEPAGE=https://www.colordiff.org/
+INHERIT=prefix
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-lang/perl sys-apps/diffutils
diff --git a/metadata/md5-cache/app-misc/colordiff-1.0.19 b/metadata/md5-cache/app-misc/colordiff-1.0.19
index d75a72ec6e87..77b5150ffeb9 100644
--- a/metadata/md5-cache/app-misc/colordiff-1.0.19
+++ b/metadata/md5-cache/app-misc/colordiff-1.0.19
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Colorizes output of diff
EAPI=7
HOMEPAGE=https://www.colordiff.org/
+INHERIT=prefix
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-lang/perl sys-apps/diffutils
diff --git a/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3 b/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
index 381838399126..15701d3193da 100644
--- a/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
+++ b/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=An ISO 3166 country code finder
EAPI=6
HOMEPAGE=http://www.grigna.com/diego/linux/countrycodes/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.grigna.com/diego/linux/countrycodes/countrycodes-1.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3387bfe32e06608e3d55584a6e406a68
diff --git a/metadata/md5-cache/app-misc/cpipe-3.0.3 b/metadata/md5-cache/app-misc/cpipe-3.0.3
index fb4f6e0ab8dd..61de8fbaeab5 100644
--- a/metadata/md5-cache/app-misc/cpipe-3.0.3
+++ b/metadata/md5-cache/app-misc/cpipe-3.0.3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Counting pipe, measures data transfered over pipe
EAPI=6
HOMEPAGE=https://github.com/HaraldKi/cpipe
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/HaraldKi/cpipe/archive/3.0.3.tar.gz -> cpipe-3.0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=571f9f5f31c1180f9dfc0f70f2029349
diff --git a/metadata/md5-cache/app-misc/datovka-4.15.3 b/metadata/md5-cache/app-misc/datovka-4.15.3
index e06a602149df..3bffce1c4439 100644
--- a/metadata/md5-cache/app-misc/datovka-4.15.3
+++ b/metadata/md5-cache/app-misc/datovka-4.15.3
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.14.0:5 >=dev-qt/qtgui-5.14.
DESCRIPTION=GUI to access the Czech data box e-government system
EAPI=7
HOMEPAGE=https://www.datovka.cz/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.14.0:5 >=dev-qt/qtgui-5.14.0:5 >=dev-qt/qtnetwork-5.14.0:5 >=dev-qt/qtprintsupport-5.14.0:5 >=dev-qt/qtsql-5.14.0:5[sqlite] >=dev-qt/qtsvg-5.14.0:5 >=dev-qt/qtwidgets-5.14.0:5 >=net-libs/libisds-0.11
SLOT=0
SRC_URI=https://secure.nic.cz/files/datove_schranky/4.15.3/datovka-4.15.3.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=0cdd70dc0de0bc2afcd63ec1fee6ce64
diff --git a/metadata/md5-cache/app-misc/detachtty-11.0.0 b/metadata/md5-cache/app-misc/detachtty-11.0.0
index 5c8e7dc4dca5..2f4201b43e46 100644
--- a/metadata/md5-cache/app-misc/detachtty-11.0.0
+++ b/metadata/md5-cache/app-misc/detachtty-11.0.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Attach/detach from interactive processes across the network
EAPI=7
HOMEPAGE=https://github.com/cosmos72/detachtty
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/cosmos72/detachtty/archive/11.0.0.tar.gz -> detachtty-11.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=60b75fe7c8372cc9ecd39562d8173dda
diff --git a/metadata/md5-cache/app-misc/detachtty-9-r1 b/metadata/md5-cache/app-misc/detachtty-9-r1
index f6cae5a6bc7c..d5d8751f0b6a 100644
--- a/metadata/md5-cache/app-misc/detachtty-9-r1
+++ b/metadata/md5-cache/app-misc/detachtty-9-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Attach/detach from interactive processes across the network
EAPI=6
HOMEPAGE=https://packages.debian.org/unstable/admin/detachtty
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/d/detachtty/detachtty_9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0872eacb3a8d99cea1953af1b009aa0d
diff --git a/metadata/md5-cache/app-misc/dvorakng-0.6.0 b/metadata/md5-cache/app-misc/dvorakng-0.6.0
index 5b844a43ddfc..073c6480c547 100644
--- a/metadata/md5-cache/app-misc/dvorakng-0.6.0
+++ b/metadata/md5-cache/app-misc/dvorakng-0.6.0
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:* virtual/pkgconfig
DESCRIPTION=Dvorak typing tutor
EAPI=6
HOMEPAGE=http://freshmeat.net/projects/dvorakng/?topic_id=71%2C861
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:*
SLOT=0
SRC_URI=http://www.free.of.pl/n/nopik/dvorakng-0.6.0rc1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c2e5f98378a56e2f467b7b701c506f62
diff --git a/metadata/md5-cache/app-misc/egads-0.9.5-r1 b/metadata/md5-cache/app-misc/egads-0.9.5-r1
index 410cb0d46ba6..e58e9239d71f 100644
--- a/metadata/md5-cache/app-misc/egads-0.9.5-r1
+++ b/metadata/md5-cache/app-misc/egads-0.9.5-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=Entropy Gathering And Distribution System
EAPI=6
HOMEPAGE=http://www.securesoftware.com/download_egads.htm
+INHERIT=multilib toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=BSD
SLOT=0
diff --git a/metadata/md5-cache/app-misc/empty-0.6.21b b/metadata/md5-cache/app-misc/empty-0.6.21b
index 0f3e3240e9b0..2ab0195179b0 100644
--- a/metadata/md5-cache/app-misc/empty-0.6.21b
+++ b/metadata/md5-cache/app-misc/empty-0.6.21b
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Small shell utility, similar to expect(1)
EAPI=7
HOMEPAGE=http://empty.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=virtual/logger
SLOT=0
SRC_URI=https://download.sourceforge.net/empty/empty-0.6.21b.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4091ef0d7b86b0c6c042d4e23191380b
diff --git a/metadata/md5-cache/app-misc/faq-0.0.6 b/metadata/md5-cache/app-misc/faq-0.0.6
index 4c3db03b413a..f2a325ca9f02 100644
--- a/metadata/md5-cache/app-misc/faq-0.0.6
+++ b/metadata/md5-cache/app-misc/faq-0.0.6
@@ -4,6 +4,7 @@ DEPEND=app-misc/jq dev-libs/oniguruma
DESCRIPTION=Format agnostic jQ
EAPI=7
HOMEPAGE=https://github.com/jzelinskie/faq
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip test
diff --git a/metadata/md5-cache/app-misc/fdupes-2.1.2 b/metadata/md5-cache/app-misc/fdupes-2.1.2
index e793b7f2f096..ee95ff4dc53c 100644
--- a/metadata/md5-cache/app-misc/fdupes-2.1.2
+++ b/metadata/md5-cache/app-misc/fdupes-2.1.2
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libpcre2[pcre32] ncurses? ( sys-libs/ncurses:0= )
DESCRIPTION=Identify/delete duplicate files residing within specified directories
EAPI=7
HOMEPAGE=https://github.com/adrianlopezroche/fdupes
+INHERIT=toolchain-funcs
IUSE=+ncurses
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=MIT
RDEPEND=dev-libs/libpcre2[pcre32] ncurses? ( sys-libs/ncurses:0= )
SLOT=0
SRC_URI=https://github.com/adrianlopezroche/fdupes/releases/download/v2.1.2/fdupes-2.1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=58d2928f504f0d8ffb59783282bbdb4c
diff --git a/metadata/md5-cache/app-misc/fslurp-2.1.4 b/metadata/md5-cache/app-misc/fslurp-2.1.4
index 584999a603c4..d133aed2e462 100644
--- a/metadata/md5-cache/app-misc/fslurp-2.1.4
+++ b/metadata/md5-cache/app-misc/fslurp-2.1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Read and display data from Fronius IG and IG Plus inverters
EAPI=7
HOMEPAGE=https://fslurp.sourceforge.io/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/fslurp/fslurp-2.1.4.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=95608f6104f4b5491dc0180d28270a9d
diff --git a/metadata/md5-cache/app-misc/gcstar-1.7.1-r1 b/metadata/md5-cache/app-misc/gcstar-1.7.1-r1
index c0fef3444ba8..843186b97fcc 100644
--- a/metadata/md5-cache/app-misc/gcstar-1.7.1-r1
+++ b/metadata/md5-cache/app-misc/gcstar-1.7.1-r1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-
DESCRIPTION=Manage your collections of movies, games, books, music and more
EAPI=6
HOMEPAGE=http://www.gcstar.org/
+INHERIT=desktop xdg
IUSE=cddb mp3 spell stats tellico vorbis
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime dev-perl/Gtk2 dev-perl/HTML-Parser dev-perl/libwww-perl dev-perl/URI dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Archive-Tar virtual/perl-Encode virtual/perl-Getopt-Long virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-libnet virtual/perl-Storable virtual/perl-Time-Piece cddb? ( dev-perl/Net-FreeDB ) mp3? ( dev-perl/MP3-Info dev-perl/MP3-Tag ) spell? ( dev-perl/gtk2-spell ) stats? ( dev-perl/Date-Calc dev-perl/GD[png,truetype] ) tellico? ( virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 ) vorbis? ( dev-perl/Ogg-Vorbis-Header-PurePerl )
SLOT=0
SRC_URI=https://launchpad.net/gcstar/1.7/1.7.1/+download/gcstar-1.7.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=49d73b4a1109b332767367b24c0add5d
diff --git a/metadata/md5-cache/app-misc/geneweb-6.08.01 b/metadata/md5-cache/app-misc/geneweb-6.08.01
index 378bdad19bf2..565fabac521e 100644
--- a/metadata/md5-cache/app-misc/geneweb-6.08.01
+++ b/metadata/md5-cache/app-misc/geneweb-6.08.01
@@ -3,6 +3,7 @@ DEPEND=dev-lang/ocaml[ocamlopt?] dev-ml/camlp5[ocamlopt?] acct-user/geneweb acct
DESCRIPTION=Genealogy software program with a Web interface
EAPI=7
HOMEPAGE=https://github.com/geneanet/geneweb
+INHERIT=eutils
IUSE=+ocamlopt
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=dev-lang/ocaml[ocamlopt?] dev-ml/camlp5[ocamlopt?] acct-user/geneweb acc
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/geneweb/geneweb/archive/9641e494cd85fb1b7baba32412d120da38234ba2.tar.gz -> geneweb-6.08.01.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
_md5_=1426dee0603cf0e255c2b06fc75df6ec
diff --git a/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2 b/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
index 18751b4dd622..38e269768ebf 100644
--- a/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
+++ b/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
@@ -3,10 +3,11 @@ DEPEND=>=app-misc/graphlcd-base-1.0.0
DESCRIPTION=A glue between the graphlcd-base library from the GraphLCD project
EAPI=7
HOMEPAGE=https://lucianm.github.io/GLCDprocDriver https://github.com/lucianm/GLCDprocDriver
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=app-misc/graphlcd-base-1.0.0
SLOT=0
SRC_URI=https://github.com/lucianm/GLCDprocDriver/archive/0.1.2.tar.gz -> GLCDprocDriver-0.1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=adcb4bcf0a64bc225254b99f3d52f9f7
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.23 b/metadata/md5-cache/app-misc/go-jira-1.0.23
index fe4f2fad9e84..7f2677200eb0 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.23
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.23
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A simple JIRA commandline client in Go
EAPI=7
HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
+INHERIT=go-module
KEYWORDS=amd64
LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.26 b/metadata/md5-cache/app-misc/go-jira-1.0.26
index c45ffa7ab171..e02bebe22a8b 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.26
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.26
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A simple JIRA commandline client in Go
EAPI=7
HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.27 b/metadata/md5-cache/app-misc/go-jira-1.0.27
index 23c778393f46..2576201f3035 100644
--- a/metadata/md5-cache/app-misc/go-jira-1.0.27
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.27
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A simple JIRA commandline client in Go
EAPI=7
HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/grabcartoons-2.8.4_p20141112 b/metadata/md5-cache/app-misc/grabcartoons-2.8.4_p20141112
index 2ce8e04e04e0..5589e8793d6f 100644
--- a/metadata/md5-cache/app-misc/grabcartoons-2.8.4_p20141112
+++ b/metadata/md5-cache/app-misc/grabcartoons-2.8.4_p20141112
@@ -2,6 +2,7 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Comic-summarizing utility
EAPI=6
HOMEPAGE=https://zzamboni.org/code/grabcartoons/
+INHERIT=vcs-snapshot
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
diff --git a/metadata/md5-cache/app-misc/gtk-sunlight-0.4.2-r1 b/metadata/md5-cache/app-misc/gtk-sunlight-0.4.2-r1
index 3b7ede7fcf2b..b9f778189465 100644
--- a/metadata/md5-cache/app-misc/gtk-sunlight-0.4.2-r1
+++ b/metadata/md5-cache/app-misc/gtk-sunlight-0.4.2-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 dev-util/desktop-fi
DESCRIPTION=Real-time Sunlight Wallpaper
EAPI=7
HOMEPAGE=http://realtimesunlightwallpaper.weebly.com/
+INHERIT=toolchain-funcs xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-1
RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
SLOT=0
SRC_URI=https://ppa.launchpad.net/realtime.sunlight.wallpaper/rsw/ubuntu/pool/main/g/gtk-sunlight/gtk-sunlight_0.4.2.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=76974de71e430aced65436c44125f12b
diff --git a/metadata/md5-cache/app-misc/hilite-1.5-r1 b/metadata/md5-cache/app-misc/hilite-1.5-r1
index 82920363cee3..24db78c2edef 100644
--- a/metadata/md5-cache/app-misc/hilite-1.5-r1
+++ b/metadata/md5-cache/app-misc/hilite-1.5-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare unpack
DESCRIPTION=A utility which highlights stderr text in red
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/hilite
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/hilite-1.5.c
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=837d0bd352d3b5a5d26131990a92e1cc
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
index 0d6426c2da6b..0f4ba30597ae 100644
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
+++ b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
EAPI=6
HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
+INHERIT=toolchain-funcs versionator
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=d82bf4d240f1e3312099333f5459f241
diff --git a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1 b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1
index 8f012297a17f..b412dcf5affe 100644
--- a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1
+++ b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install postinst unpack
DESCRIPTION=KryoFlux Host Software
EAPI=7
HOMEPAGE=https://www.kryoflux.com
+INHERIT=desktop eutils udev xdg-utils
IUSE=demos doc fast-firmware gui static
KEYWORDS=-* amd64 x86
LICENSE=SPS
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/spsdeclib virtual/libusb:1 virtual/udev gui? ( virtual/jre )
RESTRICT=bindist mirror
SLOT=0
SRC_URI=https://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2 gui? ( https://www.kryoflux.com/download/kryoflux_3.00_windows.zip )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=18fef869ac1b56bcfb1fc42c6fbc2873
diff --git a/metadata/md5-cache/app-misc/ltunify-0.2-r2 b/metadata/md5-cache/app-misc/ltunify-0.2-r2
index 04ea4cc0e07a..2d1c620e4f14 100644
--- a/metadata/md5-cache/app-misc/ltunify-0.2-r2
+++ b/metadata/md5-cache/app-misc/ltunify-0.2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Tool for working with Logitech Unifying receivers and devices
EAPI=7
HOMEPAGE=https://lekensteyn.nl/logitech-unifying.html https://git.lekensteyn.nl/ltunify/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
SLOT=0
SRC_URI=https://git.lekensteyn.nl/ltunify/snapshot/ltunify-0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dbe252ce463e0983d41df89611fec94b
diff --git a/metadata/md5-cache/app-misc/lxsplit-0.2.4-r1 b/metadata/md5-cache/app-misc/lxsplit-0.2.4-r1
index 68c44884517b..558102a03dc0 100644
--- a/metadata/md5-cache/app-misc/lxsplit-0.2.4-r1
+++ b/metadata/md5-cache/app-misc/lxsplit-0.2.4-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Command-line file splitter/joiner for Linux
EAPI=7
HOMEPAGE=http://lxsplit.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/lxsplit/lxsplit-0.2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bc261d8ea3b8ddf1b56ce43777bf81af
diff --git a/metadata/md5-cache/app-misc/mepl-0.45-r1 b/metadata/md5-cache/app-misc/mepl-0.45-r1
index b981962ca460..6687c65df572 100644
--- a/metadata/md5-cache/app-misc/mepl-0.45-r1
+++ b/metadata/md5-cache/app-misc/mepl-0.45-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Self-employed-mode software for 3COM/USR message modems
EAPI=6
HOMEPAGE=https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.hof-berlin.de/mepl/mepl0.45.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2bcc6ae288f0f37c79fc1e0f2a79e78a
diff --git a/metadata/md5-cache/app-misc/mkcert-1.4.1 b/metadata/md5-cache/app-misc/mkcert-1.4.1
index 2fb0ba63f738..61ea93460592 100644
--- a/metadata/md5-cache/app-misc/mkcert-1.4.1
+++ b/metadata/md5-cache/app-misc/mkcert-1.4.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A zero-config tool to make locally trusted development certificates
EAPI=7
HOMEPAGE=https://github.com/FiloSottile/mkcert
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/neofetch-7.1.0 b/metadata/md5-cache/app-misc/neofetch-7.1.0
index 38b172bd375d..2c9ec47faff6 100644
--- a/metadata/md5-cache/app-misc/neofetch-7.1.0
+++ b/metadata/md5-cache/app-misc/neofetch-7.1.0
@@ -2,6 +2,7 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Simple information system script
EAPI=7
HOMEPAGE=https://github.com/dylanaraps/neofetch
+INHERIT=prefix
IUSE=X
KEYWORDS=amd64 ~arm64 ~mips ~ppc64 x86
LICENSE=MIT-with-advertising
diff --git a/metadata/md5-cache/app-misc/no-more-secrets-0.3.3 b/metadata/md5-cache/app-misc/no-more-secrets-0.3.3
index 590490d4451a..c5304ed09d92 100644
--- a/metadata/md5-cache/app-misc/no-more-secrets-0.3.3
+++ b/metadata/md5-cache/app-misc/no-more-secrets-0.3.3
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=Recreate decrypting text from 1992 movie 'Sneakers'
EAPI=7
HOMEPAGE=https://github.com/bartobri/no-more-secrets
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=GPL-3
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://github.com/bartobri/no-more-secrets/archive/v0.3.3.tar.gz -> no-more-secrets-0.3.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=83c0bcd58a6433b695cb8f180820cbd9
diff --git a/metadata/md5-cache/app-misc/ondir-0.2.4 b/metadata/md5-cache/app-misc/ondir-0.2.4
index 0fe62f664ec1..3d16d89e25f5 100644
--- a/metadata/md5-cache/app-misc/ondir-0.2.4
+++ b/metadata/md5-cache/app-misc/ondir-0.2.4
@@ -3,10 +3,11 @@ DEPEND=sys-apps/sed
DESCRIPTION=Automatically execute scripts as you traverse directories
EAPI=6
HOMEPAGE=http://swapoff.org/OnDir
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-apps/sed
SLOT=0
SRC_URI=http://swapoff.org/files/ondir/ondir-0.2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4a3532c7660f1b93c32e0614562f2e6e
diff --git a/metadata/md5-cache/app-misc/pal-0.4.3-r2 b/metadata/md5-cache/app-misc/pal-0.4.3-r2
index c1a16dc2de90..cc9add92add9 100644
--- a/metadata/md5-cache/app-misc/pal-0.4.3-r2
+++ b/metadata/md5-cache/app-misc/pal-0.4.3-r2
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses:0 sys-libs/
DESCRIPTION=Command-line calendar program
EAPI=6
HOMEPAGE=http://palcal.sourceforge.net/
+INHERIT=prefix toolchain-funcs
IUSE=nls
KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses:0 sys-libs
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/palcal/pal-0.4.3.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=03ae3c21d674741a3657eec296b875dd
diff --git a/metadata/md5-cache/app-misc/pet-0.3.6 b/metadata/md5-cache/app-misc/pet-0.3.6
index 2723cb51d2f0..0a3dc40d6052 100644
--- a/metadata/md5-cache/app-misc/pet-0.3.6
+++ b/metadata/md5-cache/app-misc/pet-0.3.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Simple command-line snippet manager
EAPI=7
HOMEPAGE=https://github.com/knqyf263/pet
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/pet-0.3.6-r1 b/metadata/md5-cache/app-misc/pet-0.3.6-r1
index 063df9cfe1b4..d23a403e17a3 100644
--- a/metadata/md5-cache/app-misc/pet-0.3.6-r1
+++ b/metadata/md5-cache/app-misc/pet-0.3.6-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=Simple command-line snippet manager
EAPI=7
HOMEPAGE=https://github.com/knqyf263/pet
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/app-misc/pipeworks-0.4-r1 b/metadata/md5-cache/app-misc/pipeworks-0.4-r1
index bf47806b0367..1ba3db80e802 100644
--- a/metadata/md5-cache/app-misc/pipeworks-0.4-r1
+++ b/metadata/md5-cache/app-misc/pipeworks-0.4-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A small utility that measures throughput between stdin and stdout
EAPI=6
HOMEPAGE=http://pipeworks.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/pipeworks/pipeworks-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7a1639e55ef4169d746e03f0471b1b2a
diff --git a/metadata/md5-cache/app-misc/qcma-0.4.1 b/metadata/md5-cache/app-misc/qcma-0.4.1
index 027f5c900645..f3f59cebab92 100644
--- a/metadata/md5-cache/app-misc/qcma-0.4.1
+++ b/metadata/md5-cache/app-misc/qcma-0.4.1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/
DESCRIPTION=Cross-platform content manager assistant for the PS Vita
EAPI=7
HOMEPAGE=https://github.com/codestation/qcma
+INHERIT=qmake-utils
IUSE=+ffmpeg
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:0 ) x11-libs/libnotify:0
SLOT=0
SRC_URI=https://github.com/codestation/qcma/archive/v0.4.1.tar.gz -> qcma-0.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=21c6b15f6bcdf6455c15b5168452c213
diff --git a/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227 b/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227
index a3dc6f35d45d..ab4c68ae12f5 100644
--- a/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227
+++ b/metadata/md5-cache/app-misc/qcma-0.4.2_pre20181227
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/
DESCRIPTION=Cross-platform content manager assistant for the PS Vita
EAPI=7
HOMEPAGE=https://github.com/codestation/qcma
+INHERIT=qmake-utils vcs-snapshot
IUSE=+ffmpeg
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/vitamtp:0 ffmpeg? ( media-video/ffmpeg:0 ) x11-libs/libnotify:0
SLOT=0
SRC_URI=https://github.com/codestation/qcma/archive/65f0eab8ca0640447d2e84cdc5fadc66d2c07efb.tar.gz -> qcma-0.4.2_pre20181227.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=e9ff2294efd754c1471da6e0404ce73f
diff --git a/metadata/md5-cache/app-misc/radeontop-1.3-r2 b/metadata/md5-cache/app-misc/radeontop-1.3-r2
index 0cc4443911e1..b920b50da9f1 100644
--- a/metadata/md5-cache/app-misc/radeontop-1.3-r2
+++ b/metadata/md5-cache/app-misc/radeontop-1.3-r2
@@ -4,6 +4,7 @@ DEPEND=sys-libs/ncurses:0= x11-libs/libdrm[video_cards_amdgpu?,video_cards_radeo
DESCRIPTION=Utility to view Radeon GPU utilization
EAPI=7
HOMEPAGE=https://github.com/clbr/radeontop
+INHERIT=toolchain-funcs
IUSE=nls video_cards_amdgpu video_cards_radeon
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/ncurses:0= x11-libs/libdrm[video_cards_amdgpu?,video_cards_rade
REQUIRED_USE=|| ( video_cards_amdgpu video_cards_radeon )
SLOT=0
SRC_URI=https://github.com/clbr/radeontop/archive/v1.3.tar.gz -> radeontop-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e1096796f741bda711f40860967f9304
diff --git a/metadata/md5-cache/app-misc/rbutil-1.4.1-r2 b/metadata/md5-cache/app-misc/rbutil-1.4.1-r2
index 9d3ee08e6e0f..a00c0c7f8da3 100644
--- a/metadata/md5-cache/app-misc/rbutil-1.4.1-r2
+++ b/metadata/md5-cache/app-misc/rbutil-1.4.1-r2
@@ -4,11 +4,12 @@ DEPEND=dev-libs/crypto++:= dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev
DESCRIPTION=Rockbox open source firmware manager for music players
EAPI=7
HOMEPAGE=https://www.rockbox.org/wiki/RockboxUtility
+INHERIT=desktop qmake-utils xdg
IUSE=debug
KEYWORDS=~amd64
LICENSE=GPL-2
RDEPEND=dev-libs/crypto++:= dev-libs/quazip:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/speex media-libs/speexdsp virtual/libusb:1
SLOT=0
SRC_URI=https://download.rockbox.org/rbutil/source/RockboxUtility-v1.4.1-src.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=78dcc3ba6db0efc2a3910839d9accd9e
diff --git a/metadata/md5-cache/app-misc/socnetv-2.2 b/metadata/md5-cache/app-misc/socnetv-2.2
index 5b57f0a4c8dc..1e377bb2227b 100644
--- a/metadata/md5-cache/app-misc/socnetv-2.2
+++ b/metadata/md5-cache/app-misc/socnetv-2.2
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5
DESCRIPTION=Qt Social Network Visualizer
EAPI=7
HOMEPAGE=https://socnetv.org/
+INHERIT=desktop qmake-utils toolchain-funcs
IUSE=examples
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=mirror://sourceforge/socnetv/SocNetV-2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=a5d35e8874d9da6b8ce2fc8d80e2b7f9
diff --git a/metadata/md5-cache/app-misc/spire-0.10.0 b/metadata/md5-cache/app-misc/spire-0.10.0
index 0d89d087447a..d7edb76299e0 100644
--- a/metadata/md5-cache/app-misc/spire-0.10.0
+++ b/metadata/md5-cache/app-misc/spire-0.10.0
@@ -4,6 +4,7 @@ DEPEND=acct-group/spire acct-user/spire
DESCRIPTION=the spiffe runtime environment
EAPI=7
HOMEPAGE=https://github.com/spiffe/spire
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=acct-group/spire acct-user/spire
diff --git a/metadata/md5-cache/app-misc/spire-0.11.1 b/metadata/md5-cache/app-misc/spire-0.11.1
index 6ec39b957259..b21929862ab6 100644
--- a/metadata/md5-cache/app-misc/spire-0.11.1
+++ b/metadata/md5-cache/app-misc/spire-0.11.1
@@ -4,6 +4,7 @@ DEPEND=acct-group/spire acct-user/spire
DESCRIPTION=the spiffe runtime environment
EAPI=7
HOMEPAGE=https://github.com/spiffe/spire
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=acct-group/spire acct-user/spire
diff --git a/metadata/md5-cache/app-misc/tpipe-1.6-r1 b/metadata/md5-cache/app-misc/tpipe-1.6-r1
index 4da5acfe108f..bd759ef45826 100644
--- a/metadata/md5-cache/app-misc/tpipe-1.6-r1
+++ b/metadata/md5-cache/app-misc/tpipe-1.6-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Command to duplicate standard input to more than one program
EAPI=6
HOMEPAGE=http://www.eurogaran.com/downloads/tpipe
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.eurogaran.com/downloads/tpipe/tpipe-1.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=55de38c99ee3968cb4a20e9fc016ef7d
diff --git a/metadata/md5-cache/app-misc/transfolio-1.0.1-r1 b/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
index 7cd113b4e424..edf644a8e3e0 100644
--- a/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/transfolio-1.0.1-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Enables data transfer between the PC and the Atari Portfolio
EAPI=7
HOMEPAGE=http://leute.server.de/peichl/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://leute.server.de/peichl/transfolio.zip -> transfolio-1.0.1.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7c034201d8f4919bd7966453a927f8fa
diff --git a/metadata/md5-cache/app-misc/ttyload-0.5.3 b/metadata/md5-cache/app-misc/ttyload-0.5.3
index f589e0e66081..9ad8970f2ac7 100644
--- a/metadata/md5-cache/app-misc/ttyload-0.5.3
+++ b/metadata/md5-cache/app-misc/ttyload-0.5.3
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=color-coded graph of load averages over time
EAPI=6
HOMEPAGE=https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=ISC
RESTRICT=test
SLOT=0
SRC_URI=https://www.daveltd.com/src/util/ttyload/ttyload-0.5.3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a91757c7ec47e330d3a8b50f9879c440
diff --git a/metadata/md5-cache/app-misc/ttysnoop-0.12d b/metadata/md5-cache/app-misc/ttysnoop-0.12d
index e7f26de73fd2..b9fcef28d876 100644
--- a/metadata/md5-cache/app-misc/ttysnoop-0.12d
+++ b/metadata/md5-cache/app-misc/ttysnoop-0.12d
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Tool to snoop on login tty's through another tty-device or pseudo-tty
EAPI=7
HOMEPAGE=http://sysd.org/stas/node/35
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://sysd.org/stas/files/active/0/ttysnoop-0.12d.k26.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4d7f5237d42a161c80f19370392a5dc2
diff --git a/metadata/md5-cache/app-misc/zygrib-8.0.1-r1 b/metadata/md5-cache/app-misc/zygrib-8.0.1-r1
index 35555b308457..5172bf7ce0d8 100644
--- a/metadata/md5-cache/app-misc/zygrib-8.0.1-r1
+++ b/metadata/md5-cache/app-misc/zygrib-8.0.1-r1
@@ -3,11 +3,12 @@ DEPEND=app-arch/bzip2 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 media-libs/libpng:* sci-
DESCRIPTION=GRIB File Viewer - Weather data visualization
EAPI=7
HOMEPAGE=http://www.zygrib.org/
+INHERIT=desktop eutils qmake-utils
IUSE=+maps
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3 public-domain
RDEPEND=app-arch/bzip2 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 media-libs/libpng:* sci-libs/libnova sci-libs/proj sys-libs/zlib x11-libs/qwt:6[qt5(+)]
SLOT=0
SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/zyGrib-8.0.1.tgz -> zygrib-8.0.1.tgz https://dev.gentoo.org/~mschiff/distfiles/zygrib-icon.png maps? ( http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz -> zygrib-cities_300-1k.txt.gz http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz -> zygrib-cities_0-300.txt.gz )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=6ccfbff0d9e621367c910602db95800c
diff --git a/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1 b/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
index 7dbda7401716..67d383ffaf90 100644
--- a/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
+++ b/metadata/md5-cache/app-mobilephone/qtadb-0.8.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5
DESCRIPTION=Android phone manager via ADB
EAPI=7
HOMEPAGE=https://qtadb.wordpress.com
+INHERIT=desktop qmake-utils readme.gentoo-r1
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://bitbucket.org/michalmotyczko/qtadb/get/ccbb0c86c9eb.zip -> qtadb-0.8.1.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=d33ce02121de928be6bc9e6f9dd4ef4a
diff --git a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3 b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
index c5c5f9bee923..0e2108b90ae3 100644
--- a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
+++ b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez
DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
EAPI=7
HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez acct-user/sobexsrv acct-group/sobexsrv
SLOT=0
SRC_URI=http://www.mulliner.org/bluetooth/sobexsrv-1.0.1.tar.gz https://dev.gentoo.org/~joker/sobexsrv-1.0.1-fix64.patch
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0efc5aa55894ca408d5e4caee2d70464
diff --git a/metadata/md5-cache/app-office/borg-1.7.4-r3 b/metadata/md5-cache/app-office/borg-1.7.4-r3
index 1b29b9af0c58..74fa0fce5566 100644
--- a/metadata/md5-cache/app-office/borg-1.7.4-r3
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=dev-java/javahelp:0 dev-java/oracle-javamail:0 >=virtual/jre-1.6 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=82582d34556beb640e0ed303ade7e3fd
diff --git a/metadata/md5-cache/app-office/homebank-5.4.3 b/metadata/md5-cache/app-office/homebank-5.4.3
index 8260ebd35f2b..bef0c5163bf7 100644
--- a/metadata/md5-cache/app-office/homebank-5.4.3
+++ b/metadata/md5-cache/app-office/homebank-5.4.3
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-
DESCRIPTION=Free, easy, personal accounting for everyone
EAPI=7
HOMEPAGE=http://homebank.free.fr/index.php
+INHERIT=xdg
IUSE=+ofx
KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3:= )
SLOT=0
SRC_URI=http://homebank.free.fr/public/homebank-5.4.3.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=901f63bc6affc208134648d9912822be
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.4.7.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.7.2
index 8e6e2234639a..6100ed20e1c2 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.4.7.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.4.7.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare unpack
DESCRIPTION=Translations for the Libreoffice suite
EAPI=7
HOMEPAGE=https://www.libreoffice.org
+INHERIT=rpm
IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-3 MPL-1.1 )
@@ -10,5 +11,5 @@ RDEPEND=app-text/hunspell
RESTRICT=strip
SLOT=0
SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.4.7/rpm/x86_64/LibreOffice_6.4.7_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.4.7/rpm/x86_64/LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.4.7.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=f8dbf346f028178d614d7bcd9756f7b2
diff --git a/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1 b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
index 8b53bbb0f7d4..0654ba99ef42 100644
--- a/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
+++ b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
@@ -4,6 +4,7 @@ DEPEND=|| ( app-office/libreoffice[odk] >=app-office/libreoffice-bin-6.4.7.2_p1
DESCRIPTION=Free Finnish spell checking and hyphenation for LibreOffice
EAPI=7
HOMEPAGE=https://voikko.puimula.org/
+INHERIT=verify-sig
IUSE=verify-sig
KEYWORDS=amd64 x86
LICENSE=GPL-3
diff --git a/metadata/md5-cache/app-office/plan-1.10 b/metadata/md5-cache/app-office/plan-1.10
index 4222fbabeb40..a6635f94c0bd 100644
--- a/metadata/md5-cache/app-office/plan-1.10
+++ b/metadata/md5-cache/app-office/plan-1.10
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/motif:0
DESCRIPTION=Motif based schedule planner
EAPI=7
HOMEPAGE=https://www.bitrot.de/plan.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/motif:0
SLOT=0
SRC_URI=ftp://ftp.fu-berlin.de/unix/X11/apps/plan/plan-1.10.tar.gz https://dev.gentoo.org/~soap/distfiles/plan-1.10-patches.txz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b3d77413e2bd37353c08a83c7cc8b6f0
diff --git a/metadata/md5-cache/app-office/sc-7.16-r2 b/metadata/md5-cache/app-office/sc-7.16-r2
index be0b7dc0496b..aafe81b74207 100644
--- a/metadata/md5-cache/app-office/sc-7.16-r2
+++ b/metadata/md5-cache/app-office/sc-7.16-r2
@@ -3,10 +3,11 @@ DEPEND=virtual/pkgconfig
DESCRIPTION=Spreadsheet Calculator
EAPI=6
HOMEPAGE=http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=public-domain
RDEPEND=>=sys-libs/ncurses-5.2
SLOT=0
SRC_URI=ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/sc-7.16.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d7a345794b4d78f6eefdb375c0c44f61
diff --git a/metadata/md5-cache/app-office/texmaker-5.0.3 b/metadata/md5-cache/app-office/texmaker-5.0.3
index 38d8a6fdbc3f..5e19cdea4f7a 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0.3
+++ b/metadata/md5-cache/app-office/texmaker-5.0.3
@@ -4,10 +4,11 @@ DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qt
DESCRIPTION=A nice LaTeX-IDE
EAPI=7
HOMEPAGE=https://xm1math.net/texmaker/
+INHERIT=qmake-utils readme.gentoo-r1 xdg
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
SLOT=0
SRC_URI=https://xm1math.net/texmaker/texmaker-5.0.3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=ffc9f8ba20f942ce2404a11c51b21acd
diff --git a/metadata/md5-cache/app-office/texmaker-5.0.4 b/metadata/md5-cache/app-office/texmaker-5.0.4
index 931bb57e10cd..a06c2edfdb94 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0.4
+++ b/metadata/md5-cache/app-office/texmaker-5.0.4
@@ -4,10 +4,11 @@ DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qt
DESCRIPTION=A nice LaTeX-IDE
EAPI=7
HOMEPAGE=https://xm1math.net/texmaker/
+INHERIT=qmake-utils readme.gentoo-r1 xdg
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
SLOT=0
SRC_URI=https://xm1math.net/texmaker/texmaker-5.0.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=21c0e461eb0e613c46e88b3a573ab616
diff --git a/metadata/md5-cache/app-office/texstudio-3.0.5-r1 b/metadata/md5-cache/app-office/texstudio-3.0.5-r1
index c3c179bca04a..01518035c786 100644
--- a/metadata/md5-cache/app-office/texstudio-3.0.5-r1
+++ b/metadata/md5-cache/app-office/texstudio-3.0.5-r1
@@ -4,11 +4,12 @@ DEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.3-r1:0= d
DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
EAPI=7
HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
+INHERIT=desktop qmake-utils xdg
IUSE=video
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
SLOT=0
SRC_URI=https://github.com/texstudio-org/texstudio/archive/3.0.5.tar.gz -> texstudio-3.0.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=b2b08375519b3ff57d470d1ea411cacc
diff --git a/metadata/md5-cache/app-office/texstudio-3.1.0-r1 b/metadata/md5-cache/app-office/texstudio-3.1.0-r1
index f20e0e8e5fd1..9aa61de7b2cf 100644
--- a/metadata/md5-cache/app-office/texstudio-3.1.0-r1
+++ b/metadata/md5-cache/app-office/texstudio-3.1.0-r1
@@ -4,11 +4,12 @@ DEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.3-r1:0= d
DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
EAPI=7
HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
+INHERIT=desktop qmake-utils xdg
IUSE=video
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
SLOT=0
SRC_URI=https://github.com/texstudio-org/texstudio/archive/3.1.0.tar.gz -> texstudio-3.1.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=424ea2440ed4ab2128625c3793022090
diff --git a/metadata/md5-cache/app-pda/ifuse-1.1.3-r1 b/metadata/md5-cache/app-pda/ifuse-1.1.3-r1
index f2c28c49a6e2..9696074b1e01 100644
--- a/metadata/md5-cache/app-pda/ifuse-1.1.3-r1
+++ b/metadata/md5-cache/app-pda/ifuse-1.1.3-r1
@@ -3,6 +3,7 @@ DEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= sys-fs/fuse:0
DESCRIPTION=Mount Apple iPhone/iPod Touch file systems for backup purposes
EAPI=6
HOMEPAGE=http://www.libimobiledevice.org/
+INHERIT=readme.gentoo-r1
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
RDEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= sys-fs/fuse:0=
diff --git a/metadata/md5-cache/app-pda/iripdb-0.1.3b b/metadata/md5-cache/app-pda/iripdb-0.1.3b
index 909d111d3b83..0dca95a0a912 100644
--- a/metadata/md5-cache/app-pda/iripdb-0.1.3b
+++ b/metadata/md5-cache/app-pda/iripdb-0.1.3b
@@ -3,10 +3,11 @@ DEPEND=media-libs/taglib sys-libs/zlib app-arch/unzip
DESCRIPTION=Allows generating the DB files necessary for the iRiver iHP-1xx
EAPI=6
HOMEPAGE=http://www.fataltourist.com/iripdb/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/taglib sys-libs/zlib
SLOT=0
SRC_URI=http://www.fataltourist.com/iripdb/iRipDB-0.1.3b.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=840c83e49ddb64f7ad60570a0a98aace
diff --git a/metadata/md5-cache/app-portage/pgo-0.0.2 b/metadata/md5-cache/app-portage/pgo-0.0.2
index f43f3b2ce260..4d24fc9c5c62 100644
--- a/metadata/md5-cache/app-portage/pgo-0.0.2
+++ b/metadata/md5-cache/app-portage/pgo-0.0.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A command line interface for packages.gentoo.org
EAPI=7
HOMEPAGE=https://github.com/arzano/pgo
+INHERIT=go-module
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RESTRICT=strip
diff --git a/metadata/md5-cache/app-portage/pgo-0.0.3 b/metadata/md5-cache/app-portage/pgo-0.0.3
index a12ffb20aa2c..da94a35c186f 100644
--- a/metadata/md5-cache/app-portage/pgo-0.0.3
+++ b/metadata/md5-cache/app-portage/pgo-0.0.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A command line interface for packages.gentoo.org
EAPI=7
HOMEPAGE=https://github.com/arzano/pgo
+INHERIT=go-module
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=BSD-2
RESTRICT=strip
diff --git a/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1 b/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
index c840c84edd4d..fb5c5e224787 100644
--- a/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
+++ b/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=A repository commit helper
EAPI=7
HOMEPAGE=https://bitbucket.org/gentoo/repo-commit/
+INHERIT=out-of-source
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=sys-apps/portage
diff --git a/metadata/md5-cache/app-shells/ccsh-0.0.4-r4 b/metadata/md5-cache/app-shells/ccsh-0.0.4-r4
index 4e55debfae55..915f51407e34 100644
--- a/metadata/md5-cache/app-shells/ccsh-0.0.4-r4
+++ b/metadata/md5-cache/app-shells/ccsh-0.0.4-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=UNIX Shell for people already familiar with the C language
EAPI=6
HOMEPAGE=http://ccsh.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/ccsh/ccsh-0.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=acfb72aeaf6be141d9a5f0c713a242c0
diff --git a/metadata/md5-cache/app-shells/pdmenu-1.3.6 b/metadata/md5-cache/app-shells/pdmenu-1.3.6
index 1a63145640b1..2a4c6aaf868d 100644
--- a/metadata/md5-cache/app-shells/pdmenu-1.3.6
+++ b/metadata/md5-cache/app-shells/pdmenu-1.3.6
@@ -3,11 +3,12 @@ DEPEND=sys-libs/slang gpm? ( sys-libs/gpm ) nls? ( sys-devel/gettext )
DESCRIPTION=A simple console menu program
EAPI=7
HOMEPAGE=http://joeyh.name/code/pdmenu/
+INHERIT=toolchain-funcs
IUSE=nls gpm examples
KEYWORDS=amd64 ~mips x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~bkohler/dist/pdmenu-1.3.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=23e7bc3add74b122c7c5b7474bc3bc59
diff --git a/metadata/md5-cache/app-shells/peco-0.5.7 b/metadata/md5-cache/app-shells/peco-0.5.7
index fdc92d4273a1..b6b5b7a61b6e 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.7
+++ b/metadata/md5-cache/app-shells/peco-0.5.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=Simplistic interactive filtering tool
EAPI=7
HOMEPAGE=https://github.com/peco/peco
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/app-shells/peco-0.5.8 b/metadata/md5-cache/app-shells/peco-0.5.8
index cfb98c984dd6..3f914e884050 100644
--- a/metadata/md5-cache/app-shells/peco-0.5.8
+++ b/metadata/md5-cache/app-shells/peco-0.5.8
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=Simplistic interactive filtering tool
EAPI=7
HOMEPAGE=https://github.com/peco/peco
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/app-shells/rrs-1.70-r2 b/metadata/md5-cache/app-shells/rrs-1.70-r2
index b17e50daea4c..41363d5fbb71 100644
--- a/metadata/md5-cache/app-shells/rrs-1.70-r2
+++ b/metadata/md5-cache/app-shells/rrs-1.70-r2
@@ -3,11 +3,12 @@ DEPEND=ssl? ( dev-libs/openssl:0= )
DESCRIPTION=Reverse Remote Shell
EAPI=7
HOMEPAGE=http://freshmeat.sourceforge.net/projects/rrs
+INHERIT=toolchain-funcs
IUSE=ssl
KEYWORDS=amd64 ppc x86
LICENSE=MIT
RDEPEND=ssl? ( dev-libs/openssl:0= )
SLOT=0
SRC_URI=http://www.cycom.se/uploads/36/19/rrs-1.70.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8fe4966098b11b46425ccfdf53b91b0e
diff --git a/metadata/md5-cache/app-shells/scsh-0.6.7-r2 b/metadata/md5-cache/app-shells/scsh-0.6.7-r2
index 2db5d12d3bcd..5cfe2bca68b4 100644
--- a/metadata/md5-cache/app-shells/scsh-0.6.7-r2
+++ b/metadata/md5-cache/app-shells/scsh-0.6.7-r2
@@ -3,11 +3,12 @@ DEPEND=!dev-scheme/scheme48
DESCRIPTION=Unix shell embedded in Scheme
EAPI=6
HOMEPAGE=http://www.scsh.net/
+INHERIT=multilib
KEYWORDS=amd64 ppc sparc x86
LICENSE=BSD
RDEPEND=!dev-scheme/scheme48
RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.scsh.net/pub/scsh/0.6/scsh-0.6.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=562b5610d6dcf17ab7406f3bf5bdaf08
diff --git a/metadata/md5-cache/app-shells/shish-0.7_pre3-r1 b/metadata/md5-cache/app-shells/shish-0.7_pre3-r1
index 9ebb0ab061b7..e2d945cba282 100644
--- a/metadata/md5-cache/app-shells/shish-0.7_pre3-r1
+++ b/metadata/md5-cache/app-shells/shish-0.7_pre3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=diet? ( dev-libs/dietlibc )
SLOT=0
SRC_URI=http://www.blah.ch/shish/pkg/shish-0.7-pre3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=eafb93f6af28170e7fde8becd57621d3
diff --git a/metadata/md5-cache/app-shells/smrsh-8.15.2 b/metadata/md5-cache/app-shells/smrsh-8.15.2
index 446ecad1ef2f..2b9db9f1cdf9 100644
--- a/metadata/md5-cache/app-shells/smrsh-8.15.2
+++ b/metadata/md5-cache/app-shells/smrsh-8.15.2
@@ -9,5 +9,5 @@ LICENSE=Sendmail
RDEPEND=!mail-mta/sendmail
SLOT=0
SRC_URI=ftp://ftp.fu-berlin.de/unix/mail/sendmail/sendmail.8.15.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ba37468bf2e3f8ef519cec87da6c763e
diff --git a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1 b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
index 5e8724fb1a89..39f6bc87ec2a 100644
--- a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
+++ b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Fish shell like syntax highlighting for zsh
EAPI=7
HOMEPAGE=https://github.com/zsh-users/zsh-syntax-highlighting
+INHERIT=readme.gentoo-r1
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=app-shells/zsh
diff --git a/metadata/md5-cache/app-text/agrep-2.04-r2 b/metadata/md5-cache/app-text/agrep-2.04-r2
index 5e53068f43a0..3de0c48a783d 100644
--- a/metadata/md5-cache/app-text/agrep-2.04-r2
+++ b/metadata/md5-cache/app-text/agrep-2.04-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=A tool for the fast searching of text allowing for errors in the search pattern
EAPI=6
HOMEPAGE=ftp://ftp.cs.arizona.edu/agrep/README
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris
LICENSE=AGREP
RDEPEND=!dev-libs/tre !dev-ruby/amatch !app-misc/glimpse
SLOT=0
SRC_URI=ftp://ftp.cs.arizona.edu/agrep/agrep-2.04.tar.Z
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f72c5e7d7e64354037d446512ea7172e
diff --git a/metadata/md5-cache/app-text/an-1.2_p6 b/metadata/md5-cache/app-text/an-1.2_p6
index d46497428b96..46d5e720c34a 100644
--- a/metadata/md5-cache/app-text/an-1.2_p6
+++ b/metadata/md5-cache/app-text/an-1.2_p6
@@ -3,10 +3,11 @@ DEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal] virtual/pkgconfig
DESCRIPTION=Very fast anagram generator with dictionary lookup
EAPI=7
HOMEPAGE=https://packages.debian.org/unstable/games/an
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
SLOT=0
SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz mirror://debian/pool/main/a/an/an_1.2-6.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4d51fd669976e7e1e423ef7066c40281
diff --git a/metadata/md5-cache/app-text/ansifilter-2.17 b/metadata/md5-cache/app-text/ansifilter-2.17
index 5562d9b874f6..66f81f91f296 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.17
+++ b/metadata/md5-cache/app-text/ansifilter-2.17
@@ -3,11 +3,12 @@ DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
DESCRIPTION=Handles text files containing ANSI terminal escape codes
EAPI=7
HOMEPAGE=http://www.andre-simon.de/
+INHERIT=toolchain-funcs qmake-utils
IUSE=qt5
KEYWORDS=amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos
LICENSE=GPL-3+
RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
SLOT=0
SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.17.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=6756af09de30bb079e22a76dd4e1d0df
diff --git a/metadata/md5-cache/app-text/ansifilter-2.18 b/metadata/md5-cache/app-text/ansifilter-2.18
index 7086f5800e31..ff2672236fce 100644
--- a/metadata/md5-cache/app-text/ansifilter-2.18
+++ b/metadata/md5-cache/app-text/ansifilter-2.18
@@ -3,11 +3,12 @@ DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
DESCRIPTION=Handles text files containing ANSI terminal escape codes
EAPI=7
HOMEPAGE=http://www.andre-simon.de/
+INHERIT=toolchain-funcs qmake-utils
IUSE=qt5
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
LICENSE=GPL-3+
RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
SLOT=0
SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.18.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=7c093c8747a88981d4b465fbfa1e8dc6
diff --git a/metadata/md5-cache/app-text/bact-0.13-r1 b/metadata/md5-cache/app-text/bact-0.13-r1
index 307d82ca344c..cd597410314c 100644
--- a/metadata/md5-cache/app-text/bact-0.13-r1
+++ b/metadata/md5-cache/app-text/bact-0.13-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install test
DESCRIPTION=Boosting Algorithm for Classification of Trees
EAPI=6
HOMEPAGE=http://chasen.org/~taku/software/bact/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://chasen.org/~taku/software/bact/bact-0.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=01607b957dca6a3f5f6ce0396f69c04e
diff --git a/metadata/md5-cache/app-text/bibclean-2.17 b/metadata/md5-cache/app-text/bibclean-2.17
index ea09b43b9657..ce8dd60389a5 100644
--- a/metadata/md5-cache/app-text/bibclean-2.17
+++ b/metadata/md5-cache/app-text/bibclean-2.17
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=BibTeX bibliography prettyprinter and syntax checker
EAPI=6
HOMEPAGE=http://www.math.utah.edu/pub/bibclean/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.math.utah.edu/pub/bibclean/bibclean-2.17.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f3a685308b069272254accf5eab8368a
diff --git a/metadata/md5-cache/app-text/bibclean-3.04 b/metadata/md5-cache/app-text/bibclean-3.04
index f3ad0ec6b5bb..50df6f92fe63 100644
--- a/metadata/md5-cache/app-text/bibclean-3.04
+++ b/metadata/md5-cache/app-text/bibclean-3.04
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=BibTeX bibliography prettyprinter and syntax checker
EAPI=7
HOMEPAGE=http://www.math.utah.edu/pub/bibclean/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.math.utah.edu/pub/bibclean/bibclean-3.04.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=50475562d10b7a74501ab8ff6b451ad2
diff --git a/metadata/md5-cache/app-text/c2ps-4.0 b/metadata/md5-cache/app-text/c2ps-4.0
index c31356483e08..8cbb8e72be28 100644
--- a/metadata/md5-cache/app-text/c2ps-4.0
+++ b/metadata/md5-cache/app-text/c2ps-4.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Generates a beautified ps document from a source file (c/c++)
EAPI=7
HOMEPAGE=https://www.cs.technion.ac.il/users/c2ps
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://www.cs.technion.ac.il/users/c2ps/c2ps-4.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=97c7c9aac1f87addf4938d4bff09213f
diff --git a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1 b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
index be142e22e952..fc2858395131 100644
--- a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
+++ b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebengine:5[wi
DESCRIPTION=Tool for extracting unformatted bibliographic references
EAPI=7
HOMEPAGE=https://www.molspaces.com/cb2bib/
+INHERIT=qmake-utils xdg-utils
IUSE=+lzo
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 )
SLOT=0
SRC_URI=https://www.molspaces.com/dl/progs/cb2bib-2.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=125610adec86b95b3cc45533848beb31
diff --git a/metadata/md5-cache/app-text/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index c7a37f5792dd..a1bc4aa8685d 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -11,5 +11,5 @@ PDEPEND=>=app-dicts/ipadic-2.7.0
RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=0332c3b5b0ad2fb2d6537296831189f0
diff --git a/metadata/md5-cache/app-text/convertlit-1.8-r3 b/metadata/md5-cache/app-text/convertlit-1.8-r3
index 428e9aa545e5..1c17687a25a8 100644
--- a/metadata/md5-cache/app-text/convertlit-1.8-r3
+++ b/metadata/md5-cache/app-text/convertlit-1.8-r3
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
EAPI=6
HOMEPAGE=http://www.convertlit.com/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=>=dev-libs/libtommath-0.36-r1
SLOT=0
SRC_URI=http://www.convertlit.com/clit18src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9059b81fb8fc8d2d4e2418058b43a27b
diff --git a/metadata/md5-cache/app-text/cwtext-0.96-r1 b/metadata/md5-cache/app-text/cwtext-0.96-r1
index 9512bb96ed26..fa656ee62860 100644
--- a/metadata/md5-cache/app-text/cwtext-0.96-r1
+++ b/metadata/md5-cache/app-text/cwtext-0.96-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Text to Morse Code converter
EAPI=7
HOMEPAGE=http://cwtext.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/cwtext/cwtext-0.96.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=699b3a4fbaa91ce56734bfa3106ddcb6
diff --git a/metadata/md5-cache/app-text/diffpdf-2.1.3-r2 b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
index 623ab943bbab..ed4acaafd858 100644
--- a/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
+++ b/metadata/md5-cache/app-text/diffpdf-2.1.3-r2
@@ -4,10 +4,11 @@ DEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsuppor
DESCRIPTION=Program that textually or visually compares two PDF files
EAPI=7
HOMEPAGE=https://www.qtrac.eu/diffpdf.html
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=http://www.qtrac.eu/diffpdf-2.1.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=c532f187d41206334b960b3ac58a8f7f
diff --git a/metadata/md5-cache/app-text/ding-1.9 b/metadata/md5-cache/app-text/ding-1.9
index 86f6fd08bc72..78eafa360632 100644
--- a/metadata/md5-cache/app-text/ding-1.9
+++ b/metadata/md5-cache/app-text/ding-1.9
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
EAPI=7
HOMEPAGE=https://www-user.tu-chemnitz.de/~fri/ding/
+INHERIT=desktop xdg
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/tk-8.3
SLOT=0
SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.9.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=bc2f61884886d88e7883da6156b160ec
diff --git a/metadata/md5-cache/app-text/dos2unix-7.4.2 b/metadata/md5-cache/app-text/dos2unix-7.4.2
index 033928067554..37fa1649356d 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.4.2
+++ b/metadata/md5-cache/app-text/dos2unix-7.4.2
@@ -4,6 +4,7 @@ DEPEND=!app-text/hd2u virtual/libintl test? ( virtual/perl-Test-Simple )
DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
EAPI=7
HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
+INHERIT=l10n toolchain-funcs
IUSE=debug nls test
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
LICENSE=BSD-2
@@ -11,5 +12,5 @@ RDEPEND=!app-text/hd2u virtual/libintl
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.2.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.2.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aa7ad6d4d953fd321de38254fcf4ac68
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1-r1 b/metadata/md5-cache/app-text/enchant-1.6.1-r1
index d0d2d5bb54d1..acc13d6b07de 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1-r1
+++ b/metadata/md5-cache/app-text/enchant-1.6.1-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/
DESCRIPTION=Spellchecker wrapping library
EAPI=6
HOMEPAGE=https://abiword.github.io/enchant/
+INHERIT=versionator
IUSE=aspell +hunspell static-libs test
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=LGPL-2.1
diff --git a/metadata/md5-cache/app-text/epstool-3.09 b/metadata/md5-cache/app-text/epstool-3.09
index 07a4cc6104d0..550f9cba9ea4 100644
--- a/metadata/md5-cache/app-text/epstool-3.09
+++ b/metadata/md5-cache/app-text/epstool-3.09
@@ -3,10 +3,11 @@ DEPEND=app-text/ghostscript-gpl
DESCRIPTION=Creates or extracts preview images in EPS files, fixes bounding boxes
EAPI=7
HOMEPAGE=http://www.ghostgum.com.au/software/epstool.htm
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=app-text/ghostscript-gpl
SLOT=0
SRC_URI=http://www.ghostgum.com.au/download/epstool-3.09.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ec5b5518d517ef531e9228df927ee4d4
diff --git a/metadata/md5-cache/app-text/expander-2.0.5-r2 b/metadata/md5-cache/app-text/expander-2.0.5-r2
index 805825cbd471..ff5c0a4be985 100644
--- a/metadata/md5-cache/app-text/expander-2.0.5-r2
+++ b/metadata/md5-cache/app-text/expander-2.0.5-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=Expander is a utility that acts as a filter for text editors
EAPI=7
HOMEPAGE=http://www.nedit.org
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=71c84206f93e690e2959a8aafe760249
diff --git a/metadata/md5-cache/app-text/fbpdf-0_p20200614 b/metadata/md5-cache/app-text/fbpdf-0_p20200614
index 975d419324d5..3b772bb94fd6 100644
--- a/metadata/md5-cache/app-text/fbpdf-0_p20200614
+++ b/metadata/md5-cache/app-text/fbpdf-0_p20200614
@@ -4,10 +4,11 @@ DEPEND=>=app-text/mupdf-1.10:0= app-text/djvu:0= !media-gfx/fbida[fbcon(-)]
DESCRIPTION=framebuffer pdf and djvu viewer
EAPI=7
HOMEPAGE=https://github.com/aligrudi/fbpdf
+INHERIT=toolchain-funcs vcs-snapshot
KEYWORDS=~amd64 ~x86
LICENSE=BSD ISC
RDEPEND=>=app-text/mupdf-1.10:0= app-text/djvu:0= !media-gfx/fbida[fbcon(-)]
SLOT=0
SRC_URI=https://github.com/aligrudi/fbpdf/archive/27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz -> fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=380772be568c56c72769f032492af54a
diff --git a/metadata/md5-cache/app-text/flpsed-0.7.3 b/metadata/md5-cache/app-text/flpsed-0.7.3
index cf423b184534..291cd9d29fec 100644
--- a/metadata/md5-cache/app-text/flpsed-0.7.3
+++ b/metadata/md5-cache/app-text/flpsed-0.7.3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1
DESCRIPTION=Pseudo PostScript editor
EAPI=7
HOMEPAGE=https://flpsed.org/flpsed.html
+INHERIT=desktop xdg
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
SLOT=0
SRC_URI=https://flpsed.org/flpsed-0.7.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=711acbc4805e874fef52b21e7ffafffe
diff --git a/metadata/md5-cache/app-text/gv-3.7.3.90 b/metadata/md5-cache/app-text/gv-3.7.3.90
index 91fb197021e3..35e0c1fd4071 100644
--- a/metadata/md5-cache/app-text/gv-3.7.3.90
+++ b/metadata/md5-cache/app-text/gv-3.7.3.90
@@ -4,6 +4,7 @@ DEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >
DESCRIPTION=Viewer for PostScript and PDF documents using Ghostscript
EAPI=7
HOMEPAGE=https://www.gnu.org/software/gv/
+INHERIT=desktop
IUSE=xinerama
KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r100 b/metadata/md5-cache/app-text/highlight-3.57-r100
index a423bfc22e2d..d999af8d93c3 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r100
+++ b/metadata/md5-cache/app-text/highlight-3.57-r100
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
EAPI=7
HOMEPAGE=http://www.andre-simon.de/
+INHERIT=lua-single qmake-utils toolchain-funcs
IUSE=examples qt5 lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
SLOT=0
SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=56db539cba6db05f3e85912241d71c0c
diff --git a/metadata/md5-cache/app-text/hnb-1.9.18-r1 b/metadata/md5-cache/app-text/hnb-1.9.18-r1
index 45af0118f5cd..c10b70995932 100644
--- a/metadata/md5-cache/app-text/hnb-1.9.18-r1
+++ b/metadata/md5-cache/app-text/hnb-1.9.18-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses
DESCRIPTION=A program to organize many kinds of data in one place
EAPI=7
HOMEPAGE=http://hnb.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=http://hnb.sourceforge.net/.files/hnb-1.9.18.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d1c96c67cc89844261aba694f4813de9
diff --git a/metadata/md5-cache/app-text/html2text-1.3.2a-r2 b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
index 3db6e5203e37..c5304421d224 100644
--- a/metadata/md5-cache/app-text/html2text-1.3.2a-r2
+++ b/metadata/md5-cache/app-text/html2text-1.3.2a-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=HTML to text converter
EAPI=7
HOMEPAGE=http://www.mbayer.de/html2text/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bd15a6fa5f4f88ec9b5e9539cc85a909
diff --git a/metadata/md5-cache/app-text/html2text-2.0.0 b/metadata/md5-cache/app-text/html2text-2.0.0
index c294caf249e7..ad7dbe105dd9 100644
--- a/metadata/md5-cache/app-text/html2text-2.0.0
+++ b/metadata/md5-cache/app-text/html2text-2.0.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=HTML to text converter
EAPI=7
HOMEPAGE=https://github.com/grobian/html2text
+INHERIT=toolchain-funcs
KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/grobian/html2text/archive/v2.0.0.tar.gz -> html2text-2.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2ecea20d5f777ce571b44233a2274ef2
diff --git a/metadata/md5-cache/app-text/html401-19991224-r4 b/metadata/md5-cache/app-text/html401-19991224-r4
index f1ae2635bcff..aee3eae6da46 100644
--- a/metadata/md5-cache/app-text/html401-19991224-r4
+++ b/metadata/md5-cache/app-text/html401-19991224-r4
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst
DESCRIPTION=DTDs for the HyperText Markup Language 4.01
EAPI=7
HOMEPAGE=https://www.w3.org/TR/html401/
+INHERIT=sgml-catalog-r1
KEYWORDS=amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=W3C
RDEPEND=>=app-text/sgml-common-0.6.3-r7
diff --git a/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1 b/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
index afc44723bc76..ebc4bd6a28c7 100644
--- a/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
+++ b/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=Recodes HTML file using a new character set
EAPI=7
HOMEPAGE=https://bisqwit.iki.fi/source/htmlrecode.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=557d4b8bef59093983249f080abefc12
diff --git a/metadata/md5-cache/app-text/htmltidy-20090325-r2 b/metadata/md5-cache/app-text/htmltidy-20090325-r2
index 5088f85211d9..9ec69acce097 100644
--- a/metadata/md5-cache/app-text/htmltidy-20090325-r2
+++ b/metadata/md5-cache/app-text/htmltidy-20090325-r2
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd6
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=b61f478ff253cc88d2b0d5bc244f5d1b
diff --git a/metadata/md5-cache/app-text/itex2mml-1.5.6 b/metadata/md5-cache/app-text/itex2mml-1.5.6
index e65e36a097d8..f540d68d7b4a 100644
--- a/metadata/md5-cache/app-text/itex2mml-1.5.6
+++ b/metadata/md5-cache/app-text/itex2mml-1.5.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A LaTeX into XHTML/MathML converter
EAPI=6
HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
SLOT=0
SRC_URI=https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-1.5.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2292b121efaea40317620ae67757e4c2
diff --git a/metadata/md5-cache/app-text/liblangtag-0.6.3 b/metadata/md5-cache/app-text/liblangtag-0.6.3
index c77308122f54..64dd4d0bc419 100644
--- a/metadata/md5-cache/app-text/liblangtag-0.6.3
+++ b/metadata/md5-cache/app-text/liblangtag-0.6.3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) test?
DESCRIPTION=An interface library to access tags for identifying languages
EAPI=7
HOMEPAGE=https://bitbucket.org/tagoh/liblangtag/wiki/Home
+INHERIT=xdg-utils
IUSE=debug doc introspection static-libs test
KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
LICENSE=|| ( LGPL-3 MPL-2.0 )
diff --git a/metadata/md5-cache/app-text/lout-3.40 b/metadata/md5-cache/app-text/lout-3.40
index 6c30c365f97c..c43ac32f48e0 100644
--- a/metadata/md5-cache/app-text/lout-3.40
+++ b/metadata/md5-cache/app-text/lout-3.40
@@ -3,11 +3,12 @@ DEPEND=zlib? ( >=sys-libs/zlib-1.1.4 )
DESCRIPTION=High-level language for document formatting
EAPI=6
HOMEPAGE=http://savannah.nongnu.org/projects/lout
+INHERIT=toolchain-funcs
IUSE=zlib doc
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3+
RDEPEND=zlib? ( >=sys-libs/zlib-1.1.4 )
SLOT=0
SRC_URI=mirror://nongnu/lout/lout-3.40.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6c3fccf23539419d0446f52ff2935a8f
diff --git a/metadata/md5-cache/app-text/mandoc-1.14.5-r1 b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
index c6ead8b383db..6855995f8914 100644
--- a/metadata/md5-cache/app-text/mandoc-1.14.5-r1
+++ b/metadata/md5-cache/app-text/mandoc-1.14.5-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db ) cgi? ( sys-libs/zlib[stati
DESCRIPTION=Suite of tools compiling mdoc and man
EAPI=7
HOMEPAGE=https://mdocml.bsd.lv/
+INHERIT=toolchain-funcs
IUSE=cgi system-man
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=ISC
RDEPEND=sys-libs/zlib system-man? ( !sys-apps/man-db )
SLOT=0
SRC_URI=https://mdocml.bsd.lv/snapshots/mandoc-1.14.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8abee88b0daef87ac74fe6d67e94a0df
diff --git a/metadata/md5-cache/app-text/mathtex-1.04 b/metadata/md5-cache/app-text/mathtex-1.04
index 9f7e50a8bcb9..e3608137b74b 100644
--- a/metadata/md5-cache/app-text/mathtex-1.04
+++ b/metadata/md5-cache/app-text/mathtex-1.04
@@ -3,11 +3,12 @@ DEPEND=app-arch/unzip
DESCRIPTION=Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc
EAPI=5
HOMEPAGE=http://www.forkosh.com/mathtex.html
+INHERIT=toolchain-funcs
IUSE=png
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=app-text/dvipng virtual/latex-base
SLOT=0
SRC_URI=mirror://gentoo/mathtex-1.04.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8ce0f810325782c48905fcc7a93c7db4
diff --git a/metadata/md5-cache/app-text/mpage-2.5.6-r1 b/metadata/md5-cache/app-text/mpage-2.5.6-r1
index f1d57027dffa..acf77713eca3 100644
--- a/metadata/md5-cache/app-text/mpage-2.5.6-r1
+++ b/metadata/md5-cache/app-text/mpage-2.5.6-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Many to one page printing utility
EAPI=7
HOMEPAGE=http://www.mesa.nl/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=freedist
SLOT=0
SRC_URI=http://www.mesa.nl/pub/mpage/mpage-2.5.6.tgz https://dev.gentoo.org/~mgorny/dist/mpage-2.5.6-gentoo-patchset.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aa7fe6264951ac493b4b88bdea28979c
diff --git a/metadata/md5-cache/app-text/o3read-0.0.4 b/metadata/md5-cache/app-text/o3read-0.0.4
index e71b39247f2e..68ff84ece47e 100644
--- a/metadata/md5-cache/app-text/o3read-0.0.4
+++ b/metadata/md5-cache/app-text/o3read-0.0.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Converts OpenOffice formats to text or HTML
EAPI=7
HOMEPAGE=http://siag.nu/o3read/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=http://siag.nu/pub/o3read/o3read-0.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cd68624a7b922e51112b55d946590a1e
diff --git a/metadata/md5-cache/app-text/odt2txt-0.5 b/metadata/md5-cache/app-text/odt2txt-0.5
index c8eb24dfeb44..6cc7e5ea4d95 100644
--- a/metadata/md5-cache/app-text/odt2txt-0.5
+++ b/metadata/md5-cache/app-text/odt2txt-0.5
@@ -3,10 +3,11 @@ DEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv sys-apps/groff
DESCRIPTION=A simple converter from OpenDocument Text to plain text
EAPI=6
HOMEPAGE=http://stosberg.net/odt2txt/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~ia64 ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv
SLOT=0
SRC_URI=https://github.com/dstosberg/odt2txt/archive/v0.5.tar.gz -> odt2txt-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=868ddba2ccaeeee4a1b5c312d3175922
diff --git a/metadata/md5-cache/app-text/par-1.53.0 b/metadata/md5-cache/app-text/par-1.53.0
index b9c918332351..f8228ed3b268 100644
--- a/metadata/md5-cache/app-text/par-1.53.0
+++ b/metadata/md5-cache/app-text/par-1.53.0
@@ -3,9 +3,10 @@ DEPEND=!dev-util/par !app-arch/par
DESCRIPTION=a paragraph reformatter, vaguely similar to fmt, but better
EAPI=7
HOMEPAGE=http://www.nicemice.net/par/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=|| ( MIT par )
SLOT=0
SRC_URI=http://www.nicemice.net/par/Par-1.53.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f05d27c9bd6818133d2b2667133733d3
diff --git a/metadata/md5-cache/app-text/pdf2html-1.4 b/metadata/md5-cache/app-text/pdf2html-1.4
index 3bdce5487d3f..dc8239f26d7a 100644
--- a/metadata/md5-cache/app-text/pdf2html-1.4
+++ b/metadata/md5-cache/app-text/pdf2html-1.4
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/libpng-1.4 sys-libs/zlib
DESCRIPTION=Converts pdf files to html files
EAPI=7
HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=>=media-libs/libpng-1.4 sys-libs/zlib app-text/ghostscript-gpl >=media-gfx/imagemagick-6
SLOT=0
SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/pdf2html-1.4.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c4873b43c0416fecc761f2c390452250
diff --git a/metadata/md5-cache/app-text/psiconv-0.8.3-r1 b/metadata/md5-cache/app-text/psiconv-0.8.3-r1
index 737c08acaf09..9c66c82f2c86 100644
--- a/metadata/md5-cache/app-text/psiconv-0.8.3-r1
+++ b/metadata/md5-cache/app-text/psiconv-0.8.3-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=An interpreter for Psion 5(MX) file formats
EAPI=7
HOMEPAGE=http://huizen.dds.nl/~frodol/psiconv
+INHERIT=toolchain-funcs
KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://huizen.dds.nl/~frodol/psiconv/psiconv-0.8.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f622f65d8b259ca084c2fa6c3dc96e82
diff --git a/metadata/md5-cache/app-text/pspresent-1.3-r1 b/metadata/md5-cache/app-text/pspresent-1.3-r1
index bc2eb3246e4c..5ba82d7b8e4a 100644
--- a/metadata/md5-cache/app-text/pspresent-1.3-r1
+++ b/metadata/md5-cache/app-text/pspresent-1.3-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-g
DESCRIPTION=A tool to display full-screen PostScript presentations
EAPI=6
HOMEPAGE=http://www.cse.unsw.edu.au/~matthewc/pspresent/
+INHERIT=toolchain-funcs
IUSE=xinerama
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-gpl
SLOT=0
SRC_URI=http://www.cse.unsw.edu.au/~matthewc/pspresent/pspresent-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fc0353b614822ca0409c1274193ae1b2
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r3 b/metadata/md5-cache/app-text/psutils-1.17-r3
index 9a3c3924c25f..a0fe30a3d275 100644
--- a/metadata/md5-cache/app-text/psutils-1.17-r3
+++ b/metadata/md5-cache/app-text/psutils-1.17-r3
@@ -3,9 +3,10 @@ DEPEND=dev-lang/perl
DESCRIPTION=PostScript Utilities
EAPI=6
HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=psutils
SLOT=0
SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=311781459ebd29d6af035113248bbb3b
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18 b/metadata/md5-cache/app-text/qpdfview-0.4.18
index 8503f9491c66..3c986ba18468 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18
@@ -4,6 +4,7 @@ DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf
DESCRIPTION=A tabbed document viewer
EAPI=7
HOMEPAGE=https://launchpad.net/qpdfview
+INHERIT=l10n qmake-utils xdg
IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupd
REQUIRED_USE=?? ( fitz pdf )
SLOT=0
SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.18/+download/qpdfview-0.4.18.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=2ce959999540c011e3c5fa6f1b4e2c6d
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.18_p1 b/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
index 1dfa56bb3ef0..f89944abff65 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.18_p1
@@ -4,6 +4,7 @@ DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf
DESCRIPTION=A tabbed document viewer
EAPI=7
HOMEPAGE=https://launchpad.net/qpdfview
+INHERIT=l10n qmake-utils xdg
IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupd
REQUIRED_USE=?? ( fitz pdf )
SLOT=0
SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_p1.tar.bz2
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=83d8c5a3ca9e81270b21a6727845c3b5
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.0 b/metadata/md5-cache/app-text/scdoc-1.11.0
index 9c9921b58f74..21fad8edc732 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.0
+++ b/metadata/md5-cache/app-text/scdoc-1.11.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Standalone tool for generating man pages with a simple syntax
EAPI=7
HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm64 ~ppc64 x86
LICENSE=MIT
SLOT=0
SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.0.tar.gz -> scdoc-1.11.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=27b880b5aa07b881ca9e027f6cc95ee2
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.1 b/metadata/md5-cache/app-text/scdoc-1.11.1
index 39b47c8bf51d..97488a79c148 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Standalone tool for generating man pages with a simple syntax
EAPI=7
HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=MIT
SLOT=0
SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz -> scdoc-1.11.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1347d419f45ce808853eace34736697f
diff --git a/metadata/md5-cache/app-text/sloccount-2.26-r3 b/metadata/md5-cache/app-text/sloccount-2.26-r3
index 5fc54d4d4d25..4ee034e4a48e 100644
--- a/metadata/md5-cache/app-text/sloccount-2.26-r3
+++ b/metadata/md5-cache/app-text/sloccount-2.26-r3
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl
DESCRIPTION=Tools for counting Source Lines of Code (SLOC) for a large number of languages
EAPI=7
HOMEPAGE=http://www.dwheeler.com/sloccount/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8a056caa582bde5a3f3db48bf3672b76
diff --git a/metadata/md5-cache/app-text/tofrodos-1.7.13 b/metadata/md5-cache/app-text/tofrodos-1.7.13
index 7f1d674e8c11..725e0ac48dc8 100644
--- a/metadata/md5-cache/app-text/tofrodos-1.7.13
+++ b/metadata/md5-cache/app-text/tofrodos-1.7.13
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Utility that converts ASCII files between the MSDOS and the Unix format
EAPI=7
HOMEPAGE=http://tofrodos.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~hppa ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://tofrodos.sourceforge.net/download/tofrodos-1.7.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6caadc466ccc50338c8108db1fbef8f4
diff --git a/metadata/md5-cache/app-text/u2ps-1.2 b/metadata/md5-cache/app-text/u2ps-1.2
index 2751437822fe..3c78065d3ef1 100644
--- a/metadata/md5-cache/app-text/u2ps-1.2
+++ b/metadata/md5-cache/app-text/u2ps-1.2
@@ -4,10 +4,11 @@ DEPEND=app-text/ghostscript-gpl
DESCRIPTION=A text to PostScript converter like a2ps, but supports UTF-8
EAPI=7
HOMEPAGE=https://github.com/arsv/u2ps
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~x86
LICENSE=GPL-3
RDEPEND=app-text/ghostscript-gpl
SLOT=0
SRC_URI=https://github.com/arsv/u2ps/releases/download/1.2/u2ps-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9d241f4f4e476a6298ebfafb717c5bb0
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r2 b/metadata/md5-cache/app-text/wscr-1.2-r2
index 3d0e75e2e053..64c68112be60 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r2
+++ b/metadata/md5-cache/app-text/wscr-1.2-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A Lightweight and Fast Anagram Solver
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ppc x86
LICENSE=public-domain
RDEPEND=sys-apps/miscfiles
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8e0ae3b997e00a602af57a0995dc658f
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r6 b/metadata/md5-cache/app-text/xhtml1-20020801-r6
index 749af473ce3f..8225af8b22e8 100644
--- a/metadata/md5-cache/app-text/xhtml1-20020801-r6
+++ b/metadata/md5-cache/app-text/xhtml1-20020801-r6
@@ -3,6 +3,7 @@ DEPEND=app-text/sgml-common dev-libs/libxml2
DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
EAPI=7
HOMEPAGE=https://www.w3.org/TR/xhtml1/
+INHERIT=sgml-catalog-r1
KEYWORDS=amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=W3C
RDEPEND=>=app-text/sgml-common-0.6.3-r7
diff --git a/metadata/md5-cache/app-text/xhtml11-20101123 b/metadata/md5-cache/app-text/xhtml11-20101123
index 2383a7b0acdb..18eb1b41a28d 100644
--- a/metadata/md5-cache/app-text/xhtml11-20101123
+++ b/metadata/md5-cache/app-text/xhtml11-20101123
@@ -3,6 +3,7 @@ DEPEND=app-text/sgml-common dev-libs/libxml2
DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
EAPI=7
HOMEPAGE=http://www.w3.org/TR/xhtml11/
+INHERIT=sgml-catalog-r1
KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=W3C
RDEPEND=>=app-text/sgml-common-0.6.3-r7
diff --git a/metadata/md5-cache/app-text/xml2doc-20030510-r1 b/metadata/md5-cache/app-text/xml2doc-20030510-r1
index 7b404f672d5a..d5c955de9ee1 100644
--- a/metadata/md5-cache/app-text/xml2doc-20030510-r1
+++ b/metadata/md5-cache/app-text/xml2doc-20030510-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libxml2:2
DESCRIPTION=Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)
EAPI=7
HOMEPAGE=http://xml2doc.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=dev-libs/libxml2:2
SLOT=0
SRC_URI=mirror://sourceforge/xml2doc/xml2doc-20030510.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a0b139bb7e63182f6d05e721be791096
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2019-r1 b/metadata/md5-cache/dev-ada/gnatmem-2019-r1
index 6ca2efbf999a..59f28eb18b23 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnatmem-2019-r1
@@ -12,5 +12,5 @@ RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017?
REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
SLOT=0
SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089 -> gnatmem-2019-20190429-19745-src.tar.gz
-_eclasses_=ada f74396bdb52e86a692e8519a345ea27c multiprocessing cac3169468f893670dac3e7cb940e045 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=ada f74396bdb52e86a692e8519a345ea27c gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=6f138f524d2a45d9ba7ef037b6db7891
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2020 b/metadata/md5-cache/dev-ada/gnatmem-2020
index ad7c78ccee39..d79f33edecb7 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2020
+++ b/metadata/md5-cache/dev-ada/gnatmem-2020
@@ -12,5 +12,5 @@ RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017?
REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
SLOT=0
SRC_URI=https://community.download.adacore.com/v1/77354fedca0441f882e17b6a73ac5631bff26237?filename=gnatmem-2020-20200429-19911-src.tar.gz -> gnatmem-2020-20200429-19911-src.tar.gz
-_eclasses_=ada f74396bdb52e86a692e8519a345ea27c multiprocessing cac3169468f893670dac3e7cb940e045 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=ada f74396bdb52e86a692e8519a345ea27c gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=184cd2807208df6d6b165d62b719b977
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2017-r2 b/metadata/md5-cache/dev-ada/gprbuild-2017-r2
index 36d9fc334107..e217d8ebb32e 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2017-r2
+++ b/metadata/md5-cache/dev-ada/gprbuild-2017-r2
@@ -11,5 +11,5 @@ RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017?
REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 )
SLOT=0
SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> gprbuild-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2017-src.tar.gz
-_eclasses_=ada f74396bdb52e86a692e8519a345ea27c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045
+_eclasses_=ada f74396bdb52e86a692e8519a345ea27c multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=8d7487c79c3ad471ba55f24fa2a5fafa
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2020 b/metadata/md5-cache/dev-ada/gprbuild-2020
index 89680687d460..6cac67a00032 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2020
+++ b/metadata/md5-cache/dev-ada/gprbuild-2020
@@ -11,5 +11,5 @@ RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018?
REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
SLOT=0
SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
-_eclasses_=ada f74396bdb52e86a692e8519a345ea27c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045
+_eclasses_=ada f74396bdb52e86a692e8519a345ea27c multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=10fc6bb7cf9b07ba4ac86365451721e7
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2020-r1 b/metadata/md5-cache/dev-ada/gprbuild-2020-r1
index 1845cc608cea..dfd6d2ea2c31 100644
--- a/metadata/md5-cache/dev-ada/gprbuild-2020-r1
+++ b/metadata/md5-cache/dev-ada/gprbuild-2020-r1
@@ -11,5 +11,5 @@ RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018?
REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
SLOT=0
SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
-_eclasses_=ada f74396bdb52e86a692e8519a345ea27c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045
+_eclasses_=ada f74396bdb52e86a692e8519a345ea27c multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=90b94fc0c12c81f511d9e64d261d82f4
diff --git a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19 b/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19
index 967a98078644..ce1e6b077e16 100644
--- a/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19
+++ b/metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19
@@ -4,6 +4,7 @@ DEPEND=
DESCRIPTION=Common ODB runtime library
EAPI=7
HOMEPAGE=https://codesynthesis.com/products/odb/
+INHERIT=toolchain-funcs multiprocessing
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
@@ -11,5 +12,5 @@ RDEPEND=!<dev-util/build2-0.13.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-2.5.0-b.19.tar.gz https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=c5d03e15c5f3a0fabc26ab605778649e
diff --git a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19 b/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19
index d7a90f07a781..4773280a5511 100644
--- a/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19
+++ b/metadata/md5-cache/dev-cpp/libodb-sqlite-2.5.0_beta19
@@ -4,6 +4,7 @@ DEPEND=dev-cpp/libodb dev-db/sqlite:3
DESCRIPTION=Common ODB runtime library
EAPI=7
HOMEPAGE=https://codesynthesis.com/products/odb/
+INHERIT=toolchain-funcs multiprocessing
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=|| ( Code-Synthesis-ODB GPL-2 )
@@ -11,5 +12,5 @@ RDEPEND=dev-cpp/libodb dev-db/sqlite:3 !<dev-util/build2-0.13.0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://pkg.cppget.org/1/beta/odb/libodb-sqlite-2.5.0-b.19.tar.gz https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=d698976bbb0c29164edde50ddb1b06e7
diff --git a/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0 b/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0
index 2e6f44e314d5..ea619a590afe 100644
--- a/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0
+++ b/metadata/md5-cache/dev-cpp/libxsd-frontend-2.0.0
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/xerces-c-3.0.0 dev-libs/boost:=[threads] dev-cpp/libcutl >=dev
DESCRIPTION=A compiler frontend for the W3C XML Schema definition language
EAPI=6
HOMEPAGE=https://www.codesynthesis.com/projects/libxsd-frontend/
+INHERIT=toolchain-funcs versionator
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/xerces-c-3.0.0 dev-libs/boost:=[threads] dev-cpp/libcutl
SLOT=0
SRC_URI=https://www.codesynthesis.com/download/libxsd-frontend/2.0/libxsd-frontend-2.0.0.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=42486f1dbc9ca27b80eaa238745323c1
diff --git a/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2 b/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
index 08d264784681..17833da5a4f1 100644
--- a/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
+++ b/metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
@@ -3,6 +3,7 @@ DEPEND=dev-util/patchelf
DESCRIPTION=A cross-platform source explorer for C/C++ and Java
EAPI=7
HOMEPAGE=https://www.sourcetrail.com/
+INHERIT=desktop xdg-utils
IUSE=examples selinux
KEYWORDS=~amd64
LICENSE=Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD
diff --git a/metadata/md5-cache/dev-db/datadraw-3.1.1 b/metadata/md5-cache/dev-db/datadraw-3.1.1
index 5a1f2e9180e6..d82cbee07f72 100644
--- a/metadata/md5-cache/dev-db/datadraw-3.1.1
+++ b/metadata/md5-cache/dev-db/datadraw-3.1.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=feature rich database generator for high performance C applications
EAPI=7
HOMEPAGE=http://datadraw.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2
SLOT=0
SRC_URI=mirror://sourceforge/datadraw/datadraw/datadraw3.1.1/datadraw3.1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2bed0271b039ce2f99a51ad740945098
diff --git a/metadata/md5-cache/dev-db/go-etcd-2.0.0-r1 b/metadata/md5-cache/dev-db/go-etcd-2.0.0-r1
index d8658d207c8f..b5be651c94be 100644
--- a/metadata/md5-cache/dev-db/go-etcd-2.0.0-r1
+++ b/metadata/md5-cache/dev-db/go-etcd-2.0.0-r1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/go-1.4:=
DESCRIPTION=Go client library for etcd
EAPI=5
HOMEPAGE=https://github.com/coreos/go-etcd
+INHERIT=vcs-clean
KEYWORDS=~amd64
LICENSE=Apache-2.0
SLOT=0
diff --git a/metadata/md5-cache/dev-db/libzdb-3.1-r1 b/metadata/md5-cache/dev-db/libzdb-3.1-r1
index ff74971c4a6e..dab95faab2f0 100644
--- a/metadata/md5-cache/dev-db/libzdb-3.1-r1
+++ b/metadata/md5-cache/dev-db/libzdb-3.1-r1
@@ -3,6 +3,7 @@ DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* )
DESCRIPTION=A thread safe high level multi-database connection pool library
EAPI=6
HOMEPAGE=https://www.tildeslash.com/libzdb/
+INHERIT=toolchain-funcs
IUSE=debug doc mysql postgres +sqlite ssl static-libs
KEYWORDS=amd64 x86
LICENSE=GPL-3
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( postgres mysql sqlite )
RESTRICT=test
SLOT=0
SRC_URI=https://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=96c56461433574fa63eb1ef8978aeb8c
diff --git a/metadata/md5-cache/dev-db/libzdb-3.2.2 b/metadata/md5-cache/dev-db/libzdb-3.2.2
index 434064a3fbdd..f1121ddbd3a6 100644
--- a/metadata/md5-cache/dev-db/libzdb-3.2.2
+++ b/metadata/md5-cache/dev-db/libzdb-3.2.2
@@ -3,6 +3,7 @@ DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* )
DESCRIPTION=A thread safe high level multi-database connection pool library
EAPI=6
HOMEPAGE=https://www.tildeslash.com/libzdb/
+INHERIT=toolchain-funcs
IUSE=debug doc mysql postgres +sqlite ssl static-libs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( postgres mysql sqlite )
RESTRICT=test
SLOT=0
SRC_URI=https://www.tildeslash.com/libzdb/dist/libzdb-3.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d31dc393c071fd99108ad0d40d37a6f5
diff --git a/metadata/md5-cache/dev-db/rqlite-5.10.2 b/metadata/md5-cache/dev-db/rqlite-5.10.2
index 3f4bb324b46c..4cb5927c5222 100644
--- a/metadata/md5-cache/dev-db/rqlite-5.10.2
+++ b/metadata/md5-cache/dev-db/rqlite-5.10.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=Replicated SQLite using the Raft consensus protocol
EAPI=7
HOMEPAGE=https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/
+INHERIT=go-module
KEYWORDS=~amd64 ~x86
LICENSE=MIT BSD MPL-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-db/tinycdb-0.77-r2 b/metadata/md5-cache/dev-db/tinycdb-0.77-r2
index 5321a92b8fdd..97c038107303 100644
--- a/metadata/md5-cache/dev-db/tinycdb-0.77-r2
+++ b/metadata/md5-cache/dev-db/tinycdb-0.77-r2
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A very fast and simple package for creating and reading constant data bases
EAPI=6
HOMEPAGE=http://www.corpit.ru/mjt/tinycdb.html
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~mips ppc x86
LICENSE=public-domain
@@ -9,5 +10,5 @@ RDEPEND=!dev-db/cdb
RESTRICT=test
SLOT=0
SRC_URI=http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ed9a2fd5657bed7e3a05577ca4dbc417
diff --git a/metadata/md5-cache/dev-db/tinycdb-0.78 b/metadata/md5-cache/dev-db/tinycdb-0.78
index a6508940f7ef..d7055c859af0 100644
--- a/metadata/md5-cache/dev-db/tinycdb-0.78
+++ b/metadata/md5-cache/dev-db/tinycdb-0.78
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A very fast and simple package for creating and reading constant data bases
EAPI=7
HOMEPAGE=http://www.corpit.ru/mjt/tinycdb.html
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~x86
LICENSE=public-domain
@@ -9,5 +10,5 @@ RDEPEND=!dev-db/cdb
RESTRICT=test
SLOT=0
SRC_URI=http://www.corpit.ru/mjt/tinycdb/tinycdb-0.78.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cd33526d7aec570e94ef8ec0d74f7398
diff --git a/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1 b/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
index 1042d30f3b93..1c0dd4f753ca 100644
--- a/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A command line tool for compiling Arduino sketches
EAPI=7
HOMEPAGE=https://github.com/arduino/arduino-builder
+INHERIT=go-module
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
diff --git a/metadata/md5-cache/dev-embedded/avra-1.4.2 b/metadata/md5-cache/dev-embedded/avra-1.4.2
index f418e5a9b77d..ab3f52fc2b4a 100644
--- a/metadata/md5-cache/dev-embedded/avra-1.4.2
+++ b/metadata/md5-cache/dev-embedded/avra-1.4.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Atmel AVR Assembler
EAPI=7
HOMEPAGE=https://github.com/hsoft/avra
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/hsoft/avra/archive/1.4.2.tar.gz -> avra-1.4.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=780521fe07d7d096d7e62d43941dfcb5
diff --git a/metadata/md5-cache/dev-embedded/avrdude-6.3 b/metadata/md5-cache/dev-embedded/avrdude-6.3
index fc20d1ea6fb2..b4883808f6ba 100644
--- a/metadata/md5-cache/dev-embedded/avrdude-6.3
+++ b/metadata/md5-cache/dev-embedded/avrdude-6.3
@@ -3,11 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurse
DESCRIPTION=AVR Downloader/UploaDEr
EAPI=6
HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
+INHERIT=toolchain-funcs
IUSE=doc ftdi ncurses readline
KEYWORDS=amd64 arm ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
SLOT=0
SRC_URI=mirror://nongnu/avrdude/avrdude-6.3.tar.gz doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9e8591e523f9b737e3271b18ff6802e0
diff --git a/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4 b/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
index eebf5ee12cc3..68234e2cbd2f 100644
--- a/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
+++ b/metadata/md5-cache/dev-embedded/cpik-0.7.4_p4
@@ -3,9 +3,10 @@ DEPEND=dev-qt/qtcore:5
DESCRIPTION=C compiler for PIC18 devices
EAPI=7
HOMEPAGE=http://pikdev.free.fr/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://pikdev.free.fr/cpik-0.7.4-4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=1c0ef92ed2424462981bee3e4528ff1b
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
index 4c65be316204..6b6cb0ffd489 100644
--- a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
+++ b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
@@ -3,10 +3,11 @@ DEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev virtual/pkgconfig virtua
DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
EAPI=6
HOMEPAGE=http://dfu-programmer.sourceforge.net
+INHERIT=toolchain-funcs udev
KEYWORDS=amd64 arm
LICENSE=GPL-2
RDEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev
SLOT=0
SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=67e56e93cfe998e1cd06360898fefb1e
diff --git a/metadata/md5-cache/dev-embedded/gputils-1.5.0 b/metadata/md5-cache/dev-embedded/gputils-1.5.0
index 83b6782c85d8..8e3fb083fe50 100644
--- a/metadata/md5-cache/dev-embedded/gputils-1.5.0
+++ b/metadata/md5-cache/dev-embedded/gputils-1.5.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Tools including assembler, linker and librarian for PIC microcontrollers
EAPI=6
HOMEPAGE=https://gputils.sourceforge.io
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/gputils/gputils-1.5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e8b47d83bc5a7971e0e84f52a230d0c4
diff --git a/metadata/md5-cache/dev-embedded/icdprog-0.5 b/metadata/md5-cache/dev-embedded/icdprog-0.5
index 9711a3c70a8f..c0d19d6951ba 100644
--- a/metadata/md5-cache/dev-embedded/icdprog-0.5
+++ b/metadata/md5-cache/dev-embedded/icdprog-0.5
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install postinst
DESCRIPTION=Microchip PIC Programmer using ICD hardware
EAPI=7
HOMEPAGE=http://icdprog.sf.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/icdprog/icdprog-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cf2df2f89abb0e66fa5cfdc847f00aa9
diff --git a/metadata/md5-cache/dev-embedded/libdisasm-0.23 b/metadata/md5-cache/dev-embedded/libdisasm-0.23
index 8bc14996bf74..4497585446f6 100644
--- a/metadata/md5-cache/dev-embedded/libdisasm-0.23
+++ b/metadata/md5-cache/dev-embedded/libdisasm-0.23
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Provides basic disassembly of Intel x86 instructions from a binary stream
EAPI=7
HOMEPAGE=http://bastard.sourceforge.net/libdisasm.html
+INHERIT=toolchain-funcs
KEYWORDS=-* ~amd64 ~x86
LICENSE=Clarified-Artistic
SLOT=0
SRC_URI=mirror://sourceforge/project/bastard/libdisasm/0.23/libdisasm-0.23.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2dc4d73da6d8a6dffa8ce6e85ad19a04
diff --git a/metadata/md5-cache/dev-embedded/lpc21isp-1.85 b/metadata/md5-cache/dev-embedded/lpc21isp-1.85
index c69656bb01e8..b966b190f938 100644
--- a/metadata/md5-cache/dev-embedded/lpc21isp-1.85
+++ b/metadata/md5-cache/dev-embedded/lpc21isp-1.85
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=In-circuit programming (ISP) tool for the NXP microcontrollers
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/lpc21isp/
+INHERIT=versionator
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3
SLOT=0
diff --git a/metadata/md5-cache/dev-embedded/mspdebug-0.25 b/metadata/md5-cache/dev-embedded/mspdebug-0.25
index 2f2d292bc94c..d78ebc8af908 100644
--- a/metadata/md5-cache/dev-embedded/mspdebug-0.25
+++ b/metadata/md5-cache/dev-embedded/mspdebug-0.25
@@ -3,11 +3,12 @@ DEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
DESCRIPTION=A free debugger for use with MSP430 MCUs
EAPI=6
HOMEPAGE=https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug
+INHERIT=toolchain-funcs
IUSE=readline
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
SLOT=0
SRC_URI=https://github.com/dlbeer/mspdebug/archive/v0.25.tar.gz -> mspdebug-0.25.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1d0a80edf5f7861d29014bedad0d8492
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1 b/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
index 6471eac668c8..9e3f5878f2f5 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
@@ -4,6 +4,7 @@ DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi
DESCRIPTION=OpenOCD - Open On-Chip Debugger
EAPI=7
HOMEPAGE=http://openocd.sourceforge.net
+INHERIT=udev
IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidap
RESTRICT=strip
SLOT=0
SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=6d843acca0696a67447d4b4d71924c6e
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.5.0 b/metadata/md5-cache/dev-embedded/parapin-1.5.0
index b5522a54ac8e..dddc73453f1f 100644
--- a/metadata/md5-cache/dev-embedded/parapin-1.5.0
+++ b/metadata/md5-cache/dev-embedded/parapin-1.5.0
@@ -3,10 +3,11 @@ DEPEND=doc? ( dev-tex/latex2html )
DESCRIPTION=A parallel port pin programming library
EAPI=7
HOMEPAGE=http://parapin.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://sourceforge/parapin/parapin-1.5.0.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ba71857dd3d029b17e3012ea2e795d79
diff --git a/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1 b/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1
index 88336a19bf79..8aaaebe5f223 100644
--- a/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1
+++ b/metadata/md5-cache/dev-embedded/parapin-1.5.1_beta1
@@ -3,10 +3,11 @@ DEPEND=doc? ( dev-tex/latex2html )
DESCRIPTION=A parallel port pin programming library
EAPI=7
HOMEPAGE=http://parapin.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://sourceforge/parapin/parapin-1.5.1-beta1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c3b8d3823640b64068ea3793d6f3d7e5
diff --git a/metadata/md5-cache/dev-embedded/picasm-1.14 b/metadata/md5-cache/dev-embedded/picasm-1.14
index cf9cc2dba505..154f450b3bc8 100644
--- a/metadata/md5-cache/dev-embedded/picasm-1.14
+++ b/metadata/md5-cache/dev-embedded/picasm-1.14
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=An assembler and disassembler for 12 and 14-bit PIC chips
EAPI=7
HOMEPAGE=http://www.iki.fi/trossi/pic/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=MIT
SLOT=0
SRC_URI=http://www.iki.fi/trossi/pic/picasm114.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a81ce73e65f3a987164110c469999123
diff --git a/metadata/md5-cache/dev-embedded/picp-0.6.8 b/metadata/md5-cache/dev-embedded/picp-0.6.8
index afc6da483462..6da8b05c5ae9 100644
--- a/metadata/md5-cache/dev-embedded/picp-0.6.8
+++ b/metadata/md5-cache/dev-embedded/picp-0.6.8
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=A commandline interface to Microchip's PICSTART+ programmer
EAPI=7
HOMEPAGE=http://home.pacbell.net/theposts/picmicro/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://home.pacbell.net/theposts/picmicro/picp-0.6.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=eff9ae0f15e2a494e2961570b197722b
diff --git a/metadata/md5-cache/dev-embedded/picprog-1.9.1 b/metadata/md5-cache/dev-embedded/picprog-1.9.1
index 757df7031a2a..a81e1e81eb2e 100644
--- a/metadata/md5-cache/dev-embedded/picprog-1.9.1
+++ b/metadata/md5-cache/dev-embedded/picprog-1.9.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port
EAPI=7
HOMEPAGE=http://www.iki.fi/hyvatti/pic/picprog.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://www.iki.fi/hyvatti/pic/picprog-1.9.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d2f45d94d10b75765e0b62d252740097
diff --git a/metadata/md5-cache/dev-embedded/stm32flash-0.5 b/metadata/md5-cache/dev-embedded/stm32flash-0.5
index d0ac7313db31..34d139c42514 100644
--- a/metadata/md5-cache/dev-embedded/stm32flash-0.5
+++ b/metadata/md5-cache/dev-embedded/stm32flash-0.5
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Open source flash program for STM32 using the ST serial bootloader
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/stm32flash/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://sourceforge/project/stm32flash/stm32flash-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0962d41d8f5491dca02e485d88c091bf
diff --git a/metadata/md5-cache/dev-embedded/xa-2.3.10 b/metadata/md5-cache/dev-embedded/xa-2.3.10
index 9b7d29bb3cd7..0e9b24effea2 100644
--- a/metadata/md5-cache/dev-embedded/xa-2.3.10
+++ b/metadata/md5-cache/dev-embedded/xa-2.3.10
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install test
DESCRIPTION=High-speed, two-pass portable 6502 cross-assembler
EAPI=7
HOMEPAGE=https://www.floodgap.com/retrotech/xa/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.floodgap.com/retrotech/xa/dists/xa-2.3.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3c80da0699f3150fd87044bed1bbab80
diff --git a/metadata/md5-cache/dev-embedded/zmac-1.3-r1 b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
index bce4bb2f92e9..8b4073752703 100644
--- a/metadata/md5-cache/dev-embedded/zmac-1.3-r1
+++ b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Z80 macro cross-assembler
EAPI=7
HOMEPAGE=https://www.tim-mann.org/trs80resources.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
SLOT=0
SRC_URI=https://www.tim-mann.org/trs80/zmac13.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=14ef42bd4e387d7e7cb6dc6a5a0e69fc
diff --git a/metadata/md5-cache/dev-erlang/base64url-1.0.1 b/metadata/md5-cache/dev-erlang/base64url-1.0.1
index bf9d4d06c862..254889d1d669 100644
--- a/metadata/md5-cache/dev-erlang/base64url-1.0.1
+++ b/metadata/md5-cache/dev-erlang/base64url-1.0.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=URL safe base64-compatible codec
EAPI=6
HOMEPAGE=https://github.com/dvv/base64url
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.23 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.23
index 18612070e407..773d092ef626 100644
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.23
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.23
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:= dev
DESCRIPTION=In-memory cache Erlang and Elixir library
EAPI=6
HOMEPAGE=https://github.com/processone/cache_tab
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.25 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.25
index a6064d43f4ca..55698c002738 100644
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.25
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.25
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev
DESCRIPTION=In-memory cache Erlang and Elixir library
EAPI=6
HOMEPAGE=https://github.com/processone/cache_tab
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/eimp-1.0.15 b/metadata/md5-cache/dev-erlang/eimp-1.0.15
index 5aa32ad91ff3..651419e2aca0 100644
--- a/metadata/md5-cache/dev-erlang/eimp-1.0.15
+++ b/metadata/md5-cache/dev-erlang/eimp-1.0.15
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 media-libs/gd[png,jpe
DESCRIPTION=Erlang Image Manipulation Process
EAPI=6
HOMEPAGE=https://github.com/processone/eimp
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 media-libs/gd[png,jpeg,webp] dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/eimp-1.0.17 b/metadata/md5-cache/dev-erlang/eimp-1.0.17
index 069c8c254a05..89fd5309522a 100644
--- a/metadata/md5-cache/dev-erlang/eimp-1.0.17
+++ b/metadata/md5-cache/dev-erlang/eimp-1.0.17
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 media-libs/gd[png,jpe
DESCRIPTION=Erlang Image Manipulation Process
EAPI=6
HOMEPAGE=https://github.com/processone/eimp
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 media-libs/gd[png,jpeg,webp] dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/eredis-1.0.8 b/metadata/md5-cache/dev-erlang/eredis-1.0.8
index fe4b1279d429..bc4da67acce1 100644
--- a/metadata/md5-cache/dev-erlang/eredis-1.0.8
+++ b/metadata/md5-cache/dev-erlang/eredis-1.0.8
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Erlang Redis client
EAPI=6
HOMEPAGE=https://github.com/wooga/eredis
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/eredis-1.2.0 b/metadata/md5-cache/dev-erlang/eredis-1.2.0
index 42aabf0bbb2f..cb991b5509ed 100644
--- a/metadata/md5-cache/dev-erlang/eredis-1.2.0
+++ b/metadata/md5-cache/dev-erlang/eredis-1.2.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Erlang Redis client
EAPI=6
HOMEPAGE=https://github.com/wooga/eredis
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=MIT
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.34 b/metadata/md5-cache/dev-erlang/esip-1.0.34
index caa7255cabb9..9ad16dbe0328 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.34
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.34
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/fast_tls-1.1.6 >=dev-erlang/stun-1.0.33 >=dev-erlang/p1_util
DESCRIPTION=ProcessOne SIP server component
EAPI=6
HOMEPAGE=https://github.com/processone/esip
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/fast_tls-1.1.6 >=dev-erlang/stun-1.0.33 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.37 b/metadata/md5-cache/dev-erlang/esip-1.0.37
index 695bf576789e..f97b5febbf55 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.37
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.37
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/stun-1.0.37 >=dev-erlang/p1_util
DESCRIPTION=ProcessOne SIP server component
EAPI=6
HOMEPAGE=https://github.com/processone/esip
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/stun-1.0.37 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.7 b/metadata/md5-cache/dev-erlang/ezlib-1.0.7
index edb8f9f21d8a..dc0225d35f71 100644
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.7
+++ b/metadata/md5-cache/dev-erlang/ezlib-1.0.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:= dev-util/rebar >
DESCRIPTION=Native zlib driver for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/ezlib
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.8 b/metadata/md5-cache/dev-erlang/ezlib-1.0.8
index df910643edee..bc505755300a 100644
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.8
+++ b/metadata/md5-cache/dev-erlang/ezlib-1.0.8
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:= dev-util/rebar >
DESCRIPTION=Native zlib driver for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/ezlib
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.41 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.41
index e669a45f0057..af8601e7a5aa 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.41
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.41
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/p1_utils-1.0.19 dev-libs/expat dev-lang/erlang:= dev-util/re
DESCRIPTION=Fast Expat based Erlang XML parsing library
EAPI=6
HOMEPAGE=https://github.com/processone/fast_xml
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/p1_utils-1.0.19 dev-libs/expat dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.43 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.43
index e05fbdac5883..7d35c678fd27 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.43
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.43
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/p1_utils-1.0.20 dev-libs/expat dev-lang/erlang:= dev-util/re
DESCRIPTION=Fast Expat based Erlang XML parsing library
EAPI=6
HOMEPAGE=https://github.com/processone/fast_xml
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/p1_utils-1.0.20 dev-libs/expat dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.25 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.25
index bd9b7cd1266e..8e78bf2de1f7 100644
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.25
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.25
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-18.0 >=dev-erlang/p1_utils-1.0.19 dev-libs/libyaml dev-
DESCRIPTION=Fast Yaml native library for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/fast_yaml
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-18.0 >=dev-erlang/p1_utils-1.0.19 dev-libs/libyaml dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.27 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.27
index a06e6af68f0a..e96d77362c73 100644
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.27
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.27
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/p1_utils-1.0.20 dev-libs/libyaml dev-lang/erlang:= dev-util/
DESCRIPTION=Fast Yaml native library for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/fast_yaml
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/p1_utils-1.0.20 dev-libs/libyaml dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/goldrush-0.1.9 b/metadata/md5-cache/dev-erlang/goldrush-0.1.9
index 2932da046eec..b1f611ae7beb 100644
--- a/metadata/md5-cache/dev-erlang/goldrush-0.1.9
+++ b/metadata/md5-cache/dev-erlang/goldrush-0.1.9
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Small Erlang app that provides fast event stream processing
EAPI=6
HOMEPAGE=https://github.com/DeadZen/goldrush
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=ISC
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/goldrush-0.2.0 b/metadata/md5-cache/dev-erlang/goldrush-0.2.0
index 9ee503cd2a13..7c6ccf5daad1 100644
--- a/metadata/md5-cache/dev-erlang/goldrush-0.2.0
+++ b/metadata/md5-cache/dev-erlang/goldrush-0.2.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Small Erlang app that provides fast event stream processing
EAPI=6
HOMEPAGE=https://github.com/DeadZen/goldrush
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=ISC
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709 b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
index 3d062d9e6349..9fbadb0ff151 100644
--- a/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
+++ b/metadata/md5-cache/dev-erlang/hamcrest-0.1.0_p20160709
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/proper-1.2 ) dev-lang/erlang:
DESCRIPTION=Erlang port of Hamcrest
EAPI=6
HOMEPAGE=https://github.com/hyperthunk/hamcrest-erlang
+INHERIT=rebar
IUSE=test
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=BSD
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.10 b/metadata/md5-cache/dev-erlang/iconv-1.0.10
index 636d74d79a45..7cce5e0ec9ab 100644
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.10
+++ b/metadata/md5-cache/dev-erlang/iconv-1.0.10
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-
DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/iconv
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/idna-6.0.0 b/metadata/md5-cache/dev-erlang/idna-6.0.0
index 2390e4a8e8c2..35c4b761f93c 100644
--- a/metadata/md5-cache/dev-erlang/idna-6.0.0
+++ b/metadata/md5-cache/dev-erlang/idna-6.0.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-21.0 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Erlang IDNA implementation
EAPI=6
HOMEPAGE=https://github.com/benoitc/erlang-idna
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.11 b/metadata/md5-cache/dev-erlang/jiffy-0.14.11
index 15b0ea7532c3..6f0ba89136cc 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.11
+++ b/metadata/md5-cache/dev-erlang/jiffy-0.14.11
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=JSON NIFs for Erlang
EAPI=6
HOMEPAGE=https://github.com/davisp/jiffy
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.9 b/metadata/md5-cache/dev-erlang/jiffy-0.14.9
index cdbe00ab718f..26a7b2ed452a 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.9
+++ b/metadata/md5-cache/dev-erlang/jiffy-0.14.9
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=JSON NIFs for Erlang
EAPI=6
HOMEPAGE=https://github.com/davisp/jiffy
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jiffy-1.0.1 b/metadata/md5-cache/dev-erlang/jiffy-1.0.1
index 3324258d7ff2..88ae9fee149b 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-1.0.1
+++ b/metadata/md5-cache/dev-erlang/jiffy-1.0.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=JSON NIFs for Erlang
EAPI=6
HOMEPAGE=https://github.com/davisp/jiffy
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=MIT BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jiffy-1.0.4 b/metadata/md5-cache/dev-erlang/jiffy-1.0.4
index 9f8f18546086..2ec748349ab3 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-1.0.4
+++ b/metadata/md5-cache/dev-erlang/jiffy-1.0.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=JSON NIFs for Erlang
EAPI=6
HOMEPAGE=https://github.com/davisp/jiffy
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=MIT BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jiffy-1.0.5 b/metadata/md5-cache/dev-erlang/jiffy-1.0.5
index 3fa729897205..276e5c00c488 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-1.0.5
+++ b/metadata/md5-cache/dev-erlang/jiffy-1.0.5
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=JSON NIFs for Erlang
EAPI=6
HOMEPAGE=https://github.com/davisp/jiffy
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jose-1.10.1 b/metadata/md5-cache/dev-erlang/jose-1.10.1
index 4d3964e44fad..26076bb190f0 100644
--- a/metadata/md5-cache/dev-erlang/jose-1.10.1
+++ b/metadata/md5-cache/dev-erlang/jose-1.10.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-19.0 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=JSON Object Signing and Encryption (JOSE) for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/potatosalad/erlang-jose
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/erlang-19.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/jose-1.9.0 b/metadata/md5-cache/dev-erlang/jose-1.9.0
index 7ac93715c2a6..f95de22b3e98 100644
--- a/metadata/md5-cache/dev-erlang/jose-1.9.0
+++ b/metadata/md5-cache/dev-erlang/jose-1.9.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-19.0 >=dev-erlang/base64url-1.0 dev-lang/erlang:= dev-u
DESCRIPTION=JSON Object Signing and Encryption (JOSE) for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/potatosalad/erlang-jose
+INHERIT=rebar
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=>=dev-lang/erlang-19.0 >=dev-erlang/base64url-1.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.4 b/metadata/md5-cache/dev-erlang/lager-3.2.4
index d6fc9b4ac887..eebe4dad777a 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.2.4
+++ b/metadata/md5-cache/dev-erlang/lager-3.2.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-17.1 dev-lang/erlang:= dev-
DESCRIPTION=Logging framework for Erlang/OTP
EAPI=6
HOMEPAGE=https://github.com/basho/lager
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/lager-3.8.0 b/metadata/md5-cache/dev-erlang/lager-3.8.0
index 550f7dc6cdfe..1cf7bc77f69c 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.8.0
+++ b/metadata/md5-cache/dev-erlang/lager-3.8.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-20.0 dev-lang/erlang:= dev-
DESCRIPTION=Logging framework for Erlang/OTP
EAPI=6
HOMEPAGE=https://github.com/erlang-lager/lager
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-20.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/lager-3.8.1 b/metadata/md5-cache/dev-erlang/lager-3.8.1
index 0ebd65aacd3e..9d2c2c249a0d 100644
--- a/metadata/md5-cache/dev-erlang/lager-3.8.1
+++ b/metadata/md5-cache/dev-erlang/lager-3.8.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/goldrush-0.1.9 dev-lang/erlang:= dev-util/rebar >=sys-apps/g
DESCRIPTION=Logging framework for Erlang/OTP
EAPI=6
HOMEPAGE=https://github.com/erlang-lager/lager
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/goldrush-0.1.9 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/luerl-0.2 b/metadata/md5-cache/dev-erlang/luerl-0.2
index 429e8d296f6e..aae8a2a5df0a 100644
--- a/metadata/md5-cache/dev-erlang/luerl-0.2
+++ b/metadata/md5-cache/dev-erlang/luerl-0.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Lua in Erlang
EAPI=6
HOMEPAGE=https://github.com/rvirding/luerl
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/luerl-0.3 b/metadata/md5-cache/dev-erlang/luerl-0.3
index aa0eae1f44c4..974ec24af79b 100644
--- a/metadata/md5-cache/dev-erlang/luerl-0.3
+++ b/metadata/md5-cache/dev-erlang/luerl-0.3
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Lua in Erlang
EAPI=6
HOMEPAGE=https://github.com/rvirding/luerl
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.12 b/metadata/md5-cache/dev-erlang/meck-0.8.12
index 864be5d04933..4ef893f97621 100644
--- a/metadata/md5-cache/dev-erlang/meck-0.8.12
+++ b/metadata/md5-cache/dev-erlang/meck-0.8.12
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/hamcrest-0.1.0_p20150103 ) de
DESCRIPTION=Mocking library for Erlang
EAPI=6
HOMEPAGE=https://github.com/eproxus/meck
+INHERIT=rebar
IUSE=test
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.13 b/metadata/md5-cache/dev-erlang/meck-0.8.13
index 6c3aa2516e9b..1cf2f2f27ded 100644
--- a/metadata/md5-cache/dev-erlang/meck-0.8.13
+++ b/metadata/md5-cache/dev-erlang/meck-0.8.13
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Mocking library for Erlang
EAPI=6
HOMEPAGE=https://github.com/eproxus/meck
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.4 b/metadata/md5-cache/dev-erlang/meck-0.8.4
index b0b3226fd634..2c8cac1ebd32 100644
--- a/metadata/md5-cache/dev-erlang/meck-0.8.4
+++ b/metadata/md5-cache/dev-erlang/meck-0.8.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/hamcrest-0.1.0_p20150103 ) de
DESCRIPTION=Mocking library for Erlang
EAPI=6
HOMEPAGE=https://github.com/eproxus/meck
+INHERIT=rebar
IUSE=test
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
diff --git a/metadata/md5-cache/dev-erlang/mqtree-1.0.10 b/metadata/md5-cache/dev-erlang/mqtree-1.0.10
index b5b16ee54f56..a775c63c588b 100644
--- a/metadata/md5-cache/dev-erlang/mqtree-1.0.10
+++ b/metadata/md5-cache/dev-erlang/mqtree-1.0.10
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev
DESCRIPTION=Index tree for MQTT topic filters
EAPI=6
HOMEPAGE=https://github.com/processone/mqtree
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/mqtree-1.0.7 b/metadata/md5-cache/dev-erlang/mqtree-1.0.7
index b96120a24610..0e753f711f51 100644
--- a/metadata/md5-cache/dev-erlang/mqtree-1.0.7
+++ b/metadata/md5-cache/dev-erlang/mqtree-1.0.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.18 dev-lang/erlang:= dev
DESCRIPTION=Index tree for MQTT topic filters
EAPI=6
HOMEPAGE=https://github.com/processone/mqtree
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.18 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_acme-1.0.5 b/metadata/md5-cache/dev-erlang/p1_acme-1.0.5
index 49a5aef1566d..55afa5d7c24e 100644
--- a/metadata/md5-cache/dev-erlang/p1_acme-1.0.5
+++ b/metadata/md5-cache/dev-erlang/p1_acme-1.0.5
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.1 >=dev-erlang/yconf-1.0.4
DESCRIPTION=ACME client library for Erlang
EAPI=6
HOMEPAGE=https://github.com/processone/p1_acme
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.1 >=dev-erlang/yconf-1.0.4 >=dev-erlang/idna-6.0.0 >=dev-erlang/jose-1.9.0 >=dev-erlang/base64url-1.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_acme-1.0.8 b/metadata/md5-cache/dev-erlang/p1_acme-1.0.8
index 32dbb33a121c..9e015035682d 100644
--- a/metadata/md5-cache/dev-erlang/p1_acme-1.0.8
+++ b/metadata/md5-cache/dev-erlang/p1_acme-1.0.8
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/yconf-1.0.7
DESCRIPTION=ACME client library for Erlang
EAPI=6
HOMEPAGE=https://github.com/processone/p1_acme
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/yconf-1.0.7 >=dev-erlang/idna-6.0.0 >=dev-erlang/jose-1.9.0 >=dev-erlang/base64url-1.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.15 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.15
index 0b681ea8368e..da3e3096e424 100644
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.15
+++ b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.15
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Pure Erlang MySQL driver
EAPI=6
HOMEPAGE=https://github.com/processone/p1_mysql
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.16 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.16
index 4f0fdd9541da..10ca00d92150 100644
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.16
+++ b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.16
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Pure Erlang MySQL driver
EAPI=6
HOMEPAGE=https://github.com/processone/p1_mysql
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=BSD
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.6 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.6
index c0ff0d632abc..0960343ce8f2 100644
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.6
+++ b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.6
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.7 >=dev-erlang/prope
DESCRIPTION=Erlang OAuth 2.0 implementation
EAPI=6
HOMEPAGE=https://github.com/processone/p1_oauth2
+INHERIT=rebar
IUSE=test
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=MIT
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7
index 3216a6876192..88992b283685 100644
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7
+++ b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.7 >=dev-erlang/prope
DESCRIPTION=Erlang OAuth 2.0 implementation
EAPI=6
HOMEPAGE=https://github.com/processone/p1_oauth2
+INHERIT=rebar
IUSE=test
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=MIT
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10
index f32259439c70..361bc66f4176 100644
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10
+++ b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Pure Erlang PostgreSQL driver
EAPI=6
HOMEPAGE=https://github.com/processone/p1_pgsql
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=ErlPL-1.1
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.9 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.9
index 029d8873af94..645c3267ab2d 100644
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.9
+++ b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.9
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Pure Erlang PostgreSQL driver
EAPI=6
HOMEPAGE=https://github.com/processone/p1_pgsql
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=ErlPL-1.1
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.19 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.19
index b2ee7ec14f39..d5222c253e0c 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.19
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.19
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk
DESCRIPTION=Erlang utility modules from ProcessOne
EAPI=6
HOMEPAGE=https://github.com/processone/p1_utils
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.20 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.20
index 53da4ca9af27..50f6277859cc 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.20
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.20
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk
DESCRIPTION=Erlang utility modules from ProcessOne
EAPI=6
HOMEPAGE=https://github.com/processone/p1_utils
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1 b/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1
index 4b4253254372..5696c4480762 100644
--- a/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1
+++ b/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=Erlang XMLRPC implementation with SSL, cookies, authentication
EAPI=6
HOMEPAGE=https://github.com/processone/p1_xmlrpc
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=BSD-2
RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/pkix-1.0.5 b/metadata/md5-cache/dev-erlang/pkix-1.0.5
index e941ff10b8ac..cd95a0b4247a 100644
--- a/metadata/md5-cache/dev-erlang/pkix-1.0.5
+++ b/metadata/md5-cache/dev-erlang/pkix-1.0.5
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.5 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4
DESCRIPTION=PKIX certificates management library for Erlang
EAPI=6
HOMEPAGE=https://github.com/processone/pkix
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.5 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/pkix-1.0.6 b/metadata/md5-cache/dev-erlang/pkix-1.0.6
index d07403e0f6ed..04d9f30a50b4 100644
--- a/metadata/md5-cache/dev-erlang/pkix-1.0.6
+++ b/metadata/md5-cache/dev-erlang/pkix-1.0.6
@@ -3,6 +3,7 @@ DEPEND=dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
DESCRIPTION=PKIX certificates management library for Erlang
EAPI=6
HOMEPAGE=https://github.com/processone/pkix
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/proper-1.2 b/metadata/md5-cache/dev-erlang/proper-1.2
index 3d3021f41b25..abdb81883688 100644
--- a/metadata/md5-cache/dev-erlang/proper-1.2
+++ b/metadata/md5-cache/dev-erlang/proper-1.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk
DESCRIPTION=QuickCheck-inspired property-based testing tool for Erlang
EAPI=6
HOMEPAGE=https://github.com/manopapad/proper
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=GPL-3
RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/proper-1.3 b/metadata/md5-cache/dev-erlang/proper-1.3
index fb2079ee7d26..2fb5d50386ac 100644
--- a/metadata/md5-cache/dev-erlang/proper-1.3
+++ b/metadata/md5-cache/dev-erlang/proper-1.3
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk
DESCRIPTION=QuickCheck-inspired property-based testing tool for Erlang
EAPI=6
HOMEPAGE=https://github.com/manopapad/proper
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=GPL-3
RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0 b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
index 81d327505f57..70aead727ac8 100644
--- a/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
+++ b/metadata/md5-cache/dev-erlang/protobuffs-0.9.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.2 >=dev-erlang/prope
DESCRIPTION=Google's Protocol Buffers for Erlang
EAPI=6
HOMEPAGE=https://github.com/basho/erlang_protobuffs
+INHERIT=rebar
IUSE=test
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2 b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
index 7319eee77298..550c3ce53394 100644
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
+++ b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev
DESCRIPTION=Riak Protocol Buffers messages
EAPI=6
HOMEPAGE=https://github.com/basho/riak_pb
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/riakc-2.4.2 b/metadata/md5-cache/dev-erlang/riakc-2.4.2
index 01befea2de98..960972bc327f 100644
--- a/metadata/md5-cache/dev-erlang/riakc-2.4.2
+++ b/metadata/md5-cache/dev-erlang/riakc-2.4.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/riak_pb-2.1.4.2 >=dev-lang/erlang-17.1 dev-lang/erlang:= dev
DESCRIPTION=Erlang clients for Riak
EAPI=6
HOMEPAGE=https://github.com/basho/riak-erlang-client
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/riak_pb-2.1.4.2 >=dev-lang/erlang-17.1 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/sqlite3-1.1.7 b/metadata/md5-cache/dev-erlang/sqlite3-1.1.7
index 2b182d87bed2..a41a304215b1 100644
--- a/metadata/md5-cache/dev-erlang/sqlite3-1.1.7
+++ b/metadata/md5-cache/dev-erlang/sqlite3-1.1.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:= dev-util/rebar >
DESCRIPTION=SQLite gen_server port for Erlang
EAPI=6
HOMEPAGE=https://github.com/processone/erlang-sqlite3
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=ErlPL-1.1
RDEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/sqlite3-1.1.8 b/metadata/md5-cache/dev-erlang/sqlite3-1.1.8
index d3df1acce3df..b51c22a1605e 100644
--- a/metadata/md5-cache/dev-erlang/sqlite3-1.1.8
+++ b/metadata/md5-cache/dev-erlang/sqlite3-1.1.8
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:= dev-util/rebar >
DESCRIPTION=SQLite gen_server port for Erlang
EAPI=6
HOMEPAGE=https://github.com/processone/erlang-sqlite3
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=ErlPL-1.1
RDEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.20 b/metadata/md5-cache/dev-erlang/stringprep-1.0.20
index 3c55adbc20ed..f781edb8abf4 100644
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.20
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.20
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:= dev
DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/stringprep
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0 tcltk
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.22 b/metadata/md5-cache/dev-erlang/stringprep-1.0.22
index 1840a4f0fbe5..f9af98d41028 100644
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.22
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.22
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev
DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/stringprep
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0 tcltk
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.33 b/metadata/md5-cache/dev-erlang/stun-1.0.33
index aa950cb905da..f4fca9d4b46a 100644
--- a/metadata/md5-cache/dev-erlang/stun-1.0.33
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.33
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/fast_tls-1.1.6 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:
DESCRIPTION=STUN and TURN library for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/stun
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=BSD
RDEPEND=>=dev-erlang/fast_tls-1.1.6 >=dev-erlang/p1_utils-1.0.19 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.38 b/metadata/md5-cache/dev-erlang/stun-1.0.38
index e87742cd433c..adfe79814da7 100644
--- a/metadata/md5-cache/dev-erlang/stun-1.0.38
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.38
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:
DESCRIPTION=STUN and TURN library for Erlang and Elixir
EAPI=6
HOMEPAGE=https://github.com/processone/stun
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=BSD
RDEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.4.7 b/metadata/md5-cache/dev-erlang/xmpp-1.4.7
index 283ba52a4a8c..b762dd44922f 100644
--- a/metadata/md5-cache/dev-erlang/xmpp-1.4.7
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.4.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/ezlib-1.0.7 >=dev-erlang/fast_tls-1.1.6 >=dev-erlang/fast_xm
DESCRIPTION=XMPP parsing and serialization library on top of Fast XML
EAPI=6
HOMEPAGE=https://github.com/processone/xmpp
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/ezlib-1.0.7 >=dev-erlang/fast_tls-1.1.6 >=dev-erlang/fast_xml-1.1.41 >=dev-erlang/p1_utils-1.0.19 >=dev-erlang/stringprep-1.0.19 >=dev-erlang/idna-6.0.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.4.9 b/metadata/md5-cache/dev-erlang/xmpp-1.4.9
index 36178e7ccc57..c1adc6a64bff 100644
--- a/metadata/md5-cache/dev-erlang/xmpp-1.4.9
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.4.9
@@ -3,6 +3,7 @@ DEPEND=>=dev-erlang/ezlib-1.0.8 >=dev-erlang/fast_tls-1.1.8 >=dev-erlang/fast_xm
DESCRIPTION=XMPP parsing and serialization library on top of Fast XML
EAPI=6
HOMEPAGE=https://github.com/processone/xmpp
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-erlang/ezlib-1.0.8 >=dev-erlang/fast_tls-1.1.8 >=dev-erlang/fast_xml-1.1.43 >=dev-erlang/p1_utils-1.0.20 >=dev-erlang/stringprep-1.0.22 >=dev-erlang/idna-6.0.0 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/yconf-1.0.1 b/metadata/md5-cache/dev-erlang/yconf-1.0.1
index dedecedc69eb..e41f3a8418a3 100644
--- a/metadata/md5-cache/dev-erlang/yconf-1.0.1
+++ b/metadata/md5-cache/dev-erlang/yconf-1.0.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.21 dev-lang/erlang:= de
DESCRIPTION=YAML configuration processor
EAPI=6
HOMEPAGE=https://github.com/processone/yconf
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.21 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/yconf-1.0.4 b/metadata/md5-cache/dev-erlang/yconf-1.0.4
index ef65ae0182f6..b2807b4bf351 100644
--- a/metadata/md5-cache/dev-erlang/yconf-1.0.4
+++ b/metadata/md5-cache/dev-erlang/yconf-1.0.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.24 dev-lang/erlang:= de
DESCRIPTION=YAML configuration processor
EAPI=6
HOMEPAGE=https://github.com/processone/yconf
+INHERIT=rebar
KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.24 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-erlang/yconf-1.0.7 b/metadata/md5-cache/dev-erlang/yconf-1.0.7
index 0862cbdc28ff..4808abfbb9c9 100644
--- a/metadata/md5-cache/dev-erlang/yconf-1.0.7
+++ b/metadata/md5-cache/dev-erlang/yconf-1.0.7
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.27 dev-lang/erlang:= de
DESCRIPTION=YAML configuration processor
EAPI=6
HOMEPAGE=https://github.com/processone/yconf
+INHERIT=rebar
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.27 dev-lang/erlang:=
diff --git a/metadata/md5-cache/dev-games/hawknl-1.68-r3 b/metadata/md5-cache/dev-games/hawknl-1.68-r3
index e5043814cbcc..44c2d35a4216 100644
--- a/metadata/md5-cache/dev-games/hawknl-1.68-r3
+++ b/metadata/md5-cache/dev-games/hawknl-1.68-r3
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=A cross-platform network library designed for games
EAPI=7
HOMEPAGE=http://www.hawksoft.com/hawknl/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=amd64 ~hppa x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://www.sonic.net/~philf/download/HawkNL168src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=741c16dd6bcfca9f2439e1df0762bde6
diff --git a/metadata/md5-cache/dev-games/irrlicht-headers-1.8.4 b/metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
index b29424d0b539..0cc3fabda660 100644
--- a/metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
+++ b/metadata/md5-cache/dev-games/irrlicht-headers-1.8.4
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=Irrlicht 3D engine headers
EAPI=7
HOMEPAGE=http://irrlicht.sourceforge.net/
+INHERIT=edos2unix
KEYWORDS=amd64 x86
LICENSE=ZLIB
RDEPEND=!<dev-games/irrlicht-1.8.4-r1
diff --git a/metadata/md5-cache/dev-games/libnw-1.30.02 b/metadata/md5-cache/dev-games/libnw-1.30.02
index 6a153b113213..692bd3a44548 100644
--- a/metadata/md5-cache/dev-games/libnw-1.30.02
+++ b/metadata/md5-cache/dev-games/libnw-1.30.02
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Tools and libraries for NWN file manipulation
EAPI=7
HOMEPAGE=http://openknights.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=openknights
RDEPEND=!sci-biology/newick-utils
SLOT=0
SRC_URI=mirror://sourceforge/openknights/libnw-1.30.02.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e50ca3acc94e7bd5e9f58a07948ac4b1
diff --git a/metadata/md5-cache/dev-games/mygui-3.2.2 b/metadata/md5-cache/dev-games/mygui-3.2.2
index fbcfc262972b..38b2a98b02e8 100644
--- a/metadata/md5-cache/dev-games/mygui-3.2.2
+++ b/metadata/md5-cache/dev-games/mygui-3.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=ogre? ( !opengl ) opengl? ( !ogre )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/MyGUI/mygui/archive/MyGUI3.2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f flag-o-matic bc2e7662a4a9a8643be851982a837ddc xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8
_md5_=e229947e95c196944f6afefbc49d5e31
diff --git a/metadata/md5-cache/dev-games/paklib-0.3 b/metadata/md5-cache/dev-games/paklib-0.3
index 610a79005598..f469cb626bc8 100644
--- a/metadata/md5-cache/dev-games/paklib-0.3
+++ b/metadata/md5-cache/dev-games/paklib-0.3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=library for accessing Quake pak files
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/paklib/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/paklib/pak-0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4758aa5e2db2469026d1cc4ca15d584f
diff --git a/metadata/md5-cache/dev-go/fuzzy-0.0.5 b/metadata/md5-cache/dev-go/fuzzy-0.0.5
index 2da7da88f9c0..fbde878c3e4b 100644
--- a/metadata/md5-cache/dev-go/fuzzy-0.0.5
+++ b/metadata/md5-cache/dev-go/fuzzy-0.0.5
@@ -10,5 +10,5 @@ LICENSE=MIT
RESTRICT=strip !test? ( test )
SLOT=0/0.0.5
SRC_URI=https://github.com/sahilm/fuzzy/archive/v0.0.5.tar.gz -> fuzzy-0.0.5.tar.gz
-_eclasses_=golang-base b8fb27dacacea08140c53857f439fc7d golang-vcs-snapshot ff485cabd3f37b060f110b0be95092ec golang-build 91472d4e18894e738c69b415e236a664
+_eclasses_=golang-base b8fb27dacacea08140c53857f439fc7d golang-build 91472d4e18894e738c69b415e236a664 golang-vcs-snapshot ff485cabd3f37b060f110b0be95092ec
_md5_=44f9c71d514719f3550fb03cc2eef62b
diff --git a/metadata/md5-cache/dev-go/get-ego-vendor-0.2.0 b/metadata/md5-cache/dev-go/get-ego-vendor-0.2.0
index e3b66db15cfa..31078a4655a4 100644
--- a/metadata/md5-cache/dev-go/get-ego-vendor-0.2.0
+++ b/metadata/md5-cache/dev-go/get-ego-vendor-0.2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Utility to generate EGO_SUM data for ebuilds
EAPI=7
HOMEPAGE=https://github.com/williamh/get-ego-vendor
+INHERIT=go-module
KEYWORDS=amd64 ~ppc64
LICENSE=BSD
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/go-bindata-3.1.3 b/metadata/md5-cache/dev-go/go-bindata-3.1.3
index cef2f367d2a9..0fbffafaeb14 100644
--- a/metadata/md5-cache/dev-go/go-bindata-3.1.3
+++ b/metadata/md5-cache/dev-go/go-bindata-3.1.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A small utility which generates Go code from any file
EAPI=7
HOMEPAGE=https://github.com/go-bindata/go-bindata
+INHERIT=go-module
KEYWORDS=amd64 ~arm ~arm64 ~ppc64
LICENSE=CC-PD
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/go-license-detector-3.1.0 b/metadata/md5-cache/dev-go/go-license-detector-3.1.0
index 3f2c1e4cfc1a..94360f260886 100644
--- a/metadata/md5-cache/dev-go/go-license-detector-3.1.0
+++ b/metadata/md5-cache/dev-go/go-license-detector-3.1.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Scan a source directory and report the license
EAPI=7
HOMEPAGE=https://github.com/src-d/go-license-detector
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT ISC
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/go-licenses-0_pre20200511 b/metadata/md5-cache/dev-go/go-licenses-0_pre20200511
index 1e7b137d904a..ea296ad9e67d 100644
--- a/metadata/md5-cache/dev-go/go-licenses-0_pre20200511
+++ b/metadata/md5-cache/dev-go/go-licenses-0_pre20200511
@@ -4,6 +4,7 @@ DEPEND=dev-go/licenseclassifier
DESCRIPTION=Reports on the licenses used by a Go package and its dependencies
EAPI=7
HOMEPAGE=https://github.com/google/go-licenses
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 MIT BSD BSD-2
RDEPEND=dev-go/licenseclassifier
diff --git a/metadata/md5-cache/dev-go/go-md2man-2.0.0 b/metadata/md5-cache/dev-go/go-md2man-2.0.0
index f378535c5353..2e48e99bcf41 100644
--- a/metadata/md5-cache/dev-go/go-md2man-2.0.0
+++ b/metadata/md5-cache/dev-go/go-md2man-2.0.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=A utility to convert markdown to man pages
EAPI=7
HOMEPAGE=https://github.com/cpuguy83/go-md2man
+INHERIT=go-module
KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
LICENSE=BSD-2 MIT
RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-go/go-tour-0_pre20200201 b/metadata/md5-cache/dev-go/go-tour-0_pre20200201
index 9a7b5d57c381..21cdd905d803 100644
--- a/metadata/md5-cache/dev-go/go-tour-0_pre20200201
+++ b/metadata/md5-cache/dev-go/go-tour-0_pre20200201
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=A Tour of Go
EAPI=7
HOMEPAGE=https://tour.golang.org
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD Apache-2.0 MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/golicense-0.2.0 b/metadata/md5-cache/dev-go/golicense-0.2.0
index b502544b2965..ddb0d319c658 100644
--- a/metadata/md5-cache/dev-go/golicense-0.2.0
+++ b/metadata/md5-cache/dev-go/golicense-0.2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=detect licenses used in Go binaries
EAPI=7
HOMEPAGE=https://github.com/mitchellh/golicense
+INHERIT=go-module
KEYWORDS=~amd64 ~ppc64
LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/golint-0_pre20200301 b/metadata/md5-cache/dev-go/golint-0_pre20200301
index c6c48ae19313..b81fbaadcdad 100644
--- a/metadata/md5-cache/dev-go/golint-0_pre20200301
+++ b/metadata/md5-cache/dev-go/golint-0_pre20200301
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=a linter for Go
EAPI=7
HOMEPAGE=https://github.com/golang/lint
+INHERIT=go-module
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/gox-1.0.1 b/metadata/md5-cache/dev-go/gox-1.0.1
index f9f05cea4dbf..72db671df090 100644
--- a/metadata/md5-cache/dev-go/gox-1.0.1
+++ b/metadata/md5-cache/dev-go/gox-1.0.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A dead simple, no frills Go cross compile tool
EAPI=7
HOMEPAGE=https://github.com/mitchellh/gox
+INHERIT=go-module
KEYWORDS=amd64
LICENSE=MPL-2.0
RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-go/licenseclassifier-0_pre20200402 b/metadata/md5-cache/dev-go/licenseclassifier-0_pre20200402
index d1975d3b673e..dd4d752c13a5 100644
--- a/metadata/md5-cache/dev-go/licenseclassifier-0_pre20200402
+++ b/metadata/md5-cache/dev-go/licenseclassifier-0_pre20200402
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare test unpack
DESCRIPTION=A set of tools that analyzes text to determine type of license
EAPI=7
HOMEPAGE=https://github.com/google/licenseclassifier
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-go/qt-0_pre20200904-r1 b/metadata/md5-cache/dev-go/qt-0_pre20200904-r1
index d96d533eb89c..15852f57947b 100644
--- a/metadata/md5-cache/dev-go/qt-0_pre20200904-r1
+++ b/metadata/md5-cache/dev-go/qt-0_pre20200904-r1
@@ -4,6 +4,7 @@ DEPEND=dev-qt/designer:5= dev-qt/qt-docs:5=[html] dev-qt/qtbluetooth:5= dev-qt/q
DESCRIPTION=Qt5 Go bindings
EAPI=7
HOMEPAGE=https://github.com/therecipe/qt/
+INHERIT=go-module xdg-utils
KEYWORDS=~amd64
LICENSE=LGPL-3+
RDEPEND=dev-qt/designer:5= dev-qt/qt-docs:5=[html] dev-qt/qtbluetooth:5= dev-qt/qtcharts:5= dev-qt/qtcore:5= dev-qt/qtdatavis3d:5= dev-qt/qtdbus:5= dev-qt/qtgamepad:5= dev-qt/qthelp:5= dev-qt/qtlocation:5= dev-qt/qtmultimedia:5=[widgets] dev-qt/qtpositioning:5= dev-qt/qtquickcontrols2:5= dev-qt/qtscxml:5= dev-qt/qtsensors:5= dev-qt/qtserialbus:5= dev-qt/qtserialport:5= dev-qt/qtspeech:5= dev-qt/qtsql:5= dev-qt/qtsvg:5= dev-qt/qtvirtualkeyboard:5= dev-qt/qtwebchannel:5= dev-qt/qtwebengine:5= dev-qt/qtwebsockets:5= dev-qt/qtwebview:5=
diff --git a/metadata/md5-cache/dev-java/android-util-4.1.1.4 b/metadata/md5-cache/dev-java/android-util-4.1.1.4
index ab2e94d750f0..8f26ff9f60ae 100644
--- a/metadata/md5-cache/dev-java/android-util-4.1.1.4
+++ b/metadata/md5-cache/dev-java/android-util-4.1.1.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xpp3:0 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=http://central.maven.org/maven2/com/google/android/android/4.1.1.4/android-4.1.1.4-sources.jar
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=fee43c2327f774ac3e3222a715707194
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
index b1db9fae6205..6ef082b19fd4 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=5b84eb615eaf4fc275b5cbf35d5bd751
diff --git a/metadata/md5-cache/dev-java/batik-1.9 b/metadata/md5-cache/dev-java/batik-1.9
index 59aa12667b53..09255984164e 100644
--- a/metadata/md5-cache/dev-java/batik-1.9
+++ b/metadata/md5-cache/dev-java/batik-1.9
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
SLOT=1.9
SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=338e256f593ff733b6548dbe496b7a81
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r2 b/metadata/md5-cache/dev-java/byaccj-1.15-r2
index d6901961fa4c..718c514c414e 100644
--- a/metadata/md5-cache/dev-java/byaccj-1.15-r2
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A java extension of BSD YACC-compatible parser generator
EAPI=7
HOMEPAGE=http://byaccj.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=184b19a4c5d7dfdbb6b5f8884deb8462
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
index 862d944b96f9..7acdd132b3c5 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-coll
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=5a16d407129f4ee525c3e9ca54ad6cb0
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index 68eaa343e239..ddb7f845d28d 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=e39d999c61c6f1a87873b82806d074b4
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
index c24a02466a01..fb1d12454049 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
@@ -11,5 +11,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.5.1 )
RDEPEND=app-eselect/eselect-java >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=4.5
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=51b052d6d74153f2dccb029a59c90883
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.4.0 b/metadata/md5-cache/dev-java/edtftpj-2.4.0
index 9358df7e4799..045fa2bda375 100644
--- a/metadata/md5-cache/dev-java/edtftpj-2.4.0
+++ b/metadata/md5-cache/dev-java/edtftpj-2.4.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.4.0.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=8eb3cbbf462ada706d084ad2e15383c9
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
index 2fe16cb3e753..ac8ec423276e 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.2
SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=d7cc952bdade3ab476bdf21bdbb01484
diff --git a/metadata/md5-cache/dev-java/javacsv-2.1 b/metadata/md5-cache/dev-java/javacsv-2.1
index d0e9270ca43a..9524011f72cd 100644
--- a/metadata/md5-cache/dev-java/javacsv-2.1
+++ b/metadata/md5-cache/dev-java/javacsv-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/javacsv/javacsv2.1.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=25c76f0667c0e65afb56e8887f9208f1
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index 277002157137..8145fad403cf 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0?
RESTRICT=test
SLOT=0
SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=4befef6dba193f639b0f1cf514477f1c
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index f5a28f2585e8..e4496937d715 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=ae646125e171c4267a46024d7af5d1a0
diff --git a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1 b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
index afb4c5b694da..e0a587bb8633 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
+++ b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.1
SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-2.1.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=4714b5f1df8880e9936254ab9b3ddd05
diff --git a/metadata/md5-cache/dev-java/jfreesvg-3.0 b/metadata/md5-cache/dev-java/jfreesvg-3.0
index 2e7a6c402585..39be0191e940 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-3.0
+++ b/metadata/md5-cache/dev-java/jfreesvg-3.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-3.0.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=71f1073b7bef0f744d89970c79856ecd
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
index 3da7d76694ea..bcc1a3cf3d1a 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=test
SLOT=1.8
SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=f92f43970c38260f147bda10babfbc98
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
index 06da9fc055d6..17083b874500 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.2
SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=118dd3ef6cf8284fc3d00e89082c6fff
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
index dc2c3ac9774e..5a53bd50d9ba 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=2.0
SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=2272214f1ba3d9f95b395a413c546676
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index ef44ac5059ef..11a83dd08b7a 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=5001cd1685f984d1b167ab43934d8fd2
diff --git a/metadata/md5-cache/dev-java/jlex-1.2.6-r2 b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
index 81303b41eb1b..f3b1c951748d 100644
--- a/metadata/md5-cache/dev-java/jlex-1.2.6-r2
+++ b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
@@ -10,5 +10,5 @@ LICENSE=jlex
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
_md5_=6ec6a4f37825efba362de9ccc7dcd322
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
index f32644a9e39c..0bc95161434c 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/junit:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sourc
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=6e33e4d45c078704d9a755658b782eb1
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
index 0fd3f6195722..8d75ff21c623 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.6
+++ b/metadata/md5-cache/dev-java/metainf-services-1.6
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=6e92fec7a8b8f14f72930580076fb96a
diff --git a/metadata/md5-cache/dev-java/milton-api-2.7.1.3 b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
index 84535c6baf91..39c11a5fbb45 100644
--- a/metadata/md5-cache/dev-java/milton-api-2.7.1.3
+++ b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://milton.io/maven/io/milton/milton-api/2.7.1.3/milton-api-2.7.1.3-sources.jar
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=d4b3c84f8f717269c5ecf3079bba222a
diff --git a/metadata/md5-cache/dev-java/mojarra-2.2.12-r1 b/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
index 775c73bf70b7..75e2f7ce87c8 100644
--- a/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
+++ b/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
@@ -10,5 +10,5 @@ LICENSE=CDDL
RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0-r3
SLOT=2.2
SRC_URI=https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.12/javax.faces-2.2.12-sources.jar
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=02497fc8ad9a9255f5946dcddbf4904f
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
index 4308f12a36c8..e720bf68d61f 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=fc005ec780604720b069a2105a3ffc34
diff --git a/metadata/md5-cache/dev-java/pat-1.5.3-r1 b/metadata/md5-cache/dev-java/pat-1.5.3-r1
index 429c60fb2890..51a32a5a7984 100644
--- a/metadata/md5-cache/dev-java/pat-1.5.3-r1
+++ b/metadata/md5-cache/dev-java/pat-1.5.3-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.javaregex.com/binaries/patsrcfree153.jar -> pat-1.5.3.jar
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=13ef8c83cf82ec6e93afdf568e9685d1
diff --git a/metadata/md5-cache/dev-java/rundoc-0.11-r1 b/metadata/md5-cache/dev-java/rundoc-0.11-r1
index 7b3ef945f65b..682d87b2b655 100644
--- a/metadata/md5-cache/dev-java/rundoc-0.11-r1
+++ b/metadata/md5-cache/dev-java/rundoc-0.11-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.martiansoftware.com/lab/rundoc/rundoc-0.11-src.zip -> rundoc-0.11.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=694e02a2f7709a4394726e016c7e9edb
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
index ca797af577cd..227ac0a3dfbe 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r2
@@ -10,5 +10,5 @@ LICENSE=MPL-1.0
RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/dom4j:1 dev-java/ant-core >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=9
SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=0c7279830e1c335ece40179bf7e44fac
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index 0bedacc99dfb..de2479764a94 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ b/metadata/md5-cache/dev-java/skinlf-6.7-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=464072f0b55189a5247512d28c7edae6
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index 7c349f443759..6bf3f5bb4913 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r1
+++ b/metadata/md5-cache/dev-java/spin-1.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 sourc
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=8bfd524ca4facefc1b00aa755c67ad78
diff --git a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1 b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
index 9b037eafd666..a95322984714 100644
--- a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=82a9f02e3eedce4440695da8f3bccd6e
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
index 2b01b9bb10c0..ba9f37f6d1ba 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
_md5_=5699e38d2e5b0f2c257e078ebbc31fa7
diff --git a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1 b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
index ac81726f8e99..3304787aaa2d 100644
--- a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
+++ b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 >=virtual/jre-1.6 >=dev-java
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/santuario/java-library/1_5_7/xml-security-bin-1_5_7.zip
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=8caf44943f683c01379a032e26553917
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index 03d85490479a..1415b3c2eaf3 100644
--- a/metadata/md5-cache/dev-java/xmlrpc-3.1.3
+++ b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/commons-codec:0
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3
SRC_URI=https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-3.1.3-src.tar.bz2 https://dev.gentoo.org/~ercpe/distfiles/dev-java/xmlrpc/xmlrpc-3.1.3-build.tar.gz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
_md5_=d4505da5368b09057275021d438d142d
diff --git a/metadata/md5-cache/dev-lang/duktape-2.5.0-r1 b/metadata/md5-cache/dev-lang/duktape-2.5.0-r1
index e1e184fb08d7..ea19aab10d43 100644
--- a/metadata/md5-cache/dev-lang/duktape-2.5.0-r1
+++ b/metadata/md5-cache/dev-lang/duktape-2.5.0-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Embeddable Javascript engine
EAPI=7
HOMEPAGE=https://duktape.org
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
LICENSE=MIT
SLOT=0
diff --git a/metadata/md5-cache/dev-lang/duktape-2.6.0 b/metadata/md5-cache/dev-lang/duktape-2.6.0
index 0b4df686f480..a998a3520ab4 100644
--- a/metadata/md5-cache/dev-lang/duktape-2.6.0
+++ b/metadata/md5-cache/dev-lang/duktape-2.6.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm arm64 ppc ppc64 x86
LICENSE=MIT
SLOT=0/2.6.0
SRC_URI=https://duktape.org/duktape-2.6.0.tar.xz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=49f4f2cfe724ca2c09afdf6d1aba894d
diff --git a/metadata/md5-cache/dev-lang/execline-2.3.0.3 b/metadata/md5-cache/dev-lang/execline-2.3.0.3
index abc3efaf832c..6513babca86e 100644
--- a/metadata/md5-cache/dev-lang/execline-2.3.0.3
+++ b/metadata/md5-cache/dev-lang/execline-2.3.0.3
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.1[static-libs] )
DESCRIPTION=a non-interactive scripting language
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/execline/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/dev-lang/execline-2.3.0.4 b/metadata/md5-cache/dev-lang/execline-2.3.0.4
index e9eb4b93ee35..e72ba4a44d3f 100644
--- a/metadata/md5-cache/dev-lang/execline-2.3.0.4
+++ b/metadata/md5-cache/dev-lang/execline-2.3.0.4
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.2.0[static-libs] )
DESCRIPTION=a non-interactive scripting language
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/execline/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/dev-lang/f2c-20100827-r1 b/metadata/md5-cache/dev-lang/f2c-20100827-r1
index 1ee3ed52da49..b483ba7ada93 100644
--- a/metadata/md5-cache/dev-lang/f2c-20100827-r1
+++ b/metadata/md5-cache/dev-lang/f2c-20100827-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Fortran to C converter
EAPI=7
HOMEPAGE=https://www.netlib.org/f2c
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=HPND
RDEPEND=>=dev-libs/libf2c-20130927-r1
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.4 b/metadata/md5-cache/dev-lang/fpc-3.0.4
index 2196fb1d34e1..9592597d781a 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.4
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.4
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend unpack
DESCRIPTION=Free Pascal Compiler
EAPI=5
HOMEPAGE=https://www.freepascal.org/
+INHERIT=prefix toolchain-funcs
IUSE=doc ide source
KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
@@ -9,5 +10,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
RESTRICT=strip
SLOT=0
SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.4.tar.gz mirror://sourceforge/freepascal/fpc-3.0.4.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.4.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.4.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.4/doc-html.tar.gz -> fpc-3.0.4-doc-html.tar.gz )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=13813cbedf96fc53c9776f81760fdcab
diff --git a/metadata/md5-cache/dev-lang/jwasm-2.13 b/metadata/md5-cache/dev-lang/jwasm-2.13
index 983bb2fada9c..8642cb529984 100644
--- a/metadata/md5-cache/dev-lang/jwasm-2.13
+++ b/metadata/md5-cache/dev-lang/jwasm-2.13
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=MASM-compatible TASM-similar assembler (fork of Wasm)
EAPI=7
HOMEPAGE=https://github.com/JWasm/JWasm
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=Watcom-1.0
SLOT=0
SRC_URI=https://github.com/JWasm/JWasm/archive/2.13.tar.gz -> jwasm-2.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0898ef8f7d1099aac016625f7ad948a5
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.8.4-r2 b/metadata/md5-cache/dev-lang/lazarus-1.8.4-r2
index c51310085b8a..6de15f0d8668 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.8.4-r2
+++ b/metadata/md5-cache/dev-lang/lazarus-1.8.4-r2
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/fpc-3.0.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/b
DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
EAPI=6
HOMEPAGE=https://www.lazarus-ide.org/
+INHERIT=desktop
IUSE=minimal python
KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
diff --git a/metadata/md5-cache/dev-lang/lazarus-2.0.6 b/metadata/md5-cache/dev-lang/lazarus-2.0.6
index 89563b75ee52..6ccdb1a2c522 100644
--- a/metadata/md5-cache/dev-lang/lazarus-2.0.6
+++ b/metadata/md5-cache/dev-lang/lazarus-2.0.6
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/fpc-3.0.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/b
DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
EAPI=7
HOMEPAGE=https://www.lazarus-ide.org/
+INHERIT=desktop
IUSE=minimal
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
diff --git a/metadata/md5-cache/dev-lang/lfe-1.1.1 b/metadata/md5-cache/dev-lang/lfe-1.1.1
index 438139001fec..0e84bfce49fb 100644
--- a/metadata/md5-cache/dev-lang/lfe-1.1.1
+++ b/metadata/md5-cache/dev-lang/lfe-1.1.1
@@ -3,6 +3,7 @@ DEPEND=dev-lang/erlang
DESCRIPTION=Lisp-flavoured Erlang
EAPI=5
HOMEPAGE=http://lfe.github.io/
+INHERIT=multilib
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=dev-lang/erlang
diff --git a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2 b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
index 7ea217721283..2366cd58a878 100644
--- a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
+++ b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
RDEPEND=vim-syntax? ( app-editors/vim ) emacs? ( >=app-editors/emacs-23.1:* )
SLOT=0
SRC_URI=http://isaacproject.u-strasbg.fr/download/lisaac-0.13.1.tar.gz
-_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=869b91654ce56a5adce08ce0c225679a
diff --git a/metadata/md5-cache/dev-lang/micropython-1.11 b/metadata/md5-cache/dev-lang/micropython-1.11
index dff18445db8c..3258bd6b46db 100644
--- a/metadata/md5-cache/dev-lang/micropython-1.11
+++ b/metadata/md5-cache/dev-lang/micropython-1.11
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libffi virtual/pkgconfig
DESCRIPTION=Python implementation for microcontrollers
EAPI=6
HOMEPAGE=https://github.com/micropython/micropython
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/micropython/micropython/releases/download/v1.11/micropython-1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1e733fb7508f19283e98b4185907f20a
diff --git a/metadata/md5-cache/dev-lang/mmix-20160804-r1 b/metadata/md5-cache/dev-lang/mmix-20160804-r1
index a5817c6680be..adbac4548400 100644
--- a/metadata/md5-cache/dev-lang/mmix-20160804-r1
+++ b/metadata/md5-cache/dev-lang/mmix-20160804-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/tex-base doc? ( dev-texlive/texlive-plaingeneric )
DESCRIPTION=Donald Knuth's MMIX Assembler and Simulator
EAPI=7
HOMEPAGE=https://www-cs-faculty.stanford.edu/~knuth/mmix.html http://mmix.cs.hm.edu
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=amd64 x86
LICENSE=mmix
diff --git a/metadata/md5-cache/dev-lang/snobol-1.4.1-r1 b/metadata/md5-cache/dev-lang/snobol-1.4.1-r1
index 827c6bedfff2..69b4abe99fa7 100644
--- a/metadata/md5-cache/dev-lang/snobol-1.4.1-r1
+++ b/metadata/md5-cache/dev-lang/snobol-1.4.1-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/gdbm[berkdb]
DESCRIPTION=Phil Budne's port of Macro SNOBOL4 in C, for modern machines
EAPI=7
HOMEPAGE=http://www.snobol4.org/csnobol4/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=sys-libs/gdbm[berkdb]
SLOT=0
SRC_URI=ftp://ftp.snobol4.org/snobol/old/snobol4-1.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1df8dcad21446e561dec333e07ab6785
diff --git a/metadata/md5-cache/dev-lang/srf-1.0-r2 b/metadata/md5-cache/dev-lang/srf-1.0-r2
index 0a2261e2ed4b..ce01acdf39ec 100644
--- a/metadata/md5-cache/dev-lang/srf-1.0-r2
+++ b/metadata/md5-cache/dev-lang/srf-1.0-r2
@@ -3,6 +3,7 @@ DEPEND=sys-devel/flex virtual/yacc
DESCRIPTION=The Simple Recursive Functions programming language
EAPI=6
HOMEPAGE=http://www.stratigery.com/srf.html
+INHERIT=vcs-clean
KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.0 b/metadata/md5-cache/dev-lang/swig-4.0.0
index 707ee0bb5361..f398d4fec97e 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.0
+++ b/metadata/md5-cache/dev-lang/swig-4.0.0
@@ -11,5 +11,5 @@ RDEPEND=pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/swig/swig-4.0.0.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=d224942edeb86ee42bbb500267b8ebda
diff --git a/metadata/md5-cache/dev-lang/swig-4.0.2 b/metadata/md5-cache/dev-lang/swig-4.0.2
index b6a48a45ca98..5602e527ccb8 100644
--- a/metadata/md5-cache/dev-lang/swig-4.0.2
+++ b/metadata/md5-cache/dev-lang/swig-4.0.2
@@ -11,5 +11,5 @@ RDEPEND=virtual/pkgconfig pcre? ( dev-libs/libpcre ) ccache? ( sys-libs/zlib )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/swig/swig-4.0.2.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=6f4a45478f740a779127d1e88a419ad6
diff --git a/metadata/md5-cache/dev-lang/tcc-0.9.27 b/metadata/md5-cache/dev-lang/tcc-0.9.27
index 06938bad2ce9..48b193a15ce0 100644
--- a/metadata/md5-cache/dev-lang/tcc-0.9.27
+++ b/metadata/md5-cache/dev-lang/tcc-0.9.27
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl
DESCRIPTION=A very small C compiler for ix86/amd64
EAPI=6
HOMEPAGE=https://bellard.org/tcc/
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=LGPL-2.1
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.27.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6f6b350099fe11e517755b91cb1731c7
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1-r1 b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
index ec94c22223f2..5caa60ecb87c 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1-r1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* )
SLOT=0/2.1
SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=elisp-common 6bfea130fc0f2cbd4cbc23dc12992349 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b34cd250fa85ef4700126e4c3d3f4372
diff --git a/metadata/md5-cache/dev-lang/yasm-1.3.0-r1 b/metadata/md5-cache/dev-lang/yasm-1.3.0-r1
index 96e1478adaa3..c8642037ca5b 100644
--- a/metadata/md5-cache/dev-lang/yasm-1.3.0-r1
+++ b/metadata/md5-cache/dev-lang/yasm-1.3.0-r1
@@ -4,11 +4,12 @@ DEPEND=nls? ( virtual/libintl )
DESCRIPTION=An assembler for x86 and x86_64 instruction sets
EAPI=7
HOMEPAGE=https://yasm.tortall.net/
+INHERIT=toolchain-funcs
IUSE=nls
KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
RDEPEND=nls? ( virtual/libintl )
SLOT=0
SRC_URI=https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=005830e3335ba9de86fb74e82e997a08
diff --git a/metadata/md5-cache/dev-libs/argtable-2.13-r1 b/metadata/md5-cache/dev-libs/argtable-2.13-r1
index 6947568c225d..1520e22991eb 100644
--- a/metadata/md5-cache/dev-libs/argtable-2.13-r1
+++ b/metadata/md5-cache/dev-libs/argtable-2.13-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=configure install
DESCRIPTION=An ANSI C library for parsing GNU-style command-line options with minimal fuss
EAPI=6
HOMEPAGE=http://argtable.sourceforge.net/
+INHERIT=versionator
IUSE=doc debug examples static-libs
KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 sparc x86
LICENSE=LGPL-2
diff --git a/metadata/md5-cache/dev-libs/bcm2835-1.68 b/metadata/md5-cache/dev-libs/bcm2835-1.68
index ee041d6520fe..c30af7f8cc59 100644
--- a/metadata/md5-cache/dev-libs/bcm2835-1.68
+++ b/metadata/md5-cache/dev-libs/bcm2835-1.68
@@ -3,10 +3,11 @@ DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=Provides access to GPIO and other IO functions on the Broadcom BCM2835
EAPI=6
HOMEPAGE=https://www.airspayce.com/mikem/bcm2835/
+INHERIT=toolchain-funcs
IUSE=doc examples
KEYWORDS=~arm
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.airspayce.com/mikem/bcm2835/bcm2835-1.68.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=865a6363a6bd357d913028d810b8be07
diff --git a/metadata/md5-cache/dev-libs/bglibs-2.04-r1 b/metadata/md5-cache/dev-libs/bglibs-2.04-r1
index ea109303fc8e..ae4bc5ef355e 100644
--- a/metadata/md5-cache/dev-libs/bglibs-2.04-r1
+++ b/metadata/md5-cache/dev-libs/bglibs-2.04-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Bruce Guenter's Libraries Collection
EAPI=7
HOMEPAGE=https://untroubled.org/bglibs/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2.1+
SLOT=0/2
SRC_URI=https://untroubled.org/bglibs/archive/bglibs-2.04.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1d970f37e281eeeccab991e93d57f398
diff --git a/metadata/md5-cache/dev-libs/bglibs-2.04-r2 b/metadata/md5-cache/dev-libs/bglibs-2.04-r2
index 97541e864f3a..0ed617d86645 100644
--- a/metadata/md5-cache/dev-libs/bglibs-2.04-r2
+++ b/metadata/md5-cache/dev-libs/bglibs-2.04-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Bruce Guenter's Libraries Collection
EAPI=7
HOMEPAGE=https://untroubled.org/bglibs/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86
LICENSE=LGPL-2.1+
SLOT=0/2
SRC_URI=https://untroubled.org/bglibs/archive/bglibs-2.04.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7546c355206aef45292cc2f07d01413b
diff --git a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205 b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
index f8183a04a479..5e14b6689cc0 100644
--- a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
+++ b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
@@ -3,6 +3,7 @@ DEPEND=dev-libs/boost
DESCRIPTION=an extension to the Boost.MPL library
EAPI=6
HOMEPAGE=https://github.com/quinoacomputing/BoostMPLCartesianProduct
+INHERIT=vcs-snapshot toolchain-funcs
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=Boost-1.0
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/aeb0266b3a89f32c390dff51cb73a454d5d7a745.tar.gz -> boost-mpl-cartesian_product-20161205.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b2e3f4caf476652d5148fcc96683cc51
diff --git a/metadata/md5-cache/dev-libs/cl-1.2.4 b/metadata/md5-cache/dev-libs/cl-1.2.4
index c7a9a2140a5a..4c973816c5d3 100644
--- a/metadata/md5-cache/dev-libs/cl-1.2.4
+++ b/metadata/md5-cache/dev-libs/cl-1.2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=dev-lang/erlang-16 virtual/opencl dev-util/rebar
SLOT=0
SRC_URI=https://github.com/tonyrog/cl/archive/cl-1.2.4.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=ce029572606cbd17900b0e96ab1dbb65
diff --git a/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1 b/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
index abf0f7bd647c..a6d61f9cd667 100644
--- a/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
+++ b/metadata/md5-cache/dev-libs/concurrencykit-0.7.0-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure
DESCRIPTION=A library with concurrency related algorithms and data structures in C
EAPI=7
HOMEPAGE=http://concurrencykit.org
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=Apache-2.0 BSD-2
RDEPEND=!sys-cluster/charm
SLOT=0
SRC_URI=https://github.com/concurrencykit/ck/archive/0.7.0.tar.gz -> concurrencykit-0.7.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=919e42cf3c722604925764a5784276eb
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2 b/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
index 6dabb5a679cd..d417721a4835 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
+++ b/metadata/md5-cache/dev-libs/crypto++-8.2.0-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install prepare setup
DESCRIPTION=C++ class library of cryptographic schemes
EAPI=7
HOMEPAGE=https://cryptopp.com
+INHERIT=toolchain-funcs
IUSE=+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs
KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos
LICENSE=Boost-1.0
SLOT=0/8
SRC_URI=https://www.cryptopp.com/cryptopp820.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=73881dd595f5ebcc7db972300a1168ac
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.4.0 b/metadata/md5-cache/dev-libs/crypto++-8.4.0
index fd950fa93cab..8eb1225d381a 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.4.0
+++ b/metadata/md5-cache/dev-libs/crypto++-8.4.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=C++ class library of cryptographic schemes
EAPI=7
HOMEPAGE=https://cryptopp.com
+INHERIT=toolchain-funcs
IUSE=+asm static-libs
KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos
LICENSE=Boost-1.0
SLOT=0/8.4
SRC_URI=https://www.cryptopp.com/cryptopp840.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=76168e8c5dce7d45454df9a95bf52937
diff --git a/metadata/md5-cache/dev-libs/cvector-1.0.3.1 b/metadata/md5-cache/dev-libs/cvector-1.0.3.1
index e92e5d6cd920..c65f21701cdd 100644
--- a/metadata/md5-cache/dev-libs/cvector-1.0.3.1
+++ b/metadata/md5-cache/dev-libs/cvector-1.0.3.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=An ANSI C implementation of dynamic arrays (approximation of C++ vectors)
EAPI=7
HOMEPAGE=http://cvector.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://sourceforge/cvector/cvector/CVector-1.0.3/CVector-1.0.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aed63889ca39a1cdc228cdc4140ef11b
diff --git a/metadata/md5-cache/dev-libs/dotconf-1.3-r1 b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
index eaaa7c63ecbc..c0a9884e8038 100644
--- a/metadata/md5-cache/dev-libs/dotconf-1.3-r1
+++ b/metadata/md5-cache/dev-libs/dotconf-1.3-r1
@@ -3,9 +3,10 @@ DEPEND=>=sys-devel/autoconf-2.58
DESCRIPTION=dot.conf configuration file parser
EAPI=6
HOMEPAGE=https://github.com/williamh/dotconf
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://gentoo/dotconf-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c1b0977f47bfdce5e65141ba7a07768d
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.20 b/metadata/md5-cache/dev-libs/leveldb-1.20
index 990a15751ab9..6d785e76e808 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.20
+++ b/metadata/md5-cache/dev-libs/leveldb-1.20
@@ -3,6 +3,7 @@ DEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= )
DESCRIPTION=a fast key-value storage library written at Google
EAPI=7
HOMEPAGE=http://leveldb.org/ https://github.com/google/leveldb
+INHERIT=multilib toolchain-funcs
IUSE=+snappy static-libs kernel_FreeBSD +tcmalloc test
KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
diff --git a/metadata/md5-cache/dev-libs/libatasmart-0.19_p5 b/metadata/md5-cache/dev-libs/libatasmart-0.19_p5
index e6642bc2e5e6..99c0efc46d1a 100644
--- a/metadata/md5-cache/dev-libs/libatasmart-0.19_p5
+++ b/metadata/md5-cache/dev-libs/libatasmart-0.19_p5
@@ -4,11 +4,12 @@ DEPEND=virtual/libudev:=
DESCRIPTION=A small and lightweight parser library for ATA S.M.A.R.T. hard disks
EAPI=7
HOMEPAGE=https://salsa.debian.org/utopia-team/libatasmart
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=LGPL-2.1
RDEPEND=virtual/libudev:=
SLOT=0/4
SRC_URI=mirror://debian/pool/main/liba/libatasmart/libatasmart_0.19.orig.tar.xz mirror://debian/pool/main/liba/libatasmart/libatasmart_0.19-5.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=26cd9a9ad0ba8f02b87a6a7c5ae4ccb0
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.0.6 b/metadata/md5-cache/dev-libs/libbpf-0.0.6
index 3e57bbeb1b15..6d94cfd5cfa3 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.0.6
+++ b/metadata/md5-cache/dev-libs/libbpf-0.0.6
@@ -3,11 +3,12 @@ DEPEND=virtual/libelf !<=dev-util/bcc-0.7.0 sys-kernel/linux-headers
DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
EAPI=7
HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=toolchain-funcs
IUSE=+static-libs
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1 BSD-2
RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
SLOT=0/0.0.6
SRC_URI=https://github.com/libbpf/libbpf/archive/v0.0.6.tar.gz -> libbpf-0.0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=16c74a47ce15769f66d29b7485f3a591
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.0.7 b/metadata/md5-cache/dev-libs/libbpf-0.0.7
index 085e550150f8..a41a32979d3e 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.0.7
+++ b/metadata/md5-cache/dev-libs/libbpf-0.0.7
@@ -3,11 +3,12 @@ DEPEND=virtual/libelf !<=dev-util/bcc-0.7.0 sys-kernel/linux-headers
DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
EAPI=7
HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=toolchain-funcs
IUSE=+static-libs
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1 BSD-2
RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
SLOT=0/0.0.7
SRC_URI=https://github.com/libbpf/libbpf/archive/v0.0.7.tar.gz -> libbpf-0.0.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=040ff528327b9e841bd7ad26d2ed94be
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.0.8 b/metadata/md5-cache/dev-libs/libbpf-0.0.8
index 5124dd29ca7a..ee1b096e13bb 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.0.8
+++ b/metadata/md5-cache/dev-libs/libbpf-0.0.8
@@ -3,11 +3,12 @@ DEPEND=virtual/libelf !<=dev-util/bcc-0.7.0 sys-kernel/linux-headers
DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
EAPI=7
HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=toolchain-funcs
IUSE=+static-libs
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1 BSD-2
RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
SLOT=0/0.0.8
SRC_URI=https://github.com/libbpf/libbpf/archive/v0.0.8.tar.gz -> libbpf-0.0.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=040ff528327b9e841bd7ad26d2ed94be
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.0.9-r1 b/metadata/md5-cache/dev-libs/libbpf-0.0.9-r1
index 04d39d69ec64..e8ebd532994b 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.0.9-r1
+++ b/metadata/md5-cache/dev-libs/libbpf-0.0.9-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/libelf !<=dev-util/bcc-0.7.0 sys-kernel/linux-headers
DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
EAPI=7
HOMEPAGE=https://github.com/libbpf/libbpf
+INHERIT=toolchain-funcs
IUSE=+static-libs
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1 BSD-2
RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
SLOT=0/0.0.9
SRC_URI=https://github.com/libbpf/libbpf/archive/v0.0.9.tar.gz -> libbpf-0.0.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8a70efe3b5b9b3299c04dd11259b1304
diff --git a/metadata/md5-cache/dev-libs/libbulletml-0.0.6 b/metadata/md5-cache/dev-libs/libbulletml-0.0.6
index eaf54eb4eb88..cf8480aa95c8 100644
--- a/metadata/md5-cache/dev-libs/libbulletml-0.0.6
+++ b/metadata/md5-cache/dev-libs/libbulletml-0.0.6
@@ -3,10 +3,11 @@ DEPEND=dev-libs/boost
DESCRIPTION=A Library of Bullet Markup Language
EAPI=7
HOMEPAGE=https://shinh.skr.jp/libbulletml/index_en.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=BSD
RDEPEND=dev-libs/boost
SLOT=0
SRC_URI=https://shinh.skr.jp/libbulletml/libbulletml-0.0.6.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3b256d469ab9b45879826b0a06a77ab8
diff --git a/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1 b/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
index 33413286180e..a736b1f2c14d 100644
--- a/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
+++ b/metadata/md5-cache/dev-libs/libezV24-0.1.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=library that provides an easy API to Linux serial ports
EAPI=7
HOMEPAGE=http://ezv24.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc sparc x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://sourceforge/ezv24/libezV24-0.1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5f71e9be4e032183e7f00e37b16a3e42
diff --git a/metadata/md5-cache/dev-libs/libmaxminddb-1.5.2 b/metadata/md5-cache/dev-libs/libmaxminddb-1.5.2
index 3bba45a364bb..39458065a205 100644
--- a/metadata/md5-cache/dev-libs/libmaxminddb-1.5.2
+++ b/metadata/md5-cache/dev-libs/libmaxminddb-1.5.2
@@ -3,11 +3,12 @@ DEPEND=test? ( dev-perl/IPC-Run3 )
DESCRIPTION=C library for the MaxMind DB file format
EAPI=7
HOMEPAGE=https://github.com/maxmind/libmaxminddb
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=Apache-2.0
RESTRICT=!test? ( test )
SLOT=0/0.0.7
SRC_URI=https://github.com/maxmind/libmaxminddb/releases/download/1.5.2/libmaxminddb-1.5.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1f117b9ee575321128875d1a1fe7186f
diff --git a/metadata/md5-cache/dev-libs/libmoe-1.5.8-r3 b/metadata/md5-cache/dev-libs/libmoe-1.5.8-r3
index 2b8f2e236f74..a9ef60b9817f 100644
--- a/metadata/md5-cache/dev-libs/libmoe-1.5.8-r3
+++ b/metadata/md5-cache/dev-libs/libmoe-1.5.8-r3
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl
DESCRIPTION=Multi octet character encoding handling library
EAPI=7
HOMEPAGE=http://pub.ks-and-ks.ne.jp/prog/libmoe/
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=amd64 ppc sparc x86
LICENSE=public-domain
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://pub.ks-and-ks.ne.jp/prog/pub/libmoe-1.5.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=88315b68d05ab9a88e61e8436c36fba3
diff --git a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1 b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
index 2bf1dc516ce7..164af6acb076 100644
--- a/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
+++ b/metadata/md5-cache/dev-libs/libpfm-4.10.1-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Hardware-based performance monitoring interface for Linux
EAPI=7
HOMEPAGE=http://perfmon2.sourceforge.net
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
LICENSE=GPL-2 MIT
SLOT=0/4
SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.10.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=48893ca88d39c9789d2392e7e2381456
diff --git a/metadata/md5-cache/dev-libs/librdkafka-1.4.4 b/metadata/md5-cache/dev-libs/librdkafka-1.4.4
index 7af5967c7e0e..bd045964f81c 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-1.4.4
+++ b/metadata/md5-cache/dev-libs/librdkafka-1.4.4
@@ -3,11 +3,12 @@ DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) s
DESCRIPTION=Apache Kafka C/C++ client library
EAPI=7
HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=toolchain-funcs
IUSE=lz4 sasl ssl static-libs zstd
KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=BSD-2
RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
SLOT=0/1
SRC_URI=https://github.com/edenhill/librdkafka/archive/v1.4.4.tar.gz -> librdkafka-1.4.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=236e3e51bbe37f1049b742db5b8f5f4c
diff --git a/metadata/md5-cache/dev-libs/libtomfloat-0.02-r1 b/metadata/md5-cache/dev-libs/libtomfloat-0.02-r1
index a7a6b41382a6..32ab461a9320 100644
--- a/metadata/md5-cache/dev-libs/libtomfloat-0.02-r1
+++ b/metadata/md5-cache/dev-libs/libtomfloat-0.02-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libtommath
DESCRIPTION=library for floating point number manipulation
EAPI=7
HOMEPAGE=https://www.libtom.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=WTFPL-2
RDEPEND=dev-libs/libtommath
SLOT=0
SRC_URI=https://github.com/libtom/libtomfloat/releases/download/0.02/ltf-0.02.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1c0d21e1dc533c7d715ddbed40d649d3
diff --git a/metadata/md5-cache/dev-libs/libtompoly-0.04-r1 b/metadata/md5-cache/dev-libs/libtompoly-0.04-r1
index fce9e1cd23be..4561432b9281 100644
--- a/metadata/md5-cache/dev-libs/libtompoly-0.04-r1
+++ b/metadata/md5-cache/dev-libs/libtompoly-0.04-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libtommath
DESCRIPTION=portable ISO C library for polynomial basis arithmetic
EAPI=7
HOMEPAGE=https://www.libtom.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=WTFPL-2
RDEPEND=dev-libs/libtommath
SLOT=0
SRC_URI=https://github.com/libtom/libtompoly/releases/download/0.04/ltp-0.04.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d1ce6c8b707fb9ebe7de86b203ee4b3c
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.4.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
index ebd11bc429e1..02e7aa58fe2d 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.4.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
EAPI=7
HOMEPAGE=https://github.com/JuliaStrings/utf8proc
+INHERIT=toolchain-funcs
IUSE=cjk static-libs test
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0/2.4.0
SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.4.0.tar.gz -> libutf8proc-2.4.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-12.1.0.xz )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=45aac323035986c133e891223753d075
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.5.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.5.0
index ca6c099c43e7..ad1ca8c84cad 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.5.0
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.5.0
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
EAPI=7
HOMEPAGE=https://github.com/JuliaStrings/utf8proc
+INHERIT=toolchain-funcs
IUSE=cjk static-libs test
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0/2.5.0
SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.5.0.tar.gz -> libutf8proc-2.5.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-13.0.0.xz )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c6bdc431aef7dbc951920d6e48da0d80
diff --git a/metadata/md5-cache/dev-libs/libx86emu-1.1 b/metadata/md5-cache/dev-libs/libx86emu-1.1
index 2bf7f38317af..bb9cdf803d44 100644
--- a/metadata/md5-cache/dev-libs/libx86emu-1.1
+++ b/metadata/md5-cache/dev-libs/libx86emu-1.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install unpack
DESCRIPTION=A library for emulating x86
EAPI=7
HOMEPAGE=https://www.opensuse.org/
+INHERIT=rpm toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=HPND
SLOT=0
SRC_URI=https://download.opensuse.org/source/factory/repo/oss/suse/src/libx86emu-1.1-9.8.src.rpm
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e rpm 760ff223c2c4299b68ea901e24c4cabd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3bc00235c404657c07528561d4aada1a
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r1
index c31f30a74dda..e9ea792a537c 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.12-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.12-r1
@@ -12,6 +12,6 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
RESTRICT=!test? ( test )
SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.12-r1-patchset.tar.bz2 test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz ) verify-sig? ( ftp://xmlsoft.org/libxml2/libxml2-2.9.12.tar.gz.asc )
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc prefix de7d8e2b10085ed5ff09ad70e4753e5c multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
-_md5_=1bb7ac466e2774b99fc24ee93b7a9b97
+_md5_=e244b0e17045b2c2b679936758a665e2
diff --git a/metadata/md5-cache/dev-libs/ntl-11.4.3 b/metadata/md5-cache/dev-libs/ntl-11.4.3
index 48aa10c410d8..c82276d57a2a 100644
--- a/metadata/md5-cache/dev-libs/ntl-11.4.3
+++ b/metadata/md5-cache/dev-libs/ntl-11.4.3
@@ -4,6 +4,7 @@ DEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
DESCRIPTION=High-performance and portable C++ number theory library
EAPI=7
HOMEPAGE=https://www.shoup.net/ntl/
+INHERIT=toolchain-funcs
IUSE=bindist doc static-libs threads cpu_flags_x86_avx2
KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=LGPL-2.1+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/gf2x threads? ( >=dev-libs/gf2x-1.2 )
REQUIRED_USE=bindist? ( !cpu_flags_x86_avx2 )
SLOT=0/43
SRC_URI=https://www.shoup.net/ntl/ntl-11.4.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7ae6a9a9ae9300d7dadb56234947cbbe
diff --git a/metadata/md5-cache/dev-libs/openspecfun-0.5.3 b/metadata/md5-cache/dev-libs/openspecfun-0.5.3
index 4dad48d12b1e..5a6c5ee55190 100644
--- a/metadata/md5-cache/dev-libs/openspecfun-0.5.3
+++ b/metadata/md5-cache/dev-libs/openspecfun-0.5.3
@@ -3,10 +3,11 @@ DEPEND=sci-libs/openlibm:= virtual/fortran
DESCRIPTION=A collection of special mathematical functions
EAPI=7
HOMEPAGE=https://julialang.org
+INHERIT=fortran-2 toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT public-domain
RDEPEND=sci-libs/openlibm:= virtual/fortran
SLOT=0
SRC_URI=https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz -> openspecfun-0.5.3.tar.gz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=e92a4d59deaddaab9300b5e6318b741e
diff --git a/metadata/md5-cache/dev-libs/qcustomplot-2.0.1 b/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
index 2947492d3c8a..1524bdb45321 100644
--- a/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
+++ b/metadata/md5-cache/dev-libs/qcustomplot-2.0.1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
DESCRIPTION=Qt C++ widget for plotting and data visualization
EAPI=7
HOMEPAGE=https://www.qcustomplot.com/
+INHERIT=qmake-utils
KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://www.qcustomplot.com/release/2.0.1/QCustomPlot-sharedlib.tar.gz -> qcustomplot-sharedlib-2.0.1.tar.gz https://www.qcustomplot.com/release/2.0.1/QCustomPlot-source.tar.gz -> qcustomplot-source-2.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=59431df6141bcb625bd5321c8c650264
diff --git a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3 b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
index 267b23c21e56..1ad8d74f79b1 100644
--- a/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
+++ b/metadata/md5-cache/dev-libs/qoauth-2.0.1_pre20160315-r3
@@ -4,6 +4,7 @@ DEPEND=app-crypt/qca:2[debug?,qt5(+)] dev-qt/qtnetwork:5 test? ( dev-qt/qttest:5
DESCRIPTION=Qt-based library for OAuth support
EAPI=7
HOMEPAGE=https://github.com/ayoy/qoauth/wiki
+INHERIT=qmake-utils
IUSE=debug doc test
KEYWORDS=amd64 ~ppc64 x86
LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=app-crypt/qca:2[debug?,qt5(+)] dev-qt/qtnetwork:5 app-crypt/qca:2[ssl] !
RESTRICT=!test? ( test )
SLOT=5
SRC_URI=https://dev.gentoo.org/~johu/distfiles/qoauth-2.0.1_pre20160315.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=1257e20ff605a90b67ebc0901833b37e
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.33 b/metadata/md5-cache/dev-libs/rasqal-0.9.33
index 71a2fb19d453..84165f237ae8 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.33
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.33
@@ -4,6 +4,7 @@ DEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhas
DESCRIPTION=Library that handles Resource Description Framework (RDF)
EAPI=7
HOMEPAGE=http://librdf.org/rasqal/
+INHERIT=libtool
IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0 GPL-2 LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mha
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://download.librdf.org/source/rasqal-0.9.33.tar.gz
-_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96
_md5_=3e2f813e54f81c7cca35956f07dbc8bd
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.02-r1 b/metadata/md5-cache/dev-libs/serdisplib-2.02-r1
index c9412babd179..ee46a535c16e 100644
--- a/metadata/md5-cache/dev-libs/serdisplib-2.02-r1
+++ b/metadata/md5-cache/dev-libs/serdisplib-2.02-r1
@@ -4,6 +4,7 @@ DEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1 )
DESCRIPTION=Library to drive several displays with built-in controllers or display modules
EAPI=7
HOMEPAGE=http://serdisplib.sourceforge.net
+INHERIT=udev
IUSE=threads tools lcd_devices_acoolsdcm lcd_devices_ddusbt +lcd_devices_directgfx lcd_devices_displaylink lcd_devices_dpfax lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 lcd_devices_vssdcp
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1 )
REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_dpfax lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 lcd_devices_vssdcp ) lcd_devices_framebuffer? ( threads )
SLOT=0
SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.02.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=637495edbc6496df38900f9e25597789
diff --git a/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3 b/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
index 916b45a334a6..8484ac977cb2 100644
--- a/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
+++ b/metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=library for parsing command line options
EAPI=7
HOMEPAGE=https://shh.thathost.com/pub-unix/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=Artistic
SLOT=0
SRC_URI=https://shh.thathost.com/pub-unix/files/shhopt-1.1.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b6a75fa04f07a14c45381a73ae4ff406
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.3.2.0 b/metadata/md5-cache/dev-libs/skalibs-2.3.2.0
index 8639c4879aeb..ec72da0fee3a 100644
--- a/metadata/md5-cache/dev-libs/skalibs-2.3.2.0
+++ b/metadata/md5-cache/dev-libs/skalibs-2.3.2.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81
DESCRIPTION=development files used for building software at skarnet.org: essentially general-purpose libraries
EAPI=5
HOMEPAGE=http://www.skarnet.org/software/skalibs/index.html
+INHERIT=multilib
IUSE=doc ipv6 static-libs
KEYWORDS=amd64 x86
LICENSE=ISC
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.6.1.0 b/metadata/md5-cache/dev-libs/skalibs-2.6.1.0
index 28f4a15e5325..4104e6555866 100644
--- a/metadata/md5-cache/dev-libs/skalibs-2.6.1.0
+++ b/metadata/md5-cache/dev-libs/skalibs-2.6.1.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81
DESCRIPTION=skarnet.org general-purpose libraries
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/skalibs/
+INHERIT=versionator
IUSE=doc ipv6 static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.6.3.0 b/metadata/md5-cache/dev-libs/skalibs-2.6.3.0
index 981b56f86728..51d3427b2337 100644
--- a/metadata/md5-cache/dev-libs/skalibs-2.6.3.0
+++ b/metadata/md5-cache/dev-libs/skalibs-2.6.3.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81
DESCRIPTION=skarnet.org general-purpose libraries
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/skalibs/
+INHERIT=versionator
IUSE=doc ipv6 static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.6.4.0 b/metadata/md5-cache/dev-libs/skalibs-2.6.4.0
index 07637f09d402..c156ae8e4c9e 100644
--- a/metadata/md5-cache/dev-libs/skalibs-2.6.4.0
+++ b/metadata/md5-cache/dev-libs/skalibs-2.6.4.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81
DESCRIPTION=skarnet.org general-purpose libraries
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/skalibs/
+INHERIT=versionator
IUSE=doc ipv6 static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0-r2 b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
index 02cb730b3055..23b8232a426d 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0-r2
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
@@ -3,6 +3,7 @@ DEPEND=!app-text/agrep !dev-ruby/amatch !app-misc/glimpse virtual/pkgconfig nls?
DESCRIPTION=Lightweight, robust, and efficient POSIX compliant regexp matching library
EAPI=6
HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre/
+INHERIT=multilib
IUSE=nls static-libs
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=BSD-2
diff --git a/metadata/md5-cache/dev-libs/tvision-2.2.1.4 b/metadata/md5-cache/dev-libs/tvision-2.2.1.4
index a6eb261f9ffe..cf5b365d237d 100644
--- a/metadata/md5-cache/dev-libs/tvision-2.2.1.4
+++ b/metadata/md5-cache/dev-libs/tvision-2.2.1.4
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libbsd sys-apps/util-linux sys-libs/ncurses:0= gpm? ( sys-libs/g
DESCRIPTION=Text User Interface that implements the well known CUA widgets
EAPI=7
HOMEPAGE=http://tvision.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=+X debug gpm
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/libbsd sys-apps/util-linux sys-libs/ncurses:0= gpm? ( sys-libs/gpm ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxcb:= )
SLOT=0
SRC_URI=mirror://sourceforge/tvision/rhtvision_2.2.1-4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=da4dd83fe7edf76a7132d07a8c5e05cc
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059 b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
index 7cda0040a90a..0b4dc79fb76d 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
@@ -4,11 +4,12 @@ DEPEND=>=dev-libs/xerces-c-2.8.0
DESCRIPTION=XSLT processor for transforming XML into HTML, text, or other XML types
EAPI=7
HOMEPAGE=https://xml.apache.org/xalan-c/
+INHERIT=toolchain-funcs
IUSE=doc examples nls threads
KEYWORDS=amd64 ~ppc x86
LICENSE=Apache-2.0
RDEPEND=>=dev-libs/xerces-c-2.8.0
SLOT=0
SRC_URI=mirror://gentoo/Xalan-C_r1153059-src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e00df9abb91ee78563be84ff453f586b
diff --git a/metadata/md5-cache/dev-libs/zlog-1.2.14-r1 b/metadata/md5-cache/dev-libs/zlog-1.2.14-r1
index 523794512aa3..0d2de4bcb24f 100644
--- a/metadata/md5-cache/dev-libs/zlog-1.2.14-r1
+++ b/metadata/md5-cache/dev-libs/zlog-1.2.14-r1
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install test
DESCRIPTION=A reliable, thread safe, clear-model, pure C logging library.
EAPI=7
HOMEPAGE=http://hardysimpson.github.io/zlog/
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/HardySimpson/zlog/archive/1.2.14.tar.gz -> zlog-v1.2.14.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1edf900d4af7b404ba13d19f3b286029
diff --git a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100 b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
index 45fd7e079ff6..b11344683b61 100644
--- a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
+++ b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
@@ -3,6 +3,7 @@ DEPEND=lua_single_target_luajit? ( dev-lua/penlight[lua_targets_luajit(-)] ) lua
DESCRIPTION=A LuaDoc-compatible documentation generation system
EAPI=7
HOMEPAGE=https://stevedonovan.github.io/ldoc/
+INHERIT=lua-single
IUSE=lua_single_target_luajit lua_single_target_lua5-1
KEYWORDS=amd64 arm ppc ppc64 x86
LICENSE=MIT
@@ -11,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=d5a67d308bb72589a9cc5fee787e34ea
diff --git a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100 b/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
index 66f088ec8862..ccd40f43c0f0 100644
--- a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
+++ b/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install
DESCRIPTION=JSON Parser/Constructor for Lua
EAPI=7
HOMEPAGE=https://www.eharning.us/wiki/luajson/
+INHERIT=lua
IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
LICENSE=MIT
@@ -10,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/harningt/luajson/archive/1.3.4.tar.gz -> luajson-1.3.4.tar.gz
-_eclasses_=lua 117840f7c4855d27ccde1c6cca990331 lua-utils 736947973cfbc9de01fdb8548f942f82 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua 117840f7c4855d27ccde1c6cca990331
_md5_=b5feaec3427b34677a6ccd23f8d5049e
diff --git a/metadata/md5-cache/dev-lua/lutok-0.4-r10 b/metadata/md5-cache/dev-lua/lutok-0.4-r10
index e65cbd99c470..9428e73b3952 100644
--- a/metadata/md5-cache/dev-lua/lutok-0.4-r10
+++ b/metadata/md5-cache/dev-lua/lutok-0.4-r10
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
DESCRIPTION=Lightweight C++ API library for Lua
EAPI=7
HOMEPAGE=https://github.com/jmmv/lutok
+INHERIT=lua-single
IUSE=test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=1568e156ac52d30aa872dfaf24237e43
diff --git a/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100 b/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
index da3fe93ae05f..bc61111471c4 100644
--- a/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
+++ b/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install
DESCRIPTION=A pure Lua implementation of the MessagePack serialization format
EAPI=7
HOMEPAGE=https://fperrad.frama.io/lua-MessagePack
+INHERIT=lua toolchain-funcs
IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
RESTRICT=test
SLOT=0
SRC_URI=https://framagit.org/fperrad/lua-MessagePack/-/archive/18f316b3f62c02bf2b7a3096701780f78a4d2c67/lua-MessagePack-18f316b3f62c02bf2b7a3096701780f78a4d2c67.tar.gz -> messagepack-0.5.2_p20201025.tar.gz
-_eclasses_=lua 117840f7c4855d27ccde1c6cca990331 lua-utils 736947973cfbc9de01fdb8548f942f82 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua 117840f7c4855d27ccde1c6cca990331
_md5_=31f9433af82c4bcd5379284d677d6103
diff --git a/metadata/md5-cache/dev-ml/dune-2.8.2 b/metadata/md5-cache/dev-ml/dune-2.8.2
index 744bda0139c7..76f622552eda 100644
--- a/metadata/md5-cache/dev-ml/dune-2.8.2
+++ b/metadata/md5-cache/dev-ml/dune-2.8.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder dev-ml/findlib test? ( dev-ml/co
DESCRIPTION=A composable build system for OCaml
EAPI=7
HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=multiprocessing
IUSE=test
KEYWORDS=amd64 arm arm64 ppc ppc64 x86
LICENSE=MIT
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.41 b/metadata/md5-cache/dev-ml/ocamlweb-1.41
index 31f54a43219f..a99eaec22940 100644
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.41
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.41
@@ -4,6 +4,7 @@ DEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexext
DESCRIPTION=O'Caml literate programming tool
EAPI=7
HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
+INHERIT=latex-package
IUSE=test
KEYWORDS=amd64 arm arm64 ppc ppc64 x86
LICENSE=LGPL-2
diff --git a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1 b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
index 94925bd2d871..38e97a601585 100644
--- a/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
+++ b/metadata/md5-cache/dev-perl/DelimMatch-1.06-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/N/NW/NWALSH/DelimMatch-1.06a.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=bfb6b11bda734ca1f8defa40ac115c73
diff --git a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1 b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
index 942bedb89d48..964a355e1445 100644
--- a/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Find-0.100.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-perl/MailTools dev-perl/Email-Valid virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Find-0.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=4e5bf8b9ce37218ca1d8a9569de64f8c
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
index 604f92d7d84b..5be55c47f3ec 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/perl-MIME-Base64-3.07 dev-lang/perl:=[-build(-)]
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=e243402d3735e15a5883d1201676e4eb
diff --git a/metadata/md5-cache/dev-perl/File-Sync-0.110.0 b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
index e5e821d23622..d7315592c6fe 100644
--- a/metadata/md5-cache/dev-perl/File-Sync-0.110.0
+++ b/metadata/md5-cache/dev-perl/File-Sync-0.110.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/B/BR/BRIANSKI/File-Sync-0.11.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=5399bbbdb341618154714c627e5a6af8
diff --git a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1 b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
index 5c36a6e0cd5d..4940b5d9213c 100644
--- a/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/GSSAPI-0.280.0-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/krb5 dev-lang/perl:=[-build(-)]
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=67572db8a65e30ec7c7c46e9768a4f2e
diff --git a/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.5 b/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.5
index f00b4b271255..117d593e8315 100644
--- a/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.5
+++ b/metadata/md5-cache/dev-perl/Net-LDAPapi-3.0.5
@@ -10,5 +10,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=net-nds/openldap[sasl] dev-libs/cyrus-sasl >=dev-perl/Convert-ASN1-0.190.0 dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/M/MI/MISHIKAL/Net-LDAPapi-3.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8285592a4618be4d8f137880f39c8363
diff --git a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1 b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
index ecdc4e656cfa..d4748761e3d5 100644
--- a/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
+++ b/metadata/md5-cache/dev-perl/POE-XS-Loop-Poll-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=dev-perl/POE-1.287 >=dev-perl/POE-Test-Loops-1.033 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/T/TO/TONYC/POE-XS-Loop-Poll-1.000.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=bd4864fdc9193df11c9fccc91221240b
diff --git a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
index b1149ed3e607..750e2d14ea1c 100644
--- a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+++ b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-gfx/sane-backends-1.0.19 dev-lang/perl:=[-build(-)]
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Sane-0.05.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=64e6438b2d27324eb80949c0b06891b6
diff --git a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1 b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
index 818af93eab5a..47cb75dd344f 100644
--- a/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
+++ b/metadata/md5-cache/dev-perl/Set-Infinite-0.650.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=ffca66ecee97aeb81105898b0efb0a34
diff --git a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1 b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
index 0430f3411b42..9ffe9242b8e4 100644
--- a/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
+++ b/metadata/md5-cache/dev-perl/Symbol-Util-0.20.300-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=8b63d7d1df1fbf8039b25a13dc04b828
diff --git a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0 b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
index a469f7083c58..c409e712bb5c 100644
--- a/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
+++ b/metadata/md5-cache/dev-perl/Test-Pod-1.510.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/perl-Pod-Simple-3.50.0 >=virtual/perl-Test-Simple-0.620.0 dev-
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.51.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=477b53b3bbae3c475b0877acb82807cb
diff --git a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1 b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
index 637033c1ed6d..9901d7b3f2c7 100644
--- a/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-LevenshteinXS-0.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/J/JG/JGOLDBERG/Text-LevenshteinXS-0.03.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions f1ee42d38920b69fd6b6229cef80b7f4 perl-module 58b5d72d607014c48b5a1e106318d584
_md5_=c5d315458802c84b3a589410ace3054a
diff --git a/metadata/md5-cache/dev-php/onphp-1.0.11_pre20141124 b/metadata/md5-cache/dev-php/onphp-1.0.11_pre20141124
index 60de427279d9..e334feca5e1f 100644
--- a/metadata/md5-cache/dev-php/onphp-1.0.11_pre20141124
+++ b/metadata/md5-cache/dev-php/onphp-1.0.11_pre20141124
@@ -2,6 +2,7 @@ DEFINED_PHASES=install unpack
DESCRIPTION=onPHP is the LGPL'ed multi-purpose object-oriented PHP framework
EAPI=6
HOMEPAGE=https://github.com/onPHP/onphp-framework/
+INHERIT=vcs-snapshot
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66 b/metadata/md5-cache/dev-qt/qtchooser-66
index c63193d947aa..277ed06f3c00 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66
+++ b/metadata/md5-cache/dev-qt/qtchooser-66
@@ -3,11 +3,12 @@ DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
DESCRIPTION=Tool to quickly switch between multiple Qt installations
EAPI=7
HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
+INHERIT=qmake-utils toolchain-funcs
IUSE=test
KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
LICENSE=|| ( LGPL-2.1 GPL-3 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=f8907c2b2f1f8d32ec240cac62962d94
diff --git a/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024 b/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
index 1395316c9745..df765c4c3682 100644
--- a/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
+++ b/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5
DESCRIPTION=QFile extension with advisory locking functions
EAPI=7
HOMEPAGE=https://code.qt.io/cgit/qt-solutions/qt-solutions.git/
+INHERIT=qmake-utils
IUSE=doc
KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=dev-qt/qtcore:5
SLOT=0
SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qt-solutions-20171024.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=be611e3893f25b48ab4e7bd93dbdd3f4
diff --git a/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024 b/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
index 930bef8afaa8..34c928262cdd 100644
--- a/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
+++ b/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtnetwork:5 X? ( dev-q
DESCRIPTION=Qt library to start applications only once per user
EAPI=7
HOMEPAGE=https://code.qt.io/cgit/qt-solutions/qt-solutions.git/
+INHERIT=qmake-utils
IUSE=doc X
KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
LICENSE=|| ( LGPL-2.1 GPL-3 )
RDEPEND=dev-qt/qtcore:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtnetwork:5 X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qt-solutions-20171024.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=b6df44874c3efc1ec302a7be0eb16f79
diff --git a/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1 b/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
index 7eadcff4027b..a01e1e50d2e2 100644
--- a/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
+++ b/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5= x11-libs/gtk+:
DESCRIPTION=Additional style plugins for Qt5 (gtk2, cleanlook, plastic, motif)
EAPI=7
HOMEPAGE=https://code.qt.io/cgit/qt/qtstyleplugins.git/
+INHERIT=qmake-utils
KEYWORDS=~amd64
LICENSE=LGPL-2.1
RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5= x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
SLOT=5
SRC_URI=https://github.com/qt/qtstyleplugins/archive/335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz -> qtstyleplugins-5.0.0_p20170311.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=a447e0b62209ead0edc6597a03783d99
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
index f44ff8b87a9c..d4505095850a 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.2.tar.gz -> geometric_shapes-0.7.2.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da ros-catkin 0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da ros-catkin 0e2ee4c872fdd9df6b66002912d67e54
_md5_=e8cf35d853271fba7ee31b7762bf0023
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index 568bca146970..f430d2cde7c2 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -12,5 +12,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc git-r3 b8e8c92aa5fe8df7187e466138eb4e52 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da ros-catkin 0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da ros-catkin 0e2ee4c872fdd9df6b66002912d67e54
_md5_=e8cf35d853271fba7ee31b7762bf0023
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
index 6fb2aeda0de8..c33858c2c533 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=6.0
SRC_URI=https://github.com/rails/rails/archive/v6.0.3.7.tar.gz -> rails-6.0.3.7.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ba304b2c2eb22b23b97c9c6edc5c9fe4
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
index a7f3652337b5..a10e020e6cab 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=6.1
SRC_URI=https://github.com/rails/rails/archive/v6.1.3.2.tar.gz -> rails-6.1.3.2.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=6ba4b1eba74998bc2bb1773729850d5e
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
index 14ed8e321e30..d54c6639f75d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v2.0.1.tar.gz -> actionpack-xml_parser-2.0.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=d3cb66be6b7cb05ac6d084b36f01d28e
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.3.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.3.1
index 379093f8f168..bd4065f1932f 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.3.1
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=6.1
SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1
index 6cbc2e6ea58b..30ac6e58236b 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=6.1
SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
index bafcc2fe7863..f9119f01500f 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/halostatue/minitar/archive/v0.8.tar.gz -> archive-tar-minitar-0.8.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=4b93cc51785a2359648543e60a660beb
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
index 5d37d4fa8f4c..f161d46f0d21 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-2.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/asciidoctor/asciidoctor-diagram/archive/v2.0.5.tar.gz -> asciidoctor-diagram-2.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=d60a904683bba373541a214e7d106964
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0 b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
index 20e030210a79..2de1e57fe153 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.3.0.tar.gz -> async_sinatra-1.3.0-git.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b94efc35ff74e45d52120021f82973a2
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.4.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.4.0
index 42021bc97a99..728d02821c09 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.4.0
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=10
SRC_URI=https://github.com/ai/autoprefixer-rails/archive/10.2.4.0.tar.gz -> autoprefixer-rails-10.2.4.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=a966f76e4f85aa1bd0b70a28a10cc15d
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
index 913f965bb8b6..3cb257e7b557 100644
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.8.6.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=9
SRC_URI=https://rubygems.org/gems/autoprefixer-rails-9.8.6.5.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=12c3e247e33c6eb20ae94a2afe66826f
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
index 4da1865ef9a0..c811c96d75d0 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.297.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/aws-partitions-1.297.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0 b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
index 3cfea1b3c9c9..d5670be1662d 100644
--- a/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
+++ b/metadata/md5-cache/dev-ruby/aws-partitions-1.298.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/aws-partitions-1.298.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=90252676dd1761ed67b99228e01f57ad
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
index 8e69011257bb..db710114140c 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.11.488
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=e112891746cf5589e768608be60634ea
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
index 99b64fc1d1d9..08241180c6ba 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.11.488
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.11.488.tar.gz -> aws-sdk-ruby-2.11.488.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ed4697db5d6fb27328bec27fb7101729
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
index 077e4daaacc7..081f11ce7993 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.8
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) prawn? ( test )
SLOT=0
SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=0ca5aa1890a31535de486d464744cb6e
diff --git a/metadata/md5-cache/dev-ruby/base32-0.3.4 b/metadata/md5-cache/dev-ruby/base32-0.3.4
index e4ea7f4cad0b..11ac6a91b534 100644
--- a/metadata/md5-cache/dev-ruby/base32-0.3.4
+++ b/metadata/md5-cache/dev-ruby/base32-0.3.4
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/base32-0.3.4.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=c2ad98d96169e9dd8fe48a448e1a8086
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1
index 005f28d6e54e..29254e157b6d 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.7.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test
SLOT=0
SRC_URI=https://rubygems.org/gems/bundler-audit-0.7.0.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=13ffbcb0e498e46a6bb6a28a33b1d38e
diff --git a/metadata/md5-cache/dev-ruby/c21e-1.2.1 b/metadata/md5-cache/dev-ruby/c21e-1.2.1
index 7952286ded2c..93f92ece5c83 100644
--- a/metadata/md5-cache/dev-ruby/c21e-1.2.1
+++ b/metadata/md5-cache/dev-ruby/c21e-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/c21e-1.2.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=9717be0a0a6702534e6caa56c45b5061
diff --git a/metadata/md5-cache/dev-ruby/childprocess-4.0.0 b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
index a3e1f3a57f3d..5e266b2f4c1e 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-4.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://rubygems.org/gems/childprocess-4.0.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=4b2511c89818a146ce84aa9c27b359ee
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
index eea71ff9af87..b0e24058a3db 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/coffee-script-source-1.12.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b54c0e307b4a898355193e4c8ac5acea
diff --git a/metadata/md5-cache/dev-ruby/commander-4.5.2 b/metadata/md5-cache/dev-ruby/commander-4.5.2
index a5eeff75b530..0bdad84611e9 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.5.2
+++ b/metadata/md5-cache/dev-ruby/commander-4.5.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/commander-4.5.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=61e3875443a7d1268a2020cb5c171f7f
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.16.0 b/metadata/md5-cache/dev-ruby/contracts-0.16.0
index 54e739fb46c3..33333578a39a 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.16.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/contracts-0.16.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=cef2e60aee1a747a6d74cf22ebbe964b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.3.1 b/metadata/md5-cache/dev-ruby/daemons-1.3.1
index 843f6f8f4136..d0b04c64e44b 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.3.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.3.1.tar.gz -> daemons-1.3.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=9fdc7239f69e4108f1a153f607c9645b
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.10 b/metadata/md5-cache/dev-ruby/dalli-2.7.10
index 4382785959a0..5d325b1058fd 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.10
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.10.tar.gz -> dalli-2.7.10.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b318a410c88749102d593c93ab85d6a2
diff --git a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2 b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
index 9a404e3c2184..693c69f6f651 100644
--- a/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
+++ b/metadata/md5-cache/dev-ruby/ddplugin-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/ddplugin-1.0.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=a0e5826c351971dbb76e239510a0cb80
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index 0e2b3fcf460e..bce037f228d9 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/deep_merge-1.2.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=0d8271629af08a5304a79ba8c44953e5
diff --git a/metadata/md5-cache/dev-ruby/dependor-1.0.1 b/metadata/md5-cache/dev-ruby/dependor-1.0.1
index d97d69767ab8..645fe18c4ffd 100644
--- a/metadata/md5-cache/dev-ruby/dependor-1.0.1
+++ b/metadata/md5-cache/dev-ruby/dependor-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/dependor-1.0.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=c71826dca46919183ddecda494de50ea
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
index 21324f32e6fb..f93f3108b8b4 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=2.6
SRC_URI=https://rubygems.org/gems/did_you_mean-1.3.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=eaba2c28b60a81b9af74a06e9e75bb6f
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
index fee265bd459f..c766cd89f177 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20190701
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/domain_name-0.5.20190701.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=d6092d3be222b3863888b10c3c197411
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
index f8ef899f3f61..f8e9dc955072 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=test
SLOT=6
SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.1.tar.gz -> elasticsearch-ruby-6.8.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=21a4977bce141e2abbdee5c84cdd913e
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7 b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7
index 437918f623b2..a2d82a015f7c 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.2.7
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.2.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/eventmachine/eventmachine/archive/v1.2.7.tar.gz -> eventmachine-1.2.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ba9ed31cd90a49f544faccf47f64a0de
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.8.0 b/metadata/md5-cache/dev-ruby/execjs-2.8.0
index a8f16bfea02d..25b4fbd4d647 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.8.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/rails/execjs/archive/v2.8.0.tar.gz -> execjs-2.8.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=542d70bc3682d937d225a66a8b2d78b6
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.9 b/metadata/md5-cache/dev-ruby/exifr-1.3.9
index fb6bf3eaaf82..89b2f506bdf7 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.3.9
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.9.tar.gz -> exifr-1.3.9.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index 763274f15004..9df9e63a96ca 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fast-stemmer-1.0.2.gem
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ac9d43e9ffd90f0dc65141bee4d89aac
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.13.1 b/metadata/md5-cache/dev-ruby/ffi-1.13.1
index 1a0c4e151bbc..db3268f83815 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.13.1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.13.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/ffi/ffi/archive/1.13.1.tar.gz -> ffi-git-1.13.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=06bc514bbf732d261721effea84d9f5d
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.15.0 b/metadata/md5-cache/dev-ruby/ffi-1.15.0
index 259c3f5dda02..5b582924737c 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.15.0
+++ b/metadata/md5-cache/dev-ruby/ffi-1.15.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/ffi/ffi/archive/v1.15.0.tar.gz -> ffi-git-1.15.0.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=8b7c68682782f4cd0d763e26c41f0159
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.2.0 b/metadata/md5-cache/dev-ruby/filesize-0.2.0
index 2b359f91b710..71f4a200fd46 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.2.0
+++ b/metadata/md5-cache/dev-ruby/filesize-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0.2.0
SRC_URI=https://rubygems.org/gems/filesize-0.2.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=0eb7537b5a59abdca88f4acf024ade0d
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
index 2974ab67d10e..9ca0aefbbe04 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=8d817a3ff13de3d1404e029b4d40f408
diff --git a/metadata/md5-cache/dev-ruby/http-3.3.0 b/metadata/md5-cache/dev-ruby/http-3.3.0
index 0ccfac078eca..5339ff2b0c9a 100644
--- a/metadata/md5-cache/dev-ruby/http-3.3.0
+++ b/metadata/md5-cache/dev-ruby/http-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=3
SRC_URI=https://rubygems.org/gems/http-3.3.0.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=bb728a3db46cf6fb8a0138b7378f2004
diff --git a/metadata/md5-cache/dev-ruby/http-4.1.1 b/metadata/md5-cache/dev-ruby/http-4.1.1
index 00a1dc017104..f53eebde2757 100644
--- a/metadata/md5-cache/dev-ruby/http-4.1.1
+++ b/metadata/md5-cache/dev-ruby/http-4.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://rubygems.org/gems/http-4.1.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ca1207ca6dea6cfd88ee2045e832ff81
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.17.3 b/metadata/md5-cache/dev-ruby/httparty-0.17.3
index 288015be70a5..2cff44f23678 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.17.3
+++ b/metadata/md5-cache/dev-ruby/httparty-0.17.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.17.3.tar.gz -> httparty-0.17.3.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ec1418db30506a8193a617e89b8c5d8e
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.18.1 b/metadata/md5-cache/dev-ruby/httparty-0.18.1
index 985ea1e62bdb..ac70c738f6cc 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.18.1
+++ b/metadata/md5-cache/dev-ruby/httparty-0.18.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/jnunemaker/httparty/archive/v0.18.1.tar.gz -> httparty-0.18.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=696504585c6e6bab9555426f069884d4
diff --git a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0 b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
index d4e076e50297..fac53d24267c 100644
--- a/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
+++ b/metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/idn-ruby-0.1.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=53eadee1b0ad0b76c71ace4c5d6adff5
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2 b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
index 1b11761c5da6..00aa4eaa3953 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0.4.2
SRC_URI=https://rubygems.org/gems/jsobfu-0.4.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=d26a2bef7fc0c8b4c636a98c7e53f883
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0 b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0
index 4259f0af3bd6..23ee19df0559 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-4.0.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://rubygems.org/gems/liquid-c-4.0.0.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=c49410cf496bbeab32161bf51b0c3071
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.8.0 b/metadata/md5-cache/dev-ruby/loofah-2.8.0
index eb26c7c86b15..fd9a57804929 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.8.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/flavorjones/loofah/archive/v2.8.0.tar.gz -> loofah-2.8.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=c754e76f6c99e41c217f4b2927348c2e
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.4.0 b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
index ab0715f9a6c0..dfd688c35422 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.4.0
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/mercenary-0.4.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=17594eed5549b7450b5944245e90bcf5
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.9.2 b/metadata/md5-cache/dev-ruby/method_source-0.9.2
index a1fa5db07461..bf4d3bca00f9 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.9.2
+++ b/metadata/md5-cache/dev-ruby/method_source-0.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/method_source-0.9.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=21d83c617d0520303c86913f4eb80b7a
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9 b/metadata/md5-cache/dev-ruby/minitar-0.9
index c6a448b5dfbf..e86799ca6d2d 100644
--- a/metadata/md5-cache/dev-ruby/minitar-0.9
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=d4b5f9bde9d95888d65bc1be2cf13ffe
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
index 1bf4dc810c90..bedb467b77ad 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/minitest-pretty_diff-0.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=1ed496c6a205455763eb71eb2c46c1d2
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.12.0 b/metadata/md5-cache/dev-ruby/mocha-1.12.0
index cc17fc289c85..bee42fff8beb 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.12.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=1.0
SRC_URI=https://github.com/freerange/mocha/archive/v1.12.0.tar.gz -> mocha-1.12.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b1e47a636101f5ba0636fe874ad03c8c
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.3.3 b/metadata/md5-cache/dev-ruby/msgpack-1.3.3
index f6439710cece..12cfefc6e707 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.3.3
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/msgpack-1.3.3.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=611c6b8a44f2d56a30a0baeddaa35f3b
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1 b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
index eda57a30b93e..fb64f85058f8 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/multipart-post-2.1.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=aef71f88657a959ba3b2ca3ee1c78e7f
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.5.5 b/metadata/md5-cache/dev-ruby/oauth-0.5.5
index 87b1c8ef19a7..6017759bc820 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.5.5
+++ b/metadata/md5-cache/dev-ruby/oauth-0.5.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/oauth-xx/oauth-ruby/archive/v0.5.5.tar.gz -> oauth-0.5.5.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=31d7c582a1f1e1983af8ec447d604c7c
diff --git a/metadata/md5-cache/dev-ruby/optimist-3.0.1 b/metadata/md5-cache/dev-ruby/optimist-3.0.1
index 7f80662eb907..a8ec815a04b0 100644
--- a/metadata/md5-cache/dev-ruby/optimist-3.0.1
+++ b/metadata/md5-cache/dev-ruby/optimist-3.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3
SRC_URI=https://rubygems.org/gems/optimist-3.0.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=67e9faca17a176a2d2bed22167eed0eb
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0
index 8d7d08c5bfcc..fdf5ac7279c2 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=5cc36e60b7a557d82fffe667ca4b0d57
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
index 4f88ee251b93..326e92a3ace9 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=c2c637fb3c8788602d77d5a331d5bf7e
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.1-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
index 85e6ae350ffd..5456ef64d4b5 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/patron-0.13.1.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=3b10b7c9b78475fc53a6f0658ccbddf0
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3 b/metadata/md5-cache/dev-ruby/patron-0.13.3
index e0cfb722647d..e02837199985 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ec6f1a020d9e90d222d0cc5e40c1b871
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.8.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
index 4d11baa8e629..9bd3f094386a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/prawnpdf/pdf-core/archive/0.8.1.tar.gz -> pdf-core-0.8.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=069da159be628c332ba89f4e45c79c8c
diff --git a/metadata/md5-cache/dev-ruby/pg-1.2.2 b/metadata/md5-cache/dev-ruby/pg-1.2.2
index 8bc148d6e318..d402e43c13e1 100644
--- a/metadata/md5-cache/dev-ruby/pg-1.2.2
+++ b/metadata/md5-cache/dev-ruby/pg-1.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/pg-1.2.2.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=83cc29a34cfc7ab5e94ffade28ef5aa8
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
index b2eeda03821d..1bdf26711b28 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/pkg-config-1.4.6.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=596a96a4fc449ea49fc5a8ad6e029f65
diff --git a/metadata/md5-cache/dev-ruby/plist-3.6.0 b/metadata/md5-cache/dev-ruby/plist-3.6.0
index fc316b2a4c27..98eb04cdb395 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.6.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/patsplat/plist/archive/v3.6.0.tar.gz -> plist-3.6.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=5de5113e4a77d668f04b242b348c0d8e
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.3.1 b/metadata/md5-cache/dev-ruby/pluggaloid-1.3.1
index 6ca8dc0d2111..d7179c7fd399 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.3.1
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/pluggaloid-1.3.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=ea9bc3db210b82a1357442ce4ed7acce
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
index 52459e9b402d..cefa03b8466c 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=3d1193137f603aece994716688ffe63e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.2.1 b/metadata/md5-cache/dev-ruby/railties-6.1.2.1
index 63bc92fb75a5..c69fb67a7e8f 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.2.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test !test? ( test )
SLOT=6.1
SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=91126d3bcc589a11a8409f0b396b937e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.3.1 b/metadata/md5-cache/dev-ruby/railties-6.1.3.1
index 8c897beba9a8..e05346354f5c 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.1.3.1
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test !test? ( test )
SLOT=6.1
SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=af265ce4645447d3ac964bb749ec0b04
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
index e454b2fa7579..0fdeec00f130 100644
--- a/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=6
SRC_URI=https://rubygems.org/gems/rbnacl-7.1.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=19b1ef38e880b4f22567c45b751b6910
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.5 b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
index 211c0180189f..dee8ff6daeb5 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/cairo-1.16.5.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=31a618bb2ac1129488ab42f9dc77c00b
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
index 597ed4f9952b..8060e1028d4e 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=dc7b6ecf78d7e2b17e43b2a31eb5ad0a
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
index c399f6ed2f72..86e2f4859c3f 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.2.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=2f359c9dc6501c1b879c57a80ffe8487
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1 b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
index 23b1de94e9c4..b0f0559afd65 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.5.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/vmg/redcarpet/archive/v3.5.1.tar.gz -> redcarpet-3.5.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=9a9504bc21bcef0a206ad56498df0fe7
diff --git a/metadata/md5-cache/dev-ruby/rexml-3.2.5 b/metadata/md5-cache/dev-ruby/rexml-3.2.5
index 90856f98b2f9..b392ddcee60a 100644
--- a/metadata/md5-cache/dev-ruby/rexml-3.2.5
+++ b/metadata/md5-cache/dev-ruby/rexml-3.2.5
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3
SRC_URI=https://github.com/ruby/rexml/archive/v3.2.5.tar.gz -> rexml-3.2.5.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=adcf7e2d40a281de80ac8d187ced0f33
diff --git a/metadata/md5-cache/dev-ruby/roadie-4.0.0 b/metadata/md5-cache/dev-ruby/roadie-4.0.0
index 6e9ec97ef882..255dbe368853 100644
--- a/metadata/md5-cache/dev-ruby/roadie-4.0.0
+++ b/metadata/md5-cache/dev-ruby/roadie-4.0.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://github.com/Mange/roadie/archive/v4.0.0.tar.gz -> roadie-4.0.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=0b740404934f4d01cdd212d158cd7a8c
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-1.1.1 b/metadata/md5-cache/dev-ruby/rqrcode-1.1.1
index 85bb64bf30af..92bafaeb595a 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-1.1.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-1.1.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/whomwah/rqrcode/archive/v1.1.1.tar.gz -> rqrcode-1.1.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=e12a8cf08161b2069fb107716c6fd0b8
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
index 58948c5820f9..c4e065de09ee 100644
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/rspec-json_expectations-2.2.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=bcd421b61c441ed00bd0afee950ca311
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
index 17d5bcc30663..e771934a7d86 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3
SRC_URI=https://github.com/rspec/rspec-support/archive/v3.8.2.tar.gz -> rspec-support-3.8.2-git.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=a87cf0fad4d38d39059633e76142b4cf
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index 1a59a3eea09d..e0960a1e99ad 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=36472186a07a73ac9a89813176ce0ffa
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
index 20b755f950e4..a9220c9b01ca 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/ruby-filemagic-0.7.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=cd787aec0f909ed0838c2331a9c4c896
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
index 32b2a88efdb4..2aa928a83a2d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/gettext-3.2.9.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=6d392da1ce6e44cca847ab8c2d3fe6bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
index 290e45c98d6b..b4dbdcf5385f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-macho-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/Homebrew/ruby-macho/archive/2.2.0.tar.gz -> ruby-macho-2.2.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=5e77251ad0e18a46b5a8a98969c314de
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
index afb82ecae976..703cc55968c4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test
SLOT=0
SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99999.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=bf3d95117a4d9840026abfc3d3b6db88
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
index eb36e44be92f..a17c400467b9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/openid/ruby-openid/archive/v2.9.2.tar.gz -> ruby-openid-2.9.2.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=787f59e034a777d2b21c8942f9e7a5c1
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
index 7d081d08b99e..61c18914902f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.1.tar.gz -> ruby-prof-1.4.1.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b4f92c18ad2205838c18be95d6fab4c6
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
index dd6cb0ef90c4..33adee847ab3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.2.tar.gz -> ruby-prof-1.4.2.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=09879b02fd1beaaed3192abde17e5853
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
index 3b5339a339bb..a881a26c29d9 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=2d4058536f743b7c5cc8f9af86e02ca3
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.11 b/metadata/md5-cache/dev-ruby/rubygems-2.7.11
index cb37b4cab0bd..9b848cab3701 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.11
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.11
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.11.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b prefix de7d8e2b10085ed5ff09ad70e4753e5c
_md5_=2a5722b7227582936a4a16ef2086e597
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index dadb98b06529..9cbe5c82264c 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/rubytest-cli-0.2.0.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=969418935ca257c26e85b40d5fd34afc
diff --git a/metadata/md5-cache/dev-ruby/sanitize-5.2.2 b/metadata/md5-cache/dev-ruby/sanitize-5.2.2
index b4713e21c602..48203db752e8 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-5.2.2
+++ b/metadata/md5-cache/dev-ruby/sanitize-5.2.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=5
SRC_URI=https://github.com/rgrove/sanitize/archive/v5.2.2.tar.gz -> sanitize-5.2.2.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b97c473a8ba7fd6998c38e7d148693e8
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
index 893f641eeaef..6beb9bfcc3cc 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=dc380fd0d09c32737cdc16745de6df03
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3
index 89493706e93a..9e069507d660 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3
SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=91d7441418983c73c817af966e743028
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1 b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
index 5653a7841cda..a3f7443fdb2c 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/slim-3.0.9.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=cc83065256f384b42fcead3591e05e9b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.0.2 b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
index 15da6e66b322..642cb0a0c8ab 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.0.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.0.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://github.com/rails/sprockets/archive/v4.0.2.tar.gz -> sprockets-4.0.2-git.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=9eb168216a6ee2bbaff377c570427e78
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.8.5 b/metadata/md5-cache/dev-ruby/stringex-2.8.5
index d5566742569b..be1eafca2814 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.8.5
+++ b/metadata/md5-cache/dev-ruby/stringex-2.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/stringex-2.8.5.gem
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=6b5ddba3ea9ae6c93b8a1044865f0219
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
index 68ace2e4fd9a..9ac62ca159ba 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=c53d8f49bf69f21a12f1568a76fd7fee
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.3.9 b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
index 5cd55fa2eb7f..f6a1de3fb7d2 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.3.9
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.3.9
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ru
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://rubygems.org/gems/test-unit-3.3.9.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=523e3bb95cb4d0075ce139ea178e4ece
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.2 b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
index 7da3c820b418..d3fd6d61db8b 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.2
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/test_construct-2.0.2.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=4af7a35357abedbb4719a1fe8adc0ae8
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.0 b/metadata/md5-cache/dev-ruby/timers-4.3.0
index f9da3bf3ec63..f3a611f4e168 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.0
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://rubygems.org/gems/timers-4.3.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=99044662aeaf4a617df66cd2901f3afe
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.2 b/metadata/md5-cache/dev-ruby/timers-4.3.2
index 097fd0da0ac9..a8da8db4175c 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.2
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.2.tar.gz -> timers-4.3.2.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=3a13a29effa5a676134011eb58f7fa4d
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.3 b/metadata/md5-cache/dev-ruby/timers-4.3.3
index 844c452ed53a..eeab1d108b13 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.3
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.3
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=4
SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.3.tar.gz -> timers-4.3.3.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=3a13a29effa5a676134011eb58f7fa4d
diff --git a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1 b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
index 7d60d86f05b5..c1e7728a6dcc 100644
--- a/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
+++ b/metadata/md5-cache/dev-ruby/tty-prompt-0.23.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/piotrmurach/tty-prompt/archive/v0.23.1.tar.gz -> tty-prompt-0.23.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=930f9e3019c6454fcfde255e10e40e6c
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
index 8cdc5996c676..1c26d784f395 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/tzinfo-1.2.5.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=15bcf5011a1c1414d8aad08ba9223433
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.16 b/metadata/md5-cache/dev-ruby/vcard-0.2.16
index 68922561df97..dde2aa60ec6a 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.16
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.16
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/vcard-0.2.16.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=6364a17329983da1392dda44c9f5f4b3
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
index ebffdcac83d6..1cb555f35294 100644
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test !test? ( test )
SLOT=3
SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=88030277d71136d556fda8610ebf4504
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.8 b/metadata/md5-cache/dev-ruby/websocket-1.2.8
index 2705b08fff4b..fd0cfe2f11d7 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.8
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/websocket-1.2.8.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=da4a511359b4a5ed302da3595a0a8451
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1 b/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
index baf49a58428b..0105b9a197dc 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=2
SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.3.1.tar.gz -> zeitwerk-2.3.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=9597854c2018b209449ec5bf6b21b294
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.0 b/metadata/md5-cache/dev-ruby/zentest-4.12.0
index b30e2dcc03b3..a07aaba04dc6 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.12.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/ZenTest-4.12.0.gem
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b ruby-fakegem 5e2d0d0c89a1e9425bc8dacd73e7e940
_md5_=b1c56094b493fe627f5e38e55204f4ed
diff --git a/metadata/md5-cache/dev-scheme/chicken-4.13.0-r1 b/metadata/md5-cache/dev-scheme/chicken-4.13.0-r1
index 72e5890434e4..358af4233626 100644
--- a/metadata/md5-cache/dev-scheme/chicken-4.13.0-r1
+++ b/metadata/md5-cache/dev-scheme/chicken-4.13.0-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install postinst prepare test
DESCRIPTION=Scheme interpreter and native Scheme to C compiler
EAPI=6
HOMEPAGE=http://www.call-cc.org/
+INHERIT=versionator
IUSE=doc
KEYWORDS=~alpha amd64 ppc ppc64 x86
LICENSE=BSD
diff --git a/metadata/md5-cache/dev-scheme/slib-3.2.5-r1 b/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
index 477b35062317..df2640909bba 100644
--- a/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
+++ b/metadata/md5-cache/dev-scheme/slib-3.2.5-r1
@@ -3,6 +3,7 @@ DEPEND=>=sys-apps/texinfo-5.0 >=dev-scheme/guile-1.8.8:= gambit? ( dev-scheme/ga
DESCRIPTION=Portable Scheme library for all standard Scheme implementations
EAPI=6
HOMEPAGE=http://people.csail.mit.edu/jaffer/SLIB
+INHERIT=versionator
IUSE=gambit scm
KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=public-domain BSD
diff --git a/metadata/md5-cache/dev-tcltk/tklib-0.6-r1 b/metadata/md5-cache/dev-tcltk/tklib-0.6-r1
index 5e5cf48a0b49..65417a630b98 100644
--- a/metadata/md5-cache/dev-tcltk/tklib-0.6-r1
+++ b/metadata/md5-cache/dev-tcltk/tklib-0.6-r1
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tk:0 dev-tcltk/tcllib
DESCRIPTION=Collection of utility modules for Tk, and a companion to Tcllib
EAPI=5
HOMEPAGE=http://www.tcl.tk/software/tklib
+INHERIT=multilib
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=BSD
diff --git a/metadata/md5-cache/dev-tcltk/tklib-0.6-r2 b/metadata/md5-cache/dev-tcltk/tklib-0.6-r2
index 38af58317b33..3c7568924e42 100644
--- a/metadata/md5-cache/dev-tcltk/tklib-0.6-r2
+++ b/metadata/md5-cache/dev-tcltk/tklib-0.6-r2
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tk:0 dev-tcltk/tcllib
DESCRIPTION=Collection of utility modules for Tk, and a companion to Tcllib
EAPI=6
HOMEPAGE=http://www.tcl.tk/software/tklib
+INHERIT=multilib
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=BSD
diff --git a/metadata/md5-cache/dev-tcltk/tkpiechart-6.5-r2 b/metadata/md5-cache/dev-tcltk/tkpiechart-6.5-r2
index d33b3cd688b5..f235c1caf503 100644
--- a/metadata/md5-cache/dev-tcltk/tkpiechart-6.5-r2
+++ b/metadata/md5-cache/dev-tcltk/tkpiechart-6.5-r2
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tk:* dev-tcltk/tcllib
DESCRIPTION=create and update 2D or 3D pie charts in a Tcl/Tk application
EAPI=7
HOMEPAGE=http://jfontain.free.fr/piechart6.htm
+INHERIT=multilib
KEYWORDS=amd64 ~ppc x86
LICENSE=jfontain
RDEPEND=dev-lang/tk:* dev-tcltk/tcllib
diff --git a/metadata/md5-cache/dev-tcltk/vtcl-1.6.1_alpha1 b/metadata/md5-cache/dev-tcltk/vtcl-1.6.1_alpha1
index 86b85b3de49a..5c2f065eb0c2 100644
--- a/metadata/md5-cache/dev-tcltk/vtcl-1.6.1_alpha1
+++ b/metadata/md5-cache/dev-tcltk/vtcl-1.6.1_alpha1
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tk:*
DESCRIPTION=Visual Tcl is a high-quality application development environment
EAPI=7
HOMEPAGE=http://vtcl.sf.net
+INHERIT=edos2unix
IUSE=doc
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1 b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
index 5d18a4a0fd57..3a9fad5deea3 100644
--- a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
+++ b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
@@ -3,6 +3,7 @@ DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app
DESCRIPTION=LaTeX macros for writing documents following the ABNT norms
EAPI=7
HOMEPAGE=https://www.abntex.net.br/
+INHERIT=latex-package
IUSE=doc examples lyx
KEYWORDS=~amd64 ~x86
LICENSE=LPPL-1.3c
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.14 b/metadata/md5-cache/dev-tex/biblatex-3.14
index 6a8265051987..ac8e18b46fde 100644
--- a/metadata/md5-cache/dev-tex/biblatex-3.14
+++ b/metadata/md5-cache/dev-tex/biblatex-3.14
@@ -3,6 +3,7 @@ DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texliv
DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
EAPI=7
HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
+INHERIT=latex-package
IUSE=+biber doc examples
KEYWORDS=amd64 ~arm ~arm64 ~x86
LICENSE=LPPL-1.3
diff --git a/metadata/md5-cache/dev-tex/biblatex-gost-1.17 b/metadata/md5-cache/dev-tex/biblatex-gost-1.17
index dc95f5422eac..0f3c0fdae742 100644
--- a/metadata/md5-cache/dev-tex/biblatex-gost-1.17
+++ b/metadata/md5-cache/dev-tex/biblatex-gost-1.17
@@ -3,6 +3,7 @@ DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8
DESCRIPTION=Biblatex styles for Russian GOST 7.0.5-2008 bibliography standard
EAPI=7
HOMEPAGE=https://github.com/odomanov/biblatex-gost
+INHERIT=latex-package
KEYWORDS=~amd64 ~x86
LICENSE=LPPL-1.3c
RDEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base
diff --git a/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1 b/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
index 814a509e7e86..8347ab5c4c5c 100644
--- a/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
+++ b/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/latex-base || ( >=media-fonts/culmus-0.110[fancy] <media-fonts/cu
DESCRIPTION=Culmus fonts support for latex
EAPI=7
HOMEPAGE=http://ivritex.sourceforge.net/
+INHERIT=latex-package
IUSE=examples
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1 b/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
index 5eb1776926af..fccae1324abc 100644
--- a/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
+++ b/metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
@@ -3,11 +3,12 @@ DEPEND=media-libs/t1lib
DESCRIPTION=DVI to Grace translator
EAPI=7
HOMEPAGE=https://plasma-gate.weizmann.ac.il/Grace/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/t1lib
SLOT=0
SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/devel/dvi2gr-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=01caef578fed11c7e203a48a3f8b2b67
diff --git a/metadata/md5-cache/dev-tex/frakturx-20070103-r1 b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
index 3861e1898ad0..53224a874139 100644
--- a/metadata/md5-cache/dev-tex/frakturx-20070103-r1
+++ b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
@@ -4,6 +4,7 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=Collection of blackletter fonts for LaTeX
EAPI=7
HOMEPAGE=http://www.gaehrken.de/fraktur/
+INHERIT=eapi8-dosym latex-package
KEYWORDS=amd64 x86
LICENSE=LPPL-1.2 free-noncomm
RDEPEND=virtual/latex-base
diff --git a/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1 b/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1
index 4cdc03f7f47e..004c6deaac5d 100644
--- a/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1
+++ b/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Show hyphenations in DVI files
EAPI=7
HOMEPAGE=https://packages.debian.org/stable/tex/hyphen-show
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc64 x86
LICENSE=GPL-1+
SLOT=0
SRC_URI=mirror://debian/pool/main/h/hyphen-show/hyphen-show_20000425.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aec0373f779ac0701c6be3f5a1eef5f7
diff --git a/metadata/md5-cache/dev-tex/ivritex-1.1.2 b/metadata/md5-cache/dev-tex/ivritex-1.1.2
index 52b97d5e6a36..9b935943d385 100644
--- a/metadata/md5-cache/dev-tex/ivritex-1.1.2
+++ b/metadata/md5-cache/dev-tex/ivritex-1.1.2
@@ -3,6 +3,7 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=Hebrew support for TeX
EAPI=7
HOMEPAGE=http://ivritex.sourceforge.net/
+INHERIT=latex-package
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=LPPL-1.2
RDEPEND=virtual/latex-base
diff --git a/metadata/md5-cache/dev-tex/latex-calendar-3.1 b/metadata/md5-cache/dev-tex/latex-calendar-3.1
index b3d78552b986..a76324288b03 100644
--- a/metadata/md5-cache/dev-tex/latex-calendar-3.1
+++ b/metadata/md5-cache/dev-tex/latex-calendar-3.1
@@ -3,6 +3,7 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=LaTeX package used to create Calendars. Very flexible and robust
EAPI=7
HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/calendar/
+INHERIT=latex-package
KEYWORDS=amd64 ppc sparc x86
LICENSE=LaTeX-Calendar
RDEPEND=virtual/latex-base
diff --git a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11 b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
index 54237cfd44f6..5090e49b8f97 100644
--- a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
+++ b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
@@ -3,6 +3,7 @@ DEPEND=virtual/latex-base media-gfx/imagemagick virtual/texi2dvi test? ( dev-tex
DESCRIPTION=LaTeX to RTF converter
EAPI=6
HOMEPAGE=http://latex2rtf.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=virtual/latex-base media-gfx/imagemagick
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/latex2rtf/latex2rtf-2.3.11a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e3d1fad79d047c93ba6d4bc774022b7e
diff --git a/metadata/md5-cache/dev-tex/lgrind-3.67-r3 b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
index 43bafd6cda8a..9384afa856ad 100644
--- a/metadata/md5-cache/dev-tex/lgrind-3.67-r3
+++ b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
@@ -3,11 +3,12 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=A pretty printer for various programming languages with tex output.
EAPI=7
HOMEPAGE=http://www.tug.org/
+INHERIT=latex-package toolchain-funcs
IUSE=examples
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=BSD LGrind-Jacobson
RDEPEND=virtual/latex-base
SLOT=0
SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/lgrind-3.67.tgz
-_eclasses_=latex-package e5f296c98696dd02059bc6a5a03282e2 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=latex-package e5f296c98696dd02059bc6a5a03282e2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b31af23f289c083ce0af97ffcbec55b5
diff --git a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9 b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
index 01c4ab193ff8..d6d68c6f6dce 100644
--- a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
+++ b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
@@ -3,6 +3,7 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=Type1 cyrillic fonts collection
EAPI=7
HOMEPAGE=ftp://scon155.phys.msu.su/pub/russian/psfonts/
+INHERIT=latex-package
KEYWORDS=amd64 x86
LICENSE=LPPL-1.2
RDEPEND=virtual/latex-base
diff --git a/metadata/md5-cache/dev-tex/rail-1.2_p1-r1 b/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
index d5833c179ee3..26f8c59d8e54 100644
--- a/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
+++ b/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
@@ -4,10 +4,11 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=Offers syntax/railroad diagrams
EAPI=7
HOMEPAGE=http://www.ctan.org/tex-archive/support/rail/
+INHERIT=latex-package toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
RDEPEND=virtual/latex-base
SLOT=0
SRC_URI=http://mirror.ctan.org/support/rail.zip -> rail-1.2_p1.zip
-_eclasses_=latex-package e5f296c98696dd02059bc6a5a03282e2 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=latex-package e5f296c98696dd02059bc6a5a03282e2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b6f42f84c82eb5040565f66ee5744af7
diff --git a/metadata/md5-cache/dev-tex/tth-4.08 b/metadata/md5-cache/dev-tex/tth-4.08
index c9ffd914b069..25313ba635a7 100644
--- a/metadata/md5-cache/dev-tex/tth-4.08
+++ b/metadata/md5-cache/dev-tex/tth-4.08
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Translate TEX into HTML
EAPI=7
HOMEPAGE=http://hutchinson.belmont.ma.us/tth/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=app-text/ghostscript-gpl media-libs/netpbm
SLOT=0
SRC_URI=mirror://sourceforge/tth/tth4.08.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=52f3d4b834df804f9e484e154876ccde
diff --git a/metadata/md5-cache/dev-tex/vc-0.6 b/metadata/md5-cache/dev-tex/vc-0.6
index 533d29571192..5d2fed213a66 100644
--- a/metadata/md5-cache/dev-tex/vc-0.6
+++ b/metadata/md5-cache/dev-tex/vc-0.6
@@ -4,6 +4,7 @@ DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=The vc (version control) bundle
EAPI=7
HOMEPAGE=https://www.ctan.org/pkg/vc
+INHERIT=latex-package
KEYWORDS=~amd64 ~x86
LICENSE=CC0-1.0
RDEPEND=virtual/latex-base
diff --git a/metadata/md5-cache/dev-util/bdelta-0.3.1-r1 b/metadata/md5-cache/dev-util/bdelta-0.3.1-r1
index d17fb6075c81..bf7ba0ce5f6f 100644
--- a/metadata/md5-cache/dev-util/bdelta-0.3.1-r1
+++ b/metadata/md5-cache/dev-util/bdelta-0.3.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install unpack
DESCRIPTION=Binary Delta - Efficient difference algorithm and format
EAPI=7
HOMEPAGE=https://github.com/jjwhitney/BDelta
+INHERIT=toolchain-funcs vcs-snapshot
KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux
LICENSE=MPL-2.0
SLOT=0
SRC_URI=https://github.com/jjwhitney/BDelta/archive/v0.3.1.tar.gz -> bdelta-0.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=9c3a94c963fc1a81662985159901b73a
diff --git a/metadata/md5-cache/dev-util/bloaty-0_p20170420 b/metadata/md5-cache/dev-util/bloaty-0_p20170420
index 0379df2eec39..a3e3b0b09332 100644
--- a/metadata/md5-cache/dev-util/bloaty-0_p20170420
+++ b/metadata/md5-cache/dev-util/bloaty-0_p20170420
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/re2-0.2017.03.01
DESCRIPTION=A size profiler for binaries
EAPI=6
HOMEPAGE=https://github.com/google/bloaty
+INHERIT=vcs-snapshot toolchain-funcs
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=>=dev-libs/re2-0.2017.03.01
SLOT=0
SRC_URI=https://github.com/google/bloaty/archive/73594cde8c9a52a102c4341c244c833aa61b9c06.tar.gz -> bloaty-0_p20170420.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=81ff8352ce80f7c828031f67b0bdf9bb
diff --git a/metadata/md5-cache/dev-util/btyacc-3.0-r3 b/metadata/md5-cache/dev-util/btyacc-3.0-r3
index b21a97ea083e..a3d4d2fc389f 100644
--- a/metadata/md5-cache/dev-util/btyacc-3.0-r3
+++ b/metadata/md5-cache/dev-util/btyacc-3.0-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Backtracking YACC - modified from Berkeley YACC
EAPI=7
HOMEPAGE=https://www.siber.com/btyacc
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos
LICENSE=public-domain
SLOT=0
SRC_URI=https://www.siber.com/btyacc/btyacc-3-0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ebf84f2c1716ae5cd5c769de7fa40806
diff --git a/metadata/md5-cache/dev-util/build-0.3.10 b/metadata/md5-cache/dev-util/build-0.3.10
index 7a847cef7a32..3501141a5d38 100644
--- a/metadata/md5-cache/dev-util/build-0.3.10
+++ b/metadata/md5-cache/dev-util/build-0.3.10
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=A massively-parallel software build system implemented on top of GNU make
EAPI=6
HOMEPAGE=https://www.codesynthesis.com/projects/build/
+INHERIT=versionator
IUSE=examples
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/dev-util/build2-0.13.0 b/metadata/md5-cache/dev-util/build2-0.13.0
index 78fc04bd8347..9fa76f11394a 100644
--- a/metadata/md5-cache/dev-util/build2-0.13.0
+++ b/metadata/md5-cache/dev-util/build2-0.13.0
@@ -4,6 +4,7 @@ DEPEND=~dev-cpp/libodb-2.5.0_beta19 ~dev-cpp/libodb-sqlite-2.5.0_beta19 dev-db/s
DESCRIPTION=cross-platform toolchain for building and packaging C++ code
EAPI=7
HOMEPAGE=https://build2.org
+INHERIT=toolchain-funcs multiprocessing
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,5 +12,5 @@ RDEPEND=~dev-cpp/libodb-2.5.0_beta19 ~dev-cpp/libodb-sqlite-2.5.0_beta19 dev-db/
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045
_md5_=e316a75e700b3cbe3fecf59a6f37daa3
diff --git a/metadata/md5-cache/dev-util/clair-2.1.3 b/metadata/md5-cache/dev-util/clair-2.1.3
index 706ac700afe3..286391d28fec 100644
--- a/metadata/md5-cache/dev-util/clair-2.1.3
+++ b/metadata/md5-cache/dev-util/clair-2.1.3
@@ -4,6 +4,7 @@ DEPEND=acct-group/clair acct-user/clair
DESCRIPTION=Vulnerability Static Analysis for Containers
EAPI=7
HOMEPAGE=https://github.com/coreos/clair
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git acct-group/clair acct-user/clair !!sci-visualization/xd3d
diff --git a/metadata/md5-cache/dev-util/clair-2.1.4 b/metadata/md5-cache/dev-util/clair-2.1.4
index 6555b1dc02c8..c2ca48cc65f3 100644
--- a/metadata/md5-cache/dev-util/clair-2.1.4
+++ b/metadata/md5-cache/dev-util/clair-2.1.4
@@ -4,6 +4,7 @@ DEPEND=acct-group/clair acct-user/clair
DESCRIPTION=Vulnerability Static Analysis for Containers
EAPI=7
HOMEPAGE=https://github.com/coreos/clair
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git acct-group/clair acct-user/clair !!sci-visualization/xd3d
diff --git a/metadata/md5-cache/dev-util/crash-7.2.9 b/metadata/md5-cache/dev-util/crash-7.2.9
index c8e876bb4429..9e3ddde1266d 100644
--- a/metadata/md5-cache/dev-util/crash-7.2.9
+++ b/metadata/md5-cache/dev-util/crash-7.2.9
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
EAPI=7
HOMEPAGE=https://crash-utility.github.io/
+INHERIT=toolchain-funcs
KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
LICENSE=GPL-3
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/crash-utility/crash/archive/7.2.9.tar.gz -> crash-7.2.9.tar.gz mirror://gnu/gdb/gdb-7.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=31a6d48e7c8a30471696096e789ae707
diff --git a/metadata/md5-cache/dev-util/csup-20060318-r1 b/metadata/md5-cache/dev-util/csup-20060318-r1
index 8c1bb6f94231..d3418740c1cb 100644
--- a/metadata/md5-cache/dev-util/csup-20060318-r1
+++ b/metadata/md5-cache/dev-util/csup-20060318-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/zlib:0= dev-libs/openssl:0=
DESCRIPTION=A rewrite of CVSup
EAPI=7
HOMEPAGE=http://www.mu.org/~mux/csup.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=BSD
RDEPEND=sys-libs/zlib:0= dev-libs/openssl:0=
SLOT=0
SRC_URI=http://mu.org/~mux/csup-snap-20060318.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7ef886a418963ac93ffbe1dda655b876
diff --git a/metadata/md5-cache/dev-util/cutils-1.6-r4 b/metadata/md5-cache/dev-util/cutils-1.6-r4
index 205701d261d6..f0cb08f1979f 100644
--- a/metadata/md5-cache/dev-util/cutils-1.6-r4
+++ b/metadata/md5-cache/dev-util/cutils-1.6-r4
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=C language utilities
EAPI=7
HOMEPAGE=http://www.sigala.it/sandro/software.php#cutils
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD-2
SLOT=0
SRC_URI=http://www.sigala.it/sandro/files/cutils-1.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a2e28a9c69d5e658a479a8366a84a46b
diff --git a/metadata/md5-cache/dev-util/dissembler-0.9-r1 b/metadata/md5-cache/dev-util/dissembler-0.9-r1
index 347e064516b9..faccd7e3c192 100644
--- a/metadata/md5-cache/dev-util/dissembler-0.9-r1
+++ b/metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=polymorphs bytecode to a printable ASCII string
EAPI=6
HOMEPAGE=http://www.securiteam.com/tools/5MP0L2KFPA.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=ISC
SLOT=0
SRC_URI=https://repo.palkeo.com/repositories/mirror7.meh.or.id/Tools/OTHER_TOOLS/ShellCode/dissembler_0.9.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ca4137327bf77994da13e8c8d4c45aea
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.2.1 b/metadata/md5-cache/dev-util/drone-cli-1.2.1
index a9261a469cd8..1050ac158566 100644
--- a/metadata/md5-cache/dev-util/drone-cli-1.2.1
+++ b/metadata/md5-cache/dev-util/drone-cli-1.2.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Command-line interface for Drone
EAPI=7
HOMEPAGE=https://github.com/drone/drone-cli
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r2 b/metadata/md5-cache/dev-util/duma-2.5.15-r2
index ec59f15bc1e2..cd14e05718ae 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install postinst test
DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
EAPI=6
HOMEPAGE=http://duma.sourceforge.net
+INHERIT=toolchain-funcs versionator
IUSE=examples
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=f90b4a92c41b53cb5ed956806d6b29ed
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.3 b/metadata/md5-cache/dev-util/dwdiff-2.1.3
index bb84c1212caa..a2977f60e778 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.3
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.3
@@ -4,11 +4,12 @@ DEPEND=dev-libs/icu:= sys-apps/diffutils
DESCRIPTION=diff-like program operating at word level instead of line level
EAPI=7
HOMEPAGE=https://os.ghalkes.nl/dwdiff.html
+INHERIT=toolchain-funcs
IUSE=nls
KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-3
RDEPEND=dev-libs/icu:= sys-apps/diffutils
SLOT=0
SRC_URI=https://os.ghalkes.nl/dist/dwdiff-2.1.3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ecd213be1179f81eda18009f07dc843f
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
index 93c623a6c989..2a91579b4f6d 100644
--- a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
+++ b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r2
@@ -3,9 +3,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=A 100% compatible, enhanced implementation of the make alternative Jam
EAPI=7
HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=perforce GPL-2
SLOT=0
SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f1675ce890c02f1b9bf60e3cd3b4ab2f
diff --git a/metadata/md5-cache/dev-util/fuzz-0.6-r1 b/metadata/md5-cache/dev-util/fuzz-0.6-r1
index bdeff191a140..a0130eac8374 100644
--- a/metadata/md5-cache/dev-util/fuzz-0.6-r1
+++ b/metadata/md5-cache/dev-util/fuzz-0.6-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/readline:0=
DESCRIPTION=Stress-tests programs by giving them random input
EAPI=5
HOMEPAGE=http://fuzz.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/readline:0=
SLOT=0
SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=76e57cd7cc7fec8e7a0e52a7f98e7845
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101 b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
index f583100ccc5a..264dc8ad2f1a 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
DESCRIPTION=A collection of different plugins for Geany
EAPI=7
HOMEPAGE=https://plugins.geany.org
+INHERIT=lua-single
IUSE=ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench +lua_single_target_lua5-1
KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
SLOT=0
SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=4c4ca24c9df264fccae2617ff7015858
diff --git a/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0 b/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0
index b2be9f23d30e..366d3a389c0b 100644
--- a/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0
+++ b/metadata/md5-cache/dev-util/gitlab-ci-linter-2.2.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=linter for .gitlab-ci.yml files
EAPI=7
HOMEPAGE=https://gitlab.com/orobardet/gitlab-ci-linter
+INHERIT=go-module
KEYWORDS=amd64
LICENSE=MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-util/huc-0.1-r1 b/metadata/md5-cache/dev-util/huc-0.1-r1
index 14787373f886..6c6126b65cc3 100644
--- a/metadata/md5-cache/dev-util/huc-0.1-r1
+++ b/metadata/md5-cache/dev-util/huc-0.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=HTML umlaut conversion tool
EAPI=6
HOMEPAGE=http://www.int21.de/huc
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86 ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.int21.de/huc/huc-0.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ce5e4a1a78b6937f0b6f2ac56d4fbe96
diff --git a/metadata/md5-cache/dev-util/jfrog-cli-1.35.3 b/metadata/md5-cache/dev-util/jfrog-cli-1.35.3
index e188c57b5099..9221be09913d 100644
--- a/metadata/md5-cache/dev-util/jfrog-cli-1.35.3
+++ b/metadata/md5-cache/dev-util/jfrog-cli-1.35.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Command line utility foroperations on container images and image repositories
EAPI=7
HOMEPAGE=https://github.com/jfrog/jfrog-cli
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-util/kubebuilder-2.3.1 b/metadata/md5-cache/dev-util/kubebuilder-2.3.1
index 231021197bc2..f4150d521db8 100644
--- a/metadata/md5-cache/dev-util/kubebuilder-2.3.1
+++ b/metadata/md5-cache/dev-util/kubebuilder-2.3.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=SDK for building Kubernetes APIs using CRDs
EAPI=7
HOMEPAGE=https://book.kubebuilder.io
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD-4 ECL-2.0 JSON MIT
RESTRICT=strip
diff --git a/metadata/md5-cache/dev-util/leaktracer-2.4-r3 b/metadata/md5-cache/dev-util/leaktracer-2.4-r3
index 4368c7c327ab..941288006170 100644
--- a/metadata/md5-cache/dev-util/leaktracer-2.4-r3
+++ b/metadata/md5-cache/dev-util/leaktracer-2.4-r3
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl sys-devel/gdb
DESCRIPTION=trace and analyze memory leaks in C++ programs
EAPI=6
HOMEPAGE=http://www.andreasen.org/LeakTracer/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
RDEPEND=dev-lang/perl sys-devel/gdb
RESTRICT=test
SLOT=0
SRC_URI=mirror://gentoo/leaktracer-2.4-gentoo_p2.tbz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ea1e2f1463df9bcb931aa1dd42d80259
diff --git a/metadata/md5-cache/dev-util/lockrun-20120508-r1 b/metadata/md5-cache/dev-util/lockrun-20120508-r1
index d14c2dc4bf7e..ef2e9f626b4b 100644
--- a/metadata/md5-cache/dev-util/lockrun-20120508-r1
+++ b/metadata/md5-cache/dev-util/lockrun-20120508-r1
@@ -2,8 +2,9 @@ DEFINED_PHASES=compile install unpack
DESCRIPTION=Lockrun - runs cronjobs with overrun protection
EAPI=6
HOMEPAGE=http://www.unixwiz.net/tools/lockrun.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa x86
LICENSE=public-domain
SLOT=0
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a92dd76b4bd9e858ea6fdd059dd2c876
diff --git a/metadata/md5-cache/dev-util/makeheaders-0_p4 b/metadata/md5-cache/dev-util/makeheaders-0_p4
index 7804a962eea1..af02c9511f36 100644
--- a/metadata/md5-cache/dev-util/makeheaders-0_p4
+++ b/metadata/md5-cache/dev-util/makeheaders-0_p4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=simple utility that will automatically generate header files
EAPI=6
HOMEPAGE=http://www.hwaci.com/sw/mkhdr/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=BSD-2
SLOT=0
SRC_URI=http://www.hwaci.com/sw/mkhdr/makeheaders.c -> makeheaders-0_p4.c http://www.hwaci.com/sw/mkhdr/makeheaders.html -> makeheaders-0_p4.html
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2f7cf0c64c8492ab06e2b6533c6b54ca
diff --git a/metadata/md5-cache/dev-util/mdds-9999 b/metadata/md5-cache/dev-util/mdds-9999
index a116d7749c7c..7dfda9afebbf 100644
--- a/metadata/md5-cache/dev-util/mdds-9999
+++ b/metadata/md5-cache/dev-util/mdds-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
RDEPEND=dev-libs/boost:=
RESTRICT=!test? ( test )
SLOT=1/9999
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=f3416eb924c8a5b8af3fc8025034c220
diff --git a/metadata/md5-cache/dev-util/peg-0.1.18 b/metadata/md5-cache/dev-util/peg-0.1.18
index c771444d8237..967ae3dbc9c9 100644
--- a/metadata/md5-cache/dev-util/peg-0.1.18
+++ b/metadata/md5-cache/dev-util/peg-0.1.18
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=Recursive-descent parser generators for C
EAPI=7
HOMEPAGE=http://piumarta.com/software/peg/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
SLOT=0
SRC_URI=http://piumarta.com/software/peg/peg-0.1.18.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a052fb4b4fd4e30343af474ab8338016
diff --git a/metadata/md5-cache/dev-util/plan9port-0_pre20200526 b/metadata/md5-cache/dev-util/plan9port-0_pre20200526
index 837c4d81b69c..f0d8141dab1f 100644
--- a/metadata/md5-cache/dev-util/plan9port-0_pre20200526
+++ b/metadata/md5-cache/dev-util/plan9port-0_pre20200526
@@ -3,6 +3,7 @@ DEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontconf
DESCRIPTION=Port of many Plan 9 programs and libraries
EAPI=7
HOMEPAGE=https://9fans.github.io/plan9port/ https://github.com/9fans/plan9port
+INHERIT=multiprocessing toolchain-funcs readme.gentoo-r1
IUSE=X aqua truetype
KEYWORDS=~amd64 ~x86
LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
@@ -10,5 +11,5 @@ RDEPEND=X? ( x11-apps/xauth ) truetype? ( media-libs/freetype media-libs/fontcon
REQUIRED_USE=?? ( X aqua )
SLOT=0
SRC_URI=https://github.com/9fans/plan9port/archive/a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz -> plan9port-a6ad39aaaa36b8aadc5c35bfc803afbde32918c0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=ee0fc545a5eb9f3d78ff575aea97b64f
diff --git a/metadata/md5-cache/dev-util/premake-3.7 b/metadata/md5-cache/dev-util/premake-3.7
index 29b8573ade3f..f0e28fdd5864 100644
--- a/metadata/md5-cache/dev-util/premake-3.7
+++ b/metadata/md5-cache/dev-util/premake-3.7
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=A makefile generation tool
EAPI=5
HOMEPAGE=http://industriousone.com/premake
+INHERIT=versionator
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=3
diff --git a/metadata/md5-cache/dev-util/premake-4.4_beta5 b/metadata/md5-cache/dev-util/premake-4.4_beta5
index d83840aa9a64..2c596cf74342 100644
--- a/metadata/md5-cache/dev-util/premake-4.4_beta5
+++ b/metadata/md5-cache/dev-util/premake-4.4_beta5
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=A makefile generation tool
EAPI=6
HOMEPAGE=https://premake.github.io/
+INHERIT=versionator
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=BSD
SLOT=4
diff --git a/metadata/md5-cache/dev-util/premake-5.0.0_alpha12 b/metadata/md5-cache/dev-util/premake-5.0.0_alpha12
index 3ca69d744a3a..f3ecff907a31 100644
--- a/metadata/md5-cache/dev-util/premake-5.0.0_alpha12
+++ b/metadata/md5-cache/dev-util/premake-5.0.0_alpha12
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install test
DESCRIPTION=A makefile generation tool
EAPI=6
HOMEPAGE=https://premake.github.io/
+INHERIT=versionator
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=BSD
SLOT=5
diff --git a/metadata/md5-cache/dev-util/pretrace-0.4-r2 b/metadata/md5-cache/dev-util/pretrace-0.4-r2
index 826a863dc143..1a2863bd3175 100644
--- a/metadata/md5-cache/dev-util/pretrace-0.4-r2
+++ b/metadata/md5-cache/dev-util/pretrace-0.4-r2
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=start dynamically linked applications under debugging environment
EAPI=7
HOMEPAGE=https://github.com/robholland/pretrace
+INHERIT=readme.gentoo-r1
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/dev-util/promu-0.5.0 b/metadata/md5-cache/dev-util/promu-0.5.0
index 8cfea2352ac4..318bf0eca5d9 100644
--- a/metadata/md5-cache/dev-util/promu-0.5.0
+++ b/metadata/md5-cache/dev-util/promu-0.5.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Prometheus Utility Tool
EAPI=7
HOMEPAGE=https://github.com/prometheus/promu
+INHERIT=go-module
KEYWORDS=amd64 ~arm ~arm64 ~x86
LICENSE=Apache-2.0 BSD BSD-2 MIT
RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-util/promu-0.7.0 b/metadata/md5-cache/dev-util/promu-0.7.0
index b5a57461c172..e9bfcb6e8bce 100644
--- a/metadata/md5-cache/dev-util/promu-0.7.0
+++ b/metadata/md5-cache/dev-util/promu-0.7.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Prometheus Utility Tool
EAPI=7
HOMEPAGE=https://github.com/prometheus/promu
+INHERIT=go-module
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=Apache-2.0 BSD BSD-2 MIT
RESTRICT=strip test
diff --git a/metadata/md5-cache/dev-util/pscan-20000721-r1 b/metadata/md5-cache/dev-util/pscan-20000721-r1
index 073fda9d785e..6bc6bb6cea74 100644
--- a/metadata/md5-cache/dev-util/pscan-20000721-r1
+++ b/metadata/md5-cache/dev-util/pscan-20000721-r1
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=A limited problem scanner for C source files
EAPI=7
HOMEPAGE=http://www.striker.ottawa.on.ca/~aland/pscan/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=mirror://gentoo/pscan-20000721.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b5bede2168cced5a9649d93a46793312
diff --git a/metadata/md5-cache/dev-util/qbs-1.16.0 b/metadata/md5-cache/dev-util/qbs-1.16.0
index 374ac08eb5b9..c15f0c25289c 100644
--- a/metadata/md5-cache/dev-util/qbs-1.16.0
+++ b/metadata/md5-cache/dev-util/qbs-1.16.0
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
DESCRIPTION=Modern build tool for software projects
EAPI=7
HOMEPAGE=https://doc.qt.io/qbs/
+INHERIT=qmake-utils toolchain-funcs
IUSE=doc examples test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=|| ( LGPL-2.1 LGPL-3 )
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://download.qt.io/official_releases/qbs/1.16.0/qbs-src-1.16.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=552439f3551f29ea88655228d465ba49
diff --git a/metadata/md5-cache/dev-util/qbs-1.18.0 b/metadata/md5-cache/dev-util/qbs-1.18.0
index af8f5ae126a9..38577eea35a2 100644
--- a/metadata/md5-cache/dev-util/qbs-1.18.0
+++ b/metadata/md5-cache/dev-util/qbs-1.18.0
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
DESCRIPTION=Modern build tool for software projects
EAPI=7
HOMEPAGE=https://doc.qt.io/qbs/
+INHERIT=qmake-utils toolchain-funcs
IUSE=doc examples test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=|| ( LGPL-2.1 LGPL-3 )
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://download.qt.io/official_releases/qbs/1.18.0/qbs-src-1.18.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=57e3cbd6c2a5b60e750ab1bec875a9cf
diff --git a/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2 b/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
index 8b75f31a7158..a7e845b568f8 100644
--- a/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
+++ b/metadata/md5-cache/dev-util/qdevicemonitor-1.0.1-r2
@@ -3,10 +3,11 @@ DEPEND=app-pda/usbmuxd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-uti
DESCRIPTION=Crossplatform log viewer for Android, iOS and text files
EAPI=7
HOMEPAGE=https://github.com/alopatindev/qdevicemonitor
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=app-pda/usbmuxd dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-util/android-tools
SLOT=0
SRC_URI=https://github.com/alopatindev/qdevicemonitor/archive/1.0.1.tar.gz -> qdevicemonitor-1.0.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=0ab772b115cbe655ed995313f4db0c5a
diff --git a/metadata/md5-cache/dev-util/qstlink2-1.2.3 b/metadata/md5-cache/dev-util/qstlink2-1.2.3
index 7b60966f9366..42fc3d076a93 100644
--- a/metadata/md5-cache/dev-util/qstlink2-1.2.3
+++ b/metadata/md5-cache/dev-util/qstlink2-1.2.3
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/
DESCRIPTION=GUI and CLI ST-Link V2(Debugger/Programmer) client
EAPI=7
HOMEPAGE=https://github.com/fpoussin/QStlink2/
+INHERIT=qmake-utils udev
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1
SLOT=0
SRC_URI=https://github.com/fpoussin/QStlink2/archive/v1.2.3.tar.gz -> qstlink2-1.2.3.tar.gz https://github.com/fpoussin/QtUsb/archive/v0.2.1.tar.gz -> qtusb-0.2.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 udev 452708c3f55cf6e918b045adb949a9e6
_md5_=5d46d4414aa4776e3db45b9bcbe14c2e
diff --git a/metadata/md5-cache/dev-util/sasm-3.10.1 b/metadata/md5-cache/dev-util/sasm-3.10.1
index ce1fe4df8d8c..8866f9e365ac 100644
--- a/metadata/md5-cache/dev-util/sasm-3.10.1
+++ b/metadata/md5-cache/dev-util/sasm-3.10.1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication dev-qt/qtwidget
DESCRIPTION=Simple crossplatform IDE for NASM assembly language
EAPI=7
HOMEPAGE=http://dman95.github.io/SASM/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication dev-qt/qtwidgets:5 dev-lang/nasm sys-devel/gdb
SLOT=0
SRC_URI=https://github.com/Dman95/SASM/archive/v3.10.1.tar.gz -> sasm-3.10.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=c43474bb9e4a4f6315de8b34dba79543
diff --git a/metadata/md5-cache/dev-util/shards-0.14.1 b/metadata/md5-cache/dev-util/shards-0.14.1
index c1b356d01418..38b8f5ecefb9 100644
--- a/metadata/md5-cache/dev-util/shards-0.14.1
+++ b/metadata/md5-cache/dev-util/shards-0.14.1
@@ -3,11 +3,12 @@ DEPEND=>dev-lang/crystal-0.11.1[yaml]
DESCRIPTION=Dependency manager for the Crystal language
EAPI=7
HOMEPAGE=https://github.com/crystal-lang/shards
+INHERIT=multiprocessing toolchain-funcs
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=>dev-lang/crystal-0.11.1[yaml]
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/crystal-lang/shards/archive/v0.14.1.tar.gz -> shards-0.14.1.tar.gz https://github.com/crystal-lang/crystal-molinillo/archive/v0.1.0.tar.gz -> crystal-molinillo-0.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7cfc734149f7ab5a07e2676813ccf6c5
diff --git a/metadata/md5-cache/dev-util/stubgen-2.08 b/metadata/md5-cache/dev-util/stubgen-2.08
index 410d26c3279f..70428a3abe7a 100644
--- a/metadata/md5-cache/dev-util/stubgen-2.08
+++ b/metadata/md5-cache/dev-util/stubgen-2.08
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A member function stub generator for C++
EAPI=7
HOMEPAGE=http://www.radwin.org/michael/projects/stubgen/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
SLOT=0
SRC_URI=http://www.radwin.org/michael/projects/stubgen/dist/stubgen-2.08.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a6ded097abd8f29b3c877da05d02965a
diff --git a/metadata/md5-cache/dev-util/tinlink-1.0.0-r1 b/metadata/md5-cache/dev-util/tinlink-1.0.0-r1
index 38f37ab477dd..a9ebf98a3667 100644
--- a/metadata/md5-cache/dev-util/tinlink-1.0.0-r1
+++ b/metadata/md5-cache/dev-util/tinlink-1.0.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Tool to create very small elf binary from pure binary files
EAPI=7
HOMEPAGE=http://sed.free.fr/tinlink/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://sed.free.fr/tinlink/tinlink-1.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0e9c00a3c2a045d597b57f1f713e7116
diff --git a/metadata/md5-cache/dev-util/trinity-1.9 b/metadata/md5-cache/dev-util/trinity-1.9
index 69c52f9f5c27..7118ba56d3de 100644
--- a/metadata/md5-cache/dev-util/trinity-1.9
+++ b/metadata/md5-cache/dev-util/trinity-1.9
@@ -3,10 +3,11 @@ DEPEND=>=sys-kernel/linux-headers-4.8
DESCRIPTION=A Linux system call fuzz tester
EAPI=7
HOMEPAGE=http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.9.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=961f2787ddbaafe1e121fcd74b15d09e
diff --git a/metadata/md5-cache/dev-util/usb-robot-0.2.0 b/metadata/md5-cache/dev-util/usb-robot-0.2.0
index 02bd4d65fc65..3695c7290a44 100644
--- a/metadata/md5-cache/dev-util/usb-robot-0.2.0
+++ b/metadata/md5-cache/dev-util/usb-robot-0.2.0
@@ -3,10 +3,11 @@ DEPEND=virtual/libusb:0 sys-libs/readline
DESCRIPTION=USB Reverse engineering tools
EAPI=6
HOMEPAGE=http://usb-robot.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0 sys-libs/readline
SLOT=0
SRC_URI=mirror://sourceforge/usb-robot/usb-robot-0.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6e36676381414a902a78a3b6b77dc1d6
diff --git a/metadata/md5-cache/dev-util/vmtouch-1.3.0 b/metadata/md5-cache/dev-util/vmtouch-1.3.0
index c1049a5e3ee9..2b97ed3cff48 100644
--- a/metadata/md5-cache/dev-util/vmtouch-1.3.0
+++ b/metadata/md5-cache/dev-util/vmtouch-1.3.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
EAPI=6
HOMEPAGE=https://hoytech.com/vmtouch/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.3.0.tar.gz -> vmtouch-1.3.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=99585f3a73d71f9e74e76d196477bedd
diff --git a/metadata/md5-cache/dev-util/vmtouch-1.3.1 b/metadata/md5-cache/dev-util/vmtouch-1.3.1
index 20851e56009d..f8a06cb5ba39 100644
--- a/metadata/md5-cache/dev-util/vmtouch-1.3.1
+++ b/metadata/md5-cache/dev-util/vmtouch-1.3.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
EAPI=7
HOMEPAGE=https://hoytech.com/vmtouch/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.3.1.tar.gz -> vmtouch-1.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a9190ddbe15a3199fe7a91df4930a849
diff --git a/metadata/md5-cache/dev-util/vtable-dumper-1.2 b/metadata/md5-cache/dev-util/vtable-dumper-1.2
index a141f9354210..61bda2c86548 100644
--- a/metadata/md5-cache/dev-util/vtable-dumper-1.2
+++ b/metadata/md5-cache/dev-util/vtable-dumper-1.2
@@ -3,10 +3,11 @@ DEPEND=dev-libs/elfutils:0=
DESCRIPTION=A tool to list content of virtual tables in a shared library
EAPI=6
HOMEPAGE=https://github.com/lvc/vtable-dumper
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/elfutils:0=
SLOT=0
SRC_URI=https://github.com/lvc/vtable-dumper/archive/1.2.tar.gz -> vtable-dumper-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aa68e15bfc2897b9b65617efee65f0ca
diff --git a/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2 b/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
index 94a6e4c631f8..4a8e91aede46 100644
--- a/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
+++ b/metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
@@ -3,9 +3,10 @@ DEPEND=sys-devel/flex
DESCRIPTION=XML stream reformatter for ASCII text, but not UTF-8, written in ANSI C
EAPI=6
HOMEPAGE=http://xmlindent.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/xmlindent/xmlindent-0.2.17.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a5b455f07743e2f3acd2e63a58b6a399
diff --git a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1 b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
index 34265289923b..cd07191143bc 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/yacc
DESCRIPTION=A graphical file and directories comparator and merge tool
EAPI=7
HOMEPAGE=http://furius.ca/xxdiff/
+INHERIT=qmake-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xxdiff-4.0.1_p20170622.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=557f3fc9c7bdc2cec87c6f2930ba5331
diff --git a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2 b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
index b3773902a763..313110b2ef9a 100644
--- a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
+++ b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=A tool based on colorgcc to beautify cvs output
EAPI=6
HOMEPAGE=https://packages.gentoo.org/package/dev-vcs/colorcvs
+INHERIT=prefix
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=dev-lang/perl dev-vcs/cvs
diff --git a/metadata/md5-cache/dev-vcs/cvsync-2014.08.24.014706 b/metadata/md5-cache/dev-vcs/cvsync-2014.08.24.014706
index 4d70f37e6a66..5498f24b82f2 100644
--- a/metadata/md5-cache/dev-vcs/cvsync-2014.08.24.014706
+++ b/metadata/md5-cache/dev-vcs/cvsync-2014.08.24.014706
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib openssl? ( dev-libs/openssl:0= ) !openssl? ( gcrypt? ( dev-
DESCRIPTION=portable CVS repository synchronization utility
EAPI=6
HOMEPAGE=https://github.com/cvsync/cvsync
+INHERIT=toolchain-funcs
IUSE=gcrypt mhash +openssl
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=sys-libs/zlib openssl? ( dev-libs/openssl:0= ) !openssl? ( gcrypt? ( dev
REQUIRED_USE=!openssl? ( ^^ ( gcrypt mhash ) )
SLOT=0
SRC_URI=mirror://gentoo/cvsync-2014.08.24.014706.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=75e58163511a3fe6716550d90e90a4af
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.12.1 b/metadata/md5-cache/dev-vcs/fossil-2.12.1
index 863cdf790431..491b15c353b8 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.12.1
+++ b/metadata/md5-cache/dev-vcs/fossil-2.12.1
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite?
DESCRIPTION=Simple, high-reliability, source control management, and more
EAPI=7
HOMEPAGE=https://www.fossil-scm.org/
+INHERIT=toolchain-funcs
IUSE=debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
KEYWORDS=amd64 arm ppc ppc64 x86
LICENSE=BSD-2
@@ -11,5 +12,5 @@ REQUIRED_USE=ssl? ( !miniz )
RESTRICT=test
SLOT=0
SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.12.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5ecb21c997cd9194228c0deb48d0ec88
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.13 b/metadata/md5-cache/dev-vcs/fossil-2.13
index 4704e8f78685..486f117a2161 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.13
+++ b/metadata/md5-cache/dev-vcs/fossil-2.13
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite?
DESCRIPTION=Simple, high-reliability, source control management, and more
EAPI=7
HOMEPAGE=https://www.fossil-scm.org/
+INHERIT=toolchain-funcs
IUSE=debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=BSD-2
@@ -11,5 +12,5 @@ REQUIRED_USE=ssl? ( !miniz )
RESTRICT=test
SLOT=0
SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6f3beeebe5636b1ebb2a6c7f0c53a523
diff --git a/metadata/md5-cache/dev-vcs/fossil-2.14 b/metadata/md5-cache/dev-vcs/fossil-2.14
index 7c996d3aa467..8ee196cdf894 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.14
+++ b/metadata/md5-cache/dev-vcs/fossil-2.14
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite?
DESCRIPTION=Simple, high-reliability, source control management, and more
EAPI=7
HOMEPAGE=https://www.fossil-scm.org/
+INHERIT=toolchain-funcs
IUSE=debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=BSD-2
@@ -11,5 +12,5 @@ REQUIRED_USE=ssl? ( !miniz )
RESTRICT=test
SLOT=0
SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.14.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a64e3d4bd7139b14a621be586a050d04
diff --git a/metadata/md5-cache/dev-vcs/git-lfs-2.11.0 b/metadata/md5-cache/dev-vcs/git-lfs-2.11.0
index f58d2c1f4e27..a9590f7ba6db 100644
--- a/metadata/md5-cache/dev-vcs/git-lfs-2.11.0
+++ b/metadata/md5-cache/dev-vcs/git-lfs-2.11.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=Command line extension and specification for managing large files with git
EAPI=7
HOMEPAGE=https://git-lfs.github.com/
+INHERIT=go-module
IUSE=doc test
KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0 BSD BSD-2 BSD-4 ISC MIT
diff --git a/metadata/md5-cache/dev-vcs/rcsi-0.5 b/metadata/md5-cache/dev-vcs/rcsi-0.5
index de0d6738c369..7357d95586c8 100644
--- a/metadata/md5-cache/dev-vcs/rcsi-0.5
+++ b/metadata/md5-cache/dev-vcs/rcsi-0.5
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=A program to give information about RCS files
EAPI=7
HOMEPAGE=http://www.colinbrough.pwp.blueyonder.co.uk/rcsi.README.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-vcs/rcs-5.7-r2
SLOT=0
SRC_URI=http://www.colinbrough.pwp.blueyonder.co.uk/rcsi-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c158ba6aa4ce0c6eb0831f21fe1677c2
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.16 b/metadata/md5-cache/dev-vcs/svn2git-1.0.16
index 8b3117594e21..d088c543a2f0 100644
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.16
+++ b/metadata/md5-cache/dev-vcs/svn2git-1.0.16
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
DESCRIPTION=Tool for one-time conversion from svn to git
EAPI=7
HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
SLOT=0
SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.16.tar.gz -> svn2git-1.0.16.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=9ccee895152d9a0abd8686dfd416bfaa
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.17 b/metadata/md5-cache/dev-vcs/svn2git-1.0.17
index a4ca0dfc1364..f81371a6c8f5 100644
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.17
+++ b/metadata/md5-cache/dev-vcs/svn2git-1.0.17
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
DESCRIPTION=Tool for one-time conversion from svn to git
EAPI=7
HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
SLOT=0
SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.17.tar.gz -> svn2git-1.0.17.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=c40c53aa1d819be9f05c3151f793af31
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.18 b/metadata/md5-cache/dev-vcs/svn2git-1.0.18
index 63c849b227a1..56ccc7a83d7e 100644
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.18
+++ b/metadata/md5-cache/dev-vcs/svn2git-1.0.18
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
DESCRIPTION=Tool for one-time conversion from svn to git
EAPI=7
HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
SLOT=0
SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.18.tar.gz -> svn2git-1.0.18.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=c40c53aa1d819be9f05c3151f793af31
diff --git a/metadata/md5-cache/dev-vcs/tkcvs-9.3.2 b/metadata/md5-cache/dev-vcs/tkcvs-9.3.2
index e814ae2c0c65..694a1af42417 100644
--- a/metadata/md5-cache/dev-vcs/tkcvs-9.3.2
+++ b/metadata/md5-cache/dev-vcs/tkcvs-9.3.2
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tk
DESCRIPTION=Tcl/Tk-based graphical interface to CVS with Subversion support
EAPI=7
HOMEPAGE=https://tkcvs.sourceforge.io/
+INHERIT=desktop
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-lang/tk dev-vcs/cvs dev-vcs/subversion sys-apps/diffutils dev-util/tkdiff
diff --git a/metadata/md5-cache/dev-vcs/vcsh-1.20151229.1 b/metadata/md5-cache/dev-vcs/vcsh-1.20151229.1
index 4979301cb311..13697523357e 100644
--- a/metadata/md5-cache/dev-vcs/vcsh-1.20151229.1
+++ b/metadata/md5-cache/dev-vcs/vcsh-1.20151229.1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Manage config files in $HOME via fake bare git repositories
EAPI=6
HOMEPAGE=https://github.com/RichiH/vcsh/
+INHERIT=versionator
KEYWORDS=amd64 x86
LICENSE=|| ( GPL-3 GPL-2 )
RDEPEND=dev-vcs/git
diff --git a/metadata/md5-cache/games-action/atanks-6.5 b/metadata/md5-cache/games-action/atanks-6.5
index 240ab47fe56d..1b7dfcd0b72d 100644
--- a/metadata/md5-cache/games-action/atanks-6.5
+++ b/metadata/md5-cache/games-action/atanks-6.5
@@ -3,10 +3,11 @@ DEPEND=media-libs/allegro:0[X]
DESCRIPTION=Worms and Scorched Earth-like game
EAPI=7
HOMEPAGE=https://atanks.sourceforge.io/
+INHERIT=desktop gnome2-utils toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=media-libs/allegro:0[X]
SLOT=0
SRC_URI=mirror://sourceforge/atanks/atanks-6.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=7f7968e38cff4ceb8ff14e4107e400d2
diff --git a/metadata/md5-cache/games-action/chickens-0.2.4-r1 b/metadata/md5-cache/games-action/chickens-0.2.4-r1
index e53e1575f435..f7b43f8ef322 100644
--- a/metadata/md5-cache/games-action/chickens-0.2.4-r1
+++ b/metadata/md5-cache/games-action/chickens-0.2.4-r1
@@ -3,6 +3,7 @@ DEPEND=acct-group/gamestat <media-libs/allegro-5
DESCRIPTION=Target chickens with rockets and shotguns. Funny
EAPI=6
HOMEPAGE=http://www.chickensforlinux.com/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=all-rights-reserved
RDEPEND=acct-group/gamestat <media-libs/allegro-5
diff --git a/metadata/md5-cache/games-action/formido-1.0.1-r2 b/metadata/md5-cache/games-action/formido-1.0.1-r2
index c394d46bb5d8..709b8f53d617 100644
--- a/metadata/md5-cache/games-action/formido-1.0.1-r2
+++ b/metadata/md5-cache/games-action/formido-1.0.1-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer
DESCRIPTION=A shooting game in the spirit of Phobia games
EAPI=7
HOMEPAGE=http://www.mhgames.org/oldies/formido/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer
SLOT=0
SRC_URI=http://noe.falzon.free.fr/prog/formido-1.0.1.tar.gz http://koti.mbnet.fi/lsoft/formido/formido-music.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1a6cfc396369c4f33bd88404ca48169b
diff --git a/metadata/md5-cache/games-action/gltron-0.70-r2 b/metadata/md5-cache/games-action/gltron-0.70-r2
index d7b2a43ecae0..a70ac40aec72 100644
--- a/metadata/md5-cache/games-action/gltron-0.70-r2
+++ b/metadata/md5-cache/games-action/gltron-0.70-r2
@@ -3,6 +3,7 @@ DEPEND=media-libs/libmikmod media-libs/libpng:0 media-libs/libsdl[sound,video] m
DESCRIPTION=3d tron, just like the movie
EAPI=6
HOMEPAGE=http://gltron.sourceforge.net/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libmikmod media-libs/libpng:0 media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound[vorbis,mikmod] media-libs/smpeg virtual/opengl
diff --git a/metadata/md5-cache/games-action/snipes-1.0.4-r1 b/metadata/md5-cache/games-action/snipes-1.0.4-r1
index 7c1aa855443a..94747b1f6645 100644
--- a/metadata/md5-cache/games-action/snipes-1.0.4-r1
+++ b/metadata/md5-cache/games-action/snipes-1.0.4-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video]
DESCRIPTION=2D scrolling shooter, resembles the old DOS game of same name
EAPI=6
HOMEPAGE=https://cyp.github.com/snipes/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video]
SLOT=0
SRC_URI=https://cyp.github.com/snipes/snipes-1.0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b7e94941434ee46a3ddb74fbfdbff141
diff --git a/metadata/md5-cache/games-action/transcend-0.3-r1 b/metadata/md5-cache/games-action/transcend-0.3-r1
index fad8736362cf..c72ff7de928e 100644
--- a/metadata/md5-cache/games-action/transcend-0.3-r1
+++ b/metadata/md5-cache/games-action/transcend-0.3-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/freeglut media-libs/portaudio x11-libs/libXi x11-libs/libXmu v
DESCRIPTION=Retro-style, abstract, 2D shooter
EAPI=6
HOMEPAGE=http://transcend.sourceforge.net/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/freeglut media-libs/portaudio x11-libs/libXi x11-libs/libXmu virtual/glu virtual/opengl
diff --git a/metadata/md5-cache/games-action/tuxkart-0.4.0-r2 b/metadata/md5-cache/games-action/tuxkart-0.4.0-r2
index e617c0fad882..100f0c42a6be 100644
--- a/metadata/md5-cache/games-action/tuxkart-0.4.0-r2
+++ b/metadata/md5-cache/games-action/tuxkart-0.4.0-r2
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/plib-1.8.0 x11-libs/libX11 x11-libs/libICE x11-libs/libSM x1
DESCRIPTION=A racing game starring Tux, the Linux penguin
EAPI=7
HOMEPAGE=http://tuxkart.sourceforge.net/
+INHERIT=desktop xdg
KEYWORDS=~alpha ~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=media-libs/plib-1.8.0 x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXi x11-libs/libXmu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/tuxkart/tuxkart-0.4.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=d53231935b1020c1d32ce1201ac04ec5
diff --git a/metadata/md5-cache/games-arcade/abe-1.1-r1 b/metadata/md5-cache/games-arcade/abe-1.1-r1
index 182f6248c2fb..f5f886d5a91d 100644
--- a/metadata/md5-cache/games-arcade/abe-1.1-r1
+++ b/metadata/md5-cache/games-arcade/abe-1.1-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis
DESCRIPTION=A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game
EAPI=6
HOMEPAGE=http://abe.sourceforge.net/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis]
SLOT=0
SRC_URI=mirror://sourceforge/abe/abe-1.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=65e4be0e1284f04cd4b5af9b4ee6e914
diff --git a/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1 b/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
index 89850e033918..a7e20b72eebf 100644
--- a/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
+++ b/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0
DESCRIPTION=An ncurses-based Xenon clone
EAPI=7
HOMEPAGE=http://www.alessandropira.org/alienwave/aw.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0
SLOT=0
SRC_URI=http://www.alessandropira.org/alienwave/alienwave-0.4.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=df8234991e86238ac78bd5540c3fc050
diff --git a/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1 b/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
index 6beb41c611cd..3b1fa3b90e64 100644
--- a/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
+++ b/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
DESCRIPTION=A cool Jump'n Run game offering some unique visual effects
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
diff --git a/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1 b/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
index abc4bbe56e93..5b0f66e3071c 100644
--- a/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
+++ b/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video]
DESCRIPTION=Fly a hot air balloon and try to blow the other player out of the screen
EAPI=6
HOMEPAGE=http://makegho.mbnet.fi/c/bchase/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video]
SLOT=0
SRC_URI=http://makegho.mbnet.fi/c/bchase/balloonchase-0.9.6.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1b835598566c112f11445778d80ade2d
diff --git a/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1 b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
index c7569f91871b..76d033767bc0 100644
--- a/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
+++ b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
DESCRIPTION=clone of the Atari 2600 game "Circus Atari"
EAPI=6
HOMEPAGE=http://www.newbreedsoftware.com/circus-linux/
+INHERIT=desktop
KEYWORDS=~alpha ~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
diff --git a/metadata/md5-cache/games-arcade/cob-0.9-r1 b/metadata/md5-cache/games-arcade/cob-0.9-r1
index bbcd414f6055..b03c9382a23d 100644
--- a/metadata/md5-cache/games-arcade/cob-0.9-r1
+++ b/metadata/md5-cache/games-arcade/cob-0.9-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[joystick,sound,video]
DESCRIPTION=Cruising on Broadway: a painting-type game
EAPI=6
HOMEPAGE=http://www.autismuk.freeserve.co.uk/
+INHERIT=desktop
KEYWORDS=~alpha ~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[joystick,sound,video]
diff --git a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1 b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
index 559eb5d28fb2..1ce0e1c728f0 100644
--- a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
+++ b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
DESCRIPTION=Guide the blob along the conveyer belt collecting the red blobs
EAPI=6
HOMEPAGE=http://www.cloudsprinter.com/software/conveysdl/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
SLOT=0
SRC_URI=http://www.cloudsprinter.com/software/conveysdl/conveysdl.1.3.tar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b6a724a5b60940fb0462fd051e8a8545
diff --git a/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1 b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
index d360aad4e63e..2edbf6d64b6a 100644
--- a/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
+++ b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
DESCRIPTION=A clone of the arcade game Defender, but with a Linux theme
EAPI=6
HOMEPAGE=http://www.newbreedsoftware.com/defendguin/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
diff --git a/metadata/md5-cache/games-arcade/digger-20140423-r1 b/metadata/md5-cache/games-arcade/digger-20140423-r1
index 102111b91f4e..e9048a8cb3ee 100644
--- a/metadata/md5-cache/games-arcade/digger-20140423-r1
+++ b/metadata/md5-cache/games-arcade/digger-20140423-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[X,video] x11-libs/libX11
DESCRIPTION=Digger Remastered
EAPI=6
HOMEPAGE=http://www.digger.org/
+INHERIT=desktop
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[X,video] x11-libs/libX11
diff --git a/metadata/md5-cache/games-arcade/excido-0.1.5c-r3 b/metadata/md5-cache/games-arcade/excido-0.1.5c-r3
index 8fb7a60dd1eb..25b3b2726aac 100644
--- a/metadata/md5-cache/games-arcade/excido-0.1.5c-r3
+++ b/metadata/md5-cache/games-arcade/excido-0.1.5c-r3
@@ -3,6 +3,7 @@ DEPEND=dev-games/physfs media-libs/libsdl[opengl] media-libs/sdl-mixer media-lib
DESCRIPTION=A fast paced action game
EAPI=6
HOMEPAGE=http://icculus.org/excido/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-games/physfs media-libs/libsdl[opengl] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-image[png] media-libs/openal media-libs/freealut
diff --git a/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r2 b/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r2
index cbd51a802426..9d57b49e448d 100644
--- a/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r2
+++ b/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r2
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl media-libs/sdl-image[png] opengl? ( virtual/opengl )
DESCRIPTION=An SDL port of xkobo, a addictive space shoot-em-up
EAPI=7
HOMEPAGE=http://www.olofson.net/kobodl/
+INHERIT=desktop
IUSE=opengl
KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-arcade/komi-1.04-r1 b/metadata/md5-cache/games-arcade/komi-1.04-r1
index 81052b1b25bd..028bebadec09 100644
--- a/metadata/md5-cache/games-arcade/komi-1.04-r1
+++ b/metadata/md5-cache/games-arcade/komi-1.04-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
DESCRIPTION=Komi the Space Frog - simple SDL game of collection
EAPI=6
HOMEPAGE=http://komi.sourceforge.net
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
diff --git a/metadata/md5-cache/games-arcade/late-0.1.0-r1 b/metadata/md5-cache/games-arcade/late-0.1.0-r1
index 193c5ef7ee9f..ad9879287aef 100644
--- a/metadata/md5-cache/games-arcade/late-0.1.0-r1
+++ b/metadata/md5-cache/games-arcade/late-0.1.0-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image[jpeg]
DESCRIPTION=A game, similar to Barrack by Ambrosia Software
EAPI=6
HOMEPAGE=http://late.sourceforge.net/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[jpeg]
diff --git a/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2 b/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2
index 8a20ef2ece55..718ca6c118f9 100644
--- a/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2
+++ b/metadata/md5-cache/games-arcade/moleinvasion-0.4-r2
@@ -3,11 +3,12 @@ DEPEND=media-libs/libsdl[opengl,video] media-libs/sdl-image[jpeg,png] media-libs
DESCRIPTION=Mole infested 2D platform game
EAPI=7
HOMEPAGE=http://moleinvasion.tuxfamily.org/
+INHERIT=desktop toolchain-funcs
IUSE=music
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
SLOT=0
SRC_URI=ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-0.4.tar.bz2 music? ( mirror://gentoo/moleinvasion-music-20090731.tar.gz )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6418c436f6b20c0145d378fd0e097613
diff --git a/metadata/md5-cache/games-arcade/netris-0.52-r3 b/metadata/md5-cache/games-arcade/netris-0.52-r3
index b23200f66727..1a4edf29f5ff 100644
--- a/metadata/md5-cache/games-arcade/netris-0.52-r3
+++ b/metadata/md5-cache/games-arcade/netris-0.52-r3
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=Classic networked version of T*tris
EAPI=7
HOMEPAGE=http://www.netris.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~mips ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=ftp://ftp.netris.org/pub/netris/netris-0.52.tar.gz mirror://debian/pool/main/n/netris/netris_0.52-10.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=85df0c09b33da62d337d8ca6011be6bc
diff --git a/metadata/md5-cache/games-arcade/nibbles-0.0.4-r1 b/metadata/md5-cache/games-arcade/nibbles-0.0.4-r1
index 44a7313987ff..5d95a3b1ebc7 100644
--- a/metadata/md5-cache/games-arcade/nibbles-0.0.4-r1
+++ b/metadata/md5-cache/games-arcade/nibbles-0.0.4-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=An ncurses-based Nibbles clone
EAPI=7
HOMEPAGE=http://www.earth.li/projectpurple/progs/nibbles.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=http://www.earth.li/projectpurple/files/nibbles-v0.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=de1fe9af7d5e5d54e56f1a1da5fee422
diff --git a/metadata/md5-cache/games-arcade/openbubbles-1.2-r1 b/metadata/md5-cache/games-arcade/openbubbles-1.2-r1
index 43b535b71c74..a9664a224cd6 100644
--- a/metadata/md5-cache/games-arcade/openbubbles-1.2-r1
+++ b/metadata/md5-cache/games-arcade/openbubbles-1.2-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-g
DESCRIPTION=A clone of Evan Bailey's game Bubbles
EAPI=6
HOMEPAGE=https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/
+INHERIT=desktop
KEYWORDS=~amd64 ~hppa ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-gfx
diff --git a/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r2 b/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r2
index d0a73b68c23f..d90ea866999a 100644
--- a/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r2
+++ b/metadata/md5-cache/games-arcade/opentyrian-2.1.20130907-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-net
DESCRIPTION=Open-source port of the DOS game Tyrian, vertical scrolling shooter
EAPI=7
HOMEPAGE=https://github.com/opentyrian/opentyrian
+INHERIT=desktop toolchain-funcs xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=media-libs/libsdl[video] media-libs/sdl-net
SLOT=0
SRC_URI=http://darklomax.org/tyrian/tyrian21.zip http://www.camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=a4fd6367d7de130cbe899e7d7bb7095e
diff --git a/metadata/md5-cache/games-arcade/penguin-command-1.6.11-r1 b/metadata/md5-cache/games-arcade/penguin-command-1.6.11-r1
index 4245ad15d120..8cf1ffbdf606 100644
--- a/metadata/md5-cache/games-arcade/penguin-command-1.6.11-r1
+++ b/metadata/md5-cache/games-arcade/penguin-command-1.6.11-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[mod] media-l
DESCRIPTION=A clone of the classic Missile Command game
EAPI=6
HOMEPAGE=http://www.linux-games.com/penguin-command/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[jpeg,png]
diff --git a/metadata/md5-cache/games-arcade/sable-1.0-r1 b/metadata/md5-cache/games-arcade/sable-1.0-r1
index d18c739aa485..f6e2ec36136a 100644
--- a/metadata/md5-cache/games-arcade/sable-1.0-r1
+++ b/metadata/md5-cache/games-arcade/sable-1.0-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] media-libs/
DESCRIPTION=A frantic 3D space shooter
EAPI=6
HOMEPAGE=http://jeuxlibres.net/showgame/sable.html
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer
diff --git a/metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1 b/metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1
index 994d3b710ed3..dac5287f9d4d 100644
--- a/metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1
+++ b/metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/opengl media-libs/sdl-mixer media-libs/libsdl[sound,joystick,vide
DESCRIPTION=Rework of Sasteroids using SDL
EAPI=6
HOMEPAGE=http://sdlsas.sourceforge.net/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=sdlsasteroids GPL-2+ public-domain
RDEPEND=virtual/opengl media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf
diff --git a/metadata/md5-cache/games-arcade/spacerider-0.13-r1 b/metadata/md5-cache/games-arcade/spacerider-0.13-r1
index b8de46c8b66a..90163024e221 100644
--- a/metadata/md5-cache/games-arcade/spacerider-0.13-r1
+++ b/metadata/md5-cache/games-arcade/spacerider-0.13-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-gfx media-libs/sdl-mixer me
DESCRIPTION=Space-shooter written in C++, using the SDL
EAPI=6
HOMEPAGE=http://www.hackl.dhs.org/spacerider/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-gfx media-libs/sdl-mixer media-libs/sdl-image[jpeg] media-libs/sdl-net media-libs/sdl-ttf
diff --git a/metadata/md5-cache/games-arcade/spout-1.3-r1 b/metadata/md5-cache/games-arcade/spout-1.3-r1
index 45c76b6f633d..aef81e1b0230 100644
--- a/metadata/md5-cache/games-arcade/spout-1.3-r1
+++ b/metadata/md5-cache/games-arcade/spout-1.3-r1
@@ -3,6 +3,7 @@ DEPEND=>=media-libs/libsdl-1.2.6
DESCRIPTION=Abstract Japanese caveflier / shooter
EAPI=7
HOMEPAGE=http://freshmeat.net/projects/spout/
+INHERIT=desktop readme.gentoo-r1
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2
RDEPEND=>=media-libs/libsdl-1.2.6
diff --git a/metadata/md5-cache/games-arcade/supertransball2-1.5-r1 b/metadata/md5-cache/games-arcade/supertransball2-1.5-r1
index 945754662eed..f55a58ebaf0e 100644
--- a/metadata/md5-cache/games-arcade/supertransball2-1.5-r1
+++ b/metadata/md5-cache/games-arcade/supertransball2-1.5-r1
@@ -4,6 +4,7 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer
DESCRIPTION=Thrust clone
EAPI=7
HOMEPAGE=http://www.braingames.getput.com/stransball2/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-sound media-libs/sge
diff --git a/metadata/md5-cache/games-arcade/syobon-1.0.1-r1 b/metadata/md5-cache/games-arcade/syobon-1.0.1-r1
index 840fca78bac4..aefc5f78412a 100644
--- a/metadata/md5-cache/games-arcade/syobon-1.0.1-r1
+++ b/metadata/md5-cache/games-arcade/syobon-1.0.1-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-gfx media-libs/sdl
DESCRIPTION=Syobon Action (also known as Cat Mario or Neko Mario)
EAPI=6
HOMEPAGE=http://zapek.com/?p=189
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis]
diff --git a/metadata/md5-cache/games-arcade/trailblazer-0.9-r1 b/metadata/md5-cache/games-arcade/trailblazer-0.9-r1
index 2ac942abc7ab..b55765459744 100644
--- a/metadata/md5-cache/games-arcade/trailblazer-0.9-r1
+++ b/metadata/md5-cache/games-arcade/trailblazer-0.9-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video]
DESCRIPTION=Guide a ball through a succession of levels while avoiding holes
EAPI=7
HOMEPAGE=http://www.autismuk.freeserve.co.uk/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video]
SLOT=0
SRC_URI=http://www.autismuk.freeserve.co.uk/trailblazer-0.9.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2ee78ce79e0bd75e266fd7f25ed9710b
diff --git a/metadata/md5-cache/games-arcade/tuxdash-0.8-r1 b/metadata/md5-cache/games-arcade/tuxdash-0.8-r1
index 1f1e879034ee..671714a0e4fc 100644
--- a/metadata/md5-cache/games-arcade/tuxdash-0.8-r1
+++ b/metadata/md5-cache/games-arcade/tuxdash-0.8-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf
DESCRIPTION=A simple BoulderDash clone
EAPI=6
HOMEPAGE=http://www.tuxdash.de/index.php?language=EN
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf
SLOT=0
SRC_URI=http://www.tuxdash.de/ressources/downloads/tuxdash_src_0.8.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=47787f4985c527d302ca5a8849155f01
diff --git a/metadata/md5-cache/games-arcade/tuxpuck-0.8.2-r2 b/metadata/md5-cache/games-arcade/tuxpuck-0.8.2-r2
index 88726f20c593..5516a7cee020 100644
--- a/metadata/md5-cache/games-arcade/tuxpuck-0.8.2-r2
+++ b/metadata/md5-cache/games-arcade/tuxpuck-0.8.2-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl media-libs/libpng:0= media-libs/libvorbis virtual/jpeg:
DESCRIPTION=Hover hockey
EAPI=7
HOMEPAGE=http://home.no.net/munsuun/tuxpuck/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~alpha ~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl media-libs/libpng:0= media-libs/libvorbis virtual/jpeg:0
SLOT=0
SRC_URI=http://home.no.net/munsuun/tuxpuck/files/tuxpuck-0.8.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=eba235e1f4fe0cdc4999683f736337c7
diff --git a/metadata/md5-cache/games-arcade/wop-0.4.3-r2 b/metadata/md5-cache/games-arcade/wop-0.4.3-r2
index d387be2e28d4..f7fef3767e3d 100644
--- a/metadata/md5-cache/games-arcade/wop-0.4.3-r2
+++ b/metadata/md5-cache/games-arcade/wop-0.4.3-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer media-libs/sd
DESCRIPTION=Worms of Prey - A multi-player, real-time clone of Worms
EAPI=6
HOMEPAGE=http://wormsofprey.org/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf
SLOT=0
SRC_URI=http://wormsofprey.org/download/wop-0.4.3-src.tar.bz2 http://wormsofprey.org/download/wopdata-2005-12-21.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3528ee8d7127941c18575f25cd05533c
diff --git a/metadata/md5-cache/games-arcade/xbubble-0.5.8-r1 b/metadata/md5-cache/games-arcade/xbubble-0.5.8-r1
index 711dc59afa42..c7e05da964df 100644
--- a/metadata/md5-cache/games-arcade/xbubble-0.5.8-r1
+++ b/metadata/md5-cache/games-arcade/xbubble-0.5.8-r1
@@ -3,6 +3,7 @@ DEPEND=x11-libs/libX11 x11-libs/libXt media-libs/libpng:0= nls? ( virtual/libint
DESCRIPTION=A Puzzle Bobble clone similar to Frozen-Bubble
EAPI=6
HOMEPAGE=http://www.nongnu.org/xbubble/
+INHERIT=desktop
IUSE=nls
KEYWORDS=~alpha ~amd64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-arcade/xrick-021212-r2 b/metadata/md5-cache/games-arcade/xrick-021212-r2
index a4dd82eeac84..256c371647df 100644
--- a/metadata/md5-cache/games-arcade/xrick-021212-r2
+++ b/metadata/md5-cache/games-arcade/xrick-021212-r2
@@ -3,11 +3,12 @@ DEPEND=media-libs/libsdl[video]
DESCRIPTION=Clone of the Rick Dangerous adventure game from the 80's
EAPI=7
HOMEPAGE=http://www.bigorno.net/xrick/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-1+ xrick
RDEPEND=media-libs/libsdl[video]
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://www.bigorno.net/xrick/xrick-021212.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c060422276a1837fb71a107e54b95f3e
diff --git a/metadata/md5-cache/games-arcade/xsfcave-0.5-r1 b/metadata/md5-cache/games-arcade/xsfcave-0.5-r1
index 115e3ab95c38..93650ad83e12 100644
--- a/metadata/md5-cache/games-arcade/xsfcave-0.5-r1
+++ b/metadata/md5-cache/games-arcade/xsfcave-0.5-r1
@@ -3,6 +3,7 @@ DEPEND=x11-libs/libXext x11-libs/libSM
DESCRIPTION=A X11 sfcave clone
EAPI=6
HOMEPAGE=http://xsfcave.idios.org
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
RDEPEND=x11-libs/libXext x11-libs/libSM
diff --git a/metadata/md5-cache/games-arcade/xtux-20030306-r1 b/metadata/md5-cache/games-arcade/xtux-20030306-r1
index d69564e1b5b6..62f7264c5498 100644
--- a/metadata/md5-cache/games-arcade/xtux-20030306-r1
+++ b/metadata/md5-cache/games-arcade/xtux-20030306-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXpm
DESCRIPTION=Multiplayer Gauntlet-style arcade game
EAPI=7
HOMEPAGE=http://xtux.sourceforge.net/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXpm media-fonts/font-adobe-75dpi
SLOT=0
SRC_URI=mirror://sourceforge/xtux/xtux-src-20030306.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ca0967356f600f97898196569add64be
diff --git a/metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1 b/metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1
index d9b0d47d9b0c..d742fcb57e23 100644
--- a/metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1
+++ b/metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,joystick,video]
DESCRIPTION=Remake of the Atari 2600 classic Yar's Revenge
EAPI=6
HOMEPAGE=http://freshmeat.net/projects/yarsrevenge/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,joystick,video]
diff --git a/metadata/md5-cache/games-board/camato-0.7.4-r1 b/metadata/md5-cache/games-board/camato-0.7.4-r1
index 195d80dd1651..f1f16e68f7f8 100644
--- a/metadata/md5-cache/games-board/camato-0.7.4-r1
+++ b/metadata/md5-cache/games-board/camato-0.7.4-r1
@@ -3,6 +3,7 @@ DEPEND=dev-ruby/ruby-gtk2
DESCRIPTION=A map editor for the game gnocatan
EAPI=6
HOMEPAGE=http://yusei.ragondux.com/loisirs_jdp_catane_camato-en.html
+INHERIT=versionator
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-ruby/ruby-gtk2
diff --git a/metadata/md5-cache/games-board/fruit-2.1-r1 b/metadata/md5-cache/games-board/fruit-2.1-r1
index 6d32bd3c3dc2..6211ac2198ad 100644
--- a/metadata/md5-cache/games-board/fruit-2.1-r1
+++ b/metadata/md5-cache/games-board/fruit-2.1-r1
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=UCI-only chess engine
EAPI=6
HOMEPAGE=http://arctrix.com/nas/fruit/
+INHERIT=versionator
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/games-board/gnushogi-1.4.1-r1 b/metadata/md5-cache/games-board/gnushogi-1.4.1-r1
index 5e53bb1b6ab6..b16ec185e41b 100644
--- a/metadata/md5-cache/games-board/gnushogi-1.4.1-r1
+++ b/metadata/md5-cache/games-board/gnushogi-1.4.1-r1
@@ -4,6 +4,7 @@ DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXaw )
DESCRIPTION=Japanese version of chess (commandline + X-Version)
EAPI=7
HOMEPAGE=https://www.gnu.org/software/gnushogi/
+INHERIT=desktop
IUSE=X
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
diff --git a/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2 b/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
index 7327788bbef7..2744cd1b2963 100644
--- a/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
+++ b/metadata/md5-cache/games-board/gtkboard-0.11_pre0-r2
@@ -4,6 +4,7 @@ DEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] x11-libs/gtk+:2
DESCRIPTION=Board games system
EAPI=7
HOMEPAGE=http://gtkboard.sourceforge.net/indexold.html
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] x11-libs/gtk+:2
diff --git a/metadata/md5-cache/games-board/mah-jong-1.16 b/metadata/md5-cache/games-board/mah-jong-1.16
index d914a9149bab..5cfb32590e94 100644
--- a/metadata/md5-cache/games-board/mah-jong-1.16
+++ b/metadata/md5-cache/games-board/mah-jong-1.16
@@ -4,10 +4,11 @@ DEPEND=x11-libs/gtk+:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A networked Mah Jong program, together with a computer player
EAPI=7
HOMEPAGE=https://mahjong.julianbradfield.org/
+INHERIT=desktop toolchain-funcs xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=https://mahjong.julianbradfield.org/Source/mj-1.16-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=903a0e0477fb468dfd3367e0185aeae2
diff --git a/metadata/md5-cache/games-board/phalanx-22-r1 b/metadata/md5-cache/games-board/phalanx-22-r1
index d9a837a1faf4..1410be82c86f 100644
--- a/metadata/md5-cache/games-board/phalanx-22-r1
+++ b/metadata/md5-cache/games-board/phalanx-22-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A chess engine suitable for beginner and intermediate players
EAPI=6
HOMEPAGE=http://phalanx.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/phalanx/Phalanx-XXII.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=67f40b93a4fc852c0b01c1c2ff87c240
diff --git a/metadata/md5-cache/games-board/pokerth-1.1.2 b/metadata/md5-cache/games-board/pokerth-1.1.2
index 21b85171277b..21893f56d0d4 100644
--- a/metadata/md5-cache/games-board/pokerth-1.1.2
+++ b/metadata/md5-cache/games-board/pokerth-1.1.2
@@ -4,11 +4,12 @@ DEPEND=dev-db/sqlite:3 dev-libs/boost:0=[threads(+)] dev-libs/libgcrypt:0 dev-li
DESCRIPTION=Texas Hold'em poker game
EAPI=7
HOMEPAGE=https://www.pokerth.net/
+INHERIT=desktop qmake-utils xdg
IUSE=dedicated
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
RDEPEND=dev-db/sqlite:3 dev-libs/boost:0=[threads(+)] dev-libs/libgcrypt:0 dev-libs/protobuf:0= dev-libs/tinyxml[stl] dev-qt/qtcore:5 dev-qt/qtnetwork:5 >=net-libs/libircclient-1.6-r2 >=net-misc/curl-7.16 virtual/gsasl !dedicated? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] )
SLOT=0
SRC_URI=mirror://sourceforge/pokerth/pokerth-1.1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=74fee3a680dfb73e5b8cf05c7682c052
diff --git a/metadata/md5-cache/games-board/simsu-1.3.9 b/metadata/md5-cache/games-board/simsu-1.3.9
index 5617765c714d..6f87ad1d09a8 100644
--- a/metadata/md5-cache/games-board/simsu-1.3.9
+++ b/metadata/md5-cache/games-board/simsu-1.3.9
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=Basic sudoku game
EAPI=7
HOMEPAGE=https://gottcode.org/simsu/
+INHERIT=desktop qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/simsu/simsu-1.3.9-src.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=c0b597a4d6a9ff167faafda824f6f388
diff --git a/metadata/md5-cache/games-board/stockfish-10 b/metadata/md5-cache/games-board/stockfish-10
index 49ad2e8b234a..e92de8ea0000 100644
--- a/metadata/md5-cache/games-board/stockfish-10
+++ b/metadata/md5-cache/games-board/stockfish-10
@@ -3,10 +3,11 @@ DEPEND=|| ( app-arch/unzip app-arch/zip )
DESCRIPTION=Free UCI chess engine, claimed to be the strongest in the world
EAPI=7
HOMEPAGE=https://stockfishchess.org/
+INHERIT=toolchain-funcs
IUSE=cpu_flags_arm_v7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug general-32 general-64 +optimize
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=https://stockfish.s3.amazonaws.com/stockfish-10-src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=456d0f9d446ae8dd71264a09e9c88e96
diff --git a/metadata/md5-cache/games-board/tetzle-2.1.3 b/metadata/md5-cache/games-board/tetzle-2.1.3
index 3726b0b102a7..6a4ae2b59f44 100644
--- a/metadata/md5-cache/games-board/tetzle-2.1.3
+++ b/metadata/md5-cache/games-board/tetzle-2.1.3
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-util/desktop-file-u
DESCRIPTION=Jigsaw puzzle game that uses tetrominoes for the pieces
EAPI=7
HOMEPAGE=https://gottcode.org/tetzle/
+INHERIT=qmake-utils xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/tetzle/tetzle-2.1.3-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=1d5df8470c08bdbe5a44922ab0aaf014
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.11-r2 b/metadata/md5-cache/games-emulation/desmume-0.9.11-r2
index 8363b9a5bffc..3374331fa518 100644
--- a/metadata/md5-cache/games-emulation/desmume-0.9.11-r2
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.11-r2
@@ -3,10 +3,11 @@ DEPEND=dev-libs/zziplib gnome-base/libglade media-libs/libsdl[joystick,opengl,vi
DESCRIPTION=Nintendo DS emulator
EAPI=7
HOMEPAGE=http://desmume.org/
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/zziplib gnome-base/libglade media-libs/libsdl[joystick,opengl,video] sys-libs/zlib virtual/opengl x11-libs/agg >=x11-libs/gtk+-2.8.0:2
SLOT=0
SRC_URI=mirror://sourceforge/desmume/desmume-0.9.11.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=3f0bb330815699a6ec0737a6358f1516
diff --git a/metadata/md5-cache/games-emulation/dosbox-0.74.3 b/metadata/md5-cache/games-emulation/dosbox-0.74.3
index 0ce5f5469eb0..f36c631371f9 100644
--- a/metadata/md5-cache/games-emulation/dosbox-0.74.3
+++ b/metadata/md5-cache/games-emulation/dosbox-0.74.3
@@ -11,5 +11,5 @@ LICENSE=GPL-2
RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
SLOT=0
SRC_URI=mirror://sourceforge/dosbox/dosbox-0.74-3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 desktop c0d27bf73aa08ca05b663dbd31fbef28
_md5_=5b07692396fea72205a5013515887ecd
diff --git a/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1 b/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
index f9f21a067677..cd28eac134dd 100644
--- a/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
+++ b/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
@@ -4,6 +4,7 @@ DEPEND=>=virtual/jre-1.8:1.8
DESCRIPTION=A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro
EAPI=7
HOMEPAGE=https://github.com/optyfr/JRomManager
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1 unRAR
RDEPEND=>=virtual/jre-1.8:1.8
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
index db3997ea1dc5..0f0e80a1ac77 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-audio-sdl-2.5.9
@@ -3,11 +3,12 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] l
DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin
EAPI=7
HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
IUSE=libsamplerate oss speex
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:= ) speex? ( media-libs/speex:= media-libs/speexdsp:= )
SLOT=0
SRC_URI=https://github.com/mupen64plus/mupen64plus-audio-sdl/releases/download/2.5.9/mupen64plus-audio-sdl-src-2.5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6166c6bfa9b4c28aa6e8e8cd979acf45
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
index eec494556d08..5cf264f07dfd 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
@@ -4,6 +4,7 @@ DEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-lib
DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, core library
EAPI=7
HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
IUSE=debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
@@ -11,5 +12,5 @@ RDEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-li
REQUIRED_USE=gles2-only? ( !osd )
SLOT=0/2-sdl2
SRC_URI=https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5.9/mupen64plus-core-src-2.5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8d5dd7b23cfc7a4fc43f5183d7fdb879
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
index cbe5efebab28..19d315465f55 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-input-sdl-2.5.9
@@ -3,10 +3,11 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joystic
DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL input plugin
EAPI=7
HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=[joystick]
SLOT=0
SRC_URI=https://github.com/mupen64plus/mupen64plus-input-sdl/releases/download/2.5.9/mupen64plus-input-sdl-src-2.5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f60e23fc19c6d3599d4c16d7a2793ec4
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9 b/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
index 0a098494847a..1db8826691ea 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
+++ b/metadata/md5-cache/games-emulation/mupen64plus-ui-console-2.5.9
@@ -4,10 +4,11 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=
DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, console UI
EAPI=7
HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=games-emulation/mupen64plus-core-2.5.9:0= media-libs/libsdl2:0=
SLOT=0
SRC_URI=https://github.com/mupen64plus/mupen64plus-ui-console/releases/download/2.5.9/mupen64plus-ui-console-src-2.5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=ad67fec13e13241d19813fc0dbda4fc6
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
index 5d1b6d63a039..39b027777a12 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5.9-r2
@@ -3,11 +3,12 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:
DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin
EAPI=7
HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
IUSE=gles2-only hires cpu_flags_x86_sse
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] sys-libs/zlib:0= virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] ) hires? ( dev-libs/boost:0= )
SLOT=0
SRC_URI=https://github.com/mupen64plus/mupen64plus-video-glide64mk2/releases/download/2.5.9/mupen64plus-video-glide64mk2-src-2.5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=85bc27a1130c0612e497cb75fd665657
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
index fdbe91e758f2..269d43b89e32 100644
--- a/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
+++ b/metadata/md5-cache/games-emulation/mupen64plus-video-rice-2.5.9-r2
@@ -3,11 +3,12 @@ DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:
DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, rice video plugin
EAPI=7
HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
IUSE=gles2-only cpu_flags_x86_sse
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2-only=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0= gles2-only? ( media-libs/libsdl2:0[gles2] )
SLOT=0
SRC_URI=https://github.com/mupen64plus/mupen64plus-video-rice/releases/download/2.5.9/mupen64plus-video-rice-src-2.5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5651b4d8b76964c729840f4078e90451
diff --git a/metadata/md5-cache/games-engines/dMagnetic-0.30 b/metadata/md5-cache/games-engines/dMagnetic-0.30
index 2f6cc71729b9..ea54d002d2ad 100644
--- a/metadata/md5-cache/games-engines/dMagnetic-0.30
+++ b/metadata/md5-cache/games-engines/dMagnetic-0.30
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=A Magnetic Scrolls Interpreter for playing a collection of old text adventures
EAPI=7
HOMEPAGE=https://www.dettus.net/dMagnetic/
+INHERIT=prefix toolchain-funcs
KEYWORDS=~amd64 ~arm ~m68k ~x86
LICENSE=BSD-2
SLOT=0
SRC_URI=https://www.dettus.net/dMagnetic/dMagnetic_0.30.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bfee25942e19ad9df736d5199a380fb3
diff --git a/metadata/md5-cache/games-engines/frotz-2.52 b/metadata/md5-cache/games-engines/frotz-2.52
index daeabb929d0a..ac659ee8e41d 100644
--- a/metadata/md5-cache/games-engines/frotz-2.52
+++ b/metadata/md5-cache/games-engines/frotz-2.52
@@ -4,6 +4,7 @@ DEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media-
DESCRIPTION=Interpreter for Z-code based text games
EAPI=7
HOMEPAGE=https://661.org/proj/if/frotz/
+INHERIT=toolchain-funcs
IUSE=ncurses sdl sound unicode
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao media
REQUIRED_USE=sound? ( || ( ncurses sdl ) )
SLOT=0
SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/2.52/frotz-2.52.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=68e421b3f251349c7e67a8db511d6c3d
diff --git a/metadata/md5-cache/games-engines/love-0.7.2-r100 b/metadata/md5-cache/games-engines/love-0.7.2-r100
index 7205a9161091..c6092cc1b4ec 100644
--- a/metadata/md5-cache/games-engines/love-0.7.2-r100
+++ b/metadata/md5-cache/games-engines/love-0.7.2-r100
@@ -3,6 +3,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phys
DESCRIPTION=A framework for 2D games in Lua
EAPI=7
HOMEPAGE=https://love2d.org/
+INHERIT=lua-single
IUSE=+lua_single_target_lua5-1
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
@@ -10,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phy
REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
SLOT=0.7
SRC_URI=https://github.com/love2d/love/releases/download/0.7.2/love-0.7.2-linux-src.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=10f7ba063f6d3b4563e25286ad25e59d
diff --git a/metadata/md5-cache/games-engines/love-0.8.0-r100 b/metadata/md5-cache/games-engines/love-0.8.0-r100
index 58805b8d765c..96493830880f 100644
--- a/metadata/md5-cache/games-engines/love-0.8.0-r100
+++ b/metadata/md5-cache/games-engines/love-0.8.0-r100
@@ -3,6 +3,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phys
DESCRIPTION=A framework for 2D games in Lua
EAPI=7
HOMEPAGE=https://love2d.org/
+INHERIT=lua-single
IUSE=+lua_single_target_lua5-1
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ZLIB
@@ -10,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phy
REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
SLOT=0.8
SRC_URI=https://github.com/love2d/love/releases/download/0.8.0/love-0.8.0-linux-src.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=1aaf212d856523453a02655bf518a30e
diff --git a/metadata/md5-cache/games-engines/love-11.3-r100 b/metadata/md5-cache/games-engines/love-11.3-r100
index 65777ad03465..616b5d524bed 100644
--- a/metadata/md5-cache/games-engines/love-11.3-r100
+++ b/metadata/md5-cache/games-engines/love-11.3-r100
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_
DESCRIPTION=A framework for 2D games in Lua
EAPI=7
HOMEPAGE=https://love2d.org/
+INHERIT=lua-single xdg-utils
IUSE=lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ZLIB
@@ -10,5 +11,5 @@ RDEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single
REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
SLOT=0
SRC_URI=https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-src.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=771fbb30f04cf5c19ff95f0f7e98e9c5
diff --git a/metadata/md5-cache/games-engines/qtads-3.0.0 b/metadata/md5-cache/games-engines/qtads-3.0.0
index 9171a1f0a2f2..0b66521ccc2e 100644
--- a/metadata/md5-cache/games-engines/qtads-3.0.0
+++ b/metadata/md5-cache/games-engines/qtads-3.0.0
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5
DESCRIPTION=Multimedia interpreter for TADS text adventures
EAPI=7
HOMEPAGE=https://realnc.github.io/qtads
+INHERIT=qmake-utils xdg
IUSE=+sound
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 sound? ( media-libs/libsdl2[sound] media-libs/libsndfile media-libs/libvorbis media-sound/fluidsynth:0= media-sound/mpg123 )
SLOT=0
SRC_URI=https://github.com/realnc/qtads/releases/download/v3.0.0/qtads-3.0.0-source.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=903febb28efe6a396652502d21aa0b03
diff --git a/metadata/md5-cache/games-engines/residualvm-0.3.1-r2 b/metadata/md5-cache/games-engines/residualvm-0.3.1-r2
index 568b2678f45c..9e2ae39819fb 100644
--- a/metadata/md5-cache/games-engines/residualvm-0.3.1-r2
+++ b/metadata/md5-cache/games-engines/residualvm-0.3.1-r2
@@ -4,11 +4,12 @@ DEPEND=media-libs/glew:0= media-libs/libsdl2[X,sound,alsa,joystick,opengl,video]
DESCRIPTION=A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures
EAPI=7
HOMEPAGE=https://www.residualvm.org/
+INHERIT=desktop toolchain-funcs xdg
IUSE=alsa debug jpeg mpeg2 mp3 opengl png truetype vorbis zlib
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=media-libs/glew:0= media-libs/libsdl2[X,sound,alsa,joystick,opengl,video] virtual/glu alsa? ( media-libs/alsa-lib ) jpeg? ( virtual/jpeg:0 ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) truetype? ( media-libs/freetype:2 ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib:= )
SLOT=0
SRC_URI=https://www.residualvm.org/downloads/release/0.3.1/residualvm-0.3.1-sources.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=881f14a252c024beff374bf6a328c130
diff --git a/metadata/md5-cache/games-fps/redeclipse-1.6.0-r3 b/metadata/md5-cache/games-fps/redeclipse-1.6.0-r3
index c4cd7f7d127d..7b0c3ac0d7ea 100644
--- a/metadata/md5-cache/games-fps/redeclipse-1.6.0-r3
+++ b/metadata/md5-cache/games-fps/redeclipse-1.6.0-r3
@@ -3,6 +3,7 @@ DEPEND=!dedicated? ( media-libs/freetype:2 media-libs/libsdl2[opengl] media-libs
DESCRIPTION=First-person ego-shooter, built as a total conversion of Cube Engine 2
EAPI=6
HOMEPAGE=https://www.redeclipse.net
+INHERIT=desktop
IUSE=dedicated
KEYWORDS=~amd64 ~x86
LICENSE=HPND ZLIB CC-BY-SA-3.0
diff --git a/metadata/md5-cache/games-fps/redeclipse-2.0.0-r1 b/metadata/md5-cache/games-fps/redeclipse-2.0.0-r1
index 639fd3f44124..7b43dbba24d5 100644
--- a/metadata/md5-cache/games-fps/redeclipse-2.0.0-r1
+++ b/metadata/md5-cache/games-fps/redeclipse-2.0.0-r1
@@ -3,6 +3,7 @@ DEPEND=!dedicated? ( media-libs/freetype:2 media-libs/libsdl2[opengl] media-libs
DESCRIPTION=First-person ego-shooter, built as a total conversion of Cube Engine 2
EAPI=7
HOMEPAGE=https://www.redeclipse.net
+INHERIT=desktop
IUSE=dedicated
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB CC-BY-SA-4.0
diff --git a/metadata/md5-cache/games-fps/worldofpadman-1.6-r1 b/metadata/md5-cache/games-fps/worldofpadman-1.6-r1
index 9b13edf72557..7ab3ca7e680f 100644
--- a/metadata/md5-cache/games-fps/worldofpadman-1.6-r1
+++ b/metadata/md5-cache/games-fps/worldofpadman-1.6-r1
@@ -3,6 +3,7 @@ DEPEND=sys-libs/zlib !dedicated? ( >=media-libs/speex-1.2.0 media-libs/speexdsp
DESCRIPTION=A cartoon style multiplayer first-person shooter
EAPI=6
HOMEPAGE=https://worldofpadman.net/
+INHERIT=desktop
IUSE=+curl dedicated maps +openal +theora +vorbis
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 worldofpadman
diff --git a/metadata/md5-cache/games-fps/yamagi-quake2-7.45 b/metadata/md5-cache/games-fps/yamagi-quake2-7.45
index 1bb2c4a0e8e9..b9f875fca4c5 100644
--- a/metadata/md5-cache/games-fps/yamagi-quake2-7.45
+++ b/metadata/md5-cache/games-fps/yamagi-quake2-7.45
@@ -3,6 +3,7 @@ DEPEND=client? ( media-libs/libsdl2[video] !openal? ( media-libs/libsdl2[sound]
DESCRIPTION=Quake 2 engine focused on single player
EAPI=7
HOMEPAGE=https://www.yamagi.org/quake2/
+INHERIT=desktop wrapper
IUSE=+client ctf dedicated openal +opengl rogue softrender xatrix
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-kids/lletters-0.1.95-r4 b/metadata/md5-cache/games-kids/lletters-0.1.95-r4
index c28db37d7b98..fcb325b30d10 100644
--- a/metadata/md5-cache/games-kids/lletters-0.1.95-r4
+++ b/metadata/md5-cache/games-kids/lletters-0.1.95-r4
@@ -4,6 +4,7 @@ DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
DESCRIPTION=Game that helps young kids learn their letters and numbers
EAPI=7
HOMEPAGE=http://lln.sourceforge.net
+INHERIT=desktop
IUSE=nls
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-misc/c++robots-0-r1 b/metadata/md5-cache/games-misc/c++robots-0-r1
index ffcbd58c2cf7..5a5335aa1581 100644
--- a/metadata/md5-cache/games-misc/c++robots-0-r1
+++ b/metadata/md5-cache/games-misc/c++robots-0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=ongoing 'King of the Hill' (KotH) tournament
EAPI=7
HOMEPAGE=http://www.gamerz.net/c++robots/
+INHERIT=toolchain-funcs
KEYWORDS=~x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://gentoo/c++robots-0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b437b8c8f337d61510adb5d7f9810ad1
diff --git a/metadata/md5-cache/games-misc/gtklife-5.2 b/metadata/md5-cache/games-misc/gtklife-5.2
index cb572995af00..bd0b37309080 100644
--- a/metadata/md5-cache/games-misc/gtklife-5.2
+++ b/metadata/md5-cache/games-misc/gtklife-5.2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dev-util/desktop-file-uti
DESCRIPTION=A Conway's Life simulator for Unix
EAPI=7
HOMEPAGE=http://ironphoenix.org/tril/gtklife/
+INHERIT=desktop xdg
KEYWORDS=~amd64 ~hppa ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11
SLOT=0
SRC_URI=http://ironphoenix.org/tril/gtklife/gtklife-5.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=4baba1b8f33deb8c762db2b0ca227759
diff --git a/metadata/md5-cache/games-misc/sdljoytest-11102003 b/metadata/md5-cache/games-misc/sdljoytest-11102003
index 430a77e55ee5..b50c7efea979 100644
--- a/metadata/md5-cache/games-misc/sdljoytest-11102003
+++ b/metadata/md5-cache/games-misc/sdljoytest-11102003
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-im
DESCRIPTION=SDL app to test joysticks and game controllers
EAPI=7
HOMEPAGE=http://sdljoytest.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-image
SLOT=0
SRC_URI=mirror://sourceforge/sdljoytest/SDLJoytest-GL-11102003.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6330859dcd84e2c48d9ce2cf18f5e720
diff --git a/metadata/md5-cache/games-misc/wtf-20210130 b/metadata/md5-cache/games-misc/wtf-20210130
index 6030a814d75e..d344d96feed8 100644
--- a/metadata/md5-cache/games-misc/wtf-20210130
+++ b/metadata/md5-cache/games-misc/wtf-20210130
@@ -3,6 +3,7 @@ DEPEND=!games-misc/bsd-games
DESCRIPTION=Translates acronyms for you
EAPI=7
HOMEPAGE=https://netbsd.org/
+INHERIT=prefix
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=!games-misc/bsd-games
diff --git a/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1 b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
index 37dbd61ebcc6..5d717827f4c7 100644
--- a/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
+++ b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
@@ -4,10 +4,11 @@ DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image
DESCRIPTION=Create as many words as you can before the time runs out
EAPI=7
HOMEPAGE=http://www.coralquest.com/anagramarama/
+INHERIT=desktop toolchain-funcs vcs-clean
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 sys-apps/miscfiles
SLOT=0
SRC_URI=http://www.omega.clara.net/anagramarama/dist/anagramarama-0.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=443a5310580513752c42a951fcdee196
diff --git a/metadata/md5-cache/games-puzzle/biniax2-1.30-r1 b/metadata/md5-cache/games-puzzle/biniax2-1.30-r1
index 705b72ab2baa..adb61c1e96ef 100644
--- a/metadata/md5-cache/games-puzzle/biniax2-1.30-r1
+++ b/metadata/md5-cache/games-puzzle/biniax2-1.30-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
DESCRIPTION=Logic game with arcade and tactics modes
EAPI=6
HOMEPAGE=http://biniax.com/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
diff --git a/metadata/md5-cache/games-puzzle/color-lines-0.6-r1 b/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
index 89d4dbfec24e..fab725834686 100644
--- a/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
+++ b/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl
DESCRIPTION=Color lines game written with SDL with bonus features
EAPI=6
HOMEPAGE=https://github.com/OpenA/color-lines-sdl
+INHERIT=desktop
KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
diff --git a/metadata/md5-cache/games-puzzle/colorcode-0.8.5 b/metadata/md5-cache/games-puzzle/colorcode-0.8.5
index 396796633304..12aec0d78b24 100644
--- a/metadata/md5-cache/games-puzzle/colorcode-0.8.5
+++ b/metadata/md5-cache/games-puzzle/colorcode-0.8.5
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=Free advanced MasterMind clone
EAPI=7
HOMEPAGE=http://colorcode.laebisch.com/
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=http://colorcode.laebisch.com/download/ColorCode-0.8.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=d6cf6dc6fa727906f41126e00e16c5e2
diff --git a/metadata/md5-cache/games-puzzle/concentration-1.2-r2 b/metadata/md5-cache/games-puzzle/concentration-1.2-r2
index 2b975fac7d8e..5119a6331718 100644
--- a/metadata/md5-cache/games-puzzle/concentration-1.2-r2
+++ b/metadata/md5-cache/games-puzzle/concentration-1.2-r2
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sd
DESCRIPTION=The classic memory game with some new life
EAPI=6
HOMEPAGE=https://packages.gentoo.org/package/games-puzzle/concentration
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.2.11 b/metadata/md5-cache/games-puzzle/connectagram-1.2.11
index 903c8f081252..94b1b9246d38 100644
--- a/metadata/md5-cache/games-puzzle/connectagram-1.2.11
+++ b/metadata/md5-cache/games-puzzle/connectagram-1.2.11
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
DESCRIPTION=A word unscrambling game
EAPI=7
HOMEPAGE=https://gottcode.org/connectagram/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.11-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=abc7b7f3d4298f6b052beaa0fe34f675
diff --git a/metadata/md5-cache/games-puzzle/cutemaze-1.2.6 b/metadata/md5-cache/games-puzzle/cutemaze-1.2.6
index b9cb345c4188..a6dbe440bb8d 100644
--- a/metadata/md5-cache/games-puzzle/cutemaze-1.2.6
+++ b/metadata/md5-cache/games-puzzle/cutemaze-1.2.6
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
DESCRIPTION=Simple, top-down game in which mazes are randomly generated
EAPI=7
HOMEPAGE=https://gottcode.org/cutemaze/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/cutemaze/cutemaze-1.2.6-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=fa769d7ab351eb10c0730d66e8912cc9
diff --git a/metadata/md5-cache/games-puzzle/einstein-2.1.1 b/metadata/md5-cache/games-puzzle/einstein-2.1.1
index 1cb55a78cc92..5b5577b0094e 100644
--- a/metadata/md5-cache/games-puzzle/einstein-2.1.1
+++ b/metadata/md5-cache/games-puzzle/einstein-2.1.1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
DESCRIPTION=A puzzle game inspired by Albert Einstein
EAPI=6
HOMEPAGE=https://github.com/lksj/einstein-puzzle
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
diff --git a/metadata/md5-cache/games-puzzle/fbg-0.9-r2 b/metadata/md5-cache/games-puzzle/fbg-0.9-r2
index 2b557140fdb9..934c95a1f756 100644
--- a/metadata/md5-cache/games-puzzle/fbg-0.9-r2
+++ b/metadata/md5-cache/games-puzzle/fbg-0.9-r2
@@ -3,6 +3,7 @@ DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,vide
DESCRIPTION=A Tetris clone written in OpenGL
EAPI=6
HOMEPAGE=http://fbg.sourceforge.net/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
diff --git a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2 b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
index 5b128ac616e0..2eedf7840d2d 100644
--- a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
+++ b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
@@ -3,11 +3,12 @@ DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod
DESCRIPTION=Clone of the famous PuyoPuyo game
EAPI=6
HOMEPAGE=http://www.ios-software.com/?page=projet&quoi=29
+INHERIT=desktop toolchain-funcs
IUSE=opengl
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
SLOT=0
SRC_URI=http://www.ios-software.com/flobopuyo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=26fe71f928008f30b69e16742940d9ef
diff --git a/metadata/md5-cache/games-puzzle/freesweep-1.0.1 b/metadata/md5-cache/games-puzzle/freesweep-1.0.1
index 2f8ecdd48398..0dea894c46a2 100644
--- a/metadata/md5-cache/games-puzzle/freesweep-1.0.1
+++ b/metadata/md5-cache/games-puzzle/freesweep-1.0.1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=Console Minesweeper
EAPI=7
HOMEPAGE=https://github.com/rwestlund/freesweep
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://github.com/rwestlund/freesweep/archive/v1.0.1.tar.gz -> freesweep-1.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=309653650a6875e19642c905f3e0e42d
diff --git a/metadata/md5-cache/games-puzzle/galaxis-1.8-r1 b/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
index a0cc4b8accf3..95a9dd9542dc 100644
--- a/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
+++ b/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
@@ -4,10 +4,11 @@ DEPEND=>=sys-libs/ncurses-5.3:0=
DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
EAPI=7
HOMEPAGE=http://www.catb.org/~esr/galaxis/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.3:0=
SLOT=0
SRC_URI=http://www.catb.org/~esr/galaxis/galaxis-1.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=31b8a24ad1aa432e38d55e4aa37f12b4
diff --git a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2 b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2
index 746cbac7d3e7..3535a24c5479 100644
--- a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2
+++ b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2
@@ -3,6 +3,7 @@ DEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1
DESCRIPTION=A puzzle game where it's your job to clear the screen of gems
EAPI=6
HOMEPAGE=http://www.newbreedsoftware.com/gemdropx/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
diff --git a/metadata/md5-cache/games-puzzle/gottet-1.1.9 b/metadata/md5-cache/games-puzzle/gottet-1.1.9
index a94b14eeaf6e..edc25a81d541 100644
--- a/metadata/md5-cache/games-puzzle/gottet-1.1.9
+++ b/metadata/md5-cache/games-puzzle/gottet-1.1.9
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=Tetris clone based on Qt5
EAPI=7
HOMEPAGE=https://gottcode.org/gottet/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/gottet/gottet-1.1.9-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9eacf914a17ca5d83543fa73d0d9ce5a
diff --git a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2 b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
index 2aba5bf6f8c8..4dae3745ca66 100644
--- a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
+++ b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
@@ -3,6 +3,7 @@ DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( >=sys-d
DESCRIPTION=An entertaining game based on the old DOS game lines
EAPI=6
HOMEPAGE=http://gtkballs.antex.ru/
+INHERIT=desktop
IUSE=nls
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1 b/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
index d7bf67e20a64..d7055efe0e27 100644
--- a/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
+++ b/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
@@ -3,6 +3,7 @@ DEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/s
DESCRIPTION=The classic word guessing game
EAPI=6
HOMEPAGE=http://www.shiftygames.com/hangman/hangman.html
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf sys-apps/miscfiles
diff --git a/metadata/md5-cache/games-puzzle/hexalate-1.1.6 b/metadata/md5-cache/games-puzzle/hexalate-1.1.6
index b3be2b519ad6..49089ab7271f 100644
--- a/metadata/md5-cache/games-puzzle/hexalate-1.1.6
+++ b/metadata/md5-cache/games-puzzle/hexalate-1.1.6
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=A color matching game
EAPI=7
HOMEPAGE=https://gottcode.org/hexalate/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/hexalate/hexalate-1.1.6-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=e80268b6e0c8ee98741a81196eeaa165
diff --git a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1 b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
index 8f0f10715863..7944ec6f07a7 100644
--- a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
+++ b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
DESCRIPTION=Trap and capture penguins on Antarctica
EAPI=6
HOMEPAGE=http://www.mattdm.org/icebreaker/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-40.0.1 b/metadata/md5-cache/games-puzzle/lightsoff-40.0.1
index dad7f938c614..1eba1dc9fafd 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-40.0.1
+++ b/metadata/md5-cache/games-puzzle/lightsoff-40.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
RDEPEND=>=dev-libs/glib-2.38.0:2 >=x11-libs/gtk+-3.24.0:3 >=gnome-base/librsvg-2.32.0:2
SLOT=0
SRC_URI=mirror://gnome/sources/lightsoff/40/lightsoff-40.0.1.tar.xz
-_eclasses_=gnome.org df5c6c53843e1be0aad724138e78bbc3 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 meson 00d6fba6e500964c50ba74d1d1fc2e6c vala 12de027593aabf8f7d7df8d6c702db16 xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_eclasses_=gnome.org df5c6c53843e1be0aad724138e78bbc3 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 meson 00d6fba6e500964c50ba74d1d1fc2e6c xdg c7ba313ea1eaf266f95cc6235f7d6a07 vala 12de027593aabf8f7d7df8d6c702db16
_md5_=2843d1caac70f7c2ac5a2f2c95639ecb
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1 b/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
index e820394d13d3..5f750c83a5f7 100644
--- a/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
+++ b/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel
DESCRIPTION=A classical memory game
EAPI=6
HOMEPAGE=http://lgames.sourceforge.net/LPairs/
+INHERIT=desktop
IUSE=nls sound
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
diff --git a/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1 b/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
index d7b39db039b2..61332c09dabb 100644
--- a/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
+++ b/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
@@ -3,6 +3,7 @@ DEPEND=x11-libs/libXaw
DESCRIPTION=Four-dimensional analog of Rubik's cube
EAPI=6
HOMEPAGE=http://www.superliminal.com/cube/cube.htm
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=free-noncomm
RDEPEND=x11-libs/libXaw
diff --git a/metadata/md5-cache/games-puzzle/mindless-1.6-r1 b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
index f6a997b66877..5d934b68d1b9 100644
--- a/metadata/md5-cache/games-puzzle/mindless-1.6-r1
+++ b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
@@ -3,6 +3,7 @@ DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg:2 vir
DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
EAPI=6
HOMEPAGE=http://mindless.sourceforge.net/
+INHERIT=desktop readme.gentoo-r1
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc
diff --git a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2 b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
index 17b1f101ef6e..e752386d0f4c 100644
--- a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
+++ b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
@@ -3,11 +3,12 @@ DEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-
DESCRIPTION=A game like Deflektor (C 64) or Mindbender (Amiga)
EAPI=6
HOMEPAGE=https://www.artsoft.org/mirrormagic/
+INHERIT=desktop toolchain-funcs
IUSE=sdl
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image )
SLOT=0
SRC_URI=https://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=73634a1bf8744f106cfc9c58e2551476
diff --git a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2 b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
index 1f9582af46ae..a48e192feb1a 100644
--- a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
+++ b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Tcl/Tk variant of the well-known 15-puzzle game
EAPI=7
HOMEPAGE=http://www.naskita.com/linux/penguzzle/penguzzle.shtml
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=penguzzle
RDEPEND=dev-lang/tk:0= dev-tcltk/tclx
diff --git a/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1 b/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1
index ad3ec4e36a7e..021d0bb70dd7 100644
--- a/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1
+++ b/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1
@@ -3,6 +3,7 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext medi
DESCRIPTION=A tetris clone with multiplayer support
EAPI=6
HOMEPAGE=https://github.com/quadra-game/quadra
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib
diff --git a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2 b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
index 76b12ba3f997..873ef168737e 100644
--- a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
+++ b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
DESCRIPTION=Puzzle game like the known tetromino and the average pipe games
EAPI=7
HOMEPAGE=https://tamentis.com/projects/rezerwar/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
SLOT=0
SRC_URI=https://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=67bde81bddf5ec1f76b4892e607efb25
diff --git a/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1 b/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
index b10dcf58b0cc..85283584db59 100644
--- a/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
+++ b/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[opengl,video] virtual/opengl
DESCRIPTION=Swap and match 3 or more jewels in a line in order to score points
EAPI=6
HOMEPAGE=http://www.linuxmotors.com/gljewel/
+INHERIT=desktop vcs-clean
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.5.3 b/metadata/md5-cache/games-puzzle/tanglet-1.5.3
index 6b1546cfb9cd..887e04dbc691 100644
--- a/metadata/md5-cache/games-puzzle/tanglet-1.5.3
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.5.3
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib dev-util/
DESCRIPTION=Single player word finding game based on Boggle
EAPI=7
HOMEPAGE=https://gottcode.org/tanglet/
+INHERIT=qmake-utils xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib
SLOT=0
SRC_URI=https://gottcode.org/tanglet/tanglet-1.5.3-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=f433cfba4142da8626d37bf7c1a63861
diff --git a/metadata/md5-cache/games-puzzle/tint-0.03b-r1 b/metadata/md5-cache/games-puzzle/tint-0.03b-r1
index c464d7b3e2b8..d4d16dbf96a1 100644
--- a/metadata/md5-cache/games-puzzle/tint-0.03b-r1
+++ b/metadata/md5-cache/games-puzzle/tint-0.03b-r1
@@ -4,10 +4,11 @@ DEPEND=>=sys-libs/ncurses-5.4-r1:0=
DESCRIPTION=Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
EAPI=7
HOMEPAGE=http://oasis.frogfoot.net/code/tint/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=BSD
RDEPEND=>=sys-libs/ncurses-5.4-r1:0=
SLOT=0
SRC_URI=http://oasis.frogfoot.net/code/tint/download/0.03b/tint_0.03b.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=059255c958fb4478101c14b2012a69e9
diff --git a/metadata/md5-cache/games-puzzle/tod-0-r2 b/metadata/md5-cache/games-puzzle/tod-0-r2
index 27f9977791ff..24ec14514c6e 100644
--- a/metadata/md5-cache/games-puzzle/tod-0-r2
+++ b/metadata/md5-cache/games-puzzle/tod-0-r2
@@ -3,6 +3,7 @@ DEPEND=media-libs/allegro:0[X] app-arch/unzip
DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
EAPI=7
HOMEPAGE=http://www.pineight.com/tod/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/allegro:0[X]
diff --git a/metadata/md5-cache/games-puzzle/tong-1.2-r1 b/metadata/md5-cache/games-puzzle/tong-1.2-r1
index f69128ba688d..c0fe8af27daf 100644
--- a/metadata/md5-cache/games-puzzle/tong-1.2-r1
+++ b/metadata/md5-cache/games-puzzle/tong-1.2-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-l
DESCRIPTION=Tetris and Pong in the same place at the same time
EAPI=6
HOMEPAGE=http://www.nongnu.org/tong/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
diff --git a/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1 b/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
index 57f9eea8772c..04ed69677116 100644
--- a/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
+++ b/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
@@ -3,6 +3,7 @@ DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-ima
DESCRIPTION=Match rising tiles before reaching the top to score as many points as possible
EAPI=6
HOMEPAGE=http://www.shiftygames.com/torrent/torrent.html
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
diff --git a/metadata/md5-cache/games-puzzle/twindistress-1.1.0 b/metadata/md5-cache/games-puzzle/twindistress-1.1.0
index d1a49527f39f..11e57296b6d7 100644
--- a/metadata/md5-cache/games-puzzle/twindistress-1.1.0
+++ b/metadata/md5-cache/games-puzzle/twindistress-1.1.0
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[v
DESCRIPTION=Match and remove all of the blocks before time runs out
EAPI=7
HOMEPAGE=http://twind.sourceforge.net/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
SLOT=0
SRC_URI=mirror://sourceforge/twind/twind-1.1.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=65156933052433f460466b9d20b7f814
diff --git a/metadata/md5-cache/games-puzzle/wizznic-369-r1 b/metadata/md5-cache/games-puzzle/wizznic-369-r1
index ebf2d35a9bec..40a4ab4cde7e 100644
--- a/metadata/md5-cache/games-puzzle/wizznic-369-r1
+++ b/metadata/md5-cache/games-puzzle/wizznic-369-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png]
DESCRIPTION=Block-clearing puzzle game
EAPI=6
HOMEPAGE=http://wizznic.org/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
diff --git a/metadata/md5-cache/games-puzzle/xpired-1.22-r1 b/metadata/md5-cache/games-puzzle/xpired-1.22-r1
index 2dc5262ae5de..282279242261 100644
--- a/metadata/md5-cache/games-puzzle/xpired-1.22-r1
+++ b/metadata/md5-cache/games-puzzle/xpired-1.22-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
DESCRIPTION=A Sokoban-styled puzzle game with lots more action
EAPI=6
HOMEPAGE=http://xpired.sourceforge.net
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
index 759cea2a6f83..e73bff81067d 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
@@ -3,6 +3,7 @@ DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[
DESCRIPTION=A single-player fantasy game
EAPI=6
HOMEPAGE=https://www.bay12games.com/dwarves
+INHERIT=versionator toolchain-funcs
IUSE=debug
KEYWORDS=-* ~amd64 ~x86
LICENSE=free-noncomm BSD BitstreamVera
@@ -10,5 +11,5 @@ RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image
RESTRICT=strip
SLOT=0
SRC_URI=amd64? ( https://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2 ) x86? ( https://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2 )
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0f89f58d077012be4a92662873b6bb56
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.7.3 b/metadata/md5-cache/games-roguelike/tomenet-4.7.3
index 6cdcf1787cef..4bfbb517bf12 100644
--- a/metadata/md5-cache/games-roguelike/tomenet-4.7.3
+++ b/metadata/md5-cache/games-roguelike/tomenet-4.7.3
@@ -4,6 +4,7 @@ DEPEND=sys-libs/ncurses:0 client? ( X? ( x11-libs/libX11 ) sound? ( media-libs/l
DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
EAPI=7
HOMEPAGE=https://www.tomenet.eu
+INHERIT=desktop toolchain-funcs xdg
IUSE=+client server +sound X
KEYWORDS=~amd64 ~x86
LICENSE=Moria
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/ncurses:0 client? ( X? ( x11-libs/libX11 ) sound? ( media-libs/
REQUIRED_USE=|| ( client server )
SLOT=0
SRC_URI=https://www.tomenet.eu/downloads/tomenet-4.7.3.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=4802da179ba3e933949804058fa5e9cf
diff --git a/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1 b/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
index acf98fc67ed8..d43a0968a928 100644
--- a/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
+++ b/metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl[video]
DESCRIPTION=Gothic science fantasy roguelike game
EAPI=7
HOMEPAGE=http://freshmeat.sourceforge.net/projects/wrogue
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=media-libs/libsdl[video]
SLOT=0
SRC_URI=mirror://gentoo/wrogue-0.8.0b.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=863c81021b6bc4a4e8d14b89c5848d89
diff --git a/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267 b/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
index 19da9946b3c9..ff818d5111ae 100644
--- a/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
+++ b/metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
@@ -2,6 +2,7 @@ DEFINED_PHASES=install nofetch prepare
DESCRIPTION=The fourth and final instalment of the Deponia point-and-click adventures
EAPI=7
HOMEPAGE=https://www.daedalic.com/deponia
+INHERIT=desktop wrapper
IUSE=bonus
KEYWORDS=-* ~amd64
LICENSE=all-rights-reserved BSD LGPL-2.1 MIT OFL-1.1
diff --git a/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156 b/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
index 14ff0e655bdf..3affa714e155 100644
--- a/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
+++ b/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
@@ -2,6 +2,7 @@ DEFINED_PHASES=install nofetch prepare
DESCRIPTION=The Complete Journey: The first three Deponia point-and-click adventures
EAPI=7
HOMEPAGE=https://www.daedalic.com/deponia
+INHERIT=desktop wrapper
KEYWORDS=-* ~amd64
LICENSE=all-rights-reserved
RDEPEND=media-libs/libsdl2[opengl,video] media-libs/openal virtual/opengl
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.8 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.8
index 4eb115f8657d..f8a63032d9f7 100644
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.8
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.8
@@ -4,11 +4,12 @@ DEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-li
DESCRIPTION=A 3D fantasy MMORPG written in C and SDL
EAPI=7
HOMEPAGE=http://www.eternal-lands.com
+INHERIT=desktop toolchain-funcs xdg
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=eternal_lands
RDEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext
SLOT=0
SRC_URI=https://github.com/raduprv/Eternal-Lands/archive/1.9.5.8.tar.gz -> eternal-lands-1.9.5.8.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=1a335c566f038b17a49f02b6182f3a8c
diff --git a/metadata/md5-cache/games-rpg/hatoful-boyfriend-0-r1 b/metadata/md5-cache/games-rpg/hatoful-boyfriend-0-r1
index 3d1f7cafbd35..ad9e19c5dfa2 100644
--- a/metadata/md5-cache/games-rpg/hatoful-boyfriend-0-r1
+++ b/metadata/md5-cache/games-rpg/hatoful-boyfriend-0-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install nofetch postinst postrm
DESCRIPTION=Japanese visual novel and dating simulator where birds rule the Earth
EAPI=7
HOMEPAGE=https://www.devolverdigital.com/games/hatoful-boyfriend
+INHERIT=desktop xdg-utils
IUSE=+gui
KEYWORDS=-* ~amd64 ~x86
LICENSE=all-rights-reserved
diff --git a/metadata/md5-cache/games-server/steamcmd-1.0-r3 b/metadata/md5-cache/games-server/steamcmd-1.0-r3
index f632d8092464..72d4623a3c53 100644
--- a/metadata/md5-cache/games-server/steamcmd-1.0-r3
+++ b/metadata/md5-cache/games-server/steamcmd-1.0-r3
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=This is the command-line version of the Steam client for dedicated servers
EAPI=7
HOMEPAGE=https://developer.valvesoftware.com/wiki/SteamCMD
+INHERIT=readme.gentoo-r1
KEYWORDS=-* amd64 x86
LICENSE=LGPL-2.1+ Steam
RDEPEND=acct-group/steamcmd acct-user/steamcmd app-misc/dtach
diff --git a/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1 b/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
index ca5e87c5d215..e20be26b5634 100644
--- a/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
+++ b/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
@@ -3,6 +3,7 @@ DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-
DESCRIPTION=3D tabletennis game
EAPI=6
HOMEPAGE=http://cannonsmash.sourceforge.net/
+INHERIT=desktop
IUSE=vorbis nls
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1 b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
index cc764714a0c3..5b8d2933c14b 100644
--- a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
+++ b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
@@ -3,11 +3,12 @@ DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 )
DESCRIPTION=Portable redcode simulator's sdl port for core war
EAPI=6
HOMEPAGE=https://corewar.co.uk/pihlaja/pmars-sdl/
+INHERIT=readme.gentoo-r1 toolchain-funcs
IUSE=sdl X
KEYWORDS=~amd64 ~x86
LICENSE=BSD GPL-2
RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
SLOT=0
SRC_URI=https://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=61dcdf3abd8d346c3eac95af40b36147
diff --git a/metadata/md5-cache/games-sports/bygfoot-2.3.2-r1 b/metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
index 6e13385669e9..e2209a723eb8 100644
--- a/metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
+++ b/metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
@@ -4,6 +4,7 @@ DEPEND=app-arch/zip media-libs/freetype:2 x11-libs/gtk+:2 virtual/libintl
DESCRIPTION=GTK+2 Soccer Management Game
EAPI=7
HOMEPAGE=http://bygfoot.sourceforge.net/
+INHERIT=desktop vcs-clean
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-arch/zip media-libs/freetype:2 x11-libs/gtk+:2 virtual/libintl
diff --git a/metadata/md5-cache/games-strategy/crimson-0.5.3-r1 b/metadata/md5-cache/games-strategy/crimson-0.5.3-r1
index 4c9d52061a08..f9068c267153 100644
--- a/metadata/md5-cache/games-strategy/crimson-0.5.3-r1
+++ b/metadata/md5-cache/games-strategy/crimson-0.5.3-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf me
DESCRIPTION=Tactical war game in the tradition of Battle Isle
EAPI=6
HOMEPAGE=http://crimson.seul.org/
+INHERIT=desktop
IUSE=test zlib
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/games-strategy/dunelegacy-0.96.4 b/metadata/md5-cache/games-strategy/dunelegacy-0.96.4
index b846eb333002..1c7d0097fdeb 100644
--- a/metadata/md5-cache/games-strategy/dunelegacy-0.96.4
+++ b/metadata/md5-cache/games-strategy/dunelegacy-0.96.4
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[midi] dev-u
DESCRIPTION=Updated clone of Westood Studios' Dune II
EAPI=7
HOMEPAGE=http://dunelegacy.sourceforge.net
+INHERIT=desktop xdg
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2+
RDEPEND=media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer[midi]
SLOT=0
SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.4-src.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=07aa5025ddd3f63ace2f3dede3db8b1e
diff --git a/metadata/md5-cache/games-strategy/lgeneral-1.4.3 b/metadata/md5-cache/games-strategy/lgeneral-1.4.3
index d36a0f555831..62de32190a27 100644
--- a/metadata/md5-cache/games-strategy/lgeneral-1.4.3
+++ b/metadata/md5-cache/games-strategy/lgeneral-1.4.3
@@ -4,11 +4,12 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libint
DESCRIPTION=A Panzer General clone written in SDL
EAPI=7
HOMEPAGE=http://lgames.sourceforge.net/LGeneral/
+INHERIT=desktop toolchain-funcs xdg
IUSE=nls
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.4.3.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=efb0c830d0fdb44d85ef4bd208a3dbf6
diff --git a/metadata/md5-cache/games-strategy/netherearth-0.52-r1 b/metadata/md5-cache/games-strategy/netherearth-0.52-r1
index 1dc033359778..2e324712f3f9 100644
--- a/metadata/md5-cache/games-strategy/netherearth-0.52-r1
+++ b/metadata/md5-cache/games-strategy/netherearth-0.52-r1
@@ -3,6 +3,7 @@ DEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/f
DESCRIPTION=A remake of the SPECTRUM game Nether Earth
EAPI=6
HOMEPAGE=http://www.braingames.getput.com/nether/
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=all-rights-reserved
RDEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut
diff --git a/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1 b/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
index db186c5ca02d..3f9030d93743 100644
--- a/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
+++ b/metadata/md5-cache/games-strategy/seven-kingdoms-2.15.4_p1
@@ -3,10 +3,11 @@ DEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc
DESCRIPTION=Seven Kingdoms: Ancient Adversaries
EAPI=7
HOMEPAGE=https://7kfans.com/
+INHERIT=desktop toolchain-funcs
KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2
RDEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
SLOT=0
SRC_URI=https://github.com/the3dfxdude/7kaa/releases/download/v2.15.4p1/7kaa-2.15.4p1.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=601898fdbfd5dcfc121bcf6deeaffd89
diff --git a/metadata/md5-cache/games-strategy/uqm-0.7.0.1 b/metadata/md5-cache/games-strategy/uqm-0.7.0.1
index 1404cceabbe2..760db7a4d5b6 100644
--- a/metadata/md5-cache/games-strategy/uqm-0.7.0.1
+++ b/metadata/md5-cache/games-strategy/uqm-0.7.0.1
@@ -3,11 +3,12 @@ DEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0= media-l
DESCRIPTION=The Ur-Quan Masters: Port of Star Control 2
EAPI=7
HOMEPAGE=http://sc2.sourceforge.net/
+INHERIT=desktop toolchain-funcs
IUSE=music opengl remix voice
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2+
RDEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0= media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl )
SLOT=0
SRC_URI=mirror://sourceforge/sc2/uqm-0.7.0-1-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-disc1.uqm mirror://sourceforge/sc2/uqm-remix-disc2.uqm mirror://sourceforge/sc2/uqm-remix-disc3.uqm mirror://sourceforge/sc2/uqm-remix-disc4.uqm )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2348b2d37272f2ca24654e6470f17ad8
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.14 b/metadata/md5-cache/games-strategy/wesnoth-1.14.14
index 14c10052aad5..c722d61b59c7 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.14
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.14
@@ -11,5 +11,5 @@ LICENSE=GPL-2
RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 dev-libs/openssl:0= >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
SLOT=0
SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.14.tar.gz -> wesnoth-1.14.14.tar.gz
-_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc cmake 518e4c9a6a38dfd7afc54b6a7c5de3da
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=f0ed0cd75724ebfc827362c2cfcb20f4
diff --git a/metadata/md5-cache/games-util/eureka-1.27b b/metadata/md5-cache/games-util/eureka-1.27b
index 9dbe514b7560..1003320147e9 100644
--- a/metadata/md5-cache/games-util/eureka-1.27b
+++ b/metadata/md5-cache/games-util/eureka-1.27b
@@ -3,11 +3,12 @@ DEPEND=sys-libs/zlib x11-libs/fltk:1[opengl?] opengl? ( media-libs/glu virtual/o
DESCRIPTION=Graphical map editor for games using the DOOM engine
EAPI=7
HOMEPAGE=http://eureka-editor.sourceforge.net/
+INHERIT=desktop toolchain-funcs xdg
IUSE=+opengl
KEYWORDS=~amd64
LICENSE=GPL-2
RDEPEND=sys-libs/zlib x11-libs/fltk:1[opengl?] opengl? ( media-libs/glu virtual/opengl )
SLOT=0
SRC_URI=mirror://sourceforge/eureka-editor/Eureka/1.27/eureka-1.27b-source.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=3c09737f7bb7586b510b824d17ab247b
diff --git a/metadata/md5-cache/games-util/fteqcc-2501 b/metadata/md5-cache/games-util/fteqcc-2501
index 167d51400300..df7363e10156 100644
--- a/metadata/md5-cache/games-util/fteqcc-2501
+++ b/metadata/md5-cache/games-util/fteqcc-2501
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=QC compiler
EAPI=7
HOMEPAGE=http://fteqw.sourceforge.net/
+INHERIT=edos2unix toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/fteqw/qclibsrc2501.zip
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f66843623a05c7fd29098bdde2f1e927
diff --git a/metadata/md5-cache/games-util/grfcodec-6.0.6 b/metadata/md5-cache/games-util/grfcodec-6.0.6
index 71910fbfd656..d0e6dc635cd8 100644
--- a/metadata/md5-cache/games-util/grfcodec-6.0.6
+++ b/metadata/md5-cache/games-util/grfcodec-6.0.6
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:0 !games-util/nforenum dev-lang/perl dev-libs/boost
DESCRIPTION=A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files
EAPI=6
HOMEPAGE=https://dev.openttdcoop.org/projects/grfcodec
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2+
RDEPEND=media-libs/libpng:0
SLOT=0
SRC_URI=https://binaries.openttd.org/extra/grfcodec/6.0.6/grfcodec-6.0.6-source.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=687c9c9eb0acebe412fe4000b383d2e4
diff --git a/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12 b/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
index bacbf13a78d3..434818f2d07e 100644
--- a/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
+++ b/metadata/md5-cache/games-util/linux-wbfs-manager-0.1.12
@@ -3,10 +3,11 @@ DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig
DESCRIPTION=WBFS manager for Linux using GTK+
EAPI=5
HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
SLOT=0
SRC_URI=https://linux-wbfs-manager.googlecode.com/files/linux-wbfs-manager-0.1.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=76d508a58447bdff772915bfe6564db7
diff --git a/metadata/md5-cache/games-util/mcrcon-0.7.1 b/metadata/md5-cache/games-util/mcrcon-0.7.1
index 8fab1b216efd..0207819322d7 100644
--- a/metadata/md5-cache/games-util/mcrcon-0.7.1
+++ b/metadata/md5-cache/games-util/mcrcon-0.7.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Remote connection client for Minecraft servers
EAPI=7
HOMEPAGE=https://github.com/Tiiffi/mcrcon
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm
LICENSE=ZLIB
SLOT=0
SRC_URI=https://github.com/Tiiffi/mcrcon/archive/v0.7.1.tar.gz -> mcrcon-0.7.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=66b27abf7bb59249e7d19d53ae8f5a1c
diff --git a/metadata/md5-cache/games-util/wit-3.02a b/metadata/md5-cache/games-util/wit-3.02a
index 1fd99760b615..10362f0beb30 100644
--- a/metadata/md5-cache/games-util/wit-3.02a
+++ b/metadata/md5-cache/games-util/wit-3.02a
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2:0= fuse? ( sys-fs/fuse:0= ) zlib? ( sys-libs/zlib:0= )
DESCRIPTION=command line tools to manipulate Wii/GameCube ISO images and WBFS containers
EAPI=7
HOMEPAGE=https://wit.wiimm.de/
+INHERIT=toolchain-funcs
IUSE=+fuse +zlib
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=app-arch/bzip2:0= fuse? ( sys-fs/fuse:0= ) zlib? ( sys-libs/zlib:0= )
SLOT=0
SRC_URI=https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-3.02a.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=61f2a854fa0f437e29edd79c7fb05d1d
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.2 b/metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.2
index 862308b9ea39..a23b1b901463 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.2
@@ -4,6 +4,7 @@ DEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
DESCRIPTION=Translation data for Cinnamon
EAPI=7
HOMEPAGE=https://projects.linuxmint.com/cinnamon/
+INHERIT=l10n
KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2
RDEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-4.8.3 b/metadata/md5-cache/gnome-extra/cinnamon-translations-4.8.3
index 600b2280ee3c..8b9eec768135 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-4.8.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-4.8.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=configure install
DESCRIPTION=Translation data for Cinnamon
EAPI=7
HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations
+INHERIT=l10n
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1
index ca9575983cdf..f68cc471d037 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-10-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst
DESCRIPTION=Show tooltip with full name and description
EAPI=7
HOMEPAGE=https://github.com/RaphaelRochet/applications-overview-tooltip
+INHERIT=gnome2-utils
KEYWORDS=amd64 ~x86
LICENSE=public-domain
RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
SLOT=0
SRC_URI=https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v10.tar.gz -> gnome-shell-extension-applications-overview-tooltip-10.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=e090dbbfae874b4404e4023a1dbaba7f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28
index 3eb02c2cf91c..22259895131d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-28
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst
DESCRIPTION=Changes your wallpaper daily to the bing.com background image
EAPI=7
HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
+INHERIT=gnome2-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.28
SLOT=0
SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v28.tar.gz -> gnome-shell-extension-bing-wallpaper-28.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=9e670e1b6b9c7550b6a5a15a3bd8e5ba
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
index 29deac0adb0f..b2fe2d2f2303 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713
@@ -3,10 +3,11 @@ DEPEND=dev-libs/glib:2
DESCRIPTION=Control the blur effect on gnome-shell lock screen
EAPI=7
HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
+INHERIT=gnome2-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36.4
SLOT=0
SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/824675a32d47346c89655f89b416e653f60c4d68.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=f50518770eb13eff3f2a2fc12c4ec5a6
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211
index 1478eb9bb1e2..b2368af52137 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211
@@ -3,10 +3,11 @@ DEPEND=dev-libs/glib:2
DESCRIPTION=Control the blur effect on gnome-shell lock screen
EAPI=7
HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
+INHERIT=gnome2-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3+
RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36.4
SLOT=0
SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/748b95e931b6b1548b90ceeee7a5883da3e0529f.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=99ce2fb0ea62c9d97d3447f2cf8635b3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
index afda91602c7f..454955ce26c4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-40
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2
DESCRIPTION=An icon taskbar for the Gnome Shell
EAPI=7
HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
+INHERIT=gnome2-utils
IUSE=branding
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.18.0
SLOT=0
SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v40.tar.gz -> gnome-shell-extension-dash-to-panel-40.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=6a475016cfd115ca9e0f178bb3abcb28
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.36.3 b/metadata/md5-cache/gnome-extra/pch-session-3.36.3
index 32b7c326a2d6..1f172be311bb 100644
--- a/metadata/md5-cache/gnome-extra/pch-session-3.36.3
+++ b/metadata/md5-cache/gnome-extra/pch-session-3.36.3
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst
DESCRIPTION=Unofficial gnome based session with different default settings and extensions
EAPI=7
HOMEPAGE=https://gitlab.com/pachoramos/pch-session
+INHERIT=gnome2-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=gnome-base/gnome-shell-3.36 >=gnome-extra/gnome-shell-extensions-3.36 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-8 >=gnome-extra/gnome-shell-extension-bing-wallpaper-27 >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-12 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200713 >=gnome-extra/gnome-shell-extension-dash-to-panel-38 >=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0 >=gnome-extra/gnome-shell-extension-gsconnect-34 >=gnome-extra/gnome-shell-extensions-topicons-plus-27 >=gnome-extra/gnome-tweaks-3.34
SLOT=0
SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.36.3/pch-session-3.36.3.tar.bz2
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=661ec06d662dc332cd3327593cf65b0a
diff --git a/metadata/md5-cache/gnustep-apps/gemas-0.4 b/metadata/md5-cache/gnustep-apps/gemas-0.4
index 9e07e266b98a..c911a92f6b5d 100644
--- a/metadata/md5-cache/gnustep-apps/gemas-0.4
+++ b/metadata/md5-cache/gnustep-apps/gemas-0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
RDEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 projectcenter? ( gnustep-apps/projectcenter ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
SLOT=0
SRC_URI=mirror://nongnu/gnustep-nonfsf/Gemas-0.4.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
_md5_=0b0390454515f7e63cf140c50714e375
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
index 5646fe297be5..561042eca6cc 100644
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
+++ b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
SLOT=0
SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
_md5_=3a9e88c906d9fa680225edd67a4ac384
diff --git a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1 b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
index 74d67fc95b34..ccff73aa747d 100644
--- a/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
+++ b/metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
@@ -4,9 +4,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=nuoveXT2 iconset
EAPI=7
HOMEPAGE=https://lxde.org/
+INHERIT=xdg
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/lxde/LXDE%20Icon%20Theme/lxde-icon-theme-0.5.1/lxde-icon-theme-0.5.1.tar.xz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=777405fd0b421807d693ad11c993e297
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.10.1 b/metadata/md5-cache/lxde-base/lxpanel-0.10.1
index d168fe9ecb0f..571c4ced834b 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.10.1
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.10.1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/keybinder:3 lxde-base/lxmenu-data >=lxde-base/menu-cache-1.1.0-r
DESCRIPTION=Lightweight X11 desktop panel for LXDE
EAPI=7
HOMEPAGE=https://wiki.lxde.org/en/LXPanel
+INHERIT=readme.gentoo-r1 xdg
IUSE=+alsa wifi
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-libs/keybinder:3 lxde-base/lxmenu-data >=lxde-base/menu-cache-1.1.0-r1 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 >=x11-libs/libfm-1.3.2[gtk] x11-libs/libwnck:3 x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
SLOT=0
SRC_URI=mirror://sourceforge/lxde/lxpanel-0.10.1.tar.xz
-_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=feeceb401395bed2bd5843a67718b731
diff --git a/metadata/md5-cache/mail-client/aerc-0.5.2 b/metadata/md5-cache/mail-client/aerc-0.5.2
index 09bfb67097c1..7a3fcdccb626 100644
--- a/metadata/md5-cache/mail-client/aerc-0.5.2
+++ b/metadata/md5-cache/mail-client/aerc-0.5.2
@@ -4,6 +4,7 @@ DEPEND=notmuch? ( net-mail/notmuch:= )
DESCRIPTION=Email client for your terminal
EAPI=7
HOMEPAGE=https://aerc-mail.org
+INHERIT=go-module
IUSE=notmuch
KEYWORDS=~amd64 ~ppc64
LICENSE=Apache-2.0 BSD BSD-2 MIT
diff --git a/metadata/md5-cache/mail-client/bower-0.12 b/metadata/md5-cache/mail-client/bower-0.12
index 683f22c23052..5529caf03a36 100644
--- a/metadata/md5-cache/mail-client/bower-0.12
+++ b/metadata/md5-cache/mail-client/bower-0.12
@@ -3,6 +3,7 @@ DEPEND=app-crypt/gpgme:= sys-libs/ncurses:0= dev-lang/mercury
DESCRIPTION=Curses terminal client for the Notmuch email system
EAPI=7
HOMEPAGE=https://github.com/wangp/bower
+INHERIT=multiprocessing
KEYWORDS=amd64
LICENSE=GPL-3+
RDEPEND=app-crypt/gpgme:= sys-libs/ncurses:0= net-mail/notmuch sys-apps/coreutils
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807 b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
index c46574c8a321..3d85fda14fbe 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
@@ -3,10 +3,11 @@ DEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx
DESCRIPTION=The $ mail program, which is used to send mail via shell scripts
EAPI=7
HOMEPAGE=https://www.debian.org/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
RDEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
SLOT=0
SRC_URI=http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ef0440b06d191fd665e0978fe69daf94
diff --git a/metadata/md5-cache/mail-filter/bmf-0.9.4-r3 b/metadata/md5-cache/mail-filter/bmf-0.9.4-r3
index f6a422998317..e5cb7d86f0fe 100644
--- a/metadata/md5-cache/mail-filter/bmf-0.9.4-r3
+++ b/metadata/md5-cache/mail-filter/bmf-0.9.4-r3
@@ -3,11 +3,12 @@ DEPEND=mysql? ( dev-db/mysql-connector-c:0= ) berkdb? ( >=sys-libs/db-3.2.9 )
DESCRIPTION=A fast and small Bayesian spam filter
EAPI=7
HOMEPAGE=http://bmf.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=mysql berkdb
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) berkdb? ( >=sys-libs/db-3.2.9 )
SLOT=0
SRC_URI=mirror://sourceforge/bmf/bmf-0.9.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9e4ae8a7f65bc29a383359eb21963dc0
diff --git a/metadata/md5-cache/mail-filter/libmilter-1.0.2 b/metadata/md5-cache/mail-filter/libmilter-1.0.2
index c03e3ae1e487..2dcfece7c822 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2
@@ -3,6 +3,7 @@ DEPEND=!mail-mta/sendmail !mail-mta/sendmail
DESCRIPTION=The Sendmail Filter API (Milter)
EAPI=7
HOMEPAGE=http://www.sendmail.org/
+INHERIT=multilib toolchain-funcs
IUSE=ipv6 poll
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=Sendmail
diff --git a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1 b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
index 97c2bf85d8c2..c675bee8ddab 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1
@@ -3,6 +3,7 @@ DEPEND=!mail-mta/sendmail !mail-mta/sendmail
DESCRIPTION=The Sendmail Filter API (Milter)
EAPI=7
HOMEPAGE=http://www.sendmail.org/
+INHERIT=multilib toolchain-funcs
IUSE=ipv6 poll
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=Sendmail
diff --git a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r1 b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r1
index dc3597deb380..5d2aa1b1b576 100644
--- a/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r1
+++ b/metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=The Sendmail Filter API (Milter)
EAPI=7
HOMEPAGE=http://www.sendmail.org/
+INHERIT=toolchain-funcs
IUSE=ipv6 poll
LICENSE=Sendmail
SLOT=0/1.0.2_p1
SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.16.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5ac1b42a19248f848f6268ebfff790d5
diff --git a/metadata/md5-cache/mail-filter/milter-regex-2.7 b/metadata/md5-cache/mail-filter/milter-regex-2.7
index c654128d8d28..5827b763febb 100644
--- a/metadata/md5-cache/mail-filter/milter-regex-2.7
+++ b/metadata/md5-cache/mail-filter/milter-regex-2.7
@@ -3,10 +3,11 @@ DEPEND=acct-user/milter-regex || ( mail-filter/libmilter mail-mta/sendmail ) vir
DESCRIPTION=A milter-based regular expression filter
EAPI=7
HOMEPAGE=https://www.benzedrine.ch/milter-regex.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=acct-user/milter-regex || ( mail-filter/libmilter mail-mta/sendmail )
SLOT=0
SRC_URI=https://www.benzedrine.ch/milter-regex-2.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dee6da72c81a344a1deb5a811efb5422
diff --git a/metadata/md5-cache/mail-filter/normalizemime-1.19 b/metadata/md5-cache/mail-filter/normalizemime-1.19
index 5e99b83f139f..6f79d43cfd9b 100644
--- a/metadata/md5-cache/mail-filter/normalizemime-1.19
+++ b/metadata/md5-cache/mail-filter/normalizemime-1.19
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Helper program to normalize MIME encoded messages
EAPI=7
HOMEPAGE=http://hyvatti.iki.fi/~jaakko/spam/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/normalizemime-1.19.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f9506a5d0e688cffdc76d763058c53fa
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.12 b/metadata/md5-cache/mail-mta/msmtp-1.8.12
index 70451c634c4e..3916803c188e 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.12
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.12
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? (
DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
EAPI=7
HOMEPAGE=https://marlam.de/msmtp/
+INHERIT=fcaps multilib
IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.14 b/metadata/md5-cache/mail-mta/msmtp-1.8.14
index b23b0b0f45c2..380dc03718d0 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.14
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.14
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? (
DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
EAPI=7
HOMEPAGE=https://marlam.de/msmtp/
+INHERIT=fcaps multilib
IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.15 b/metadata/md5-cache/mail-mta/msmtp-1.8.15
index f8ddb2f8161d..8aba8eb75740 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.15
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.15
@@ -4,6 +4,7 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) idn? ( net-dns/libidn2:= ) nls? (
DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
EAPI=7
HOMEPAGE=https://marlam.de/msmtp/
+INHERIT=fcaps multilib
IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3
diff --git a/metadata/md5-cache/mate-base/mate-1.24 b/metadata/md5-cache/mate-base/mate-1.24
index 81172b1ae1ff..e64d5d6b2824 100644
--- a/metadata/md5-cache/mate-base/mate-1.24
+++ b/metadata/md5-cache/mate-base/mate-1.24
@@ -2,6 +2,7 @@ DEFINED_PHASES=postinst
DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
EAPI=6
HOMEPAGE=https://mate-desktop.org
+INHERIT=eapi7-ver
IUSE=+base -bluetooth help +notification +themes +extras
KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=metapackage
diff --git a/metadata/md5-cache/mate-base/mate-applets-meta-1.24.0 b/metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
index 6fa698cb5d38..dce47670326b 100644
--- a/metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
+++ b/metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
@@ -2,6 +2,7 @@ DEFINED_PHASES=-
DESCRIPTION=Meta package for MATE panel applets
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=eapi7-ver
IUSE=appindicator sensors
KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=metapackage
diff --git a/metadata/md5-cache/media-gfx/aaphoto-0.45 b/metadata/md5-cache/media-gfx/aaphoto-0.45
index 4fad4916ce3c..f660d926336e 100644
--- a/metadata/md5-cache/media-gfx/aaphoto-0.45
+++ b/metadata/md5-cache/media-gfx/aaphoto-0.45
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0
DESCRIPTION=Automatic color correction and resizing of photos
EAPI=6
HOMEPAGE=http://log69.com/aaphoto.html https://github.com/log69/aaphoto
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0
SLOT=0
SRC_URI=http://log69.com/downloads/aaphoto_sources_0.45.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fac9ebc17b9fb6a94e7785429052b143
diff --git a/metadata/md5-cache/media-gfx/apng2gif-1.8 b/metadata/md5-cache/media-gfx/apng2gif-1.8
index d797c4c84187..d4dd28bdcb63 100644
--- a/metadata/md5-cache/media-gfx/apng2gif-1.8
+++ b/metadata/md5-cache/media-gfx/apng2gif-1.8
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:0= app-arch/unzip
DESCRIPTION=create a GIF from an APNG
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/apng2gif/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
RDEPEND=media-libs/libpng:0=
SLOT=0
SRC_URI=mirror://sourceforge/apng2gif/1.8/apng2gif-1.8-src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=86aa0482340404b2d24f2120ad2ec88e
diff --git a/metadata/md5-cache/media-gfx/apngdis-2.9 b/metadata/md5-cache/media-gfx/apngdis-2.9
index 5ac01336da50..fa1d71f17c3a 100644
--- a/metadata/md5-cache/media-gfx/apngdis-2.9
+++ b/metadata/md5-cache/media-gfx/apngdis-2.9
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:0= app-arch/unzip
DESCRIPTION=extract PNG frames from an APNG
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/apngdis/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
RDEPEND=media-libs/libpng:0=
SLOT=0
SRC_URI=mirror://sourceforge/apngdis/2.9/apngdis-2.9-src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=040bf8f690692a10ccb6af10ba5485b1
diff --git a/metadata/md5-cache/media-gfx/apngopt-1.4 b/metadata/md5-cache/media-gfx/apngopt-1.4
index bff3b52005b9..b2c284150038 100644
--- a/metadata/md5-cache/media-gfx/apngopt-1.4
+++ b/metadata/md5-cache/media-gfx/apngopt-1.4
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib >=app-arch/zopfli-1.0.1-r2:= media-libs/libpng:0= app-arch/
DESCRIPTION=optimize APNG images
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/apng/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=sys-libs/zlib >=app-arch/zopfli-1.0.1-r2:= media-libs/libpng:0=
SLOT=0
SRC_URI=mirror://sourceforge/apng/apngopt-1.4-src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d74b1581a1f42d7ba826b1db2607ccbb
diff --git a/metadata/md5-cache/media-gfx/cellwriter-1.3.6 b/metadata/md5-cache/media-gfx/cellwriter-1.3.6
index 9cfffd3e1918..383264795a55 100644
--- a/metadata/md5-cache/media-gfx/cellwriter-1.3.6
+++ b/metadata/md5-cache/media-gfx/cellwriter-1.3.6
@@ -4,10 +4,11 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto dev-
DESCRIPTION=Grid-entry natural handwriting input panel
EAPI=7
HOMEPAGE=http://risujin.org/cellwriter/
+INHERIT=xdg
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst
SLOT=0
SRC_URI=https://github.com/risujin/cellwriter/archive/1.3.6.tar.gz -> cellwriter-1.3.6.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=3f496b3c7a362bf6910d127998591193
diff --git a/metadata/md5-cache/media-gfx/clockphoto-1.2 b/metadata/md5-cache/media-gfx/clockphoto-1.2
index 1cec19f43459..76ea12d98250 100644
--- a/metadata/md5-cache/media-gfx/clockphoto-1.2
+++ b/metadata/md5-cache/media-gfx/clockphoto-1.2
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=Adjusts photo timestamps based on clock photos
EAPI=7
HOMEPAGE=https://git.zx2c4.com/clockphoto/about/
+INHERIT=qmake-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-gfx/exiv2
SLOT=0
SRC_URI=https://git.zx2c4.com/clockphoto/snapshot/clockphoto-1.2.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=d3c1b820b8873316d9c52bfb44ba2f69
diff --git a/metadata/md5-cache/media-gfx/crwinfo-0.2 b/metadata/md5-cache/media-gfx/crwinfo-0.2
index 5ccd9d3b1d98..1ba5409e27b0 100644
--- a/metadata/md5-cache/media-gfx/crwinfo-0.2
+++ b/metadata/md5-cache/media-gfx/crwinfo-0.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Canon raw image (CRW) information and thumbnail extractor
EAPI=7
HOMEPAGE=http://freshmeat.net/projects/crwinfo/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=91ffee4a06c7d2733c99d5cfe8b8e85e
diff --git a/metadata/md5-cache/media-gfx/dawn-3.90b-r1 b/metadata/md5-cache/media-gfx/dawn-3.90b-r1
index 6db5e5a52e33..2621b8387989 100644
--- a/metadata/md5-cache/media-gfx/dawn-3.90b-r1
+++ b/metadata/md5-cache/media-gfx/dawn-3.90b-r1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/tk:* opengl? ( virtual/opengl ) X? ( x11-libs/libX11 ) app-shell
DESCRIPTION=3D geometrical postscript renderer
EAPI=6
HOMEPAGE=http://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html
+INHERIT=eapi7-ver toolchain-funcs
IUSE=doc opengl X
KEYWORDS=amd64 ~hppa ppc x86
LICENSE=public-domain
RDEPEND=dev-lang/tk:* opengl? ( virtual/opengl ) X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=http://geant4.kek.jp/~tanaka/src/dawn_3_90b.tgz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c7b18b4406549649d6a43afe9e9455af
diff --git a/metadata/md5-cache/media-gfx/duhdraw-2.8.13-r1 b/metadata/md5-cache/media-gfx/duhdraw-2.8.13-r1
index b1aac831e06a..6b39bf4410cd 100644
--- a/metadata/md5-cache/media-gfx/duhdraw-2.8.13-r1
+++ b/metadata/md5-cache/media-gfx/duhdraw-2.8.13-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
DESCRIPTION=ASCII art editor
EAPI=7
HOMEPAGE=https://www.cs.helsinki.fi/u/penberg/duhdraw
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://www.cs.helsinki.fi/u/penberg/duhdraw/duhdraw-2.8.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c2b05eaa98ed7d9a183297f15a83a57a
diff --git a/metadata/md5-cache/media-gfx/ephoto-1.5 b/metadata/md5-cache/media-gfx/ephoto-1.5
index 81f10f61c120..312c4e92b45e 100644
--- a/metadata/md5-cache/media-gfx/ephoto-1.5
+++ b/metadata/md5-cache/media-gfx/ephoto-1.5
@@ -4,11 +4,12 @@ DEPEND=dev-libs/efl[eet,X] dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Enlightenment image viewer written with EFL
EAPI=7
HOMEPAGE=https://www.enlightenment.org/about-ephoto
+INHERIT=xdg
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=BSD-2
RDEPEND=dev-libs/efl[eet,X]
SLOT=0
SRC_URI=https://download.enlightenment.org/rel/apps/ephoto/ephoto-1.5.tar.xz -> ephoto-1.5-1.tar.xz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=296ce0223e4d8e32fd1737ab18800a64
diff --git a/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1 b/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1
index 8193ad5434fd..a1c1cdd34ed1 100644
--- a/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1
+++ b/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1
@@ -3,11 +3,12 @@ DEFINED_PHASES=install postinst postrm prepare unpack
DESCRIPTION=A simple GUI prototyping tool to create mockups
EAPI=7
HOMEPAGE=https://pencil.evolus.vn/
+INHERIT=rpm xdg-utils desktop
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
RESTRICT=splitdebug
SLOT=0
SRC_URI=https://pencil.evolus.vn/dl/V3.1.0.ga/pencil-3.1.0.ga-1.x86_64.rpm -> evoluspencil-3.1.0-1.rpm
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd xdg-utils ff2ff954e6b17929574eee4efc5152ba desktop c0d27bf73aa08ca05b663dbd31fbef28
_md5_=bf74cd331335c36fb0940795ecd6c153
diff --git a/metadata/md5-cache/media-gfx/farbfeld-4 b/metadata/md5-cache/media-gfx/farbfeld-4
index d7f83e694d2a..e128de8cf965 100644
--- a/metadata/md5-cache/media-gfx/farbfeld-4
+++ b/metadata/md5-cache/media-gfx/farbfeld-4
@@ -3,10 +3,11 @@ DEPEND=media-libs/libjpeg-turbo media-libs/libpng:*
DESCRIPTION=farbfeld simple image format tools
EAPI=6
HOMEPAGE=https://tools.suckless.org/farbfeld/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=ISC
RDEPEND=media-libs/libjpeg-turbo media-libs/libpng:*
SLOT=0
SRC_URI=https://dl.suckless.org/farbfeld/farbfeld-4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=10b4cb71ca246267e92e13f58636f767
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.3 b/metadata/md5-cache/media-gfx/fbgrab-1.3
index c99d493f8289..2cb3b7a67da2 100644
--- a/metadata/md5-cache/media-gfx/fbgrab-1.3
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.3
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:= sys-libs/zlib
DESCRIPTION=Framebuffer screenshot utility
EAPI=7
HOMEPAGE=https://fbgrab.monells.se/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86
LICENSE=GPL-2
RDEPEND=media-libs/libpng:= sys-libs/zlib
SLOT=0
SRC_URI=https://fbgrab.monells.se/fbgrab-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0fa3e3328c45cb68ca87ed4d40b175f2
diff --git a/metadata/md5-cache/media-gfx/fbgrab-1.3.3 b/metadata/md5-cache/media-gfx/fbgrab-1.3.3
index 8c8a345c5d30..eed63a8c59f8 100644
--- a/metadata/md5-cache/media-gfx/fbgrab-1.3.3
+++ b/metadata/md5-cache/media-gfx/fbgrab-1.3.3
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:= sys-libs/zlib
DESCRIPTION=Framebuffer screenshot utility
EAPI=7
HOMEPAGE=https://fbgrab.monells.se/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libpng:= sys-libs/zlib
SLOT=0
SRC_URI=https://github.com/GunnarMonell/fbgrab/archive/1.3.3.tar.gz -> fbgrab-1.3.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ca33dbb787da65b504428a09f904f8f5
diff --git a/metadata/md5-cache/media-gfx/fbida-2.14-r2 b/metadata/md5-cache/media-gfx/fbida-2.14-r2
index fe1b33efb286..4ec82e1be8eb 100644
--- a/metadata/md5-cache/media-gfx/fbida-2.14-r2
+++ b/metadata/md5-cache/media-gfx/fbida-2.14-r2
@@ -3,6 +3,7 @@ DEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 app-
DESCRIPTION=Image viewers for the framebuffer console (fbi) and X11 (ida)
EAPI=7
HOMEPAGE=https://www.kraxel.org/blog/linux/fbida/
+INHERIT=desktop toolchain-funcs
IUSE=curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp
KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86
LICENSE=GPL-2 IJG
@@ -10,5 +11,5 @@ RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 app
REQUIRED_USE=ghostscript? ( tiff )
SLOT=0
SRC_URI=https://www.kraxel.org/releases/fbida/fbida-2.14.tar.gz mirror://gentoo/ida.png.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ba437fb2d51e43d098235e83383f27bd
diff --git a/metadata/md5-cache/media-gfx/feh-3.6 b/metadata/md5-cache/media-gfx/feh-3.6
index 403c320764ef..266fde53fc47 100644
--- a/metadata/md5-cache/media-gfx/feh-3.6
+++ b/metadata/md5-cache/media-gfx/feh-3.6
@@ -3,6 +3,7 @@ DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( n
DESCRIPTION=A fast, lightweight imageviewer using imlib2
EAPI=7
HOMEPAGE=https://feh.finalrewind.org/
+INHERIT=toolchain-funcs xdg-utils
IUSE=debug curl exif test xinerama
KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86
LICENSE=feh
@@ -10,5 +11,5 @@ RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? (
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://feh.finalrewind.org/feh-3.6.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=bfb82569ecdaf43e90867aa515e14235
diff --git a/metadata/md5-cache/media-gfx/feh-3.6.1 b/metadata/md5-cache/media-gfx/feh-3.6.1
index 66ee03bee936..1695d8cd0b2b 100644
--- a/metadata/md5-cache/media-gfx/feh-3.6.1
+++ b/metadata/md5-cache/media-gfx/feh-3.6.1
@@ -3,6 +3,7 @@ DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( n
DESCRIPTION=A fast, lightweight imageviewer using imlib2
EAPI=7
HOMEPAGE=https://feh.finalrewind.org/
+INHERIT=toolchain-funcs xdg-utils
IUSE=debug curl exif test xinerama
KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86
LICENSE=feh
@@ -10,5 +11,5 @@ RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? (
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://feh.finalrewind.org/feh-3.6.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=bfb82569ecdaf43e90867aa515e14235
diff --git a/metadata/md5-cache/media-gfx/feh-3.6.2 b/metadata/md5-cache/media-gfx/feh-3.6.2
index d6f90d02a7cd..99c91e0ab5f4 100644
--- a/metadata/md5-cache/media-gfx/feh-3.6.2
+++ b/metadata/md5-cache/media-gfx/feh-3.6.2
@@ -3,6 +3,7 @@ DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( n
DESCRIPTION=A fast, lightweight imageviewer using imlib2
EAPI=7
HOMEPAGE=https://feh.finalrewind.org/
+INHERIT=toolchain-funcs xdg-utils
IUSE=debug curl exif test xinerama inotify
KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
LICENSE=feh
@@ -10,5 +11,5 @@ RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? (
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://feh.finalrewind.org/feh-3.6.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=db2d56f4c454c11eecd2ee12df6b6c11
diff --git a/metadata/md5-cache/media-gfx/figurine-1.0.5-r1 b/metadata/md5-cache/media-gfx/figurine-1.0.5-r1
index e4311a14f3d2..c37153d1e409 100644
--- a/metadata/md5-cache/media-gfx/figurine-1.0.5-r1
+++ b/metadata/md5-cache/media-gfx/figurine-1.0.5-r1
@@ -3,10 +3,11 @@ DEPEND=media-gfx/transfig
DESCRIPTION=A vector based graphics editor similar to xfig, but simpler
EAPI=7
HOMEPAGE=http://figurine.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=media-gfx/transfig
SLOT=0
SRC_URI=mirror://sourceforge/figurine/figurine-1.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=934608aafb7470de7ed238ad71eb69b8
diff --git a/metadata/md5-cache/media-gfx/fotowall-1.0 b/metadata/md5-cache/media-gfx/fotowall-1.0
index 777851444962..87d5a29fb5e5 100644
--- a/metadata/md5-cache/media-gfx/fotowall-1.0
+++ b/metadata/md5-cache/media-gfx/fotowall-1.0
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5
DESCRIPTION=Qt5 tool for creating wallpapers
EAPI=7
HOMEPAGE=https://www.enricoros.com/opensource/fotowall/
+INHERIT=qmake-utils
IUSE=opengl webcam
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 opengl? ( dev-qt/qtopengl:5 )
SLOT=0
SRC_URI=https://github.com/enricoros/fotowall/archive/v1.0.tar.gz -> fotowall-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=f77c9fec214065158bff1f388032a83c
diff --git a/metadata/md5-cache/media-gfx/gif2apng-1.9-r1 b/metadata/md5-cache/media-gfx/gif2apng-1.9-r1
index 9ead596eab46..875e51b07c41 100644
--- a/metadata/md5-cache/media-gfx/gif2apng-1.9-r1
+++ b/metadata/md5-cache/media-gfx/gif2apng-1.9-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib app-arch/zopfli:= app-arch/unzip
DESCRIPTION=create an APNG from a GIF
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/gif2apng/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB LGPL-2.1
RDEPEND=sys-libs/zlib app-arch/zopfli:=
SLOT=0
SRC_URI=mirror://sourceforge/gif2apng/1.9/gif2apng-1.9-src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a616359bbd90aa1401fe670518ff4107
diff --git a/metadata/md5-cache/media-gfx/gif2png-2.5.14 b/metadata/md5-cache/media-gfx/gif2png-2.5.14
index e12cb691a836..035b0a65ac91 100644
--- a/metadata/md5-cache/media-gfx/gif2png-2.5.14
+++ b/metadata/md5-cache/media-gfx/gif2png-2.5.14
@@ -3,11 +3,12 @@ DEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
DESCRIPTION=Converts images from gif format to png format
EAPI=7
HOMEPAGE=http://catb.org/~esr/gif2png/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=ZLIB
RDEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
RESTRICT=test
SLOT=0
SRC_URI=http://catb.org/~esr/gif2png/gif2png-2.5.14.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=caa0f980b575295679e1cfbbf1ab78b4
diff --git a/metadata/md5-cache/media-gfx/grub-splashes-20091109 b/metadata/md5-cache/media-gfx/grub-splashes-20091109
index f19310a71f97..7948188c0f67 100644
--- a/metadata/md5-cache/media-gfx/grub-splashes-20091109
+++ b/metadata/md5-cache/media-gfx/grub-splashes-20091109
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
DESCRIPTION=Collection of grub splashes
EAPI=6
HOMEPAGE=https://dev.gentoo.org/~welp/grub-splashes.xml
+INHERIT=mount-boot
KEYWORDS=amd64 x86
LICENSE=GPL-2 Artistic-2
SLOT=0
diff --git a/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1 b/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
index 7d2e7a066c15..45c73ff2abc7 100644
--- a/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
+++ b/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
@@ -4,11 +4,12 @@ DEPEND=jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= sys-libs/zlib ) tiff? (
DESCRIPTION=Convert Hewlett-Packard's HP-GL plotter language to other graphics formats
EAPI=7
HOMEPAGE=https://www.gnu.org/software/hp2xx/
+INHERIT=toolchain-funcs
IUSE=jpeg png tiff X
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= sys-libs/zlib ) tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=mirror://gnu/hp2xx/hp2xx-3.4.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8b89aef1b6dc1e69557abc2dfc99c66d
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
index 2f6adaf83d6e..b09216330469 100644
--- a/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
@@ -4,10 +4,11 @@ DEPEND=udev? ( dev-libs/libxslt media-gfx/sane-backends )
DESCRIPTION=Image Scan! for Linux data files
EAPI=7
HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+INHERIT=udev
IUSE=udev
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.0-1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=33c84a16ebca6c73210d76332bab7857
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
index f0742238ab96..1e97f884278f 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
@@ -4,11 +4,12 @@ DEPEND=minimal? ( >=media-gfx/iscan-2.21.0 )
DESCRIPTION=Epson Perfection 2480/2580 PHOTO scanner plugin for SANE 'epkowa' backend
EAPI=7
HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+INHERIT=rpm
IUSE=minimal
KEYWORDS=-* ~amd64
LICENSE=EPSON EAPL
RDEPEND=minimal? ( >=media-gfx/iscan-2.21.0 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=055163651d1c8d772b39069c349b1de2
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
index 10536734e612..63e134041c74 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
@@ -4,10 +4,11 @@ DEPEND=>=media-gfx/iscan-2.21.0
DESCRIPTION=Epson Perfection V300 PHOTO scanner plugin for SANE 'epkowa' backend
EAPI=7
HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+INHERIT=rpm
KEYWORDS=-* amd64 x86
LICENSE=AVASYS
RDEPEND=>=media-gfx/iscan-2.21.0
SLOT=0
SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-f720-0.0.1-2.i386.rpm )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=13cd21097e0769fc3a9688557cf7477b
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3
index f20b7dedb3fc..079f65be102f 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3
@@ -4,10 +4,11 @@ DEPEND=>=media-gfx/iscan-2.21.0 !!<media-gfx/iscan-plugin-gt-x770-2.1.2.1-r2
DESCRIPTION=Epson Perfection V500 scanner plugin for SANE 'epkowa' backend
EAPI=7
HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+INHERIT=rpm
KEYWORDS=-* ~amd64 ~x86
LICENSE=AVASYS
RDEPEND=>=media-gfx/iscan-2.21.0 !!<media-gfx/iscan-plugin-gt-x770-2.1.2.1-r2
SLOT=0
SRC_URI=x86? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x770/2.1.2/iscan-plugin-gt-x770-2.1.2-1.i386.rpm ) amd64? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x770/2.1.2/iscan-plugin-gt-x770-2.1.2-1.x86_64.rpm )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=7643722e94c26e3f9b1f79ec44172b49
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1
index e60cb5d4e8a6..04bda821751d 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1
@@ -4,10 +4,11 @@ DEPEND=>=media-gfx/iscan-2.21.0
DESCRIPTION=Epson Perfection V600 scanner plugin for SANE 'epkowa' backend
EAPI=7
HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+INHERIT=rpm
KEYWORDS=-* ~amd64 ~x86
LICENSE=AVASYS
RDEPEND=>=media-gfx/iscan-2.21.0
SLOT=0
SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x820-2.2.0-1.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x820-2.2.0-1.i386.rpm )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=82b1e6a36f9b0be497af8cba58e1406f
diff --git a/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2 b/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
index 6081c03f681b..3d63514c6041 100644
--- a/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
+++ b/metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=Convert JPEG images to Postscript using a wrapper
EAPI=7
HOMEPAGE=https://web.archive.org/web/20131003144811/http://www.pdflib.com/download/free-software/jpeg2ps/
+INHERIT=toolchain-funcs readme.gentoo-r1
IUSE=metric
KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=free-noncomm
SLOT=0
SRC_URI=https://web.archive.org/web/20131003165952/http://www.pdflib.com/fileadmin/pdflib/products/more/jpeg2ps/jpeg2ps-1.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=0bf01e340a678af5cb28fba8a2a7cafe
diff --git a/metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r1 b/metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r1
index a19f1b6cf2f5..4a8137133b9e 100644
--- a/metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r1
+++ b/metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/jpeg:0
DESCRIPTION=Prints information and tests integrity of JPEG/JFIF files
EAPI=7
HOMEPAGE=https://www.kokkonen.net/tjko/projects.html
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=virtual/jpeg:0
SLOT=0
SRC_URI=https://www.kokkonen.net/tjko/src/jpeginfo-1.6.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bdf9f24752bb176c5c68a85d941f8dcd
diff --git a/metadata/md5-cache/media-gfx/jpegtoavi-1.5 b/metadata/md5-cache/media-gfx/jpegtoavi-1.5
index dc58fbf34ada..ffaa5c21504e 100644
--- a/metadata/md5-cache/media-gfx/jpegtoavi-1.5
+++ b/metadata/md5-cache/media-gfx/jpegtoavi-1.5
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=JPEG to AVI/MJPEG animation command-line conversion tool
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/jpegtoavi/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/jpegtoavi/jpegtoavi-1.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5d6eb5455341c3810b94a458ba82381e
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.3 b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
index 5abbbdb6166a..e89e775d6666 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.3
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install pretend
DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
EAPI=7
HOMEPAGE=https://pngquant.org/lib/
+INHERIT=toolchain-funcs
IUSE=cpu_flags_x86_sse2 debug openmp static-libs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
SLOT=0/0
SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.3.tar.gz -> libimagequant-2.12.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aa2197eda3054158963631849e40981b
diff --git a/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1 b/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1
index bbd45f5f3c87..016abd3403b3 100644
--- a/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1
+++ b/metadata/md5-cache/media-gfx/mandelbulber-2.12-r1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/
DESCRIPTION=Tool to render 3D fractals
EAPI=7
HOMEPAGE=https://www.mandelbulber.com
+INHERIT=desktop qmake-utils xdg-utils
IUSE=opencl openexr sndfile tiff
KEYWORDS=~amd64 ~x86
LICENSE=CC-BY-4.0 GPL-3
RDEPEND=dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/libpng:0= sci-libs/gsl:= opencl? ( virtual/opencl ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 )
SLOT=0
SRC_URI=mirror://sourceforge/mandelbulber/mandelbulber2-2.12-1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=e215e79e77c3ccaf105d45c22ed8df05
diff --git a/metadata/md5-cache/media-gfx/metapixel-1.0.2-r1 b/metadata/md5-cache/media-gfx/metapixel-1.0.2-r1
index 4d3ea0735def..f0cbaec586a7 100644
--- a/metadata/md5-cache/media-gfx/metapixel-1.0.2-r1
+++ b/metadata/md5-cache/media-gfx/metapixel-1.0.2-r1
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl >=media-libs/giflib-5:0= >=media-libs/libpng-1.4:0= virtual
DESCRIPTION=a program for generating photomosaics
EAPI=6
HOMEPAGE=https://www.complang.tuwien.ac.at/schani/metapixel
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl >=media-libs/giflib-5:0= >=media-libs/libpng-1.4:0= virtual/jpeg:0
SLOT=0
SRC_URI=https://www.complang.tuwien.ac.at/schani/metapixel/files/metapixel-1.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f8fb5fdb2879c9ffadea11cc16acf0f9
diff --git a/metadata/md5-cache/media-gfx/monica-3.7 b/metadata/md5-cache/media-gfx/monica-3.7
index 2dbff9311cdd..d3147dfc4b8e 100644
--- a/metadata/md5-cache/media-gfx/monica-3.7
+++ b/metadata/md5-cache/media-gfx/monica-3.7
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/fltk-1.1:1
DESCRIPTION=Monica is a Monitor Calibration Tool
EAPI=6
HOMEPAGE=http://freshmeat.sourceforge.net/projects/monica
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=BSD
RDEPEND=>=x11-libs/fltk-1.1:1 x11-apps/xgamma
SLOT=0
SRC_URI=mirror://gentoo/monica-3.7.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8e7300cc5be727bd4d707f9146c82185
diff --git a/metadata/md5-cache/media-gfx/opencsg-1.4.2-r1 b/metadata/md5-cache/media-gfx/opencsg-1.4.2-r1
index e6065589e1ca..dea4052a660b 100644
--- a/metadata/md5-cache/media-gfx/opencsg-1.4.2-r1
+++ b/metadata/md5-cache/media-gfx/opencsg-1.4.2-r1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/libbsd media-libs/glew:0= virtual/opengl x11-libs/libX11 x11-lib
DESCRIPTION=The Constructive Solid Geometry rendering library
EAPI=7
HOMEPAGE=http://www.opencsg.org
+INHERIT=qmake-utils
IUSE=doc
KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/libbsd media-libs/glew:0= virtual/opengl x11-libs/libX11 x11-li
RESTRICT=test
SLOT=0
SRC_URI=http://www.opencsg.org/OpenCSG-1.4.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=15a9763885288d3259a7afa06a9b6030
diff --git a/metadata/md5-cache/media-gfx/optipng-0.7.7-r1 b/metadata/md5-cache/media-gfx/optipng-0.7.7-r1
index e3a1455099d9..b31f2088e311 100644
--- a/metadata/md5-cache/media-gfx/optipng-0.7.7-r1
+++ b/metadata/md5-cache/media-gfx/optipng-0.7.7-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib media-libs/libpng:0= sys-apps/findutils
DESCRIPTION=Compress PNG files without affecting image quality
EAPI=7
HOMEPAGE=http://optipng.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=ZLIB
RDEPEND=sys-libs/zlib media-libs/libpng:0=
SLOT=0
SRC_URI=mirror://sourceforge/optipng/optipng-0.7.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=da87339a1e9c145026593b6d6abf89c6
diff --git a/metadata/md5-cache/media-gfx/panini-0.73.0 b/metadata/md5-cache/media-gfx/panini-0.73.0
index a7aa1974c3bc..a8600cb00607 100644
--- a/metadata/md5-cache/media-gfx/panini-0.73.0
+++ b/metadata/md5-cache/media-gfx/panini-0.73.0
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 sys-l
DESCRIPTION=OpenGL-based panoramic image viewer
EAPI=7
HOMEPAGE=https://github.com/lazarus-pkgs/panini
+INHERIT=desktop qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 sys-libs/zlib virtual/glu
SLOT=0
SRC_URI=https://github.com/lazarus-pkgs/panini/archive/v0.73.0.tar.gz -> panini-0.73.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=545820956df511f16780628aa0448e47
diff --git a/metadata/md5-cache/media-gfx/pencil-0.6.5 b/metadata/md5-cache/media-gfx/pencil-0.6.5
index 278eec15204a..ae6bfe28c3fa 100644
--- a/metadata/md5-cache/media-gfx/pencil-0.6.5
+++ b/metadata/md5-cache/media-gfx/pencil-0.6.5
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 d
DESCRIPTION=2D animation and drawing program based on Qt5
EAPI=7
HOMEPAGE=https://www.pencil2d.org/
+INHERIT=desktop qmake-utils xdg-utils
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/pencil2d/pencil/archive/v0.6.5.tar.gz -> pencil-0.6.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=bc0031965e0dc8a4214a327ba74e35f2
diff --git a/metadata/md5-cache/media-gfx/phototonic-2.1 b/metadata/md5-cache/media-gfx/phototonic-2.1
index 0fdd26009069..ce56e697c064 100644
--- a/metadata/md5-cache/media-gfx/phototonic-2.1
+++ b/metadata/md5-cache/media-gfx/phototonic-2.1
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= svg?
DESCRIPTION=Image viewer and organizer
EAPI=7
HOMEPAGE=https://github.com/oferkv/phototonic
+INHERIT=qmake-utils xdg-utils
IUSE=svg tiff
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-gfx/exiv2:= svg? ( dev-qt/qtsvg:5 ) tiff? ( dev-qt/qtimageformats:5 )
SLOT=0
SRC_URI=https://github.com/oferkv/phototonic/archive/v2.1.tar.gz -> phototonic-2.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=73bd864e46eb063a5823745e49c6949a
diff --git a/metadata/md5-cache/media-gfx/pngcheck-3.0.2 b/metadata/md5-cache/media-gfx/pngcheck-3.0.2
index 7374329d1bcd..ff1efe12b7f1 100644
--- a/metadata/md5-cache/media-gfx/pngcheck-3.0.2
+++ b/metadata/md5-cache/media-gfx/pngcheck-3.0.2
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib
DESCRIPTION=Verifies the integrity of PNG, JNG and MNG files with internal checksums
EAPI=7
HOMEPAGE=http://www.libpng.org/pub/png/apps/pngcheck.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=HPND GPL-2+
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=mirror://sourceforge/png-mng/pngcheck-3.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=84d156c2ee0bee441770e5b0ed4f7ddd
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.12.3 b/metadata/md5-cache/media-gfx/pngquant-2.12.3
index 64e944891fab..f8d63b61e106 100644
--- a/metadata/md5-cache/media-gfx/pngquant-2.12.3
+++ b/metadata/md5-cache/media-gfx/pngquant-2.12.3
@@ -3,11 +3,12 @@ DEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( me
DESCRIPTION=command-line utility and library for lossy compression of PNG images
EAPI=7
HOMEPAGE=https://pngquant.org/
+INHERIT=toolchain-funcs
IUSE=debug lcms openmp cpu_flags_x86_sse2
KEYWORDS=amd64 ~x86
LICENSE=GPL-3 HPND rwpng
RDEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 )
SLOT=0
SRC_URI=https://pngquant.org/pngquant-2.12.3-src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a30869d1dc7870678121984c97ae04ab
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.12.6 b/metadata/md5-cache/media-gfx/pngquant-2.12.6
index fbced2acdb01..cc6bf861c3e3 100644
--- a/metadata/md5-cache/media-gfx/pngquant-2.12.6
+++ b/metadata/md5-cache/media-gfx/pngquant-2.12.6
@@ -3,6 +3,7 @@ DEPEND=media-libs/libpng:0= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( me
DESCRIPTION=Command-line utility and library for lossy compression of PNG images
EAPI=7
HOMEPAGE=https://pngquant.org/ https://github.com/kornelski/pngquant
+INHERIT=toolchain-funcs
IUSE=cpu_flags_x86_sse2 debug lcms openmp test
KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
LICENSE=GPL-3 HPND rwpng
@@ -11,5 +12,5 @@ REQUIRED_USE=test? ( lcms )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/kornelski/pngquant/archive/2.12.6.tar.gz -> pngquant-2.12.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e57da2b5dc5cd985d742e060146d0641
diff --git a/metadata/md5-cache/media-gfx/pngrewrite-1.4.0 b/metadata/md5-cache/media-gfx/pngrewrite-1.4.0
index c6105c836596..46ce7746cae2 100644
--- a/metadata/md5-cache/media-gfx/pngrewrite-1.4.0
+++ b/metadata/md5-cache/media-gfx/pngrewrite-1.4.0
@@ -4,10 +4,11 @@ DEPEND=media-libs/libpng:0=
DESCRIPTION=Utility which reduces large palettes in PNG images
EAPI=7
HOMEPAGE=https://entropymine.com/jason/pngrewrite/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc sparc x86 ~x86-linux ~ppc-macos
LICENSE=public-domain
RDEPEND=media-libs/libpng:0=
SLOT=0
SRC_URI=https://entropymine.com/jason/pngrewrite/pngrewrite-1.4.0.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0ad2fea2842f98e7b924404e9a54930a
diff --git a/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1 b/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
index 82adda2716d1..f9ee0895dd07 100644
--- a/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
+++ b/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:=
DESCRIPTION=Convert png images to MS ico format
EAPI=7
HOMEPAGE=https://www.kernel.org/pub/software/graphics/pngtoico/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=media-libs/libpng:=
SLOT=0
SRC_URI=https://www.kernel.org/pub/software/graphics/pngtoico/pngtoico-1.0.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bf5031fe2fab746522e70c51d2f6c9ce
diff --git a/metadata/md5-cache/media-gfx/potrace-1.15 b/metadata/md5-cache/media-gfx/potrace-1.15
index 6813be750387..34559d2f3df6 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.15
+++ b/metadata/md5-cache/media-gfx/potrace-1.15
@@ -3,11 +3,12 @@ DEPEND=sys-libs/zlib
DESCRIPTION=Transforming bitmaps into vector graphics
EAPI=6
HOMEPAGE=http://potrace.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=metric static-libs
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://potrace.sourceforge.net/download/1.15/potrace-1.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=536114de09e500f97514732053b8ff93
diff --git a/metadata/md5-cache/media-gfx/potrace-1.16 b/metadata/md5-cache/media-gfx/potrace-1.16
index 0dd40c835c9d..8b438d3dbd44 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.16
+++ b/metadata/md5-cache/media-gfx/potrace-1.16
@@ -3,11 +3,12 @@ DEPEND=sys-libs/zlib:=
DESCRIPTION=Transforming bitmaps into vector graphics
EAPI=7
HOMEPAGE=http://potrace.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=metric
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
RDEPEND=sys-libs/zlib:=
SLOT=0
SRC_URI=http://potrace.sourceforge.net/download/1.16/potrace-1.16.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c912aba3de02899641d4c721be9449af
diff --git a/metadata/md5-cache/media-gfx/qiv-2.3.2-r1 b/metadata/md5-cache/media-gfx/qiv-2.3.2-r1
index 197aaba2cec2..054b29ff4b60 100644
--- a/metadata/md5-cache/media-gfx/qiv-2.3.2-r1
+++ b/metadata/md5-cache/media-gfx/qiv-2.3.2-r1
@@ -4,11 +4,12 @@ DEPEND=media-libs/imlib2[X] >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif )
DESCRIPTION=Quick Image Viewer
EAPI=7
HOMEPAGE=https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv
+INHERIT=desktop toolchain-funcs xdg
IUSE=exif lcms magic
KEYWORDS=~amd64 ~mips ~x86
LICENSE=GPL-2
RDEPEND=media-libs/imlib2[X] >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 media-libs/tiff:0 virtual/jpeg:0 ) magic? ( sys-apps/file )
SLOT=0
SRC_URI=https://spiegl.de/qiv/download/qiv-2.3.2.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=97260abb8069c09a4fb137a496b5db5f
diff --git a/metadata/md5-cache/media-gfx/qvv-4.04.2 b/metadata/md5-cache/media-gfx/qvv-4.04.2
index 221dd9bf7bd1..c553d6cd078e 100644
--- a/metadata/md5-cache/media-gfx/qvv-4.04.2
+++ b/metadata/md5-cache/media-gfx/qvv-4.04.2
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
DESCRIPTION=Qt-based compact image viewer and browser
EAPI=7
HOMEPAGE=http://cade.datamax.bg/qvv/
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://github.com/cade-vs/qvv/archive/4.04.2.tar.gz -> qvv-4.04.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=869ca45599a7347fd7004a5b6cc90e04
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.10.0 b/metadata/md5-cache/media-gfx/ristretto-0.10.0
index 65ab68c0e9e5..6d32426fc2d4 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.10.0
+++ b/metadata/md5-cache/media-gfx/ristretto-0.10.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo
DESCRIPTION=A fast and lightweight picture viewer for Xfce
EAPI=7
HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.42:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.12.1:0=
diff --git a/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218 b/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218
index 2951b964adba..03df1397d991 100644
--- a/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218
+++ b/metadata/md5-cache/media-gfx/ttygif-1.80_p20181218
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install unpack
DESCRIPTION=Convert terminal recordings to animated gifs
EAPI=6
HOMEPAGE=https://github.com/icholy/ttygif
+INHERIT=vcs-snapshot toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=x11-apps/xwd app-misc/ttyrec media-gfx/imagemagick
SLOT=0
SRC_URI=https://github.com/icholy/ttygif/archive/362bc381c1c2449509e732d68f07656caf46b420.tar.gz -> ttygif-1.80_p20181218.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=38b04d85f3f33ec7a5cdca18cc7b45ff
diff --git a/metadata/md5-cache/media-gfx/valentina-0.6.1-r1 b/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
index 573c1ffeca33..47b2070f889a 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
+++ b/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
@@ -4,11 +4,12 @@ DEPEND=app-text/poppler dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev
DESCRIPTION=Cloth patternmaking software
EAPI=7
HOMEPAGE=https://valentinaproject.bitbucket.io/
+INHERIT=qmake-utils xdg
IUSE=l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=app-text/poppler dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
SLOT=0
SRC_URI=https://gitlab.com/smart-pattern/valentina/-/archive/v0.6.1/valentina-v0.6.1.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=18dea6db0cebd6c7a3aedee27d4bd155
diff --git a/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1 b/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
index afe32ea6a027..b5a83a9924b3 100644
--- a/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
+++ b/metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
@@ -3,10 +3,11 @@ DEPEND=media-libs/stimg
DESCRIPTION=Image viewer for w3m under frame buffer environment
EAPI=7
HOMEPAGE=http://homepage3.nifty.com/slokar/fb/w3mimg.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=w3m BSD
RDEPEND=media-libs/stimg virtual/w3m
SLOT=0
SRC_URI=http://homepage3.nifty.com/slokar/fb/w3mimgfb-0.9.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a9b06c93d107cf8b2a0e70a13b80ea2c
diff --git a/metadata/md5-cache/media-gfx/wings-2.2.6.1 b/metadata/md5-cache/media-gfx/wings-2.2.6.1
index 6385dc4f410c..b1422d7547b8 100644
--- a/metadata/md5-cache/media-gfx/wings-2.2.6.1
+++ b/metadata/md5-cache/media-gfx/wings-2.2.6.1
@@ -3,10 +3,11 @@ DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libs
DESCRIPTION=Wings 3D is an advanced subdivision modeler
EAPI=7
HOMEPAGE=http://www.wings3d.com/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/wings/wings-2.2.6.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a5fa6670c7c664a567c0e6f5a929294d
diff --git a/metadata/md5-cache/media-gfx/xfig-3.2.7b b/metadata/md5-cache/media-gfx/xfig-3.2.7b
index 42ef2f05a023..e9678f62c202 100644
--- a/metadata/md5-cache/media-gfx/xfig-3.2.7b
+++ b/metadata/md5-cache/media-gfx/xfig-3.2.7b
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-lib
DESCRIPTION=A menu-driven tool to draw and manipulate objects interactively in an X window
EAPI=7
HOMEPAGE=http://mcj.sourceforge.net/
+INHERIT=xdg
IUSE=jpeg nls postscript
KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl )
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/mcj/xfig-3.2.7b.tar.xz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=4e0af6d913b7c120a5523718864ef0fd
diff --git a/metadata/md5-cache/media-gfx/zgv-5.9 b/metadata/md5-cache/media-gfx/zgv-5.9
index 3ea9853c1340..17938f1f3c40 100644
--- a/metadata/md5-cache/media-gfx/zgv-5.9
+++ b/metadata/md5-cache/media-gfx/zgv-5.9
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng >=media-libs/svgalib-1.4.2 >=media-libs/tiff-3.5.5 sys-
DESCRIPTION=A svgalib console image viewer
EAPI=7
HOMEPAGE=http://www.svgalib.org/rus/zgv/
+INHERIT=toolchain-funcs
KEYWORDS=x86
LICENSE=GPL-2
RDEPEND=media-libs/libpng >=media-libs/svgalib-1.4.2 >=media-libs/tiff-3.5.5 sys-apps/gawk >=sys-libs/zlib-1.1.4 virtual/jpeg
SLOT=0
SRC_URI=http://www.svgalib.org/rus/zgv/zgv-5.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=061216dd8ebb0c3bdc718ef3ee755b12
diff --git a/metadata/md5-cache/media-libs/ganv-1.8.0 b/metadata/md5-cache/media-libs/ganv-1.8.0
index cd6ab21c5d02..ede97b6a5aff 100644
--- a/metadata/md5-cache/media-libs/ganv-1.8.0
+++ b/metadata/md5-cache/media-libs/ganv-1.8.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 graphviz? ( media-gfx/graphviz[gtk] ) introspection? ( app-text/yelp-tools dev-libs/gobject-introspection:=[doctool] )
SLOT=0
SRC_URI=http://download.drobilla.net/ganv-1.8.0.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-any-r1 17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-any-r1 17241a11501065ff3651350040875aa9 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91
_md5_=9aab52bbfbca76b7a7e22a92ba6eaf50
diff --git a/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.1 b/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.1
index a95bbec86485..afa3c360fc69 100644
--- a/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.1
+++ b/metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.1
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=ICC color profiles by OpenICC
EAPI=7
HOMEPAGE=https://www.freedesktop.org/wiki/OpenIcc/ProfilePackages
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
SLOT=0
SRC_URI=mirror://sourceforge/openicc/OpenICC-Profiles/icc-profiles-openicc-1.3.1.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=070f2c4d82d8d63af9313657b2541695
diff --git a/metadata/md5-cache/media-libs/icclib-2.14 b/metadata/md5-cache/media-libs/icclib-2.14
index 5218e521a530..c5fe60418c03 100644
--- a/metadata/md5-cache/media-libs/icclib-2.14
+++ b/metadata/md5-cache/media-libs/icclib-2.14
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Library for reading and writing ICC color profile files
EAPI=7
HOMEPAGE=http://freshmeat.sourceforge.net/projects/icclib
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=http://www.argyllcms.com/icclib_V2.14.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=681c2aae9d5f757b108bc31c0f4208af
diff --git a/metadata/md5-cache/media-libs/libdvd-audio-1.0.0 b/metadata/md5-cache/media-libs/libdvd-audio-1.0.0
index 7ab9c261e590..6bfa0b2a70f5 100644
--- a/metadata/md5-cache/media-libs/libdvd-audio-1.0.0
+++ b/metadata/md5-cache/media-libs/libdvd-audio-1.0.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=library for extracting audio from DVD-Audio discs
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/libdvd-audio/
+INHERIT=toolchain-funcs
IUSE=doc static-libs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-3
SLOT=0
SRC_URI=mirror://sourceforge/libdvd-audio/libdvd-audio-1.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dac332c9b66b681c83981838b5adb4ad
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20190621 b/metadata/md5-cache/media-libs/libhdhomerun-20190621
index 77b6733252db..b9faa1a72ec2 100644
--- a/metadata/md5-cache/media-libs/libhdhomerun-20190621
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20190621
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=SiliconDust HDHomeRun Utilties
EAPI=7
HOMEPAGE=https://www.silicondust.com/support/linux/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1+
SLOT=0
SRC_URI=https://download.silicondust.com/hdhomerun/libhdhomerun_20190621.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=675199d5f3e267592f72b3eb378dc252
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20200521 b/metadata/md5-cache/media-libs/libhdhomerun-20200521
index 509557b15fcc..85f021e85bf7 100644
--- a/metadata/md5-cache/media-libs/libhdhomerun-20200521
+++ b/metadata/md5-cache/media-libs/libhdhomerun-20200521
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=SiliconDust HDHomeRun Utilties
EAPI=7
HOMEPAGE=https://www.silicondust.com/support/linux/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1+
SLOT=0
SRC_URI=https://download.silicondust.com/hdhomerun/libhdhomerun_20200521.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f71e7f2642d455d5ac8c1deef45f1cb5
diff --git a/metadata/md5-cache/media-libs/libjsw-1.5.8 b/metadata/md5-cache/media-libs/libjsw-1.5.8
index 819bade0476e..7064ec4483d5 100644
--- a/metadata/md5-cache/media-libs/libjsw-1.5.8
+++ b/metadata/md5-cache/media-libs/libjsw-1.5.8
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=provide a uniform API and user configuration for joysticks and game controllers
EAPI=7
HOMEPAGE=http://freshmeat.net/projects/libjsw/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://wolfsinger.com/~wolfpack/packages/libjsw-1.5.8.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1d7cc83a924db85a432786755bb8f101
diff --git a/metadata/md5-cache/media-libs/liblrdf-0.6.1 b/metadata/md5-cache/media-libs/liblrdf-0.6.1
index db9b7d85b761..f8cbc3c290a5 100644
--- a/metadata/md5-cache/media-libs/liblrdf-0.6.1
+++ b/metadata/md5-cache/media-libs/liblrdf-0.6.1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk media-libs/raptor:2
SLOT=0
SRC_URI=https://github.com/swh/LRDF/archive/v0.6.1.tar.gz -> liblrdf-0.6.1.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=312ddc0b0c3b9a33f499a43fef3a7618
diff --git a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2 b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
index 31cee6571bc3..c4206a3688e0 100644
--- a/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
+++ b/metadata/md5-cache/media-libs/libmp4v2-2.0.0-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Functions for accessing ISO-IEC:14496-1:2001 MPEG-4 standard
EAPI=7
HOMEPAGE=https://code.google.com/p/mp4v2/
+INHERIT=libtool
IUSE=static-libs utils
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=MPL-1.1
RESTRICT=test
SLOT=0
SRC_URI=https://mp4v2.googlecode.com/files/mp4v2-2.0.0.tar.bz2
-_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96
_md5_=cd8fca84b2a6ccafdfa97b2867b31953
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.18 b/metadata/md5-cache/media-libs/libmtp-1.1.18
index fb56bab56c25..dbb27bdda7aa 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.18
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.18
@@ -4,11 +4,12 @@ DEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( >=dev-libs/
DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
EAPI=7
HOMEPAGE=http://libmtp.sourceforge.net/
+INHERIT=udev
IUSE=+crypt doc examples static-libs
KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
SLOT=0/9
SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.18.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=1320a44a234ac32a0638267560038dad
diff --git a/metadata/md5-cache/media-libs/libnjb-2.2.7 b/metadata/md5-cache/media-libs/libnjb-2.2.7
index 881e4a97952c..d10e7cd82764 100644
--- a/metadata/md5-cache/media-libs/libnjb-2.2.7
+++ b/metadata/md5-cache/media-libs/libnjb-2.2.7
@@ -3,11 +3,12 @@ DEPEND=virtual/libusb:0 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170
DESCRIPTION=Library for communicating with the Creative Nomad JukeBox digital audio player
EAPI=6
HOMEPAGE=http://libnjb.sourceforge.net
+INHERIT=libtool udev
IUSE=doc static-libs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=BSD
RDEPEND=virtual/libusb:0
SLOT=0
SRC_URI=mirror://sourceforge/libnjb/libnjb-2.2.7.tar.gz
-_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 udev 452708c3f55cf6e918b045adb949a9e6
_md5_=7d30536c0b6a08cf4d64a8c475e93845
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100 b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
index a210a2bd9662..23016d86ec10 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
@@ -3,6 +3,7 @@ DEFINED_PHASES=configure setup
DESCRIPTION=Embedded lua scripts for libquvi
EAPI=7
HOMEPAGE=http://quvi.sourceforge.net/
+INHERIT=lua-single
IUSE=offensive +lua_single_target_lua5-1
KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
LICENSE=AGPL-3
@@ -11,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/quvi/libquvi-scripts-0.9.20131130.tar.xz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=eae57f3156ecb78801027af2eff3b111
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302
index 2a4e364f7949..4705e9f05dff 100644
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20210302
@@ -11,5 +11,5 @@ LICENSE=Unlicense
RDEPEND=dev-libs/openssl:0= media-libs/opus:= media-libs/alsa-lib !pulseaudio? ( media-sound/apulse[sdk] ) pulseaudio? ( media-sound/pulseaudio ) dsp? ( media-libs/tg_owt )
SLOT=0
SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/0c0a6e476df58ee441490da72ca7a32f83e68dbd.tar.gz -> libtgvoip-2.4.4_p20210302.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
_md5_=a7b3e6d664aead19b45db8d575213d92
diff --git a/metadata/md5-cache/media-libs/lsp-plugins-1.1.24 b/metadata/md5-cache/media-libs/lsp-plugins-1.1.24
index ab3a5e0117a2..0a3cba79d9ba 100644
--- a/metadata/md5-cache/media-libs/lsp-plugins-1.1.24
+++ b/metadata/md5-cache/media-libs/lsp-plugins-1.1.24
@@ -3,6 +3,7 @@ DEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-la
DESCRIPTION=Linux Studio Plugins
EAPI=7
HOMEPAGE=https://lsp-plug.in
+INHERIT=xdg
IUSE=doc jack ladspa +lv2
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-l
REQUIRED_USE=|| ( jack ladspa lv2 )
SLOT=0
SRC_URI=https://github.com/sadko4u/lsp-plugins/archive/lsp-plugins-1.1.24.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=7de43a28ab5fa86a3a49bdd2434fd2bd
diff --git a/metadata/md5-cache/media-libs/lsp-plugins-1.1.29 b/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
index 0c59cc7c3425..020ef34c16e2 100644
--- a/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
+++ b/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
@@ -3,6 +3,7 @@ DEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-la
DESCRIPTION=Linux Studio Plugins
EAPI=7
HOMEPAGE=https://lsp-plug.in
+INHERIT=xdg
IUSE=doc jack ladspa +lv2
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=LGPL-3
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-l
REQUIRED_USE=|| ( jack ladspa lv2 )
SLOT=0
SRC_URI=https://github.com/sadko4u/lsp-plugins/archive/1.1.29.tar.gz -> lsp-plugins-1.1.29.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=17616c6a563361b50fa4a5db3595f253
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.21 b/metadata/md5-cache/media-libs/netpbm-10.86.21
index 168529550ce6..bd933670765d 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.21
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.21
@@ -11,5 +11,5 @@ LICENSE=GPL-2
RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.21/netpbm-10.86.21.tar.xz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=bdd5514542abe0cc85eb977b5ca5da30
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.0 b/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.0
index 96f227a1c2cd..fb1d2935ee19 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.0
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.0
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=x11-drivers/nvidia-drivers-445.87[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n10.0.26.0/nv-codec-headers-10.0.26.0.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=2f4ff2fbeb9cb490a958e303b3c0ac1d
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1 b/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1
index 2d81c27996db..f9d6e7be2c25 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=x11-drivers/nvidia-drivers-445.87[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n10.0.26.1/nv-codec-headers-10.0.26.1.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=2f4ff2fbeb9cb490a958e303b3c0ac1d
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-11.0.10.0 b/metadata/md5-cache/media-libs/nv-codec-headers-11.0.10.0
index 9788f999b9fa..8d33913432e5 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-11.0.10.0
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-11.0.10.0
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=x11-drivers/nvidia-drivers-455.28[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.0.10.0/nv-codec-headers-11.0.10.0.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=54457298363844d3332c4ab1738ffe9c
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2 b/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
index f22f28873e95..e5c39c06b1e1 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=x11-drivers/nvidia-drivers-390.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n8.1.24.2/nv-codec-headers-8.1.24.2.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=b5fc255d09be76938c6bcbc1d6d0c2a4
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.1 b/metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.1
index 46d5fe816b2e..22e83dae0b1b 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.1
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-9.0.18.1
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=x11-drivers/nvidia-drivers-390.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.0.18.1/nv-codec-headers-9.0.18.1.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=9702e8941d141758c3fa9e6094a65fed
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.1 b/metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.1
index 8c75dab3b8d4..ed2f70e8d28d 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.1
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-9.1.23.1
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=>=x11-drivers/nvidia-drivers-435.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.1.23.1/nv-codec-headers-9.1.23.1.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=6bc6e81f4ccfb04b8349ce52742fbc9e
diff --git a/metadata/md5-cache/media-libs/stimg-0.1.0 b/metadata/md5-cache/media-libs/stimg-0.1.0
index 067220fa682a..34ee0a345369 100644
--- a/metadata/md5-cache/media-libs/stimg-0.1.0
+++ b/metadata/md5-cache/media-libs/stimg-0.1.0
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:= media-libs/tiff:= virtual/jpeg
DESCRIPTION=Simple and tiny image loading library
EAPI=7
HOMEPAGE=http://homepage3.nifty.com/slokar/fb/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc x86
LICENSE=LGPL-2+ MIT-with-advertising
RDEPEND=media-libs/libpng:= media-libs/tiff:= virtual/jpeg
SLOT=0
SRC_URI=http://homepage3.nifty.com/slokar/stimg/stimg-0.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ede5aafac4a297e878bb7092aadfff06
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
index 1677d9f82f8a..21ae14b4db37 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
@@ -11,5 +11,5 @@ LICENSE=BSD
RDEPEND=media-libs/libsndfile:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/c4dm/vamp-plugin-sdk/archive/vamp-plugin-sdk-v2.10.tar.gz -> vamp-plugin-sdk-2.10.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=a6f911c0b1e24383866e075cfd2175b3
diff --git a/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.2 b/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.2
index 917e02a1e4a3..913cb2047306 100644
--- a/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.2
+++ b/metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.2
@@ -3,10 +3,11 @@ DEPEND=media-libs/alsa-lib
DESCRIPTION=Provides easy access to ALSA PCM devices
EAPI=7
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=toolchain-funcs multilib
KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-3
RDEPEND=media-libs/alsa-lib
SLOT=0
SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.3.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ba2cd44b407167d228f84d46224a15c4
diff --git a/metadata/md5-cache/media-libs/zita-convolver-4.0.3 b/metadata/md5-cache/media-libs/zita-convolver-4.0.3
index 049106b83f9d..f46549cd23a9 100644
--- a/metadata/md5-cache/media-libs/zita-convolver-4.0.3
+++ b/metadata/md5-cache/media-libs/zita-convolver-4.0.3
@@ -3,10 +3,11 @@ DEPEND=sci-libs/fftw:3.0=
DESCRIPTION=C++ library implementing a real-time convolution matrix
EAPI=7
HOMEPAGE=https://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
LICENSE=GPL-3+
RDEPEND=sci-libs/fftw:3.0=
SLOT=0/4
SRC_URI=https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-4.0.3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2c12c483ed8b8c576b208dfc93e121cb
diff --git a/metadata/md5-cache/media-plugins/g2reverb-0.7.1 b/metadata/md5-cache/media-plugins/g2reverb-0.7.1
index 8a6c51fde47f..64190254379d 100644
--- a/metadata/md5-cache/media-plugins/g2reverb-0.7.1
+++ b/metadata/md5-cache/media-plugins/g2reverb-0.7.1
@@ -3,6 +3,7 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=Stereo reverb LADSPA plugin.
EAPI=5
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=multilib toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sndio-1.8.0.1 b/metadata/md5-cache/media-plugins/gst-plugins-sndio-1.8.0.1
index 790444b936f7..8c187d677332 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sndio-1.8.0.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sndio-1.8.0.1
@@ -3,10 +3,11 @@ DEPEND=media-libs/gst-plugins-base:1.0 media-sound/sndio:=
DESCRIPTION=Sndio audio sink and source for GStreamer
EAPI=7
HOMEPAGE=https://github.com/t6/gstreamer1-plugins-sndio
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=ISC
RDEPEND=media-libs/gst-plugins-base:1.0 media-sound/sndio:=
SLOT=0
SRC_URI=https://github.com/t6/gstreamer1-plugins-sndio/archive/v1.8.0.1.tar.gz -> gstreamer1-plugins-sndio-1.8.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9864d8a17f365ad3d6c6d95114825b72
diff --git a/metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1 b/metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1
index b6b1e98d9463..341a367ee426 100644
--- a/metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1
+++ b/metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=MCP ladspa plugins package. Includes moogvcf, phaser & chorus
EAPI=7
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
SLOT=0
SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/MCP-plugins-0.4.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6efc8cd186c8b3dcf54291967489f39a
diff --git a/metadata/md5-cache/media-plugins/rev-plugins-0.7.1 b/metadata/md5-cache/media-plugins/rev-plugins-0.7.1
index 8f85076da0ac..e8318c83bda0 100644
--- a/metadata/md5-cache/media-plugins/rev-plugins-0.7.1
+++ b/metadata/md5-cache/media-plugins/rev-plugins-0.7.1
@@ -3,6 +3,7 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb
EAPI=5
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
diff --git a/metadata/md5-cache/media-plugins/swh-lv2-1.0.16 b/metadata/md5-cache/media-plugins/swh-lv2-1.0.16
index 0b8c5e04c05a..730bd85d100d 100644
--- a/metadata/md5-cache/media-plugins/swh-lv2-1.0.16
+++ b/metadata/md5-cache/media-plugins/swh-lv2-1.0.16
@@ -3,10 +3,11 @@ DEPEND=sci-libs/fftw:3.0 dev-libs/libxslt virtual/pkgconfig
DESCRIPTION=Large collection of LV2 audio plugins/effects
EAPI=6
HOMEPAGE=http://plugin.org.uk/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=sci-libs/fftw:3.0
SLOT=0
SRC_URI=https://github.com/swh/lv2/archive/v1.0.16.tar.gz -> swh-lv2-1.0.16.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0b9c07ac31d8c0b95f76189641bce734
diff --git a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204 b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
index bf83070cb949..e77c8a77345e 100644
--- a/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
+++ b/metadata/md5-cache/media-plugins/vamp-libxtract-plugins-0.6.6.20121204
@@ -3,6 +3,7 @@ DEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
DESCRIPTION=Vamp plugin encapsulating many of the functions of the LibXtract library
EAPI=6
HOMEPAGE=https://www.vamp-plugins.org/
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 ~ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND==sci-libs/fftw-3* >=media-libs/libxtract-0.6.6 media-libs/vamp-plugin-sdk
diff --git a/metadata/md5-cache/media-plugins/vco-plugins-0.3.0-r1 b/metadata/md5-cache/media-plugins/vco-plugins-0.3.0-r1
index f1bea8260d1c..eaff6d45e681 100644
--- a/metadata/md5-cache/media-plugins/vco-plugins-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/vco-plugins-0.3.0-r1
@@ -3,6 +3,7 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=SAW-VCO ladspa plugin package. Anti-aliased oscillators
EAPI=5
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
diff --git a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5 b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
index 5f787639db2b..40b2dcbcea74 100644
--- a/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
+++ b/metadata/md5-cache/media-plugins/vdr-ddci2-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=>=media-video/vdr-2.1.7 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
SLOT=0
SRC_URI=https://github.com/jasmin-j/vdr-plugin-ddci2/archive/1.0.5.tar.gz -> vdr-ddci2-1.0.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc unpacker 517f16af48ee3ab88180dd58b5143213 vdr-plugin-2 97da93828a6d0a7bb63d8a301042b0f3
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc unpacker 517f16af48ee3ab88180dd58b5143213 vdr-plugin-2 97da93828a6d0a7bb63d8a301042b0f3
_md5_=053eee2b0d77291590ef1e55e41d9ace
diff --git a/metadata/md5-cache/media-sound/abcm2ps-8.14.11 b/metadata/md5-cache/media-sound/abcm2ps-8.14.11
index f2a9705b3aeb..fa9dd642db3a 100644
--- a/metadata/md5-cache/media-sound/abcm2ps-8.14.11
+++ b/metadata/md5-cache/media-sound/abcm2ps-8.14.11
@@ -4,11 +4,12 @@ DEPEND=pango? ( media-libs/freetype:2 x11-libs/pango )
DESCRIPTION=Program to convert abc files to Postscript files
EAPI=7
HOMEPAGE=https://github.com/leesavide/abcm2ps
+INHERIT=toolchain-funcs
IUSE=examples pango
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=pango? ( media-libs/freetype:2 x11-libs/pango )
SLOT=0
SRC_URI=https://github.com/leesavide/abcm2ps/archive/v8.14.11.tar.gz -> abcm2ps-8.14.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bd8de723b66eb6d9e7e916120e49807a
diff --git a/metadata/md5-cache/media-sound/alac_decoder-0.2.0-r1 b/metadata/md5-cache/media-sound/alac_decoder-0.2.0-r1
index fb6903f8f546..1015f59a1f72 100644
--- a/metadata/md5-cache/media-sound/alac_decoder-0.2.0-r1
+++ b/metadata/md5-cache/media-sound/alac_decoder-0.2.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Basic decoder for Apple Lossless Audio Codec files (ALAC)
EAPI=6
HOMEPAGE=http://craz.net/programs/itunes/alac.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~ppc-macos ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=http://craz.net/programs/itunes/files/alac_decoder-0.2.0.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dcdfe8edb42f474ad92ea11b60d6d68f
diff --git a/metadata/md5-cache/media-sound/alsamixer-app-0.1-r1 b/metadata/md5-cache/media-sound/alsamixer-app-0.1-r1
index 1b97c439da07..d10bc45b8244 100644
--- a/metadata/md5-cache/media-sound/alsamixer-app-0.1-r1
+++ b/metadata/md5-cache/media-sound/alsamixer-app-0.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext media-libs/alsa-lib x11-
DESCRIPTION=simple alsa mixer dockapp
EAPI=7
HOMEPAGE=https://www.dockapps.net/alsamixerapp
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext media-libs/alsa-lib
SLOT=0
SRC_URI=https://www.dockapps.net/download/AlsaMixer.app-0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bcbe5a909f20e20e2c537601d32554fa
diff --git a/metadata/md5-cache/media-sound/ario-1.6 b/metadata/md5-cache/media-sound/ario-1.6
index 20a845916db8..eaa67e9b169e 100644
--- a/metadata/md5-cache/media-sound/ario-1.6
+++ b/metadata/md5-cache/media-sound/ario-1.6
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl
DESCRIPTION=GTK client for MPD inspired by Rhythmbox but much lighter and faster
EAPI=7
HOMEPAGE=http://ario-player.sourceforge.net
+INHERIT=xdg-utils
IUSE=dbus debug +idle nls taglib zeroconf
KEYWORDS=amd64 x86
LICENSE=GPL-2+
diff --git a/metadata/md5-cache/media-sound/aucatctl-0.1 b/metadata/md5-cache/media-sound/aucatctl-0.1
index 712d7110b8da..30df548c34e4 100644
--- a/metadata/md5-cache/media-sound/aucatctl-0.1
+++ b/metadata/md5-cache/media-sound/aucatctl-0.1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libbsd media-sound/sndio:=
DESCRIPTION=A tool for controlling aucat and/or sndiod volume through MIDI
EAPI=7
HOMEPAGE=http://www.sndio.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=ISC
RDEPEND=dev-libs/libbsd media-sound/sndio:=
SLOT=0
SRC_URI=http://www.sndio.org/aucatctl-0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=34e25db1c960b065083ac16be2c1dcc7
diff --git a/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1 b/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
index 222036ddf339..2c860c420b8e 100644
--- a/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
+++ b/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Commandline FLAC CDDA authenticity verifier
EAPI=7
HOMEPAGE=http://en.true-audio.com
+INHERIT=rpm
KEYWORDS=~amd64 ~x86
LICENSE=freedist
SLOT=0
SRC_URI=http://en.true-audio.com/ftp/aucdtect-0.8-2.i586.rpm -> aucdtect-0.8.2.rpm
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=def29790d2f489b9e9ecbb8200bebce8
diff --git a/metadata/md5-cache/media-sound/audacious-3.10.1-r1 b/metadata/md5-cache/media-sound/audacious-3.10.1-r1
index a49d4502d63a..e6211e9308ad 100644
--- a/metadata/md5-cache/media-sound/audacious-3.10.1-r1
+++ b/metadata/md5-cache/media-sound/audacious-3.10.1-r1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 >=x11-libs/cairo-1.2.6 x11
DESCRIPTION=Lightweight and versatile audio player
EAPI=7
HOMEPAGE=https://audacious-media-player.org/
+INHERIT=xdg
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=BSD-2
@@ -11,5 +12,5 @@ PDEPEND=~media-plugins/audacious-plugins-3.10.1
RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 >=x11-libs/cairo-1.2.6 x11-libs/gtk+:2 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme
SLOT=0
SRC_URI=https://distfiles.audacious-media-player.org/audacious-3.10.1.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=fe3cbe3518be395ffc4f933e776141b8
diff --git a/metadata/md5-cache/media-sound/audacious-4.0.5 b/metadata/md5-cache/media-sound/audacious-4.0.5
index bb5a67b4d0de..12c91697b85e 100644
--- a/metadata/md5-cache/media-sound/audacious-4.0.5
+++ b/metadata/md5-cache/media-sound/audacious-4.0.5
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtg
DESCRIPTION=Lightweight and versatile audio player
EAPI=7
HOMEPAGE=https://audacious-media-player.org/
+INHERIT=xdg
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=BSD-2
@@ -11,5 +12,5 @@ PDEPEND=~media-plugins/audacious-plugins-4.0.5
RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme
SLOT=0
SRC_URI=https://distfiles.audacious-media-player.org/audacious-4.0.5.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=bb6652809801d2e96cab5cdf44d8525a
diff --git a/metadata/md5-cache/media-sound/audiocompress-2.0 b/metadata/md5-cache/media-sound/audiocompress-2.0
index 7cab0ac05985..ad4231b592bb 100644
--- a/metadata/md5-cache/media-sound/audiocompress-2.0
+++ b/metadata/md5-cache/media-sound/audiocompress-2.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Very gentle 1-band dynamic range compressor
EAPI=7
HOMEPAGE=https://beesbuzz.biz/code/audiocompress.php
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=https://beesbuzz.biz/code/audiocompress/AudioCompress-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d44833fc09e69e624633f88cfcc1aa5c
diff --git a/metadata/md5-cache/media-sound/aylet-0.5 b/metadata/md5-cache/media-sound/aylet-0.5
index 6010c6ec3ab8..b23ee5d23d80 100644
--- a/metadata/md5-cache/media-sound/aylet-0.5
+++ b/metadata/md5-cache/media-sound/aylet-0.5
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:= gtk? ( x11-libs/gtk+:2 )
DESCRIPTION=Aylet plays music files in the .ay format
EAPI=7
HOMEPAGE=http://rus.members.beeb.net/aylet.html
+INHERIT=toolchain-funcs
IUSE=gtk
KEYWORDS=amd64 ~ppc sparc x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:= gtk? ( x11-libs/gtk+:2 )
SLOT=0
SRC_URI=http://ftp.ibiblio.org/pub/Linux/apps/sound/players/aylet-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b4b349ab9aec90ccc1bbccb38a353949
diff --git a/metadata/md5-cache/media-sound/bempc-0.11_p20160207 b/metadata/md5-cache/media-sound/bempc-0.11_p20160207
index a72f8bc041f8..6632cc215dba 100644
--- a/metadata/md5-cache/media-sound/bempc-0.11_p20160207
+++ b/metadata/md5-cache/media-sound/bempc-0.11_p20160207
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 medi
DESCRIPTION=Qt5 MPD client with experimental UI
EAPI=7
HOMEPAGE=https://www.linux-apps.com/content/show.php/BE::MPC?content=137091
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libmpdclient
SLOT=0
SRC_URI=https://sourceforge.net/code-snapshots/git/b/be/be-mpc/code.git/be-mpc-code-783ea4e61cbfe54250e809498b1496d6cbd5afa1.zip -> bempc-0.11_p20160207.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=85bf7cef3f11f72d1a7c5703044d4060
diff --git a/metadata/md5-cache/media-sound/bplay-0.991 b/metadata/md5-cache/media-sound/bplay-0.991
index 74cfdb0d4bf3..aa425c918b55 100644
--- a/metadata/md5-cache/media-sound/bplay-0.991
+++ b/metadata/md5-cache/media-sound/bplay-0.991
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=No-frills command-line buffered player and recorder
EAPI=7
HOMEPAGE=http://www.amberdata.demon.co.uk/bplay/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.amberdata.demon.co.uk/bplay/bplay-0.991.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a18c2b00ad14cf33d304b4519ab48321
diff --git a/metadata/md5-cache/media-sound/brutefir-1.0k-r2 b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
index 9cb3d955b9bb..1ff95e64776d 100644
--- a/metadata/md5-cache/media-sound/brutefir-1.0k-r2
+++ b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
DESCRIPTION=Software convolution engine for applying long FIR filters
EAPI=7
HOMEPAGE=https://www.ludd.ltu.se/~torger/brutefir.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
SLOT=0
SRC_URI=https://www.ludd.ltu.se/~torger/files/brutefir-1.0k.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cb315dfc2f5d847afe092c90b3cae245
diff --git a/metadata/md5-cache/media-sound/cd-discid-1.4 b/metadata/md5-cache/media-sound/cd-discid-1.4
index 4b62cc32ce7a..c9ee001c2044 100644
--- a/metadata/md5-cache/media-sound/cd-discid-1.4
+++ b/metadata/md5-cache/media-sound/cd-discid-1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=returns the disc id for the cd in the cd-rom drive
EAPI=5
HOMEPAGE=https://github.com/taem/cd-discid
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/taem/cd-discid/archive/upstream/1.4.tar.gz -> cd-discid-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=44a830c55058696de0ffbccefc1fbc26
diff --git a/metadata/md5-cache/media-sound/cdplay-1.0 b/metadata/md5-cache/media-sound/cdplay-1.0
index d789b0d28cbe..5d967e80480e 100644
--- a/metadata/md5-cache/media-sound/cdplay-1.0
+++ b/metadata/md5-cache/media-sound/cdplay-1.0
@@ -3,9 +3,10 @@ DEPEND=!media-sound/cdtool
DESCRIPTION=A commandline CD Player
EAPI=7
HOMEPAGE=http://www.ta-sa.org/?entry=cdplay
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.ta-sa.org/files/cdplay-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c14fcd5972f6cfe2089a9973dfe0aea4
diff --git a/metadata/md5-cache/media-sound/cmix-1.6 b/metadata/md5-cache/media-sound/cmix-1.6
index 08ee3d1e78e4..e2d546684e6f 100644
--- a/metadata/md5-cache/media-sound/cmix-1.6
+++ b/metadata/md5-cache/media-sound/cmix-1.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=command line audio mixer
EAPI=6
HOMEPAGE=http://cmix.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=-amd64 ~ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://antipoder.dyndns.org/downloads/cmix-1.6.tbz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0fada6a717c79b14b383b1cbdb66cc4d
diff --git a/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1 b/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
index fdde616c94a4..ab7729e00de1 100644
--- a/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
+++ b/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch
EAPI=6
HOMEPAGE=http://panteltje.com/panteltje/dvd/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://panteltje.com/panteltje/dvd/combine_wave-0.3.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0d10177f44f4336861bd923518f259de
diff --git a/metadata/md5-cache/media-sound/coquillo-2.0.1 b/metadata/md5-cache/media-sound/coquillo-2.0.1
index 7eaf610541ea..5dc6f2d4ce33 100644
--- a/metadata/md5-cache/media-sound/coquillo-2.0.1
+++ b/metadata/md5-cache/media-sound/coquillo-2.0.1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:
DESCRIPTION=GUI audio tagger based on Qt and taglib
EAPI=7
HOMEPAGE=https://www.linux-apps.com/content/show.php/Coquillo?content=141896
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/musicbrainz:5= media-libs/taglib
SLOT=0
SRC_URI=https://github.com/sjuvonen/coquillo/archive/v2.0.1.tar.gz -> coquillo-2.0.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=8c42bfc5c367dc539d33c3303e11a1cf
diff --git a/metadata/md5-cache/media-sound/dcd-0.95 b/metadata/md5-cache/media-sound/dcd-0.95
index 225467ebc8ff..e818ad06c47d 100644
--- a/metadata/md5-cache/media-sound/dcd-0.95
+++ b/metadata/md5-cache/media-sound/dcd-0.95
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A simple command-line based CD Player
EAPI=7
HOMEPAGE=http://www.technopagan.org/dcd
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~ppc ppc64 sparc x86
LICENSE=GPL-2 LGPL-2
SLOT=0
SRC_URI=http://www.technopagan.org/dcd/dcd-0.95.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fe9cc068a1c62f0194b17e6662ce2f85
diff --git a/metadata/md5-cache/media-sound/declick-0.6.5-r1 b/metadata/md5-cache/media-sound/declick-0.6.5-r1
index dd225baffe59..752dc3404bb6 100644
--- a/metadata/md5-cache/media-sound/declick-0.6.5-r1
+++ b/metadata/md5-cache/media-sound/declick-0.6.5-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Dynamic digital declicker for audio sample files
EAPI=7
HOMEPAGE=http://home.snafu.de/wahlm/dl8hbs/declick.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://home.snafu.de/wahlm/dl8hbs/declick-0.6.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=948e7dadf604bbfb55f3fe40d26aaaae
diff --git a/metadata/md5-cache/media-sound/dvda-author-10.06-r1 b/metadata/md5-cache/media-sound/dvda-author-10.06-r1
index 9f777a9160d3..b6cbeb4de590 100644
--- a/metadata/md5-cache/media-sound/dvda-author-10.06-r1
+++ b/metadata/md5-cache/media-sound/dvda-author-10.06-r1
@@ -4,11 +4,12 @@ DEPEND=media-sound/sox[png] media-libs/flac[ogg]
DESCRIPTION=Author a DVD-Audio DVD
EAPI=7
HOMEPAGE=http://dvd-audio.sourceforge.net
+INHERIT=desktop toolchain-funcs
IUSE=debug
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=media-sound/sox[png] media-libs/flac[ogg]
SLOT=0
SRC_URI=mirror://sourceforge/dvd-audio/dvda-author-10.06-300.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ffad5fd157aa0d3909d8aec19bb6cf4b
diff --git a/metadata/md5-cache/media-sound/erec-2.2.0.1-r1 b/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
index 914567aa23a6..0fc08b9d233a 100644
--- a/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
+++ b/metadata/md5-cache/media-sound/erec-2.2.0.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Shared audio recording server
EAPI=7
HOMEPAGE=https://bisqwit.iki.fi/source/erec.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc sparc x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://bisqwit.iki.fi/src/arch/erec-2.2.0.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f0079d1224d947eb3f56596ab8ff8a42
diff --git a/metadata/md5-cache/media-sound/flac-image-1.00 b/metadata/md5-cache/media-sound/flac-image-1.00
index 48b37ad5fb70..3dab4783d853 100644
--- a/metadata/md5-cache/media-sound/flac-image-1.00
+++ b/metadata/md5-cache/media-sound/flac-image-1.00
@@ -3,10 +3,11 @@ DEPEND=media-libs/flac
DESCRIPTION=Utility for adding image files (e.g. album cover art) to metadata of FLAC files
EAPI=6
HOMEPAGE=http://www.singingtree.com/software/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=media-libs/flac
SLOT=0
SRC_URI=http://www.singingtree.com/software/flac-image.tar.gz -> flac-image-1.00.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=461c352e7cae025df36c86a579a39c55
diff --git a/metadata/md5-cache/media-sound/flake-0.11 b/metadata/md5-cache/media-sound/flake-0.11
index f494092366cb..1b9e47228767 100644
--- a/metadata/md5-cache/media-sound/flake-0.11
+++ b/metadata/md5-cache/media-sound/flake-0.11
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=An alternative to the FLAC reference encoder
EAPI=7
HOMEPAGE=http://flake-enc.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://sourceforge/flake-enc/flake-0.11.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b7880466143c445dd9fd965e1c0c164c
diff --git a/metadata/md5-cache/media-sound/fmdrv-1.0.7 b/metadata/md5-cache/media-sound/fmdrv-1.0.7
index d9458dccd966..ca9947e9111a 100644
--- a/metadata/md5-cache/media-sound/fmdrv-1.0.7
+++ b/metadata/md5-cache/media-sound/fmdrv-1.0.7
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install postinst
DESCRIPTION=Console mode MIDI player with builtin userland OPL2 driver
EAPI=7
HOMEPAGE=https://bisqwit.iki.fi/source/fmdrv.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=fmdrv GPL-2
SLOT=0
SRC_URI=https://bisqwit.iki.fi/src/arch/fmdrv-1.0.7.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0a49489b66a4fa52e3d92a4b892a1f14
diff --git a/metadata/md5-cache/media-sound/fmit-1.0.15-r3 b/metadata/md5-cache/media-sound/fmit-1.0.15-r3
index 21bde0f3da19..756e06098b75 100644
--- a/metadata/md5-cache/media-sound/fmit-1.0.15-r3
+++ b/metadata/md5-cache/media-sound/fmit-1.0.15-r3
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/
DESCRIPTION=Free Music Instrument Tuner
EAPI=7
HOMEPAGE=https://gillesdegottex.github.io/fmit
+INHERIT=qmake-utils
IUSE=alsa jack oss portaudio
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ LGPL-2.1
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/fftw-3.3.4:3.0= virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio )
SLOT=0
SRC_URI=https://github.com/gillesdegottex/fmit/archive/v1.0.15.tar.gz -> fmit-1.0.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=481bfe21afa5901abbd07a6fac6505e6
diff --git a/metadata/md5-cache/media-sound/gbsplay-0.0.91-r2 b/metadata/md5-cache/media-sound/gbsplay-0.0.91-r2
index 45f9b94e6651..1d7494eca436 100644
--- a/metadata/md5-cache/media-sound/gbsplay-0.0.91-r2
+++ b/metadata/md5-cache/media-sound/gbsplay-0.0.91-r2
@@ -3,11 +3,12 @@ DEPEND=alsa? ( media-libs/alsa-lib:0 ) nas? ( media-libs/nas:0 ) nls? ( sys-deve
DESCRIPTION=Nintendo Gameboy sound player for GBS format
EAPI=6
HOMEPAGE=https://www.cgarbs.de/gbsplay.en.html
+INHERIT=l10n toolchain-funcs
IUSE=+alsa nas nls oss
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=alsa? ( media-libs/alsa-lib:0 ) nas? ( media-libs/nas:0 )
SLOT=0
SRC_URI=mirror://gentoo/gbsplay-0.0.91.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3c79abad2acff34858a79180fd58920b
diff --git a/metadata/md5-cache/media-sound/glurp-0.12.3 b/metadata/md5-cache/media-sound/glurp-0.12.3
index 44dae46d3bd2..6e1ffebeef82 100644
--- a/metadata/md5-cache/media-sound/glurp-0.12.3
+++ b/metadata/md5-cache/media-sound/glurp-0.12.3
@@ -4,6 +4,7 @@ DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 media-libs/libmpd:=
DESCRIPTION=Glurp is a GTK2 based graphical client for the Music Player Daemon
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/glurp/
+INHERIT=desktop
IUSE=debug
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/media-sound/gmtp-1.3.11-r1 b/metadata/md5-cache/media-sound/gmtp-1.3.11-r1
index 3f1612a9359b..bb0b36032690 100644
--- a/metadata/md5-cache/media-sound/gmtp-1.3.11-r1
+++ b/metadata/md5-cache/media-sound/gmtp-1.3.11-r1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp me
DESCRIPTION=A simple MTP client for MP3 players
EAPI=7
HOMEPAGE=http://gmtp.sourceforge.net/
+INHERIT=gnome2-utils
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3
SLOT=0
SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.11.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=6f61051cfcaaa51c10c9fd53a289e168
diff --git a/metadata/md5-cache/media-sound/gnomad-2.9.6 b/metadata/md5-cache/media-sound/gnomad-2.9.6
index e2d53c9e5fb3..cfa8af4b7a08 100644
--- a/metadata/md5-cache/media-sound/gnomad-2.9.6
+++ b/metadata/md5-cache/media-sound/gnomad-2.9.6
@@ -4,11 +4,12 @@ DEPEND=dev-libs/libgudev:= media-libs/libid3tag media-libs/libmtp media-libs/lib
DESCRIPTION=A GTK+ music manager for the Portable Digital Entertainment (PDE) protocol
EAPI=7
HOMEPAGE=http://gnomad2.sourceforge.net/
+INHERIT=xdg
IUSE=nls
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/libgudev:= media-libs/libid3tag media-libs/libmtp media-libs/libnjb media-libs/taglib >=x11-libs/gtk+-2.24:2
SLOT=0
SRC_URI=mirror://sourceforge/gnomad2/gnomad2-2.9.6.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=bfa95d47389913adf7a530254de835c0
diff --git a/metadata/md5-cache/media-sound/gramofile-1.6_p9 b/metadata/md5-cache/media-sound/gramofile-1.6_p9
index c454bed5f7ec..1cb9c34ffc74 100644
--- a/metadata/md5-cache/media-sound/gramofile-1.6_p9
+++ b/metadata/md5-cache/media-sound/gramofile-1.6_p9
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:= sci-libs/fftw:2.1
DESCRIPTION=Transfer sound from gramophone records to CD
EAPI=7
HOMEPAGE=http://www.opensourcepartners.nl/~costar/gramofile
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:= sci-libs/fftw:2.1
SLOT=0
SRC_URI=mirror://debian/pool/main/g/gramofile/gramofile_1.6.orig.tar.gz mirror://debian/pool/main/g/gramofile/gramofile_1.6-9.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f754b5948f148c11926139be5adcba39
diff --git a/metadata/md5-cache/media-sound/gtick-0.5.5 b/metadata/md5-cache/media-sound/gtick-0.5.5
index 24de81556f69..28ac20a16a3c 100644
--- a/metadata/md5-cache/media-sound/gtick-0.5.5
+++ b/metadata/md5-cache/media-sound/gtick-0.5.5
@@ -4,6 +4,7 @@ DEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
DESCRIPTION=Metronome application supporting different meters and speeds ranging
EAPI=7
HOMEPAGE=https://www.antcom.de/gtick
+INHERIT=desktop xdg-utils
IUSE=nls sndfile
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=GPL-3+
diff --git a/metadata/md5-cache/media-sound/gtkguitune-0.8 b/metadata/md5-cache/media-sound/gtkguitune-0.8
index a82dd5d0a9c6..ce172c3ad74a 100644
--- a/metadata/md5-cache/media-sound/gtkguitune-0.8
+++ b/metadata/md5-cache/media-sound/gtkguitune-0.8
@@ -4,10 +4,11 @@ DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 dev-util/desktop-
DESCRIPTION=A guitar tuning program that uses Schmitt-triggering for quick feedback
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop xdg
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2
SLOT=0
SRC_URI=mirror://gentoo/gtkguitune-gtk2-0.8.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=2bc4ef78d577db51f3f37d7c240b7282
diff --git a/metadata/md5-cache/media-sound/helm-0.9.0-r1 b/metadata/md5-cache/media-sound/helm-0.9.0-r1
index 91db7932ca8d..dc6fbbbb2d85 100644
--- a/metadata/md5-cache/media-sound/helm-0.9.0-r1
+++ b/metadata/md5-cache/media-sound/helm-0.9.0-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/alsa-lib media-libs/freetype media-libs/lv2 virtual/jack virtu
DESCRIPTION=Open source polyphonic software synthesizer with lots of modulation
EAPI=7
HOMEPAGE=https://tytel.org/helm/
+INHERIT=desktop xdg
KEYWORDS=amd64
LICENSE=GPL-3+
RDEPEND=media-libs/alsa-lib media-libs/freetype media-libs/lv2 virtual/jack virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr !app-admin/helm
SLOT=0
SRC_URI=https://github.com/mtytel/helm/archive/v0.9.0.tar.gz -> helm-0.9.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=a4dd21724cad8cebe73f385dbdb45bb0
diff --git a/metadata/md5-cache/media-sound/id3-0.15-r1 b/metadata/md5-cache/media-sound/id3-0.15-r1
index ae1fce8380bd..107007fab03d 100644
--- a/metadata/md5-cache/media-sound/id3-0.15-r1
+++ b/metadata/md5-cache/media-sound/id3-0.15-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=changes the id3 tag in an mp3 file
EAPI=6
HOMEPAGE=http://lly.org/~rcw/abcde/page
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://lly.org/~rcw/id3/id3_0.15.orig.tar.gz -> id3-0.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=46a992ae75cc5d0bb7da3d87352f787c
diff --git a/metadata/md5-cache/media-sound/id3ed-1.10.4-r1 b/metadata/md5-cache/media-sound/id3ed-1.10.4-r1
index 2a937a29211d..7129b5f5ee6e 100644
--- a/metadata/md5-cache/media-sound/id3ed-1.10.4-r1
+++ b/metadata/md5-cache/media-sound/id3ed-1.10.4-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
DESCRIPTION=ID3 tag editor for mp3 files
EAPI=7
HOMEPAGE=http://code.fluffytapeworm.com/projects/id3ed
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=GPL-2+
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
SLOT=0
SRC_URI=http://code.fluffytapeworm.com/projects/id3ed/id3ed-1.10.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ef3e669bb4f29d90b4b61570622020d6
diff --git a/metadata/md5-cache/media-sound/id3ted-1.0 b/metadata/md5-cache/media-sound/id3ted-1.0
index ef2bbcbea54a..7dda502ba5d0 100644
--- a/metadata/md5-cache/media-sound/id3ted-1.0
+++ b/metadata/md5-cache/media-sound/id3ted-1.0
@@ -3,10 +3,11 @@ DEPEND=media-libs/taglib sys-apps/file
DESCRIPTION=A Command-line ID3 Tag Editor
EAPI=7
HOMEPAGE=https://muennich.github.com/id3ted/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=media-libs/taglib sys-apps/file
SLOT=0
SRC_URI=https://github.com/muennich/id3ted/archive/v1.0.tar.gz -> id3ted-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f2aeea5c4c49227aa6f7408582dfca6e
diff --git a/metadata/md5-cache/media-sound/id3v2-0.1.12-r1 b/metadata/md5-cache/media-sound/id3v2-0.1.12-r1
index 79a424fa89e2..d19566400288 100644
--- a/metadata/md5-cache/media-sound/id3v2-0.1.12-r1
+++ b/metadata/md5-cache/media-sound/id3v2-0.1.12-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/id3lib
DESCRIPTION=A command line editor for id3v2 tags
EAPI=7
HOMEPAGE=http://id3v2.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=media-libs/id3lib
SLOT=0
SRC_URI=mirror://sourceforge/id3v2/id3v2-0.1.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=08a71cf41a0e9dfaebc65ef8876f3835
diff --git a/metadata/md5-cache/media-sound/litestream-1.3_rc3 b/metadata/md5-cache/media-sound/litestream-1.3_rc3
index 87f1790b2b22..774b9ba8248e 100644
--- a/metadata/md5-cache/media-sound/litestream-1.3_rc3
+++ b/metadata/md5-cache/media-sound/litestream-1.3_rc3
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Litstream is a lightweight and robust shoutcast-compatible streaming mp3 server
EAPI=7
HOMEPAGE=http://www.litestream.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=http://litestream.org/litestream/litestream-1.3RC3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f975a1ace9ea6277affb43041d126573
diff --git a/metadata/md5-cache/media-sound/mcdp-0.4b b/metadata/md5-cache/media-sound/mcdp-0.4b
index 5a61c7718355..ff4096bfa218 100644
--- a/metadata/md5-cache/media-sound/mcdp-0.4b
+++ b/metadata/md5-cache/media-sound/mcdp-0.4b
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A very small console cd player
EAPI=7
HOMEPAGE=http://www.mcmilk.de/projects/mcdp/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.mcmilk.de/projects/mcdp/dl/mcdp-0.4b.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cf2392563dab535656150f2c93e7f055
diff --git a/metadata/md5-cache/media-sound/mhwaveedit-1.4.24 b/metadata/md5-cache/media-sound/mhwaveedit-1.4.24
index c11e7c0bc01b..d9a08fbc523a 100644
--- a/metadata/md5-cache/media-sound/mhwaveedit-1.4.24
+++ b/metadata/md5-cache/media-sound/mhwaveedit-1.4.24
@@ -4,11 +4,12 @@ DEPEND=x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib:= ) jack? ( vi
DESCRIPTION=GTK+ Sound file editor (wav, and a few others.)
EAPI=7
HOMEPAGE=https://github.com/magnush/mhwaveedit/
+INHERIT=xdg
IUSE=alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib:= ) jack? ( virtual/jack ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate:= ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl:= ) sndfile? ( media-libs/libsndfile:= ) sox? ( media-sound/sox:= )
SLOT=0
SRC_URI=https://github.com/magnush/mhwaveedit/archive/v1.4.24.tar.gz -> mhwaveedit-1.4.24.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=7225f6913436a7ada1eedfda6aa93ace
diff --git a/metadata/md5-cache/media-sound/mmix-0.3-r1 b/metadata/md5-cache/media-sound/mmix-0.3-r1
index 1b257ac41856..052e2f3c3063 100644
--- a/metadata/md5-cache/media-sound/mmix-0.3-r1
+++ b/metadata/md5-cache/media-sound/mmix-0.3-r1
@@ -3,9 +3,10 @@ DEPEND=virtual/os-headers
DESCRIPTION=A soundcard mixer for the OSS driver
EAPI=7
HOMEPAGE=http://www.mcmilk.de/projects/mmix/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.mcmilk.de/projects/mmix/dl/mmix-0.3.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b73bd749102ddfdac7480e117c3f6ab9
diff --git a/metadata/md5-cache/media-sound/mp3cat-0.5 b/metadata/md5-cache/media-sound/mp3cat-0.5
index c58a136a740a..d7df47dd7269 100644
--- a/metadata/md5-cache/media-sound/mp3cat-0.5
+++ b/metadata/md5-cache/media-sound/mp3cat-0.5
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Reads and writes MP3 files
EAPI=7
HOMEPAGE=https://tomclegg.ca/mp3cat
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/tomclegg/mp3cat/archive/0.5.tar.gz -> mp3cat-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3bc2c4bf8f68e5362c5c40817e43f464
diff --git a/metadata/md5-cache/media-sound/mp3diags-1.5.01 b/metadata/md5-cache/media-sound/mp3diags-1.5.01
index 44dceb113355..924fbc11ceda 100644
--- a/metadata/md5-cache/media-sound/mp3diags-1.5.01
+++ b/metadata/md5-cache/media-sound/mp3diags-1.5.01
@@ -3,10 +3,11 @@ DEPEND=dev-libs/boost:=[threads] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
DESCRIPTION=Qt-based MP3 diagnosis and repair tool
EAPI=7
HOMEPAGE=http://mp3diags.sourceforge.net
+INHERIT=desktop qmake-utils xdg-utils
KEYWORDS=~amd64
LICENSE=LGPL-3 GPL-2
RDEPEND=dev-libs/boost:=[threads] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib dev-qt/qtsvg:5
SLOT=0
SRC_URI=mirror://sourceforge/mp3diags/MP3Diags-unstable-1.5.01.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=b49eece52c05516a66edf1d2811c4c17
diff --git a/metadata/md5-cache/media-sound/mp3gain-1.6.2 b/metadata/md5-cache/media-sound/mp3gain-1.6.2
index ae11a2725f54..7eab7dd55bf0 100644
--- a/metadata/md5-cache/media-sound/mp3gain-1.6.2
+++ b/metadata/md5-cache/media-sound/mp3gain-1.6.2
@@ -4,10 +4,11 @@ DEPEND=media-sound/mpg123
DESCRIPTION=A program to analyze and adjust MP3 files to same volume
EAPI=7
HOMEPAGE=http://mp3gain.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=LGPL-2.1
RDEPEND=media-sound/mpg123
SLOT=0
SRC_URI=mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b46eb3570fccac333655f29c730c06ca
diff --git a/metadata/md5-cache/media-sound/mpdas-0.4.2 b/metadata/md5-cache/media-sound/mpdas-0.4.2
index 54eec62aa0d7..d259eb4e12e6 100644
--- a/metadata/md5-cache/media-sound/mpdas-0.4.2
+++ b/metadata/md5-cache/media-sound/mpdas-0.4.2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libmpdclient net-misc/curl
DESCRIPTION=AudioScrobbler client for MPD written in C++
EAPI=7
HOMEPAGE=https://50hz.ws/mpdas/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=media-libs/libmpdclient net-misc/curl
SLOT=0
SRC_URI=https://50hz.ws/mpdas/mpdas-0.4.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=05496495bf168c29567c01e633c44c3c
diff --git a/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0 b/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
index 7b4531e267a9..f42927db381c 100644
--- a/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
+++ b/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
@@ -3,11 +3,12 @@ DEPEND=media-libs/alsa-lib media-libs/munt-mt32emu X? ( x11-libs/libX11 x11-libs
DESCRIPTION=ALSA MIDI driver for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I
EAPI=6
HOMEPAGE=https://github.com/munt/munt
+INHERIT=toolchain-funcs prefix
IUSE=X
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=media-libs/alsa-lib media-libs/munt-mt32emu X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXt )
SLOT=0
SRC_URI=https://github.com/munt/munt/archive/munt_2_3_0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c
_md5_=fa1e6d19714b9f84ef84e6e6bb55942e
diff --git a/metadata/md5-cache/media-sound/mup-6.6 b/metadata/md5-cache/media-sound/mup-6.6
index f82a9904a262..94ac4e07cd01 100644
--- a/metadata/md5-cache/media-sound/mup-6.6
+++ b/metadata/md5-cache/media-sound/mup-6.6
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/fltk-1.3:1 x11-libs/libXpm vi
DESCRIPTION=Program for printing music scores
EAPI=6
HOMEPAGE=http://www.arkkra.com/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=Arkkra
RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/fltk-1.3:1 x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0=
SLOT=0
SRC_URI=ftp://ftp.arkkra.com/pub/unix/mup66src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8c9dca58afa5ab2e141d6977e27909ca
diff --git a/metadata/md5-cache/media-sound/musique-1.5-r1 b/metadata/md5-cache/media-sound/musique-1.5-r1
index 5bd78df3a271..6841273c26f4 100644
--- a/metadata/md5-cache/media-sound/musique-1.5-r1
+++ b/metadata/md5-cache/media-sound/musique-1.5-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/
DESCRIPTION=Qt music player
EAPI=7
HOMEPAGE=https://flavio.tordini.org/musique
+INHERIT=qmake-utils xdg-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/phonon[qt5(+)] media-libs/taglib
SLOT=0
SRC_URI=https://github.com/flaviotordini/musique/archive/1.5.tar.gz -> musique-1.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6c48fb391b7e4c1ae387e998e53325e6
diff --git a/metadata/md5-cache/media-sound/poc-0.4.1 b/metadata/md5-cache/media-sound/poc-0.4.1
index 04609211d653..f24fbf65f708 100644
--- a/metadata/md5-cache/media-sound/poc-0.4.1
+++ b/metadata/md5-cache/media-sound/poc-0.4.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure
DESCRIPTION=mp3 and ogg streamer (include mp3cue and mp3cut)
EAPI=7
HOMEPAGE=http://www.bl0rg.net/software/poc
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=BSD
SLOT=0
SRC_URI=http://www.bl0rg.net/software/poc/poc-0.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dfac9981c476cd6cb075433238369a5e
diff --git a/metadata/md5-cache/media-sound/potamus-17 b/metadata/md5-cache/media-sound/potamus-17
index 5e56f6b8973d..5de96cc44ac4 100644
--- a/metadata/md5-cache/media-sound/potamus-17
+++ b/metadata/md5-cache/media-sound/potamus-17
@@ -4,11 +4,12 @@ DEPEND=x11-libs/gtk+:2 gnome-base/libglade media-libs/libsamplerate media-video/
DESCRIPTION=A lightweight audio player with a simple interface and an emphasis on high audio quality
EAPI=7
HOMEPAGE=http://offog.org/code/potamus/
+INHERIT=xdg
IUSE=+ao audiofile flac jack mad modplug opus vorbis
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 gnome-base/libglade media-libs/libsamplerate media-video/ffmpeg:0= ao? ( media-libs/libao ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) modplug? ( media-libs/libmodplug ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis )
SLOT=0
SRC_URI=http://offog.org/files/potamus-17.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=2a0f686dd1ad8035bb507b588d3cde91
diff --git a/metadata/md5-cache/media-sound/ptabtools-0.5.0 b/metadata/md5-cache/media-sound/ptabtools-0.5.0
index 433c81c73855..9cb3b38b867a 100644
--- a/metadata/md5-cache/media-sound/ptabtools-0.5.0
+++ b/metadata/md5-cache/media-sound/ptabtools-0.5.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/popt:= dev-libs/libxml2:= dev-libs/libxslt:=
DESCRIPTION=Utilities for PowerTab Guitar files (.ptb)
EAPI=7
HOMEPAGE=https://www.samba.org/~jelmer/ptabtools/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/popt:= dev-libs/libxml2:= dev-libs/libxslt:=
SLOT=0
SRC_URI=https://www.samba.org/~jelmer/ptabtools/ptabtools-0.5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d2a03a37c9762e34d7631bedc01d925
diff --git a/metadata/md5-cache/media-sound/qmidiarp-0.6.5 b/metadata/md5-cache/media-sound/qmidiarp-0.6.5
index 9316f9ba1336..17c3db5e35a3 100644
--- a/metadata/md5-cache/media-sound/qmidiarp-0.6.5
+++ b/metadata/md5-cache/media-sound/qmidiarp-0.6.5
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib vir
DESCRIPTION=Arpeggiator, sequencer and MIDI LFO for ALSA
EAPI=7
HOMEPAGE=http://qmidiarp.sourceforge.net/
+INHERIT=qmake-utils xdg
IUSE=lv2 nls osc
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/jack lv2? ( media-libs/lv2 ) osc? ( media-libs/liblo )
SLOT=0
SRC_URI=mirror://sourceforge/qmidiarp/qmidiarp-0.6.5.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=8bd281285d751c69a17e9c3f74e951d4
diff --git a/metadata/md5-cache/media-sound/qtgain-1.0.0 b/metadata/md5-cache/media-sound/qtgain-1.0.0
index 83fba41d9817..123958968274 100644
--- a/metadata/md5-cache/media-sound/qtgain-1.0.0
+++ b/metadata/md5-cache/media-sound/qtgain-1.0.0
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 app-arch/unzip
DESCRIPTION=Simple frontend to mp3gain, vorbisgain and metaflac
EAPI=7
HOMEPAGE=https://www.linux-apps.com/content/show.php/QtGain?content=56842
+INHERIT=desktop qmake-utils
IUSE=flac mp3 mp4 vorbis
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://dl.opendesktop.org/api/files/download/id/1466640864/56842-QtGain_1.0.0.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=07f9b6c028e38c7ffcfa66f51f969e2a
diff --git a/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123 b/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
index bdbfaf47ac34..4d81d696cc9a 100644
--- a/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
+++ b/metadata/md5-cache/media-sound/qtscrobbler-0.11_pre20130123
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/q
DESCRIPTION=Updates last.fm profiles using information from supported portable music players
EAPI=7
HOMEPAGE=http://qtscrob.sourceforge.net/
+INHERIT=desktop qmake-utils toolchain-funcs xdg-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 media-libs/libmtp:= net-misc/curl
SLOT=0
SRC_URI=https://sourceforge.net/code-snapshots/git/q/qt/qtscrob/code.git/qtscrob-code-33ed278b9b543554fd6a556fd391eb4c78faab07.zip -> qtscrobbler-0.11_pre20130123.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=8dc8609acdaab2d5ab4d53ae078da800
diff --git a/metadata/md5-cache/media-sound/quimup-1.4.4 b/metadata/md5-cache/media-sound/quimup-1.4.4
index 04fbc1453f34..91686b91f806 100644
--- a/metadata/md5-cache/media-sound/quimup-1.4.4
+++ b/metadata/md5-cache/media-sound/quimup-1.4.4
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=me
DESCRIPTION=Qt5 client for the music player daemon (MPD)
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/quimup/
+INHERIT=desktop qmake-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib
SLOT=0
SRC_URI=mirror://sourceforge/quimup/Quimup_1.4.4_source.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=10dc5ccae585087e062100480932e63d
diff --git a/metadata/md5-cache/media-sound/rcenter-0.6.2 b/metadata/md5-cache/media-sound/rcenter-0.6.2
index 7c914720a959..0e4c7ee60b22 100644
--- a/metadata/md5-cache/media-sound/rcenter-0.6.2
+++ b/metadata/md5-cache/media-sound/rcenter-0.6.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install postinst
DESCRIPTION=Rcenter - A program to control the EMU10K Remote Control
EAPI=7
HOMEPAGE=http://rooster.stanford.edu/~ben/projects/rcenter.php
+INHERIT=toolchain-funcs
KEYWORDS=amd64 -sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://rooster.stanford.edu/~ben/projects/rcenter-0.6.2.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c07e21c7dcf37a041fe595f1cee41647
diff --git a/metadata/md5-cache/media-sound/redoflacs-0.30 b/metadata/md5-cache/media-sound/redoflacs-0.30
index 950cf3c0982c..0710663d0c4e 100644
--- a/metadata/md5-cache/media-sound/redoflacs-0.30
+++ b/metadata/md5-cache/media-sound/redoflacs-0.30
@@ -2,6 +2,7 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Bash commandline flac compressor, verifier, organizer, analyzer, retagger
EAPI=7
HOMEPAGE=https://github.com/sirjaren/redoflacs
+INHERIT=readme.gentoo-r1 vcs-snapshot
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=app-shells/bash-4 media-libs/flac sys-apps/coreutils
diff --git a/metadata/md5-cache/media-sound/rexima-1.4-r1 b/metadata/md5-cache/media-sound/rexima-1.4-r1
index b137b34db4c8..aa7bf4e5e27b 100644
--- a/metadata/md5-cache/media-sound/rexima-1.4-r1
+++ b/metadata/md5-cache/media-sound/rexima-1.4-r1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
DESCRIPTION=A curses-based interactive mixer which can also be used from the command-line
EAPI=6
HOMEPAGE=http://www.svgalib.org/rus/rexima.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/rexima-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=61a5c171175ea6995581c07d2369ca7c
diff --git a/metadata/md5-cache/media-sound/ripperx-2.7.3 b/metadata/md5-cache/media-sound/ripperx-2.7.3
index 277fe49aaec4..f25e21976404 100644
--- a/metadata/md5-cache/media-sound/ripperx-2.7.3
+++ b/metadata/md5-cache/media-sound/ripperx-2.7.3
@@ -4,6 +4,7 @@ DEPEND=media-libs/id3lib media-sound/cdparanoia media-sound/lame x11-libs/gtk+:2
DESCRIPTION=GTK program to rip CD audio tracks to Ogg, MP3 or FLAC
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/ripperx
+INHERIT=desktop
IUSE=nls
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/media-sound/setmixer-19941227_p1 b/metadata/md5-cache/media-sound/setmixer-19941227_p1
index b31858beafc9..b5346edda40e 100644
--- a/metadata/md5-cache/media-sound/setmixer-19941227_p1
+++ b/metadata/md5-cache/media-sound/setmixer-19941227_p1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A commandline mixer
EAPI=7
HOMEPAGE=https://packages.debian.org/unstable/sound/setmixer
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/s/setmixer/setmixer_27DEC94ds1.orig.tar.gz mirror://debian/pool/main/s/setmixer/setmixer_27DEC94ds1-1.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=77e6327550cd237c17fd1cfe6212a2be
diff --git a/metadata/md5-cache/media-sound/sexypsf-0.4.8 b/metadata/md5-cache/media-sound/sexypsf-0.4.8
index 4110cee952af..1c561a0246a3 100644
--- a/metadata/md5-cache/media-sound/sexypsf-0.4.8
+++ b/metadata/md5-cache/media-sound/sexypsf-0.4.8
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib
DESCRIPTION=Open-source PSF1 (Playstation music) file player
EAPI=7
HOMEPAGE=http://projects.raphnet.net/#sexypsf
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://projects.raphnet.net/sexypsf/sexypsf-0.4.8.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d0209383362c3908a6753977cafef23
diff --git a/metadata/md5-cache/media-sound/shnflacverify-0.3 b/metadata/md5-cache/media-sound/shnflacverify-0.3
index 4071912bcb05..52e1192e9eab 100644
--- a/metadata/md5-cache/media-sound/shnflacverify-0.3
+++ b/metadata/md5-cache/media-sound/shnflacverify-0.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Manage the verification of checksums related to Shorten and FLAC files
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/shnflacverify/
+INHERIT=edos2unix
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl media-libs/flac media-sound/shntool sys-apps/coreutils
diff --git a/metadata/md5-cache/media-sound/smixer-1.0.4 b/metadata/md5-cache/media-sound/smixer-1.0.4
index 47ff6fb96cda..10debb20b7b6 100644
--- a/metadata/md5-cache/media-sound/smixer-1.0.4
+++ b/metadata/md5-cache/media-sound/smixer-1.0.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=command-line tool for setting and viewing mixer settings
EAPI=7
HOMEPAGE=http://centerclick.org/programs/smixer
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://centerclick.org/programs/smixer/smixer1.0.4.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8cd9044bebb3c24f27982fae80b89322
diff --git a/metadata/md5-cache/media-sound/substract_wave-0.3-r1 b/metadata/md5-cache/media-sound/substract_wave-0.3-r1
index 7594433f967b..eee4157768f2 100644
--- a/metadata/md5-cache/media-sound/substract_wave-0.3-r1
+++ b/metadata/md5-cache/media-sound/substract_wave-0.3-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=substracts 2 mono wave files from each other by a factor specified on the command line
EAPI=7
HOMEPAGE=http://panteltje.com/panteltje/dvd/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://panteltje.com/panteltje/dvd/substract_wave-0.3.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=250e919221160452d6b27be7578e346c
diff --git a/metadata/md5-cache/media-sound/taginfo-1.2-r2 b/metadata/md5-cache/media-sound/taginfo-1.2-r2
index b960d68e8ba6..9d922eea4ae2 100644
--- a/metadata/md5-cache/media-sound/taginfo-1.2-r2
+++ b/metadata/md5-cache/media-sound/taginfo-1.2-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/taglib
DESCRIPTION=A simple ID3 tag reader for use in shell scripts
EAPI=7
HOMEPAGE=http://freshmeat.net/projects/taginfo
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=media-libs/taglib
SLOT=0
SRC_URI=http://grecni.com/software/taginfo/taginfo-1.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2a9daf0e556100151e1d28ed58345a85
diff --git a/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2 b/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2
index 0835db1d276c..c05c99392c41 100644
--- a/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2
+++ b/metadata/md5-cache/media-sound/tempest_for_eliza-1.0.5-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl
DESCRIPTION=Listen to music on the radio generated by images on your screen
EAPI=7
HOMEPAGE=http://www.erikyyy.de/tempest/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl
SLOT=0
SRC_URI=http://www.erikyyy.de/tempest/tempest_for_eliza-1.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bb51dc4006a114b232832b7f4919dee5
diff --git a/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1 b/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
index f9a8ab715078..3aae8970fc30 100644
--- a/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
+++ b/metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=True Audio Compressor Software
EAPI=7
HOMEPAGE=http://tta.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/tta/ttaenc-3.4.1-src.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=994b8ee0614e921377a04965f5bc84bd
diff --git a/metadata/md5-cache/media-sound/tudor-volumed-0_pre20110427 b/metadata/md5-cache/media-sound/tudor-volumed-0_pre20110427
index e09738d5cd6f..c01424db17ea 100644
--- a/metadata/md5-cache/media-sound/tudor-volumed-0_pre20110427
+++ b/metadata/md5-cache/media-sound/tudor-volumed-0_pre20110427
@@ -3,10 +3,11 @@ DEPEND=media-libs/alsa-lib:= x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=Lightweight, desktop environment agnostic volume management daemon
EAPI=7
HOMEPAGE=https://github.com/darvid/tudor-volumed
+INHERIT=toolchain-funcs vcs-snapshot
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=media-libs/alsa-lib:= x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/darvid/tudor-volumed/tarball/7fc04cb2fb71e6f8815ddd87fd7ef5d02022edeb -> tudor-volumed-0_pre20110427.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=5a629b1b0001a8e4404407215e258ede
diff --git a/metadata/md5-cache/media-sound/vb2rip-1.4 b/metadata/md5-cache/media-sound/vb2rip-1.4
index 22d382d535fc..977a1d6264f5 100644
--- a/metadata/md5-cache/media-sound/vb2rip-1.4
+++ b/metadata/md5-cache/media-sound/vb2rip-1.4
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Konami VB2 sound format ripping utility
EAPI=7
HOMEPAGE=http://www.neillcorlett.com/vb2rip
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.neillcorlett.com/vb2rip/vb2rip14.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=498ebbe170b52d2327fc47c1a108af61
diff --git a/metadata/md5-cache/media-sound/vkeybd-0.1.18d b/metadata/md5-cache/media-sound/vkeybd-0.1.18d
index 9f004872b090..1df218abbcfa 100644
--- a/metadata/md5-cache/media-sound/vkeybd-0.1.18d
+++ b/metadata/md5-cache/media-sound/vkeybd-0.1.18d
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/tk-8.3:= x11-libs/libX11 alsa? ( media-libs/alsa-lib:= ) lash?
DESCRIPTION=A virtual MIDI keyboard for X
EAPI=7
HOMEPAGE=http://www.alsa-project.org/~iwai/alsa.html
+INHERIT=toolchain-funcs
IUSE=alsa lash oss
KEYWORDS=amd64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/tk-8.3:= x11-libs/libX11 alsa? ( media-libs/alsa-lib:= ) lash? ( media-sound/lash:= )
SLOT=0
SRC_URI=http://ftp.suse.com/pub/people/tiwai/vkeybd/vkeybd-0.1.18d.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d6852240299ccc9ba9abbc330969282
diff --git a/metadata/md5-cache/media-sound/vlevel-0.5-r1 b/metadata/md5-cache/media-sound/vlevel-0.5-r1
index 05557d212489..2a638333570e 100644
--- a/metadata/md5-cache/media-sound/vlevel-0.5-r1
+++ b/metadata/md5-cache/media-sound/vlevel-0.5-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=Dynamic compressor to amplify quiet parts of music
EAPI=7
HOMEPAGE=http://vlevel.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
SLOT=0
SRC_URI=mirror://sourceforge/vlevel/vlevel-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=250de4dca969dd312dda3faa1d9987f8
diff --git a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1 b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
index c4958b99f9e0..dd73f943e7b5 100644
--- a/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
+++ b/metadata/md5-cache/media-sound/volwheel-0.2.8-r1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A volume control trayicon with mouse wheel support
EAPI=7
HOMEPAGE=https://oliwer.net/b/volwheel.html
+INHERIT=xdg
IUSE=alsa
KEYWORDS=amd64 ~mips x86
LICENSE=GPL-3
RDEPEND=dev-lang/perl dev-perl/Gtk2 alsa? ( media-sound/alsa-utils )
SLOT=0
SRC_URI=https://olwtools.googlecode.com/files/volwheel-0.2.8.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=05b0fec35a5d45cb957ec76a2e35f469
diff --git a/metadata/md5-cache/media-sound/wavegain-1.3.1 b/metadata/md5-cache/media-sound/wavegain-1.3.1
index d2ed39dd7d84..04de51d54614 100644
--- a/metadata/md5-cache/media-sound/wavegain-1.3.1
+++ b/metadata/md5-cache/media-sound/wavegain-1.3.1
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=ReplayGain for WAVE audio files
EAPI=7
HOMEPAGE=http://www.rarewares.org/files/others/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://www.rarewares.org/files/others/wavegain-1.3.1srcs.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ff337647a44505664607e0d45ccef93f
diff --git a/metadata/md5-cache/media-sound/wavsplit-1.2.1-r2 b/metadata/md5-cache/media-sound/wavsplit-1.2.1-r2
index a795686a923c..6bbe577500bf 100644
--- a/metadata/md5-cache/media-sound/wavsplit-1.2.1-r2
+++ b/metadata/md5-cache/media-sound/wavsplit-1.2.1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=Simple command line tool to split WAV files
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/wavsplit/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 -sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/wavsplit/wavsplit-1.2.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=77373d9064aec200c88bfd0695ebd3e0
diff --git a/metadata/md5-cache/media-sound/xfmpc-0.3.0 b/metadata/md5-cache/media-sound/xfmpc-0.3.0
index 0e0ae9176191..cffe632dd596 100644
--- a/metadata/md5-cache/media-sound/xfmpc-0.3.0
+++ b/metadata/md5-cache/media-sound/xfmpc-0.3.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.18:2= >=media-libs/libmpd-0.15:= >=x11-libs/gtk+-3.22:3
DESCRIPTION=Music Player Daemon (MPD) client for the Xfce desktop environment
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/applications/xfmpc
+INHERIT=xdg-utils
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.18:2= >=media-libs/libmpd-0.15:= >=x11-libs/gtk+-3.22:3= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:=
diff --git a/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1 b/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
index 38104c38a69e..ecc82e67b893 100644
--- a/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
+++ b/metadata/md5-cache/media-sound/xmms2-scrobbler-0.4.0-r1
@@ -3,10 +3,11 @@ DEPEND=media-sound/xmms2 net-misc/curl
DESCRIPTION=XMMS2 AudioScrobbler client
EAPI=7
HOMEPAGE=https://code-monkey.de/pages/xmms2-scrobbler
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=media-sound/xmms2 net-misc/curl
SLOT=0
SRC_URI=ftp://ftp.code-monkey.de/pub/xmms2-scrobbler/xmms2-scrobbler-0.4.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aad8974a8cf46486c93f4a9558cb6423
diff --git a/metadata/md5-cache/media-sound/xnoise-0.2.21 b/metadata/md5-cache/media-sound/xnoise-0.2.21
index ad5d196de720..001e8c8358a9 100644
--- a/metadata/md5-cache/media-sound/xnoise-0.2.21
+++ b/metadata/md5-cache/media-sound/xnoise-0.2.21
@@ -4,11 +4,12 @@ DEPEND=dev-db/sqlite:3= dev-libs/glib:2 gnome-base/librsvg:2 media-libs/gstreame
DESCRIPTION=A media player for Gtk+ with a slick GUI, great speed and lots of features
EAPI=7
HOMEPAGE=http://www.xnoise-media-player.com/
+INHERIT=xdg
IUSE=appindicator +lastfm +lyrics
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-db/sqlite:3= dev-libs/glib:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= media-libs/libtaginfo:= media-plugins/gst-plugins-meta:1.0 x11-libs/cairo:= x11-libs/gtk+:3 x11-libs/libX11 appindicator? ( dev-libs/libappindicator:3= ) lastfm? ( net-libs/libsoup:2.4= ) lyrics? ( net-libs/libsoup:2.4= dev-libs/libxml2:2= )
SLOT=0
SRC_URI=https://www.bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-0.2.21.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=c95d29106d9b8dcf3a7807ffb36804a4
diff --git a/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1 b/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
index 842d2ec52c54..13b58dd70cf4 100644
--- a/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
+++ b/metadata/md5-cache/media-tv/dvbstream-0.7_pre20080516-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/linuxtv-dvb-headers
DESCRIPTION=RTP multicast stream server and other tools for DVB cards
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/dvbtools
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=mirror://gentoo/dvbstream-snapshot-20080302.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=846f499e7e88bc4111cfdd72510ca691
diff --git a/metadata/md5-cache/media-tv/ivtv-utils-1.4.1 b/metadata/md5-cache/media-tv/ivtv-utils-1.4.1
index e49e51e55c16..8f4ab67ce09a 100644
--- a/metadata/md5-cache/media-tv/ivtv-utils-1.4.1
+++ b/metadata/md5-cache/media-tv/ivtv-utils-1.4.1
@@ -3,11 +3,12 @@ DEPEND=!media-tv/ivtv
DESCRIPTION=IVTV utilities for Hauppauge PVR PCI cards
EAPI=7
HOMEPAGE=http://www.ivtvdriver.org/
+INHERIT=toolchain-funcs
IUSE=perl
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=!media-tv/ivtv media-tv/v4l-utils perl? ( dev-perl/Video-Frequencies dev-perl/Video-ivtv dev-perl/Config-IniFiles dev-perl/Tk virtual/perl-Getopt-Long )
SLOT=0
SRC_URI=http://dl.ivtvdriver.org/ivtv/archive/1.4.x/ivtv-utils-1.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ea84ced79c3265a57bb8e5c7b25dbf7d
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1 b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
index e75ad9bc4d3c..784870a79a7b 100644
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
+++ b/metadata/md5-cache/media-tv/linuxtv-dvb-apps-1.1.1.20140321-r1
@@ -3,11 +3,12 @@ DEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys
DESCRIPTION=Small utils for DVB to scan, zap, view signal strength
EAPI=7
HOMEPAGE=https://www.linuxtv.org/
+INHERIT=toolchain-funcs vcs-snapshot
IUSE=alevt usb
KEYWORDS=amd64 ~arm ~arm64 ppc x86
LICENSE=GPL-2
RDEPEND=alevt? ( !media-video/alevt media-libs/libpng:0= media-libs/zvbi[v4l] sys-libs/zlib x11-libs/libX11 ) usb? ( virtual/libusb:0 ) media-tv/dtv-scan-tables
SLOT=0
SRC_URI=https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> linuxtv-dvb-apps-1.1.1.20140321.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=aa28777e499ba62e7467e1b9135f79c6
diff --git a/metadata/md5-cache/media-tv/tvbrowser-bin-4.2.2 b/metadata/md5-cache/media-tv/tvbrowser-bin-4.2.2
index 76efacf5bf92..9a925f29d747 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-bin-4.2.2
+++ b/metadata/md5-cache/media-tv/tvbrowser-bin-4.2.2
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=Themeable and easy to use TV Guide - written in Java
EAPI=7
HOMEPAGE=https://www.tvbrowser.org
+INHERIT=desktop
KEYWORDS=~amd64
LICENSE=GPL-3
RDEPEND=|| ( dev-java/openjdk:11 dev-java/openjdk-bin:11 dev-java/openjdk-jre-bin:11 )
diff --git a/metadata/md5-cache/media-video/asfrecorder-1.1-r1 b/metadata/md5-cache/media-video/asfrecorder-1.1-r1
index 3991a544b639..2e4dc945a9f3 100644
--- a/metadata/md5-cache/media-video/asfrecorder-1.1-r1
+++ b/metadata/md5-cache/media-video/asfrecorder-1.1-r1
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Linux WindowsMedia streaming client
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/asfrecorder/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86 ~x86-linux ~ppc-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/asfrecorder/ASFRecorder.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=10b4da060105337af377db7646d4055d
diff --git a/metadata/md5-cache/media-video/baka-mplayer-2.0.4 b/metadata/md5-cache/media-video/baka-mplayer-2.0.4
index 859aaf24b0e4..3ef3f6e8ff14 100644
--- a/metadata/md5-cache/media-video/baka-mplayer-2.0.4
+++ b/metadata/md5-cache/media-video/baka-mplayer-2.0.4
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/q
DESCRIPTION=Cross-platform libmpv-based multimedia player with uncluttered design
EAPI=7
HOMEPAGE=http://bakamplayer.u8sand.net/
+INHERIT=qmake-utils
KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv] x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/u8sand/Baka-MPlayer/archive/v2.0.4.tar.gz -> baka-mplayer-2.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=a5d55a9ad723b99a0b50ac0ece26341c
diff --git a/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1 b/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
index 55454e6001e9..668fa7c95920 100644
--- a/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
+++ b/metadata/md5-cache/media-video/baka-mplayer-2.0.4-r1
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/q
DESCRIPTION=Cross-platform libmpv-based multimedia player with uncluttered design
EAPI=7
HOMEPAGE=http://bakamplayer.u8sand.net/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/mpv[libmpv] x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/u8sand/Baka-MPlayer/archive/v2.0.4.tar.gz -> baka-mplayer-2.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=cbec281e97f7cc05709b999f0e87183b
diff --git a/metadata/md5-cache/media-video/blind-1.1 b/metadata/md5-cache/media-video/blind-1.1
index e9762a609fb4..29edd859eb7a 100644
--- a/metadata/md5-cache/media-video/blind-1.1
+++ b/metadata/md5-cache/media-video/blind-1.1
@@ -3,10 +3,11 @@ DEPEND=
DESCRIPTION=a collection of command line video editing utilities
EAPI=6
HOMEPAGE=https://tools.suckless.org/blind/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=ISC
RDEPEND=
SLOT=0
SRC_URI=https://dl.suckless.org/tools/blind-1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=92a5fb163eff0241a9da76ca4801e9b3
diff --git a/metadata/md5-cache/media-video/chaplin-1.10-r2 b/metadata/md5-cache/media-video/chaplin-1.10-r2
index f602c9a3fe4e..ba1381058ffa 100644
--- a/metadata/md5-cache/media-video/chaplin-1.10-r2
+++ b/metadata/md5-cache/media-video/chaplin-1.10-r2
@@ -3,11 +3,12 @@ DEPEND=>=media-libs/libdvdread-0.9.4
DESCRIPTION=This is a program to raw copy chapters from a dvd using libdvdread
EAPI=7
HOMEPAGE=http://www.lallafa.de/bp/chaplin.html
+INHERIT=toolchain-funcs
IUSE=transcode vcd
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libdvdread-0.9.4 virtual/imagemagick-tools media-video/mjpegtools transcode? ( media-video/transcode ) vcd? ( media-video/vcdimager )
SLOT=0
SRC_URI=http://www.lallafa.de/bp/files/chaplin-1.10.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=eabf5e3cd469bef8e050b84487dfde75
diff --git a/metadata/md5-cache/media-video/dvbackup-0.0.4-r2 b/metadata/md5-cache/media-video/dvbackup-0.0.4-r2
index bfffbcb0ecdf..b229ef943fdf 100644
--- a/metadata/md5-cache/media-video/dvbackup-0.0.4-r2
+++ b/metadata/md5-cache/media-video/dvbackup-0.0.4-r2
@@ -3,10 +3,11 @@ DEPEND=sys-libs/glibc dev-libs/popt sys-libs/zlib
DESCRIPTION=A small utility for creating backups on DV tapes
EAPI=7
HOMEPAGE=http://dvbackup.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/glibc dev-libs/popt sys-libs/zlib media-libs/libdv
SLOT=0
SRC_URI=mirror://sourceforge/dvbackup/dvbackup-0.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f921070cf2a973b9c5954c634ecabdf0
diff --git a/metadata/md5-cache/media-video/flvstreamer-2.1c b/metadata/md5-cache/media-video/flvstreamer-2.1c
index 6306a827062d..0e1f49615c50 100644
--- a/metadata/md5-cache/media-video/flvstreamer-2.1c
+++ b/metadata/md5-cache/media-video/flvstreamer-2.1c
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Open source command-line RTMP client intended to stream audio or video flash content
EAPI=7
HOMEPAGE=https://savannah.nongnu.org/projects/flvstreamer/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://nongnu/flvstreamer/source/flvstreamer-2.1c.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b67df50caa3a0e73f5fe8f03cde9896b
diff --git a/metadata/md5-cache/media-video/luvcview-0.2.6-r1 b/metadata/md5-cache/media-video/luvcview-0.2.6-r1
index 3fdd58022152..26ea30810d45 100644
--- a/metadata/md5-cache/media-video/luvcview-0.2.6-r1
+++ b/metadata/md5-cache/media-video/luvcview-0.2.6-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl media-libs/libv4l x11-libs/libX11 virtual/pkgconfig
DESCRIPTION=USB Video Class grabber
EAPI=6
HOMEPAGE=https://packages.qa.debian.org/l/luvcview.html
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl media-libs/libv4l x11-libs/libX11
SLOT=0
SRC_URI=mirror://debian/pool/main/l/luvcview/luvcview_0.2.6.orig.tar.gz mirror://debian/pool/main/l/luvcview/luvcview_0.2.6-4.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=19dd3ac1aeee4b72951035068a32c254
diff --git a/metadata/md5-cache/media-video/m2vrequantizer-0.0.2_pre20060306-r1 b/metadata/md5-cache/media-video/m2vrequantizer-0.0.2_pre20060306-r1
index 86329cce02dc..6763f6efdc87 100644
--- a/metadata/md5-cache/media-video/m2vrequantizer-0.0.2_pre20060306-r1
+++ b/metadata/md5-cache/media-video/m2vrequantizer-0.0.2_pre20060306-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Tool to requantize mpeg2 videos
EAPI=7
HOMEPAGE=http://www.metakine.com/products/dvdremaster/modules.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://vdr.websitec.de/download/m2vrequantizer/M2VRequantizer-20060306.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=da154483bfe2d56ceff7cd5bae5f6ea3
diff --git a/metadata/md5-cache/media-video/matroxset-0.4 b/metadata/md5-cache/media-video/matroxset-0.4
index a05394f81876..e7b0991a4567 100644
--- a/metadata/md5-cache/media-video/matroxset-0.4
+++ b/metadata/md5-cache/media-video/matroxset-0.4
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig
DESCRIPTION=Matrox utility to switch output modes (activate tvout)
EAPI=6
HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/matroxset-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=804d01fd4225eea15658560dab4215e2
diff --git a/metadata/md5-cache/media-video/mkclean-0.8.10 b/metadata/md5-cache/media-video/mkclean-0.8.10
index c79cf6ab107c..b2506debd523 100644
--- a/metadata/md5-cache/media-video/mkclean-0.8.10
+++ b/metadata/md5-cache/media-video/mkclean-0.8.10
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=mkclean is a command line tool to clean and optimize Matroska files
EAPI=7
HOMEPAGE=https://www.matroska.org/downloads/mkclean.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/matroska/mkclean/mkclean-0.8.10.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=95e397f5719e17221dd423442042a1d8
diff --git a/metadata/md5-cache/media-video/mkvalidator-0.5.2 b/metadata/md5-cache/media-video/mkvalidator-0.5.2
index 4d6c42f8595f..7fa31b352c6d 100644
--- a/metadata/md5-cache/media-video/mkvalidator-0.5.2
+++ b/metadata/md5-cache/media-video/mkvalidator-0.5.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=mkvalidator is a command line tool to verify Matroska files for spec conformance
EAPI=5
HOMEPAGE=https://www.matroska.org/downloads/mkvalidator.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/matroska/mkvalidator/mkvalidator-0.5.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=062efe375a00f6acb0a5883f63d905a5
diff --git a/metadata/md5-cache/media-video/nvidia_video_sdk-6.0.1 b/metadata/md5-cache/media-video/nvidia_video_sdk-6.0.1
index de636cae3e77..4120e90afdda 100644
--- a/metadata/md5-cache/media-video/nvidia_video_sdk-6.0.1
+++ b/metadata/md5-cache/media-video/nvidia_video_sdk-6.0.1
@@ -3,11 +3,12 @@ DEPEND=!media-video/nvenc >=x11-drivers/nvidia-drivers-347.09 app-arch/unzip
DESCRIPTION=NVIDIA Video Codec SDK
EAPI=5
HOMEPAGE=https://developer.nvidia.com/nvidia-video-codec-sdk
+INHERIT=versionator toolchain-funcs
IUSE=tools
KEYWORDS=amd64 x86
LICENSE=MIT tools? ( NVIDIA-CODEC-SDK )
RDEPEND=!media-video/nvenc >=x11-drivers/nvidia-drivers-347.09
SLOT=0
SRC_URI=https://developer.nvidia.com/video-sdk-601 -> nvidia_video_sdk_6.0.1.zip
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4e9e4ab315620e8bda8ff559a6075f62
diff --git a/metadata/md5-cache/media-video/parole-4.16.0 b/metadata/md5-cache/media-video/parole-4.16.0
index f4185a3422d1..f8014da26396 100644
--- a/metadata/md5-cache/media-video/parole-4.16.0
+++ b/metadata/md5-cache/media-video/parole-4.16.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 media-libs/gstreamer:1.
DESCRIPTION=A simple Xfce4 media player using GStreamer
EAPI=7
HOMEPAGE=https://docs.xfce.org/apps/parole/start
+INHERIT=xdg-utils
IUSE=libnotify taglib
KEYWORDS=amd64 ~mips x86
LICENSE=GPL-2+
diff --git a/metadata/md5-cache/media-video/pgmfindclip-1.13 b/metadata/md5-cache/media-video/pgmfindclip-1.13
index a20ad3f61c5d..e6b8366a1d05 100644
--- a/metadata/md5-cache/media-video/pgmfindclip-1.13
+++ b/metadata/md5-cache/media-video/pgmfindclip-1.13
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=automatically find a clipping border for a sequence of pgm images
EAPI=7
HOMEPAGE=http://www.lallafa.de/bp/pgmfindclip.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.lallafa.de/bp/files/pgmfindclip-1.13.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1a7360925ecd9c53674a485c4cdd4e27
diff --git a/metadata/md5-cache/media-video/rovclock-0.6e-r1 b/metadata/md5-cache/media-video/rovclock-0.6e-r1
index 7e908c3592e1..8445c80c6142 100644
--- a/metadata/md5-cache/media-video/rovclock-0.6e-r1
+++ b/metadata/md5-cache/media-video/rovclock-0.6e-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Overclocking utility for ATI Radeon cards
EAPI=6
HOMEPAGE=http://www.hasw.net/linux/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.hasw.net/linux/rovclock-0.6e.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8e740fc373ec77fd8ee28def6c7a5379
diff --git a/metadata/md5-cache/media-video/setpwc-1.3 b/metadata/md5-cache/media-video/setpwc-1.3
index 8fda1ac75703..5410904893d6 100644
--- a/metadata/md5-cache/media-video/setpwc-1.3
+++ b/metadata/md5-cache/media-video/setpwc-1.3
@@ -3,9 +3,10 @@ DEPEND=sys-kernel/linux-headers
DESCRIPTION=Control various aspects of Philips (and compatible) webcams
EAPI=7
HOMEPAGE=http://www.vanheusden.com/setpwc/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.vanheusden.com/setpwc/setpwc-1.3.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=24616dca8dd94ba32c08fc9ea5a507f7
diff --git a/metadata/md5-cache/media-video/shotcut-21.02.27 b/metadata/md5-cache/media-video/shotcut-21.02.27
index f635ed645735..139890dd5900 100644
--- a/metadata/md5-cache/media-video/shotcut-21.02.27
+++ b/metadata/md5-cache/media-video/shotcut-21.02.27
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtm
DESCRIPTION=A free, open source, cross-platform video editor
EAPI=7
HOMEPAGE=https://www.shotcut.org/ https://github.com/mltframework/shotcut/
+INHERIT=qmake-utils xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-6.22.1[ffmpeg,frei0r,fftw,jack,melt(+),opengl,qt5,sdl,xml] media-video/ffmpeg dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5 virtual/jack
SLOT=0
SRC_URI=https://github.com/mltframework/shotcut/archive/v21.02.27.tar.gz -> shotcut-21.02.27.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=228f7789ac249bc8254397986f1016b3
diff --git a/metadata/md5-cache/media-video/smplayer-20.6.0 b/metadata/md5-cache/media-video/smplayer-20.6.0
index 0775b0e64bca..45202f5ed228 100644
--- a/metadata/md5-cache/media-video/smplayer-20.6.0
+++ b/metadata/md5-cache/media-video/smplayer-20.6.0
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5
DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
EAPI=7
HOMEPAGE=https://www.smplayer.eu/
+INHERIT=l10n qmake-utils toolchain-funcs xdg
IUSE=autoshutdown bidi debug mpris
KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
LICENSE=GPL-2+ BSD-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mpv[libass(+),X] media-video/mplayer[bidi?,libass,png,X] )
SLOT=0
SRC_URI=mirror://sourceforge/smplayer/smplayer-20.6.0.tar.bz2
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=1d4237c3c9983d1caa0c18aa9117c78b
diff --git a/metadata/md5-cache/media-video/submux-dvd-0.5.2-r1 b/metadata/md5-cache/media-video/submux-dvd-0.5.2-r1
index 9b19c4c2096c..5312d0b1bb55 100644
--- a/metadata/md5-cache/media-video/submux-dvd-0.5.2-r1
+++ b/metadata/md5-cache/media-video/submux-dvd-0.5.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A subtitle multiplexer, muxes subtitles into .vob
EAPI=7
HOMEPAGE=http://panteltje.com/panteltje/dvd/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://panteltje.com/panteltje/dvd/submux-dvd-0.5.2.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c00df7348c145d4b79ae4cbb2b49b053
diff --git a/metadata/md5-cache/media-video/subtitleripper-0.3.4-r4 b/metadata/md5-cache/media-video/subtitleripper-0.3.4-r4
index dfc6477f40f7..11a4552e6ef2 100644
--- a/metadata/md5-cache/media-video/subtitleripper-0.3.4-r4
+++ b/metadata/md5-cache/media-video/subtitleripper-0.3.4-r4
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/netpbm-10.41.0 media-libs/libpng sys-libs/zlib >=app-text/go
DESCRIPTION=DVD Subtitle Ripper for Linux
EAPI=7
HOMEPAGE=http://subtitleripper.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=media-libs/netpbm-10.41.0 media-libs/libpng sys-libs/zlib >=app-text/gocr-0.39
SLOT=0
SRC_URI=mirror://sourceforge/subtitleripper/subtitleripper-0.3-4.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e7478ec96d6c1204c5507fbf4e8cf144
diff --git a/metadata/md5-cache/media-video/ttcut-0.19.6_p1-r1 b/metadata/md5-cache/media-video/ttcut-0.19.6_p1-r1
index 70248ade875e..b7f3df66a164 100644
--- a/metadata/md5-cache/media-video/ttcut-0.19.6_p1-r1
+++ b/metadata/md5-cache/media-video/ttcut-0.19.6_p1-r1
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/libmpeg2-0.4.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopeng
DESCRIPTION=Tool for cutting MPEG files especially for removing commercials
EAPI=7
HOMEPAGE=https://github.com/templer/ttcut
+INHERIT=desktop qmake-utils xdg
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libmpeg2-0.4.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 virtual/glu virtual/opengl media-video/mplayer >=media-video/ffmpeg-1.0.8[encode]
SLOT=0
SRC_URI=https://dev.gentoo.org/~billie/distfiles/ttcut-0.19.6_p1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=dfed82501ca0cfb030999575e82284b8
diff --git a/metadata/md5-cache/media-video/vamps-0.99.2-r2 b/metadata/md5-cache/media-video/vamps-0.99.2-r2
index 60a743587ab0..7c2c13213cc4 100644
--- a/metadata/md5-cache/media-video/vamps-0.99.2-r2
+++ b/metadata/md5-cache/media-video/vamps-0.99.2-r2
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/libdvdread-0.9.4
DESCRIPTION=Very fast requantisizing tool for backup DVDs
EAPI=7
HOMEPAGE=http://vamps.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=media-libs/libdvdread-0.9.4 >=media-video/dvdauthor-0.6.10
SLOT=0
SRC_URI=mirror://sourceforge/vamps/vamps-0.99.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3e757effe4d27f5cd705b15b9aaaac81
diff --git a/metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5 b/metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
index 10c47772fd7a..f6c0e49e7014 100644
--- a/metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
+++ b/metadata/md5-cache/media-video/vdr2jpeg-0.2.0-r5
@@ -4,11 +4,12 @@ DEPEND=media-video/ffmpeg:0
DESCRIPTION=Addon needed for XXV - WWW Admin for the Video Disk Recorder
EAPI=7
HOMEPAGE=https://projects.vdr-developer.org/projects/xxv
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-video/ffmpeg:0
RESTRICT=strip
SLOT=0
SRC_URI=mirror://vdr-developerorg/1911/vdr2jpeg-0.2.0.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dc75fe3bf5aeff9a91656d026cfcee96
diff --git a/metadata/md5-cache/media-video/vobcopy-1.2.0 b/metadata/md5-cache/media-video/vobcopy-1.2.0
index 0a4f3a4a071b..6f628bb3e8bb 100644
--- a/metadata/md5-cache/media-video/vobcopy-1.2.0
+++ b/metadata/md5-cache/media-video/vobcopy-1.2.0
@@ -3,9 +3,10 @@ DEPEND=media-libs/libdvdread:0=
DESCRIPTION=copies DVD .vob files to harddisk, decrypting them on the way
EAPI=6
HOMEPAGE=http://lpn.rnbhq.org/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://lpn.rnbhq.org/download/vobcopy-1.2.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ea54b59dc139293f4ecdda709272ca55
diff --git a/metadata/md5-cache/net-analyzer/arping-2.17 b/metadata/md5-cache/net-analyzer/arping-2.17
index 2c9ee13812f5..f1cca8b77e95 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.17
+++ b/metadata/md5-cache/net-analyzer/arping-2.17
@@ -3,6 +3,7 @@ DEPEND=net-libs/libpcap net-libs/libnet:1.1 test? ( dev-libs/check )
DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
EAPI=5
HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
+INHERIT=fcaps
IUSE=test +filecaps
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
diff --git a/metadata/md5-cache/net-analyzer/arpoison-0.7 b/metadata/md5-cache/net-analyzer/arpoison-0.7
index 6b08a80c61f3..e489e8565579 100644
--- a/metadata/md5-cache/net-analyzer/arpoison-0.7
+++ b/metadata/md5-cache/net-analyzer/arpoison-0.7
@@ -4,10 +4,11 @@ DEPEND=net-libs/libnet:1.1
DESCRIPTION=A utility to poison ARP caches
EAPI=7
HOMEPAGE=http://arpoison.sourceforge.net/ http://www.arpoison.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ppc x86
LICENSE=GPL-2
RDEPEND=net-libs/libnet:1.1
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/arpoison-0.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3393a2d862c97802a377f29873135ca4
diff --git a/metadata/md5-cache/net-analyzer/bing-1.1.3-r2 b/metadata/md5-cache/net-analyzer/bing-1.1.3-r2
index 12f8ebc18b08..fee3ac31625d 100644
--- a/metadata/md5-cache/net-analyzer/bing-1.1.3-r2
+++ b/metadata/md5-cache/net-analyzer/bing-1.1.3-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A point-to-point bandwidth measurement tool
EAPI=7
HOMEPAGE=http://fgouget.free.fr/bing/index-en.shtml
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~ia64 ppc sparc x86
LICENSE=BSD-4
SLOT=0
SRC_URI=mirror://debian/pool/main/b/bing/bing_1.1.3.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d36a2bec23e0061a330764393e88523c
diff --git a/metadata/md5-cache/net-analyzer/braa-0.82-r1 b/metadata/md5-cache/net-analyzer/braa-0.82-r1
index 6c96339064cf..fcab5fdb72f7 100644
--- a/metadata/md5-cache/net-analyzer/braa-0.82-r1
+++ b/metadata/md5-cache/net-analyzer/braa-0.82-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Quick and dirty mass SNMP scanner
EAPI=7
HOMEPAGE=http://s-tech.elsat.net.pl/braa/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://s-tech.elsat.net.pl/braa/braa-0.82.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=25d2c5ae5d51fe091794eabecb2f7a5b
diff --git a/metadata/md5-cache/net-analyzer/ethloop-10-r4 b/metadata/md5-cache/net-analyzer/ethloop-10-r4
index f3e91cf02524..de9a6f8487eb 100644
--- a/metadata/md5-cache/net-analyzer/ethloop-10-r4
+++ b/metadata/md5-cache/net-analyzer/ethloop-10-r4
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Local simulator for testing Linux QoS disciplines
EAPI=7
HOMEPAGE=http://luxik.cdi.cz/~devik/qos/ethloop/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=all-rights-reserved
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://luxik.cdi.cz/~devik/qos/ethloop/ethloop10.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6b94af5dcbf36618c0c58bdcb4b8fe0d
diff --git a/metadata/md5-cache/net-analyzer/fping-5.0 b/metadata/md5-cache/net-analyzer/fping-5.0
index c81f0cca8c49..5202279d5dda 100644
--- a/metadata/md5-cache/net-analyzer/fping-5.0
+++ b/metadata/md5-cache/net-analyzer/fping-5.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=configure install postinst
DESCRIPTION=A utility to ping multiple hosts at once
EAPI=7
HOMEPAGE=https://fping.org/ https://github.com/schweikert/fping/
+INHERIT=fcaps
IUSE=ipv6 suid +filecaps
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=fping
diff --git a/metadata/md5-cache/net-analyzer/gensink-4.1-r2 b/metadata/md5-cache/net-analyzer/gensink-4.1-r2
index 00257c0efeb5..df66ab6f6e22 100644
--- a/metadata/md5-cache/net-analyzer/gensink-4.1-r2
+++ b/metadata/md5-cache/net-analyzer/gensink-4.1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A simple TCP benchmark suite
EAPI=7
HOMEPAGE=http://jes.home.cern.ch/jes/gensink/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://jes.home.cern.ch/jes/gensink/gensink-4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6e1724fc57039782674267c39a9030c6
diff --git a/metadata/md5-cache/net-analyzer/hexinject-1.6-r1 b/metadata/md5-cache/net-analyzer/hexinject-1.6-r1
index 87dc770003bb..86bb2ebad86c 100644
--- a/metadata/md5-cache/net-analyzer/hexinject-1.6-r1
+++ b/metadata/md5-cache/net-analyzer/hexinject-1.6-r1
@@ -3,11 +3,12 @@ DEPEND=net-libs/libpcap
DESCRIPTION=Network packet sniffer and injector
EAPI=6
HOMEPAGE=http://hexinject.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=+tools experimental
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=net-libs/libpcap experimental? ( dev-lang/tcl )
SLOT=0
SRC_URI=mirror://sourceforge/hexinject/hexinject-1.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ecb5cbe9733f4273e13be40281db732f
diff --git a/metadata/md5-cache/net-analyzer/hping-3_pre20141226 b/metadata/md5-cache/net-analyzer/hping-3_pre20141226
index 2e002822a911..f6eff5c083a6 100644
--- a/metadata/md5-cache/net-analyzer/hping-3_pre20141226
+++ b/metadata/md5-cache/net-analyzer/hping-3_pre20141226
@@ -3,11 +3,12 @@ DEPEND=net-libs/libpcap tcl? ( dev-lang/tcl:0= )
DESCRIPTION=A ping-like TCP/IP packet assembler/analyzer
EAPI=7
HOMEPAGE=http://www.hping.org
+INHERIT=toolchain-funcs
IUSE=tcl
KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86
LICENSE=GPL-2
RDEPEND=net-libs/libpcap tcl? ( dev-lang/tcl:0= )
SLOT=0
SRC_URI=https://github.com/antirez/hping/archive/3547c7691742c6eaa31f8402e0ccbb81387c1b99.tar.gz -> hping-3_pre20141226.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=27f61affa53f7f450147c61f246d26db
diff --git a/metadata/md5-cache/net-analyzer/ipband-0.8.1-r2 b/metadata/md5-cache/net-analyzer/ipband-0.8.1-r2
index 3f1c0386a556..5f2c1f348c59 100644
--- a/metadata/md5-cache/net-analyzer/ipband-0.8.1-r2
+++ b/metadata/md5-cache/net-analyzer/ipband-0.8.1-r2
@@ -3,10 +3,11 @@ DEPEND=>=net-libs/libpcap-0.4
DESCRIPTION=A pcap based IP traffic and bandwidth monitor
EAPI=7
HOMEPAGE=http://ipband.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libpcap-0.4
SLOT=0
SRC_URI=mirror://sourceforge/ipband/ipband-0.8.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dd79a17dade05bef36d51235fe78486f
diff --git a/metadata/md5-cache/net-analyzer/ippl-1.4.14-r6 b/metadata/md5-cache/net-analyzer/ippl-1.4.14-r6
index b997f777d613..f17220524996 100644
--- a/metadata/md5-cache/net-analyzer/ippl-1.4.14-r6
+++ b/metadata/md5-cache/net-analyzer/ippl-1.4.14-r6
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=A daemon which logs TCP/UDP/ICMP packets
EAPI=7
HOMEPAGE=http://pltplp.net/ippl/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=acct-user/ippl
SLOT=0
SRC_URI=http://pltplp.net/ippl/archive/ippl-1.4.14.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4f8421eb4b332a1a721906a871ea4af1
diff --git a/metadata/md5-cache/net-analyzer/iptstate-2.2.6 b/metadata/md5-cache/net-analyzer/iptstate-2.2.6
index 3770ef50af1f..9240c0fd9466 100644
--- a/metadata/md5-cache/net-analyzer/iptstate-2.2.6
+++ b/metadata/md5-cache/net-analyzer/iptstate-2.2.6
@@ -3,10 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.7-r7:0= >=net-libs/libnetfilter_conntrack-0.0.50 vir
DESCRIPTION=IP Tables State displays states being kept by iptables in a top-like format
EAPI=6
HOMEPAGE=https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ppc x86
LICENSE=ZLIB
RDEPEND=>=sys-libs/ncurses-5.7-r7:0= >=net-libs/libnetfilter_conntrack-0.0.50
SLOT=0
SRC_URI=https://github.com/jaymzh/iptstate/releases/download/v2.2.6/iptstate-2.2.6.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=efeea015b6c179d75eba58b0f12339cd
diff --git a/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20200412 b/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20200412
index 62db8925b468..f58fa03c98eb 100644
--- a/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20200412
+++ b/metadata/md5-cache/net-analyzer/ipv6toolkit-2.1_p20200412
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap[ipv6(+)]
DESCRIPTION=Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets
EAPI=7
HOMEPAGE=https://www.si6networks.com/tools/ipv6toolkit/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=net-libs/libpcap[ipv6(+)] sys-apps/hwids
SLOT=0
SRC_URI=https://github.com/fgont/ipv6toolkit/archive/623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf.tar.gz -> ipv6toolkit-2.1_p20200412.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=acde5ca20c9592e2219eeb9caa52adc2
diff --git a/metadata/md5-cache/net-analyzer/isic-0.07-r1 b/metadata/md5-cache/net-analyzer/isic-0.07-r1
index 57105c688a7e..70bb637d7812 100644
--- a/metadata/md5-cache/net-analyzer/isic-0.07-r1
+++ b/metadata/md5-cache/net-analyzer/isic-0.07-r1
@@ -3,10 +3,11 @@ DEPEND=net-libs/libnet:1.1
DESCRIPTION=IP Stack Integrity Checker
EAPI=5
HOMEPAGE=http://isic.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=BSD
RDEPEND=net-libs/libnet:1.1
SLOT=0
SRC_URI=mirror://sourceforge/isic/isic-0.07.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8c3f1571c27394d427d607aa4bd87126
diff --git a/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3 b/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
index ef194fefe7d4..7a0e40ec4577 100644
--- a/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
+++ b/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Knocker is an easy to use security port scanner written in C
EAPI=7
HOMEPAGE=http://knocker.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/knocker/knocker-0.7.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d92273f6b9a2f83add0c3364de43c8a7
diff --git a/metadata/md5-cache/net-analyzer/masscan-1.3.2 b/metadata/md5-cache/net-analyzer/masscan-1.3.2
index 989fa43b4732..7ab7fec4cc77 100644
--- a/metadata/md5-cache/net-analyzer/masscan-1.3.2
+++ b/metadata/md5-cache/net-analyzer/masscan-1.3.2
@@ -2,10 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Mass IP port scanner
EAPI=7
HOMEPAGE=https://github.com/robertdavidgraham/masscan
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3
RDEPEND=net-libs/libpcap
SLOT=0
SRC_URI=https://github.com/robertdavidgraham/masscan/archive/1.3.2.tar.gz -> masscan-1.3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bf813a9e0f653873b32e4451dba6dff4
diff --git a/metadata/md5-cache/net-analyzer/multipath-tcp-tools-2018_p12_p21 b/metadata/md5-cache/net-analyzer/multipath-tcp-tools-2018_p12_p21
index 420738e28068..458b2a08b4f1 100644
--- a/metadata/md5-cache/net-analyzer/multipath-tcp-tools-2018_p12_p21
+++ b/metadata/md5-cache/net-analyzer/multipath-tcp-tools-2018_p12_p21
@@ -3,10 +3,11 @@ DEPEND=dev-libs/openssl:* net-libs/libpcap
DESCRIPTION=Analysis tools for Multipath Transmission Control Protocol (MPTCP)
EAPI=7
HOMEPAGE=https://github.com/nasa/multipath-tcp-tools
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=NOSA
RDEPEND=dev-libs/openssl:* net-libs/libpcap
SLOT=0
SRC_URI=https://github.com/nasa/multipath-tcp-tools/archive/v2018-12-21.tar.gz -> multipath-tcp-tools-2018_p12_p21.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5ca64b04c4f8aba411ddce43555a462b
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4 b/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
index 302baf73627d..2b6d16dce213 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
+++ b/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl
DESCRIPTION=Nagios plugin to monitor bonding status of network interfaces
EAPI=5
HOMEPAGE=http://folk.uio.no/trondham/software/check_linux_bonding.html
+INHERIT=multilib
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://folk.uio.no/trondham/software/files/check_linux_bonding-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ba07cc090f356c29560b2daa3fb070a0
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.6 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.6
index cc4400b1fea1..cb728fc38654 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.6
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.6
@@ -4,6 +4,7 @@ DEPEND=dev-libs/libltdl:0
DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
EAPI=7
HOMEPAGE=https://www.nagios.org/
+INHERIT=toolchain-funcs
IUSE=apache2 classicui lighttpd perl +web vim-syntax
KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86
LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=acct-group/nagios acct-user/nagios virtual/mailx perl? ( dev-lang/perl:=
REQUIRED_USE=apache2? ( !lighttpd )
SLOT=0
SRC_URI=mirror://sourceforge/nagios/nagios-4.4.6.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=192082363f5fdd50bbf5eead2619d8d6
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1 b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
index 5587c4c8d45f..717e81304e63 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
@@ -12,5 +12,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.4.1.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 multiprocessing cac3169468f893670dac3e7cb940e045 distutils-r1 f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 f0ca511df3fddd316b783632b804e8fb
_md5_=36393c7eb2ab75d06daae047c75f907c
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.6.0 b/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
index 5307c743ee27..3f330ee65487 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
@@ -12,5 +12,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
SRC_URI=https://github.com/HenriWahl/Nagstamon/archive/v3.6.0.tar.gz -> nagstamon-3.6.0.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 multiprocessing cac3169468f893670dac3e7cb940e045 distutils-r1 f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 f0ca511df3fddd316b783632b804e8fb
_md5_=237bf656c17bfee4f49b1a5e77645cda
diff --git a/metadata/md5-cache/net-analyzer/netio-1.33 b/metadata/md5-cache/net-analyzer/netio-1.33
index 985040d53a43..1f69c021c6f4 100644
--- a/metadata/md5-cache/net-analyzer/netio-1.33
+++ b/metadata/md5-cache/net-analyzer/netio-1.33
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip >=sys-apps/sed-4
DESCRIPTION=Network benchmark using TCP and UDP protocols
EAPI=7
HOMEPAGE=https://web.ars.de/netio/
+INHERIT=edos2unix toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=free-noncomm
RESTRICT=mirror
SLOT=0
SRC_URI=https://www.ars.de/netio133.zip
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f1b579eedcef7efe9284a6c66d80e86f
diff --git a/metadata/md5-cache/net-analyzer/netpipe-3.7.2 b/metadata/md5-cache/net-analyzer/netpipe-3.7.2
index 6d571ab0859f..3346a210c6e2 100644
--- a/metadata/md5-cache/net-analyzer/netpipe-3.7.2
+++ b/metadata/md5-cache/net-analyzer/netpipe-3.7.2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=network protocol independent performance evaluator
EAPI=6
HOMEPAGE=http://bitspjoule.org/netpipe/
+INHERIT=toolchain-funcs
IUSE=ipv6
KEYWORDS=~amd64
LICENSE=GPL-1+
SLOT=0
SRC_URI=http://bitspjoule.org/netpipe/code/NetPIPE-3.7.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a6736ee6c4295f3332dac814c79d5223
diff --git a/metadata/md5-cache/net-analyzer/odhcploc-20111021-r1 b/metadata/md5-cache/net-analyzer/odhcploc-20111021-r1
index 760421839b20..de6fbca55f04 100644
--- a/metadata/md5-cache/net-analyzer/odhcploc-20111021-r1
+++ b/metadata/md5-cache/net-analyzer/odhcploc-20111021-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Open DHCP Locator
EAPI=7
HOMEPAGE=http://odhcploc.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=ISC
SLOT=0
SRC_URI=mirror://sourceforge/project/odhcploc/20111021/odhcploc-20111021.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4c462b8b5eed63b96fd5d9cf601f41b3
diff --git a/metadata/md5-cache/net-analyzer/opsgenie-lamp-2.5.1_p20181102 b/metadata/md5-cache/net-analyzer/opsgenie-lamp-2.5.1_p20181102
index ab4430b49240..308cd0392b02 100644
--- a/metadata/md5-cache/net-analyzer/opsgenie-lamp-2.5.1_p20181102
+++ b/metadata/md5-cache/net-analyzer/opsgenie-lamp-2.5.1_p20181102
@@ -3,6 +3,7 @@ DEPEND=dev-lang/go:=
DESCRIPTION=command line client for the opsgenie service
EAPI=6
HOMEPAGE=https://docs.opsgenie.com/docs/lamp-command-line-interface-for-opsgenie
+INHERIT=vcs-snapshot
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/net-analyzer/ostinato-1.1 b/metadata/md5-cache/net-analyzer/ostinato-1.1
index 9a520765b0ea..63d691fca996 100644
--- a/metadata/md5-cache/net-analyzer/ostinato-1.1
+++ b/metadata/md5-cache/net-analyzer/ostinato-1.1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-
DESCRIPTION=Packet generator and analyzer
EAPI=7
HOMEPAGE=https://ostinato.org/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-3
RDEPEND=dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 >=net-libs/libpcap-1.8.1-r2
SLOT=0
SRC_URI=https://github.com/pstavirs/ostinato/archive/v1.1.tar.gz -> ostinato-1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=b0847fd40c9b98be32a295127ab50523
diff --git a/metadata/md5-cache/net-analyzer/p0f-3.09_beta b/metadata/md5-cache/net-analyzer/p0f-3.09_beta
index 9a3ef4cc88b7..f584f9b519c2 100644
--- a/metadata/md5-cache/net-analyzer/p0f-3.09_beta
+++ b/metadata/md5-cache/net-analyzer/p0f-3.09_beta
@@ -3,11 +3,12 @@ DEPEND=net-libs/libpcap
DESCRIPTION=A tool to perform passive OS detection based on SYN packets
EAPI=6
HOMEPAGE=https://lcamtuf.coredump.cx/p0f3/
+INHERIT=toolchain-funcs
IUSE=debug ipv6
KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=LGPL-2.1
RDEPEND=net-libs/libpcap
SLOT=0
SRC_URI=https://lcamtuf.coredump.cx/p0f3/releases/p0f-3.09b.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=00dd267a4865aacc36cf6ec4ae891f47
diff --git a/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1 b/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1
index 875eedaf8353..d63032b4578d 100644
--- a/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1
+++ b/metadata/md5-cache/net-analyzer/pathload-1.3.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Non-intrusive utility for estimation of available bandwidth of Internet paths
EAPI=7
HOMEPAGE=https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/pathload-1.3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aec2e90a092bb0e81254cc9432fe72b8
diff --git a/metadata/md5-cache/net-analyzer/poink-2.03 b/metadata/md5-cache/net-analyzer/poink-2.03
index c1d899792fca..b583a5828c53 100644
--- a/metadata/md5-cache/net-analyzer/poink-2.03
+++ b/metadata/md5-cache/net-analyzer/poink-2.03
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=TCP/IP-based ping implementation
EAPI=7
HOMEPAGE=https://directory.fsf.org/security/system/poink.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://ep09.pld-linux.org/~mmazur/poink/poink-2.03.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e9cf9e7c9094b0c26b9a0fa3381df90a
diff --git a/metadata/md5-cache/net-analyzer/siphon-666-r2 b/metadata/md5-cache/net-analyzer/siphon-666-r2
index 67c542b9fa86..391a54da6ee9 100644
--- a/metadata/md5-cache/net-analyzer/siphon-666-r2
+++ b/metadata/md5-cache/net-analyzer/siphon-666-r2
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap
DESCRIPTION=A portable passive network mapping suite
EAPI=7
HOMEPAGE=http://siphon.datanerds.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=BSD
RDEPEND=net-libs/libpcap
SLOT=0
SRC_URI=http://siphon.datanerds.net/siphon-v.666.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=17997717093a2ad059b371c2cc67e179
diff --git a/metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1 b/metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
index 0dcb36dcf094..16dc00436f26 100644
--- a/metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
+++ b/metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=A SQL Server injection & takeover tool
EAPI=5
HOMEPAGE=http://sqlninja.sourceforge.net/
+INHERIT=versionator
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/net-analyzer/tcping-1.3.6 b/metadata/md5-cache/net-analyzer/tcping-1.3.6
index 43bb5cf89e75..b7c7ff5f13d5 100644
--- a/metadata/md5-cache/net-analyzer/tcping-1.3.6
+++ b/metadata/md5-cache/net-analyzer/tcping-1.3.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Check if a desired port is reachable via TCP
EAPI=7
HOMEPAGE=https://github.com/mkirchner/tcping
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT-with-advertising
SLOT=0
SRC_URI=https://github.com/mkirchner/tcping/archive/1.3.6.tar.gz -> tcping-1.3.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1adfc08b2944cdc5ac0351db62721bae
diff --git a/metadata/md5-cache/net-analyzer/tcpreen-1.4.4 b/metadata/md5-cache/net-analyzer/tcpreen-1.4.4
index 568d60321d60..c26e8a400e5d 100644
--- a/metadata/md5-cache/net-analyzer/tcpreen-1.4.4
+++ b/metadata/md5-cache/net-analyzer/tcpreen-1.4.4
@@ -3,10 +3,11 @@ DEPEND=nls? ( sys-devel/gettext )
DESCRIPTION=TCP network re-engineering tool
EAPI=6
HOMEPAGE=https://www.remlab.net/tcpreen/
+INHERIT=toolchain-funcs
IUSE=nls
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.remlab.net/files/tcpreen/stable/tcpreen-1.4.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4aa48592dd4d8ff3eef813c56e6aad84
diff --git a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1 b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
index 6e8ddbbd4e1d..366215b37309 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
+++ b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Traceroute with AS lookup, TOS support, MTU discovery and other features
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2.orig.tar.gz https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2-1.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c10fc1e6d869e89027923bd6f336ebd8
diff --git a/metadata/md5-cache/net-analyzer/ttcp-1.12-r2 b/metadata/md5-cache/net-analyzer/ttcp-1.12-r2
index b0b0cbc35c58..fbbcddfe75cc 100644
--- a/metadata/md5-cache/net-analyzer/ttcp-1.12-r2
+++ b/metadata/md5-cache/net-analyzer/ttcp-1.12-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Tool to test TCP and UDP throughput
EAPI=6
HOMEPAGE=http://ftp.arl.mil/~mike/ttcp.html http://www.netcore.fi/pekkas/linux/ipv6/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://gentoo/ttcp-1.12.tar.bz2 https://dev.gentoo.org/~jer/ttcp-1.12.c
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a7aa1b39377ff2b16519ffde5e98a1dd
diff --git a/metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2 b/metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
index b43b1a91fd47..a077791ac61e 100644
--- a/metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
+++ b/metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Poor man's web vulnerability scanner
EAPI=7
HOMEPAGE=http://gunzip.altervista.org/g.php?f=projects
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://gunzip.altervista.org/webfuzzer/webfuzzer-0.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=88aa855c85cfe3744a0c0371bffa62d1
diff --git a/metadata/md5-cache/net-analyzer/xprobe-0.3-r1 b/metadata/md5-cache/net-analyzer/xprobe-0.3-r1
index 26c60ef9a813..c5b20aa8ebe8 100644
--- a/metadata/md5-cache/net-analyzer/xprobe-0.3-r1
+++ b/metadata/md5-cache/net-analyzer/xprobe-0.3-r1
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap
DESCRIPTION=Active OS fingerprinting tool - this is Xprobe2
EAPI=7
HOMEPAGE=http://sys-security.com/blog/xprobe2
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=net-libs/libpcap
SLOT=0
SRC_URI=mirror://sourceforge/xprobe/xprobe2-0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6a4a468414f8c1d8d6d16955e9173aa4
diff --git a/metadata/md5-cache/net-analyzer/zniper-1.0-r1 b/metadata/md5-cache/net-analyzer/zniper-1.0-r1
index 91a5eb38ce86..43b47682e254 100644
--- a/metadata/md5-cache/net-analyzer/zniper-1.0-r1
+++ b/metadata/md5-cache/net-analyzer/zniper-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap sys-libs/ncurses
DESCRIPTION=Displays and kill active TCP connections seen by the selected interface
EAPI=5
HOMEPAGE=http://www.signedness.org/tools/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/zniper-1.0.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dc8ad9964da14a4aaf58ec8e758232c6
diff --git a/metadata/md5-cache/net-dialup/dwun-0.96e-r4 b/metadata/md5-cache/net-dialup/dwun-0.96e-r4
index fa9091e7a1cb..8b7aac3f82f6 100644
--- a/metadata/md5-cache/net-dialup/dwun-0.96e-r4
+++ b/metadata/md5-cache/net-dialup/dwun-0.96e-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install postinst prepare
DESCRIPTION=Dialer Without a Useful Name (DWUN)
EAPI=6
HOMEPAGE=http://dwun.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=MIT GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/dwun/dwun-0.96e.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=580aeb0b2ae1ab818ad90f8cd159ae62
diff --git a/metadata/md5-cache/net-dialup/kpnadsl4linux-1.11 b/metadata/md5-cache/net-dialup/kpnadsl4linux-1.11
index a4099168c0ca..5f2641990dda 100644
--- a/metadata/md5-cache/net-dialup/kpnadsl4linux-1.11
+++ b/metadata/md5-cache/net-dialup/kpnadsl4linux-1.11
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=ADSL4Linux, a PPTP start/stop/etc. program especially for Dutch users
EAPI=7
HOMEPAGE=http://www.adsl4linux.nl/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=net-dialup/ppp net-dialup/pptpclient
SLOT=0
SRC_URI=http://home.planet.nl/~mcdon001/kpnadsl4linux-1.11.tar.gz http://www.adsl4linux.nl/download/kpnadsl4linux-1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=61451d4e2f8c97fd55fb9ddb5683b032
diff --git a/metadata/md5-cache/net-dialup/neocon-20110228 b/metadata/md5-cache/net-dialup/neocon-20110228
index fc498092b844..6be8e96e9af1 100644
--- a/metadata/md5-cache/net-dialup/neocon-20110228
+++ b/metadata/md5-cache/net-dialup/neocon-20110228
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A simple serial console utility that tries to open ttys repeatedly
EAPI=7
HOMEPAGE=http://wiki.openmoko.org/wiki/NeoCon
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://dev.gentoo.org/~radhermit/distfiles/neocon-20110228.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b1cf246ac0da63376b588b22d1cd8044
diff --git a/metadata/md5-cache/net-dialup/picocom-3.1 b/metadata/md5-cache/net-dialup/picocom-3.1
index 22239250e66b..588f386c1f33 100644
--- a/metadata/md5-cache/net-dialup/picocom-3.1
+++ b/metadata/md5-cache/net-dialup/picocom-3.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=minimal dumb-terminal emulation program
EAPI=6
HOMEPAGE=https://github.com/npat-efault/picocom
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/npat-efault/picocom/archive/3.1.tar.gz -> picocom-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1d26c836a09e2d7f69a7fa47c0eed23f
diff --git a/metadata/md5-cache/net-dialup/pptpclient-1.10.0 b/metadata/md5-cache/net-dialup/pptpclient-1.10.0
index 698e4db711ad..d3aa667b0264 100644
--- a/metadata/md5-cache/net-dialup/pptpclient-1.10.0
+++ b/metadata/md5-cache/net-dialup/pptpclient-1.10.0
@@ -3,6 +3,7 @@ DEPEND=net-dialup/ppp dev-lang/perl tk? ( dev-perl/Tk )
DESCRIPTION=Linux client for PPTP
EAPI=7
HOMEPAGE=http://pptpclient.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=tk
KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=net-dialup/ppp dev-lang/perl tk? ( dev-perl/Tk ) sys-apps/iproute2
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/pptpclient/pptp-1.10.0.tar.gz https://dev.gentoo.org/~pinkbyte/distfiles/pptpclient/pptp-command-20130515.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0cd05b016ce735f227e6c9ffff70b454
diff --git a/metadata/md5-cache/net-dialup/rp-l2tp-0.4-r4 b/metadata/md5-cache/net-dialup/rp-l2tp-0.4-r4
index dfefedbaf5c3..944839c9a64d 100644
--- a/metadata/md5-cache/net-dialup/rp-l2tp-0.4-r4
+++ b/metadata/md5-cache/net-dialup/rp-l2tp-0.4-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=User-space implementation of L2TP for Linux and other UNIX systems
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/rp-l2tp/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/rp-l2tp/rp-l2tp-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=26a904ad0a740f187b74e45c5957ffe4
diff --git a/metadata/md5-cache/net-dialup/wvdial-1.61 b/metadata/md5-cache/net-dialup/wvdial-1.61
index 86fb8957b228..722ea9007e54 100644
--- a/metadata/md5-cache/net-dialup/wvdial-1.61
+++ b/metadata/md5-cache/net-dialup/wvdial-1.61
@@ -3,6 +3,7 @@ DEPEND=>=net-libs/wvstreams-4.4 virtual/pkgconfig
DESCRIPTION=Excellent program to automatically configure PPP sessions
EAPI=6
HOMEPAGE=https://code.google.com/archive/p/wvstreams/
+INHERIT=readme.gentoo-r1
KEYWORDS=~alpha amd64 ~hppa ppc sparc x86
LICENSE=LGPL-2
RDEPEND=>=net-libs/wvstreams-4.4 net-dialup/ppp:=
diff --git a/metadata/md5-cache/net-dns/coredns-1.6.9 b/metadata/md5-cache/net-dns/coredns-1.6.9
index 89708a47a880..61a4739b9511 100644
--- a/metadata/md5-cache/net-dns/coredns-1.6.9
+++ b/metadata/md5-cache/net-dns/coredns-1.6.9
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=A DNS server that chains middleware
EAPI=7
HOMEPAGE=https://github.com/coredns/coredns
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2
RESTRICT=strip
diff --git a/metadata/md5-cache/net-dns/dnshijacker-1.3-r2 b/metadata/md5-cache/net-dns/dnshijacker-1.3-r2
index a3591133bc4f..e639e9f7f4c7 100644
--- a/metadata/md5-cache/net-dns/dnshijacker-1.3-r2
+++ b/metadata/md5-cache/net-dns/dnshijacker-1.3-r2
@@ -3,10 +3,11 @@ DEPEND=>=net-libs/libnet-1.0.2a-r3:1.0 net-libs/libpcap
DESCRIPTION=a libnet/libpcap based packet sniffer and spoofer
EAPI=7
HOMEPAGE=http://pedram.redhive.com/code/dns_hijacker/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libnet-1.0.2a-r3:1.0 net-libs/libpcap
SLOT=0
SRC_URI=http://pedram.redhive.com/downloads/dnshijacker-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=68e39891e946b09bbe22d8c8148ec86c
diff --git a/metadata/md5-cache/net-dns/dnssec-check-2.2 b/metadata/md5-cache/net-dns/dnssec-check-2.2
index 672418da0320..02af817b7a9d 100644
--- a/metadata/md5-cache/net-dns/dnssec-check-2.2
+++ b/metadata/md5-cache/net-dns/dnssec-check-2.2
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtdeclarative:5 net-dns/dnssec-validator[threads]
DESCRIPTION=Tests local resolver for support of DNSSEC validation
EAPI=7
HOMEPAGE=https://www.dnssec-tools.org
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=dev-qt/qtdeclarative:5 net-dns/dnssec-validator[threads]
SLOT=0
SRC_URI=https://www.dnssec-tools.org/download/dnssec-check-2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=5cc873d91f63211b4ada3433b81dab42
diff --git a/metadata/md5-cache/net-dns/mdns-repeater-1.11 b/metadata/md5-cache/net-dns/mdns-repeater-1.11
index 1e652ae3b80d..b40c477014c1 100644
--- a/metadata/md5-cache/net-dns/mdns-repeater-1.11
+++ b/metadata/md5-cache/net-dns/mdns-repeater-1.11
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Multicast DNS repeater
EAPI=7
HOMEPAGE=https://github.com/kennylevinsen/mdns-repeater
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://github.com/kennylevinsen/mdns-repeater/archive/1.11.tar.gz -> mdns-repeater-1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=770ca8f3e4a4633ebdc3938a320672d6
diff --git a/metadata/md5-cache/net-dns/ndu-0.4-r4 b/metadata/md5-cache/net-dns/ndu-0.4-r4
index 13f77acd3800..c1342844fcda 100644
--- a/metadata/md5-cache/net-dns/ndu-0.4-r4
+++ b/metadata/md5-cache/net-dns/ndu-0.4-r4
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=DNS serial number incrementer and reverse zone builder
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=sys-apps/ed
SLOT=0
SRC_URI=http://uranus.it.swin.edu.au/~jn/linux/ndu-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c222323a0130e0a1e684dbaa274817dd
diff --git a/metadata/md5-cache/net-dns/odsclient-1.03-r1 b/metadata/md5-cache/net-dns/odsclient-1.03-r1
index e2caad4e1117..a3a155835cff 100644
--- a/metadata/md5-cache/net-dns/odsclient-1.03-r1
+++ b/metadata/md5-cache/net-dns/odsclient-1.03-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Client for the Open Domain Server's dynamic dns
EAPI=6
HOMEPAGE=http://www.ods.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://www.ods.org/dl/odsclient-1.03.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4913c6f4c45315726a03c84d563d72f4
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.998b-r2 b/metadata/md5-cache/net-dns/rbldnsd-0.998b-r2
index d3488de7dd44..80a686f9dcfb 100644
--- a/metadata/md5-cache/net-dns/rbldnsd-0.998b-r2
+++ b/metadata/md5-cache/net-dns/rbldnsd-0.998b-r2
@@ -4,6 +4,7 @@ DEPEND=zlib? ( sys-libs/zlib )
DESCRIPTION=DNS server designed to serve blacklist zones
EAPI=7
HOMEPAGE=https://rbldnsd.io/
+INHERIT=toolchain-funcs
IUSE=ipv6 zlib
KEYWORDS=amd64 ~hppa ~sparc x86
LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=zlib? ( sys-libs/zlib )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/spamhaus/rbldnsd/archive/0.998b.tar.gz -> rbldnsd-0.998b.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=92168f023634ddda215b20e886ce5f15
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.2.0.1 b/metadata/md5-cache/net-dns/s6-dns-2.2.0.1
index cf1f1df8eb2f..9636c274717f 100644
--- a/metadata/md5-cache/net-dns/s6-dns-2.2.0.1
+++ b/metadata/md5-cache/net-dns/s6-dns-2.2.0.1
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.0.0[static-libs] )
DESCRIPTION=suite of DNS client programs and libraries for Unix systems
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6-dns/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.3.0.0 b/metadata/md5-cache/net-dns/s6-dns-2.3.0.0
index 73c63433e8cc..b6383387795d 100644
--- a/metadata/md5-cache/net-dns/s6-dns-2.3.0.0
+++ b/metadata/md5-cache/net-dns/s6-dns-2.3.0.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.6.3.0[static-libs] )
DESCRIPTION=suite of DNS client programs and libraries for Unix systems
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6-dns/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/net-fs/mc-2021.03.06.22.16.44 b/metadata/md5-cache/net-fs/mc-2021.03.06.22.16.44
index f5bdb9de88b4..380a93a5a2e2 100644
--- a/metadata/md5-cache/net-fs/mc-2021.03.06.22.16.44
+++ b/metadata/md5-cache/net-fs/mc-2021.03.06.22.16.44
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
EAPI=7
HOMEPAGE=https://github.com/minio/mc
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD MIT MPL-2.0
RDEPEND=!!app-misc/mc
diff --git a/metadata/md5-cache/net-fs/mc-2021.03.12.03.36.59 b/metadata/md5-cache/net-fs/mc-2021.03.12.03.36.59
index 900cffca62b5..ad002633a596 100644
--- a/metadata/md5-cache/net-fs/mc-2021.03.12.03.36.59
+++ b/metadata/md5-cache/net-fs/mc-2021.03.12.03.36.59
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
EAPI=7
HOMEPAGE=https://github.com/minio/mc
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD MIT MPL-2.0
RDEPEND=!!app-misc/mc
diff --git a/metadata/md5-cache/net-fs/smbnetfs-0.6.3 b/metadata/md5-cache/net-fs/smbnetfs-0.6.3
index fd4e3fc97c5a..9c77088765ae 100644
--- a/metadata/md5-cache/net-fs/smbnetfs-0.6.3
+++ b/metadata/md5-cache/net-fs/smbnetfs-0.6.3
@@ -3,6 +3,7 @@ DEPEND=>=sys-fs/fuse-2.3:0= >=net-fs/samba-4.2 >=dev-libs/glib-2.30 gnome-keyrin
DESCRIPTION=FUSE filesystem for SMB shares
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/smbnetfs
+INHERIT=readme.gentoo-r1
IUSE=gnome-keyring
KEYWORDS=~amd64 ~x86 ~x86-linux
LICENSE=GPL-2
diff --git a/metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r3 b/metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r3
index 6ae6e38ceeaf..641b16037f0a 100644
--- a/metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r3
+++ b/metadata/md5-cache/net-ftp/linksys-tftp-1.2.1-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=TFTP client suitable for uploading to the Linksys WRT54G Wireless Router
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://www.redsand.net/solutions/linksys-tftp-1.2.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5314b7112292d539ffc95a5d32e73c58
diff --git a/metadata/md5-cache/net-ftp/pureadmin-0.4-r2 b/metadata/md5-cache/net-ftp/pureadmin-0.4-r2
index a50601416629..69565486f1e3 100644
--- a/metadata/md5-cache/net-ftp/pureadmin-0.4-r2
+++ b/metadata/md5-cache/net-ftp/pureadmin-0.4-r2
@@ -4,11 +4,12 @@ DEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 x11-lib
DESCRIPTION=GUI tool used to make the management of Pure-FTPd a little easier
EAPI=7
HOMEPAGE=http://purify.sourceforge.net/
+INHERIT=desktop xdg
IUSE=doc
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=gnome-base/libglade:2.0 sys-libs/zlib virtual/fam x11-libs/gtk+:2 x11-libs/libX11
SLOT=0
SRC_URI=mirror://sourceforge/purify/pureadmin-0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=7dcacfba3c85ee8a45b497c7e1fa5d98
diff --git a/metadata/md5-cache/net-im/dianara-1.4.2 b/metadata/md5-cache/net-im/dianara-1.4.2
index e7e2711bb040..d323dddbc7ed 100644
--- a/metadata/md5-cache/net-im/dianara-1.4.2
+++ b/metadata/md5-cache/net-im/dianara-1.4.2
@@ -3,10 +3,11 @@ DEPEND=>=app-crypt/qca-2.1.0.3:2[qt5(+),ssl] >=dev-libs/qoauth-2.0.1_pre20160315
DESCRIPTION=Qt-based client for the pump.io distributed social network
EAPI=7
HOMEPAGE=http://dianara.nongnu.org/
+INHERIT=desktop qmake-utils xdg
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=>=app-crypt/qca-2.1.0.3:2[qt5(+),ssl] >=dev-libs/qoauth-2.0.1_pre20160315-r2:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 sys-apps/file
SLOT=0
SRC_URI=mirror://nongnu/dianara/dianara-v1.4.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=c2d99831651b05dcdca993668072299b
diff --git a/metadata/md5-cache/net-im/libcommuni-3.6.0 b/metadata/md5-cache/net-im/libcommuni-3.6.0
index f1b8b48a18af..78da61c83ccb 100644
--- a/metadata/md5-cache/net-im/libcommuni-3.6.0
+++ b/metadata/md5-cache/net-im/libcommuni-3.6.0
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 examples? ( || ( dev-qt/qtgui:5[X(
DESCRIPTION=A cross-platform IRC framework written with Qt
EAPI=7
HOMEPAGE=https://communi.github.io/
+INHERIT=qmake-utils
IUSE=examples qml test +uchardet
KEYWORDS=amd64 x86
LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 examples? ( || ( dev-qt/qtgui:5[X
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/communi/libcommuni/archive/v3.6.0.tar.gz -> libcommuni-3.6.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=c80cf6b54392afaf4a236e96e8795418
diff --git a/metadata/md5-cache/net-im/mcabber-1.1.2 b/metadata/md5-cache/net-im/mcabber-1.1.2
index df3eb1a117e2..e4373ae26d7d 100644
--- a/metadata/md5-cache/net-im/mcabber-1.1.2
+++ b/metadata/md5-cache/net-im/mcabber-1.1.2
@@ -3,6 +3,7 @@ DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspel
DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
EAPI=7
HOMEPAGE=http://mcabber.com/
+INHERIT=readme.gentoo-r1
IUSE=aspell crypt idn otr spell ssl vim-syntax l10n_cs l10n_de l10n_fr l10n_it l10n_nl l10n_pl l10n_ru l10n_uk
KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
diff --git a/metadata/md5-cache/net-im/psi-1.5 b/metadata/md5-cache/net-im/psi-1.5
index 3540229677f5..b26aceaf8a54 100644
--- a/metadata/md5-cache/net-im/psi-1.5
+++ b/metadata/md5-cache/net-im/psi-1.5
@@ -4,6 +4,7 @@ DEPEND=app-crypt/qca:2[ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5
DESCRIPTION=Qt XMPP client
EAPI=7
HOMEPAGE=https://psi-im.org
+INHERIT=l10n qmake-utils xdg
IUSE=aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding xscreensaver
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -12,5 +13,5 @@ REQUIRED_USE=?? ( aspell enchant hunspell )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/psi/psi-1.5.tar.xz https://github.com/psi-im/psi-l10n/archive/1.5.tar.gz -> psi-l10n-1.5.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=ca8b1d38499290ac05f47978406d8e9d
diff --git a/metadata/md5-cache/net-im/ricochet-1.1.4 b/metadata/md5-cache/net-im/ricochet-1.1.4
index d1dc9e47f2ba..3b8c8af8eb7e 100644
--- a/metadata/md5-cache/net-im/ricochet-1.1.4
+++ b/metadata/md5-cache/net-im/ricochet-1.1.4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdeclara
DESCRIPTION=Privacy-focused instant messaging through Tor hidden services
EAPI=7
HOMEPAGE=https://ricochet.im
+INHERIT=qmake-utils xdg-utils
IUSE=debug hardened
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 net-vpn/tor
SLOT=0
SRC_URI=https://github.com/ricochet-im/ricochet/archive/v1.1.4.tar.gz -> ricochet-1.1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=07d9b8e4f160b67f124004690214a246
diff --git a/metadata/md5-cache/net-irc/dccserver-0.5-r1 b/metadata/md5-cache/net-irc/dccserver-0.5-r1
index 1e782888eb06..b86fa9dece5a 100644
--- a/metadata/md5-cache/net-irc/dccserver-0.5-r1
+++ b/metadata/md5-cache/net-irc/dccserver-0.5-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=linux implementation of the mirc dccserver command
EAPI=7
HOMEPAGE=https://www.nih.at/dccserver/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://www.nih.at/dccserver/dccserver-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4cb2143dc664e8068ff1d01163e842a1
diff --git a/metadata/md5-cache/net-irc/eggdrop-1.8.4-r1 b/metadata/md5-cache/net-irc/eggdrop-1.8.4-r1
index 80ae596549da..f5fcb6b8d842 100644
--- a/metadata/md5-cache/net-irc/eggdrop-1.8.4-r1
+++ b/metadata/md5-cache/net-irc/eggdrop-1.8.4-r1
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tcl:0= ssl? ( dev-libs/openssl:0= )
DESCRIPTION=An IRC bot extensible with C or TCL
EAPI=7
HOMEPAGE=https://www.eggheads.org/
+INHERIT=readme.gentoo-r1
IUSE=debug doc ipv6 ssl static
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc sparc x86
LICENSE=GPL-2+
diff --git a/metadata/md5-cache/net-irc/emech-3.0.99_p3 b/metadata/md5-cache/net-irc/emech-3.0.99_p3
index c1bfce44ddc2..ed02b6046abd 100644
--- a/metadata/md5-cache/net-irc/emech-3.0.99_p3
+++ b/metadata/md5-cache/net-irc/emech-3.0.99_p3
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=UNIX compatible IRC bot programmed in the C language
EAPI=6
HOMEPAGE=http://www.energymech.net/
+INHERIT=readme.gentoo-r1 toolchain-funcs
IUSE=debug session tcl
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.energymech.net/files/emech-3.0.99p3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=579d905042209a600b8752119c4e4c46
diff --git a/metadata/md5-cache/net-irc/inspircd-3.8.1 b/metadata/md5-cache/net-irc/inspircd-3.8.1
index 0ce4319e5892..db0b80be96ee 100644
--- a/metadata/md5-cache/net-irc/inspircd-3.8.1
+++ b/metadata/md5-cache/net-irc/inspircd-3.8.1
@@ -3,11 +3,12 @@ DEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl gnutls? ( net-libs/g
DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
EAPI=7
HOMEPAGE=https://www.inspircd.org/
+INHERIT=toolchain-funcs
IUSE=debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
SLOT=0
SRC_URI=https://github.com/inspircd/inspircd/archive/v3.8.1.tar.gz -> inspircd-3.8.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=38a9ea21d50cd249212226745247c760
diff --git a/metadata/md5-cache/net-irc/ircstats-1.2 b/metadata/md5-cache/net-irc/ircstats-1.2
index ced19c897119..0a6475db2f95 100644
--- a/metadata/md5-cache/net-irc/ircstats-1.2
+++ b/metadata/md5-cache/net-irc/ircstats-1.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=IRCStats is a Linux log analyzer
EAPI=7
HOMEPAGE=https://humdi.net/ircstats/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://humdi.net/ircstats/IRCStats-1.2.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=11cfa5c4c22f90d0ba3782b8a29dbedc
diff --git a/metadata/md5-cache/net-irc/irssi-xmpp-0.54 b/metadata/md5-cache/net-irc/irssi-xmpp-0.54
index 6b0c5b038667..236269495080 100644
--- a/metadata/md5-cache/net-irc/irssi-xmpp-0.54
+++ b/metadata/md5-cache/net-irc/irssi-xmpp-0.54
@@ -4,10 +4,11 @@ DEPEND=net-irc/irssi net-libs/loudmouth
DESCRIPTION=An irssi plugin providing Jabber/XMPP support
EAPI=7
HOMEPAGE=https://cybione.org/~irssi-xmpp/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=net-irc/irssi net-libs/loudmouth
SLOT=0
SRC_URI=https://github.com/cdidier/irssi-xmpp/archive/v0.54.tar.gz -> irssi-xmpp-0.54.tar.gz https://dev.gentoo.org/~sam/distfiles/net-irc/irssi-xmpp/irssi-xmpp-0.54-musl-build.patch
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=54b3336d8d2bfb1be0c20191272dc4d1
diff --git a/metadata/md5-cache/net-irc/irssistats-0.75-r1 b/metadata/md5-cache/net-irc/irssistats-0.75-r1
index e86d5de9cf64..c5c6adda9d22 100644
--- a/metadata/md5-cache/net-irc/irssistats-0.75-r1
+++ b/metadata/md5-cache/net-irc/irssistats-0.75-r1
@@ -3,9 +3,10 @@ DEPEND=net-irc/irssi
DESCRIPTION=Generates HTML IRC stats based on irssi logs
EAPI=6
HOMEPAGE=http://royale.zerezo.com/irssistats/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://royale.zerezo.com/irssistats/irssistats-0.75.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cb995f82da046596b675296218dadb27
diff --git a/metadata/md5-cache/net-irc/rhapsody-0.28b b/metadata/md5-cache/net-irc/rhapsody-0.28b
index 4eeea78c2e79..1c943f774c02 100644
--- a/metadata/md5-cache/net-irc/rhapsody-0.28b
+++ b/metadata/md5-cache/net-irc/rhapsody-0.28b
@@ -4,9 +4,10 @@ DEPEND=>=sys-libs/ncurses-5.0:0=
DESCRIPTION=IRC client intended to be displayed on a text console
EAPI=7
HOMEPAGE=http://rhapsody.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/rhapsody/rhapsody_0.28b.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=84c4bf819dbb32353afb6f291c34a7ea
diff --git a/metadata/md5-cache/net-irc/scrollz-2.3 b/metadata/md5-cache/net-irc/scrollz-2.3
index 3c3ba6558875..542fa5368e6c 100644
--- a/metadata/md5-cache/net-irc/scrollz-2.3
+++ b/metadata/md5-cache/net-irc/scrollz-2.3
@@ -4,6 +4,7 @@ DEPEND=sys-libs/ncurses:0= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/gn
DESCRIPTION=Advanced IRC client based on ircII
EAPI=7
HOMEPAGE=https://www.scrollz.info/
+INHERIT=toolchain-funcs
IUSE=gmp gnutls ipv6 ssl
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/ncurses:0= gmp? ( dev-libs/gmp:0= ) ssl? ( gnutls? ( net-libs/g
REQUIRED_USE=gnutls? ( ssl )
SLOT=0
SRC_URI=https://www.scrollz.info/download/ScrollZ-2.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d958f743f38910297d38e70f3200e5a6
diff --git a/metadata/md5-cache/net-irc/sic-1.2-r1 b/metadata/md5-cache/net-irc/sic-1.2-r1
index ac34397b959d..51c62c401b8a 100644
--- a/metadata/md5-cache/net-irc/sic-1.2-r1
+++ b/metadata/md5-cache/net-irc/sic-1.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=An extremely simple IRC client
EAPI=7
HOMEPAGE=https://tools.suckless.org/sic
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=MIT
SLOT=0
SRC_URI=https://dl.suckless.org/tools/sic-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=418bd8d318655a1e20e015eb02233279
diff --git a/metadata/md5-cache/net-libs/accounts-qml-0.7-r1 b/metadata/md5-cache/net-libs/accounts-qml-0.7-r1
index 8e15e8dc5ba2..09e3f840b915 100644
--- a/metadata/md5-cache/net-libs/accounts-qml-0.7-r1
+++ b/metadata/md5-cache/net-libs/accounts-qml-0.7-r1
@@ -4,6 +4,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 net-libs/accounts-qt net-libs/sign
DESCRIPTION=QML bindings for accounts-qt and signond
EAPI=7
HOMEPAGE=https://accounts-sso.gitlab.io/
+INHERIT=qmake-utils
IUSE=doc test
KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 net-libs/accounts-qt net-libs/sig
RESTRICT=test
SLOT=0
SRC_URI=https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/VERSION_0.7/accounts-qml-module-VERSION_0.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=9a26228b1c24c3a5dfc1502ba13d7e12
diff --git a/metadata/md5-cache/net-libs/accounts-qt-1.16 b/metadata/md5-cache/net-libs/accounts-qt-1.16
index ba68a78c967c..32743ac2e23e 100644
--- a/metadata/md5-cache/net-libs/accounts-qt-1.16
+++ b/metadata/md5-cache/net-libs/accounts-qt-1.16
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 >=net-libs/libaccounts-gli
DESCRIPTION=Qt5 bindings for libaccounts-glib
EAPI=7
HOMEPAGE=https://accounts-sso.gitlab.io/
+INHERIT=qmake-utils
IUSE=doc test
KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 >=net-libs/libaccounts-gl
RESTRICT=test
SLOT=0
SRC_URI=https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.16/archive.tar.gz -> accounts-qt-1.16.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=f4895fbc42e33e7e7b1381c9ac29c4fd
diff --git a/metadata/md5-cache/net-libs/canlock-2b b/metadata/md5-cache/net-libs/canlock-2b
index f4da59bd9552..74f3bcf9bc1e 100644
--- a/metadata/md5-cache/net-libs/canlock-2b
+++ b/metadata/md5-cache/net-libs/canlock-2b
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=A library for creating and verifying Usenet cancel locks
EAPI=7
HOMEPAGE=https://packages.qa.debian.org/c/canlock.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=BSD MIT
SLOT=0
SRC_URI=mirror://debian/pool/main/c/canlock/canlock_2b.orig.tar.gz mirror://debian/pool/main/c/canlock/canlock_2b-6.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b15d9189a51066d8222a599f379a0330
diff --git a/metadata/md5-cache/net-libs/cvm-0.97 b/metadata/md5-cache/net-libs/cvm-0.97
index db19615bedbe..1190ec009d4a 100644
--- a/metadata/md5-cache/net-libs/cvm-0.97
+++ b/metadata/md5-cache/net-libs/cvm-0.97
@@ -3,6 +3,7 @@ DEPEND=dev-db/cdb:= >=dev-libs/bglibs-2.04:0= mysql? ( dev-db/mysql-connector-c:
DESCRIPTION=Credential Validation Modules by Bruce Guenter
EAPI=7
HOMEPAGE=http://untroubled.org/cvm/
+INHERIT=toolchain-funcs
IUSE=mysql postgres test vpopmail
KEYWORDS=~amd64 ppc sparc x86
LICENSE=GPL-2+
@@ -10,5 +11,5 @@ RDEPEND=dev-db/cdb:= >=dev-libs/bglibs-2.04:0=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://untroubled.org/cvm/archive/cvm-0.97.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f20940425821dc7cc9a52c850481755f
diff --git a/metadata/md5-cache/net-libs/libbloom-1.5-r2 b/metadata/md5-cache/net-libs/libbloom-1.5-r2
index a02ed062f793..1ea90bec533c 100644
--- a/metadata/md5-cache/net-libs/libbloom-1.5-r2
+++ b/metadata/md5-cache/net-libs/libbloom-1.5-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A simple and small bloom filter implementation in plain C.
EAPI=7
HOMEPAGE=https://github.com/jvirkki/libbloom
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/jvirkki/libbloom/archive/v1.5.tar.gz -> libbloom-1.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9a1d51bdefa9ea672e7923390aacff89
diff --git a/metadata/md5-cache/net-libs/libbloom-1.6 b/metadata/md5-cache/net-libs/libbloom-1.6
index 600401b841bd..5256460524f5 100644
--- a/metadata/md5-cache/net-libs/libbloom-1.6
+++ b/metadata/md5-cache/net-libs/libbloom-1.6
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=A simple and small bloom filter implementation in plain C.
EAPI=7
HOMEPAGE=https://github.com/jvirkki/libbloom
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/jvirkki/libbloom/archive/v1.6.tar.gz -> libbloom-1.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9a1d51bdefa9ea672e7923390aacff89
diff --git a/metadata/md5-cache/net-libs/libnatpmp-20150609 b/metadata/md5-cache/net-libs/libnatpmp-20150609
index 1eb932c30156..26e49f2d49c3 100644
--- a/metadata/md5-cache/net-libs/libnatpmp-20150609
+++ b/metadata/md5-cache/net-libs/libnatpmp-20150609
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=An alternative protocol to UPnP IGD specification
EAPI=7
HOMEPAGE=http://miniupnp.free.fr/libnatpmp.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20150609.tar.gz -> libnatpmp-20150609.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fe0c654cef5a64ea30ede27a748d5c3a
diff --git a/metadata/md5-cache/net-libs/libpri-1.6.0 b/metadata/md5-cache/net-libs/libpri-1.6.0
index 6651a9f16eb5..ea35703482cc 100644
--- a/metadata/md5-cache/net-libs/libpri-1.6.0
+++ b/metadata/md5-cache/net-libs/libpri-1.6.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Primary Rate ISDN (PRI) library
EAPI=6
HOMEPAGE=http://www.asterisk.org/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.6.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0c7ec3eb479670b0c8785e438d1c3bb9
diff --git a/metadata/md5-cache/net-libs/netwib-5.39.0 b/metadata/md5-cache/net-libs/netwib-5.39.0
index c4b9020cdf6a..926cbb9e5383 100644
--- a/metadata/md5-cache/net-libs/netwib-5.39.0
+++ b/metadata/md5-cache/net-libs/netwib-5.39.0
@@ -3,11 +3,12 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap
DESCRIPTION=Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols
EAPI=5
HOMEPAGE=http://www.laurentconstantin.com/en/netw/netwib/ http://ntwib.sourceforge.net/
+INHERIT=toolchain-funcs multilib
IUSE=doc
KEYWORDS=~amd64 ~hppa ~ppc x86
LICENSE=GPL-3
RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
SLOT=0
SRC_URI=mirror://sourceforge/ntwib/netwib-5.39.0-src.tgz doc? ( mirror://sourceforge/ntwib/netwib-5.39.0-doc_html.tgz )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1e4308fc7657d5e05234b26d1244351f
diff --git a/metadata/md5-cache/net-libs/signon-oauth2-0.25 b/metadata/md5-cache/net-libs/signon-oauth2-0.25
index af18fb85ec76..cd94de407e90 100644
--- a/metadata/md5-cache/net-libs/signon-oauth2-0.25
+++ b/metadata/md5-cache/net-libs/signon-oauth2-0.25
@@ -3,6 +3,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] net-libs/signond test? ( dev-qt/q
DESCRIPTION=OAuth2 plugin for Signon daemon
EAPI=7
HOMEPAGE=https://gitlab.com/accounts-sso/signon-plugin-oauth2
+INHERIT=qmake-utils
IUSE=test
KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
LICENSE=LGPL-2.1
@@ -10,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] net-libs/signond
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_0.25/signon-plugin-oauth2-VERSION_0.25.tar.gz -> signon-oauth2-0.25.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=13da33e03da14389b8a9833f4be32c4d
diff --git a/metadata/md5-cache/net-libs/signon-ui-0.15_p20171022-r1 b/metadata/md5-cache/net-libs/signon-ui-0.15_p20171022-r1
index 83c83845ae68..58b46a7a0ce8 100644
--- a/metadata/md5-cache/net-libs/signon-ui-0.15_p20171022-r1
+++ b/metadata/md5-cache/net-libs/signon-ui-0.15_p20171022-r1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 de
DESCRIPTION=Online accounts signon UI
EAPI=7
HOMEPAGE=https://gitlab.com/accounts-sso/signon-ui
+INHERIT=qmake-utils
IUSE=test
KEYWORDS=amd64 arm64 ~ppc64 x86
LICENSE=GPL-2 GPL-3
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 d
RESTRICT=test
SLOT=0
SRC_URI=https://gitlab.com/accounts-sso/signon-ui/-/archive/4368bb77d9d1abc2978af514225ba4a42c29a646/signon-ui-4368bb77d9d1abc2978af514225ba4a42c29a646.tar.bz2 -> signon-ui-0.15_p20171022.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=514c8ee4b9d672f125a144bc1019adfe
diff --git a/metadata/md5-cache/net-libs/signond-8.60-r2 b/metadata/md5-cache/net-libs/signond-8.60-r2
index fe74f3c34ae9..252e6ebb19e8 100644
--- a/metadata/md5-cache/net-libs/signond-8.60-r2
+++ b/metadata/md5-cache/net-libs/signond-8.60-r2
@@ -4,6 +4,7 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/
DESCRIPTION=Signon daemon for libaccounts-glib
EAPI=7
HOMEPAGE=https://gitlab.com/accounts-sso
+INHERIT=qmake-utils
IUSE=doc test
KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://gitlab.com/accounts-sso/signond/-/archive/VERSION_8.60/signond-VERSION_8.60.tar.gz -> signond-8.60.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=a05c2f08d258172697179199e345d301
diff --git a/metadata/md5-cache/net-libs/udns-0.4 b/metadata/md5-cache/net-libs/udns-0.4
index 4443588496ba..a392537a54af 100644
--- a/metadata/md5-cache/net-libs/udns-0.4
+++ b/metadata/md5-cache/net-libs/udns-0.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Async-capable DNS stub resolver library
EAPI=7
HOMEPAGE=http://www.corpit.ru/mjt/udns.html
+INHERIT=toolchain-funcs
IUSE=ipv6 static +tools
KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://www.corpit.ru/mjt/udns/udns-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d914de2bffa9ff7670d690de1dd2d78
diff --git a/metadata/md5-cache/net-mail/altermime-0.3.11 b/metadata/md5-cache/net-mail/altermime-0.3.11
index a363f6acf052..4b6c896cc68b 100644
--- a/metadata/md5-cache/net-mail/altermime-0.3.11
+++ b/metadata/md5-cache/net-mail/altermime-0.3.11
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=alterMIME is a small program which is used to alter your mime-encoded mailpacks
EAPI=7
HOMEPAGE=https://pldaniels.com/altermime/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=Sendmail
SLOT=0
SRC_URI=https://www.pldaniels.com/altermime/altermime-0.3.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aed0cc8af3a85e368925f997722d384f
diff --git a/metadata/md5-cache/net-mail/eps-1.7-r1 b/metadata/md5-cache/net-mail/eps-1.7-r1
index f49dc9f677bf..bca574d945e9 100644
--- a/metadata/md5-cache/net-mail/eps-1.7-r1
+++ b/metadata/md5-cache/net-mail/eps-1.7-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Inter7 Email Processing and mht System library
EAPI=7
HOMEPAGE=http://www.inter7.com/eps
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.inter7.com/eps/eps-1.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7fd9827b0d0dcb7c320b6755fe09b661
diff --git a/metadata/md5-cache/net-mail/mailfront-2.22 b/metadata/md5-cache/net-mail/mailfront-2.22
index 98225c5805a1..0e68d954683c 100644
--- a/metadata/md5-cache/net-mail/mailfront-2.22
+++ b/metadata/md5-cache/net-mail/mailfront-2.22
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/bglibs-2.04 >=net-libs/cvm-0.81
DESCRIPTION=Mail server network protocol front-ends
EAPI=7
HOMEPAGE=https://untroubled.org/mailfront/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/bglibs-2.04 >=net-libs/cvm-0.81 virtual/qmail net-libs/cvm
SLOT=0
SRC_URI=https://untroubled.org/mailfront/archive/mailfront-2.22.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2798b9f59b7852b35887279b6b3de9f4
diff --git a/metadata/md5-cache/net-mail/mairix-0.24 b/metadata/md5-cache/net-mail/mairix-0.24
index 22bc73f2a02e..d723d2debb68 100644
--- a/metadata/md5-cache/net-mail/mairix-0.24
+++ b/metadata/md5-cache/net-mail/mairix-0.24
@@ -3,6 +3,7 @@ DEPEND=zlib? ( sys-libs/zlib ) bzip2? ( app-arch/bzip2 ) sys-devel/flex sys-deve
DESCRIPTION=Indexes and searches Maildir/MH folders
EAPI=6
HOMEPAGE=http://www.rpcurnow.force9.co.uk/mairix/
+INHERIT=toolchain-funcs
IUSE=zlib bzip2
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=zlib? ( sys-libs/zlib ) bzip2? ( app-arch/bzip2 )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/mairix/mairix-0.24.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fd6659f635804693472b588b36f9a45e
diff --git a/metadata/md5-cache/net-mail/mess822-0.58-r2 b/metadata/md5-cache/net-mail/mess822-0.58-r2
index cce051c5ca38..886e331c2752 100644
--- a/metadata/md5-cache/net-mail/mess822-0.58-r2
+++ b/metadata/md5-cache/net-mail/mess822-0.58-r2
@@ -3,11 +3,12 @@ DEPEND=>=sys-apps/sed-4
DESCRIPTION=Collection of utilities for parsing Internet mail messages
EAPI=7
HOMEPAGE=http://cr.yp.to/mess822.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=public-domain
RDEPEND=>=sys-apps/sed-4
RESTRICT=test
SLOT=0
SRC_URI=http://cr.yp.to/software/mess822-0.58.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=527ee67f0adf2b4dd36e45986b8412c8
diff --git a/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3 b/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
index d8cfb4724b25..bcbda0399c94 100644
--- a/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
+++ b/metadata/md5-cache/net-mail/qmail-autoresponder-0.97-r3
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/bglibs-1.106 mysql? ( dev-db/mysql-connector-c:0= )
DESCRIPTION=Rate-limited autoresponder for qmail
EAPI=7
HOMEPAGE=http://untroubled.org/qmail-autoresponder/
+INHERIT=toolchain-funcs
IUSE=mysql
KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/bglibs-1.106 mysql? ( dev-db/mysql-connector-c:0= ) virtual/qmail mysql? ( virtual/mysql )
SLOT=0
SRC_URI=http://untroubled.org/qmail-autoresponder/archive/qmail-autoresponder-0.97.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c674d3cad35a0457417c32884c27d367
diff --git a/metadata/md5-cache/net-mail/qmail-autoresponder-2.0 b/metadata/md5-cache/net-mail/qmail-autoresponder-2.0
index f741d65b0c9e..d9657ac8b5bd 100644
--- a/metadata/md5-cache/net-mail/qmail-autoresponder-2.0
+++ b/metadata/md5-cache/net-mail/qmail-autoresponder-2.0
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/bglibs-2.04 mysql? ( dev-db/mysql-connector-c:0= )
DESCRIPTION=Rate-limited autoresponder for qmail
EAPI=7
HOMEPAGE=https://untroubled.org/qmail-autoresponder/
+INHERIT=toolchain-funcs
IUSE=mysql
KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/bglibs-2.04 mysql? ( dev-db/mysql-connector-c:0= ) virtual/qmail mysql? ( virtual/mysql )
SLOT=0
SRC_URI=https://untroubled.org/qmail-autoresponder/archive/qmail-autoresponder-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=33993cebe154189eaf3b3111baff1a6e
diff --git a/metadata/md5-cache/net-mail/qmail-notify-0.93-r2 b/metadata/md5-cache/net-mail/qmail-notify-0.93-r2
index 62b5b87e845c..f67ecd49dafc 100644
--- a/metadata/md5-cache/net-mail/qmail-notify-0.93-r2
+++ b/metadata/md5-cache/net-mail/qmail-notify-0.93-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=Delayed delivery notification for qmail
EAPI=7
HOMEPAGE=http://untroubled.org/qmail-notify/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ppc sparc x86
LICENSE=GPL-2
RDEPEND=virtual/cron virtual/qmail
SLOT=0
SRC_URI=http://untroubled.org/qmail-notify/archive/qmail-notify-0.93.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=98245399ffc776c78763e045f5034bfb
diff --git a/metadata/md5-cache/net-mail/qtools-0.56 b/metadata/md5-cache/net-mail/qtools-0.56
index c81cb138f714..1884f2ce8d71 100644
--- a/metadata/md5-cache/net-mail/qtools-0.56
+++ b/metadata/md5-cache/net-mail/qtools-0.56
@@ -2,11 +2,12 @@ DEFINED_PHASES=configure install
DESCRIPTION=Utilities for use with qmail, typically as part of .qmail command processing
EAPI=7
HOMEPAGE=http://www.superscript.com/qtools/intro.html
+INHERIT=toolchain-funcs
IUSE=static
KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=all-rights-reserved public-domain
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://www.superscript.com/qtools/qtools-0.56.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=74741f4dbf6c5d543dce8b71bf96106a
diff --git a/metadata/md5-cache/net-mail/ripmime-1.4.0.10-r1 b/metadata/md5-cache/net-mail/ripmime-1.4.0.10-r1
index 4150fffc62ae..b3708ff9848d 100644
--- a/metadata/md5-cache/net-mail/ripmime-1.4.0.10-r1
+++ b/metadata/md5-cache/net-mail/ripmime-1.4.0.10-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=extract attachment files out of a MIME-encoded email pack
EAPI=7
HOMEPAGE=http://pldaniels.com/ripmime/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=Sendmail
SLOT=0
SRC_URI=http://www.pldaniels.com/ripmime/ripmime-1.4.0.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fec344c996e53964f5241b7b04ad315a
diff --git a/metadata/md5-cache/net-mail/ripole-0.2.2 b/metadata/md5-cache/net-mail/ripole-0.2.2
index afe515794ff2..94a10ea7386d 100644
--- a/metadata/md5-cache/net-mail/ripole-0.2.2
+++ b/metadata/md5-cache/net-mail/ripole-0.2.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Program/library to pull out attachment from OLE2 data files
EAPI=7
HOMEPAGE=http://www.pldaniels.com/ripole/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=http://www.pldaniels.com/ripole/ripole-0.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2e1ba8aff3e7745c3ea829adfc14818a
diff --git a/metadata/md5-cache/net-mail/safecat-1.13 b/metadata/md5-cache/net-mail/safecat-1.13
index d8ba4e0d9241..8822dc9362f8 100644
--- a/metadata/md5-cache/net-mail/safecat-1.13
+++ b/metadata/md5-cache/net-mail/safecat-1.13
@@ -3,10 +3,11 @@ DEPEND=sys-apps/groff
DESCRIPTION=Safecat implements qmail's maildir algorithm, safely copying standard input
EAPI=6
HOMEPAGE=http://www.jeenyus.net/linux/software/safecat.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=BSD
RESTRICT=test
SLOT=0
SRC_URI=http://www.jeenyus.net/linux/software/safecat/safecat-1.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f6c4b93db10b57180c3605c59351bcc6
diff --git a/metadata/md5-cache/net-mail/serialmail-0.75-r5 b/metadata/md5-cache/net-mail/serialmail-0.75-r5
index 090a62ffb841..9471e51dcb6b 100644
--- a/metadata/md5-cache/net-mail/serialmail-0.75-r5
+++ b/metadata/md5-cache/net-mail/serialmail-0.75-r5
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/ucspi-tcp-0.88
DESCRIPTION=A serialmail is a collection of tools for passing mail across serial links
EAPI=7
HOMEPAGE=http://cr.yp.to/serialmail.html
+INHERIT=toolchain-funcs
IUSE=static
KEYWORDS=~amd64 ppc x86
LICENSE=all-rights-reserved
@@ -11,5 +12,5 @@ RDEPEND=>=sys-apps/ucspi-tcp-0.88 virtual/daemontools
RESTRICT=mirror bindist test
SLOT=0
SRC_URI=http://cr.yp.to/software/serialmail-0.75.tar.gz mirror://gentoo/serialmail-0.75-patch.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0e44d37007d8c5d242c7a80e3eab4101
diff --git a/metadata/md5-cache/net-misc/aget-0.4.1-r2 b/metadata/md5-cache/net-misc/aget-0.4.1-r2
index f3929a6db2bb..b9fc271793de 100644
--- a/metadata/md5-cache/net-misc/aget-0.4.1-r2
+++ b/metadata/md5-cache/net-misc/aget-0.4.1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile
DESCRIPTION=multithreaded HTTP download accelerator
EAPI=7
HOMEPAGE=http://www.enderunix.org/aget/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
SLOT=0
SRC_URI=http://www.enderunix.org/aget/aget-0.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=02e443807902d72305895b55b97df79a
diff --git a/metadata/md5-cache/net-misc/aggregate-1.6 b/metadata/md5-cache/net-misc/aggregate-1.6
index f9b0d883344a..93559173da18 100644
--- a/metadata/md5-cache/net-misc/aggregate-1.6
+++ b/metadata/md5-cache/net-misc/aggregate-1.6
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Perform two optimisations on a list of prefixes to reduce the length of the list
EAPI=6
HOMEPAGE=https://ftp.isc.org/isc/aggregate
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
LICENSE=ISC
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=https://ftp.isc.org/isc/aggregate/aggregate-1.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bdd1094f07daa5db542ee2982a14a9e1
diff --git a/metadata/md5-cache/net-misc/astmanproxy-1.28.2 b/metadata/md5-cache/net-misc/astmanproxy-1.28.2
index 6964242697d6..92e1dd48dca0 100644
--- a/metadata/md5-cache/net-misc/astmanproxy-1.28.2
+++ b/metadata/md5-cache/net-misc/astmanproxy-1.28.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Proxy for the Asterisk manager interface
EAPI=7
HOMEPAGE=https://github.com/davies147/astmanproxy/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/davies147/astmanproxy/archive/1.28.2.tar.gz -> astmanproxy-1.28.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6a08b3b992ba98164a32cc62ec0398c3
diff --git a/metadata/md5-cache/net-misc/balance-3.57 b/metadata/md5-cache/net-misc/balance-3.57
index 7c09fdb8e542..d04e84f944b2 100644
--- a/metadata/md5-cache/net-misc/balance-3.57
+++ b/metadata/md5-cache/net-misc/balance-3.57
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=TCP Load Balancing Port Forwarder
EAPI=6
HOMEPAGE=http://www.inlab.de/balance.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.inlab.de/balance-3.57.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=618894ee3c6b40f411f3ed2fec841b85
diff --git a/metadata/md5-cache/net-misc/cmst-2020.11.01 b/metadata/md5-cache/net-misc/cmst-2020.11.01
index 28bb0ff8c767..fd8d976f18cb 100644
--- a/metadata/md5-cache/net-misc/cmst-2020.11.01
+++ b/metadata/md5-cache/net-misc/cmst-2020.11.01
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/
DESCRIPTION=Qt GUI for Connman with system tray icon
EAPI=7
HOMEPAGE=https://github.com/andrew-bibb/cmst
+INHERIT=qmake-utils xdg-utils
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/connman
SLOT=0
SRC_URI=https://github.com/andrew-bibb/cmst/archive/2020.11.01.tar.gz -> cmst-2020.11.01.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=73cc561824372327e90f33d259d47461
diff --git a/metadata/md5-cache/net-misc/datapipe-1.0-r2 b/metadata/md5-cache/net-misc/datapipe-1.0-r2
index 565ea627dc97..a6a816f0f5d2 100644
--- a/metadata/md5-cache/net-misc/datapipe-1.0-r2
+++ b/metadata/md5-cache/net-misc/datapipe-1.0-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=bind a local port and connect it to a remote socket
EAPI=6
HOMEPAGE=http://http.distributed.net/pub/dcti/unsupported/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~ppc ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=ftp://ftp.distributed.net/pub/dcti/unsupported/datapipe-1.0.tar.gz http://http.distributed.net/pub/dcti/unsupported/datapipe-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=795cac09ef2fe4f4af4e412d21dd0e5d
diff --git a/metadata/md5-cache/net-misc/efax-0.9a_p19_p1 b/metadata/md5-cache/net-misc/efax-0.9a_p19_p1
index 9ae52728cd9f..7f973e4480cf 100644
--- a/metadata/md5-cache/net-misc/efax-0.9a_p19_p1
+++ b/metadata/md5-cache/net-misc/efax-0.9a_p19_p1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A simple fax program for single-user systems
EAPI=7
HOMEPAGE=https://www.cce.com/efax/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/e/efax/efax_0.9a.orig.tar.gz mirror://debian/pool/main/e/efax/efax_0.9a-19.1.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2c509684968ee4c5416f1b23c8847e44
diff --git a/metadata/md5-cache/net-misc/ethercard-diag-20050321.1g-r1 b/metadata/md5-cache/net-misc/ethercard-diag-20050321.1g-r1
index 9b089d131490..1aa6b5b3ef25 100644
--- a/metadata/md5-cache/net-misc/ethercard-diag-20050321.1g-r1
+++ b/metadata/md5-cache/net-misc/ethercard-diag-20050321.1g-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=low level mii diagnostic tools including mii-diag and etherwake (merge of netdiag/isa-diag)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!sys-apps/nictools
SLOT=0
SRC_URI=mirror://gentoo/ethercard-diag-20050321.1g.tar.lzma
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ea7fa66d88befd8af0a44211acf7f3e8
diff --git a/metadata/md5-cache/net-misc/fakeidentd-2.6-r1 b/metadata/md5-cache/net-misc/fakeidentd-2.6-r1
index 1787cb439fdc..509dada1b488 100644
--- a/metadata/md5-cache/net-misc/fakeidentd-2.6-r1
+++ b/metadata/md5-cache/net-misc/fakeidentd-2.6-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install unpack
DESCRIPTION=A static, secure identd. One source file only!
EAPI=6
HOMEPAGE=http://www.guru-group.fi/~too/sw/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.guru-group.fi/~too/sw/identd.readme -> fakeidentd-2.6.readme http://www.guru-group.fi/~too/sw/releases/identd.c -> fakeidentd-2.6.c
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=26d72a320d765fa16d29bcd446dc38d3
diff --git a/metadata/md5-cache/net-misc/getdate-1.2-r2 b/metadata/md5-cache/net-misc/getdate-1.2-r2
index 117766e47dea..0836b4393bb9 100644
--- a/metadata/md5-cache/net-misc/getdate-1.2-r2
+++ b/metadata/md5-cache/net-misc/getdate-1.2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Network Date/Time Query and Set Local Date/Time Utility
EAPI=7
HOMEPAGE=http://www.ibiblio.org/pub/Linux/system/network/misc/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ppc x86
LICENSE=GPL-1+
SLOT=0
SRC_URI=http://www.ibiblio.org/pub/Linux/system/network/misc/getdate_rfc868-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=352a0725a45a5521e294926164500e78
diff --git a/metadata/md5-cache/net-misc/gwhois-20120626-r1 b/metadata/md5-cache/net-misc/gwhois-20120626-r1
index 27d58e6d9dd4..b4b655006155 100644
--- a/metadata/md5-cache/net-misc/gwhois-20120626-r1
+++ b/metadata/md5-cache/net-misc/gwhois-20120626-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=Generic whois
EAPI=7
HOMEPAGE=https://julijane.de/gwhois/
+INHERIT=readme.gentoo-r1
KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=net-misc/curl dev-lang/perl:= dev-perl/libwww-perl dev-perl/Net-LibIDN www-client/lynx
diff --git a/metadata/md5-cache/net-misc/hashcash-1.22-r2 b/metadata/md5-cache/net-misc/hashcash-1.22-r2
index 50b060d5fcfd..a399656b12ae 100644
--- a/metadata/md5-cache/net-misc/hashcash-1.22-r2
+++ b/metadata/md5-cache/net-misc/hashcash-1.22-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Utility to generate hashcash tokens
EAPI=7
HOMEPAGE=http://www.hashcash.org
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=CPL-1.0
SLOT=0
SRC_URI=http://www.hashcash.org/source/hashcash-1.22.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0a07d93b484df1eb0a0004f0d42c06d7
diff --git a/metadata/md5-cache/net-misc/kafkacat-1.5.0 b/metadata/md5-cache/net-misc/kafkacat-1.5.0
index 716bfab0b1a2..b9009a131e57 100644
--- a/metadata/md5-cache/net-misc/kafkacat-1.5.0
+++ b/metadata/md5-cache/net-misc/kafkacat-1.5.0
@@ -3,11 +3,12 @@ DEPEND=>=dev-libs/librdkafka-0.9.4 avro? ( dev-libs/avro-c dev-libs/libserdes )
DESCRIPTION=Generic command line non-JVM Apache Kafka producer and consumer
EAPI=6
HOMEPAGE=https://github.com/edenhill/kafkacat
+INHERIT=toolchain-funcs
IUSE=+avro +json
KEYWORDS=amd64
LICENSE=BSD-2
RDEPEND=>=dev-libs/librdkafka-0.9.4 avro? ( dev-libs/avro-c dev-libs/libserdes ) json? ( dev-libs/yajl )
SLOT=0
SRC_URI=https://github.com/edenhill/kafkacat/archive/1.5.0.tar.gz -> kafkacat-1.5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fe6983128e22bf68e3ff3a6f5e8f6c4f
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928 b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
index cf1babed631e..914715edfcc1 100644
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
@@ -4,11 +4,12 @@ DEPEND=net-libs/libnfnetlink
DESCRIPTION=MiniSSDP Daemon
EAPI=7
HOMEPAGE=http://miniupnp.free.fr/
+INHERIT=toolchain-funcs verify-sig
IUSE=verify-sig
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
SLOT=0
SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz verify-sig? ( http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz.sig )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e verify-sig 40b4f4f782cf67118f594ce604cc4c0a
_md5_=50527fbe201e220319258d3da40367a8
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0
index 5f12f662235d..407e5b0dc587 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.0
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=
DESCRIPTION=MiniUPnP IGD Daemon
EAPI=7
HOMEPAGE=http://miniupnp.free.fr/
+INHERIT=toolchain-funcs verify-sig
IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
KEYWORDS=~amd64 ~arm ~x86
LICENSE=BSD
RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
SLOT=0
SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0.tar.gz.sig )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e verify-sig 40b4f4f782cf67118f594ce604cc4c0a
_md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.1 b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
index 8c33fe49aaa4..97b58f9905a5 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.1
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.1
@@ -4,11 +4,12 @@ DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=
DESCRIPTION=MiniUPnP IGD Daemon
EAPI=7
HOMEPAGE=http://miniupnp.free.fr/
+INHERIT=toolchain-funcs verify-sig
IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict verify-sig
KEYWORDS=~amd64 ~arm ~x86
LICENSE=BSD
RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
SLOT=0
SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.1.tar.gz.sig )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e verify-sig 40b4f4f782cf67118f594ce604cc4c0a
_md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-misc/ncp-1.2.4-r2 b/metadata/md5-cache/net-misc/ncp-1.2.4-r2
index e6ecee1cb39e..9bdfd509e2e1 100644
--- a/metadata/md5-cache/net-misc/ncp-1.2.4-r2
+++ b/metadata/md5-cache/net-misc/ncp-1.2.4-r2
@@ -3,9 +3,10 @@ DEPEND=>=dev-libs/libowfat-0.28-r1[-diet]
DESCRIPTION=Utility for copying files in a LAN (npoll, npush)
EAPI=7
HOMEPAGE=https://www.fefe.de/ncp/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=https://dl.fefe.de/ncp-1.2.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=81a0cf4922f422e76e0aaecde20e4519
diff --git a/metadata/md5-cache/net-misc/netevent-2.0_p20200217 b/metadata/md5-cache/net-misc/netevent-2.0_p20200217
index 77d2f02e18cc..efaaa7fdda74 100644
--- a/metadata/md5-cache/net-misc/netevent-2.0_p20200217
+++ b/metadata/md5-cache/net-misc/netevent-2.0_p20200217
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure
DESCRIPTION=Tool to share Linux event devices with other machines
EAPI=7
HOMEPAGE=https://github.com/Blub/netevent
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~arm
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://github.com/Blub/netevent/archive/c2066fa55db6f51090e00a240889d2f0cbd0ab4d.tar.gz -> netevent-2.0_p20200217.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7a4f46d6ab162353becaaf7d1cf945f9
diff --git a/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1 b/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
index b55a45ae2abf..107ac82dc55b 100644
--- a/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
+++ b/metadata/md5-cache/net-misc/netkit-bootpd-2.4-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Netkit - bootp
EAPI=6
HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/bootpd-2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ab0bdfe81c130ebd7d7365a98ee26431
diff --git a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12 b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
index 34836d84df92..619cceeda41b 100644
--- a/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
+++ b/metadata/md5-cache/net-misc/netkit-telnetd-0.17-r12
@@ -3,10 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.2:= !net-misc/telnet-bsd
DESCRIPTION=Standard Linux telnet client and server
EAPI=6
HOMEPAGE=https://launchpad.net/netkit-telnet
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
LICENSE=BSD
RDEPEND=>=sys-libs/ncurses-5.2:= !net-misc/telnet-bsd
SLOT=0
SRC_URI=mirror://gentoo/netkit-telnet-0.17.tar.gz mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-41.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=49eafcf4162225c4e8187d5f4705a1ca
diff --git a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2 b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2
index e5b3b2dbd6bb..600124aa062e 100644
--- a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2
+++ b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=tool to reliably distribute binary data using UDP broadcasting techniques
EAPI=7
HOMEPAGE=https://www.wudika.de/~jan/netpipe/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.wudika.de/~jan/netpipe/netpipe.tar.gz -> netpipe-1.0.0_beta2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=75914454315f0c9fb5ad2c6578e6f548
diff --git a/metadata/md5-cache/net-misc/netpipes-4.2-r2 b/metadata/md5-cache/net-misc/netpipes-4.2-r2
index 2b87836e0afe..978c9528a135 100644
--- a/metadata/md5-cache/net-misc/netpipes-4.2-r2
+++ b/metadata/md5-cache/net-misc/netpipes-4.2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Tools to manipulate BSD TCP/IP stream sockets
EAPI=7
HOMEPAGE=http://web.purplefrog.com/~thoth/netpipes/netpipes.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://web.purplefrog.com/~thoth/netpipes/ftp/netpipes-4.2-export.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4cbb73b87d150906b8869b86fd250280
diff --git a/metadata/md5-cache/net-misc/nicstat-1.95 b/metadata/md5-cache/net-misc/nicstat-1.95
index 55d66933a29c..7af92dd49f30 100644
--- a/metadata/md5-cache/net-misc/nicstat-1.95
+++ b/metadata/md5-cache/net-misc/nicstat-1.95
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Network traffic statics utility for Solaris and Linux
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/nicstat/ https://github.com/scotte/nicstat/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=Artistic-2
SLOT=0
SRC_URI=https://github.com/scotte/nicstat/archive/a716ee81cbf1e177267e20a880b5a0d9fa5b689e.tar.gz -> nicstat-1.95.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1a33ea1055458a085ddbc717b18ed781
diff --git a/metadata/md5-cache/net-misc/pimpd-0.8-r1 b/metadata/md5-cache/net-misc/pimpd-0.8-r1
index 42a431fe0e90..de7f4241ce04 100644
--- a/metadata/md5-cache/net-misc/pimpd-0.8-r1
+++ b/metadata/md5-cache/net-misc/pimpd-0.8-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=RFC1413-compliant identd server supporting masqueraded connections
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://cats.meow.at/~peter/pimpd_0.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c1a957f47de6f741a48d5ff792e8cdc7
diff --git a/metadata/md5-cache/net-misc/pps-tools-1.0.2 b/metadata/md5-cache/net-misc/pps-tools-1.0.2
index 375d263a8b1c..d2177626bacf 100644
--- a/metadata/md5-cache/net-misc/pps-tools-1.0.2
+++ b/metadata/md5-cache/net-misc/pps-tools-1.0.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=User-space tools for LinuxPPS
EAPI=6
HOMEPAGE=https://github.com/redlab-i/pps-tools
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/redlab-i/pps-tools/archive/v1.0.2.tar.gz -> pps-tools-1.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8cc3846a4a473b92b1ddb61391b28a28
diff --git a/metadata/md5-cache/net-misc/proxychains-4.14 b/metadata/md5-cache/net-misc/proxychains-4.14
index 86bf9b8caf16..7422abbae5e2 100644
--- a/metadata/md5-cache/net-misc/proxychains-4.14
+++ b/metadata/md5-cache/net-misc/proxychains-4.14
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=force any tcp connections to flow through a proxy (or proxy chain)
EAPI=7
HOMEPAGE=https://github.com/rofl0r/proxychains-ng/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://ftp.barfooze.de/pub/sabotage/tarballs/proxychains-ng-4.14.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5d509a096479a271a18ea527fd7ba1f8
diff --git a/metadata/md5-cache/net-misc/rinetd-0.62-r2 b/metadata/md5-cache/net-misc/rinetd-0.62-r2
index 7ace3a69a2a0..1c68c0dc9303 100644
--- a/metadata/md5-cache/net-misc/rinetd-0.62-r2
+++ b/metadata/md5-cache/net-misc/rinetd-0.62-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=redirects TCP connections from one IP address and port to another
EAPI=6
HOMEPAGE=http://www.boutell.com/rinetd/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.boutell.com/rinetd/http/rinetd.tar.gz -> rinetd-0.62.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b79f89c332e6107ffd4d51b2fa3ed8a6
diff --git a/metadata/md5-cache/net-misc/s6-networking-2.3.0.2 b/metadata/md5-cache/net-misc/s6-networking-2.3.0.2
index efdbafc12845..ae0be684526f 100644
--- a/metadata/md5-cache/net-misc/s6-networking-2.3.0.2
+++ b/metadata/md5-cache/net-misc/s6-networking-2.3.0.2
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.2[static-libs]
DESCRIPTION=suite of small networking utilities for Unix systems
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6-networking/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/net-misc/snarf-7.0-r4 b/metadata/md5-cache/net-misc/snarf-7.0-r4
index 05b861f95e23..6c27e2f45da6 100644
--- a/metadata/md5-cache/net-misc/snarf-7.0-r4
+++ b/metadata/md5-cache/net-misc/snarf-7.0-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=Small and fast CLI resource grabber for http, gopher, finger, ftp
EAPI=7
HOMEPAGE=https://www.xach.com/snarf/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.xach.com/snarf/snarf-7.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c3a3adbe6a58183231f9cd5ee75b4a02
diff --git a/metadata/md5-cache/net-misc/ssh-chain-20131217 b/metadata/md5-cache/net-misc/ssh-chain-20131217
index 2f51081d6d60..9784544b4817 100644
--- a/metadata/md5-cache/net-misc/ssh-chain-20131217
+++ b/metadata/md5-cache/net-misc/ssh-chain-20131217
@@ -2,6 +2,7 @@ DEFINED_PHASES=install unpack
DESCRIPTION=ssh via a chain of intermediary hosts
EAPI=5
HOMEPAGE=https://github.com/ryancdotorg/ssh-chain
+INHERIT=vcs-snapshot
KEYWORDS=~amd64
LICENSE=BSD
RDEPEND=dev-lang/perl virtual/ssh
diff --git a/metadata/md5-cache/net-misc/taptap-1.0 b/metadata/md5-cache/net-misc/taptap-1.0
index 95bd84b37978..6844ba849940 100644
--- a/metadata/md5-cache/net-misc/taptap-1.0
+++ b/metadata/md5-cache/net-misc/taptap-1.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=A program to link two /dev/net/tun to form virtual ethernet
EAPI=6
HOMEPAGE=http://www.munted.org.uk/programming/taptap/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~sparc ~x86
LICENSE=MIT
SLOT=0
SRC_URI=http://www.munted.org.uk/programming/taptap/taptap-1.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cc0b2d1e004f80774dbf2eb6588cc9eb
diff --git a/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1 b/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
index d58b16f63acc..330bccff003e 100644
--- a/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
+++ b/metadata/md5-cache/net-misc/tcpsound-0.3.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libmba media-libs/libsdl net-analyzer/tcpdump
DESCRIPTION=Play sounds in response to network traffic
EAPI=7
HOMEPAGE=http://www.ioplex.com/~miallen/tcpsound/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=dev-libs/libmba media-libs/libsdl net-analyzer/tcpdump
SLOT=0
SRC_URI=http://www.ioplex.com/~miallen/tcpsound/dl/tcpsound-0.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9367a6fe231e65c0b402781bf7ff38b6
diff --git a/metadata/md5-cache/net-misc/ttytter-2.1.00 b/metadata/md5-cache/net-misc/ttytter-2.1.00
index 2727f2ea0ee9..648d28231ae9 100644
--- a/metadata/md5-cache/net-misc/ttytter-2.1.00
+++ b/metadata/md5-cache/net-misc/ttytter-2.1.00
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst
DESCRIPTION=A multi-functional, console-based Twitter client
EAPI=6
HOMEPAGE=http://www.floodgap.com/software/ttytter/
+INHERIT=readme.gentoo-r1
KEYWORDS=amd64 x86
LICENSE=FFSL
RDEPEND=>=dev-lang/perl-5.8 || ( net-misc/curl www-client/lynx )
diff --git a/metadata/md5-cache/net-misc/ubridge-0.9.18 b/metadata/md5-cache/net-misc/ubridge-0.9.18
index 55a6dcb34a16..217983752557 100644
--- a/metadata/md5-cache/net-misc/ubridge-0.9.18
+++ b/metadata/md5-cache/net-misc/ubridge-0.9.18
@@ -4,11 +4,12 @@ DEPEND=acct-group/ubridge dev-libs/iniparser:4= net-libs/libpcap
DESCRIPTION=Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces
EAPI=7
HOMEPAGE=https://github.com/GNS3/ubridge
+INHERIT=fcaps toolchain-funcs
IUSE=+filecaps
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=acct-group/ubridge dev-libs/iniparser:4= net-libs/libpcap filecaps? ( sys-libs/libcap )
SLOT=0
SRC_URI=https://github.com/GNS3/ubridge/archive/v0.9.18.tar.gz -> ubridge-0.9.18.tar.gz
-_eclasses_=fcaps da689a8e04bbbb3518888ff668fee45b multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=fcaps da689a8e04bbbb3518888ff668fee45b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aa19ed2d77e2b877e085f6b7708d478f
diff --git a/metadata/md5-cache/net-misc/uftp-4.10.1 b/metadata/md5-cache/net-misc/uftp-4.10.1
index 4e34f6e1a5cc..422f5974e689 100644
--- a/metadata/md5-cache/net-misc/uftp-4.10.1
+++ b/metadata/md5-cache/net-misc/uftp-4.10.1
@@ -3,6 +3,7 @@ DEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
DESCRIPTION=Encrypted UDP based FTP with multicast
EAPI=7
HOMEPAGE=http://uftp-multicast.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=+server ssl
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3-with-openssl-exception
@@ -10,5 +11,5 @@ RDEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
RESTRICT=test
SLOT=0
SRC_URI=https://download.sourceforge.net/uftp-multicast/source-tar/uftp-4.10.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=15d5cf4427208e41efc11442b74b079d
diff --git a/metadata/md5-cache/net-misc/uftp-5.0 b/metadata/md5-cache/net-misc/uftp-5.0
index 7b3965815411..f1df971e2ea3 100644
--- a/metadata/md5-cache/net-misc/uftp-5.0
+++ b/metadata/md5-cache/net-misc/uftp-5.0
@@ -3,11 +3,12 @@ DEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
DESCRIPTION=Encrypted UDP based FTP with multicast
EAPI=7
HOMEPAGE=http://uftp-multicast.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=+server ssl
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3-with-openssl-exception
RDEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
SLOT=0
SRC_URI=https://download.sourceforge.net/uftp-multicast/source-tar/uftp-5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=402466ad15208d7926ca4fe2e1956e23
diff --git a/metadata/md5-cache/net-misc/utelnetd-0.1.11-r2 b/metadata/md5-cache/net-misc/utelnetd-0.1.11-r2
index a2080fb089d1..3a11dd74be99 100644
--- a/metadata/md5-cache/net-misc/utelnetd-0.1.11-r2
+++ b/metadata/md5-cache/net-misc/utelnetd-0.1.11-r2
@@ -3,9 +3,10 @@ DEPEND=sys-apps/shadow
DESCRIPTION=A small Telnet daemon, derived from the Axis tools
EAPI=6
HOMEPAGE=http://www.pengutronix.de/software/utelnetd/index_en.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~s390 ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.pengutronix.de/software/utelnetd/utelnetd-0.1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=39274dc80806889b73c5387422489cbd
diff --git a/metadata/md5-cache/net-misc/vncsnapshot-1.2a b/metadata/md5-cache/net-misc/vncsnapshot-1.2a
index 62ae46f0341e..e0e303901c24 100644
--- a/metadata/md5-cache/net-misc/vncsnapshot-1.2a
+++ b/metadata/md5-cache/net-misc/vncsnapshot-1.2a
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib virtual/jpeg
DESCRIPTION=A command-line tool for taking JPEG snapshots of VNC servers
EAPI=7
HOMEPAGE=http://vncsnapshot.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
RDEPEND=sys-libs/zlib virtual/jpeg
SLOT=0
SRC_URI=mirror://sourceforge/vncsnapshot/vncsnapshot-1.2a-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=97f0c64b2ef75bdc01e019a91d38d119
diff --git a/metadata/md5-cache/net-misc/whatmask-1.2-r1 b/metadata/md5-cache/net-misc/whatmask-1.2-r1
index 1c946749edc8..33dd769375f7 100644
--- a/metadata/md5-cache/net-misc/whatmask-1.2-r1
+++ b/metadata/md5-cache/net-misc/whatmask-1.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=little C program to compute different subnet mask notations
EAPI=7
HOMEPAGE=http://www.laffeycomputer.com/whatmask.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://downloads.laffeycomputer.com/current_builds/whatmask/whatmask-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3e63af5c1a056037447e41d6cc8c01b4
diff --git a/metadata/md5-cache/net-misc/wol-0.7.1-r2 b/metadata/md5-cache/net-misc/wol-0.7.1-r2
index d55936549a4d..495fa3eaf6fe 100644
--- a/metadata/md5-cache/net-misc/wol-0.7.1-r2
+++ b/metadata/md5-cache/net-misc/wol-0.7.1-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure
DESCRIPTION=Implements Wake On LAN (Magic Paket) functionality in a small program
EAPI=7
HOMEPAGE=http://ahh.sourceforge.net/wol/
+INHERIT=toolchain-funcs
IUSE=nls
KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://sourceforge/ahh/wol-0.7.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1cd3f0d05c4702acc8ad70307092e020
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.2.2 b/metadata/md5-cache/net-misc/x2goclient-4.1.2.2
index 4b042c68a34b..15a5e0265336 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.2.2
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.2.2
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev
DESCRIPTION=The X2Go Qt client
EAPI=7
HOMEPAGE=http://www.x2go.org
+INHERIT=desktop qmake-utils xdg
IUSE=ldap
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
SLOT=0
SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=8819f4c6c74fd07212ddc4aba44896b2
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.22.1 b/metadata/md5-cache/net-p2p/ncdc-1.22.1
index ecdda3feda58..b7b95f66cee3 100644
--- a/metadata/md5-cache/net-p2p/ncdc-1.22.1
+++ b/metadata/md5-cache/net-p2p/ncdc-1.22.1
@@ -4,11 +4,12 @@ DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs
DESCRIPTION=ncurses directconnect client
EAPI=7
HOMEPAGE=https://dev.yorhel.nl/ncdc
+INHERIT=toolchain-funcs
IUSE=geoip
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:0=[unicode] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
SLOT=0
SRC_URI=https://dev.yorhel.nl/download/ncdc-1.22.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4389d31f2000d5f4855a70d5dd69bc64
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.3.1 b/metadata/md5-cache/net-p2p/qbittorrent-4.3.1
index c43079749742..0b8a0f5e2502 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.3.1
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.3.1
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-
DESCRIPTION=BitTorrent client in C++ and Qt
EAPI=7
HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
+INHERIT=xdg-utils
IUSE=+dbus debug webui +X
KEYWORDS=amd64 ~arm ~ppc64 x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.3.3 b/metadata/md5-cache/net-p2p/qbittorrent-4.3.3
index e637dc65fdbe..1db666c71d7a 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-4.3.3
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.3.3
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/boost-1.62.0-r1:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-
DESCRIPTION=BitTorrent client in C++ and Qt
EAPI=7
HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
+INHERIT=xdg-utils
IUSE=+dbus debug webui +X
KEYWORDS=~amd64 ~arm ~ppc64 ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20170331 b/metadata/md5-cache/net-print/foomatic-db-4.0.20170331
index 3879e05a7f6e..137240ea592c 100644
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20170331
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20170331
@@ -2,6 +2,7 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
EAPI=5
HOMEPAGE=http://www.linuxprinting.org/foomatic.html
+INHERIT=versionator
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
LICENSE=GPL-2
RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20180126 b/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
index 9f908efd902d..b1fbde738c9b 100644
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
@@ -2,6 +2,7 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
EAPI=6
HOMEPAGE=http://www.linuxprinting.org/foomatic.html
+INHERIT=versionator
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20190226 b/metadata/md5-cache/net-print/foomatic-db-4.0.20190226
index c6d3b9e9d585..70ac2a7e4c1b 100644
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20190226
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20190226
@@ -2,6 +2,7 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
EAPI=6
HOMEPAGE=http://www.linuxprinting.org/foomatic.html
+INHERIT=versionator
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
diff --git a/metadata/md5-cache/net-print/hplip-3.20.11-r1 b/metadata/md5-cache/net-print/hplip-3.20.11-r1
index e265e382c7ae..f61be894c9c8 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.11-r1
+++ b/metadata/md5-cache/net-print/hplip-3.20.11-r1
@@ -5,7 +5,7 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
EAPI=7
HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 udev
-IUSE=doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
KEYWORDS=amd64 arm arm64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
SLOT=0
SRC_URI=mirror://sourceforge/hplip/hplip-3.20.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.11-patches-2.tar.xz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=06a0dab76b4d5233c7f8ec745beaa4fe
+_md5_=17ff02334aba1082243ce8a0e28002c5
diff --git a/metadata/md5-cache/net-print/hplip-3.21.2 b/metadata/md5-cache/net-print/hplip-3.21.2
index 6c10c4eeda37..7851f76ac0c3 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.2
+++ b/metadata/md5-cache/net-print/hplip-3.21.2
@@ -5,7 +5,7 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
EAPI=7
HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 udev
-IUSE=doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
SLOT=0
SRC_URI=mirror://sourceforge/hplip/hplip-3.21.2.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.2-patches-1.tar.xz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=4b3489b882c52765177b5844dddfd2a5
+_md5_=d88ef8637891cce10d0ed76220a5c9db
diff --git a/metadata/md5-cache/net-print/mtink-1.0.16-r2 b/metadata/md5-cache/net-print/mtink-1.0.16-r2
index c4b616abf46e..f83bafdc9d3c 100644
--- a/metadata/md5-cache/net-print/mtink-1.0.16-r2
+++ b/metadata/md5-cache/net-print/mtink-1.0.16-r2
@@ -3,11 +3,12 @@ DEPEND=virtual/libusb:0 cups? ( net-print/cups ) X? ( x11-libs/libX11 x11-libs/l
DESCRIPTION=mtink is a status monitor and inkjet cartridge changer for some Epson printers
EAPI=7
HOMEPAGE=http://xwtools.automatix.de/
+INHERIT=toolchain-funcs
IUSE=cups doc X
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0 cups? ( net-print/cups ) X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-libs/motif:0 ) cups? ( net-print/cups ) virtual/libusb:0
SLOT=0
SRC_URI=http://xwtools.automatix.de/files/mtink-1.0.16.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=91c112db5dc94a0c9fbcd5b6f6028eed
diff --git a/metadata/md5-cache/net-print/poster-20060221-r3 b/metadata/md5-cache/net-print/poster-20060221-r3
index 05d84fa34a5e..6c15f7bd1089 100644
--- a/metadata/md5-cache/net-print/poster-20060221-r3
+++ b/metadata/md5-cache/net-print/poster-20060221-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Small utility for making a poster from an EPS file or a one-page PS document
EAPI=6
HOMEPAGE=https://printing.kde.org/downloads
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://kde/printing/poster-20060221.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f7924898a3c5a79839538a9b96184411
diff --git a/metadata/md5-cache/net-proxy/3proxy-0.9.0 b/metadata/md5-cache/net-proxy/3proxy-0.9.0
index 6fb189748aa5..53e9245c71f1 100644
--- a/metadata/md5-cache/net-proxy/3proxy-0.9.0
+++ b/metadata/md5-cache/net-proxy/3proxy-0.9.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A really tiny cross-platform proxy servers set
EAPI=7
HOMEPAGE=https://www.3proxy.ru/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~arm ppc ~sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/z3APA3A/3proxy/archive/0.9.0.tar.gz -> 3proxy-0.9.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b5967af0f3b0b738d68ef12457226fbf
diff --git a/metadata/md5-cache/net-proxy/microsocks-1.0.2 b/metadata/md5-cache/net-proxy/microsocks-1.0.2
index 889386e2e70f..7296c7b07200 100644
--- a/metadata/md5-cache/net-proxy/microsocks-1.0.2
+++ b/metadata/md5-cache/net-proxy/microsocks-1.0.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Multithreaded, small, efficient SOCKS5 server
EAPI=7
HOMEPAGE=https://github.com/rofl0r/microsocks
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/rofl0r/microsocks/archive/v1.0.2.tar.gz -> microsocks-1.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d714a73e726988b25a7903d71257c1b9
diff --git a/metadata/md5-cache/net-proxy/pingtunnel-0.72 b/metadata/md5-cache/net-proxy/pingtunnel-0.72
index bcafd827c62a..d915f91c7f73 100644
--- a/metadata/md5-cache/net-proxy/pingtunnel-0.72
+++ b/metadata/md5-cache/net-proxy/pingtunnel-0.72
@@ -3,11 +3,12 @@ DEPEND=net-libs/libpcap selinux? ( sys-libs/libselinux )
DESCRIPTION=Tunnel TCP over ICMP
EAPI=7
HOMEPAGE=https://www.cs.uit.no/~daniels/PingTunnel
+INHERIT=toolchain-funcs
IUSE=selinux
KEYWORDS=~amd64 ~arm ~ppc ~x86
LICENSE=BSD
RDEPEND=net-libs/libpcap selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-0.72.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=718d3ac369f14307b44fe2ade13f73e4
diff --git a/metadata/md5-cache/net-proxy/rejik-3.2.10 b/metadata/md5-cache/net-proxy/rejik-3.2.10
index 4b66679829fb..ef98d86e20c7 100644
--- a/metadata/md5-cache/net-proxy/rejik-3.2.10
+++ b/metadata/md5-cache/net-proxy/rejik-3.2.10
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libpcre
DESCRIPTION=A squid redirector used for blocking unwanted content
EAPI=7
HOMEPAGE=https://rejik.ru/
+INHERIT=toolchain-funcs
IUSE=banlists
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/libpcre dev-perl/Text-Iconv dev-perl/XML-Parser net-proxy/squid
SLOT=0
SRC_URI=https://rejik.ru/download/redirector-3.2.10.tgz banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f018d427046033aad0dfd4dfee58b2af
diff --git a/metadata/md5-cache/net-proxy/squirm-1.26-r1 b/metadata/md5-cache/net-proxy/squirm-1.26-r1
index 0149387ff43e..88e4e0b4e21c 100644
--- a/metadata/md5-cache/net-proxy/squirm-1.26-r1
+++ b/metadata/md5-cache/net-proxy/squirm-1.26-r1
@@ -3,10 +3,11 @@ DEPEND=net-proxy/squid
DESCRIPTION=A redirector for Squid
EAPI=7
HOMEPAGE=http://squirm.foote.com.au
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
RDEPEND=net-proxy/squid
SLOT=0
SRC_URI=http://squirm.foote.com.au/squirm-1.26.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2aa3ff290ebfaa2b8efeb0ed82c20f70
diff --git a/metadata/md5-cache/net-wireless/airtraf-1.1-r4 b/metadata/md5-cache/net-wireless/airtraf-1.1-r4
index d148359e5f53..aaa9a55108d4 100644
--- a/metadata/md5-cache/net-wireless/airtraf-1.1-r4
+++ b/metadata/md5-cache/net-wireless/airtraf-1.1-r4
@@ -3,10 +3,11 @@ DEPEND=net-libs/libpcap sys-libs/ncurses:= virtual/pkgconfig
DESCRIPTION=AirTraf 802.11b Wireless traffic sniffer
EAPI=7
HOMEPAGE=http://www.elixar.com/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=net-libs/libpcap sys-libs/ncurses:=
SLOT=0
SRC_URI=http://www.elixar.com/airtraf-1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b56dab45bf633a935e9fb318d7d29c78
diff --git a/metadata/md5-cache/net-wireless/b43-fwcutter-019 b/metadata/md5-cache/net-wireless/b43-fwcutter-019
index 695abc5464ae..8194a9ae9442 100644
--- a/metadata/md5-cache/net-wireless/b43-fwcutter-019
+++ b/metadata/md5-cache/net-wireless/b43-fwcutter-019
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=Firmware Tool for Broadcom 43xx based wireless network devices using the mac80211 wireless stack
EAPI=5
HOMEPAGE=https://bues.ch/b43/fwcutter/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm64 ppc ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://bues.ch/b43/fwcutter/b43-fwcutter-019.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=88784a3d5247cfdfa9bd732b483651f9
diff --git a/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2 b/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
index 853cf2507273..55be78254cc9 100644
--- a/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
+++ b/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
@@ -3,6 +3,7 @@ DEPEND=virtual/libusb:0 virtual/pkgconfig
DESCRIPTION=gobi_loader is a firmware loader for Qualcomm Gobi USB chipsets
EAPI=6
HOMEPAGE=https://www.codon.org.uk/~mjg59/gobi_loader/
+INHERIT=multilib udev
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0
diff --git a/metadata/md5-cache/net-wireless/horst-5.1 b/metadata/md5-cache/net-wireless/horst-5.1
index a82c6f47aefb..e6799d438019 100644
--- a/metadata/md5-cache/net-wireless/horst-5.1
+++ b/metadata/md5-cache/net-wireless/horst-5.1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sy
DESCRIPTION=Small 802.11 wireless LAN analyzer
EAPI=6
HOMEPAGE=https://github.com/br101/horst/
+INHERIT=toolchain-funcs vcs-snapshot
IUSE=debug +pcap test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/br101/horst/archive/v5.1.tar.gz -> horst-5.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=e99a24a71c2d9af65c62000cab701f3f
diff --git a/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1 b/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
index caa276e4bf81..0bf511ac4adf 100644
--- a/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
+++ b/metadata/md5-cache/net-wireless/hostap-utils-0.4.7-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Utilities for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products
EAPI=7
HOMEPAGE=https://hostap.epitest.fi/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://hostap.epitest.fi/releases/hostap-utils-0.4.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a8861214a090b27b4302cb51ec4236e4
diff --git a/metadata/md5-cache/net-wireless/iw-5.9 b/metadata/md5-cache/net-wireless/iw-5.9
index cc6ddb89ce9f..492a52154cf0 100644
--- a/metadata/md5-cache/net-wireless/iw-5.9
+++ b/metadata/md5-cache/net-wireless/iw-5.9
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libnl:=
DESCRIPTION=nl80211 configuration utility for wireless devices using the mac80211 stack
EAPI=7
HOMEPAGE=https://wireless.wiki.kernel.org/en/users/Documentation/iw
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=ISC
RDEPEND=dev-libs/libnl:=
SLOT=0
SRC_URI=https://www.kernel.org/pub/software/network/iw/iw-5.9.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e5ef333efe86d35a49fa6fae0101679d
diff --git a/metadata/md5-cache/net-wireless/iwgtk-0.4 b/metadata/md5-cache/net-wireless/iwgtk-0.4
index 0d8438b48fdb..8c6b837ae4a0 100644
--- a/metadata/md5-cache/net-wireless/iwgtk-0.4
+++ b/metadata/md5-cache/net-wireless/iwgtk-0.4
@@ -3,10 +3,11 @@ DEPEND=dev-libs/atk:0 dev-libs/glib:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11
DESCRIPTION=Lightweight, graphical wifi management utility for Linux
EAPI=7
HOMEPAGE=https://github.com/J-Lentz/iwgtk
+INHERIT=xdg
KEYWORDS=~amd64
LICENSE=GPL-3+
RDEPEND=dev-libs/atk:0 dev-libs/glib:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango:0 net-wireless/iwd
SLOT=0
SRC_URI=https://github.com/J-Lentz/iwgtk/archive/v0.4.tar.gz -> iwgtk-0.4.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=9c9cfd82d744b36c34727b6164e4ef5d
diff --git a/metadata/md5-cache/net-wireless/linssid-3.6-r1 b/metadata/md5-cache/net-wireless/linssid-3.6-r1
index 6d8d6dd3ca69..bc5da6e6254f 100644
--- a/metadata/md5-cache/net-wireless/linssid-3.6-r1
+++ b/metadata/md5-cache/net-wireless/linssid-3.6-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/
DESCRIPTION=Graphical wireless scanning for Linux
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/linssid/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5(+),svg] net-wireless/iw sys-auth/polkit x11-libs/libxkbcommon[X]
SLOT=0
SRC_URI=mirror://sourceforge/linssid/linssid_3.6.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=3c6c22739dd2a4068382193d9a6ae851
diff --git a/metadata/md5-cache/net-wireless/rfkill-0.5-r2 b/metadata/md5-cache/net-wireless/rfkill-0.5-r2
index 5bde8a93d6e5..ee641b16f91b 100644
--- a/metadata/md5-cache/net-wireless/rfkill-0.5-r2
+++ b/metadata/md5-cache/net-wireless/rfkill-0.5-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
EAPI=6
HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~mips ppc ppc64 x86
LICENSE=ISC
RDEPEND=!>=sys-apps/util-linux-2.31_rc1
SLOT=0
SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-0.5.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=765455e6ebf2dbe5d0b7cd8665d69c47
diff --git a/metadata/md5-cache/net-wireless/rfkill-0.5-r3 b/metadata/md5-cache/net-wireless/rfkill-0.5-r3
index a70d198c0f17..ebaac6092c84 100644
--- a/metadata/md5-cache/net-wireless/rfkill-0.5-r3
+++ b/metadata/md5-cache/net-wireless/rfkill-0.5-r3
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
EAPI=6
HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
LICENSE=ISC
RDEPEND=!>=sys-apps/util-linux-2.31_rc1
SLOT=0
SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-0.5.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fde6120399d89e8f7bf324b75ed1432b
diff --git a/metadata/md5-cache/net-wireless/rfkill-1.0 b/metadata/md5-cache/net-wireless/rfkill-1.0
index a695f4409e1a..6a40383824c4 100644
--- a/metadata/md5-cache/net-wireless/rfkill-1.0
+++ b/metadata/md5-cache/net-wireless/rfkill-1.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Tool to read and control rfkill status through /dev/rfkill
EAPI=6
HOMEPAGE=https://wireless.kernel.org/en/users/Documentation/rfkill
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
LICENSE=ISC
RDEPEND=!>=sys-apps/util-linux-2.31_rc1
SLOT=0
SRC_URI=https://www.kernel.org/pub/software/network/rfkill/rfkill-1.0.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7fc9ac9af62be4c7804f757049eb9e89
diff --git a/metadata/md5-cache/net-wireless/sigdigger-0.1.0 b/metadata/md5-cache/net-wireless/sigdigger-0.1.0
index 864e34252a6a..6d20b629a71b 100644
--- a/metadata/md5-cache/net-wireless/sigdigger-0.1.0
+++ b/metadata/md5-cache/net-wireless/sigdigger-0.1.0
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib med
DESCRIPTION=The free digital signal analyzer
EAPI=7
HOMEPAGE=https://github.com/BatchDrake/SigDigger
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libsndfile net-wireless/sigutils net-wireless/soapysdr:= net-wireless/suscan net-wireless/suwidgets sci-libs/fftw:3.0=
SLOT=0
SRC_URI=https://github.com/BatchDrake/SigDigger/archive/v0.1.0.tar.gz -> sigdigger-0.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=226e56a9511ad24f91db0af67bdd5d0f
diff --git a/metadata/md5-cache/net-wireless/suwidgets-0.1.0-r1 b/metadata/md5-cache/net-wireless/suwidgets-0.1.0-r1
index 9e473ad69d92..b0da22dd88f0 100644
--- a/metadata/md5-cache/net-wireless/suwidgets-0.1.0-r1
+++ b/metadata/md5-cache/net-wireless/suwidgets-0.1.0-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-wireless/sigutils
DESCRIPTION=graphical library containing all SigDigger's custom widgets
EAPI=7
HOMEPAGE=https://github.com/BatchDrake/SuWidgets
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-wireless/sigutils
SLOT=0
SRC_URI=https://github.com/BatchDrake/SuWidgets/archive/v0.1.0.tar.gz -> suwidgets-0.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=a050aa40a6c52306b6a669e2c77222bb
diff --git a/metadata/md5-cache/sci-astronomy/sofa_c-20170420 b/metadata/md5-cache/sci-astronomy/sofa_c-20170420
index bfc46de0b7fc..452e02d3bcee 100644
--- a/metadata/md5-cache/sci-astronomy/sofa_c-20170420
+++ b/metadata/md5-cache/sci-astronomy/sofa_c-20170420
@@ -2,10 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Library for algorithms for models in fundamental astronomy
EAPI=6
HOMEPAGE=http://www.iausofa.org/current_C.html
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=SOFA
SLOT=0
SRC_URI=http://www.iausofa.org/2017_0420_C/sofa_c-20170420.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=62cc0a9b4a1e95312a03adcc3b7a99e7
diff --git a/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1 b/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
index 82cf9a8cf217..c2e71e89683d 100644
--- a/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
+++ b/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
@@ -4,10 +4,11 @@ DEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0 media-libs/libpng:0=
DESCRIPTION=Interactive tool for astronomical ephemeris and sky simulation
EAPI=7
HOMEPAGE=https://www.clearskyinstitute.com/xephem
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=XEphem
RDEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0 media-libs/libpng:0=
SLOT=0
SRC_URI=https://www.clearskyinstitute.com/xephem/xephem-3.7.7.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=de8a43d7b90f205e988adab69831725a
diff --git a/metadata/md5-cache/sci-biology/STAR-2.5.3a b/metadata/md5-cache/sci-biology/STAR-2.5.3a
index b4a8d33404f5..33e1d8cf326e 100644
--- a/metadata/md5-cache/sci-biology/STAR-2.5.3a
+++ b/metadata/md5-cache/sci-biology/STAR-2.5.3a
@@ -3,10 +3,11 @@ DEPEND=sci-libs/htslib:= virtual/pkgconfig
DESCRIPTION=STAR aligner: align RNA-seq reads to reference genome uncompressed suffix arrays
EAPI=6
HOMEPAGE=https://github.com/alexdobin/STAR
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=GPL-3
RDEPEND=sci-libs/htslib:=
SLOT=0
SRC_URI=https://github.com/alexdobin/STAR/archive/2.5.3a.tar.gz -> STAR-2.5.3a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1eb821b9192887ab1f2ac6b1536037ac
diff --git a/metadata/md5-cache/sci-biology/augustus-2.5.5 b/metadata/md5-cache/sci-biology/augustus-2.5.5
index f7063acd431f..cc61aeccbc6c 100644
--- a/metadata/md5-cache/sci-biology/augustus-2.5.5
+++ b/metadata/md5-cache/sci-biology/augustus-2.5.5
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Eukaryotic gene predictor
EAPI=7
HOMEPAGE=http://augustus.gobics.de/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=amd64 x86
LICENSE=Artistic
SLOT=0
SRC_URI=http://augustus.gobics.de/binaries/augustus.2.5.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=80962b244c7531e320f35904727b5bd5
diff --git a/metadata/md5-cache/sci-biology/blat-34-r2 b/metadata/md5-cache/sci-biology/blat-34-r2
index 8c44a880bc4d..69d369891eaa 100644
--- a/metadata/md5-cache/sci-biology/blat-34-r2
+++ b/metadata/md5-cache/sci-biology/blat-34-r2
@@ -3,9 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=The BLAST-Like Alignment Tool, a fast genomic sequence aligner
EAPI=6
HOMEPAGE=http://www.cse.ucsc.edu/~kent/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=blat
SLOT=0
SRC_URI=http://www.soe.ucsc.edu/~kent/src/blatSrc34.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cfc86b588e33e0935a06563d2a9c19c0
diff --git a/metadata/md5-cache/sci-biology/bowtie-2.2.9 b/metadata/md5-cache/sci-biology/bowtie-2.2.9
index 710cd205096e..fc2392772e79 100644
--- a/metadata/md5-cache/sci-biology/bowtie-2.2.9
+++ b/metadata/md5-cache/sci-biology/bowtie-2.2.9
@@ -3,11 +3,12 @@ DEPEND=dev-lang/perl tbb? ( dev-cpp/tbb ) app-arch/unzip
DESCRIPTION=Popular short read aligner for Next-generation sequencing data
EAPI=6
HOMEPAGE=http://bowtie-bio.sourceforge.net/bowtie2/
+INHERIT=toolchain-funcs
IUSE=examples cpu_flags_x86_sse2 +tbb
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-lang/perl tbb? ( dev-cpp/tbb )
SLOT=2
SRC_URI=mirror://sourceforge/project/bowtie-bio/bowtie2/2.2.9/bowtie2-2.2.9-source.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=46d87c867cd445707dc1913cf3dd7eb6
diff --git a/metadata/md5-cache/sci-biology/bwa-0.7.17 b/metadata/md5-cache/sci-biology/bwa-0.7.17
index efed985dd5a6..970ee11780fa 100644
--- a/metadata/md5-cache/sci-biology/bwa-0.7.17
+++ b/metadata/md5-cache/sci-biology/bwa-0.7.17
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib
DESCRIPTION=Burrows-Wheeler Alignment Tool, a fast short genomic sequence aligner
EAPI=7
HOMEPAGE=https://github.com/lh3/bwa/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~x64-macos
LICENSE=GPL-3
RDEPEND=sys-libs/zlib dev-lang/perl
SLOT=0
SRC_URI=https://github.com/lh3/bwa/archive/v0.7.17.tar.gz -> bwa-0.7.17.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=620c3569e8293303737f7844385c7e82
diff --git a/metadata/md5-cache/sci-biology/clustalw-1.83-r4 b/metadata/md5-cache/sci-biology/clustalw-1.83-r4
index eac082027f02..96c55d445756 100644
--- a/metadata/md5-cache/sci-biology/clustalw-1.83-r4
+++ b/metadata/md5-cache/sci-biology/clustalw-1.83-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=General purpose multiple alignment program for DNA and proteins
EAPI=6
HOMEPAGE=http://www.embl-heidelberg.de/~seqanal/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=clustalw
SLOT=1
SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/unix/clustalw/clustalw1.83.UNIX.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0f69889feff7a8cb3002ae5d4ea053d3
diff --git a/metadata/md5-cache/sci-biology/clustalw-mpi-0.13-r3 b/metadata/md5-cache/sci-biology/clustalw-mpi-0.13-r3
index ca203ca8ca38..9c3f98b66a65 100644
--- a/metadata/md5-cache/sci-biology/clustalw-mpi-0.13-r3
+++ b/metadata/md5-cache/sci-biology/clustalw-mpi-0.13-r3
@@ -3,11 +3,12 @@ DEPEND=virtual/mpi
DESCRIPTION=An MPI implemention of the ClustalW general purpose multiple alignment algorithm
EAPI=7
HOMEPAGE=http://www.bii.a-star.edu.sg/achievements/applications/clustalw/index.php
+INHERIT=toolchain-funcs
IUSE=mpi-njtree static-pairalign
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
RDEPEND=virtual/mpi
SLOT=0
SRC_URI=http://web.bii.a-star.edu.sg/~kuobin/clustalw-mpi/clustalw-mpi-0.13.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=689841db0e3b7d6629b51049a2942165
diff --git a/metadata/md5-cache/sci-biology/clustalx-2.1-r3 b/metadata/md5-cache/sci-biology/clustalx-2.1-r3
index 69d6099f2ab4..94d29272d6ec 100644
--- a/metadata/md5-cache/sci-biology/clustalx-2.1-r3
+++ b/metadata/md5-cache/sci-biology/clustalx-2.1-r3
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
DESCRIPTION=Graphical interface for the ClustalW multiple alignment program
EAPI=7
HOMEPAGE=https://www.ebi.ac.uk/Tools/msa/clustalw2/
+INHERIT=desktop qmake-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3 LGPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sci-biology/clustalw-2.1
SLOT=0
SRC_URI=http://www.clustal.org/download/current/clustalx-2.1.tar.gz https://dev.gentoo.org/~jlec/distfiles/clustalx.png.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=3f60f1952758458fc3cd4e2789a942f5
diff --git a/metadata/md5-cache/sci-biology/dialign-tx-1.0.2-r2 b/metadata/md5-cache/sci-biology/dialign-tx-1.0.2-r2
index c13b4d403024..15a53ae77140 100644
--- a/metadata/md5-cache/sci-biology/dialign-tx-1.0.2-r2
+++ b/metadata/md5-cache/sci-biology/dialign-tx-1.0.2-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install postinst
DESCRIPTION=Greedy and progressive approaches for segment-based multiple sequence alignment
EAPI=7
HOMEPAGE=http://dialign-tx.gobics.de/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://dialign-tx.gobics.de/DIALIGN-TX_1.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b2a78c4cfa60eb348ae63d076ecb5fba
diff --git a/metadata/md5-cache/sci-biology/elph-1.0.1-r1 b/metadata/md5-cache/sci-biology/elph-1.0.1-r1
index c139a666abcd..529057aa6bf9 100644
--- a/metadata/md5-cache/sci-biology/elph-1.0.1-r1
+++ b/metadata/md5-cache/sci-biology/elph-1.0.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Estimated Locations of Pattern Hits - Motif finder program
EAPI=6
HOMEPAGE=http://cbcb.umd.edu/software/ELPH/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=Artistic
SLOT=0
SRC_URI=ftp://ftp.cbcb.umd.edu/pub/software/elph/ELPH-1.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dbee2f511488caf9eadadb20d043a2da
diff --git a/metadata/md5-cache/sci-biology/fasta-36.3.5e b/metadata/md5-cache/sci-biology/fasta-36.3.5e
index 17405335a10b..9807649e6aa3 100644
--- a/metadata/md5-cache/sci-biology/fasta-36.3.5e
+++ b/metadata/md5-cache/sci-biology/fasta-36.3.5e
@@ -10,5 +10,5 @@ LICENSE=fasta
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://faculty.virginia.edu/wrpearson/fasta/fasta36/fasta-36.3.5e.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
_md5_=43c2cf221a4fd397bebdbe11749a1707
diff --git a/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3 b/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
index 95de424d961e..75f7ff38f513 100644
--- a/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
+++ b/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=Graphical viewer for chromatogram files
EAPI=7
HOMEPAGE=http://www.geospiza.com/finchtv/
+INHERIT=desktop
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=finchtv
SLOT=0
diff --git a/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1 b/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
index a6d00e6001d0..e43ea67d50fa 100644
--- a/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
+++ b/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=A eukaryotic gene finding system from TIGR
EAPI=7
HOMEPAGE=http://www.cbcb.umd.edu/software/GlimmerHMM/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=Artistic
SLOT=0
SRC_URI=ftp://ftp.cbcb.umd.edu/pub/software/glimmerhmm/GlimmerHMM-3.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9fc33629a982f35b93c18da772894fdd
diff --git a/metadata/md5-cache/sci-biology/infernal-1.0.2-r1 b/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
index c0fe4539d8cd..12dc394a8950 100644
--- a/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
+++ b/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
@@ -3,11 +3,12 @@ DEPEND=mpi? ( virtual/mpi )
DESCRIPTION=Inference of RNA alignments
EAPI=7
HOMEPAGE=http://infernal.janelia.org/
+INHERIT=toolchain-funcs
IUSE=mpi
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=mpi? ( virtual/mpi )
SLOT=0
SRC_URI=ftp://selab.janelia.org/pub/software/infernal/infernal-1.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a3b1f788e8f5b38e41b3a9e38f91fe88
diff --git a/metadata/md5-cache/sci-biology/kalign-2.03-r2 b/metadata/md5-cache/sci-biology/kalign-2.03-r2
index 32b37e0d1227..0e87425693f5 100644
--- a/metadata/md5-cache/sci-biology/kalign-2.03-r2
+++ b/metadata/md5-cache/sci-biology/kalign-2.03-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Global and progressive multiple sequence alignment
EAPI=6
HOMEPAGE=http://msa.cgb.ki.se/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/k/kalign/kalign_2.03.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=175d26382226c7bed2b44be485b01d01
diff --git a/metadata/md5-cache/sci-biology/lagan-2.0-r4 b/metadata/md5-cache/sci-biology/lagan-2.0-r4
index f1ef727b0cbf..d5e3260d9911 100644
--- a/metadata/md5-cache/sci-biology/lagan-2.0-r4
+++ b/metadata/md5-cache/sci-biology/lagan-2.0-r4
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=The LAGAN suite of tools for whole-genome multiple alignment of genomic DNA
EAPI=7
HOMEPAGE=http://lagan.stanford.edu/lagan_web/index.shtml
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://lagan.stanford.edu/lagan_web/lagan20.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c4b4e347541c85d423cac28e03a104d4
diff --git a/metadata/md5-cache/sci-biology/muscle-3.8.31 b/metadata/md5-cache/sci-biology/muscle-3.8.31
index 9a397fa84e78..4e86b4781da9 100644
--- a/metadata/md5-cache/sci-biology/muscle-3.8.31
+++ b/metadata/md5-cache/sci-biology/muscle-3.8.31
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Multiple sequence comparison by log-expectation
EAPI=7
HOMEPAGE=http://www.drive5.com/muscle/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=public-domain
RDEPEND=!sci-libs/libmuscle
SLOT=0
SRC_URI=http://www.drive5.com/muscle/downloads3.8.31/muscle3.8.31_src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=53bf57f6526fd17fc747a39406e13cef
diff --git a/metadata/md5-cache/sci-biology/njplot-2.3-r2 b/metadata/md5-cache/sci-biology/njplot-2.3-r2
index 07aa5c84cada..e5bb87908476 100644
--- a/metadata/md5-cache/sci-biology/njplot-2.3-r2
+++ b/metadata/md5-cache/sci-biology/njplot-2.3-r2
@@ -3,10 +3,11 @@ DEPEND=sci-biology/ncbi-tools[X,static-libs] x11-libs/libXmu
DESCRIPTION=A phylogenetic tree drawing program which supports tree rooting
EAPI=6
HOMEPAGE=http://pbil.univ-lyon1.fr/software/njplot.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
RDEPEND=sci-biology/ncbi-tools[X,static-libs] x11-libs/libXmu
SLOT=0
SRC_URI=ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/archive/njplot-2.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c70b49c7f5e1a92f5169df372f9638c6
diff --git a/metadata/md5-cache/sci-biology/pals-1.0-r1 b/metadata/md5-cache/sci-biology/pals-1.0-r1
index 3981fa0451f4..7fe6d75b3ac6 100644
--- a/metadata/md5-cache/sci-biology/pals-1.0-r1
+++ b/metadata/md5-cache/sci-biology/pals-1.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Pairwise Aligner for Long Sequences
EAPI=6
HOMEPAGE=http://www.drive5.com/pals/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://www.drive5.com/pals/pals_source.tar.gz -> pals-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b0df20d47905df6a290c5fe2f79fd48b
diff --git a/metadata/md5-cache/sci-biology/paml-4.9j b/metadata/md5-cache/sci-biology/paml-4.9j
index 17c1456fe89d..76571f576532 100644
--- a/metadata/md5-cache/sci-biology/paml-4.9j
+++ b/metadata/md5-cache/sci-biology/paml-4.9j
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Phylogenetic Analysis by Maximum Likelihood
EAPI=7
HOMEPAGE=http://abacus.gene.ucl.ac.uk/software/paml.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=free-noncomm
SLOT=0
SRC_URI=http://abacus.gene.ucl.ac.uk/software/paml4.9j.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=236ce838eff8e04f8059e18110b3ff38
diff --git a/metadata/md5-cache/sci-biology/phrap-1.080812-r2 b/metadata/md5-cache/sci-biology/phrap-1.080812-r2
index 4b6bda5363cb..0423bf9da289 100644
--- a/metadata/md5-cache/sci-biology/phrap-1.080812-r2
+++ b/metadata/md5-cache/sci-biology/phrap-1.080812-r2
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install nofetch
DESCRIPTION=Shotgun assembly and alignment utilities
EAPI=6
HOMEPAGE=http://www.phrap.org/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=phrap
RDEPEND=dev-lang/perl dev-perl/Tk
RESTRICT=fetch
SLOT=0
SRC_URI=phrap-1.080812-distrib.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8f5aa73e6a49ffbd5804d4ddea05b2b8
diff --git a/metadata/md5-cache/sci-biology/phred-071220-r1 b/metadata/md5-cache/sci-biology/phred-071220-r1
index d0485e1c6867..a4271395e1a3 100644
--- a/metadata/md5-cache/sci-biology/phred-071220-r1
+++ b/metadata/md5-cache/sci-biology/phred-071220-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install nofetch
DESCRIPTION=A base caller for Sanger DNA sequencing
EAPI=6
HOMEPAGE=http://phrap.org/phredphrapconsed.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=phrap
RESTRICT=fetch
SLOT=0
SRC_URI=phred-dist-071220.b-acd.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6cb07f602eee34da61fd893818f30936
diff --git a/metadata/md5-cache/sci-biology/phyml-2.4.5-r3 b/metadata/md5-cache/sci-biology/phyml-2.4.5-r3
index 50e19815c1c4..70fe0e2f652e 100644
--- a/metadata/md5-cache/sci-biology/phyml-2.4.5-r3
+++ b/metadata/md5-cache/sci-biology/phyml-2.4.5-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Estimation of large phylogenies by maximum likelihood
EAPI=6
HOMEPAGE=http://atgc.lirmm.fr/phyml/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.lirmm.fr/~guindon/phyml_v2.4.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fcca6fb4f9e88f5eb6a63a3ee0c79df7
diff --git a/metadata/md5-cache/sci-biology/piler-1.0-r1 b/metadata/md5-cache/sci-biology/piler-1.0-r1
index 4cc7564e35a7..63b7d760cd6e 100644
--- a/metadata/md5-cache/sci-biology/piler-1.0-r1
+++ b/metadata/md5-cache/sci-biology/piler-1.0-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Analysis of repetitive DNA found in genome sequences
EAPI=6
HOMEPAGE=http://www.drive5.com/piler/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
RDEPEND=|| ( sci-biology/muscle sci-libs/libmuscle ) sci-biology/pals
SLOT=0
SRC_URI=http://www.drive5.com/piler/piler_source.tar.gz -> piler-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7b5a6d618aac08240cf165a04509c319
diff --git a/metadata/md5-cache/sci-biology/pilercr-1.0-r1 b/metadata/md5-cache/sci-biology/pilercr-1.0-r1
index 3545d7d2e0a0..df5d60265bc9 100644
--- a/metadata/md5-cache/sci-biology/pilercr-1.0-r1
+++ b/metadata/md5-cache/sci-biology/pilercr-1.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Analysis of Clustered Regularly Interspaced Short Palindromic Repeats (CRISPRs)
EAPI=6
HOMEPAGE=http://www.drive5.com/pilercr/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://www.drive5.com/pilercr/pilercr1.06.tar.gz -> pilercr-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d9f7901d3776c424cfb93782cc6ddafa
diff --git a/metadata/md5-cache/sci-biology/poa-2-r1 b/metadata/md5-cache/sci-biology/poa-2-r1
index 61c5f70b6ffa..8c7402347b71 100644
--- a/metadata/md5-cache/sci-biology/poa-2-r1
+++ b/metadata/md5-cache/sci-biology/poa-2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install postinst
DESCRIPTION=Fast multiple sequence alignments using partial-order graphs
EAPI=7
HOMEPAGE=http://bioinfo.mbi.ucla.edu/poa/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/poamsa/poaV2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d7bb9c94a05320cd21ff72a8beb56406
diff --git a/metadata/md5-cache/sci-biology/prank-140603 b/metadata/md5-cache/sci-biology/prank-140603
index c82f021bc346..d8e367833156 100644
--- a/metadata/md5-cache/sci-biology/prank-140603
+++ b/metadata/md5-cache/sci-biology/prank-140603
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Probabilistic Alignment Kit
EAPI=6
HOMEPAGE=http://wasabiapp.org/software/prank/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://wasabiapp.org/download/prank/prank.source.140603.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=17023476000980284365a9c0ed04a6f0
diff --git a/metadata/md5-cache/sci-biology/primer3-2.3.7 b/metadata/md5-cache/sci-biology/primer3-2.3.7
index 7caaf44deb56..e2f44054ba6e 100644
--- a/metadata/md5-cache/sci-biology/primer3-2.3.7
+++ b/metadata/md5-cache/sci-biology/primer3-2.3.7
@@ -3,9 +3,10 @@ DEPEND=dev-lang/perl
DESCRIPTION=Primer Design for PCR reactions
EAPI=6
HOMEPAGE=http://primer3.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/project/primer3/primer3/2.3.7/primer3-2.3.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e79ee4774138e651c83467c2b2cb2926
diff --git a/metadata/md5-cache/sci-biology/prodigal-2.6.3 b/metadata/md5-cache/sci-biology/prodigal-2.6.3
index f92adc723923..a8b5b09a7f4b 100644
--- a/metadata/md5-cache/sci-biology/prodigal-2.6.3
+++ b/metadata/md5-cache/sci-biology/prodigal-2.6.3
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure
DESCRIPTION=Prokaryotic Dynamic Programming Genefinding Algorithm
EAPI=6
HOMEPAGE=http://prodigal.ornl.gov/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=GPL-3
SLOT=0
SRC_URI=https://github.com/hyattpd/Prodigal/archive/v2.6.3.tar.gz -> prodigal-2.6.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9cea3bcc55e864076d7e4b542f657f96
diff --git a/metadata/md5-cache/sci-biology/qrna-2.0.3c-r3 b/metadata/md5-cache/sci-biology/qrna-2.0.3c-r3
index 2f019984bb9f..a9bd55e8d4e5 100644
--- a/metadata/md5-cache/sci-biology/qrna-2.0.3c-r3
+++ b/metadata/md5-cache/sci-biology/qrna-2.0.3c-r3
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl sci-biology/hmmer:2
DESCRIPTION=Prototype ncRNA genefinder
EAPI=7
HOMEPAGE=http://selab.janelia.org/software.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl sci-biology/hmmer:2
SLOT=0
SRC_URI=mirror://gentoo/qrna-2.0.3c.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fdc52d5355060d858ec78d793dc26d81
diff --git a/metadata/md5-cache/sci-biology/recon-1.08 b/metadata/md5-cache/sci-biology/recon-1.08
index b83110761eae..342306f77827 100644
--- a/metadata/md5-cache/sci-biology/recon-1.08
+++ b/metadata/md5-cache/sci-biology/recon-1.08
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Automated de novo identification of repeat families from genomic sequences
EAPI=6
HOMEPAGE=http://www.repeatmasker.org/RepeatModeler.html
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://www.repeatmasker.org/RECON-1.08.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2ddd537d912c7c88b6f0b0d203a51613
diff --git a/metadata/md5-cache/sci-biology/rnaview-20040713-r4 b/metadata/md5-cache/sci-biology/rnaview-20040713-r4
index 8bc9529db2b1..2f6749c3b6de 100644
--- a/metadata/md5-cache/sci-biology/rnaview-20040713-r4
+++ b/metadata/md5-cache/sci-biology/rnaview-20040713-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Generates 2D displays of RNA/DNA secondary structures with tertiary interactions
EAPI=6
HOMEPAGE=http://ndbserver.rutgers.edu/services/download/index.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://gentoo/rnaview-20040713.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=788c156d45287bef4f6aa876055bde4c
diff --git a/metadata/md5-cache/sci-biology/samtools-0.1.20-r4 b/metadata/md5-cache/sci-biology/samtools-0.1.20-r4
index b4d2aa14c4f8..cb4e290ea18b 100644
--- a/metadata/md5-cache/sci-biology/samtools-0.1.20-r4
+++ b/metadata/md5-cache/sci-biology/samtools-0.1.20-r4
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=sys-libs/ncurses:0= dev-lang/perl
SLOT=0.1-legacy
SRC_URI=https://github.com/samtools/samtools/archive/0.1.20.tar.gz -> samtools-0.1.20.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=89941c8b8d527ccc386063a3f533ef77
diff --git a/metadata/md5-cache/sci-biology/seaview-4.6-r1 b/metadata/md5-cache/sci-biology/seaview-4.6-r1
index 0be96964f72b..6e1c97b04cdc 100644
--- a/metadata/md5-cache/sci-biology/seaview-4.6-r1
+++ b/metadata/md5-cache/sci-biology/seaview-4.6-r1
@@ -4,11 +4,12 @@ DEPEND=sci-biology/clustalw:2 sci-biology/phyml || ( sci-libs/libmuscle sci-biol
DESCRIPTION=A graphical multiple sequence alignment editor
EAPI=7
HOMEPAGE=http://pbil.univ-lyon1.fr/software/seaview.html
+INHERIT=desktop toolchain-funcs
IUSE=+xft
KEYWORDS=~amd64 ~x86
LICENSE=public-domain
RDEPEND=sci-biology/clustalw:2 sci-biology/phyml || ( sci-libs/libmuscle sci-biology/muscle ) sys-libs/zlib x11-libs/fltk:1[xft?] x11-libs/libX11 xft? ( x11-libs/libXft )
SLOT=0
SRC_URI=ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_4.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a742711d8523a4e49524662c12d647c2
diff --git a/metadata/md5-cache/sci-biology/sim4-20030921-r2 b/metadata/md5-cache/sci-biology/sim4-20030921-r2
index 11f1c1e6627d..4c361fcc0687 100644
--- a/metadata/md5-cache/sci-biology/sim4-20030921-r2
+++ b/metadata/md5-cache/sci-biology/sim4-20030921-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=A program to align cDNA and genomic DNA
EAPI=7
HOMEPAGE=http://globin.cse.psu.edu/html/docs/sim4.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/sim4-20030921.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d9ac88a2e3ccc00187d880fcca7f5db2
diff --git a/metadata/md5-cache/sci-biology/t-coffee-11.00-r2 b/metadata/md5-cache/sci-biology/t-coffee-11.00-r2
index d2f64adbc608..3ca609c0acac 100644
--- a/metadata/md5-cache/sci-biology/t-coffee-11.00-r2
+++ b/metadata/md5-cache/sci-biology/t-coffee-11.00-r2
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A multiple sequence alignment package
EAPI=6
HOMEPAGE=http://www.tcoffee.org/Projects_home_page/t_coffee_home_page.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=sci-biology/clustalw sci-chemistry/tm-align
SLOT=0
SRC_URI=http://www.tcoffee.org/Packages/Beta/Latest/T-COFFEE_distribution_Version_11.00.4466924.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5c54b109c5b8bef93adbc5f99ddd7114
diff --git a/metadata/md5-cache/sci-biology/tree-puzzle-5.2 b/metadata/md5-cache/sci-biology/tree-puzzle-5.2
index 4c5d98d5793b..7ee0613cf182 100644
--- a/metadata/md5-cache/sci-biology/tree-puzzle-5.2
+++ b/metadata/md5-cache/sci-biology/tree-puzzle-5.2
@@ -3,6 +3,7 @@ DEPEND=mpi? ( virtual/mpi )
DESCRIPTION=Maximum likelihood analysis for nucleotide, amino acid, and two-state data
EAPI=7
HOMEPAGE=http://www.tree-puzzle.de
+INHERIT=toolchain-funcs
IUSE=mpi
KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=mpi? ( virtual/mpi )
RESTRICT=test
SLOT=0
SRC_URI=http://www.tree-puzzle.de/tree-puzzle-5.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8bd164fc83c9bb1d9a2e9559a47ff526
diff --git a/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2 b/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
index 38216481158c..064907447b62 100644
--- a/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
+++ b/metadata/md5-cache/sci-biology/wgs-assembler-7.0-r2
@@ -3,10 +3,11 @@ DEPEND=net-libs/libtirpc x11-libs/libXt !x11-terms/terminator
DESCRIPTION=The Celera de novo whole-genome shotgun DNA sequence assembler, aka CABOG
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/wgs-assembler/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=net-libs/libtirpc x11-libs/libXt !x11-terms/terminator app-shells/tcsh dev-perl/Log-Log4perl
SLOT=0
SRC_URI=mirror://sourceforge/wgs-assembler/wgs-7.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8de6fdef210cdf37e56e086c61983865
diff --git a/metadata/md5-cache/sci-calculators/pcalc-4 b/metadata/md5-cache/sci-calculators/pcalc-4
index 748818b394ff..bb5ef23a81cb 100644
--- a/metadata/md5-cache/sci-calculators/pcalc-4
+++ b/metadata/md5-cache/sci-calculators/pcalc-4
@@ -3,9 +3,10 @@ DEPEND=sys-devel/flex
DESCRIPTION=the programmers calculator
EAPI=6
HOMEPAGE=https://github.com/vapier/pcalc
+INHERIT=toolchain-funcs
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/pcalc/pcalc-4.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=718e8d3a320601f7de7da784f1f50ba4
diff --git a/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r1 b/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r1
index 0b9e8bb854bf..2960d5ab6639 100644
--- a/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r1
+++ b/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/boost:=[threads]
DESCRIPTION=The protein secondary structure standard
EAPI=6
HOMEPAGE=http://swift.cmbi.ru.nl/gv/dssp/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=Boost-1.0
RDEPEND=dev-libs/boost:=[threads]
SLOT=0
SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/dssp-2.2.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8926af5031d675f7830e47a5da91b75a
diff --git a/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2 b/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
index 7bd21384c39f..8b8d21b7f3b1 100644
--- a/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
+++ b/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/xforms
DESCRIPTION=periodic table of the elements
EAPI=6
HOMEPAGE=http://elem.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/xforms
SLOT=0
SRC_URI=mirror://sourceforge/elem/elem-src-1.0.3-Linux.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3d04f4bb12447f29a2873239829212ee
diff --git a/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3 b/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
index 05acb289dff7..e3f6c5a692e5 100644
--- a/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
+++ b/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0 x11-libs/gtk+:2 x11-libs/cairo[X]
DESCRIPTION=Periodic table application for Linux
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/gperiodic/
+INHERIT=toolchain-funcs xdg-utils
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0 x11-libs/gtk+:2 x11-libs/cairo[X]
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/gperiodic/gperiodic-3.0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=3ec44bc3c99d753abd9dd38b88349c90
diff --git a/metadata/md5-cache/sci-chemistry/ksdssp-040728-r1 b/metadata/md5-cache/sci-chemistry/ksdssp-040728-r1
index 1a84483c784a..eb95a3694348 100644
--- a/metadata/md5-cache/sci-chemistry/ksdssp-040728-r1
+++ b/metadata/md5-cache/sci-chemistry/ksdssp-040728-r1
@@ -4,10 +4,11 @@ DEPEND=sci-libs/libpdb++
DESCRIPTION=An open source implementation of sci-chemistry/dssp
EAPI=7
HOMEPAGE=http://www.cgl.ucsf.edu/Overview/software.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=sci-libs/libpdb++
SLOT=0
SRC_URI=mirror://gentoo/ksdssp-040728.shar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d9484bfa46cce35d2317ffe1b0a890a9
diff --git a/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2 b/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
index dd3017beaa87..24d4029cac26 100644
--- a/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
+++ b/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=Molecular dynamics simulations platform
EAPI=7
HOMEPAGE=http://www.ccp5.ac.uk/moldy/moldy.html
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.earth.ox.ac.uk/pub/keith/moldy-2.16e.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f50dfe7ac4461c3972cef37ca176f922
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
index 725ed540a389..c6ac02a6d48c 100644
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
+++ b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
@@ -3,10 +3,11 @@ DEPEND=|| ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/mesa[motif,X(+)
DESCRIPTION=Publication-quality molecular visualization package
EAPI=7
HOMEPAGE=http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html http://pjf.net/science/molmol.html
+INHERIT=desktop prefix toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=molmol
RDEPEND=|| ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/mesa[motif,X(+)] ) media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
SLOT=0
SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2 https://dev.gentoo.org/~pacho/molmol/molmol.png
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7d8a4c625c1b9bdc28452405ff187cb7
diff --git a/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1 b/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
index 23aa9e7fe558..d05570087851 100644
--- a/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
+++ b/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libX11 X? ( >=x1
DESCRIPTION=Prepares molecular kinemages from PDB-format coordinate files
EAPI=6
HOMEPAGE=http://kinemage.biochem.duke.edu/software/prekin.php
+INHERIT=toolchain-funcs
IUSE=X
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=richardson
RDEPEND=x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libX11 X? ( >=x11-libs/motif-2.3:0= )
SLOT=0
SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/prekin/prekin.6.51.081122.src.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f9ebfd63a2e82c2f066b1d7467a37c45
diff --git a/metadata/md5-cache/sci-chemistry/probe-2.13.110909 b/metadata/md5-cache/sci-chemistry/probe-2.13.110909
index 4f96d0ad2ace..501cb6cedb82 100644
--- a/metadata/md5-cache/sci-chemistry/probe-2.13.110909
+++ b/metadata/md5-cache/sci-chemistry/probe-2.13.110909
@@ -3,9 +3,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Evaluates atomic packing within or between molecules
EAPI=7
HOMEPAGE=http://kinemage.biochem.duke.edu/software/probe.php
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=richardson
SLOT=0
SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/probe/probe.2.13.110909.src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0e1d9712f7bb5dcfd1adb9051b881d44
diff --git a/metadata/md5-cache/sci-chemistry/suitename-0.3.070628 b/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
index 70167fa8c16e..cc5c1dc61ce5 100644
--- a/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
+++ b/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=The ROC RNA Ontology nomenclature and conformer-list development
EAPI=7
HOMEPAGE=http://kinemage.biochem.duke.edu/software/suitename.php
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=richardson
SLOT=0
SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/suitename/suitename.0.3.070628.src.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=33cf8423353d46b4e660655c6d0743c1
diff --git a/metadata/md5-cache/sci-chemistry/surf-1.0 b/metadata/md5-cache/sci-chemistry/surf-1.0
index 09ecf9ca5f68..0da7ef073e36 100644
--- a/metadata/md5-cache/sci-chemistry/surf-1.0
+++ b/metadata/md5-cache/sci-chemistry/surf-1.0
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Solvent accesible Surface calculator
EAPI=7
HOMEPAGE=http://www.ks.uiuc.edu/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=SURF
RDEPEND=!www-client/surf
SLOT=0
SRC_URI=http://www.ks.uiuc.edu/Research/vmd/extsrcs/surf.tar.Z -> surf-1.0.tar.Z
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6792fb81e0a549773b6d73e1ca6fe94c
diff --git a/metadata/md5-cache/sci-chemistry/threeV-1.2-r1 b/metadata/md5-cache/sci-chemistry/threeV-1.2-r1
index 9cd37b7453bc..2728d9e90fca 100644
--- a/metadata/md5-cache/sci-chemistry/threeV-1.2-r1
+++ b/metadata/md5-cache/sci-chemistry/threeV-1.2-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=3V: Voss Volume Voxelator
EAPI=6
HOMEPAGE=http://geometry.molmovdb.org/3v/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
PDEPEND=sci-chemistry/msms-bin
SLOT=0
SRC_URI=http://geometry.molmovdb.org/3v/3v-1.2.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5ca6079a9193f10a01a27b188fadd411
diff --git a/metadata/md5-cache/sci-chemistry/xyza2pipe-20121001 b/metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
index e72fa9271ec8..a3adba568a5f 100644
--- a/metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
+++ b/metadata/md5-cache/sci-chemistry/xyza2pipe-20121001
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Cross conversion environment of NMR spectra
EAPI=6
HOMEPAGE=http://fermi.pharm.hokudai.ac.jp/olivia/api/index.php/Xyza2pipe_src
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=olivia
SLOT=0
SRC_URI=http://fermi.pharm.hokudai.ac.jp/olivia/documents/xyza2pipe.tgz -> xyza2pipe-20121001.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d056cc95701850434eb72d01e71d2ea5
diff --git a/metadata/md5-cache/sci-electronics/fasthenry-3.0.20.07.17 b/metadata/md5-cache/sci-electronics/fasthenry-3.0.20.07.17
index 055ddc0ab052..fc90e1bf8530 100644
--- a/metadata/md5-cache/sci-electronics/fasthenry-3.0.20.07.17
+++ b/metadata/md5-cache/sci-electronics/fasthenry-3.0.20.07.17
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Three dimensional inductance computation program, Whiteley Research version
EAPI=7
HOMEPAGE=http://www.wrcad.com/freestuff.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=all-rights-reserved
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://www.wrcad.com/ftp/pub/fasthenry-3.0wr-071720.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0411815cfdee784b93b8ea9cea00637a
diff --git a/metadata/md5-cache/sci-electronics/fritzing-0.9.4-r2 b/metadata/md5-cache/sci-electronics/fritzing-0.9.4-r2
index 457901acf389..31ea99d8d378 100644
--- a/metadata/md5-cache/sci-electronics/fritzing-0.9.4-r2
+++ b/metadata/md5-cache/sci-electronics/fritzing-0.9.4-r2
@@ -3,10 +3,11 @@ DEPEND=dev-libs/quazip:0= dev-libs/libgit2:= dev-qt/qtconcurrent:5 dev-qt/qtcore
DESCRIPTION=Electronic Design Automation
EAPI=7
HOMEPAGE=https://fritzing.org/ https://github.com/fritzing/fritzing-app/
+INHERIT=qmake-utils xdg
KEYWORDS=~amd64 ~x86
LICENSE=CC-BY-SA-3.0 GPL-3+
RDEPEND=dev-libs/quazip:0= dev-libs/libgit2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
SLOT=0
SRC_URI=https://github.com/fritzing/fritzing-app/archive/CD-498.tar.gz -> fritzing-0.9.4.tar.gz https://github.com/fritzing/fritzing-parts/archive/e79a69765026f3fda8aab1b3e7a4952c28047a62.tar.gz -> fritzing-parts-0.9.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=d4f354326a7d6c47fa8d336b8325a373
diff --git a/metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124 b/metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
index 17f4eeac1984..e9387ca3ed96 100644
--- a/metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
+++ b/metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/tcl-8.6:0 sci-electronics/geda dev-db/datadraw
DESCRIPTION=A GNU Netlist Manipulation Library
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/gnetman/
+INHERIT=toolchain-funcs
IUSE=doc examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/tcl-8.6:0 sci-electronics/geda
SLOT=0
SRC_URI=mirror://gentoo/gnetman-0.0.1_pre20110124.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3bc4943b41ceefd4b153bbe198785bf3
diff --git a/metadata/md5-cache/sci-electronics/gtkwave-3.3.106 b/metadata/md5-cache/sci-electronics/gtkwave-3.3.106
index 3d8cd013a8f1..d2a8f0633f44 100644
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.106
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.106
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango judy? ( dev-
DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
EAPI=7
HOMEPAGE=http://gtkwave.sourceforge.net/
+INHERIT=toolchain-funcs xdg
IUSE=doc examples fasttree fatlines judy lzma packed tcl
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 MIT
RDEPEND=dev-libs/glib:2 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils )
SLOT=0
SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.106.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=b07c4d85a94cbfe00b1c1a5ba1f76030
diff --git a/metadata/md5-cache/sci-electronics/librepcb-0.1.3 b/metadata/md5-cache/sci-electronics/librepcb-0.1.3
index c5610d141129..7207262b5788 100644
--- a/metadata/md5-cache/sci-electronics/librepcb-0.1.3
+++ b/metadata/md5-cache/sci-electronics/librepcb-0.1.3
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[s
DESCRIPTION=Free EDA software to develop printed circuit boards
EAPI=7
HOMEPAGE=https://librepcb.org/
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib
SLOT=0
SRC_URI=https://download.librepcb.org/releases/0.1.3/librepcb-0.1.3-source.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=4c49874bc4f3bc53e6b0d638bdb1c599
diff --git a/metadata/md5-cache/sci-electronics/magic-8.0.207 b/metadata/md5-cache/sci-electronics/magic-8.0.207
index 986469f8b557..4c56f8de7d41 100644
--- a/metadata/md5-cache/sci-electronics/magic-8.0.207
+++ b/metadata/md5-cache/sci-electronics/magic-8.0.207
@@ -10,5 +10,5 @@ LICENSE=HPND GPL-2+
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/glu virtual/opengl )
SLOT=0
SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.0.207.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
_md5_=79e800875e858ba562b23dd2ed38c109
diff --git a/metadata/md5-cache/sci-electronics/voacapl-0.7.6 b/metadata/md5-cache/sci-electronics/voacapl-0.7.6
index c320614be479..2cee30c25a0e 100644
--- a/metadata/md5-cache/sci-electronics/voacapl-0.7.6
+++ b/metadata/md5-cache/sci-electronics/voacapl-0.7.6
@@ -3,11 +3,12 @@ DEPEND=virtual/fortran
DESCRIPTION=HF propagation prediction tool
EAPI=7
HOMEPAGE=https://www.qsl.net/hz1jw/voacapl/index.html
+INHERIT=fortran-2
KEYWORDS=amd64 x86
LICENSE=all-rights-reserved
RDEPEND=virtual/fortran
RESTRICT=mirror bindist
SLOT=0
SRC_URI=https://github.com/jawatson/voacapl/archive/v.0.7.6.tar.gz -> voacapl-0.7.6.tar.gz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=0f72766c5b5aea46076386c09b0fd465
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-4.1.1 b/metadata/md5-cache/sci-electronics/xnec2c-4.1.1
index 5f5dfa97a33e..f60e7e5cebb3 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-4.1.1
+++ b/metadata/md5-cache/sci-electronics/xnec2c-4.1.1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 sys-devel/gettext
DESCRIPTION=A GTK+ graphical interactive version of nec2c
EAPI=7
HOMEPAGE=https://www.qsl.net/5b4az/pages/nec2.html
+INHERIT=xdg-utils
IUSE=doc examples
KEYWORDS=amd64 x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-8.1 b/metadata/md5-cache/sci-geosciences/gpxsee-8.1
index 452cd8484944..378d651bdce3 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-8.1
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-8.1
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport
DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
EAPI=7
HOMEPAGE=https://www.gpxsee.org/
+INHERIT=desktop qmake-utils l10n xdg
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5
SLOT=0
SRC_URI=https://github.com/tumic0/GPXSee/archive/8.1.tar.gz -> gpxsee-8.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 l10n 8cdd85e169b835d518bc2fd59f780d8e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=9517cd5e14fd440a061ab6f5630166cd
diff --git a/metadata/md5-cache/sci-geosciences/gshhs-1.13 b/metadata/md5-cache/sci-geosciences/gshhs-1.13
index 180566c62379..e802c05d43e5 100644
--- a/metadata/md5-cache/sci-geosciences/gshhs-1.13
+++ b/metadata/md5-cache/sci-geosciences/gshhs-1.13
@@ -3,11 +3,12 @@ DEPEND=sci-libs/netcdf sci-libs/gdal data? ( sci-geosciences/gshhs-data ) virtua
DESCRIPTION=Global Self-consistent, Hierarchical, High-resolution Shoreline programs
EAPI=5
HOMEPAGE=https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html
+INHERIT=toolchain-funcs
IUSE=+data
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=sci-libs/netcdf sci-libs/gdal data? ( sci-geosciences/gshhs-data )
SLOT=0
SRC_URI=ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c7553b20fda19a4f688bfbd8a2e58fe4
diff --git a/metadata/md5-cache/sci-libs/amd-2.4.6 b/metadata/md5-cache/sci-libs/amd-2.4.6
index 5c8e2ddf6d43..285d7b7372a4 100644
--- a/metadata/md5-cache/sci-libs/amd-2.4.6
+++ b/metadata/md5-cache/sci-libs/amd-2.4.6
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/suitesparseconfig-5.4.0 virtual/fortran
DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
EAPI=7
HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
+INHERIT=fortran-2
IUSE=doc fortran
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=>=sci-libs/suitesparseconfig-5.4.0 virtual/fortran
SLOT=0
SRC_URI=http://202.36.178.9/sage/amd-2.4.6.tar.bz2
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=21a6d46c779da5249592f77ce267e10d
diff --git a/metadata/md5-cache/sci-libs/buddy-2.4-r1 b/metadata/md5-cache/sci-libs/buddy-2.4-r1
index 822345ae0af3..f94bf1491b3c 100644
--- a/metadata/md5-cache/sci-libs/buddy-2.4-r1
+++ b/metadata/md5-cache/sci-libs/buddy-2.4-r1
@@ -3,11 +3,12 @@ DEPEND=virtual/fortran
DESCRIPTION=Binary Decision Diagram Package
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/buddy/
+INHERIT=fortran-2
IUSE=doc examples
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=buddy
RDEPEND=virtual/fortran
SLOT=0
SRC_URI=mirror://sourceforge/buddy/buddy-2.4.tar.gz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=4d55bb0c1d7c81f697a7e6fd08a699b0
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.13 b/metadata/md5-cache/sci-libs/cholmod-3.0.13
index 5e796d7d67e1..3a5efb8007b6 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.13
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.13
@@ -4,11 +4,12 @@ DEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drive
DESCRIPTION=Sparse Cholesky factorization and update/downdate library
EAPI=7
HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
+INHERIT=toolchain-funcs
IUSE=cuda doc +lapack +matrixops +modify +partition
KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/colamd-2.9 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) partition? ( >=sci-libs/camd-2.4 >=sci-libs/ccolamd-2.9 || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
SLOT=0
SRC_URI=http://202.36.178.9/sage/cholmod-3.0.13.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=05d791dbc3f21f386b40debe79836985
diff --git a/metadata/md5-cache/sci-libs/cholmod-3.0.14 b/metadata/md5-cache/sci-libs/cholmod-3.0.14
index fa847533bd9e..ce2a354d149b 100644
--- a/metadata/md5-cache/sci-libs/cholmod-3.0.14
+++ b/metadata/md5-cache/sci-libs/cholmod-3.0.14
@@ -4,11 +4,12 @@ DEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-dri
DESCRIPTION=Sparse Cholesky factorization and update/downdate library
EAPI=7
HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
+INHERIT=toolchain-funcs
IUSE=cuda doc +lapack +matrixops +modify +partition
KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )
RDEPEND=sci-libs/amd sci-libs/colamd cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) lapack? ( virtual/lapack ) partition? ( sci-libs/camd sci-libs/ccolamd || ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )
SLOT=0
SRC_URI=http://202.36.178.9/sage/cholmod-3.0.14.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=99b04407ca7c7d5ab5fab40a199e70c4
diff --git a/metadata/md5-cache/sci-libs/cmpfit-1.2-r1 b/metadata/md5-cache/sci-libs/cmpfit-1.2-r1
index 0437f024b6aa..056817acebe8 100644
--- a/metadata/md5-cache/sci-libs/cmpfit-1.2-r1
+++ b/metadata/md5-cache/sci-libs/cmpfit-1.2-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install test
DESCRIPTION=MINPACK-1 Least Squares Fitting Library in C
EAPI=6
HOMEPAGE=http://www.physics.wisc.edu/~craigm/idl/cmpfit.html
+INHERIT=toolchain-funcs
IUSE=static-libs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=public-domain minpack
SLOT=0
SRC_URI=http://www.physics.wisc.edu/~craigm/idl/down/cmpfit-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=467dbfe34d6da72607c2b33fc3905ca3
diff --git a/metadata/md5-cache/sci-libs/coinor-clp-1.17.6 b/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
index 60676b52ffb7..8cdaa4ca1c44 100644
--- a/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
+++ b/metadata/md5-cache/sci-libs/coinor-clp-1.17.6
@@ -4,6 +4,7 @@ DEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/glp
DESCRIPTION=COIN-OR linear programming solver
EAPI=7
HOMEPAGE=https://github.com/coin-or/Clp/
+INHERIT=toolchain-funcs
IUSE=doc examples glpk metis mumps sparse static-libs test
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=EPL-1.0
@@ -11,5 +12,5 @@ RDEPEND=sci-libs/coinor-osi:= sci-libs/coinor-utils:= glpk? ( sci-mathematics/gl
RESTRICT=!test? ( test )
SLOT=0/1
SRC_URI=https://github.com/coin-or/Clp/archive/releases/1.17.6.tar.gz -> coinor-clp-1.17.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ac909571f5f8bc762a656d2f6615930e
diff --git a/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1 b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
index 39d1cf1198d4..99d17a726d14 100644
--- a/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
+++ b/metadata/md5-cache/sci-libs/coinor-couenne-0.5.8-r1
@@ -4,11 +4,12 @@ DEPEND=sci-libs/coinor-bonmin:= sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-
DESCRIPTION=COIN-OR Convex Over and Under ENvelopes for Nonlinear Estimation
EAPI=7
HOMEPAGE=https://projects.coin-or.org/Couenne/
+INHERIT=fortran-2
IUSE=doc
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=EPL-1.0
RDEPEND=sci-libs/coinor-bonmin:= sci-libs/coinor-cbc:= sci-libs/coinor-cgl:= sci-libs/coinor-clp:= sci-libs/coinor-osi:= sci-libs/coinor-utils:= sci-libs/ipopt:=[lapack] virtual/blas virtual/fortran
SLOT=0/1
SRC_URI=https://github.com/coin-or/Couenne/archive/releases/0.5.8.tar.gz -> coinor-couenne-0.5.8.tar.gz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=703251557336fff8b4c1c8cf57a6466f
diff --git a/metadata/md5-cache/sci-libs/coinor-utils-2.11.4 b/metadata/md5-cache/sci-libs/coinor-utils-2.11.4
index d059462e7be9..03dcfb206abd 100644
--- a/metadata/md5-cache/sci-libs/coinor-utils-2.11.4
+++ b/metadata/md5-cache/sci-libs/coinor-utils-2.11.4
@@ -4,6 +4,7 @@ DEPEND=sys-libs/readline:0= blas? ( virtual/blas ) bzip2? ( app-arch/bzip2 ) glp
DESCRIPTION=COIN-OR Matrix, Vector and other utility classes
EAPI=7
HOMEPAGE=https://github.com/coin-or/CoinUtils/
+INHERIT=toolchain-funcs
IUSE=bzip2 doc glpk blas lapack static-libs test zlib
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=EPL-1.0
@@ -11,5 +12,5 @@ RDEPEND=sys-libs/readline:0= blas? ( virtual/blas ) bzip2? ( app-arch/bzip2 ) gl
RESTRICT=!test? ( test )
SLOT=0/3
SRC_URI=https://github.com/coin-or/CoinUtils/archive/releases/2.11.4.tar.gz -> coinor-utils-2.11.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b6f5c5ea445f5cb36ee31ab72f84e62e
diff --git a/metadata/md5-cache/sci-libs/dsdp-5.8-r3 b/metadata/md5-cache/sci-libs/dsdp-5.8-r3
index 662b4615a0bb..95397f437e0a 100644
--- a/metadata/md5-cache/sci-libs/dsdp-5.8-r3
+++ b/metadata/md5-cache/sci-libs/dsdp-5.8-r3
@@ -3,11 +3,12 @@ DEPEND=virtual/lapack virtual/pkgconfig
DESCRIPTION=Software for interior-point for semidefinite programming
EAPI=6
HOMEPAGE=https://www.mcs.anl.gov/hs/software/DSDP/
+INHERIT=multilib toolchain-funcs versionator
IUSE=doc examples
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=BSD
RDEPEND=virtual/lapack
SLOT=0
SRC_URI=https://www.mcs.anl.gov/hs/software/DSDP/DSDP5.8.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=7dd49b976fcb9287977952c57ab52ea4
diff --git a/metadata/md5-cache/sci-libs/galib-2.4.7-r1 b/metadata/md5-cache/sci-libs/galib-2.4.7-r1
index 4f9d43e73fd0..0809c39c7a49 100644
--- a/metadata/md5-cache/sci-libs/galib-2.4.7-r1
+++ b/metadata/md5-cache/sci-libs/galib-2.4.7-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Library for genetic algorithms in C++ programs
EAPI=6
HOMEPAGE=http://lancet.mit.edu/ga/
+INHERIT=toolchain-funcs
IUSE=doc examples
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=BSD examples? ( GPL-2 )
SLOT=0
SRC_URI=http://lancet.mit.edu/ga/dist/galib247.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=596bd6ec749f0adb4c7725dbb48917a9
diff --git a/metadata/md5-cache/sci-libs/htslib-1.10.2 b/metadata/md5-cache/sci-libs/htslib-1.10.2
index 1311f106d107..87d55205321a 100644
--- a/metadata/md5-cache/sci-libs/htslib-1.10.2
+++ b/metadata/md5-cache/sci-libs/htslib-1.10.2
@@ -3,11 +3,12 @@ DEPEND=bzip2? ( app-arch/bzip2:= ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-u
DESCRIPTION=C library for high-throughput sequencing data formats
EAPI=7
HOMEPAGE=http://www.htslib.org/
+INHERIT=toolchain-funcs
IUSE=+bzip2 curl +lzma
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=bzip2? ( app-arch/bzip2:= ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils:= )
SLOT=0/3
SRC_URI=mirror://sourceforge/samtools/1.10.2/htslib-1.10.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=23b94cf7e1e965cd1a0196a498381a08
diff --git a/metadata/md5-cache/sci-libs/jama-1.2.5 b/metadata/md5-cache/sci-libs/jama-1.2.5
index b04e61a90873..041c1326d138 100644
--- a/metadata/md5-cache/sci-libs/jama-1.2.5
+++ b/metadata/md5-cache/sci-libs/jama-1.2.5
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=Java-like matrix C++ templates
EAPI=6
HOMEPAGE=https://math.nist.gov/tnt/
+INHERIT=versionator
IUSE=doc
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=public-domain
diff --git a/metadata/md5-cache/sci-libs/libexcelformat-101016 b/metadata/md5-cache/sci-libs/libexcelformat-101016
index d21e245148db..6f865f612f8c 100644
--- a/metadata/md5-cache/sci-libs/libexcelformat-101016
+++ b/metadata/md5-cache/sci-libs/libexcelformat-101016
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=reading, writing, and editing of XLS (BIFF8 format) files using C++
EAPI=6
HOMEPAGE=https://www.codeproject.com/Articles/42504/ExcelFormat-Library
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=CPOL
SLOT=0
SRC_URI=mirror://gentoo/libexcelformat-101016.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7d3f30f1515b3f4760348c282ce1ebce
diff --git a/metadata/md5-cache/sci-libs/libpdb++-040728-r1 b/metadata/md5-cache/sci-libs/libpdb++-040728-r1
index d81d7d9538a1..3c934bddf58e 100644
--- a/metadata/md5-cache/sci-libs/libpdb++-040728-r1
+++ b/metadata/md5-cache/sci-libs/libpdb++-040728-r1
@@ -3,10 +3,11 @@ DEPEND=app-arch/sharutils
DESCRIPTION=PDB Record I/O Libraries -- c++ version
EAPI=6
HOMEPAGE=http://www.cgl.ucsf.edu/Overview/software.html
+INHERIT=multilib toolchain-funcs
IUSE=static-libs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
SLOT=0
SRC_URI=mirror://gentoo/libpdb++-040728.shar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6a898b56f1363b0d1a06ce2650bbee9b
diff --git a/metadata/md5-cache/sci-libs/lrslib-071 b/metadata/md5-cache/sci-libs/lrslib-071
index c236bc5d4915..a711146f29d7 100644
--- a/metadata/md5-cache/sci-libs/lrslib-071
+++ b/metadata/md5-cache/sci-libs/lrslib-071
@@ -3,11 +3,12 @@ DEPEND=gmp? ( dev-libs/gmp:0= mpi? ( virtual/mpi ) )
DESCRIPTION=Self-contained C implementation of the reverse search algorithm
EAPI=7
HOMEPAGE=http://cgm.cs.mcgill.ca/~avis/C/lrs.html
+INHERIT=toolchain-funcs
IUSE=gmp mpi
KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=gmp? ( dev-libs/gmp:0= mpi? ( virtual/mpi ) )
SLOT=0
SRC_URI=http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-071.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=726acafd1469757b4160d8c9a1e9a6ca
diff --git a/metadata/md5-cache/sci-libs/nfft-3.5.2 b/metadata/md5-cache/sci-libs/nfft-3.5.2
index 0697f59fdaba..0a86bf225241 100644
--- a/metadata/md5-cache/sci-libs/nfft-3.5.2
+++ b/metadata/md5-cache/sci-libs/nfft-3.5.2
@@ -3,11 +3,12 @@ DEPEND=sci-libs/fftw:3.0[threads,openmp?]
DESCRIPTION=library for nonequispaced discrete Fourier transformations
EAPI=7
HOMEPAGE=https://www-user.tu-chemnitz.de/~potts/nfft/
+INHERIT=toolchain-funcs
IUSE=doc openmp
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sci-libs/fftw:3.0[threads,openmp?]
SLOT=0
SRC_URI=https://github.com/NFFT/nfft/releases/download/3.5.2/nfft-3.5.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d770522e70ab59a9b00c60b02241e4ec
diff --git a/metadata/md5-cache/sci-libs/openlibm-0.7.4 b/metadata/md5-cache/sci-libs/openlibm-0.7.4
index 9c37993874f1..48dc1ba52bfb 100644
--- a/metadata/md5-cache/sci-libs/openlibm-0.7.4
+++ b/metadata/md5-cache/sci-libs/openlibm-0.7.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=High quality system independent, open source libm
EAPI=7
HOMEPAGE=https://github.com/JuliaLang/openlibm
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=public-domain MIT ISC BSD-2 LGPL-2.1+
SLOT=0/3
SRC_URI=https://github.com/JuliaMath/openlibm/archive/v0.7.4.tar.gz -> openlibm-0.7.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a9c0592ebaaeb8deb1f571720fbc6dd3
diff --git a/metadata/md5-cache/sci-libs/taucs-2.2-r1 b/metadata/md5-cache/sci-libs/taucs-2.2-r1
index a2348169aebc..385331c64a38 100644
--- a/metadata/md5-cache/sci-libs/taucs-2.2-r1
+++ b/metadata/md5-cache/sci-libs/taucs-2.2-r1
@@ -4,6 +4,7 @@ DEPEND=virtual/blas virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) virtu
DESCRIPTION=C library of sparse linear solvers
EAPI=7
HOMEPAGE=http://www.tau.ac.il/~stoledo/taucs/
+INHERIT=fortran-2 toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=virtual/blas virtual/lapack || ( sci-libs/metis sci-libs/parmetis ) virt
RESTRICT=test
SLOT=0
SRC_URI=http://www.tau.ac.il/~stoledo/taucs/2.2/taucs.tgz -> taucs-2.2.tgz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=70cb1a13db6d7ab0ae66ad91fe219481
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.7.9 b/metadata/md5-cache/sci-libs/umfpack-5.7.9
index 1045593927f0..c995d8057496 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.7.9
+++ b/metadata/md5-cache/sci-libs/umfpack-5.7.9
@@ -4,11 +4,12 @@ DEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( s
DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
EAPI=7
HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
+INHERIT=toolchain-funcs
IUSE=+cholmod doc
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=sci-libs/amd >=sci-libs/suitesparseconfig-5.4.0 virtual/blas cholmod? ( sci-libs/cholmod )
SLOT=0
SRC_URI=http://202.36.178.9/sage/umfpack-5.7.9.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=79126e5bca4a2022f7370017d3658b39
diff --git a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5 b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
index 78ea446f2b3f..78b033475e83 100644
--- a/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
+++ b/metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11 virtual/fortran
DESCRIPTION=PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System
EAPI=7
HOMEPAGE=http://www.gentoogeek.org/viewvc/Linux/xgks-pmel/
+INHERIT=fortran-2 toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=UCAR-Unidata
RDEPEND=x11-libs/libX11 virtual/fortran
SLOT=0
SRC_URI=http://www.gentoogeek.org/files/xgks-pmel-2.5.5.tar.gz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=6798d96d728f3a3bc3c681b23dca9e17
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.11.2 b/metadata/md5-cache/sci-mathematics/coq-8.11.2
index 79f6164f90f7..8ee303602d5f 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.11.2
+++ b/metadata/md5-cache/sci-mathematics/coq-8.11.2
@@ -3,6 +3,7 @@ DEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlop
DESCRIPTION=Proof assistant written in O'Caml
EAPI=7
HOMEPAGE=http://coq.inria.fr/
+INHERIT=desktop multilib
IUSE=gtk debug +ocamlopt doc
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
diff --git a/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r2 b/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r2
index c591159784c8..74539585ecb0 100644
--- a/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r2
+++ b/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r2
@@ -3,11 +3,12 @@ DEPEND=dev-libs/gmp:0=[cxx] doc? ( virtual/latex-base )
DESCRIPTION=Software system and project for computations with monomial ideals
EAPI=6
HOMEPAGE=http://www.broune.com/frobby/
+INHERIT=toolchain-funcs
IUSE=doc static-libs
KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
RDEPEND=dev-libs/gmp:0=[cxx]
SLOT=0
SRC_URI=http://www.broune.com/frobby/frobby_v0.9.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=68b602d263b3bdfa91a948bd19c27ab4
diff --git a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2 b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
index 3dcb18d322cc..9e665014c11b 100644
--- a/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
+++ b/metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Mathematics software for geometry
EAPI=7
HOMEPAGE=https://www.geogebra.org
+INHERIT=desktop prefix xdg
KEYWORDS=~amd64 ~ppc64
LICENSE=Geogebra CC-BY-NC-SA-3.0 GPL-3 Apache-2.0 BSD-2 BSD BSD-4 colt EPL-1.0 icu LGPL-2.1 LGPL-2.1+ MIT W3C || ( GPL-2 CDDL )
RDEPEND=dev-java/java-config || ( dev-java/openjdk:8[javafx] dev-java/openjdk:11[javafx] ) !sci-mathematics/geogebra
RESTRICT=test
SLOT=0
SRC_URI=https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-604-0.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/Geogebra.svg
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 prefix de7d8e2b10085ed5ff09ad70e4753e5c xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 prefix de7d8e2b10085ed5ff09ad70e4753e5c xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=1ad1c05f1b19001232df01c4ba399f96
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1 b/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
index abe6eb88a1d7..1a49aa2c8d8d 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Wolfram Mathematica
EAPI=7
HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
IUSE=+doc
KEYWORDS=-* ~amd64
LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
RESTRICT=strip mirror bindist fetch
SLOT=0
SRC_URI=Mathematica_10.3.1_LINUX.sh
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=815e2870a1b434224510b1e2c3514aa3
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-12.1.0 b/metadata/md5-cache/sci-mathematics/mathematica-12.1.0
index d8f56342df46..0d2ce26a4bca 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-12.1.0
+++ b/metadata/md5-cache/sci-mathematics/mathematica-12.1.0
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Wolfram Mathematica
EAPI=7
HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
IUSE=+doc
KEYWORDS=-* ~amd64
LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
RESTRICT=strip mirror bindist fetch
SLOT=0
SRC_URI=Mathematica_12.1.0_LINUX.sh
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=f5ad4d7e14ff9226e8064420c3c241e8
diff --git a/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1 b/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1
index dbefefae2b38..502f6bed5c66 100644
--- a/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathematica-12.1.1-r1
@@ -3,6 +3,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Wolfram Mathematica
EAPI=7
HOMEPAGE=https://www.wolfram.com/mathematica/
+INHERIT=desktop multilib xdg
IUSE=+doc
KEYWORDS=-* ~amd64
LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/freetype
RESTRICT=strip mirror bindist fetch
SLOT=0
SRC_URI=Mathematica_12.1.1_LINUX.sh
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=f5ad4d7e14ff9226e8064420c3c241e8
diff --git a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1 b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
index 277e150279dc..609a632937d0 100644
--- a/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
+++ b/metadata/md5-cache/sci-mathematics/mathmod-4.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5
DESCRIPTION=Plot parametric and implicit surfaces
EAPI=7
HOMEPAGE=https://www.facebook.com/pages/MathMod/529510253833102
+INHERIT=desktop qmake-utils xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=mirror://sourceforge/mathmod/mathmod-4.1.src.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=1d289ab54304c5a60e0ccf3e0a7763e4
diff --git a/metadata/md5-cache/sci-mathematics/minisat-2.2.0_p20130925-r1 b/metadata/md5-cache/sci-mathematics/minisat-2.2.0_p20130925-r1
index 3793a32c63d4..b6c3901b362c 100644
--- a/metadata/md5-cache/sci-mathematics/minisat-2.2.0_p20130925-r1
+++ b/metadata/md5-cache/sci-mathematics/minisat-2.2.0_p20130925-r1
@@ -3,11 +3,12 @@ DEPEND=sys-libs/zlib
DESCRIPTION=Small yet efficient SAT solver with reference paper
EAPI=6
HOMEPAGE=http://minisat.se/Main.html
+INHERIT=toolchain-funcs vcs-snapshot
IUSE=debug doc
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=https://github.com/niklasso/minisat/archive/37dc6c67e2af26379d88ce349eb9c4c6160e8543.tar.gz -> minisat-2.2.0_p20130925.tar.gz doc? ( http://minisat.se/downloads/MiniSat.pdf )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=5953499592185616da8ea218420a28c9
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.1.3 b/metadata/md5-cache/sci-mathematics/normaliz-3.1.3
index c756e9ace9b3..e8918327d524 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.1.3
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.1.3
@@ -3,11 +3,12 @@ DEPEND=dev-libs/gmp[cxx] doc? ( app-text/texlive ) dev-libs/boost
DESCRIPTION=Tool for computations in affine monoids and more
EAPI=6
HOMEPAGE=http://www.mathematik.uni-osnabrueck.de/normaliz/
+INHERIT=toolchain-funcs versionator
IUSE=doc extras openmp
KEYWORDS=amd64 ~arm x86
LICENSE=GPL-3
RDEPEND=dev-libs/gmp[cxx]
SLOT=0
SRC_URI=https://github.com/Normaliz/Normaliz/archive/v3.1.3.tar.gz -> normaliz-3.1.3.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=fa69d6b86faf7eee94a6d5c73eca04fa
diff --git a/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1 b/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
index 35fe993cb9ef..ab85591852fe 100644
--- a/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
+++ b/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile configure install test
DESCRIPTION=Multiple independent streams of pseudo-random numbers
EAPI=7
HOMEPAGE=http://statmath.wu.ac.at/software/RngStreams/
+INHERIT=out-of-source
IUSE=doc examples
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
diff --git a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1 b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
index 8537d3d83273..9930d8d5aa68 100644
--- a/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
+++ b/metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install test
DESCRIPTION=implementation of SHA1 is taken from the GNU coreutils package
EAPI=6
HOMEPAGE=http://isabelle.in.tum.de/
+INHERIT=multilib toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
diff --git a/metadata/md5-cache/sci-mathematics/sympow-2.023.6 b/metadata/md5-cache/sci-mathematics/sympow-2.023.6
index f5805570a990..6c8f874617e0 100644
--- a/metadata/md5-cache/sci-mathematics/sympow-2.023.6
+++ b/metadata/md5-cache/sci-mathematics/sympow-2.023.6
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure
DESCRIPTION=Symmetric power elliptic curve L-functions
EAPI=7
HOMEPAGE=https://gitlab.com/rezozer/forks/sympow/
+INHERIT=toolchain-funcs
KEYWORDS=amd64
LICENSE=Sympow-BSD
RDEPEND=sci-mathematics/pari
SLOT=0
SRC_URI=https://gitlab.com/rezozer/forks/sympow/-/archive/v2.023.6/sympow-v2.023.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=097af9d617ddbe7b44b5b0a7efeae61b
diff --git a/metadata/md5-cache/sci-mathematics/unuran-1.8.1 b/metadata/md5-cache/sci-mathematics/unuran-1.8.1
index 7210199fab28..c22424f180ee 100644
--- a/metadata/md5-cache/sci-mathematics/unuran-1.8.1
+++ b/metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -3,6 +3,7 @@ DEPEND=gsl? ( sci-libs/gsl:= ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-
DESCRIPTION=Universal Non-Uniform Random number generator
EAPI=7
HOMEPAGE=http://statmath.wu.ac.at/unuran/
+INHERIT=out-of-source
IUSE=doc examples gsl prng +rngstreams
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sci-misc/cdfplayer-12.2.0 b/metadata/md5-cache/sci-misc/cdfplayer-12.2.0
index fa86fd6c348c..f5af86381f96 100644
--- a/metadata/md5-cache/sci-misc/cdfplayer-12.2.0
+++ b/metadata/md5-cache/sci-misc/cdfplayer-12.2.0
@@ -2,11 +2,12 @@ DEFINED_PHASES=install nofetch unpack
DESCRIPTION=Wolfram Player for the interactive Computable Document Format (CDF)
EAPI=6
HOMEPAGE=http://www.wolfram.com/cdf-player/
+INHERIT=multilib versionator
KEYWORDS=-* ~amd64 ~x86
LICENSE=WolframCDFPlayer
RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt media-libs/alsa-lib dev-libs/expat media-libs/fontconfig dev-libs/icu x11-libs/libxcb dev-libs/libxml2 sys-libs/ncurses-compat:5 media-libs/freetype
RESTRICT=strip mirror bindist fetch
SLOT=0
SRC_URI=WolframPlayer_12.2.0_LINUX.sh
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=7fcebdd494a23eeb501f00eb4c5f86dc
diff --git a/metadata/md5-cache/sci-misc/fitsverify-4.18 b/metadata/md5-cache/sci-misc/fitsverify-4.18
index a4786427374c..7ce12bd5d448 100644
--- a/metadata/md5-cache/sci-misc/fitsverify-4.18
+++ b/metadata/md5-cache/sci-misc/fitsverify-4.18
@@ -3,10 +3,11 @@ DEPEND=sci-libs/cfitsio:0= virtual/pkgconfig
DESCRIPTION=FITS file format checker
EAPI=6
HOMEPAGE=https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=sci-libs/cfitsio:0=
SLOT=0
SRC_URI=https://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/fitsverify-4.18.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=74ba0b36d622f26d1c3473faa5a838cd
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.10.6.3 b/metadata/md5-cache/sci-physics/geant-data-4.10.6.3
index 213aaf299e8b..fb0630ac7a8f 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.10.6.3
+++ b/metadata/md5-cache/sci-physics/geant-data-4.10.6.3
@@ -5,5 +5,5 @@ HOMEPAGE=https://geant4.web.cern.ch
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=geant4
SLOT=4
-SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.9.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.4.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.1.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.2.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.5.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.1.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.2.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.9.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.4.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.5.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz
_md5_=aef692c300514d66b934f6349b500e34
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.10.7 b/metadata/md5-cache/sci-physics/geant-data-4.10.7
index c827c760b360..c2e95fbbe48c 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.10.7
+++ b/metadata/md5-cache/sci-physics/geant-data-4.10.7
@@ -5,5 +5,5 @@ HOMEPAGE=https://geant4.web.cern.ch
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=geant4
SLOT=4
-SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.13.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.7.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz
+SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.3.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.7.13.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.7.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz
_md5_=470e7da09274a9eb0f5e13ea9a8d609b
diff --git a/metadata/md5-cache/sci-physics/looptools-2.15 b/metadata/md5-cache/sci-physics/looptools-2.15
index bc8b8b411b02..76af5b6ba1e6 100644
--- a/metadata/md5-cache/sci-physics/looptools-2.15
+++ b/metadata/md5-cache/sci-physics/looptools-2.15
@@ -3,11 +3,12 @@ DEPEND=virtual/fortran
DESCRIPTION=Tools for evaluation of scalar and tensor one-loop integrals
EAPI=7
HOMEPAGE=http://www.feynarts.de/looptools
+INHERIT=fortran-2
IUSE=doc
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-3
RDEPEND=virtual/fortran
SLOT=0/2.15
SRC_URI=http://www.feynarts.de/looptools/LoopTools-2.15.tar.gz
-_eclasses_=fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=fb0d033d8e620e381623a3811dfe4022
diff --git a/metadata/md5-cache/sci-physics/pythia-8.2.26-r1 b/metadata/md5-cache/sci-physics/pythia-8.2.26-r1
index 92c3d3709711..05c94627f260 100644
--- a/metadata/md5-cache/sci-physics/pythia-8.2.26-r1
+++ b/metadata/md5-cache/sci-physics/pythia-8.2.26-r1
@@ -3,6 +3,7 @@ DEPEND=fastjet? ( sci-physics/fastjet ) gzip? ( sys-libs/zlib ) hepmc? ( sci-phy
DESCRIPTION=Lund Monte Carlo high-energy physics event generator
EAPI=7
HOMEPAGE=http://pythia8.hepforge.org/
+INHERIT=toolchain-funcs
IUSE=doc examples fastjet gzip +hepmc lhapdf root test
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=fastjet? ( sci-physics/fastjet ) gzip? ( sys-libs/zlib ) hepmc? ( sci-ph
RESTRICT=!test? ( test )
SLOT=8
SRC_URI=http://home.thep.lu.se/~torbjorn/pythia8/pythia8226.tgz test? ( lhapdf? ( https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/CT10.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/MRST2007lomod.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq66.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/cteq6l1.tar.gz https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/unvalidated/MRST2004qed.tar.gz ) )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dc9c11dca225abee1b2247d34a819122
diff --git a/metadata/md5-cache/sci-visualization/fig2sxd-0.22.1 b/metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
index cee90a25e67c..880c6338c43a 100644
--- a/metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
+++ b/metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
@@ -3,10 +3,11 @@ DEPEND=sys-libs/zlib
DESCRIPTION=Utility to convert files in xfig format to OpenOffice.org Draw format
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/fig2sxd
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=mirror://sourceforge/fig2sxd/fig2sxd_0.22.1.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8c2fca7dafdb1bfbcd8e626642f6f527
diff --git a/metadata/md5-cache/sci-visualization/grace-5.1.25_p7 b/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
index c7055945708f..fceccd493e5e 100644
--- a/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
+++ b/metadata/md5-cache/sci-visualization/grace-5.1.25_p7
@@ -3,11 +3,12 @@ DEPEND=media-libs/t1lib media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x
DESCRIPTION=Motif based XY-plotting tool
EAPI=7
HOMEPAGE=https://plasma-gate.weizmann.ac.il/Grace/
+INHERIT=desktop fortran-2 toolchain-funcs
IUSE=fftw fortran jpeg netcdf png
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 LGPL-2
RDEPEND=media-libs/t1lib media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) jpeg? ( virtual/jpeg:0 ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) x11-misc/xdg-utils fortran? ( virtual/fortran )
SLOT=0
SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/grace-5.1.25.tar.gz mirror://debian/pool/main/g/grace/grace_5.1.25-7.debian.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=4c8d2422fb94a425747f69e4f12fd888
diff --git a/metadata/md5-cache/sci-visualization/grace-5.1.25_p9 b/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
index 6f6e2bce1917..70687467d740 100644
--- a/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
+++ b/metadata/md5-cache/sci-visualization/grace-5.1.25_p9
@@ -3,11 +3,12 @@ DEPEND=media-libs/t1lib media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x
DESCRIPTION=Motif based XY-plotting tool
EAPI=7
HOMEPAGE=https://plasma-gate.weizmann.ac.il/Grace/
+INHERIT=desktop fortran-2 toolchain-funcs
IUSE=fftw fortran jpeg netcdf png
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 LGPL-2
RDEPEND=media-libs/t1lib media-libs/tiff:0 sys-libs/zlib >=x11-libs/motif-2.3:0 x11-libs/xbae fftw? ( sci-libs/fftw:3.0= ) jpeg? ( virtual/jpeg:0 ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) x11-misc/xdg-utils fortran? ( virtual/fortran )
SLOT=0
SRC_URI=ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/grace-5.1.25.tar.gz mirror://debian/pool/main/g/grace/grace_5.1.25-9.debian.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 fortran-2 b4796813ccda91c9c0d3463fc90aa969 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e fortran-2 b4796813ccda91c9c0d3463fc90aa969
_md5_=86e9246638e27e7234470ee407fb34c2
diff --git a/metadata/md5-cache/sci-visualization/xyscan-4.3.0 b/metadata/md5-cache/sci-visualization/xyscan-4.3.0
index dd6a4e6d82bf..0290024bd36b 100644
--- a/metadata/md5-cache/sci-visualization/xyscan-4.3.0
+++ b/metadata/md5-cache/sci-visualization/xyscan-4.3.0
@@ -3,10 +3,11 @@ DEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:
DESCRIPTION=Tool for extracting data points from graphs
EAPI=7
HOMEPAGE=http://rhig.physics.yale.edu/~ullrich/software/xyscan/
+INHERIT=desktop qmake-utils
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.30/xyscan-4.30-src.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=26ff272bf583be28055f4ee8fa3bc8ba
diff --git a/metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1 b/metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
index a249864ca306..6dc25f75470f 100644
--- a/metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
+++ b/metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5
DESCRIPTION=Interactive 3D mathematical function viewer
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/zhu3d
+INHERIT=desktop qmake-utils
IUSE=l10n_cs l10n_de l10n_es l10n_fr l10n_zh
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 virtual/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/zhu3d/zhu3d-4.2.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=b517b48dcd2ee0bc114d6f9b67ebec67
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
index 73cc5100ed81..633658273fa8 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for abrt
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
index 866a4b8bbf67..3d2b91041257 100644
--- a/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
DESCRIPTION=SELinux policy for accountsd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
index b8d33813e328..777941fd1b3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for acct
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
index f1746f95fc23..b19614021b5e 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-afs-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for afs
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
index 38cd094717ca..fadef27e1989 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-aide-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for aide
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
index f085acfe7a01..e58f78555660 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for alsa
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
index c47ede10d87a..dbd23b78873d 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
DESCRIPTION=SELinux policy for amanda
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
index eec734a4ab11..e72306473cb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for amavis
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
index dd57a7adfefb..afd39833aa94 100644
--- a/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-android-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreu
DESCRIPTION=SELinux policy for android
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-java sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
index 196aeaff309b..d9e6d1210c37 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apache-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-polic
DESCRIPTION=SELinux policy for apache
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
index 82a143ae1159..6187de6df85b 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for apcupsd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
index fff1053204c7..2e3ce887c155 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-apm-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for acpi
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
index cb8960678f2e..c52ef04ec169 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for arpwatch
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
index 0fed371527b1..31f4b788e09e 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for asterisk
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
index 2a805d299f94..e362b0987462 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-at-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for at
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
index 342c9e77936e..a44bbeea2a3b 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-automount-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for automount
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
index 083dd39c1335..c6c621006760 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for avahi
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
index 6be1592f4748..b35002f10c21 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for awstats
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
index 24a6b709d880..00f8ffddcc3f 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-backup-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for generic backup apps
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
index c874ff64c2e8..2a22414940e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for bacula
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
index bae688e48e9c..c98dc77ac0c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bind-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for bind
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
index bfbb77a6e415..ea3434889c07 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitcoin-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for bitcoin
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
index bd7c7137fffb..aed71fd3a364 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
DESCRIPTION=SELinux policy for bitlbee
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
index 2ca7d7cb71a0..f2e39ddcd9fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for bluetooth
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
index 7b5305a7bf47..1eddcbecfd57 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for brctl
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
index 4150fdbe3455..1c190d0f1adc 100644
--- a/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cachefilesd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cachefilesd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
index 08551772e2c1..30086bc02b34 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for calamaris
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
index 31164b928caf..d4716ead37d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-canna-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for canna
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
index 55b0f63afb8d..a40ecbeb4fd3 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ccs
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
index ea366f5ac2cf..7ff8783e9da9 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cdrecord
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
index 8f31823b54be..d062cc886327 100644
--- a/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ceph-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ceph
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
index 81e598c6f904..c6ed080de48f 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgmanager-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cgmanager
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
index 1dcf8446d8bc..8c80d8da40e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cgroup
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
index f25efe971dea..c6abfbc2e320 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for chromium
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
IUSE=alsa
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
index 391d6cc3ab7b..f877ed2041c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for chronyd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
index 7b8a7d3ee0f4..c485e09d8dc4 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for clamav
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
index edd63542a7a7..42dbadcf5631 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for clockspeed
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
index 36c05a48a3e3..ba1bb423dd43 100644
--- a/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-collectd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for collectd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
index b503f9733f93..ccc1c2cc1a25 100644
--- a/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-colord-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for colord
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
index 893f8f2529f6..7fe13ebd6cde 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for corosync
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
index 65bc2a61a8ae..47b1c696ae16 100644
--- a/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-couchdb-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for couchdb
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
index 47f365a1869b..e03cddd37b34 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-courier-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for courier
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
index bad2e8dc1fd3..bc6aecfa637c 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cpucontrol
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
index 2801a6d4ee10..2f5866e7b56e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cpufreqselector
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
index c59ba6c50232..e1c60461d879 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/sel
DESCRIPTION=SELinux policy for cups
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
index 34b444e018fe..23c8e4b2a7e7 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreu
DESCRIPTION=SELinux policy for cvs
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
index 3f1e88994343..01e0827df131 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for cyphesis
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
index e575069780b8..55ae20838503 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for daemontools
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
index 116956a5e47c..e805f22985be 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dante-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dante
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
index a5c43ca74d3c..61a44074acdd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dbadm
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
index 75b507e364c0..86339dceccf0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
DESCRIPTION=SELinux policy for dbskk
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
index a6466d77d1c6..de612e94b565 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dbus
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
index a8c8f4e50bc5..693a3350db3d 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dcc
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
index 40e2e27f6b80..782c90b94c2b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ddclient
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
index 69ddd1cf6ee1..65c253d0170f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ddcprobe
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
index 9a6848720522..0c09f0d2a5b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for denyhosts
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
index b9e95778bda9..61081c85c780 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
DESCRIPTION=SELinux policy for devicekit
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
index 059b38b99182..e4b96f08caed 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dhcp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
index fcf2af4a9257..5cd0d9efb420 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dictd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
index 2acc72d95a5c..03de6676016a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirmngr-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dirmngr
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
index f1da9ab3a3b3..0624248a7a6c 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dirsrv
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
index 376ad9100320..7cb964765332 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for distcc
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
index e9432b5ad42c..f4972166e36f 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/pol
DESCRIPTION=SELinux policy for djbdns
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-daemontools sec-policy/selinux-ucspitcp >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
index a16bc7b3ac3a..744014d10bcc 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for dkim
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-milter >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
index edfad75f4cf3..96b9da9c4676 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dmidecode
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
index 5be0aff9f79b..ed92eb06d778 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dnsmasq
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
index b21d932d161e..c88658db8cfd 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dovecot
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
index 78db7f44dbad..9b8eebf82847 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dpkg
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
index 5d10cec4d90d..e925ee599fe0 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for dracut
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
index e2738600fc20..b8b444b7b73a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-dropbox-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreu
DESCRIPTION=SELinux policy for dropbox
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-xserver sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
index 16200757f423..2fef5cdf4e00 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for entropyd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
index 8c3912312935..6b82108dcaec 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for evolution
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
index d821a22b5463..b3cc24008005 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-exim-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for exim
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
index d4e018e7bd0d..f29c2231e721 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for fail2ban
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
index c793a666adaf..7878985d8e65 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for fetchmail
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
index acf24e7b7deb..2ce7e8ccad65 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-finger-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
DESCRIPTION=SELinux policy for finger
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
index 2fb1d7054195..5374e38ecd21 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-flash-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for flash
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
index ef9f1d7e8300..3485e4e759ec 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
DESCRIPTION=SELinux policy for fprintd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
index cc42bef1f533..8600b3c85c9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ftp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
index 81a2c4c766f1..5bc2379b6b27 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-games-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for games
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
index 8ee9ea274cac..6bf80daa09d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gatekeeper
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
index d5c0b4721899..3f613170b98a 100644
--- a/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-git-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for git
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
index 5b74cbae7001..17d1184d89fd 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gitosis
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
index 0fec7483da91..2a427e6076d6 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gnome
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
index 85015f0f5413..edacb7da3ed1 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for googletalk
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
IUSE=alsa
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
index 47eb0edbe0e1..175e89d53e58 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gorg
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
index ceab34d22634..7dfb36d95d23 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for gpg
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-dirmngr >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
index 87885b38b8b0..c9b0fdd4e4bb 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gpm
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
index 6f5798bc3bf6..f0c7fad214a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gpsd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
index aeab039cba10..54045248b5c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-gssproxy-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for gssproxy
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
index 4fff957c6940..381b4cd22958 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for hddtemp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
index fe6f59fd0965..a5429033a9ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-howl-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for howl
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
index 8c5e588cc725..4afec9ae608d 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for icecast
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
index 19d044311fb8..e02960211644 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ifplugd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
index 05028d8dd92c..16a3465486b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for imaze
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
index 4bd91595910e..0c0c27dc0130 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for inetd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
index 45686ffd9668..e9a6d514396d 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-inn-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for inn
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
index 4aac44ed6ae2..2a66945e10eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ipsec
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
index 2a3eb1fd7f5f..5315e17576f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irc-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for irc
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
index ce0e24cc7cca..bfef329f8cfd 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ircd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
index d402d85aa10f..d3eca9cf99c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for irqbalance
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
index a769e396fb19..e518894e5893 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for jabber
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
index 1eb601b18a4d..164156207347 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-java-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for java
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
IUSE=alsa
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
index e2e63af89bf2..69c5283288ba 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdeconnect-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for kdeconnect
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
index 4bc465d42594..fd461c6e4760 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for kdump
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
index cdca881b2743..76cdc12d99eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for kerberos
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
index d38822bd97f3..c38a2792358b 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for kerneloops
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
index 46d4072ba422..4949d58be9bf 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for kismet
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
index 7d81aee3bf13..1372a57245b2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ksmtuned
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
index 606b8d7bdfe7..3a4a84d496e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for kudzu
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
index 9e1f09e3956e..d044110ae05b 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ldap
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
index b272131aa74a..bbd927f575ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-links-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for links
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
index 28ca2ed619c9..d651b735f494 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for lircd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
index 3d3dade132ce..e042b3f50725 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for loadkeys
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
index 0df73309eb73..87d8fd87af9e 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for lockdev
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
index 9fcf6c0b07b8..0e2acca23ccb 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for logrotate
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
index 0c5ec72cdf16..e2ed70e4d9cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for logsentry
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
index ca8f9fd5e48f..94ae538dfcab 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for logwatch
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
index 75b1201be4da..c201cd95136b 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for lpd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
index d2bc385fa6dd..09942cec24a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mailman
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
index 2054302e9dc1..3e4203822f53 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for makewhatis
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
index b847a19bf729..d3bbae81debb 100644
--- a/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mandb-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mandb
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
index 199e81677e88..4218af189518 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mcelog
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
index bcfea68a8869..254002744bd5 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for memcached
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
index 44007e7f9b7a..279e580bb873 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-milter-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for milter
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
index 34c1bb826c63..6dd008f380c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
DESCRIPTION=SELinux policy for modemmanager
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
index 3a9f2cdf5129..d32d3e46fa68 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mono-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mono
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
index feb389322515..3692156a782b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for mozilla
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
IUSE=alsa
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
index ec9f5b36b65c..caacdfa36d9b 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mpd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
index 46e3a01e34c2..724061c6f805 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mplayer
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
IUSE=alsa
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
index a1734333ce71..9bf5f1e8cf2d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mrtg
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
index f8c3bcdc0f31..3d2fd4215163 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-munin-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for munin
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
index 0acb6aa41585..fa68ae354c81 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mutt
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
index ae3654bd6149..0d224c1b1f4d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for mysql
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
index 21cc7de264c3..1f9ce791c15d 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for nagios
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
index bf9457a33c11..4a865cb2728c 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ncftool
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
index 0c8086644fa7..81d5b8a7aca8 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for networkmanager
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
index 8373df5ec64e..447d34286ee2 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for nginx
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
index 8b687075ed2d..aed661f125c7 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for nslcd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
index fce965e1622a..63c47ae7bca0 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ntop
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
index 41dc4122b71b..5a3327d199a6 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ntp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
index 3eb737249f85..8b1299f8eea7 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nut-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for nut
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
index 10e2251b1f93..8428749b654a 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-nx-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for nx
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
index e8f1e339ccf9..57dbfa383f43 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for oddjob
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
index 4dc93c774ba5..21cf959b2e89 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-oident-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for oident
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
index 7ea44c4c467a..b8744dbc0900 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openct-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for openct
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
index bed57ea2e36c..793d79ce85e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for openrc
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
index f94e07626074..ef43e8c3aa2c 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for openvpn
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
index 8448471bb24c..3dc14b253c62 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pan-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for pan
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
index ed29785e8e7d..bcff8f4dd3c5 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for pcmcia
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
index 5f432fe46752..57de8fbbc9f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pcscd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for pcscd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
index 6e6f32c849ed..29ec77a2a104 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for phpfpm
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
index 42a975852535..2318837757c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for plymouthd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
index 1170943a838f..32e8de7a4ab3 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for podsleuth
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
index 808d4e637e2e..0f9898f3917f 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for policykit
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
index 2eaea6323b19..3cbd1452d613 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for portmap
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
index 69a2bc8a5409..608b49ddec8a 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for postfix
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
index 2d9d38827030..5610566cf2a7 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for postgresql
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
index 1ff403b5e898..081ce8e729f6 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for postgrey
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
index 1d2391843410..68a1a402f0ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ppp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
index 10eaac35c27b..c524a5a522ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for prelink
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
index 3759cd68fc40..b7f2fcb0a3d1 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for prelude
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
index 27f0fb433d13..320adf5e6715 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for privoxy
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
index 03eab28131ac..993a93b27160 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for procmail
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
index 10446664430b..7491a8ebebdf 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-psad-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for psad
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
index 5029179b6729..f2fd61fb9aea 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for publicfile
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
index 26948ea1dc33..643c936e42e6 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for pulseaudio
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
index f84b646eee78..2cee97a721c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for puppet
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
index 8f7231e9c2b2..4d70997b4c3c 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for pyicqt
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
index babeff9aa1af..4fe7c1c9ae9c 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for pyzor
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
index 905e4dce8c61..89e5e94447c1 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
DESCRIPTION=SELinux policy for qemu
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
index 8837401aa0c8..95b1b16025b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for qmail
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
index c4012a452751..c5064a1dbc2b 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-quota-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for quota
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
index 02dbc6e1927a..1b7ea10e3568 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radius-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for radius
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
index a0a84e1ba1fd..4ad6aa6ea7ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for radvd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
index 0f896cbfdb43..b89737d5d2db 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-razor-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for razor
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
index 50712737abfc..9c63f99dbd8c 100644
--- a/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-redis-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for redis
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
index b77251c08244..767019b7ec86 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for remotelogin
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
index 757e295c8243..544f93714e62 100644
--- a/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-resolvconf-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for resolvconf
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
index 5b9ab5e5d7be..10c701c90f32 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rgmanager
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
index 5cf201ed6d7d..56b51ef1ab3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rngd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rngd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
index 2a0f9548548a..dfc507553590 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for roundup
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
index af77940b662e..c5c11683f0c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rpc
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
index 3fd7903e4d5e..62796665559b 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rpcbind
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
index 112dace8df6d..08d9a9263d7c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rpm
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
index a6b5daf66c6d..2c3d0de1c95d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rssh
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
index 3549e8686e0c..73567ec402d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/se
DESCRIPTION=SELinux policy for rtkit
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
index cd1a2dae032e..82d95d01493f 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for rtorrent
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
index c3c67186cddb..55edbab19094 100644
--- a/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-salt-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for salt
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
index 6ccde411c212..3c0f252a15c8 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-samba-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for samba
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
index a2fa7aed6b96..1e9225451bfa 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sasl
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
index 0dcfd17e97e1..7bc2af14a159 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-screen-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for screen
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
index 6bbc88718979..0b34850a6181 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sendmail
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
index d3f7b6db1976..99e645528184 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sensord
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
index d8fd9dccde26..226d493304c9 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for shorewall
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
index adb4276b41fe..9f98159547b4 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for shutdown
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
index a8b97978b557..076351c22fe7 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-skype-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for skype
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
IUSE=alsa
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
index b03d9391ec5d..775a4599d8a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for slocate
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
index 3a913222f256..746f3def4f1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for slrnpull
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
index b8918d732549..99d9d4197c4e 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for smartmon
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
index b27f3bda1409..b0b0b4439b2d 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for smokeping
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
index 4c8778978864..b3e3c6cd3196 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for snmp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
index 43e2b26e9554..cd69f9539d4d 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-snort-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for snort
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
index b12cc1241920..d97cc291ece9 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for soundserver
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
index 67fc160e8880..a03779551689 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for spamassassin
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
index 1e67043af25d..76bea7d63420 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for speedtouch
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
index be88670a9cc7..825b31d636f4 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-squid-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for squid
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
index 0ff0d7132044..e595c8ee18ae 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sssd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
index bcd11ddb4799..79382a0c4fbb 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for stunnel
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
index d0d41b2219bd..0e06dde801fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-subsonic-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for subsonic
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
index c43635b18f9f..43d3d25f46ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sudo
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
index 55e76d809207..9858996b3619 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sxid
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
index bee4c197db64..b985a276c298 100644
--- a/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-syncthing-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for syncthing
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
index c6b02fe44e39..4173b686baad 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for sysstat
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
index 9e0f9c0e086b..46cf9c5f2001 100644
--- a/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tboot-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tboot
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
index 0952d034cc89..05833cffd94c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
DESCRIPTION=SELinux policy for tcpd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
index cf4a37912b67..2037a5d18a93 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tcsd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tcsd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
index 349bcfec2a1c..875603222965 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-po
DESCRIPTION=SELinux policy for telnet
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
index 8a83683ea57b..e5c26282c227 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tftp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
index 9d55aafeb7f8..c0c191ab3517 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tgtd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
index 79ecdc66e62e..c4966fb2eab4 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for thunderbird
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
index 5ececbc5d1df..a142554eb6cf 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for timidity
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
index 4e232a5e6368..1f509a6705aa 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tmpreaper
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
index a6923642ece7..708502c203e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tor-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tor
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
index 31a63a8d90b9..d6ad3f0fa6d5 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for tripwire
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
index ea9c576b8823..daf46aa73434 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ucspitcp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
index b19000e0b110..c8a89ec0dc1f 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for ulogd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
index 68a5a8cf31ef..4a3a2a266be8 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uml-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for uml
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
index 0eedb967e1d1..22ebc84ec6a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for unconfined
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
index ee32ac4dcc96..35a604d4f2a4 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for uptime
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
index badf736763cb..0e390a318e56 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for usbmuxd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
index 6be68b79ee4f..7e6f21177840 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/s
DESCRIPTION=SELinux policy for uucp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
index ad097dae4ca2..5d4cf02ed38c 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for uwimap
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
index 50a87ddf5bd0..160fa6610d03 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-uwsgi-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for uWSGI
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
index 8af4b4c00110..eda2d9bcb8e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for varnishd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
index 7975d51e8985..b91e00836434 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for vbetool
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
index d92c35a5ec99..fe7ed3f07082 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for vdagent
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
index f3094332b8eb..d9458c2d0431 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vde-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for vde
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
index 94d81f5a0ac1..b87203543fd8 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-virt-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for virt
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
index 6de300c45e08..626f07c95fc1 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for vlock
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
index 3a904c27102d..995166196b1c 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for vmware
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
index a7294c943fdb..6941dbcfaff2 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for vnstatd
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
index 6512f1c25427..e5a226976802 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for vpn
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
index 48d1d562e63d..720a7d6009b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for watchdog
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
index ade7b2dd855b..7990352bcf20 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/
DESCRIPTION=SELinux policy for webalizer
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
index 4fac4a2d3ede..fc86336463af 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wine-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for wine
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
index e6aa16399bc3..66de8144646d 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for wireshark
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
index 524ca3b931d2..6ca778776413 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-wm-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for wm
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
index ad998aff9843..9aacbf175863 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xen-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for xen
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
index 856d165eb0a3..2d55071d628e 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for xfs
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
index 8abf059d4fd6..8d4c4f2e7103 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for xprint
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
index 6f4a9172e378..12b3e59b8598 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy
DESCRIPTION=SELinux policy for xscreensaver
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
index 9428d6c2763a..e3ff90c884a5 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for xserver
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2 b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
index 9c9fd668c7fc..d1e01bb6b9c4 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-2.20200818-r2
@@ -4,6 +4,7 @@ DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.2020
DESCRIPTION=SELinux policy for zabbix
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
+INHERIT=selinux-policy-2
KEYWORDS=amd64 -arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20200818-r2
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7-r1 b/metadata/md5-cache/sys-apps/baselayout-2.7-r1
index 8ab8d05a9335..2846139f9650 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.7-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-2.7-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst preinst prepare setup
DESCRIPTION=Filesystem baselayout and init scripts
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib versionator prefix
IUSE=build kernel_FreeBSD kernel_linux +split-usr
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d prefix de7d8e2b10085ed5ff09ad70e4753e5c
_md5_=595287f2cf0fbd6740ec76903a3f205f
diff --git a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1 b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
index 36990daccab9..a193515336ea 100644
--- a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install postinst postrm
DESCRIPTION=Baselayout for Java
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=xdg-utils
KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=app-crypt/p11-kit[trust] app-misc/ca-certificates !<dev-java/java-config-2.2
diff --git a/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3 b/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
index ea0e26392948..99c0ad92bb7f 100644
--- a/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
+++ b/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
@@ -2,6 +2,7 @@ DEFINED_PHASES=configure install postinst preinst prepare setup
DESCRIPTION=Filesystem baselayout and init scripts
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib
IUSE=build kernel_FreeBSD kernel_linux +split-usr
KEYWORDS=~arm ~arm64 ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-3.1 b/metadata/md5-cache/sys-apps/checkpolicy-3.1
index 60e380eaa63d..310572b5164a 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-3.1
+++ b/metadata/md5-cache/sys-apps/checkpolicy-3.1
@@ -4,11 +4,12 @@ DEPEND=>=sys-libs/libsepol-3.1
DESCRIPTION=SELinux policy compiler
EAPI=7
HOMEPAGE=http://userspace.selinuxproject.org
+INHERIT=toolchain-funcs
IUSE=debug
KEYWORDS=amd64 ~arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/libsepol-3.1
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/checkpolicy-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3f213c2390ac4c3c74f92442d5b8645b
diff --git a/metadata/md5-cache/sys-apps/chname-1.1 b/metadata/md5-cache/sys-apps/chname-1.1
index 54fa414decaa..211ccc1b4f6e 100644
--- a/metadata/md5-cache/sys-apps/chname-1.1
+++ b/metadata/md5-cache/sys-apps/chname-1.1
@@ -3,9 +3,10 @@ DEPEND=>=sys-kernel/linux-headers-2.6.16
DESCRIPTION=Run a command with a new system hostname
EAPI=6
HOMEPAGE=https://github.com/marineam/chname
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/marineam/chname/archive/v1.1.tar.gz -> chname-1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d4f3ef1ada4ae7182fa600738def508d
diff --git a/metadata/md5-cache/sys-apps/cinit-0.2.1 b/metadata/md5-cache/sys-apps/cinit-0.2.1
index cd1802ea7e55..c6f2e99f7438 100644
--- a/metadata/md5-cache/sys-apps/cinit-0.2.1
+++ b/metadata/md5-cache/sys-apps/cinit-0.2.1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=a fast, small and simple init with support for profiles
EAPI=7
HOMEPAGE=http://linux.schottelius.org/cinit/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~hppa ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://linux.schottelius.org/cinit/archives/cinit-0.2.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3628bf7922a1d82c274ae70847d21fb3
diff --git a/metadata/md5-cache/sys-apps/cpuid-20201006 b/metadata/md5-cache/sys-apps/cpuid-20201006
index 22ddd44f496a..58c7613ccb08 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20201006
+++ b/metadata/md5-cache/sys-apps/cpuid-20201006
@@ -4,9 +4,10 @@ DEPEND=app-arch/gzip
DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
EAPI=7
HOMEPAGE=http://www.etallen.com/cpuid.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=http://www.etallen.com/cpuid/cpuid-20201006.src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=15a78e9120fa26228f22f14175cbbcc1
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-11 b/metadata/md5-cache/sys-apps/darwin-miscutils-11
index 5110e19ecf35..d27e1634f380 100644
--- a/metadata/md5-cache/sys-apps/darwin-miscutils-11
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-11
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Miscellaneous commands used on macOS, Sierra 10.12
EAPI=6
HOMEPAGE=https://www.opensource.apple.com/
+INHERIT=toolchain-funcs
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-33.tar.gz https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-198.tar.gz https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-63.tar.gz https://opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.c -> adv_cmds-md-147.c https://opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.1 -> adv_cmds-md-147.1
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6230437d089fcbc3cb21b969b41daeee
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-12 b/metadata/md5-cache/sys-apps/darwin-miscutils-12
index 08a58255b641..6d4388fd4e91 100644
--- a/metadata/md5-cache/sys-apps/darwin-miscutils-12
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-12
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses:=
DESCRIPTION=Miscellaneous commands used on macOS, High Sierra 10.13
EAPI=6
HOMEPAGE=https://www.opensource.apple.com/
+INHERIT=toolchain-funcs
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
RDEPEND=sys-libs/ncurses:=
SLOT=0
SRC_URI=https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-34.tar.gz https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-203.tar.gz https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-63.tar.gz https://opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.c -> adv_cmds-md-147.c https://opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.1 -> adv_cmds-md-147.1 https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-147-compile.patch
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fb550c0a511c2354d141d0c97245e57d
diff --git a/metadata/md5-cache/sys-apps/dchroot-0.12.1 b/metadata/md5-cache/sys-apps/dchroot-0.12.1
index 35cd512e5924..66af4968d64d 100644
--- a/metadata/md5-cache/sys-apps/dchroot-0.12.1
+++ b/metadata/md5-cache/sys-apps/dchroot-0.12.1
@@ -3,10 +3,11 @@ DEPEND=sys-apps/help2man
DESCRIPTION=Utility for managing chroots for non-root users
EAPI=6
HOMEPAGE=https://packages.debian.org/unstable/admin/dchroot
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!dev-util/schroot[dchroot]
SLOT=0
SRC_URI=mirror://debian/pool/main/d/dchroot/dchroot_0.12.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5e76d10a262c3fc9fac8540c5f7e961f
diff --git a/metadata/md5-cache/sys-apps/dog-1.7-r6 b/metadata/md5-cache/sys-apps/dog-1.7-r6
index cb63ba49d79d..1efa645349aa 100644
--- a/metadata/md5-cache/sys-apps/dog-1.7-r6
+++ b/metadata/md5-cache/sys-apps/dog-1.7-r6
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Dog is better than cat
EAPI=6
HOMEPAGE=https://packages.gentoo.org/package/sys-apps/dog
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~arm64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/dog-1.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ab3547047db4492be80bcab0446f27f7
diff --git a/metadata/md5-cache/sys-apps/edid-decode-0_pre20201230 b/metadata/md5-cache/sys-apps/edid-decode-0_pre20201230
index b4a125f97857..35a279392a60 100644
--- a/metadata/md5-cache/sys-apps/edid-decode-0_pre20201230
+++ b/metadata/md5-cache/sys-apps/edid-decode-0_pre20201230
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Decode EDID data in a human-readable format
EAPI=7
HOMEPAGE=https://git.linuxtv.org/edid-decode.git/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=amd64 x86
LICENSE=MIT
SLOT=0
SRC_URI=https://dev.gentoo.org/~conikost/files/edid-decode-0_pre20201230.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c475a1dca8f1dd7e48b8564bbf5192eb
diff --git a/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r2 b/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r2
index c7149f5b9f6c..9e8360f518a0 100644
--- a/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r2
+++ b/metadata/md5-cache/sys-apps/firejail-lts-0.9.56.2-r2
@@ -3,6 +3,7 @@ DEPEND=apparmor? ( sys-libs/libapparmor ) !sys-apps/firejail test? ( dev-tcltk/e
DESCRIPTION=Security sandbox for any type of processes; LTS version
EAPI=7
HOMEPAGE=https://firejail.wordpress.com/
+INHERIT=toolchain-funcs
IUSE=apparmor +globalcfg +network +seccomp +suid +userns test +whitelist
KEYWORDS=amd64 ~arm ~arm64
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=apparmor? ( sys-libs/libapparmor )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/netblue30/firejail/archive/0.9.56.2-LTS.tar.gz -> firejail-lts-0.9.56.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8d5039b5f41599614ec82c602c975d7f
diff --git a/metadata/md5-cache/sys-apps/grepcidr-2.0 b/metadata/md5-cache/sys-apps/grepcidr-2.0
index db8e3deffbf4..658f2260765b 100644
--- a/metadata/md5-cache/sys-apps/grepcidr-2.0
+++ b/metadata/md5-cache/sys-apps/grepcidr-2.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Filter IPv4 and IPv6 addresses matching CIDR patterns
EAPI=5
HOMEPAGE=http://www.pc-tools.net/unix/grepcidr/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://www.pc-tools.net/files/unix/grepcidr-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a1b58902fca877e56c401e0fa5dd33d1
diff --git a/metadata/md5-cache/sys-apps/hexdump-esr-1.8 b/metadata/md5-cache/sys-apps/hexdump-esr-1.8
index 2a122b65ed3a..273c35e0e901 100644
--- a/metadata/md5-cache/sys-apps/hexdump-esr-1.8
+++ b/metadata/md5-cache/sys-apps/hexdump-esr-1.8
@@ -2,10 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Eric Raymond's hex dumper
EAPI=5
HOMEPAGE=http://www.catb.org/~esr/hexdump/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
RESTRICT=test
SLOT=0
SRC_URI=http://www.catb.org/~esr/hexdump/hexdump-1.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6f3044b0edeb36f7cd394e89fef44c9a
diff --git a/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1 b/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
index 29de7a3516b7..65dd8d8a24e6 100644
--- a/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
+++ b/metadata/md5-cache/sys-apps/hotplug2stdout-1.2.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A tool for reading kernel uevent(s) to stdout
EAPI=5
HOMEPAGE=http://www.bellut.net/projects.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/hotplug2stdout-1.2.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b7fc4f6d04a03db02d4fff2b5b720eb3
diff --git a/metadata/md5-cache/sys-apps/idle3-tools-0.9.3_pre20120123-r1 b/metadata/md5-cache/sys-apps/idle3-tools-0.9.3_pre20120123-r1
index f8643d435c22..51370f77c8ba 100644
--- a/metadata/md5-cache/sys-apps/idle3-tools-0.9.3_pre20120123-r1
+++ b/metadata/md5-cache/sys-apps/idle3-tools-0.9.3_pre20120123-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile
DESCRIPTION=Set, get or disable the value of the idle3 timer found on WD HDDs
EAPI=7
HOMEPAGE=http://idle3-tools.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm x86
LICENSE=GPL-3+
SLOT=0
SRC_URI=https://dev.gentoo.org/~conikost/files/idle3-tools-0.9.3_pre20120123.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=29d957f9c3e8dde7f2f06debaecccc0b
diff --git a/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0 b/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0
index 48314f3687e3..443930d066c7 100644
--- a/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0
+++ b/metadata/md5-cache/sys-apps/intel-sa-00075-tools-1.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile
DESCRIPTION=Tools from Intel to detect and mitigate the AMT/MEI vulnerability
EAPI=6
HOMEPAGE=https://downloadcenter.intel.com/download/26799/INTEL-SA-00075-Linux-Detection-and-Mitigation-Tools
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 BSD
SLOT=0
SRC_URI=https://github.com/intel/INTEL-SA-00075-Linux-Detection-And-Mitigation-Tools/archive/1.0.tar.gz -> intel-sa-00075-tools-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=49747bae71466a85257dc3f65b36aa3b
diff --git a/metadata/md5-cache/sys-apps/iotools-1.5 b/metadata/md5-cache/sys-apps/iotools-1.5
index e46bae35f8e2..eb7a8f1d0f7d 100644
--- a/metadata/md5-cache/sys-apps/iotools-1.5
+++ b/metadata/md5-cache/sys-apps/iotools-1.5
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install
DESCRIPTION=Simple commands to access hardware device registers
EAPI=7
HOMEPAGE=https://code.google.com/p/iotools/
+INHERIT=toolchain-funcs
IUSE=static make-symlinks
KEYWORDS=amd64 ~arm ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://iotools.googlecode.com/files/iotools-1.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=69f0a7093b1646a1b48d215eb4b9c804
diff --git a/metadata/md5-cache/sys-apps/lcdutils-0.2-r1 b/metadata/md5-cache/sys-apps/lcdutils-0.2-r1
index aa7e615701f9..7743a0482ee4 100644
--- a/metadata/md5-cache/sys-apps/lcdutils-0.2-r1
+++ b/metadata/md5-cache/sys-apps/lcdutils-0.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=(Sun) Cobalt Qube/RaQ button reading and LCD writing utilities
EAPI=7
HOMEPAGE=https://people.debian.org/~pm/mips-cobalt/
+INHERIT=toolchain-funcs
KEYWORDS=~mips x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://people.debian.org/~pm/mips-cobalt/lcdutils-0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=141bb2fed9be359090e54fe82850c586
diff --git a/metadata/md5-cache/sys-apps/lsadb-0.1.3-r1 b/metadata/md5-cache/sys-apps/lsadb-0.1.3-r1
index 56a069deda92..f998c541e5e4 100644
--- a/metadata/md5-cache/sys-apps/lsadb-0.1.3-r1
+++ b/metadata/md5-cache/sys-apps/lsadb-0.1.3-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Prints out information on all devices attached to the ADB bus
EAPI=7
HOMEPAGE=http://pbbuttons.berlios.de/projects/lsadb/
+INHERIT=toolchain-funcs
KEYWORDS=-* ~ppc
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/lsadb-0.1.3.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=731d2c0a4041763c8010e195d4bf8a21
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200106-r1 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200106-r1
index 45c22b65c1b0..9ff4636dd6ca 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200106-r1
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20200106-r1
@@ -3,10 +3,11 @@ DEPEND=app-eselect/eselect-awk
DESCRIPTION=an (often faster than gawk) awk-interpreter
EAPI=7
HOMEPAGE=https://invisible-island.net/mawk/mawk.html
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-eselect/eselect-awk
SLOT=0
SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200106.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b8611b7d6ec301adb58344f58b0e7733
diff --git a/metadata/md5-cache/sys-apps/mcstrans-3.1 b/metadata/md5-cache/sys-apps/mcstrans-3.1
index ba799e1c76d9..5a5d615d2be6 100644
--- a/metadata/md5-cache/sys-apps/mcstrans-3.1
+++ b/metadata/md5-cache/sys-apps/mcstrans-3.1
@@ -3,10 +3,11 @@ DEPEND=>=sys-libs/libsepol-3.1:= >=sys-libs/libselinux-3.1:= dev-libs/libpcre:=
DESCRIPTION=SELinux context translation to human readable names
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/libsepol-3.1:= >=sys-libs/libselinux-3.1:= dev-libs/libpcre:= >=sys-libs/libcap-1.10-r10:=
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/mcstrans-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=fa5c7573292a2bac923e80b56f89197a
diff --git a/metadata/md5-cache/sys-apps/memtest86-bin-9.0_p2000 b/metadata/md5-cache/sys-apps/memtest86-bin-9.0_p2000
index 7de548d1f952..ed82c82df502 100644
--- a/metadata/md5-cache/sys-apps/memtest86-bin-9.0_p2000
+++ b/metadata/md5-cache/sys-apps/memtest86-bin-9.0_p2000
@@ -3,6 +3,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
DESCRIPTION=Stand alone memory testing software for x86 computers
EAPI=7
HOMEPAGE=http://www.memtest86.com/
+INHERIT=mount-boot
KEYWORDS=-* ~amd64
LICENSE=PassMark-EULA
SLOT=0
diff --git a/metadata/md5-cache/sys-apps/minised-1.15 b/metadata/md5-cache/sys-apps/minised-1.15
index ee8a903aa54e..205b649d55be 100644
--- a/metadata/md5-cache/sys-apps/minised-1.15
+++ b/metadata/md5-cache/sys-apps/minised-1.15
@@ -2,9 +2,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=a smaller, cheaper and faster sed implementation
EAPI=6
HOMEPAGE=http://www.exactcode.de/oss/minised/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://dl.exactcode.de/oss/minised/minised-1.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f2602f23d62f495ba5b050220e1b48ff
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.65 b/metadata/md5-cache/sys-apps/moreutils-0.65
index 015f748fa459..d4ab36067fd2 100644
--- a/metadata/md5-cache/sys-apps/moreutils-0.65
+++ b/metadata/md5-cache/sys-apps/moreutils-0.65
@@ -3,11 +3,12 @@ DEPEND=doc? ( >=app-text/docbook2X-0.8.8-r2 app-text/docbook-xml-dtd:4.4 dev-lan
DESCRIPTION=A collection of tools that nobody thought to write when Unix was young
EAPI=7
HOMEPAGE=https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/
+INHERIT=toolchain-funcs
IUSE=+doc +perl
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos
LICENSE=GPL-2
RDEPEND=app-admin/eselect perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
SLOT=0
SRC_URI=https://git.joeyh.name/index.cgi/moreutils.git/snapshot/moreutils-0.65.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=258572d85f1207b768f112bd750cad42
diff --git a/metadata/md5-cache/sys-apps/nawk-20180827 b/metadata/md5-cache/sys-apps/nawk-20180827
index 4f2a9a9a164f..52cea0076dad 100644
--- a/metadata/md5-cache/sys-apps/nawk-20180827
+++ b/metadata/md5-cache/sys-apps/nawk-20180827
@@ -3,10 +3,11 @@ DEPEND=app-eselect/eselect-awk virtual/yacc
DESCRIPTION=Brian Kernighan's pattern scanning and processing language
EAPI=6
HOMEPAGE=https://www.cs.princeton.edu/~bwk/btl.mirror/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=MIT
RDEPEND=app-eselect/eselect-awk
SLOT=0
SRC_URI=https://github.com/onetrueawk/awk/archive/20180827.tar.gz -> nawk-20180827.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ca29d7dcc783b62c3718f1d92f5a4d08
diff --git a/metadata/md5-cache/sys-apps/netkit-base-0.17-r9 b/metadata/md5-cache/sys-apps/netkit-base-0.17-r9
index c0029642a917..c2093ae9e327 100644
--- a/metadata/md5-cache/sys-apps/netkit-base-0.17-r9
+++ b/metadata/md5-cache/sys-apps/netkit-base-0.17-r9
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Old-style inetd
EAPI=7
HOMEPAGE=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bd6e4ee44e26d53b51247b4b719a8c8c
diff --git a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3 b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
index 2f8c2bf66fc8..04d224feac93 100644
--- a/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
+++ b/metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
@@ -3,10 +3,11 @@ DEPEND=doc? ( app-text/ghostscript-gpl media-gfx/graphviz )
DESCRIPTION=Brings up/down ethernet ports automatically with cable detection
EAPI=7
HOMEPAGE=https://www.red-bean.com/~bos/
+INHERIT=toolchain-funcs
IUSE=debug doc
KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.red-bean.com/~bos/netplug/netplug-1.2.9.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8fd2d4e63d1feae1709412102c50b7e8
diff --git a/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1 b/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
index ee72dbcea648..95f75bf9883f 100644
--- a/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
+++ b/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=A standalone utility to process systemd-style tmpfiles.d files
EAPI=6
HOMEPAGE=https://github.com/openrc/opentmpfiles
+INHERIT=prefix
IUSE=selinux
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
LICENSE=BSD-2
diff --git a/metadata/md5-cache/sys-apps/opentmpfiles-0.3.1 b/metadata/md5-cache/sys-apps/opentmpfiles-0.3.1
index 91f622ca3a97..eeba4ef2f405 100644
--- a/metadata/md5-cache/sys-apps/opentmpfiles-0.3.1
+++ b/metadata/md5-cache/sys-apps/opentmpfiles-0.3.1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=A standalone utility to process systemd-style tmpfiles.d files
EAPI=6
HOMEPAGE=https://github.com/openrc/opentmpfiles
+INHERIT=prefix
IUSE=selinux
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
LICENSE=BSD-2
diff --git a/metadata/md5-cache/sys-apps/pcsc-tools-1.5.6 b/metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
index 11e8e22c88de..a7510b390b5e 100644
--- a/metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
+++ b/metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
@@ -4,11 +4,12 @@ DEPEND=>=sys-apps/pcsc-lite-1.4.14
DESCRIPTION=PC/SC Architecture smartcard tools
EAPI=7
HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
+INHERIT=desktop toolchain-funcs xdg-utils
IUSE=gtk network-cron
KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/pcsc-lite-1.4.14 dev-perl/pcsc-perl gtk? ( dev-perl/Gtk2 )
SLOT=0
SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.5.6.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=b0d02e7f2db3b3cfdc663fab315e64b7
diff --git a/metadata/md5-cache/sys-apps/pcsc-tools-1.5.7 b/metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
index b229fddae2c2..21a85d045c0c 100644
--- a/metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
+++ b/metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
@@ -4,11 +4,12 @@ DEPEND=>=sys-apps/pcsc-lite-1.4.14
DESCRIPTION=PC/SC Architecture smartcard tools
EAPI=7
HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/ https://github.com/LudovicRousseau/pcsc-tools
+INHERIT=desktop toolchain-funcs xdg-utils
IUSE=gtk network-cron
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/pcsc-lite-1.4.14 dev-perl/pcsc-perl gtk? ( dev-perl/Gtk2 )
SLOT=0
SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.5.7.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=05cf76059c1fd4dbbba5d2d07045996a
diff --git a/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806 b/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
index bf7a2fbd8470..72f86b2fa931 100644
--- a/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
+++ b/metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=A simple graphical frontend for pmount
EAPI=5
HOMEPAGE=http://git.tdb.fi/?p=pmount-gui.git;a=summary
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=x11-libs/gtk+:2 sys-apps/pmount virtual/udev
SLOT=0
SRC_URI=https://dev.gentoo.org/~ssuominen/pmount-gui-0_pre20130806.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=87a6648e3c5de3361b31180dd132237f
diff --git a/metadata/md5-cache/sys-apps/pnputils-0.1 b/metadata/md5-cache/sys-apps/pnputils-0.1
index af1182455b77..d2872d7e0227 100644
--- a/metadata/md5-cache/sys-apps/pnputils-0.1
+++ b/metadata/md5-cache/sys-apps/pnputils-0.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Plug and Play BIOS utilities
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=-* amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://archive.debian.org/debian/pool/main/p/pnputils/pnputils_0.1.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9605773fea999cfb2faff4e5c1dc2f95
diff --git a/metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r4 b/metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r4
index d2013786ab11..1683a7073f8c 100644
--- a/metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r4
+++ b/metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=PowerPC utilities and additional OldWorld apps
EAPI=7
HOMEPAGE=http://http.us.debian.org/debian/pool/main/p/powerpc-utils/
+INHERIT=toolchain-funcs
KEYWORDS=-* ppc ppc64
LICENSE=GPL-2
SLOT=0
SRC_URI=http://http.us.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_1.1.3.orig.tar.gz http://http.us.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_1.1.3-18.diff.gz mirror://gentoo/powerpc-utils-cleanup.patch.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1da2a149b829303ebd217e44102a6106
diff --git a/metadata/md5-cache/sys-apps/progress-0.15 b/metadata/md5-cache/sys-apps/progress-0.15
index a16aeb388868..0beb97df46d9 100644
--- a/metadata/md5-cache/sys-apps/progress-0.15
+++ b/metadata/md5-cache/sys-apps/progress-0.15
@@ -3,10 +3,11 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig
DESCRIPTION=Coreutils Viewer: show progress for cp, rm, dd, and so forth
EAPI=5
HOMEPAGE=https://github.com/Xfennec/progress
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-3
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=https://github.com/Xfennec/progress/archive/v0.15.tar.gz -> progress-0.15.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=301f69b26b6a72c3075f6dc952020f78
diff --git a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100 b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
index 40ec18324c8e..834b03213d4e 100644
--- a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
+++ b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
@@ -3,6 +3,7 @@ DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1?
DESCRIPTION=Send commands to some microcontrollers, e.g., to change LEDs or sound a buzzer
EAPI=7
HOMEPAGE=http://qnap.nas-central.org/index.php/PIC_Control_Software
+INHERIT=lua-single toolchain-funcs
IUSE=lua_single_target_luajit lua_single_target_lua5-1
KEYWORDS=arm
LICENSE=GPL-3+
@@ -10,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
SLOT=0
SRC_URI=mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2.orig.tar.gz mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2-6.diff.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54
_md5_=1ce439e95323f7b5fc99c04df29f1410
diff --git a/metadata/md5-cache/sys-apps/rename-1.3-r2 b/metadata/md5-cache/sys-apps/rename-1.3-r2
index 4647100db6ca..59221cb9fa4c 100644
--- a/metadata/md5-cache/sys-apps/rename-1.3-r2
+++ b/metadata/md5-cache/sys-apps/rename-1.3-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=Easily rename files
EAPI=6
HOMEPAGE=http://rename.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=http://rename/sourceforge.net/rename-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d071d4a5e6bf36a425e00bc1c61fea5a
diff --git a/metadata/md5-cache/sys-apps/restartd-0.2.2-r1 b/metadata/md5-cache/sys-apps/restartd-0.2.2-r1
index aa372f0800a8..3db4a7e06d5d 100644
--- a/metadata/md5-cache/sys-apps/restartd-0.2.2-r1
+++ b/metadata/md5-cache/sys-apps/restartd-0.2.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A daemon for checking your running and not running processes
EAPI=7
HOMEPAGE=https://packages.debian.org/unstable/utils/restartd
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/r/restartd/restartd_0.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1dd4278a78c9fd259516f9bb5262f4b1
diff --git a/metadata/md5-cache/sys-apps/rkflashtool-6.1 b/metadata/md5-cache/sys-apps/rkflashtool-6.1
index 41a407dbe9f9..e00fa26904eb 100644
--- a/metadata/md5-cache/sys-apps/rkflashtool-6.1
+++ b/metadata/md5-cache/sys-apps/rkflashtool-6.1
@@ -3,10 +3,11 @@ DEPEND=virtual/libusb:1
DESCRIPTION=Tool for flashing Rockchip devices
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/rkflashtool/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=BSD-2
RDEPEND=virtual/libusb:1
SLOT=0
SRC_URI=mirror://sourceforge/project/rkflashtool/rkflashtool-6.1/rkflashtool-6.1-src.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=06d857c7facfb01e229c38fadc2cff5f
diff --git a/metadata/md5-cache/sys-apps/s6-2.6.1.1 b/metadata/md5-cache/sys-apps/s6-2.6.1.1
index cc254c097424..f0153579495a 100644
--- a/metadata/md5-cache/sys-apps/s6-2.6.1.1
+++ b/metadata/md5-cache/sys-apps/s6-2.6.1.1
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.3[static-libs]
DESCRIPTION=skarnet.org's small and secure supervision software suite
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/sys-apps/s6-2.7.0.0 b/metadata/md5-cache/sys-apps/s6-2.7.0.0
index 3859a8f29efc..523b48f240e3 100644
--- a/metadata/md5-cache/sys-apps/s6-2.7.0.0
+++ b/metadata/md5-cache/sys-apps/s6-2.7.0.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.4[static-libs]
DESCRIPTION=skarnet.org's small and secure supervision software suite
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/sys-apps/s6-2.7.1.1 b/metadata/md5-cache/sys-apps/s6-2.7.1.1
index 1ed9ae9ebf5e..bb85c2d5907d 100644
--- a/metadata/md5-cache/sys-apps/s6-2.7.1.1
+++ b/metadata/md5-cache/sys-apps/s6-2.7.1.1
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.4[static-libs]
DESCRIPTION=skarnet.org's small and secure supervision software suite
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.3.0.0 b/metadata/md5-cache/sys-apps/s6-rc-0.3.0.0
index 4107d89e4794..1fe923a23716 100644
--- a/metadata/md5-cache/sys-apps/s6-rc-0.3.0.0
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.3.0.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.3[static-libs]
DESCRIPTION=service manager for the s6 supervision suite
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.4.0.0 b/metadata/md5-cache/sys-apps/s6-rc-0.4.0.0
index c7e99fac6484..3e9b3fbd245f 100644
--- a/metadata/md5-cache/sys-apps/s6-rc-0.4.0.0
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.4.0.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.4[static-libs]
DESCRIPTION=service manager for the s6 supervision suite
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.4.0.1 b/metadata/md5-cache/sys-apps/s6-rc-0.4.0.1
index 8590eb8b4549..5c189779ad2c 100644
--- a/metadata/md5-cache/sys-apps/s6-rc-0.4.0.1
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.4.0.1
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.3.0.4[static-libs]
DESCRIPTION=service manager for the s6 supervision suite
EAPI=6
HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+INHERIT=versionator
IUSE=static static-libs
KEYWORDS=~amd64 ~x86
LICENSE=ISC
diff --git a/metadata/md5-cache/sys-apps/salinfo-1.2 b/metadata/md5-cache/sys-apps/salinfo-1.2
index 7e3c0ebb7802..f7e323e62403 100644
--- a/metadata/md5-cache/sys-apps/salinfo-1.2
+++ b/metadata/md5-cache/sys-apps/salinfo-1.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=decode Itanium SAL records (e.g. various hardware errors)
EAPI=6
HOMEPAGE=https://www.kernel.org/pub/linux/kernel/people/helgaas/
+INHERIT=toolchain-funcs
KEYWORDS=-* ~ia64
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/salinfo-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4b8bf8220c4d96d5e32c4ee8cb2d2921
diff --git a/metadata/md5-cache/sys-apps/secilc-3.1 b/metadata/md5-cache/sys-apps/secilc-3.1
index 6ed136e877f6..72789cd52858 100644
--- a/metadata/md5-cache/sys-apps/secilc-3.1
+++ b/metadata/md5-cache/sys-apps/secilc-3.1
@@ -4,11 +4,12 @@ DEPEND=>=sys-libs/libsepol-3.1
DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/libsepol-3.1
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/secilc-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=841746fc50de4436c32cb0ca2b578a7f
diff --git a/metadata/md5-cache/sys-apps/semodule-utils-3.1 b/metadata/md5-cache/sys-apps/semodule-utils-3.1
index 357b1252e0dc..0500d6a820fb 100644
--- a/metadata/md5-cache/sys-apps/semodule-utils-3.1
+++ b/metadata/md5-cache/sys-apps/semodule-utils-3.1
@@ -3,10 +3,11 @@ DEPEND=>=sys-libs/libsepol-3.1:=
DESCRIPTION=SELinux policy module utilities
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~mips x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/libsepol-3.1:=
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/semodule-utils-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8508886b77c55bc69a8638a44c062c60
diff --git a/metadata/md5-cache/sys-apps/superiotool-6637 b/metadata/md5-cache/sys-apps/superiotool-6637
index 400ab380b5e8..a954d802ff8d 100644
--- a/metadata/md5-cache/sys-apps/superiotool-6637
+++ b/metadata/md5-cache/sys-apps/superiotool-6637
@@ -3,11 +3,12 @@ DEPEND=pci? ( sys-apps/pciutils ) app-arch/xz-utils
DESCRIPTION=util to detect Super I/O chips and functionality
EAPI=6
HOMEPAGE=https://www.coreboot.org/Superiotool
+INHERIT=toolchain-funcs
IUSE=pci
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=pci? ( sys-apps/pciutils )
SLOT=0
SRC_URI=mirror://gentoo/superiotool-6637.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=78827e410dd0d79d6356fc45ff50413c
diff --git a/metadata/md5-cache/sys-apps/syslog-notify-0.2 b/metadata/md5-cache/sys-apps/syslog-notify-0.2
index 23129ef6466c..10ab8ee009c8 100644
--- a/metadata/md5-cache/sys-apps/syslog-notify-0.2
+++ b/metadata/md5-cache/sys-apps/syslog-notify-0.2
@@ -3,6 +3,7 @@ DEPEND=>=x11-libs/libnotify-0.7
DESCRIPTION=Notifications for syslog entries via libnotify
EAPI=7
HOMEPAGE=https://jtniehof.github.com/syslog-notify/
+INHERIT=readme.gentoo-r1
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libnotify-0.7 || ( app-admin/syslog-ng app-admin/rsyslog )
diff --git a/metadata/md5-cache/sys-apps/uam-0.3.2-r1 b/metadata/md5-cache/sys-apps/uam-0.3.2-r1
index db978dcc05b7..d74733e7bb3a 100644
--- a/metadata/md5-cache/sys-apps/uam-0.3.2-r1
+++ b/metadata/md5-cache/sys-apps/uam-0.3.2-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Simple udev-based automounter for removable USB media
EAPI=6
HOMEPAGE=https://github.com/mgorny/uam/
+INHERIT=udev
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=acct-group/plugdev virtual/udev
SLOT=0
SRC_URI=https://github.com/mgorny/uam/releases/download/uam-0.3.2/uam-0.3.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=96f30c20d3c1f1976c9cba06c05ecc93
diff --git a/metadata/md5-cache/sys-apps/ucspi-unix-1.0 b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
index 0bb40862b71c..b7c6dd6a789e 100644
--- a/metadata/md5-cache/sys-apps/ucspi-unix-1.0
+++ b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
@@ -3,10 +3,11 @@ DEPEND=>=dev-libs/bglibs-2.04
DESCRIPTION=A UCSPI implementation for Unix domain sockets
EAPI=7
HOMEPAGE=https://untroubled.org/ucspi-unix/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2+
RDEPEND=!net-analyzer/mk-livestatus
SLOT=0
SRC_URI=https://untroubled.org/ucspi-unix/archive/ucspi-unix-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=207063438ff6e590db7e49b4fc761002
diff --git a/metadata/md5-cache/sys-apps/usbmon-6.1 b/metadata/md5-cache/sys-apps/usbmon-6.1
index 63e607fd74a5..9b262d74877f 100644
--- a/metadata/md5-cache/sys-apps/usbmon-6.1
+++ b/metadata/md5-cache/sys-apps/usbmon-6.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Userland for USB monitoring framework
EAPI=6
HOMEPAGE=https://people.redhat.com/zaitcev/linux/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://people.redhat.com/zaitcev/linux/usbmon-6.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=632855b0d2bf3597dc34b89d9bf046ca
diff --git a/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4 b/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
index f30852f64e58..a4c2f6ea90ac 100644
--- a/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
+++ b/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
@@ -3,11 +3,12 @@ DEPEND=fuse? ( sys-fs/fuse:0= ) sys-libs/readline:0=
DESCRIPTION=Tools for use with Usermode Linux virtual machines
EAPI=7
HOMEPAGE=http://user-mode-linux.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=fuse
KEYWORDS=amd64 arm x86
LICENSE=GPL-2
RDEPEND=fuse? ( sys-fs/fuse:0= ) sys-libs/readline:0=
SLOT=0
SRC_URI=http://user-mode-linux.sourceforge.net/uml_utilities_20070815.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f4ef5ddb37ba5838dbdb952b038abe47
diff --git a/metadata/md5-cache/sys-auth/docker_auth-1.5.0 b/metadata/md5-cache/sys-auth/docker_auth-1.5.0
index 4d2e0596cc99..68ab286f2af9 100644
--- a/metadata/md5-cache/sys-auth/docker_auth-1.5.0
+++ b/metadata/md5-cache/sys-auth/docker_auth-1.5.0
@@ -4,6 +4,7 @@ DEPEND=acct-group/docker_auth acct-user/docker_auth
DESCRIPTION=Docker Registry 2 authentication server
EAPI=7
HOMEPAGE=https://github.com/cesanta/docker_auth
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT ZLIB
RDEPEND=acct-group/docker_auth acct-user/docker_auth
diff --git a/metadata/md5-cache/sys-auth/pam_krb5-4.9 b/metadata/md5-cache/sys-auth/pam_krb5-4.9
index ef2f365220d5..ea57374a281d 100644
--- a/metadata/md5-cache/sys-auth/pam_krb5-4.9
+++ b/metadata/md5-cache/sys-auth/pam_krb5-4.9
@@ -3,6 +3,7 @@ DEPEND=virtual/krb5 sys-libs/pam
DESCRIPTION=Kerberos V PAM Authentication Module
EAPI=7
HOMEPAGE=https://www.eyrie.org/~eagle/software/pam-krb5/
+INHERIT=multilib
KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=|| ( BSD-2 GPL-2 )
RDEPEND=virtual/krb5 sys-libs/pam
diff --git a/metadata/md5-cache/sys-block/cec-14 b/metadata/md5-cache/sys-block/cec-14
index 50378b3fc477..f280ceded724 100644
--- a/metadata/md5-cache/sys-block/cec-14
+++ b/metadata/md5-cache/sys-block/cec-14
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Coraid Ethernet Console client
EAPI=7
HOMEPAGE=http://aoetools.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/aoetools/cec-14.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0d3aae529abf7c19baeaebcf6bd6b671
diff --git a/metadata/md5-cache/sys-block/di-4.50 b/metadata/md5-cache/sys-block/di-4.50
index dfb173adb52a..fed718f7370c 100644
--- a/metadata/md5-cache/sys-block/di-4.50
+++ b/metadata/md5-cache/sys-block/di-4.50
@@ -10,5 +10,5 @@ LICENSE=ZLIB
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/diskinfo-di/di-4.50.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=66e6ff24490822bb4fb6f521fc0a2723
diff --git a/metadata/md5-cache/sys-block/disktype-9-r1 b/metadata/md5-cache/sys-block/disktype-9-r1
index 86c4647a83fb..0de52e9e4fb8 100644
--- a/metadata/md5-cache/sys-block/disktype-9-r1
+++ b/metadata/md5-cache/sys-block/disktype-9-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Detect the content format of a disk or disk image
EAPI=7
HOMEPAGE=http://disktype.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ppc sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/disktype/disktype-9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3072ce6b1783f67d5686d5178ae931c8
diff --git a/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1 b/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
index ce50955e2cf7..af708e982eb3 100644
--- a/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
+++ b/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install postinst
DESCRIPTION=Udev rules to allow easier customization of kernel I/O schedulers
EAPI=7
HOMEPAGE=https://gitlab.com/pachoramos/io-scheduler-udev-rules
+INHERIT=udev
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/udev
SLOT=0
SRC_URI=https://gitlab.com/pachoramos/io-scheduler-udev-rules/-/archive/1/io-scheduler-udev-rules-1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=aad4daa649bd126cb12daaf3fbac3291
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14-r3 b/metadata/md5-cache/sys-block/megacli-8.07.14-r3
index b098a0058457..2273e19319d4 100644
--- a/metadata/md5-cache/sys-block/megacli-8.07.14-r3
+++ b/metadata/md5-cache/sys-block/megacli-8.07.14-r3
@@ -4,11 +4,12 @@ DEPEND=app-arch/unzip app-admin/chrpath
DESCRIPTION=LSI Logic MegaRAID Command Line Interface management tool
EAPI=7
HOMEPAGE=https://www.broadcom.com/support/knowledgebase/1211161498596/megacli-cheat-sheet--live-examples https://www.broadcom.com/support/knowledgebase/1211161496959/megacli-commands
+INHERIT=rpm
KEYWORDS=~amd64 ~x86
LICENSE=LSI
RDEPEND=sys-libs/ncurses-compat:5
RESTRICT=mirror bindist
SLOT=0
SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=66b39bae11897b7c36716ae2fd3bfc85
diff --git a/metadata/md5-cache/sys-block/megactl-0.4.1-r3 b/metadata/md5-cache/sys-block/megactl-0.4.1-r3
index fd02e71a4e83..99172aa299bf 100644
--- a/metadata/md5-cache/sys-block/megactl-0.4.1-r3
+++ b/metadata/md5-cache/sys-block/megactl-0.4.1-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=LSI MegaRAID control utility
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/megactl/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/megactl/megactl-0.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=acddb82681de9e8c9d49029e166cc8c3
diff --git a/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1 b/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
index b789f427048c..91b1cdc6311f 100644
--- a/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
+++ b/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Query tool to access the running configuration and status of LSI SCSI HBAs
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/mpt-status-1.2.0.tar.bz2 mirror://gentoo/mpt-status-1.2.0-linux-sources.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e77a8c01f198f4e227f82b919f87837b
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.5.3 b/metadata/md5-cache/sys-block/ms-sys-2.5.3
index d25e9f664269..5946805d53e3 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.5.3
+++ b/metadata/md5-cache/sys-block/ms-sys-2.5.3
@@ -3,10 +3,11 @@ DEPEND=sys-devel/gettext
DESCRIPTION=A command-line program for writing Microsoft compatible boot records
EAPI=6
HOMEPAGE=http://ms-sys.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/libintl
SLOT=0
SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.5.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9bfb12ba2a194cd1921ef8792417cf5a
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.7.0 b/metadata/md5-cache/sys-block/ms-sys-2.7.0
index b9bacbaec7ce..ca12fd5d6812 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.7.0
+++ b/metadata/md5-cache/sys-block/ms-sys-2.7.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A command-line program for writing Microsoft compatible boot records
EAPI=7
HOMEPAGE=http://ms-sys.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=virtual/libintl
SLOT=0
SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.7.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ff79775e5d3a57b17aae85b68d5b9324
diff --git a/metadata/md5-cache/sys-block/perccli-7.5.007.0529 b/metadata/md5-cache/sys-block/perccli-7.5.007.0529
index 2d42a926bdbf..5adae06108a1 100644
--- a/metadata/md5-cache/sys-block/perccli-7.5.007.0529
+++ b/metadata/md5-cache/sys-block/perccli-7.5.007.0529
@@ -3,11 +3,12 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
DESCRIPTION=LINUX PERCCLI Utility For All Dell HBA/PERC Controllers
EAPI=7
HOMEPAGE=https://www.dell.com/support/home/us/en/19/drivers/driversdetails?driverId=NF8G9
+INHERIT=mount-boot rpm
IUSE=doc efi
KEYWORDS=-* ~amd64 ~x86
LICENSE=Avago BSD
RESTRICT=strip
SLOT=0
SRC_URI=https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz doc? ( https://topics-cdn.dell.com/pdf/dell-sas-hba-12gbps_reference-guide_en-us.pdf )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e mount-boot 060ced4c5e0fd737db17cbb609bbf557 rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=mount-boot 060ced4c5e0fd737db17cbb609bbf557 estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=4d013328b62ef4afa013f89fad967ada
diff --git a/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2 b/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2
index 1b81e2a375f9..df597a7c3507 100644
--- a/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2
+++ b/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend unpack
DESCRIPTION=LINUX PERCCLI Utility For All Dell HBA/PERC Controllers
EAPI=7
HOMEPAGE=https://www.dell.com/support/home/us/en/19/drivers/driversdetails?driverId=NF8G9
+INHERIT=mount-boot rpm
IUSE=doc efi
KEYWORDS=-* ~amd64 ~x86
LICENSE=Avago BSD
RESTRICT=strip
SLOT=0
SRC_URI=https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz doc? ( https://topics-cdn.dell.com/pdf/dell-sas-hba-12gbps_reference-guide_en-us.pdf )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e mount-boot 060ced4c5e0fd737db17cbb609bbf557 rpm 760ff223c2c4299b68ea901e24c4cabd wrapper 4251d4c84c25f59094fd557e0063a974
+_eclasses_=mount-boot 060ced4c5e0fd737db17cbb609bbf557 estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
_md5_=d3407748298518bf36a90bb5c5e5c697
diff --git a/metadata/md5-cache/sys-block/sas2ircu-20 b/metadata/md5-cache/sys-block/sas2ircu-20
index bcc5987fc95a..158f881990f2 100644
--- a/metadata/md5-cache/sys-block/sas2ircu-20
+++ b/metadata/md5-cache/sys-block/sas2ircu-20
@@ -3,6 +3,7 @@ DEPEND=app-arch/unzip
DESCRIPTION=LSI MPT-SAS2 controller management tool
EAPI=6
HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9207-8e#tab-archive-drivers4-abc
+INHERIT=mount-boot
IUSE=efi doc
KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LSI
diff --git a/metadata/md5-cache/sys-block/sas3flash-15 b/metadata/md5-cache/sys-block/sas3flash-15
index 181078d33c43..ab2248a949c3 100644
--- a/metadata/md5-cache/sys-block/sas3flash-15
+++ b/metadata/md5-cache/sys-block/sas3flash-15
@@ -2,6 +2,7 @@ DEFINED_PHASES=install nofetch postinst postrm preinst prerm pretend unpack
DESCRIPTION=Flash utility for LSI MPT-SAS3 controller
EAPI=6
HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
+INHERIT=mount-boot
IUSE=efi doc
KEYWORDS=-* ~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LSI
diff --git a/metadata/md5-cache/sys-block/sas3flash-15-r1 b/metadata/md5-cache/sys-block/sas3flash-15-r1
index 33ee6eb782ab..6b431b91a4eb 100644
--- a/metadata/md5-cache/sys-block/sas3flash-15-r1
+++ b/metadata/md5-cache/sys-block/sas3flash-15-r1
@@ -3,6 +3,7 @@ DEFINED_PHASES=install nofetch postinst postrm preinst prerm pretend
DESCRIPTION=Flash utility for LSI MPT-SAS3 controller
EAPI=7
HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
+INHERIT=mount-boot
IUSE=doc efi
KEYWORDS=~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LSI
diff --git a/metadata/md5-cache/sys-block/sas3flash-16 b/metadata/md5-cache/sys-block/sas3flash-16
index 92d8b9b15d09..173ab854a7a8 100644
--- a/metadata/md5-cache/sys-block/sas3flash-16
+++ b/metadata/md5-cache/sys-block/sas3flash-16
@@ -3,6 +3,7 @@ DEFINED_PHASES=install nofetch postinst postrm preinst prerm pretend
DESCRIPTION=Flash utility for LSI MPT-SAS3 controller
EAPI=7
HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
+INHERIT=mount-boot
IUSE=doc efi
KEYWORDS=~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LSI
diff --git a/metadata/md5-cache/sys-block/sas3ircu-16 b/metadata/md5-cache/sys-block/sas3ircu-16
index 8e48850916d7..5e84d51c18cd 100644
--- a/metadata/md5-cache/sys-block/sas3ircu-16
+++ b/metadata/md5-cache/sys-block/sas3ircu-16
@@ -3,6 +3,7 @@ DEFINED_PHASES=install nofetch postinst postrm preinst prerm pretend
DESCRIPTION=LSI MPT-SAS3 controller management tool
EAPI=7
HOMEPAGE=https://www.broadcom.com/products/storage/host-bus-adapters/sas-9300-8e#downloads
+INHERIT=mount-boot
IUSE=doc efi
KEYWORDS=~amd64 ~ppc64 ~x86 ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LSI
diff --git a/metadata/md5-cache/sys-block/tgt-1.0.79 b/metadata/md5-cache/sys-block/tgt-1.0.79
index 571346187ff1..ce4aa468ed5b 100644
--- a/metadata/md5-cache/sys-block/tgt-1.0.79
+++ b/metadata/md5-cache/sys-block/tgt-1.0.79
@@ -3,11 +3,12 @@ DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General
DESCRIPTION=Linux SCSI target framework (tgt)
EAPI=7
HOMEPAGE=http://stgt.sourceforge.net
+INHERIT=toolchain-funcs
IUSE=fcoe fcp ibmvio infiniband rbd
KEYWORDS=amd64 arm64 ~ppc x86
LICENSE=GPL-2
RDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-perl/Config-General rbd? ( sys-cluster/ceph ) infiniband? ( sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) dev-libs/libaio sys-apps/sg3_utils
SLOT=0
SRC_URI=https://github.com/fujita/tgt/tarball/v1.0.79 -> tgt-1.0.79.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3acc4682052a593d174ccd22b0cfe61e
diff --git a/metadata/md5-cache/sys-block/vblade-24 b/metadata/md5-cache/sys-block/vblade-24
index 3c829b71f824..f2f9c87036a9 100644
--- a/metadata/md5-cache/sys-block/vblade-24
+++ b/metadata/md5-cache/sys-block/vblade-24
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=vblade exports a block device using AoE
EAPI=7
HOMEPAGE=https://github.com/OpenAoE/vblade
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=sys-apps/util-linux
SLOT=0
SRC_URI=https://github.com/OpenAoE/vblade/archive/vblade-24.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2399f8528aefbd4a50413795e1ad0472
diff --git a/metadata/md5-cache/sys-block/whdd-3.0.1 b/metadata/md5-cache/sys-block/whdd-3.0.1
index e1d29edf5155..743079f3096f 100644
--- a/metadata/md5-cache/sys-block/whdd-3.0.1
+++ b/metadata/md5-cache/sys-block/whdd-3.0.1
@@ -3,10 +3,11 @@ DEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode]
DESCRIPTION=Diagnostic and recovery tool for block devices
EAPI=6
HOMEPAGE=https://whdd.github.io
+INHERIT=toolchain-funcs vcs-snapshot
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
SLOT=0
SRC_URI=https://github.com/whdd/whdd/tarball/3.0.1 -> whdd-3.0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=1b582106c23ae07fc19d3569bb30194a
diff --git a/metadata/md5-cache/sys-block/zram-init-10.5 b/metadata/md5-cache/sys-block/zram-init-10.5
index 1d4ed35f68c2..3744bd270a82 100644
--- a/metadata/md5-cache/sys-block/zram-init-10.5
+++ b/metadata/md5-cache/sys-block/zram-init-10.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=Scripts to support compressed swap devices or ramdisks with zRAM
EAPI=7
HOMEPAGE=https://github.com/vaeth/zram-init/
+INHERIT=prefix readme.gentoo-r1
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=app-shells/push-2.0 virtual/libintl || ( sys-apps/openrc sys-apps/systemd )
diff --git a/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3 b/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
index 745b8e3fb257..7088e45aeebe 100644
--- a/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
+++ b/metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
@@ -7,5 +7,5 @@ KEYWORDS=-* ~alpha
LICENSE=GPL-2
SLOT=0
SRC_URI=http://aboot.sourceforge.net/tarballs/aboot-1.0_pre20040408.tar.bz2 mirror://gentoo/gentoo-headers-base-2.6.22.tar.bz2 mirror://gentoo/aboot_gentoo.diff.bz2 https://dev.gentoo.org/~armin76/dist/aboot_gentoo.diff.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=fa5304816043220566feda29529848e0
diff --git a/metadata/md5-cache/sys-boot/arcload-0.50-r3 b/metadata/md5-cache/sys-boot/arcload-0.50-r3
index 526c7982255a..1dadac65ac83 100644
--- a/metadata/md5-cache/sys-boot/arcload-0.50-r3
+++ b/metadata/md5-cache/sys-boot/arcload-0.50-r3
@@ -3,11 +3,12 @@ DEPEND=sys-boot/dvhtool abi_mips_o32? ( sys-devel/kgcc64 )
DESCRIPTION=ARCLoad - SGI Multi-bootloader. Able to bootload many different SGI Systems
EAPI=7
HOMEPAGE=https://www.linux-mips.org/wiki/ARCLoad
+INHERIT=toolchain-funcs
IUSE=abi_mips_o32
KEYWORDS=-* ~mips
LICENSE=GPL-2+
RESTRICT=strip
SLOT=0
SRC_URI=https://www.linux-mips.org/pub/linux/mips/people/skylark/arcload-0.5.tar.bz2 mirror://gentoo/arcload-0.50-patches-v1.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=72a95954c17df60dae0030dbb926519f
diff --git a/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1 b/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
index cd24a62dae76..8cd9aaed9941 100644
--- a/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
+++ b/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
DESCRIPTION=Xbox boot loader precompiled binaries from xbox-linux.org
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/xbox-linux/
+INHERIT=mount-boot
KEYWORDS=-* x86
LICENSE=GPL-2
RESTRICT=strip
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-14 b/metadata/md5-cache/sys-boot/efibootmgr-14
index cb1ef1997c44..6df9c44d6dc3 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-14
+++ b/metadata/md5-cache/sys-boot/efibootmgr-14
@@ -3,10 +3,11 @@ DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
DESCRIPTION=User-space application to modify the EFI boot manager
EAPI=6
HOMEPAGE=https://github.com/rhinstaller/efibootmgr
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~ia64 x86
LICENSE=GPL-2
RDEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
SLOT=0
SRC_URI=https://github.com/rhinstaller/efibootmgr/releases/download/14/efibootmgr-14.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=09231568a67fa043c018331977adeb86
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-15 b/metadata/md5-cache/sys-boot/efibootmgr-15
index af25f2697898..a31072525f5c 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-15
+++ b/metadata/md5-cache/sys-boot/efibootmgr-15
@@ -3,10 +3,11 @@ DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
DESCRIPTION=User-space application to modify the EFI boot manager
EAPI=6
HOMEPAGE=https://github.com/rhinstaller/efibootmgr
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~ia64 x86
LICENSE=GPL-2
RDEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
SLOT=0
SRC_URI=https://github.com/rhinstaller/efibootmgr/releases/download/15/efibootmgr-15.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2419c031e11bc3f0adf4518c881c7c7e
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.12 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
index d4624be926e6..8ccc871dee8d 100644
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ BSD BSD-2
RESTRICT=strip
SLOT=0
SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.12.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
_md5_=d7aff43531a431bd6e16f87ca5271c0b
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.77 b/metadata/md5-cache/sys-boot/os-prober-1.77
index cfe384f71e33..41ef0b0e22b8 100644
--- a/metadata/md5-cache/sys-boot/os-prober-1.77
+++ b/metadata/md5-cache/sys-boot/os-prober-1.77
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=Utility to detect other OSs on a set of drives
EAPI=7
HOMEPAGE=https://packages.debian.org/source/sid/os-prober
+INHERIT=readme.gentoo-r1 toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=sys-boot/grub:2[mount]
SLOT=0
SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.77.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0930d57de09032b7c97f94d571ca0bfc
diff --git a/metadata/md5-cache/sys-boot/palo-2.14 b/metadata/md5-cache/sys-boot/palo-2.14
index 0fc83b9813a5..dfcf7d740d49 100644
--- a/metadata/md5-cache/sys-boot/palo-2.14
+++ b/metadata/md5-cache/sys-boot/palo-2.14
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=PALO : PArisc Linux Loader
EAPI=7
HOMEPAGE=http://parisc-linux.org/ https://parisc.wiki.kernel.org/
+INHERIT=toolchain-funcs
KEYWORDS=-* hppa
LICENSE=GPL-2
SLOT=0
SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git/snapshot/palo-2.14.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=58a9bebfa204a4e08091f7181ca3ec6c
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022
index d4b0b12ded18..cc7e4d62b55a 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend
DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot readme.gentoo-r1
KEYWORDS=-* arm arm64
LICENSE=GPL-2 raspberrypi-videocore-bin
RESTRICT=binchecks strip
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201201 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201201
index dba627480aa4..25625ebf7094 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201201
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201201
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend
DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot readme.gentoo-r1
KEYWORDS=-* arm arm64
LICENSE=GPL-2 raspberrypi-videocore-bin
RESTRICT=binchecks strip
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20210108 b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20210108
index 952f8d382ed5..a5203114c53d 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20210108
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20210108
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend
DESCRIPTION=Raspberry Pi (all versions) bootloader and GPU firmware
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot readme.gentoo-r1
KEYWORDS=-* arm arm64
LICENSE=GPL-2 raspberrypi-videocore-bin
RESTRICT=binchecks strip
diff --git a/metadata/md5-cache/sys-boot/refind-0.11.4 b/metadata/md5-cache/sys-boot/refind-0.11.4
index b66448113249..1c4bc8d74cec 100644
--- a/metadata/md5-cache/sys-boot/refind-0.11.4
+++ b/metadata/md5-cache/sys-boot/refind-0.11.4
@@ -3,10 +3,11 @@ DEPEND=gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) !gnuefi? ( >=sys-boot/udk-2018-r1 )
DESCRIPTION=The UEFI Boot Manager by Rod Smith
EAPI=7
HOMEPAGE=https://www.rodsbooks.com/refind/
+INHERIT=multiprocessing toolchain-funcs
IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc gnuefi
KEYWORDS=amd64 x86
LICENSE=BSD GPL-2 GPL-3 FDL-1.3
SLOT=0
SRC_URI=mirror://sourceforge/project/refind/0.11.4/refind-src-0.11.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a0ccf0b9debecf8661544898d9616fff
diff --git a/metadata/md5-cache/sys-boot/refind-0.12.0-r1 b/metadata/md5-cache/sys-boot/refind-0.12.0-r1
index ff36443cadcc..6b2bfe785c2d 100644
--- a/metadata/md5-cache/sys-boot/refind-0.12.0-r1
+++ b/metadata/md5-cache/sys-boot/refind-0.12.0-r1
@@ -3,10 +3,11 @@ DEPEND=sys-boot/gnu-efi
DESCRIPTION=The UEFI Boot Manager by Rod Smith
EAPI=7
HOMEPAGE=https://www.rodsbooks.com/refind/
+INHERIT=multiprocessing toolchain-funcs
IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc
KEYWORDS=amd64 x86
LICENSE=BSD GPL-2 GPL-3 FDL-1.3
SLOT=0
SRC_URI=mirror://sourceforge/project/refind/0.12.0/refind-src-0.12.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5eaa9084b75290c50e4159bfa5024bbb
diff --git a/metadata/md5-cache/sys-boot/sgibootcd-0.12 b/metadata/md5-cache/sys-boot/sgibootcd-0.12
index 4550d882523b..235043a7bc38 100644
--- a/metadata/md5-cache/sys-boot/sgibootcd-0.12
+++ b/metadata/md5-cache/sys-boot/sgibootcd-0.12
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Creates burnable CD images for SGI LiveCDs
EAPI=7
HOMEPAGE=ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/
+INHERIT=toolchain-funcs
KEYWORDS=-* ~mips
LICENSE=all-rights-reserved
SLOT=0
SRC_URI=ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/sgibootcd-0.12.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e19297d7721b69bb81c6407fe00101d2
diff --git a/metadata/md5-cache/sys-cluster/hpl-2.0-r4 b/metadata/md5-cache/sys-cluster/hpl-2.0-r4
index c47d6bec8fdc..76edab5e0381 100644
--- a/metadata/md5-cache/sys-cluster/hpl-2.0-r4
+++ b/metadata/md5-cache/sys-cluster/hpl-2.0-r4
@@ -4,11 +4,12 @@ DEPEND=virtual/blas virtual/lapack virtual/mpi
DESCRIPTION=Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters
EAPI=7
HOMEPAGE=http://www.netlib.org/benchmark/hpl/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=HPL
RDEPEND=virtual/blas virtual/lapack virtual/mpi
SLOT=0
SRC_URI=http://www.netlib.org/benchmark/hpl/hpl-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=809e545bfc5c60ff5dbb4b6f69ef08a1
diff --git a/metadata/md5-cache/sys-cluster/k9scli-0.20.5 b/metadata/md5-cache/sys-cluster/k9scli-0.20.5
index 897ef655e076..27e28d0d8166 100644
--- a/metadata/md5-cache/sys-cluster/k9scli-0.20.5
+++ b/metadata/md5-cache/sys-cluster/k9scli-0.20.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=terminal based UI to manage kubernetes clusters
EAPI=7
HOMEPAGE=https://k9scli.io
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/sys-cluster/k9scli-0.21.2 b/metadata/md5-cache/sys-cluster/k9scli-0.21.2
index 74495a3bd5ac..ff528fdc7a06 100644
--- a/metadata/md5-cache/sys-cluster/k9scli-0.21.2
+++ b/metadata/md5-cache/sys-cluster/k9scli-0.21.2
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=terminal based UI to manage kubernetes clusters
EAPI=7
HOMEPAGE=https://k9scli.io
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/sys-cluster/k9scli-0.22.1 b/metadata/md5-cache/sys-cluster/k9scli-0.22.1
index 58e80c5817a7..4b61e54d9021 100644
--- a/metadata/md5-cache/sys-cluster/k9scli-0.22.1
+++ b/metadata/md5-cache/sys-cluster/k9scli-0.22.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst prepare unpack
DESCRIPTION=terminal based UI to manage kubernetes clusters
EAPI=7
HOMEPAGE=https://k9scli.io
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
diff --git a/metadata/md5-cache/sys-cluster/kube-router-1.1.1 b/metadata/md5-cache/sys-cluster/kube-router-1.1.1
index 5d6808ad839f..51e286632f98 100644
--- a/metadata/md5-cache/sys-cluster/kube-router-1.1.1
+++ b/metadata/md5-cache/sys-cluster/kube-router-1.1.1
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst test unpack
DESCRIPTION=A turnkey solution for Kubernetes networking
EAPI=7
HOMEPAGE=https://kube-router.io
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception
RDEPEND=net-firewall/iptables[conntrack] net-firewall/ipset sys-cluster/ipvsadm
diff --git a/metadata/md5-cache/sys-cluster/kubeletctl-1.5 b/metadata/md5-cache/sys-cluster/kubeletctl-1.5
index a75799d0f728..30ebbddae008 100644
--- a/metadata/md5-cache/sys-cluster/kubeletctl-1.5
+++ b/metadata/md5-cache/sys-cluster/kubeletctl-1.5
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A client for kubelet
EAPI=7
HOMEPAGE=https://github.com/cyberark/kubeletctl
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
RESTRICT=strip test
diff --git a/metadata/md5-cache/sys-cluster/kubeletctl-1.6 b/metadata/md5-cache/sys-cluster/kubeletctl-1.6
index 58b80aa857c0..b9b7bfd6d71f 100644
--- a/metadata/md5-cache/sys-cluster/kubeletctl-1.6
+++ b/metadata/md5-cache/sys-cluster/kubeletctl-1.6
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=A client for kubelet
EAPI=7
HOMEPAGE=https://github.com/cyberark/kubeletctl
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
RESTRICT=strip test
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.10.1 b/metadata/md5-cache/sys-cluster/minikube-1.10.1
index 0bb4b3257021..b4d56d751545 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.10.1
+++ b/metadata/md5-cache/sys-cluster/minikube-1.10.1
@@ -4,6 +4,7 @@ DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
DESCRIPTION=Single Node Kubernetes Cluster
EAPI=7
HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+INHERIT=go-module
IUSE=hardened libvirt
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.11.0 b/metadata/md5-cache/sys-cluster/minikube-1.11.0
index 08379bb1ab87..a68564029500 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.11.0
+++ b/metadata/md5-cache/sys-cluster/minikube-1.11.0
@@ -4,6 +4,7 @@ DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
DESCRIPTION=Single Node Kubernetes Cluster
EAPI=7
HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+INHERIT=go-module
IUSE=hardened libvirt
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.13.1 b/metadata/md5-cache/sys-cluster/minikube-1.13.1
index e20a85ff120e..d56a59a8fb7a 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.13.1
+++ b/metadata/md5-cache/sys-cluster/minikube-1.13.1
@@ -4,6 +4,7 @@ DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
DESCRIPTION=Single Node Kubernetes Cluster
EAPI=7
HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+INHERIT=go-module
IUSE=hardened libvirt
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
diff --git a/metadata/md5-cache/sys-cluster/pconsole-1.0-r4 b/metadata/md5-cache/sys-cluster/pconsole-1.0-r4
index 18a3b3a0bd9d..8bed7d3221cf 100644
--- a/metadata/md5-cache/sys-cluster/pconsole-1.0-r4
+++ b/metadata/md5-cache/sys-cluster/pconsole-1.0-r4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=Tool for managing multiple xterms simultaneously
EAPI=7
HOMEPAGE=https://github.com/walterdejong/pconsole
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.xs4all.nl/~walterj/pconsole/pconsole-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3c332afca05591515653da6e28ff595f
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.71 b/metadata/md5-cache/sys-devel/autoconf-2.71
index fec1342bd126..874100a2c715 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.71
+++ b/metadata/md5-cache/sys-devel/autoconf-2.71
@@ -3,6 +3,7 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Used to create autoconfiguration files
EAPI=7
HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
+INHERIT=toolchain-autoconf
IUSE=emacs
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
diff --git a/metadata/md5-cache/sys-devel/dev86-0.16.21-r3 b/metadata/md5-cache/sys-devel/dev86-0.16.21-r3
index a25f88ad11b8..ef92ee650f1b 100644
--- a/metadata/md5-cache/sys-devel/dev86-0.16.21-r3
+++ b/metadata/md5-cache/sys-devel/dev86-0.16.21-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=sys-devel/bin86
SLOT=0
SRC_URI=http://v3.sk/~lkundrak/dev86/Dev86src-0.16.21.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=24960904a4d7d270078271976da31e70
diff --git a/metadata/md5-cache/sys-devel/dwz-0.13 b/metadata/md5-cache/sys-devel/dwz-0.13
index c6f46aa0798f..347691ad820c 100644
--- a/metadata/md5-cache/sys-devel/dwz-0.13
+++ b/metadata/md5-cache/sys-devel/dwz-0.13
@@ -4,6 +4,7 @@ DEPEND=dev-libs/elfutils
DESCRIPTION=DWARF optimization and duplicate removal tool
EAPI=7
HOMEPAGE=https://sourceware.org/dwz
+INHERIT=toolchain-funcs
IUSE=test
KEYWORDS=~amd64
LICENSE=GPL-2+ GPL-3+
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/elfutils
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://sourceware.org/ftp/dwz/releases/dwz-0.13.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1aad987f55fcdb5ea74777d79596a786
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1752 b/metadata/md5-cache/sys-devel/gdb-apple-1752
index c323c94bbb6e..2ad7fe9efc72 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1752
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1752
@@ -10,5 +10,5 @@ LICENSE=APSL-2 GPL-2
RDEPEND=>=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= =dev-db/sqlite-3*
SLOT=0
SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1752.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc
_md5_=8445d8442c42359de3c7614a7dd98e3c
diff --git a/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2 b/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
index ef8a4009b382..aa40f8e08ab3 100644
--- a/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
+++ b/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm
DESCRIPTION=Wrappers for gcc tools to be used on non-native CHOSTs
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib
KEYWORDS=amd64
LICENSE=public-domain
RDEPEND=sys-devel/gcc:=
diff --git a/metadata/md5-cache/sys-devel/qconf-2.5 b/metadata/md5-cache/sys-devel/qconf-2.5
index 80a7dac9d716..158753a76f04 100644
--- a/metadata/md5-cache/sys-devel/qconf-2.5
+++ b/metadata/md5-cache/sys-devel/qconf-2.5
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
DESCRIPTION=./configure like generator for qmake-based projects
EAPI=7
HOMEPAGE=https://github.com/psi-im/qconf
+INHERIT=qmake-utils
KEYWORDS=amd64 ~arm ~hppa ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtxml:5
SLOT=0
SRC_URI=https://github.com/psi-im/qconf/archive/v2.5.tar.gz -> qconf-2.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=4e4de0ce2bfdea1651d0bd4a434d18fd
diff --git a/metadata/md5-cache/sys-devel/smatch-1.60 b/metadata/md5-cache/sys-devel/smatch-1.60
index 6f418f9769ee..e0e4efd4d8a9 100644
--- a/metadata/md5-cache/sys-devel/smatch-1.60
+++ b/metadata/md5-cache/sys-devel/smatch-1.60
@@ -4,10 +4,11 @@ DEPEND=dev-db/sqlite
DESCRIPTION=static analysis tool for C
EAPI=7
HOMEPAGE=http://smatch.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=OSL-1.1
RDEPEND=dev-db/sqlite
SLOT=0
SRC_URI=http://repo.or.cz/w/smatch.git/snapshot/1.60.tar.gz -> smatch-1.60.tar.gz mirror://gentoo/smatch-1.60.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aa845c6c79716fbfaf52ac525b3aef75
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
index f70d03408c77..36780fe6ea1f 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install
DESCRIPTION=Advanced Linux Sound Architecture firmware
EAPI=7
HOMEPAGE=https://alsa-project.org/
+INHERIT=udev
IUSE=alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
SLOT=0
SRC_URI=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-1.2.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=3c8f92445da158a50062ab0d5212d84b
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
index 122fd31e628b..13989c802a8f 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
@@ -3,11 +3,12 @@ DEFINED_PHASES=configure install
DESCRIPTION=Advanced Linux Sound Architecture firmware
EAPI=7
HOMEPAGE=https://alsa-project.org/
+INHERIT=udev
IUSE=alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
SLOT=0
SRC_URI=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-1.2.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
_md5_=fdbf3d62bdd82f27ad38fdaec6388904
diff --git a/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1 b/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
index f94c9ccfb7aa..dd91d077bb2c 100644
--- a/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
+++ b/metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
@@ -2,11 +2,12 @@ DEFINED_PHASES=compile install postinst postrm
DESCRIPTION=Firmware and config for atmel and atmel_cs wlan drivers included in linux 2.6
EAPI=5
HOMEPAGE=http://www.thekelleys.org.uk/atmel/
+INHERIT=toolchain-funcs
IUSE=pcmcia usb
KEYWORDS=amd64 ~ppc x86
LICENSE=Atmel
RDEPEND=>=net-wireless/wireless-tools-26-r1 pcmcia? ( sys-apps/pcmciautils )
SLOT=0
SRC_URI=http://www.thekelleys.org.uk/atmel/atmel-firmware-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9368d0f39795ffeb9878e27015efca34
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.21.1 b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
index 4589c834877a..f03670067c86 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.21.1
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.21.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
REQUIRED_USE=!amd64? ( !x86? ( binary ) )
SLOT=0
SRC_URI=!binary? ( https://github.com/ipxe/ipxe/archive/refs/tags/v1.21.1.tar.gz -> ipxe-1.21.1.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.21.1-bin.tar.xz )
-_eclasses_=portability c10bdc40668533b1faf15b1d89df0303 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e portability c10bdc40668533b1faf15b1d89df0303 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd
_md5_=332d436052c41289e22b438d59fc23df
diff --git a/metadata/md5-cache/sys-fs/duperemove-0.11.2 b/metadata/md5-cache/sys-fs/duperemove-0.11.2
index a5e76fd12428..e85fabdad7ef 100644
--- a/metadata/md5-cache/sys-fs/duperemove-0.11.2
+++ b/metadata/md5-cache/sys-fs/duperemove-0.11.2
@@ -3,10 +3,11 @@ DEPEND=dev-db/sqlite:3 dev-libs/glib:2
DESCRIPTION=Btrfs and xfs deduplication utility
EAPI=7
HOMEPAGE=https://github.com/markfasheh/duperemove
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-db/sqlite:3 dev-libs/glib:2
SLOT=0
SRC_URI=https://github.com/markfasheh/duperemove/archive/v0.11.2.tar.gz -> duperemove-0.11.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bae120e665aa2cd76b90999f0d8af75e
diff --git a/metadata/md5-cache/sys-fs/e2tools-0.1.0 b/metadata/md5-cache/sys-fs/e2tools-0.1.0
index d79447baaf62..a408726bc891 100644
--- a/metadata/md5-cache/sys-fs/e2tools-0.1.0
+++ b/metadata/md5-cache/sys-fs/e2tools-0.1.0
@@ -3,10 +3,11 @@ DEPEND=sys-fs/e2fsprogs sys-libs/e2fsprogs-libs
DESCRIPTION=utilities to read, write, and manipulate files in an ext2/ext3 filesystem
EAPI=7
HOMEPAGE=https://github.com/ndim/e2tools
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-fs/e2fsprogs sys-libs/e2fsprogs-libs
SLOT=0
SRC_URI=https://github.com/e2tools/e2tools/releases/download/v0.1.0/e2tools-0.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=40996cb6e80110156e453e40b14686cd
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.6.3.622 b/metadata/md5-cache/sys-fs/fatsort-1.6.3.622
index b76256387c00..ef307a338c63 100644
--- a/metadata/md5-cache/sys-fs/fatsort-1.6.3.622
+++ b/metadata/md5-cache/sys-fs/fatsort-1.6.3.622
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare test
DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players
EAPI=7
HOMEPAGE=http://fatsort.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/fatsort/fatsort-1.6.3.622.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2a1820ce0258b33b537f08f7fd554b90
diff --git a/metadata/md5-cache/sys-fs/fuse-zip-0.7.0 b/metadata/md5-cache/sys-fs/fuse-zip-0.7.0
index 476ef80be1f4..1c7bfbbf1344 100644
--- a/metadata/md5-cache/sys-fs/fuse-zip-0.7.0
+++ b/metadata/md5-cache/sys-fs/fuse-zip-0.7.0
@@ -3,11 +3,12 @@ DEPEND=dev-libs/libzip:= sys-fs/fuse:0
DESCRIPTION=FUSE file system to navigate, extract, create and modify ZIP archives
EAPI=7
HOMEPAGE=https://bitbucket.org/agalanin/fuse-zip
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-libs/libzip:= sys-fs/fuse:0
RESTRICT=test
SLOT=0
SRC_URI=https://bitbucket.org/agalanin/fuse-zip/downloads/fuse-zip-0.7.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=286b1f9ea554467a79076495f0d50be2
diff --git a/metadata/md5-cache/sys-fs/go-mtpfs-1.0.0 b/metadata/md5-cache/sys-fs/go-mtpfs-1.0.0
index 79a1233f7954..12f443aecd5b 100644
--- a/metadata/md5-cache/sys-fs/go-mtpfs-1.0.0
+++ b/metadata/md5-cache/sys-fs/go-mtpfs-1.0.0
@@ -4,6 +4,7 @@ DEPEND=virtual/libusb:1 virtual/udev media-libs/libmtp
DESCRIPTION=a simple FUSE filesystem for mounting Android devices as a MTP device
EAPI=7
HOMEPAGE=https://github.com/hanwen/go-mtpfs
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD
RDEPEND=virtual/libusb:1 virtual/udev
diff --git a/metadata/md5-cache/sys-fs/lufis-0.3 b/metadata/md5-cache/sys-fs/lufis-0.3
index b7c8c0ddfd82..baa5e49e7e24 100644
--- a/metadata/md5-cache/sys-fs/lufis-0.3
+++ b/metadata/md5-cache/sys-fs/lufis-0.3
@@ -3,9 +3,10 @@ DEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3
DESCRIPTION=Wrapper to use lufs modules with fuse kernel support
EAPI=6
HOMEPAGE=http://fuse.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/fuse/lufis-0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=92493f70107a281cd26f72ae466865b2
diff --git a/metadata/md5-cache/sys-fs/lufis-0.3-r1 b/metadata/md5-cache/sys-fs/lufis-0.3-r1
index 6d2dbf54a3a8..ef62a002daa3 100644
--- a/metadata/md5-cache/sys-fs/lufis-0.3-r1
+++ b/metadata/md5-cache/sys-fs/lufis-0.3-r1
@@ -3,10 +3,11 @@ DEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3:0=
DESCRIPTION=Wrapper to use lufs modules with fuse kernel support
EAPI=7
HOMEPAGE=http://fuse.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3:0=
SLOT=0
SRC_URI=mirror://sourceforge/fuse/lufis-0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cdd418cc0637291ad72431ac54fcb5b7
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.32.1 b/metadata/md5-cache/sys-fs/mergerfs-2.32.1
index ac2213360b55..c5e9508023b9 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.32.1
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.32.1
@@ -4,11 +4,12 @@ DEPEND=xattr? ( sys-apps/attr )
DESCRIPTION=A featureful union filesystem
EAPI=7
HOMEPAGE=https://github.com/trapexit/mergerfs
+INHERIT=toolchain-funcs
IUSE=+xattr
KEYWORDS=amd64 x86
LICENSE=ISC LGPL-2.1
RDEPEND=xattr? ( sys-apps/attr )
SLOT=0
SRC_URI=https://github.com/trapexit/mergerfs/archive/2.32.1.tar.gz -> mergerfs-2.32.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6b1fdf98d9d2020daa1463dff0cae8f1
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.32.2 b/metadata/md5-cache/sys-fs/mergerfs-2.32.2
index 674d8ab58ffc..531234de1436 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.32.2
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.32.2
@@ -4,11 +4,12 @@ DEPEND=xattr? ( sys-apps/attr )
DESCRIPTION=A featureful union filesystem
EAPI=7
HOMEPAGE=https://github.com/trapexit/mergerfs
+INHERIT=toolchain-funcs
IUSE=+xattr
KEYWORDS=~amd64 ~x86
LICENSE=ISC LGPL-2.1
RDEPEND=xattr? ( sys-apps/attr )
SLOT=0
SRC_URI=https://github.com/trapexit/mergerfs/archive/2.32.2.tar.gz -> mergerfs-2.32.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=cb78fb241262775f57a9a51fa97391cf
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.32.3 b/metadata/md5-cache/sys-fs/mergerfs-2.32.3
index a8c8c6ca45e2..9281c365426e 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.32.3
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.32.3
@@ -4,11 +4,12 @@ DEPEND=xattr? ( sys-apps/attr )
DESCRIPTION=A featureful union filesystem
EAPI=7
HOMEPAGE=https://github.com/trapexit/mergerfs
+INHERIT=toolchain-funcs
IUSE=+xattr
KEYWORDS=amd64 x86
LICENSE=ISC LGPL-2.1
RDEPEND=xattr? ( sys-apps/attr )
SLOT=0
SRC_URI=https://github.com/trapexit/mergerfs/archive/2.32.3.tar.gz -> mergerfs-2.32.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6b1fdf98d9d2020daa1463dff0cae8f1
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.32.4 b/metadata/md5-cache/sys-fs/mergerfs-2.32.4
index a0d39ef68a9c..299fd750b7bd 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.32.4
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.32.4
@@ -4,11 +4,12 @@ DEPEND=xattr? ( sys-apps/attr )
DESCRIPTION=A featureful union filesystem
EAPI=7
HOMEPAGE=https://github.com/trapexit/mergerfs
+INHERIT=toolchain-funcs
IUSE=+xattr
KEYWORDS=~amd64 ~x86
LICENSE=ISC LGPL-2.1
RDEPEND=xattr? ( sys-apps/attr )
SLOT=0
SRC_URI=https://github.com/trapexit/mergerfs/archive/2.32.4.tar.gz -> mergerfs-2.32.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c36fe198a9910df6da840b1ae4c4b657
diff --git a/metadata/md5-cache/sys-fs/quotatool-1.6.2 b/metadata/md5-cache/sys-fs/quotatool-1.6.2
index 3d400a72a4d4..6abfabf84813 100644
--- a/metadata/md5-cache/sys-fs/quotatool-1.6.2
+++ b/metadata/md5-cache/sys-fs/quotatool-1.6.2
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=Command-line utility for filesystem quotas
EAPI=7
HOMEPAGE=http://quotatool.ekenberg.se/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
RDEPEND=sys-fs/quota
SLOT=0
SRC_URI=http://quotatool.ekenberg.se/quotatool-1.6.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6e25e47f49c9d0a6d5133ff0d9d03fdb
diff --git a/metadata/md5-cache/sys-fs/reiser4progs-2.0.4 b/metadata/md5-cache/sys-fs/reiser4progs-2.0.4
index 79ecf2508f27..8b9dc341cb2b 100644
--- a/metadata/md5-cache/sys-fs/reiser4progs-2.0.4
+++ b/metadata/md5-cache/sys-fs/reiser4progs-2.0.4
@@ -3,6 +3,7 @@ DEPEND=!static? ( >=sys-libs/libaal-1.0.7:= readline? ( sys-libs/readline:0= ) )
DESCRIPTION=reiser4progs: mkfs, fsck, etc...
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/reiser4/
+INHERIT=multilib toolchain-funcs usr-ldscript
IUSE=debug readline static static-libs split-usr
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9 b/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
index e48b2f657c73..4569b09f4f6c 100644
--- a/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
+++ b/metadata/md5-cache/sys-fs/yaffs2utils-0.2.9
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=tools for generating YAFFS images
EAPI=7
HOMEPAGE=https://code.google.com/p/yaffs2utils/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~mips ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://yaffs2utils.googlecode.com/files/0.2.9.tar.gz -> yaffs2utils-0.2.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7a7935f2fc43cce49b257ad0f9dcc028
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
index 5f1af13f83e0..fdd5d943e978 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
@@ -3,6 +3,7 @@ DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
+INHERIT=kernel-install
IUSE=+initramfs test
KEYWORDS=-* amd64
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
RESTRICT=strip test
SLOT=4.14.178-FC.01
SRC_URI=https://xyinn.org/gentoo/kernels/4.14.178-FC.01/kernel-4.14.178-FC.01.tar.xz
-_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f mount-boot 060ced4c5e0fd737db17cbb609bbf557 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e kernel-install 2154935526abef328cb31b7a02890f47
_md5_=7cba610edaaca4b1ab671a5b00f17fb5
diff --git a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51 b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
index 3c7527a8f263..71089e5898b3 100644
--- a/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+++ b/metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
@@ -3,6 +3,7 @@ DEFINED_PHASES=config install postinst postrm preinst prerm pretend test
DESCRIPTION=Precompiled Vanilla Kernel (Kernel Ready-to-Eat [KRE])
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/User:Fearedbliss
+INHERIT=kernel-install
IUSE=+initramfs test
KEYWORDS=-* amd64
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-bo
RESTRICT=strip test
SLOT=5.4.51-FB.01
SRC_URI=https://xyinn.org/gentoo/kernels/5.4.51-FB.01/kernel-5.4.51-FB.01.tar.xz
-_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f mount-boot 060ced4c5e0fd737db17cbb609bbf557 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e kernel-install 2154935526abef328cb31b7a02890f47
_md5_=8170537a4890872f8e6fe40afe25e141
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215 b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
index 55467efb5c7e..7bc2c73a6c72 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
DESCRIPTION=Raspberry Pi (all versions) kernel and modules
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot
KEYWORDS=-* ~arm
LICENSE=GPL-2 raspberrypi-videocore-bin
RDEPEND=sys-boot/raspberrypi-firmware
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925 b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
index 666c7d7bd04e..2bc2e8762272 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
DESCRIPTION=Raspberry Pi (all versions) kernel and modules
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot
KEYWORDS=-* ~arm
LICENSE=GPL-2 raspberrypi-videocore-bin
RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-5.10.11_p20210201 b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.10.11_p20210201
index e993a7a5c8c2..3b401644a3e6 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-5.10.11_p20210201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.10.11_p20210201
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
DESCRIPTION=Raspberry Pi (all versions) kernel and modules
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot
LICENSE=GPL-2 raspberrypi-videocore-bin
RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
RESTRICT=binchecks strip
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201 b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
index 3096da7079ee..9049cc330f15 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
DESCRIPTION=Raspberry Pi (all versions) kernel and modules
EAPI=7
HOMEPAGE=https://github.com/raspberrypi/firmware
+INHERIT=mount-boot
KEYWORDS=-* ~arm ~arm64
LICENSE=GPL-2 raspberrypi-videocore-bin
RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
diff --git a/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r1 b/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r1
index 4c12802c4532..3a98a06ebe4d 100644
--- a/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r1
+++ b/metadata/md5-cache/sys-libs/blocksruntime-0_pre20171027-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare unpack
DESCRIPTION=BlocksRuntime library needed for clang's -fblocks support
EAPI=7
HOMEPAGE=https://github.com/mackyle/blocksruntime
+INHERIT=toolchain-funcs vcs-snapshot
IUSE=static-libs
KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
SLOT=0
SRC_URI=https://github.com/mackyle/blocksruntime/archive/9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81.tar.gz -> blocksruntime-0_pre20171027.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=2486da084ce9e8c007da12935ea8ded0
diff --git a/metadata/md5-cache/sys-libs/cygwin-crypt-1.4 b/metadata/md5-cache/sys-libs/cygwin-crypt-1.4
index 4ec31d684c8f..e9996f7de6ca 100644
--- a/metadata/md5-cache/sys-libs/cygwin-crypt-1.4
+++ b/metadata/md5-cache/sys-libs/cygwin-crypt-1.4
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Cygwin Encryption/Decryption utility and library
EAPI=5
HOMEPAGE=https://sourceware.org/cygwin-apps/
+INHERIT=toolchain-funcs
KEYWORDS=~x64-cygwin
LICENSE=GPL-2+
SLOT=0
SRC_URI=mirror://gentoo/cygwin-crypt-1.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=35a1769b94240cf62585b43f89298b7e
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r6 b/metadata/md5-cache/sys-libs/db-5.3.28-r6
index 7b0f91b7c42a..c380d4931d3d 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r6
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r6
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tcl )
RESTRICT=!test? ( test )
SLOT=5.3
SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 db c42a9015ada022c979cd2ca4bc247821 flag-o-matic bc2e7662a4a9a8643be851982a837ddc eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 db c42a9015ada022c979cd2ca4bc247821 flag-o-matic bc2e7662a4a9a8643be851982a837ddc eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=f38858a42dcc898cc2fdfbc6abad6652
diff --git a/metadata/md5-cache/sys-libs/ldb-2.1.4-r1 b/metadata/md5-cache/sys-libs/ldb-2.1.4-r1
index a0adf25fb477..0f630d81c6e0 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.1.4-r1
+++ b/metadata/md5-cache/sys-libs/ldb-2.1.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0/2.1.4
SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.1.4.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=6c26892f92d52c05e0aaf5cdc342045d
diff --git a/metadata/md5-cache/sys-libs/ldb-2.1.5 b/metadata/md5-cache/sys-libs/ldb-2.1.5
index 4f2001fe9b39..2c8657a9d715 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.1.5
+++ b/metadata/md5-cache/sys-libs/ldb-2.1.5
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0/2.1.5
SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.1.5.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=2c075dc5d27e7ece11e9962598825f2f
diff --git a/metadata/md5-cache/sys-libs/ldb-2.2.0-r2 b/metadata/md5-cache/sys-libs/ldb-2.2.0-r2
index 88128c2b5d5b..a545412f4723 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.2.0-r2
+++ b/metadata/md5-cache/sys-libs/ldb-2.2.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0/2.2.0
SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.2.0.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=2c075dc5d27e7ece11e9962598825f2f
diff --git a/metadata/md5-cache/sys-libs/ldb-2.2.1 b/metadata/md5-cache/sys-libs/ldb-2.2.1
index 376b452599bf..f9e62de64385 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.2.1
+++ b/metadata/md5-cache/sys-libs/ldb-2.2.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0/2.2.1
SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.2.1.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=7ab14203a8a8da4686d683ed9974d6a3
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.0 b/metadata/md5-cache/sys-libs/ldb-2.3.0
index 427e085bee7f..ba3b9e101386 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.3.0
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0/2.3.0
SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.0.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=2c075dc5d27e7ece11e9962598825f2f
diff --git a/metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3 b/metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3
index 5aa9f407d79b..7d94f33d5e9c 100644
--- a/metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3
+++ b/metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=A stand-alone client/server 9P library including ixpc client
EAPI=7
HOMEPAGE=https://libs.suckless.org/deprecated/libixp
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=MIT
SLOT=0
SRC_URI=mirror://gentoo/libixp-0.5_p20110208.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5cb1a8dd6891ded62389a6f57df3dfb8
diff --git a/metadata/md5-cache/sys-libs/libuuid-1.0.3 b/metadata/md5-cache/sys-libs/libuuid-1.0.3
index d722fe69b169..fa0beb7c28ca 100644
--- a/metadata/md5-cache/sys-libs/libuuid-1.0.3
+++ b/metadata/md5-cache/sys-libs/libuuid-1.0.3
@@ -3,10 +3,11 @@ DEPEND=!!sys-apps/util-linux !!sys-libs/native-uuid >=app-portage/elt-patches-20
DESCRIPTION=Portable uuid C library
EAPI=6
HOMEPAGE=http://libuuid.sourceforge.net/
+INHERIT=libtool
KEYWORDS=~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=!!sys-apps/util-linux !!sys-libs/native-uuid
SLOT=0
SRC_URI=mirror://sourceforge/libuuid/libuuid-1.0.3.tar.gz
-_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96
_md5_=4d3cc7eeec6274ce00e75da925002357
diff --git a/metadata/md5-cache/sys-libs/lwp-2.8 b/metadata/md5-cache/sys-libs/lwp-2.8
index 685b5a773ffa..efdf5dda4293 100644
--- a/metadata/md5-cache/sys-libs/lwp-2.8
+++ b/metadata/md5-cache/sys-libs/lwp-2.8
@@ -2,9 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Light-weight process library (used by Coda)
EAPI=6
HOMEPAGE=http://www.coda.cs.cmu.edu/
+INHERIT=ltprune
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=LGPL-2.1
SLOT=1
SRC_URI=http://www.coda.cs.cmu.edu/pub/lwp/src/lwp-2.8.tar.xz
-_eclasses_=ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
_md5_=afe3a09aae7c0f98166fd05671cc6a2e
diff --git a/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1 b/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
index dbd898140989..eba93f1cea1d 100644
--- a/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
+++ b/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=NSS module to read passwd/group files from CoreOS /usr location
EAPI=7
HOMEPAGE=https://github.com/coreos/nss-altfiles
+INHERIT=toolchain-funcs
KEYWORDS=~amd64-linux
LICENSE=LGPL-2.1+
SLOT=0
SRC_URI=https://github.com/coreos/nss-altfiles/archive/v2.18.1.tar.gz -> nss-altfiles-2.18.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ec71a6e71b541b751ccc1f56d48b481b
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.2.1 b/metadata/md5-cache/sys-power/acpi_call-1.2.1
index a01b013fe66c..70f5f82bbcfb 100644
--- a/metadata/md5-cache/sys-power/acpi_call-1.2.1
+++ b/metadata/md5-cache/sys-power/acpi_call-1.2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
SLOT=0
SRC_URI=https://github.com/nix-community/acpi_call/archive/v1.2.1.tar.gz -> acpi_call-1.2.1.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e linux-info 30ded7f9adbdd03d3e848cdd74f6c395 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e linux-mod 2356a95549dd8cb503f063d05e88c0c8
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e linux-info 30ded7f9adbdd03d3e848cdd74f6c395 linux-mod 2356a95549dd8cb503f063d05e88c0c8
_md5_=7172c3c6ea120695245a43c5f0f3f36b
diff --git a/metadata/md5-cache/sys-power/athcool-0.3.12 b/metadata/md5-cache/sys-power/athcool-0.3.12
index 05bfc63cabb8..7c29c90a3d52 100644
--- a/metadata/md5-cache/sys-power/athcool-0.3.12
+++ b/metadata/md5-cache/sys-power/athcool-0.3.12
@@ -3,9 +3,10 @@ DEPEND=sys-apps/pciutils
DESCRIPTION=small utility to toggle Powersaving mode for AMD Athlon/Duron processors
EAPI=7
HOMEPAGE=http://members.jcom.home.ne.jp/jacobi/linux/softwares.html#athcool
+INHERIT=toolchain-funcs
KEYWORDS=-* x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://members.jcom.home.ne.jp/jacobi/linux/files/athcool-0.3.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=db7765957317649fe08a5aa630426a2d
diff --git a/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03-r1 b/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03-r1
index 1971c20a5723..86a4c542e454 100644
--- a/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03-r1
+++ b/metadata/md5-cache/sys-power/nvram-reboot-2004.10.03-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
DESCRIPTION=PowerOff Boot-Images for nvram-wakeup (not needed for GRUB)
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/nvram-wakeup/
+INHERIT=mount-boot
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
diff --git a/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2 b/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
index c9c915172a66..a82e9b57d8c7 100644
--- a/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
+++ b/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
@@ -3,10 +3,11 @@ DEPEND=virtual/awk sys-apps/grep sys-apps/kmod[tools]
DESCRIPTION=Script to test whether computer is running on AC power
EAPI=7
HOMEPAGE=http://packages.debian.org/testing/utils/powermgmt-base
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~ia64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=virtual/awk sys-apps/grep sys-apps/kmod[tools]
SLOT=0
SRC_URI=mirror://debian/pool/main/p/powermgmt-base/powermgmt-base_1.31.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b9d225f5ea337a939daad04ffe8d3a42
diff --git a/metadata/md5-cache/sys-power/powerstat-0.02.21 b/metadata/md5-cache/sys-power/powerstat-0.02.21
index 1f866316025f..f7d956ca3081 100644
--- a/metadata/md5-cache/sys-power/powerstat-0.02.21
+++ b/metadata/md5-cache/sys-power/powerstat-0.02.21
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile
DESCRIPTION=Laptop power measuring tool
EAPI=7
HOMEPAGE=https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://github.com/ColinIanKing/powerstat/archive/V0.02.21.tar.gz -> powerstat-0.02.21.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2edfecafd89f66212ddd7f2659f7977a
diff --git a/metadata/md5-cache/sys-power/powerstat-0.02.22 b/metadata/md5-cache/sys-power/powerstat-0.02.22
index 11b183571a3d..fb32b92880a6 100644
--- a/metadata/md5-cache/sys-power/powerstat-0.02.22
+++ b/metadata/md5-cache/sys-power/powerstat-0.02.22
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile prepare
DESCRIPTION=Laptop power measuring tool
EAPI=7
HOMEPAGE=https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://github.com/ColinIanKing/powerstat/archive/V0.02.22.tar.gz -> powerstat-0.02.22.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aab479cfd4e9d8ce0d68fb2d3dd9c489
diff --git a/metadata/md5-cache/sys-process/anacron-2.3-r4 b/metadata/md5-cache/sys-process/anacron-2.3-r4
index edf89b4c93f8..da5353b38cd7 100644
--- a/metadata/md5-cache/sys-process/anacron-2.3-r4
+++ b/metadata/md5-cache/sys-process/anacron-2.3-r4
@@ -3,10 +3,11 @@ DEPEND=sys-process/cronbase
DESCRIPTION=a periodic command scheduler
EAPI=6
HOMEPAGE=http://anacron.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ppc x86
LICENSE=GPL-2+
RDEPEND=sys-process/cronbase virtual/mta
SLOT=0
SRC_URI=mirror://sourceforge/anacron/anacron-2.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b645ed5f6dd206f4e2c9b62394f30f12
diff --git a/metadata/md5-cache/sys-process/cronutils-1.9 b/metadata/md5-cache/sys-process/cronutils-1.9
index 000c0b035ead..987a304e535f 100644
--- a/metadata/md5-cache/sys-process/cronutils-1.9
+++ b/metadata/md5-cache/sys-process/cronutils-1.9
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install
DESCRIPTION=Utilities to assist running batch processing jobs
EAPI=6
HOMEPAGE=https://github.com/google/cronutils
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://github.com/google/cronutils/archive/version/1.9.tar.gz -> cronutils-1.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4312c32777ce3e13a253b02bee23c863
diff --git a/metadata/md5-cache/sys-process/ctop-0.7.3 b/metadata/md5-cache/sys-process/ctop-0.7.3
index 18a16e9deeca..69b0fec14c2c 100644
--- a/metadata/md5-cache/sys-process/ctop-0.7.3
+++ b/metadata/md5-cache/sys-process/ctop-0.7.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Top-like interface for container-metrics
EAPI=7
HOMEPAGE=https://ctop.sh https://github.com/bcicen/ctop
+INHERIT=go-module
IUSE=hardened
KEYWORDS=~amd64
LICENSE=MIT
diff --git a/metadata/md5-cache/sys-process/minit-0.10-r1 b/metadata/md5-cache/sys-process/minit-0.10-r1
index b80c7250165e..342fe1ea3f78 100644
--- a/metadata/md5-cache/sys-process/minit-0.10-r1
+++ b/metadata/md5-cache/sys-process/minit-0.10-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/libowfat dev-libs/dietlibc
DESCRIPTION=a small yet feature-complete init
EAPI=6
HOMEPAGE=http://www.fefe.de/minit/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/libowfat dev-libs/dietlibc
SLOT=0
SRC_URI=http://dl.fefe.de/minit-0.10.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a32056ae55ac97bbff26656fd58ba2b2
diff --git a/metadata/md5-cache/sys-process/pkill-darwin-1.0 b/metadata/md5-cache/sys-process/pkill-darwin-1.0
index e49ab5ae243f..81535f0be29c 100644
--- a/metadata/md5-cache/sys-process/pkill-darwin-1.0
+++ b/metadata/md5-cache/sys-process/pkill-darwin-1.0
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=pgrep(1) and pkill(1) for Darwin
EAPI=6
HOMEPAGE=https://sourceforge.net/p/pkilldarwin/code/ci/default/tree/
+INHERIT=toolchain-funcs
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=https://www.gentoo.org/~grobian/distfiles/pkill-darwin-1.0.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=656535a4991fcad64c1f41b85151e6d7
diff --git a/metadata/md5-cache/sys-process/prll-0.6.4 b/metadata/md5-cache/sys-process/prll-0.6.4
index 8494ae8c4b32..f460769a28d7 100644
--- a/metadata/md5-cache/sys-process/prll-0.6.4
+++ b/metadata/md5-cache/sys-process/prll-0.6.4
@@ -2,10 +2,11 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=A utility for parallelizing execution of shell functions
EAPI=6
HOMEPAGE=https://github.com/exzombie/prll
+INHERIT=toolchain-funcs readme.gentoo-r1
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/exzombie/prll/archive/0.6.4.tar.gz -> prll-0.6.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=32422b689f9672d9f8f3e4e297de985c
diff --git a/metadata/md5-cache/sys-process/schedtool-1.3.0-r1 b/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
index cf371a4f297b..54ba4e95b23c 100644
--- a/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
+++ b/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A tool to query or alter a process' scheduling policy
EAPI=7
HOMEPAGE=https://github.com/freequaos/schedtool
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/freequaos/schedtool/archive/schedtool-1.3.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=963cee6154a162affa93960896d8d6a6
diff --git a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1 b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
index e87c71e4d9ac..710bce560ec0 100644
--- a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
+++ b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
@@ -2,9 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=small utility to wait for an arbitrary process to exit
EAPI=6
HOMEPAGE=https://dev.gentoo.org/~zzam/wait_on_pid/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/wait_on_pid-0.0.2.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/wait_on_pid-0.0.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=aea07d377cde46e91784806c3a20bb39
diff --git a/metadata/md5-cache/virtual/rubygems-16 b/metadata/md5-cache/virtual/rubygems-16
index f7c10241c280..ff62bbce057a 100644
--- a/metadata/md5-cache/virtual/rubygems-16
+++ b/metadata/md5-cache/virtual/rubygems-16
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby27? ( >=dev-ruby/rubygems-3.1.0[ruby_targets_ruby27] ) ruby_targets_ruby30? ( >=dev-ruby/rubygems-3.2.0[ruby_targets_ruby30] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
SLOT=0
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng b97a1a9a3103f9a66f622ea3eb2ce12b
_md5_=948d9e99744b8883f5932a217a90b33f
diff --git a/metadata/md5-cache/www-apache/modsec-flameeyes-20130216 b/metadata/md5-cache/www-apache/modsec-flameeyes-20130216
index 34b78d9cd722..7c827b798e20 100644
--- a/metadata/md5-cache/www-apache/modsec-flameeyes-20130216
+++ b/metadata/md5-cache/www-apache/modsec-flameeyes-20130216
@@ -2,6 +2,7 @@ DEFINED_PHASES=install
DESCRIPTION=Flameeyes's Ruleset for ModSecurity
EAPI=6
HOMEPAGE=http://www.flameeyes.eu/projects/modsec
+INHERIT=readme.gentoo-r1
KEYWORDS=~amd64
LICENSE=CC-BY-SA-3.0
RDEPEND=>=www-apache/mod_security-2.5.1
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6 b/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
index 8c4c626573d4..6c1a1e9b41d9 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
+++ b/metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
@@ -3,10 +3,11 @@ DEPEND=dev-db/postgresql:=
DESCRIPTION=Internet platforms for proposition development and decision making
EAPI=7
HOMEPAGE=https://www.public-software-group.org/liquid_feedback
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=HPND CC-BY-2.5
RDEPEND=dev-db/postgresql:=
SLOT=0
SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/backend/v2.2.6/liquid_feedback_core-v2.2.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2a31f4ca716aa6714875e0705a2d127f
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4 b/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
index 4a7195c0edc7..caa57ae7a615 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
+++ b/metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
@@ -3,10 +3,11 @@ DEPEND=dev-db/postgresql:=
DESCRIPTION=Internet platforms for proposition development and decision making
EAPI=7
HOMEPAGE=https://www.public-software-group.org/liquid_feedback
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=HPND CC-BY-2.5
RDEPEND=dev-db/postgresql:=
SLOT=0
SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/backend/v3.0.4/liquid_feedback_core-v3.0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a1852d10c557bf5c5f5a3392dcc5c7a3
diff --git a/metadata/md5-cache/www-apps/webdavcgi-1.1.2 b/metadata/md5-cache/www-apps/webdavcgi-1.1.2
index e03ca490c010..93ba8147e468 100644
--- a/metadata/md5-cache/www-apps/webdavcgi-1.1.2
+++ b/metadata/md5-cache/www-apps/webdavcgi-1.1.2
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile install postinst
DESCRIPTION=A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV.
EAPI=7
HOMEPAGE=https://danrohde.github.io/webdavcgi/
+INHERIT=toolchain-funcs
IUSE=afs git kerberos ldap mysql pdf postgres rcs samba +sqlite +suid
KEYWORDS=~amd64
LICENSE=GPL-3+
@@ -9,5 +10,5 @@ RDEPEND=afs? ( net-fs/openafs ) dev-lang/perl dev-perl/Archive-Zip dev-perl/CGI
REQUIRED_USE=|| ( mysql postgres sqlite )
SLOT=1.1
SRC_URI=https://github.com/DanRohde/webdavcgi/archive/1.1.2.tar.gz -> webdavcgi-1.1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=47f19b09d284593e7b01228f031a2df3
diff --git a/metadata/md5-cache/www-client/luakit-2.2.1-r100 b/metadata/md5-cache/www-client/luakit-2.2.1-r100
index 6acb88cef783..c24db28fa336 100644
--- a/metadata/md5-cache/www-client/luakit-2.2.1-r100
+++ b/metadata/md5-cache/www-client/luakit-2.2.1-r100
@@ -4,6 +4,7 @@ DEPEND=dev-db/sqlite:3 dev-libs/glib:2 net-libs/webkit-gtk:4= x11-libs/gtk+:3 lu
DESCRIPTION=A fast, extensible, and customizable web browser
EAPI=7
HOMEPAGE=https://luakit.github.io/luakit
+INHERIT=lua-single toolchain-funcs xdg
IUSE=doc test lua_single_target_luajit lua_single_target_lua5-1
KEYWORDS=~amd64
LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/luakit/luakit/archive/2.2.1.tar.gz -> luakit-2.2.1.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=048cc38680f9da4986a56416889b0124
diff --git a/metadata/md5-cache/www-client/uget-2.2.1 b/metadata/md5-cache/www-client/uget-2.2.1
index e6e850d60bef..ac68a2980969 100644
--- a/metadata/md5-cache/www-client/uget-2.2.1
+++ b/metadata/md5-cache/www-client/uget-2.2.1
@@ -4,6 +4,7 @@ DEPEND=dev-libs/glib:2 dev-libs/libpcre net-misc/curl >=x11-libs/gtk+-3.4:3 gnut
DESCRIPTION=Download manager using gtk+ and libcurl
EAPI=7
HOMEPAGE=http://www.ugetdm.com
+INHERIT=xdg
IUSE=aria2 appindicator control-socket +gnutls gstreamer libnotify nls openssl rss
KEYWORDS=amd64 ~arm ~ppc x86
LICENSE=LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libpcre net-misc/curl >=x11-libs/gtk+-3.4:3 gnu
REQUIRED_USE=^^ ( gnutls openssl )
SLOT=0
SRC_URI=mirror://sourceforge/urlget/uget-2.2.1.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=c8d0b164b55363008f7e17d57eafd112
diff --git a/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r3 b/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r3
index bdf8bb3b98d1..7bc23210cf71 100644
--- a/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r3
+++ b/metadata/md5-cache/www-misc/bookmarksync-0.3.4-r3
@@ -2,6 +2,7 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=bookmarksync synchronizes various browser bookmark files
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/booksync/
+INHERIT=toolchain-funcs
IUSE=perl
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
@@ -9,5 +10,5 @@ RDEPEND=perl? ( dev-lang/perl )
RESTRICT=mirror
SLOT=0
SRC_URI=mirror://sourceforge/booksync/bookmarksync-0.3.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=770b62dbd1a7ae4446cfa1822a58738a
diff --git a/metadata/md5-cache/www-misc/multisort-1.1-r2 b/metadata/md5-cache/www-misc/multisort-1.1-r2
index 0cdf291ce474..223096929156 100644
--- a/metadata/md5-cache/www-misc/multisort-1.1-r2
+++ b/metadata/md5-cache/www-misc/multisort-1.1-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Merges httpd logfiles in the Common Log Format
EAPI=7
HOMEPAGE=https://www.xach.com/multisort/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.xach.com/multisort/multisort-1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5c34b737cf3465545a66fc0a9d948e0b
diff --git a/metadata/md5-cache/www-misc/profile-sync-daemon-6.31 b/metadata/md5-cache/www-misc/profile-sync-daemon-6.31
index e34804e50d46..a03c890fe6b2 100644
--- a/metadata/md5-cache/www-misc/profile-sync-daemon-6.31
+++ b/metadata/md5-cache/www-misc/profile-sync-daemon-6.31
@@ -2,6 +2,7 @@ DEFINED_PHASES=postinst
DESCRIPTION=Symlinks and syncs browser profile dirs to RAM.
EAPI=6
HOMEPAGE=https://wiki.archlinux.org/index.php/Profile-sync-daemon
+INHERIT=versionator
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=app-shells/bash net-misc/rsync[xattr] sys-apps/systemd
diff --git a/metadata/md5-cache/www-misc/visitors-0.7-r2 b/metadata/md5-cache/www-misc/visitors-0.7-r2
index 7a190bd5332e..2d93a532a7f9 100644
--- a/metadata/md5-cache/www-misc/visitors-0.7-r2
+++ b/metadata/md5-cache/www-misc/visitors-0.7-r2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Fast web log analyzer
EAPI=7
HOMEPAGE=http://www.hping.org/visitors/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.hping.org/visitors/visitors-0.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6285e7b2b8c64bfdf76a07bc33809324
diff --git a/metadata/md5-cache/www-misc/wsmake-0.6.4-r1 b/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
index 72fdb53e3044..a27fdfc9e598 100644
--- a/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
+++ b/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=configure install unpack
DESCRIPTION=Website pre-processor features tag substitution and page ordering
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/wsmake/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ Artistic
SLOT=0
SRC_URI=mirror://sourceforge/wsmake/wsmake-0.6.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=88c1929fed15cad8a25ce280cf5baf76
diff --git a/metadata/md5-cache/www-plugins/browserpass-3.0.7 b/metadata/md5-cache/www-plugins/browserpass-3.0.7
index 544923a32c74..b50f878b3e4d 100644
--- a/metadata/md5-cache/www-plugins/browserpass-3.0.7
+++ b/metadata/md5-cache/www-plugins/browserpass-3.0.7
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=WebExtension host binary for app-admin/pass, a UNIX password manager
EAPI=7
HOMEPAGE=https://github.com/browserpass/browserpass-native
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=BSD ISC MIT
RDEPEND=app-crypt/gnupg
diff --git a/metadata/md5-cache/www-servers/caddy-2.0.0 b/metadata/md5-cache/www-servers/caddy-2.0.0
index eb780694eea6..1b63c6d594b0 100644
--- a/metadata/md5-cache/www-servers/caddy-2.0.0
+++ b/metadata/md5-cache/www-servers/caddy-2.0.0
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
EAPI=7
HOMEPAGE=https://caddyserver.com
+INHERIT=go-module
KEYWORDS=amd64
LICENSE=Apache-2.0
RESTRICT=strip test
diff --git a/metadata/md5-cache/www-servers/caddy-2.2.3 b/metadata/md5-cache/www-servers/caddy-2.2.3
index 4dbca49db7c2..bfd0f87dd371 100644
--- a/metadata/md5-cache/www-servers/caddy-2.2.3
+++ b/metadata/md5-cache/www-servers/caddy-2.2.3
@@ -3,6 +3,7 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
EAPI=7
HOMEPAGE=https://caddyserver.com
+INHERIT=go-module
KEYWORDS=~amd64
LICENSE=Apache-2.0 BSD ECL-2.0 MIT
RESTRICT=strip test
diff --git a/metadata/md5-cache/x11-apps/amlc-0.5.1 b/metadata/md5-cache/x11-apps/amlc-0.5.1
index 6d0f66ad3784..51e40016667e 100644
--- a/metadata/md5-cache/x11-apps/amlc-0.5.1
+++ b/metadata/md5-cache/x11-apps/amlc-0.5.1
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Another Modeline Calculator, generates quality X11 display configs easily
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/amlc.berlios/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/amlc-0.5.1.cpp
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=54c8ac7f845be7a98ba5fbf4c8018177
diff --git a/metadata/md5-cache/x11-apps/radeon-profile-20200824 b/metadata/md5-cache/x11-apps/radeon-profile-20200824
index 9292140defdb..271df30eb39b 100644
--- a/metadata/md5-cache/x11-apps/radeon-profile-20200824
+++ b/metadata/md5-cache/x11-apps/radeon-profile-20200824
@@ -3,10 +3,11 @@ DEPEND=!<x11-apps/radeon-profile-daemon-20190603-r1 dev-qt/qtcharts:5 dev-qt/qtc
DESCRIPTION=Read current clocks of ATi/AMD Radeon cards
EAPI=7
HOMEPAGE=https://github.com/marazmista/radeon-profile
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!<x11-apps/radeon-profile-daemon-20190603-r1 dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 x11-libs/libX11 x11-libs/libXrandr
SLOT=0
SRC_URI=https://github.com/marazmista/radeon-profile/archive/20200824.tar.gz -> radeon-profile-20200824.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=d304bb7f0ca750dbb9112243c2634992
diff --git a/metadata/md5-cache/x11-apps/radeon-profile-20200824-r1 b/metadata/md5-cache/x11-apps/radeon-profile-20200824-r1
index 1f371219756a..80333ee22d77 100644
--- a/metadata/md5-cache/x11-apps/radeon-profile-20200824-r1
+++ b/metadata/md5-cache/x11-apps/radeon-profile-20200824-r1
@@ -3,10 +3,11 @@ DEPEND=!<x11-apps/radeon-profile-daemon-20190603-r1 dev-qt/qtcharts:5 dev-qt/qtc
DESCRIPTION=Read current clocks of ATi/AMD Radeon cards
EAPI=7
HOMEPAGE=https://github.com/marazmista/radeon-profile
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!<x11-apps/radeon-profile-daemon-20190603-r1 dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 x11-libs/libX11 x11-libs/libXrandr
SLOT=0
SRC_URI=https://github.com/marazmista/radeon-profile/archive/20200824.tar.gz -> radeon-profile-20200824.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=322c85ae490588abcd70f5e80f22f3da
diff --git a/metadata/md5-cache/x11-apps/xwarppointer-1-r2 b/metadata/md5-cache/x11-apps/xwarppointer-1-r2
index a9f2ebc5ee24..d8d89ab0282c 100644
--- a/metadata/md5-cache/x11-apps/xwarppointer-1-r2
+++ b/metadata/md5-cache/x11-apps/xwarppointer-1-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
DESCRIPTION=Program to move the mouse cursor
EAPI=5
HOMEPAGE=http://www.ishiboo.com/~nirva/Projects/xwarppointer/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://www.ishiboo.com/~nirva/Projects/xwarppointer/xwarppointer.tar.gz -> xwarppointer-1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ca0dba33e7fa02010b1ce2aa1be4db87
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0 b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
index 1784c196bd9e..f489200f3a5f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-libs/mtdev-1.0 x11-base/xorg-server:= x11-base/xorg-proto
DESCRIPTION=Xorg Driver for Multitouch Trackpads
EAPI=6
HOMEPAGE=https://github.com/p2rkw/xf86-input-mtrack
+INHERIT=vcs-snapshot
IUSE=debug
KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/x11-libs/dnd-1.1-r3 b/metadata/md5-cache/x11-libs/dnd-1.1-r3
index f37171d1f3b4..fad1eb8d3055 100644
--- a/metadata/md5-cache/x11-libs/dnd-1.1-r3
+++ b/metadata/md5-cache/x11-libs/dnd-1.1-r3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/l
DESCRIPTION=OffiX' Drag'n'drop library
EAPI=6
HOMEPAGE=http://leb.net/offix
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2 LGPL-2
RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt
SLOT=0
SRC_URI=http://leb.net/offix/dnd.1.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d64078e4ab7d20932463e61abf5937f4
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.0 b/metadata/md5-cache/x11-libs/libX11-1.7.0
index ac4b772de123..df3df6f3f537 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.0
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.0
@@ -12,5 +12,5 @@ RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.0.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 xorg-3 212a355607d8ee9cf75132010ead368c
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 xorg-3 212a355607d8ee9cf75132010ead368c
_md5_=907231f0484638c8421c9f0aed40ca24
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.1 b/metadata/md5-cache/x11-libs/libX11-1.7.1
index af3441827301..6f7e8150089b 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.1
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.1
@@ -12,5 +12,5 @@ RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.1.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 xorg-3 212a355607d8ee9cf75132010ead368c
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic bc2e7662a4a9a8643be851982a837ddc multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 xorg-3 212a355607d8ee9cf75132010ead368c
_md5_=b08fa6aebbb0b73fcfba460d180261a5
diff --git a/metadata/md5-cache/x11-libs/libva-2.9.1 b/metadata/md5-cache/x11-libs/libva-2.9.1
index 8215a7f1238d..f7b9545630f0 100644
--- a/metadata/md5-cache/x11-libs/libva-2.9.1
+++ b/metadata/md5-cache/x11-libs/libva-2.9.1
@@ -13,5 +13,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
SLOT=0/2
SRC_URI=https://github.com/intel/libva/archive/2.9.1.tar.gz -> libva-2.9.1.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
_md5_=79ac80bde3ee5bf0c3daf8d55b129a8a
diff --git a/metadata/md5-cache/x11-libs/qwt-6.1.5 b/metadata/md5-cache/x11-libs/qwt-6.1.5
index 9ecf9a846ab2..cfacc79a3382 100644
--- a/metadata/md5-cache/x11-libs/qwt-6.1.5
+++ b/metadata/md5-cache/x11-libs/qwt-6.1.5
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsuppor
DESCRIPTION=2D plotting library for Qt5
EAPI=7
HOMEPAGE=https://qwt.sourceforge.net/
+INHERIT=qmake-utils
IUSE=designer doc examples mathml opengl svg
KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) opengl? ( dev-qt/qtopengl:5 virtual/opengl ) svg? ( dev-qt/qtsvg:5 )
SLOT=6/1.5
SRC_URI=mirror://sourceforge/project/qwt/qwt/6.1.5/qwt-6.1.5.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=52ee86d7fc676f93d3f886d7ea971245
diff --git a/metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r2 b/metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r2
index 23eb52a7176d..65406894b50a 100644
--- a/metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r2
+++ b/metadata/md5-cache/x11-libs/qwtpolar-1.1.1-r2
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev
DESCRIPTION=Library for displaying values on a polar coordinate system
EAPI=7
HOMEPAGE=https://qwtpolar.sourceforge.io/
+INHERIT=qmake-utils
KEYWORDS=amd64 x86
LICENSE=qwt
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6=[designer,qt5(+),svg]
SLOT=0
SRC_URI=mirror://sourceforge/qwtpolar/qwtpolar-1.1.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=e4d765a07b3a805721f72c833201c388
diff --git a/metadata/md5-cache/x11-misc/alock-1.0.0 b/metadata/md5-cache/x11-misc/alock-1.0.0
index 5ea9dc131b4d..bcf618947e3b 100644
--- a/metadata/md5-cache/x11-misc/alock-1.0.0
+++ b/metadata/md5-cache/x11-misc/alock-1.0.0
@@ -10,5 +10,5 @@ LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( sys-libs/pam ) doc? ( app-text/asciidoc )
SLOT=0
SRC_URI=https://github.com/mgumz/alock/archive/v1.0.0.tar.gz -> alock-1.0.0.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=5114043eadc076043def8925d92f607c
diff --git a/metadata/md5-cache/x11-misc/blockdpy-1-r1 b/metadata/md5-cache/x11-misc/blockdpy-1-r1
index 43195c2531ff..ce339a8e9687 100644
--- a/metadata/md5-cache/x11-misc/blockdpy-1-r1
+++ b/metadata/md5-cache/x11-misc/blockdpy-1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext virtual/pkgconfig
DESCRIPTION=Tool to block access via the physical display while x11vnc is running
EAPI=6
HOMEPAGE=http://www.karlrunge.com/x11vnc/blockdpy.c
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext
SLOT=0
SRC_URI=http://www.karlrunge.com/x11vnc/blockdpy.c
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=39a98b11a8c8ce1d005d97aeb9877dbd
diff --git a/metadata/md5-cache/x11-misc/dunst-1.4.1 b/metadata/md5-cache/x11-misc/dunst-1.4.1
index a7ef7feb9b2c..436198affd6b 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.4.1
+++ b/metadata/md5-cache/x11-misc/dunst-1.4.1
@@ -3,11 +3,12 @@ DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf
DESCRIPTION=Customizable and lightweight notification-daemon
EAPI=7
HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
+INHERIT=toolchain-funcs
IUSE=dunstify
KEYWORDS=amd64 ~arm x86
LICENSE=BSD
RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
SLOT=0
SRC_URI=https://github.com/dunst-project/dunst/archive/v1.4.1.tar.gz -> dunst-1.4.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d1973ae1ee1edf02eec64bddfd05b8a
diff --git a/metadata/md5-cache/x11-misc/dunst-1.5.0 b/metadata/md5-cache/x11-misc/dunst-1.5.0
index 505ccf372652..fc9c8fbe0f5a 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.5.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.5.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf
DESCRIPTION=Customizable and lightweight notification-daemon
EAPI=7
HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=BSD
RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X]
SLOT=0
SRC_URI=https://github.com/dunst-project/dunst/archive/v1.5.0.tar.gz -> dunst-1.5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9c9c56b6c7678ab65782d75e27163186
diff --git a/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1 b/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
index 9da0f1c324e7..1caa1522d2f8 100644
--- a/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
+++ b/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt
DESCRIPTION=Generative art image evolver
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/evolvotron/
+INHERIT=qmake-utils
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
SLOT=0
SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.7.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=4bc6b4d942bc4b22fd960848db3828e4
diff --git a/metadata/md5-cache/x11-misc/fpm2-0.90 b/metadata/md5-cache/x11-misc/fpm2-0.90
index 6bb09dd304f7..e646a5fdf0a1 100644
--- a/metadata/md5-cache/x11-misc/fpm2-0.90
+++ b/metadata/md5-cache/x11-misc/fpm2-0.90
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-libs/nettle x11-libs/gtk+:3 x11-libs
DESCRIPTION=A GUI password manager utility with password generator
EAPI=7
HOMEPAGE=https://als.regnet.cz/fpm2/
+INHERIT=xdg
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-libs/nettle x11-libs/gtk+:3 x11-libs/libX11
SLOT=2
SRC_URI=https://als.regnet.cz/fpm2/download/fpm2-0.90.tar.xz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=cb3ff75bf53d3bc53d257cea7e49c689
diff --git a/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2 b/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
index 4a7cece19f6f..667d3fa1b715 100644
--- a/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
+++ b/metadata/md5-cache/x11-misc/fraqtive-0.4.8-r2
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 virtual/g
DESCRIPTION=Open source, multi-platform generator of the Mandelbrot family fractals
EAPI=7
HOMEPAGE=https://fraqtive.mimec.org/
+INHERIT=qmake-utils toolchain-funcs xdg
IUSE=cpu_flags_x86_sse2
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 virtual/glu
SLOT=0
SRC_URI=mirror://sourceforge/fraqtive/fraqtive-0.4.8.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=73afc1a1807ddbf32fc8a32d08c18dc5
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.8 b/metadata/md5-cache/x11-misc/grsync-1.2.8
index b39056c65251..12a165fc541d 100644
--- a/metadata/md5-cache/x11-misc/grsync-1.2.8
+++ b/metadata/md5-cache/x11-misc/grsync-1.2.8
@@ -4,10 +4,11 @@ DEPEND=>=x11-libs/gtk+-2.16:2 dev-util/desktop-file-utils x11-misc/shared-mime-i
DESCRIPTION=A gtk frontend to rsync
EAPI=7
HOMEPAGE=http://www.opbyte.it/grsync/
+INHERIT=xdg
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
SLOT=0
SRC_URI=http://www.opbyte.it/release/grsync-1.2.8.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=40db7fc4dc7aab99cbf1cafb7b5f4a9f
diff --git a/metadata/md5-cache/x11-misc/habak-0.2.5-r3 b/metadata/md5-cache/x11-misc/habak-0.2.5-r3
index b2ccff5f824a..bbd456bb0ecf 100644
--- a/metadata/md5-cache/x11-misc/habak-0.2.5-r3
+++ b/metadata/md5-cache/x11-misc/habak-0.2.5-r3
@@ -3,10 +3,11 @@ DEPEND=media-libs/imlib2[X] x11-libs/libX11 virtual/pkgconfig x11-base/xorg-prot
DESCRIPTION=A simple but powerful tool to set desktop wallpaper
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/fvwm-crystal/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=media-libs/imlib2[X] x11-libs/libX11
SLOT=0
SRC_URI=https://sourceforge.net/projects/fvwm-crystal/files/habak/0.2.5/habak-0.2.5.tar.gz/download -> habak-0.2.5-sourceforge.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c075b78ab01163f6cc3a3bd29cfa812f
diff --git a/metadata/md5-cache/x11-misc/hsetroot-1.0.5 b/metadata/md5-cache/x11-misc/hsetroot-1.0.5
index 7d7750c9983d..ba890d90158a 100644
--- a/metadata/md5-cache/x11-misc/hsetroot-1.0.5
+++ b/metadata/md5-cache/x11-misc/hsetroot-1.0.5
@@ -4,10 +4,11 @@ DEPEND=>=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 x11-libs/libXinerama x1
DESCRIPTION=Tool which allows you to compose wallpapers ('root pixmaps') for X
EAPI=7
HOMEPAGE=https://github.com/himdel/hsetroot/
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 x11-libs/libXinerama
SLOT=0
SRC_URI=https://github.com/himdel/hsetroot/archive/1.0.5.tar.gz -> hsetroot-1.0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2d61e8dcf2df7d6f85b0e75ac98c91ce
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.13 b/metadata/md5-cache/x11-misc/i3lock-2.13
index b98da402db4f..7de435663603 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.13
+++ b/metadata/md5-cache/x11-misc/i3lock-2.13
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb]
DESCRIPTION=Simple screen locker
EAPI=7
HOMEPAGE=https://i3wm.org/i3lock/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
LICENSE=BSD
RDEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-xrm
SLOT=0
SRC_URI=https://i3wm.org/i3lock/i3lock-2.13.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9c4f0ce913a98f3ec9771d2a70d9e75e
diff --git a/metadata/md5-cache/x11-misc/i855crt-0.4-r1 b/metadata/md5-cache/x11-misc/i855crt-0.4-r1
index f8807819a40c..61dd0a682d8a 100644
--- a/metadata/md5-cache/x11-misc/i855crt-0.4-r1
+++ b/metadata/md5-cache/x11-misc/i855crt-0.4-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXv
DESCRIPTION=Intel Montara 855GM CRT out auxiliary driver
EAPI=7
HOMEPAGE=http://i855crt.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXv
SLOT=0
SRC_URI=mirror://sourceforge/i855crt/i855crt-0.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=884d2257a0c0f6fe2c2f824d714979e7
diff --git a/metadata/md5-cache/x11-misc/kapow-1.5.10 b/metadata/md5-cache/x11-misc/kapow-1.5.10
index 62678c948812..fe3d0c2e73b0 100644
--- a/metadata/md5-cache/x11-misc/kapow-1.5.10
+++ b/metadata/md5-cache/x11-misc/kapow-1.5.10
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5
DESCRIPTION=A punch clock program designed to easily keep track of your hours
EAPI=7
HOMEPAGE=https://gottcode.org/kapow/
+INHERIT=qmake-utils xdg-utils
IUSE=l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_en l10n_es l10n_fr l10n_it l10n_lt l10n_nl l10n_no l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_sv l10n_tr l10n_uk
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://gottcode.org/kapow/kapow-1.5.10-src.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9d6f743ffbccc2d93f016ec43d10c43c
diff --git a/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r4 b/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r4
index 90cf77863b70..a5e03aabe0a2 100644
--- a/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r4
+++ b/metadata/md5-cache/x11-misc/kaqaz-1.2.0-r4
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt
DESCRIPTION=Modern note manager
EAPI=7
HOMEPAGE=https://github.com/sialan-labs/kaqaz/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5[ssl] dev-qt/qtpositioning:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsensors:5 dev-qt/qtsql:5[sqlite] dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
SLOT=0
SRC_URI=https://github.com/sialan-labs/kaqaz/archive/1.2.0.tar.gz -> kaqaz-1.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=736f361a05117b6d06cb197047d290fb
diff --git a/metadata/md5-cache/x11-misc/lsw-0.3 b/metadata/md5-cache/x11-misc/lsw-0.3
index b32cbc657ac8..2b8552da1ee1 100644
--- a/metadata/md5-cache/x11-misc/lsw-0.3
+++ b/metadata/md5-cache/x11-misc/lsw-0.3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=list window names
EAPI=5
HOMEPAGE=https://tools.suckless.org/x/lsw
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~x86
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://dl.suckless.org/tools/lsw-0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b5c86dba716c0ffa962d577f393df674
diff --git a/metadata/md5-cache/x11-misc/mixer_app-1.8.0-r1 b/metadata/md5-cache/x11-misc/mixer_app-1.8.0-r1
index 3595123a23df..39b780215fb0 100644
--- a/metadata/md5-cache/x11-misc/mixer_app-1.8.0-r1
+++ b/metadata/md5-cache/x11-misc/mixer_app-1.8.0-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm virtual/os-headers x11-b
DESCRIPTION=mixer_app has volume controllers that can be configured to handle sound sources
EAPI=7
HOMEPAGE=http://www.fukt.bsnet.se/~per/mixer/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=http://www.fukt.bsnet.se/~per/mixer/Mixer.app-1.8.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=849bd0255a55a68c195891f752aae2aa
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.0 b/metadata/md5-cache/x11-misc/mozo-1.24.0
index 3fc636730e76..8b9d54b0b800 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.24.0
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python
REQUIRED_USE=|| ( python_targets_python3_7 )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.0.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 autotools 9e63f92c2a5d867fea55ecb160c7d354 mate-desktop.org 600a203b6f17fa1070d58baa12f6e737 mate 0746707eb54b01af9c594947527af4eb multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 d273d56dc725880edbeb1f6389faf5f1 python-r1 26e4ad0a4190b14f70973dc253e86535 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 autotools 9e63f92c2a5d867fea55ecb160c7d354 mate-desktop.org 600a203b6f17fa1070d58baa12f6e737 mate 0746707eb54b01af9c594947527af4eb
_md5_=531740810ddb4ea87baca643ef1faf66
diff --git a/metadata/md5-cache/x11-misc/netwmpager-2.05 b/metadata/md5-cache/x11-misc/netwmpager-2.05
index ab094be86de5..778e6d654698 100644
--- a/metadata/md5-cache/x11-misc/netwmpager-2.05
+++ b/metadata/md5-cache/x11-misc/netwmpager-2.05
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXft x11-libs/libXdmcp x11
DESCRIPTION=Pager that works with Openbox and other EWMH compliant window managers
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/sf-xpaint/files/netwmpager/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXft x11-libs/libXdmcp x11-libs/libXau
SLOT=0
SRC_URI=mirror://sourceforge/sf-xpaint/netwmpager-2.05.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ed81ce794ea3e903444ec8d086cc67bd
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.4 b/metadata/md5-cache/x11-misc/obconf-2.0.4
index 82c62e58bd0e..aab542c69885 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.4
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.4
@@ -3,6 +3,7 @@ DEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x
DESCRIPTION=ObConf is a tool for configuring the Openbox window manager
EAPI=5
HOMEPAGE=http://openbox.org/wiki/ObConf:About
+INHERIT=xdg-utils
IUSE=nls
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux
LICENSE=GPL-2
diff --git a/metadata/md5-cache/x11-misc/qarma-1 b/metadata/md5-cache/x11-misc/qarma-1
index 22036009bc44..dbf4b82ce47b 100644
--- a/metadata/md5-cache/x11-misc/qarma-1
+++ b/metadata/md5-cache/x11-misc/qarma-1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
DESCRIPTION=Zenity Clone for Qt5
EAPI=7
HOMEPAGE=https://github.com/luebking/qarma
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
SLOT=0
SRC_URI=https://github.com/luebking/qarma/archive/t1.tar.gz -> qarma-1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=5b4657bc730410ce2cca0ca12aef4ced
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.1 b/metadata/md5-cache/x11-misc/qt5ct-1.1
index a4d3dbfcb47b..a67dc3ca1d31 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-1.1
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.1
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5
DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/qt5ct/
+INHERIT=qmake-utils
IUSE=+dbus
KEYWORDS=amd64 ~arm x86
LICENSE=BSD-2
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
SLOT=0
SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=be97e21943e5039722322f799ba21b8b
diff --git a/metadata/md5-cache/x11-misc/qtfm-6.2.0 b/metadata/md5-cache/x11-misc/qtfm-6.2.0
index 6f5ec716500d..d76ec515644f 100644
--- a/metadata/md5-cache/x11-misc/qtfm-6.2.0
+++ b/metadata/md5-cache/x11-misc/qtfm-6.2.0
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 d
DESCRIPTION=Small, lightweight file manager based on pure Qt
EAPI=7
HOMEPAGE=https://qtfm.eu/
+INHERIT=qmake-utils xdg-utils
IUSE=+dbus shared
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dbus? ( dev-qt/qtdbus:5 )
SLOT=0
SRC_URI=https://github.com/rodlie/qtfm/archive/6.2.0.tar.gz -> qtfm-6.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=440ee9671cfc55d608cc11423062c6a2
diff --git a/metadata/md5-cache/x11-misc/screen-message-0.26 b/metadata/md5-cache/x11-misc/screen-message-0.26
index c1bc6aa11e2f..b957b2307e2a 100644
--- a/metadata/md5-cache/x11-misc/screen-message-0.26
+++ b/metadata/md5-cache/x11-misc/screen-message-0.26
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:3 x11-libs/cairo >=x11-libs/pango-1.16 dev-util/desktop-fil
DESCRIPTION=Display a multi-line message large, fullscreen, black on white
EAPI=7
HOMEPAGE=http://www.joachim-breitner.de/projects#screen-message
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=x11-libs/gtk+:3 x11-libs/cairo >=x11-libs/pango-1.16
SLOT=0
SRC_URI=mirror://debian/pool/main/s/screen-message/screen-message_0.26.orig.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=4354f6fc9d19f5abf6fa4a096ac11e4d
diff --git a/metadata/md5-cache/x11-misc/set_opacity-1.0 b/metadata/md5-cache/x11-misc/set_opacity-1.0
index c8c86c2f31c4..1610e521b406 100644
--- a/metadata/md5-cache/x11-misc/set_opacity-1.0
+++ b/metadata/md5-cache/x11-misc/set_opacity-1.0
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXdamage x11-libs/libXcomposite x11-libs/libXfixes x11-libs/li
DESCRIPTION=Tool for set real compositing for windows through window's id, process' pid etc.
EAPI=7
HOMEPAGE=https://github.com/XVilka/set_opacity
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXdamage x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXrender
SLOT=0
SRC_URI=https://github.com/XVilka/set_opacity/archive-tarball/1.0 -> set_opacity-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d0f9af30c8f31f801b2bc5fa78faa20f
diff --git a/metadata/md5-cache/x11-misc/spnavcfg-0.3.1 b/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
index ea8c134a4785..9c71da5a3c67 100644
--- a/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
+++ b/metadata/md5-cache/x11-misc/spnavcfg-0.3.1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=GTK-based GUI to configure a space navigator device
EAPI=7
HOMEPAGE=http://spacenav.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=x11-libs/gtk+:2 app-misc/spacenavd[X]
SLOT=0
SRC_URI=mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/spnavcfg%200.3.1/spnavcfg-0.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=459f57f3b4c08b749272f6c345a3bf79
diff --git a/metadata/md5-cache/x11-misc/sprop-0.1-r1 b/metadata/md5-cache/x11-misc/sprop-0.1-r1
index 256c17e6214d..6d9d9c037ad7 100644
--- a/metadata/md5-cache/x11-misc/sprop-0.1-r1
+++ b/metadata/md5-cache/x11-misc/sprop-0.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=a simple X property utility
EAPI=6
HOMEPAGE=https://tools.suckless.org/x/sprop
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://dl.suckless.org/tools/sprop-0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=071d63b82cb9d29e844a9fda89e24f23
diff --git a/metadata/md5-cache/x11-misc/sselp-0.2-r1 b/metadata/md5-cache/x11-misc/sselp-0.2-r1
index e3386e5e092c..d97f2810ab48 100644
--- a/metadata/md5-cache/x11-misc/sselp-0.2-r1
+++ b/metadata/md5-cache/x11-misc/sselp-0.2-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
DESCRIPTION=Simple X selection printer
EAPI=6
HOMEPAGE=https://tools.suckless.org/x/sselp
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://dl.suckless.org/tools/sselp-0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0fbb10c79854e46003857b3e9a4580db
diff --git a/metadata/md5-cache/x11-misc/touchcal-0.80 b/metadata/md5-cache/x11-misc/touchcal-0.80
index 7389dec04bfc..7d3548417df3 100644
--- a/metadata/md5-cache/x11-misc/touchcal-0.80
+++ b/metadata/md5-cache/x11-misc/touchcal-0.80
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
DESCRIPTION=Touchscreen calibration utility
EAPI=7
HOMEPAGE=http://touchcal.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 arm ~arm64 x86
LICENSE=GPL-2+
RDEPEND=sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
SLOT=0
SRC_URI=mirror://sourceforge/touchcal/touchcal_0.80.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7532940153ba19a61b102a5bd23391ce
diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
index cb8a1839fd18..be0f587055db 100644
--- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
+++ b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase
EAPI=6
HOMEPAGE=https://github.com/sargon/trayer-srg
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=MIT GPL-2+
RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.8.tar.gz -> trayer-srg-1.1.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=732d85de6272d15fadd7608ce9306621
diff --git a/metadata/md5-cache/x11-misc/unclutter-8-r4 b/metadata/md5-cache/x11-misc/unclutter-8-r4
index ba827055d350..da94a8fae93b 100644
--- a/metadata/md5-cache/x11-misc/unclutter-8-r4
+++ b/metadata/md5-cache/x11-misc/unclutter-8-r4
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=Hides mouse pointer while not in use
EAPI=6
HOMEPAGE=http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86
LICENSE=public-domain
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=ftp://ftp.x.org/contrib/utilities/unclutter-8.tar.Z
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=516f81e48b894ec0a8c75c4c7fffeb16
diff --git a/metadata/md5-cache/x11-misc/urxvtconfig-1.0-r1 b/metadata/md5-cache/x11-misc/urxvtconfig-1.0-r1
index ecf590685733..7591f8e36f87 100644
--- a/metadata/md5-cache/x11-misc/urxvtconfig-1.0-r1
+++ b/metadata/md5-cache/x11-misc/urxvtconfig-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtsingleappli
DESCRIPTION=GUI configuration tool for the rxvt-unicode terminal emulator
EAPI=7
HOMEPAGE=https://github.com/daedreth/URXVTConfig
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-terms/rxvt-unicode[xft]
SLOT=0
SRC_URI=https://github.com/daedreth/URXVTConfig/archive/1.0.tar.gz -> urxvtconfig-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=4c5442b5ba0cefd3194f0ab7b311e9b5
diff --git a/metadata/md5-cache/x11-misc/vym-2.7.1 b/metadata/md5-cache/x11-misc/vym-2.7.1
index e55e295779c6..733a0b6ea644 100644
--- a/metadata/md5-cache/x11-misc/vym-2.7.1
+++ b/metadata/md5-cache/x11-misc/vym-2.7.1
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5
DESCRIPTION=View Your Mind, a mindmap tool
EAPI=7
HOMEPAGE=https://www.insilmaril.de/vym/
+INHERIT=desktop l10n qmake-utils
IUSE=dbus
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
SLOT=0
SRC_URI=mirror://sourceforge/vym/vym-2.7.1.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=6c6c437a67b3b0748bb287235295cd09
diff --git a/metadata/md5-cache/x11-misc/wmname-0.1-r1 b/metadata/md5-cache/x11-misc/wmname-0.1-r1
index 71af8729c061..9f27571e0b21 100644
--- a/metadata/md5-cache/x11-misc/wmname-0.1-r1
+++ b/metadata/md5-cache/x11-misc/wmname-0.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
DESCRIPTION=utility to set the name of your window manager
EAPI=6
HOMEPAGE=https://tools.suckless.org/x/wmname
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://dl.suckless.org/tools/wmname-0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=d82910d853a423d63c1bed60cfdf44a3
diff --git a/metadata/md5-cache/x11-misc/xcape-1.2 b/metadata/md5-cache/x11-misc/xcape-1.2
index 243d64385bef..d7d28bf4480a 100644
--- a/metadata/md5-cache/x11-misc/xcape-1.2
+++ b/metadata/md5-cache/x11-misc/xcape-1.2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig
DESCRIPTION=Utility to make modifier keys send custom key events when pressed on their own
EAPI=6
HOMEPAGE=https://github.com/alols/xcape
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=x11-libs/libX11 x11-libs/libXtst
SLOT=0
SRC_URI=https://github.com/alols/xcape/archive/v1.2.tar.gz -> xcape-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1ed36cac0e3b96bb03cb30a6a8fa8436
diff --git a/metadata/md5-cache/x11-misc/xcb-2.4-r1 b/metadata/md5-cache/x11-misc/xcb-2.4-r1
index 748f4c7441db..9c647155a1a6 100644
--- a/metadata/md5-cache/x11-misc/xcb-2.4-r1
+++ b/metadata/md5-cache/x11-misc/xcb-2.4-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt x11-base/
DESCRIPTION=Marc Lehmann's improved X Cut Buffers
EAPI=6
HOMEPAGE=http://oldhome.schmorp.de/marc/xcb.html
+INHERIT=toolchain-funcs
IUSE=motif
KEYWORDS=~alpha amd64 ~ppc ~riscv x86
LICENSE=BSD
RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXt
SLOT=0
SRC_URI=http://oldhome.schmorp.de/marc/data/xcb-2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=496d4b2e86b553eda7c270ead621348d
diff --git a/metadata/md5-cache/x11-misc/xdo-0.5.7 b/metadata/md5-cache/x11-misc/xdo-0.5.7
index 71c6f7a4dc1a..16e5e11c05a6 100644
--- a/metadata/md5-cache/x11-misc/xdo-0.5.7
+++ b/metadata/md5-cache/x11-misc/xdo-0.5.7
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
DESCRIPTION=Small X utility to perform elementary actions on windows
EAPI=7
HOMEPAGE=https://github.com/baskerville/xdo/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
SLOT=0
SRC_URI=https://github.com/baskerville/xdo/archive/0.5.7.tar.gz -> xdo-0.5.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2d4a07f99b51b2feb4f2fd7b662ddc8c
diff --git a/metadata/md5-cache/x11-misc/xfe-1.43.2 b/metadata/md5-cache/x11-misc/xfe-1.43.2
index 9b54e6386f21..9febc240bee2 100644
--- a/metadata/md5-cache/x11-misc/xfe-1.43.2
+++ b/metadata/md5-cache/x11-misc/xfe-1.43.2
@@ -3,6 +3,7 @@ DEPEND=media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] x11-libs/libX11 x11-li
DESCRIPTION=MS-Explorer-like minimalist file manager for X
EAPI=7
HOMEPAGE=http://roland65.free.fr/xfe
+INHERIT=l10n xdg-utils
IUSE=debug nls startup-notification
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
diff --git a/metadata/md5-cache/x11-misc/xfractint-20.04_p16 b/metadata/md5-cache/x11-misc/xfractint-20.04_p16
index 3de468e9bfe2..638810b48b27 100644
--- a/metadata/md5-cache/x11-misc/xfractint-20.04_p16
+++ b/metadata/md5-cache/x11-misc/xfractint-20.04_p16
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXft
DESCRIPTION=A fractal generator
EAPI=7
HOMEPAGE=https://www.fractint.org
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=free-noncomm HPND public-domain
RDEPEND=x11-libs/libX11 x11-libs/libXft
SLOT=0
SRC_URI=https://www.fractint.org/ftp/current/linux/xfractint-20.04p16.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4f5de447d4a001c854ce276cf72f09ba
diff --git a/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118 b/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118
index 19c2bf4894bd..68413b481e69 100644
--- a/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118
+++ b/metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
DESCRIPTION=A small program to get/set the current XKB layout
EAPI=6
HOMEPAGE=https://github.com/nonpop/xkblayout-state
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/nonpop/xkblayout-state/archive/45b752b130e077d5b1437d40b0a459e062aafa13.tar.gz -> xkblayout-state-0_p20180118.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=19457c8f647cc8a60b2912329970a807
diff --git a/metadata/md5-cache/x11-misc/xkbset-0.5_p7_p1 b/metadata/md5-cache/x11-misc/xkbset-0.5_p7_p1
index 52653bd6c95f..cf5283684aed 100644
--- a/metadata/md5-cache/x11-misc/xkbset-0.5_p7_p1
+++ b/metadata/md5-cache/x11-misc/xkbset-0.5_p7_p1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11
DESCRIPTION=User preference utility for XKB extensions for X
EAPI=7
HOMEPAGE=https://faculty.missouri.edu/~stephen/software/#xkbset
+INHERIT=toolchain-funcs
IUSE=tk
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=x11-libs/libX11 tk? ( dev-perl/Tk )
SLOT=0
SRC_URI=https://faculty.missouri.edu/~stephen/software/xkbset/xkbset-0.5.tar.gz mirror://debian/pool/main/x/xkbset/xkbset_0.5-7.1.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e16e4d9887c615fc330a0ef2a9e86005
diff --git a/metadata/md5-cache/x11-misc/xmountains-2.9-r1 b/metadata/md5-cache/x11-misc/xmountains-2.9-r1
index a678c86ec0b2..9c06bfcfb955 100644
--- a/metadata/md5-cache/x11-misc/xmountains-2.9-r1
+++ b/metadata/md5-cache/x11-misc/xmountains-2.9-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-misc/xbitmaps x11-base/xorg-proto
DESCRIPTION=Fractal terrains of snow-capped mountains near water
EAPI=7
HOMEPAGE=https://spbooth.github.io/xmountains/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=HPND
RDEPEND=x11-libs/libX11 x11-misc/xbitmaps
SLOT=0
SRC_URI=http://www.epcc.ed.ac.uk/~spb/xmountains/xmountains_2.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=15ca37fdc00be06081a385f1688e7540
diff --git a/metadata/md5-cache/x11-misc/xosview-1.20-r1 b/metadata/md5-cache/x11-misc/xosview-1.20-r1
index 84ef8a2773fd..1c34dc747112 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.20-r1
+++ b/metadata/md5-cache/x11-misc/xosview-1.20-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
DESCRIPTION=X11 operating system viewer
EAPI=6
HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
+INHERIT=toolchain-funcs xdg-utils
IUSE=suid
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2 BSD
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
SLOT=0
SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.20.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=fba701dafb17d879f367ab6b60cd5805
diff --git a/metadata/md5-cache/x11-misc/xosview-1.22 b/metadata/md5-cache/x11-misc/xosview-1.22
index af0829c9e10b..99296ca9a517 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.22
+++ b/metadata/md5-cache/x11-misc/xosview-1.22
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
DESCRIPTION=X11 operating system viewer
EAPI=7
HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
+INHERIT=toolchain-funcs xdg-utils
IUSE=suid
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2 BSD
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
SLOT=0
SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.22.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=faf43a7649773968a1095ed5dd1d579d
diff --git a/metadata/md5-cache/x11-misc/xosview-1.23 b/metadata/md5-cache/x11-misc/xosview-1.23
index e222faf63863..07606d1deebc 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.23
+++ b/metadata/md5-cache/x11-misc/xosview-1.23
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
DESCRIPTION=X11 operating system viewer
EAPI=7
HOMEPAGE=http://www.pogo.org.uk/~mark/xosview/
+INHERIT=toolchain-funcs xdg-utils
IUSE=suid
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2 BSD
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
SLOT=0
SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.23.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=faf43a7649773968a1095ed5dd1d579d
diff --git a/metadata/md5-cache/x11-misc/xwit-3.4_p16 b/metadata/md5-cache/x11-misc/xwit-3.4_p16
index 93ce0991062c..80c9455f7b2a 100644
--- a/metadata/md5-cache/x11-misc/xwit-3.4_p16
+++ b/metadata/md5-cache/x11-misc/xwit-3.4_p16
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=A collection of simple routines to call some of those X11 functions
EAPI=7
HOMEPAGE=https://tracker.debian.org/pkg/xwit
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=public-domain HPND
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=mirror://debian/pool/main/x/xwit/xwit_3.4.orig.tar.gz mirror://debian/pool/main/x/xwit/xwit_3.4-16.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f4aa22085560e92bc283075fbc1c79ff
diff --git a/metadata/md5-cache/x11-plugins/allin1-0.5.0-r2 b/metadata/md5-cache/x11-plugins/allin1-0.5.0-r2
index a153be83b4c8..4d45186a8031 100644
--- a/metadata/md5-cache/x11-plugins/allin1-0.5.0-r2
+++ b/metadata/md5-cache/x11-plugins/allin1-0.5.0-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti
EAPI=6
HOMEPAGE=http://ilpettegolo.altervista.org/linux_allin1.en.shtml
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=mirror://sourceforge/allinone/allin1-0.5.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4d82eda8d3d1b2adea78967cca82da5e
diff --git a/metadata/md5-cache/x11-plugins/asclock-2.0.12-r3 b/metadata/md5-cache/x11-plugins/asclock-2.0.12-r3
index 04b1ed118d04..4be06b7a39ce 100644
--- a/metadata/md5-cache/x11-plugins/asclock-2.0.12-r3
+++ b/metadata/md5-cache/x11-plugins/asclock-2.0.12-r3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXpm
DESCRIPTION=Clock applet for AfterStep
EAPI=7
HOMEPAGE=http://tigr.net/afterstep/applets/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
LICENSE=GPL-2
RDEPEND=x11-libs/libXpm
SLOT=0
SRC_URI=http://www.tigr.net/afterstep/download/asclock/asclock-2.0.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2b29c9ef0f9b1ee84beb52f00ca54621
diff --git a/metadata/md5-cache/x11-plugins/ascpu-1.11-r1 b/metadata/md5-cache/x11-plugins/ascpu-1.11-r1
index 8a0c6ce02814..84c4d034243f 100644
--- a/metadata/md5-cache/x11-plugins/ascpu-1.11-r1
+++ b/metadata/md5-cache/x11-plugins/ascpu-1.11-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libXpm x11-libs/libSM jpeg? ( virtual/jpeg:0 ) x11-base/xorg-pro
DESCRIPTION=CPU statistics monitor utility for X Windows
EAPI=6
HOMEPAGE=http://www.tigr.net/
+INHERIT=toolchain-funcs
IUSE=jpeg
KEYWORDS=amd64 ~mips ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXpm x11-libs/libSM jpeg? ( virtual/jpeg:0 )
SLOT=0
SRC_URI=http://www.tigr.net/afterstep/download/ascpu/ascpu-1.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c30da5f0f7a00113dad079d4f239ad38
diff --git a/metadata/md5-cache/x11-plugins/asmem-1.12-r1 b/metadata/md5-cache/x11-plugins/asmem-1.12-r1
index 8ad424d937c8..44dc829ca2f6 100644
--- a/metadata/md5-cache/x11-plugins/asmem-1.12-r1
+++ b/metadata/md5-cache/x11-plugins/asmem-1.12-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXpm x11-libs/l
DESCRIPTION=Monitor the utilization level of memory, cache and swap space
EAPI=6
HOMEPAGE=http://www.tigr.net/
+INHERIT=toolchain-funcs
IUSE=jpeg
KEYWORDS=amd64 ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXpm x11-libs/libXext jpeg? ( virtual/jpeg:0 )
SLOT=0
SRC_URI=http://www.tigr.net/afterstep/download/asmem/asmem-1.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b2db86a7e76029726ede0151d1f0e96f
diff --git a/metadata/md5-cache/x11-plugins/asmon-0.71-r1 b/metadata/md5-cache/x11-plugins/asmon-0.71-r1
index 92741e2cf28c..2c07f35578b5 100644
--- a/metadata/md5-cache/x11-plugins/asmon-0.71-r1
+++ b/metadata/md5-cache/x11-plugins/asmon-0.71-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=WindowMaker/AfterStep system monitor dockapp
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11
SLOT=0
SRC_URI=mirror://debian/pool/main/a/asmon/asmon_0.71.orig.tar.gz -> asmon-0.71.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=73db65bd0c9468f3bedf8fcdfaad27d5
diff --git a/metadata/md5-cache/x11-plugins/astime-2.8-r2 b/metadata/md5-cache/x11-plugins/astime-2.8-r2
index db9511ddc19d..d1cf892f8d56 100644
--- a/metadata/md5-cache/x11-plugins/astime-2.8-r2
+++ b/metadata/md5-cache/x11-plugins/astime-2.8-r2
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libXpm x11-libs/libSM jpeg? ( virtual/jpeg:0 ) x11-base/xorg-pro
DESCRIPTION=Analogue clock utility for X Windows
EAPI=6
HOMEPAGE=http://www.tigr.net/
+INHERIT=toolchain-funcs
IUSE=jpeg
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXpm x11-libs/libSM jpeg? ( virtual/jpeg:0 )
SLOT=0
SRC_URI=http://www.tigr.net/afterstep/download/astime/astime-2.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=670c999a17aaae856dc61abe47739e37
diff --git a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3 b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
index 3e0a39d64c3b..a3dde0a6ff46 100644
--- a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
+++ b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
@@ -3,11 +3,12 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext virtual/pkgconfig gkrell
DESCRIPTION=a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime
EAPI=7
HOMEPAGE=https://github.com/JNRowe-retired/bfm
+INHERIT=toolchain-funcs
IUSE=gkrellm
KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext
SLOT=0
SRC_URI=https://github.com/JNRowe-retired/bfm/archive/0.6.4.tar.gz -> bfm-0.6.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=36decde9085a0009e179485be718911c
diff --git a/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1 b/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
index d22d8266e75d..35e5f93706bb 100644
--- a/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
+++ b/metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=cputnik is a simple cpu monitor dockapp
EAPI=7
HOMEPAGE=https://www.dockapps.net/cputnik
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/cputnik-0.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=998354d42b8c4061f2ab7b8bae81ba73
diff --git a/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2 b/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2
index 96c42eeea57a..466f3dc9847a 100644
--- a/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2
+++ b/metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.2
@@ -3,11 +3,12 @@ DEPEND=dev-lang/spidermonkey:0 >=net-irc/hexchat-2.9.6[plugins(+)] virtual/pkgco
DESCRIPTION=Javascript interface for HexChat
EAPI=5
HOMEPAGE=https://github.com/TingPing/hexchat-javascript
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=amd64 x86
LICENSE=MPL-2.0
RDEPEND=dev-lang/spidermonkey:0 >=net-irc/hexchat-2.9.6[plugins(+)]
SLOT=0
SRC_URI=https://github.com/TingPing/hexchat-javascript/archive/0.3.2.tar.gz -> hexchat-javascript-0.3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8dca27b3ae85df0a712f2d2bf3368563
diff --git a/metadata/md5-cache/x11-plugins/lurch-0.6.8-r2 b/metadata/md5-cache/x11-plugins/lurch-0.6.8-r2
index 49dc8e039ff3..9ab05e51322e 100644
--- a/metadata/md5-cache/x11-plugins/lurch-0.6.8-r2
+++ b/metadata/md5-cache/x11-plugins/lurch-0.6.8-r2
@@ -3,10 +3,11 @@ DEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt:= dev-libs/libxml2 dev-lib
DESCRIPTION=OMEMO encryption for libpurple (XEP-0384)
EAPI=7
HOMEPAGE=https://github.com/gkdr/lurch
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-3
RDEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt:= dev-libs/libxml2 dev-libs/mxml net-im/pidgin:= >=net-libs/libsignal-protocol-c-2.3.2
SLOT=0
SRC_URI=https://github.com/gkdr/lurch/releases/download/v0.6.8/lurch-0.6.8-src.tar.gz -> lurch-0.6.8.tar.gz https://github.com/gkdr/axc/archive/v0.3.3.tar.gz -> axc-0.3.3.tar.gz https://github.com/gkdr/libomemo/archive/v0.7.0.tar.gz -> libomemo-0.7.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a674640bfc71a07780a50fde9bd49ff9
diff --git a/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0 b/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0
index b74c0ee40948..b263c775b964 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0
@@ -3,10 +3,11 @@ DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 sys-devel/libtool virtual/pkgconfig
DESCRIPTION=Pidgin plugin that renders latex formulae
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/pidgin-latex/
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/latex-base app-text/dvipng
SLOT=0
SRC_URI=mirror://sourceforge/pidgin-latex/pidgin-latex_1.5.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=c97b049f0cb25cdc670209b0f3fd5f1f
diff --git a/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1 b/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
index 418fe897bc00..f38495ae70fa 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
@@ -3,10 +3,11 @@ DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=Pidgin plugin to notify by writing user defined strings to (led control) files
EAPI=6
HOMEPAGE=https://sites.google.com/site/simohmattila/led-notification
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
SLOT=0
SRC_URI=https://sites.google.com/site/simohmattila/led-notification-0.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0fd367ce876b915ce0ea90e470ce2721
diff --git a/metadata/md5-cache/x11-plugins/pidgin-mbpurple-0.3.0-r2 b/metadata/md5-cache/x11-plugins/pidgin-mbpurple-0.3.0-r2
index 5e66de269ff6..a488b58c4da6 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-mbpurple-0.3.0-r2
+++ b/metadata/md5-cache/x11-plugins/pidgin-mbpurple-0.3.0-r2
@@ -3,11 +3,12 @@ DEPEND=net-im/pidgin twitgin? ( net-im/pidgin[gtk] ) virtual/pkgconfig
DESCRIPTION=Pidgin plug-in supporting microblog services like Twitter or identi.ca
EAPI=6
HOMEPAGE=https://code.google.com/p/microblog-purple/
+INHERIT=toolchain-funcs
IUSE=+twitgin
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=net-im/pidgin twitgin? ( net-im/pidgin[gtk] )
SLOT=0
SRC_URI=https://microblog-purple.googlecode.com/files/mbpurple-0.3.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=abe405bfd9cbcb65c218c9a6ec780c8c
diff --git a/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.7 b/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.7
index 3743ad793319..e790ffa0dcd6 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.7
+++ b/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.7
@@ -4,10 +4,11 @@ DEPEND=app-crypt/libsecret dev-libs/glib:2 dev-libs/json-glib dev-libs/nss net-i
DESCRIPTION=Steam protocol plugin for pidgin
EAPI=7
HOMEPAGE=https://github.com/eionrobb/pidgin-opensteamworks
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-3
RDEPEND=app-crypt/libsecret dev-libs/glib:2 dev-libs/json-glib dev-libs/nss net-im/pidgin
SLOT=0
SRC_URI=https://github.com/EionRobb/pidgin-opensteamworks/archive/1.7.tar.gz -> pidgin-opensteamworks-1.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=51c6c1d41017fe5fd859b1b000a94f3b
diff --git a/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107 b/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107
index 53e1740c0ddc..223fb64cc5b2 100644
--- a/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107
+++ b/metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107
@@ -3,11 +3,12 @@ DEPEND=net-im/pidgin[gtk] app-text/mathtex nls? ( virtual/libintl ) virtual/pkgc
DESCRIPTION=Pidgin plugin to render LaTeX expressions in messages
EAPI=6
HOMEPAGE=https://github.com/Micket/pidgintex
+INHERIT=toolchain-funcs vcs-snapshot
IUSE=nls
KEYWORDS=amd64 x86
LICENSE=GPL-3+
RDEPEND=net-im/pidgin[gtk] app-text/mathtex nls? ( virtual/libintl )
SLOT=0
SRC_URI=https://github.com/Micket/pidgintex/archive/a8f618cf1bf92279b43c7b737010fd7e42c8e5d3.tar.gz -> pidgintex-1.1.2_p20170107.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
_md5_=a0c3d881f59f3ed029f77871a3627557
diff --git a/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20181202 b/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20181202
index 8d8740f7c01a..637bbe25d96e 100644
--- a/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20181202
+++ b/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20181202
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/protobuf-c:= net-im/pidgin sy
DESCRIPTION=Hangouts Plugin for libpurple
EAPI=7
HOMEPAGE=https://bitbucket.org/EionRobb/purple-hangouts
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=GPL-3+
RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/protobuf-c:= net-im/pidgin sys-libs/zlib
SLOT=0
SRC_URI=https://bitbucket.org/EionRobb/purple-hangouts/get/cccf2f62d439.tar.gz -> purple-hangouts-0_p20181202.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bbdd57f05f6cc7aa36bde541ce56320a
diff --git a/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20200710 b/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20200710
index 83ad6f6f0411..4186d4e8f80e 100644
--- a/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20200710
+++ b/metadata/md5-cache/x11-plugins/purple-hangouts-0_p20200710
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/protobuf-c:= net-im/pidgin sy
DESCRIPTION=Hangouts Plugin for libpurple
EAPI=7
HOMEPAGE=https://github.com/EionRobb/purple-hangouts
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=GPL-3+
RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/protobuf-c:= net-im/pidgin sys-libs/zlib
SLOT=0
SRC_URI=https://github.com/EionRobb/purple-hangouts/archive/efa7a53e2db4087a1590850423aa16b380bfbbd5.tar.gz -> purple-hangouts-0_p20200710.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4a5bb862d5eae692fd0f251c6a600fee
diff --git a/metadata/md5-cache/x11-plugins/purple-mattermost-2.0 b/metadata/md5-cache/x11-plugins/purple-mattermost-2.0
index 912fe3927e6d..b0f4b231d342 100644
--- a/metadata/md5-cache/x11-plugins/purple-mattermost-2.0
+++ b/metadata/md5-cache/x11-plugins/purple-mattermost-2.0
@@ -3,10 +3,11 @@ DEPEND=app-text/discount dev-libs/glib dev-libs/json-glib net-im/pidgin
DESCRIPTION=A libpurple/Pidgin plugin for Mattermost
EAPI=7
HOMEPAGE=https://github.com/EionRobb/purple-mattermost
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=app-text/discount dev-libs/glib dev-libs/json-glib net-im/pidgin
SLOT=0
SRC_URI=https://github.com/EionRobb/purple-mattermost/archive/v2.0.tar.gz -> purple-mattermost-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ccff155fd2f96bde1883b4ba48aad813
diff --git a/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3 b/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
index 96a1a68ae653..fef6ceb444ca 100644
--- a/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
+++ b/metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=WMaker DockApp: A Calendar clock with antialiased text
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmcalclock
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmCalClock-1.25.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=ea33936b5cabf091f53580a0183203f1
diff --git a/metadata/md5-cache/x11-plugins/wmDownload-0.1.2a-r3 b/metadata/md5-cache/x11-plugins/wmDownload-0.1.2a-r3
index 33560cfdc2b2..cc1a52e89b49 100644
--- a/metadata/md5-cache/x11-plugins/wmDownload-0.1.2a-r3
+++ b/metadata/md5-cache/x11-plugins/wmDownload-0.1.2a-r3
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
DESCRIPTION=dockapp that displays how much data you've received on each eth and ppp device
EAPI=7
HOMEPAGE=http://wmdownload.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=mirror://sourceforge/wmdownload/wmDownload-0.1.2a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=e1d9d8dc927b87ebed0667762fe1bdef
diff --git a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2 b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2
index 623e05a3de13..8b5cae5b50b6 100644
--- a/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmMatrix-0.2-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmmatrix
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-misc/xscreensaver
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmMatrix-0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0eb6b8fd15d93050f7475d4330dd5da5
diff --git a/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2 b/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
index 369fda04d524..1c5358bee520 100644
--- a/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
+++ b/metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=SMP system monitor dockapp
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmsmpmon
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmSMPmon-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6f4363df0c2296462534a72d82c3c7cf
diff --git a/metadata/md5-cache/x11-plugins/wmSun-1.05-r1 b/metadata/md5-cache/x11-plugins/wmSun-1.05-r1
index 52a4b30fcf43..680d2a3bf4b9 100644
--- a/metadata/md5-cache/x11-plugins/wmSun-1.05-r1
+++ b/metadata/md5-cache/x11-plugins/wmSun-1.05-r1
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
DESCRIPTION=dockapp which displays the rise/set time of the sun
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmsun
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmsun-1.05.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=08ae12d96f80085bb7720669802ac9df
diff --git a/metadata/md5-cache/x11-plugins/wmXName-0.1-r1 b/metadata/md5-cache/x11-plugins/wmXName-0.1-r1
index a72f1f4ff7ba..774ba740c342 100644
--- a/metadata/md5-cache/x11-plugins/wmXName-0.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmXName-0.1-r1
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=dock-app showing you status of your XName hosted zones
EAPI=7
HOMEPAGE=http://source.xname.org/
+INHERIT=toolchain-funcs
KEYWORDS=x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libXpm-3.5.7 >=x11-libs/libX11-1.1.4 >=x11-libs/libXext-1.0.3 >=dev-lang/perl-5.8.8-r5 >=www-client/lynx-2.8.6-r2
SLOT=0
SRC_URI=http://source.xname.org/wmXName-0.01.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=7e85c9c201340518db04226e9081052b
diff --git a/metadata/md5-cache/x11-plugins/wmacpi-2.4 b/metadata/md5-cache/x11-plugins/wmacpi-2.4
index a0753427a51f..0ca156699be4 100644
--- a/metadata/md5-cache/x11-plugins/wmacpi-2.4
+++ b/metadata/md5-cache/x11-plugins/wmacpi-2.4
@@ -3,9 +3,10 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11
DESCRIPTION=DockApp ACPI status monitor for laptops
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmacpi
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 -ppc -sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmacpi-2.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=36679a1eb472e4c648208d5acce65e44
diff --git a/metadata/md5-cache/x11-plugins/wmail-2.0-r5 b/metadata/md5-cache/x11-plugins/wmail-2.0-r5
index 75b2f0fa6318..982c7a06069f 100644
--- a/metadata/md5-cache/x11-plugins/wmail-2.0-r5
+++ b/metadata/md5-cache/x11-plugins/wmail-2.0-r5
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:=
DESCRIPTION=Window Maker dock application showing incoming mail
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmail
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:=
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmail-2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=db37202ceba6528b0dab97ba626c708c
diff --git a/metadata/md5-cache/x11-plugins/wmail-2.2 b/metadata/md5-cache/x11-plugins/wmail-2.2
index 96c871640a75..11f843304b82 100644
--- a/metadata/md5-cache/x11-plugins/wmail-2.2
+++ b/metadata/md5-cache/x11-plugins/wmail-2.2
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:=
DESCRIPTION=Window Maker dock application showing incoming mail
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmail
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:=
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmail-2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8a6244289920525aa8a09977dcc04e52
diff --git a/metadata/md5-cache/x11-plugins/wmail-2.3 b/metadata/md5-cache/x11-plugins/wmail-2.3
index d17d6dd138a3..10afd2c56cc4 100644
--- a/metadata/md5-cache/x11-plugins/wmail-2.3
+++ b/metadata/md5-cache/x11-plugins/wmail-2.3
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:=
DESCRIPTION=Window Maker dock application showing incoming mail
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmail
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:=
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmail-2.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=8a6244289920525aa8a09977dcc04e52
diff --git a/metadata/md5-cache/x11-plugins/wmamixer-1.0 b/metadata/md5-cache/x11-plugins/wmamixer-1.0
index 7fa0608e2806..65d679a5adcd 100644
--- a/metadata/md5-cache/x11-plugins/wmamixer-1.0
+++ b/metadata/md5-cache/x11-plugins/wmamixer-1.0
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=ALSA mixer dockapp, fork of wmsmixer
EAPI=7
HOMEPAGE=https://github.com/gryf/wmamixer
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/gryf/wmamixer/archive/1.0.tar.gz -> wmamixer-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=11f9d21c8c8a332be111b83b8cc58951
diff --git a/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1 b/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1
index 400988475fb3..706106cc31c0 100644
--- a/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1
+++ b/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/alsa-lib x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-
DESCRIPTION=ALSA mixer dockapp, fork of wmsmixer
EAPI=7
HOMEPAGE=https://github.com/gryf/wmamixer
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/alsa-lib x11-libs/libXpm x11-libs/libXext x11-libs/libX11
SLOT=0
SRC_URI=https://github.com/gryf/wmamixer/archive/1.0.tar.gz -> wmamixer-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=93851192eec9d73ee7ba0c2b49bbd076
diff --git a/metadata/md5-cache/x11-plugins/wmapm-3.1-r2 b/metadata/md5-cache/x11-plugins/wmapm-3.1-r2
index d5a1aee47852..db81f79634f2 100644
--- a/metadata/md5-cache/x11-plugins/wmapm-3.1-r2
+++ b/metadata/md5-cache/x11-plugins/wmapm-3.1-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=WindowMaker DockApp: Battery/Power status monitor for laptops
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmapm
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmapm-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=df6f8fbf5a394c603830a18d2f677c7f
diff --git a/metadata/md5-cache/x11-plugins/wmbinclock-0.5-r1 b/metadata/md5-cache/x11-plugins/wmbinclock-0.5-r1
index 7ace2b499ec3..97805d5e64e8 100644
--- a/metadata/md5-cache/x11-plugins/wmbinclock-0.5-r1
+++ b/metadata/md5-cache/x11-plugins/wmbinclock-0.5-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-base/xorg-proto
DESCRIPTION=a nifty little binary clock dockapp
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmbinclock
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
SLOT=0
SRC_URI=mirror://sourceforge/wmbinclock/wmbinclock-0.5.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=492e74e1bdea3ea2a816af2fcd93c581
diff --git a/metadata/md5-cache/x11-plugins/wmcalc-0.6-r1 b/metadata/md5-cache/x11-plugins/wmcalc-0.6-r1
index 89ace6c3edc8..84c0122648dd 100644
--- a/metadata/md5-cache/x11-plugins/wmcalc-0.6-r1
+++ b/metadata/md5-cache/x11-plugins/wmcalc-0.6-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=A WindowMaker DockApp calculator
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmcalc
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmcalc-0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=dbe6c9c08445245b6b63033dc53b5c15
diff --git a/metadata/md5-cache/x11-plugins/wmcalendar-0.5.2-r2 b/metadata/md5-cache/x11-plugins/wmcalendar-0.5.2-r2
index 97de2315512f..0c92c108263c 100644
--- a/metadata/md5-cache/x11-plugins/wmcalendar-0.5.2-r2
+++ b/metadata/md5-cache/x11-plugins/wmcalendar-0.5.2-r2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/libical x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-lib
DESCRIPTION=a calendar dockapp
EAPI=7
HOMEPAGE=http://wmcalendar.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=dev-libs/libical x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=mirror://sourceforge/wmcalendar/wmcalendar-0.5.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5073ed0f84fab6b9893cb050e66c199d
diff --git a/metadata/md5-cache/x11-plugins/wmcliphist-2.1-r2 b/metadata/md5-cache/x11-plugins/wmcliphist-2.1-r2
index c71cb0c5ff56..df8867ce53c4 100644
--- a/metadata/md5-cache/x11-plugins/wmcliphist-2.1-r2
+++ b/metadata/md5-cache/x11-plugins/wmcliphist-2.1-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:3[X] virtual/pkgconfig
DESCRIPTION=Dockable clipboard history application for Window Maker
EAPI=6
HOMEPAGE=https://www.dockapps.net/wmcliphist
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:3[X]
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmcliphist-2.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2394d0f68ac2a8b5ff474745e2e8d165
diff --git a/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1 b/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1
index 979039f561f1..08009e316ddf 100644
--- a/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1
+++ b/metadata/md5-cache/x11-plugins/wmcp-1.2.8-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=A pager dockapp
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmcp
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmcp-1.2.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a07287f9cf3c6a7b609c4ff662d84a01
diff --git a/metadata/md5-cache/x11-plugins/wmcube-1.0.2 b/metadata/md5-cache/x11-plugins/wmcube-1.0.2
index 5b5dd11eb4ba..4fcee220953a 100644
--- a/metadata/md5-cache/x11-plugins/wmcube-1.0.2
+++ b/metadata/md5-cache/x11-plugins/wmcube-1.0.2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
DESCRIPTION=a dockapp cpu monitor with spinning 3d objects
EAPI=6
HOMEPAGE=http://linux-bsd-unix.strefa.pl/index.en.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmcube-1.0.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5cb0ef63427eef010166a30ae97f3400
diff --git a/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1 b/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
index 3d42645a64d0..3f8f1a34712f 100644
--- a/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
+++ b/metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
DESCRIPTION=multishape 3d rotating dots
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmdots
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmdots-0.2beta.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=29c52306d98243f47538f0a47eba9627
diff --git a/metadata/md5-cache/x11-plugins/wmfortune-0.241-r1 b/metadata/md5-cache/x11-plugins/wmfortune-0.241-r1
index ae7b631434e1..eb0741c85ec9 100644
--- a/metadata/md5-cache/x11-plugins/wmfortune-0.241-r1
+++ b/metadata/md5-cache/x11-plugins/wmfortune-0.241-r1
@@ -3,10 +3,11 @@ DEPEND=games-misc/fortune-mod x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x
DESCRIPTION=a dockapp showing fortune-mod messages
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmfortune
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-1
RDEPEND=games-misc/fortune-mod x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmfortune-0.241.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9efc36b2758eb27c78b5b4b72f5422a5
diff --git a/metadata/md5-cache/x11-plugins/wmfrog-0.3.1-r1 b/metadata/md5-cache/x11-plugins/wmfrog-0.3.1-r1
index cd1117d152a0..b7e9d9c338ff 100644
--- a/metadata/md5-cache/x11-plugins/wmfrog-0.3.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmfrog-0.3.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=a weather application, it shows the weather in a graphical way
EAPI=7
HOMEPAGE=http://wiki.colar.net/wmfrog_dockapp
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXext x11-libs/libXpm x11-libs/libX11
SLOT=0
SRC_URI=mirror://sourceforge/wmfrog/wmfrog-0.3.1.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3be353e3a9e20efb56caf83e77359438
diff --git a/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2 b/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
index 01f0c7cbd22b..04489d75a2eb 100644
--- a/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
+++ b/metadata/md5-cache/x11-plugins/wmgrabimage-0.72-r2
@@ -3,6 +3,7 @@ DEPEND=>=net-misc/wget-1.9-r2 >=media-gfx/imagemagick-5.5.7.15 x11-libs/libX11 x
DESCRIPTION=wmGrabImage grabs an image from the WWW and displays it
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmgrabimage
+INHERIT=desktop
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
RDEPEND=>=net-misc/wget-1.9-r2 >=media-gfx/imagemagick-5.5.7.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
diff --git a/metadata/md5-cache/x11-plugins/wmifinfo-0.10-r1 b/metadata/md5-cache/x11-plugins/wmifinfo-0.10-r1
index cab566651f81..9d18afb25b91 100644
--- a/metadata/md5-cache/x11-plugins/wmifinfo-0.10-r1
+++ b/metadata/md5-cache/x11-plugins/wmifinfo-0.10-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=a dockapp for monitoring network interfaces
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmifinfo
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmifinfo-0.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=0d48ecd5c94418ab0effab59762f326c
diff --git a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2 b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2
index dc4246b1297e..007040bf8c00 100644
--- a/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2
+++ b/metadata/md5-cache/x11-plugins/wminet-3.0.0-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=dockapp for monitoring internet connections to and from your computer
EAPI=7
HOMEPAGE=http://www.improbability.net/#wminet
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=http://www.improbability.net/wmdock//wminet-3.0.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=996964fea412a6e1ce84b715f024e3c7
diff --git a/metadata/md5-cache/x11-plugins/wmitime-0.5-r1 b/metadata/md5-cache/x11-plugins/wmitime-0.5-r1
index cdbebb96b436..e98dc6fe3cbb 100644
--- a/metadata/md5-cache/x11-plugins/wmitime-0.5-r1
+++ b/metadata/md5-cache/x11-plugins/wmitime-0.5-r1
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
DESCRIPTION=Overglorified clock dockapp w/time, date, and internet time
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmitime
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmitime-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4566b603e40b118be667d9823ad09608
diff --git a/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1 b/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1
index bd6c9e2a1f35..f8a275075bee 100644
--- a/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1
+++ b/metadata/md5-cache/x11-plugins/wmload-0.9.7-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=yet another dock application showing a system load gauge
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmload
+INHERIT=desktop toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmload-0.9.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=9a2e7ae330a5a7a0972e728d60364b8f
diff --git a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2 b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
index 11f6f27c48b2..a8c56b9e8760 100644
--- a/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
+++ b/metadata/md5-cache/x11-plugins/wmmaiload-2.3.0-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libXpm virtual/pkgconfig
DESCRIPTION=dockapp that monitors one or more mailboxes
EAPI=7
HOMEPAGE=http://tnemeth.free.fr/projets/dockapps.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libXpm
SLOT=0
SRC_URI=http://tnemeth.free.fr/projets/programmes/wmmaiload-2.3.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=08d79beed8d61370e63f6bc9841426c0
diff --git a/metadata/md5-cache/x11-plugins/wmmenu-1.3-r2 b/metadata/md5-cache/x11-plugins/wmmenu-1.3-r2
index 6c8bc6da7ff9..ba1dc57e36c4 100644
--- a/metadata/md5-cache/x11-plugins/wmmenu-1.3-r2
+++ b/metadata/md5-cache/x11-plugins/wmmenu-1.3-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 >=x11-libs/libdoc
DESCRIPTION=a popup menu of icons like in AfterStep, as a dockapp
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmmenu
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 >=x11-libs/libdockapp-0.7:=
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmmenu-1.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=17d1d6fd772054da0a8257efce91b8ee
diff --git a/metadata/md5-cache/x11-plugins/wmmisc-1.2 b/metadata/md5-cache/x11-plugins/wmmisc-1.2
index 9bf0cb4e9e95..16d2694cf9dc 100644
--- a/metadata/md5-cache/x11-plugins/wmmisc-1.2
+++ b/metadata/md5-cache/x11-plugins/wmmisc-1.2
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:=
DESCRIPTION=a monitoring dockapp for system load, user amount, fork amount and processes
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmmisc
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:=
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmmisc-1.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=32661184cc4e5c52be323a50e0e85ccc
diff --git a/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3 b/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
index b9f1b9452951..55ffa7344ca5 100644
--- a/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
+++ b/metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=Dockapp CPU monitor resembling Xosview, support for smp
EAPI=7
HOMEPAGE=http://www.ne.jp/asahi/linux/timecop/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz -> wmmon+smp-1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6d0694ce1d9a1e0ebf04e2cb3103f69d
diff --git a/metadata/md5-cache/x11-plugins/wmppp-1.3.2-r1 b/metadata/md5-cache/x11-plugins/wmppp-1.3.2-r1
index 6a20bdd86e4d..e3b4d8065d8d 100644
--- a/metadata/md5-cache/x11-plugins/wmppp-1.3.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmppp-1.3.2-r1
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
DESCRIPTION=PPP dial control and network load monitor with NeXTStep look
EAPI=5
HOMEPAGE=http://www.dockapps.net/wmppp.app
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=http://www.dockapps.net/download/wmppp.app-1.3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=62952a801040ad02350b0a1cb175fb86
diff --git a/metadata/md5-cache/x11-plugins/wmrack-1.4-r1 b/metadata/md5-cache/x11-plugins/wmrack-1.4-r1
index b0d462db52f3..edcf575343c7 100644
--- a/metadata/md5-cache/x11-plugins/wmrack-1.4-r1
+++ b/metadata/md5-cache/x11-plugins/wmrack-1.4-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-base/xorg-proto
DESCRIPTION=a sound mixer and CD player dockapp
EAPI=7
HOMEPAGE=http://wmrack.sourceforge.net
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
SLOT=0
SRC_URI=mirror://sourceforge/wmrack/wmrack-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3d5d7c516175d873a4962937e0fb52d3
diff --git a/metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r2 b/metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r2
index abde37093e8a..bfbf46a79e96 100644
--- a/metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r2
+++ b/metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=A Dockable General Purpose Recording Utility
EAPI=7
HOMEPAGE=http://ret009t0.eresmas.net/other_software/wmrecord/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=http://ret009t0.eresmas.net/other_software/wmrecord/wmrecord-1.0.5_20040218_0029.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=412a66bde7c7b9ae49a0a48cd34f488c
diff --git a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1 b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
index 6d055b710299..7fd8d0a9306a 100644
--- a/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=fork of wmmixer adding scrollwheel support and other features
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmsmixer
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
SLOT=0
SRC_URI=https://www.dockapps.net/download/wmsmixer-0.5.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=b79ea4b76f78bb07d630a699b2eb203c
diff --git a/metadata/md5-cache/x11-plugins/wmsysmon-0.7.8 b/metadata/md5-cache/x11-plugins/wmsysmon-0.7.8
index ba5b584b959d..9823bfc7ff87 100644
--- a/metadata/md5-cache/x11-plugins/wmsysmon-0.7.8
+++ b/metadata/md5-cache/x11-plugins/wmsysmon-0.7.8
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
DESCRIPTION=a dockapp to monitor: CPU, Memory, Uptime, IRQs, Paging and Swap activity
EAPI=6
HOMEPAGE=https://github.com/voyageur/wmsysmon
+INHERIT=toolchain-funcs
KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=https://github.com/voyageur/wmsysmon/archive/0.7.8.tar.gz -> wmsysmon-0.7.8.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=836baa77d212ca72ba8006f1c4adf0af
diff --git a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1 b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
index e033e3bca599..67cf08a067f0 100644
--- a/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm
DESCRIPTION=Window Maker dock app that provides a system tray for GNOME/KDE applications
EAPI=7
HOMEPAGE=https://github.com/bbidulock/wmsystray
+INHERIT=desktop toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXpm
SLOT=0
SRC_URI=https://github.com/bbidulock/wmsystray/releases/download/0.1.1/wmsystray-0.1.1.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=15e276ab93ff4d618690c45f203d1060
diff --git a/metadata/md5-cache/x11-plugins/wmtime-1.4-r1 b/metadata/md5-cache/x11-plugins/wmtime-1.4-r1
index 1dd81457561b..8ccd454ac4a4 100644
--- a/metadata/md5-cache/x11-plugins/wmtime-1.4-r1
+++ b/metadata/md5-cache/x11-plugins/wmtime-1.4-r1
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
DESCRIPTION=applet which displays the date and time in a dockable tile
EAPI=7
HOMEPAGE=https://www.dockapps.net/wmtime
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libXpm
SLOT=0
SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmtime-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f23d4678a36a2c03cdf1ecfec7cc0697
diff --git a/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2 b/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
index 7c45672e1899..c8d3841d660b 100644
--- a/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
+++ b/metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libXpm x11-libs/libXext x11-li
DESCRIPTION=Dockable clock which can run in alarm, countdown timer or chronograph mode
EAPI=6
HOMEPAGE=https://github.com/bbidulock/wmtimer
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
diff --git a/metadata/md5-cache/x11-plugins/wmtz-0.7_p20150816 b/metadata/md5-cache/x11-plugins/wmtz-0.7_p20150816
index c474b57947c7..0a4d1f742eb4 100644
--- a/metadata/md5-cache/x11-plugins/wmtz-0.7_p20150816
+++ b/metadata/md5-cache/x11-plugins/wmtz-0.7_p20150816
@@ -3,6 +3,7 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
DESCRIPTION=dockapp that shows the time in multiple timezones
EAPI=6
HOMEPAGE=https://www.dockapps.net/wmtz
+INHERIT=multilib toolchain-funcs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
diff --git a/metadata/md5-cache/x11-plugins/wmxkb-1.2.2-r1 b/metadata/md5-cache/x11-plugins/wmxkb-1.2.2-r1
index ecade21b1778..383c13f14f6b 100644
--- a/metadata/md5-cache/x11-plugins/wmxkb-1.2.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmxkb-1.2.2-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm x11-base/
DESCRIPTION=Dockable keyboard layout switcher for Window Maker
EAPI=7
HOMEPAGE=http://wmalms.tripod.com/#WMXKB
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=http://wmalms.tripod.com/wmxkb-1.2.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=28297c212850f719ced455271e2a03fb
diff --git a/metadata/md5-cache/x11-plugins/wmxres-1.2-r1 b/metadata/md5-cache/x11-plugins/wmxres-1.2-r1
index 144fd55f984f..ec51b22877fe 100644
--- a/metadata/md5-cache/x11-plugins/wmxres-1.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmxres-1.2-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86vm x11-
DESCRIPTION=Dock application to select your display mode among those possible
EAPI=7
HOMEPAGE=http://yalla.free.fr/wn
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-1
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86vm
SLOT=0
SRC_URI=http://yalla.free.fr/wn/wmxres-1.1-0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=1445655b037fa54768cfe45908c780dd
diff --git a/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2 b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
index 42e229aba449..6aa7e41b9551 100644
--- a/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
+++ b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/q
DESCRIPTION=terminal emulator which mimics the look and feel of the old cathode tube screens
EAPI=7
HOMEPAGE=https://github.com/Swordfish90/cool-retro-term
+INHERIT=qmake-utils xdg-utils
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2 GPL-3
RDEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtsql:5 dev-qt/qtwidgets:5
SLOT=0
SRC_URI=https://github.com/Swordfish90/cool-retro-term/archive/1.1.1.tar.gz -> cool-retro-term-1.1.1.tar.gz https://github.com/Swordfish90/qmltermwidget/archive/0.2.0.tar.gz -> qmltermwidget-0.2.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=28f6c242524b6c651d3c64351db25d03
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.0 b/metadata/md5-cache/x11-terms/mlterm-3.9.0
index a4c37079222e..22fbf2e8fff9 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.0
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.0
@@ -3,6 +3,7 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi )
DESCRIPTION=A multi-lingual terminal emulator
EAPI=7
HOMEPAGE=http://mlterm.sourceforge.net/
+INHERIT=desktop
IUSE=bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=BSD
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.1 b/metadata/md5-cache/x11-terms/mlterm-3.9.1
index a297daac4c4f..ad11c291f131 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.1
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.1
@@ -3,6 +3,7 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi )
DESCRIPTION=A multi-lingual terminal emulator
EAPI=7
HOMEPAGE=http://mlterm.sourceforge.net/
+INHERIT=desktop
IUSE=bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=BSD
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
index a1cc5aaa372d..b297118e2d38 100644
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
+++ b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.9.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.38:2= >=x11-libs/gtk+-3.20.8:3= x11-libs/libX11:= >=x11
DESCRIPTION=A terminal emulator for the Xfce desktop environment
EAPI=6
HOMEPAGE=https://docs.xfce.org/apps/terminal/start
+INHERIT=eapi7-ver
IUSE=utempter
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
LICENSE=GPL-2+
diff --git a/metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1 b/metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
index 48c4c31ad904..abcbd8d77513 100644
--- a/metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
+++ b/metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=yeahconsole turns an xterm or rxvt-unicode into a game-like console
EAPI=6
HOMEPAGE=http://phrat.de/yeahtools.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=http://phrat.de/yeahconsole-0.3.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3c514c0f6f477f5e65fab791237db9a2
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
index 70ec6be3dfc2..273473aaff91 100644
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx
DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
EAPI=7
HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
+INHERIT=qmake-utils
KEYWORDS=amd64 ~ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= x11-libs/gtk+:3[X]
SLOT=0
SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.6.1.tar.gz -> QGnomePlatform-0.6.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=163687b62b73a56052d5536e786f9c05
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.7.0 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.7.0
index 8ec91afc74da..c44a95c956b6 100644
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.7.0
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.7.0
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.12:5= dev-qt/qtwayland:5= dev-qt/qt
DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
EAPI=7
HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.12:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.2.0
SLOT=0
SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.7.0.tar.gz -> QGnomePlatform-0.7.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=c26eaa057b802d0c3695e2913f8d92da
diff --git a/metadata/md5-cache/x11-themes/claws-mail-themes-20140629 b/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
index b505eae1c257..e08944486520 100644
--- a/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
+++ b/metadata/md5-cache/x11-themes/claws-mail-themes-20140629
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Iconsets for Claws Mail
EAPI=7
HOMEPAGE=https://www.claws-mail.org/
+INHERIT=xdg
KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2 GPL-3 CC-BY-3.0 CC-BY-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-3.0 MPL-1.1 freedist public-domain all-rights-reserved
RDEPEND=mail-client/claws-mail
RESTRICT=mirror bindist
SLOT=0
SRC_URI=https://www.claws-mail.org/themes/claws-mail-themes-20140629.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=c7ff14ed94815a0ba0ea0aa273433c82
diff --git a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031 b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
index ad8586379a7b..9f0341cf3c25 100644
--- a/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
+++ b/metadata/md5-cache/x11-themes/echo-icon-theme-0.3.89.0_pre20081031
@@ -4,9 +4,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=SVG icon theme from the Echo Icon project
EAPI=7
HOMEPAGE=https://fedorahosted.org/echo-icon-theme
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=CC-BY-SA-3.0
SLOT=0
SRC_URI=mirror://gentoo/echo-icon-theme-0.3.89.0_pre20081031.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=13e55af26d4fd2045b28ecec2eea84bb
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
index 75f87fbc46bc..588dac217a8a 100644
--- a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
@@ -3,9 +3,10 @@ DEPEND=media-gfx/optipng sys-apps/findutils x11-libs/gdk-pixbuf:2 x11-libs/gtk+:
DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
EAPI=7
HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
+INHERIT=xdg-utils toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain GPL-1 GPL-2 GPL-3
SLOT=0
SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/v0.15.1.tar.gz -> elementary-xfce-0.15.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3c594fab5dffdfb72937fec61d84d6f2
diff --git a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.2 b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.2
index 34e31d5a68e3..53b2272082df 100644
--- a/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.2
+++ b/metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.2
@@ -3,9 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare
DESCRIPTION=Elementary icons forked from upstream, extended and maintained for Xfce
EAPI=7
HOMEPAGE=https://github.com/shimmerproject/elementary-xfce
+INHERIT=xdg-utils toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=public-domain GPL-1 GPL-2 GPL-3
SLOT=0
SRC_URI=https://github.com/shimmerproject/elementary-xfce/archive/v0.15.2.tar.gz -> elementary-xfce-0.15.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=542ba4b5885fb48f5fb87426f995a9e6
diff --git a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1 b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1
index c62a7670b4b5..2405384e103d 100644
--- a/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1
+++ b/metadata/md5-cache/x11-themes/faenza-icon-theme-1.3.1-r1
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A scalable icon theme called Faenza
EAPI=7
HOMEPAGE=https://tiheum.deviantart.com/art/Faenza-Icons-173323228
+INHERIT=xdg
KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-3
RDEPEND=x11-themes/hicolor-icon-theme
SLOT=0
SRC_URI=mirror://gentoo/faenza-icon-theme_1.3.1.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=57f20598dad6c043db92bd31ea0ccce8
diff --git a/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7 b/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
index d528c83de42a..f32aec56f047 100644
--- a/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
+++ b/metadata/md5-cache/x11-themes/gargantuan-icon-theme-1.7
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Gargantuan Icon Theme
EAPI=7
HOMEPAGE=https://www.gnome-look.org/content/show.php?content=24364
+INHERIT=xdg
KEYWORDS=~amd64
LICENSE=public-domain
RDEPEND=x11-themes/hicolor-icon-theme
SLOT=0
SRC_URI=mirror://gentoo/gargantuan-icon-theme-1.7.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=d9fced8cdc9789efba250a14781d9a4a
diff --git a/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1 b/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
index 51cc4132c47f..81bd4eb8be09 100644
--- a/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
+++ b/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
LICENSE=CC-BY-SA-2.0
SLOT=0
SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/goddard-backgrounds-13.0.0-3.fc15.src.rpm
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd versionator d3fb3ba33acc3bbbdc4d7970227c100d
_md5_=08a280370cbea57d7cadb6b984c6b9dd
diff --git a/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1 b/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
index 7df4c5fe9840..655cc33fb083 100644
--- a/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
+++ b/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=Utility to switch and preview GTK+ theme
EAPI=7
HOMEPAGE=https://packages.qa.debian.org/g/gtk-theme-switch.html
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://debian/pool/main/g/gtk-theme-switch/gtk-theme-switch_2.1.0.orig.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=2ba067103981688ff1a8d50199e85fa8
diff --git a/metadata/md5-cache/x11-themes/human-icon-theme-0.36 b/metadata/md5-cache/x11-themes/human-icon-theme-0.36
index 0c09a660ef5d..c33a3ee957a9 100644
--- a/metadata/md5-cache/x11-themes/human-icon-theme-0.36
+++ b/metadata/md5-cache/x11-themes/human-icon-theme-0.36
@@ -4,11 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A nice and well polished icon theme
EAPI=7
HOMEPAGE=https://packages.ubuntu.com/lucid/human-icon-theme
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=CC-BY-SA-2.5
RDEPEND=|| ( x11-themes/adwaita-icon-theme x11-themes/tangerine-icon-theme )
RESTRICT=binchecks strip
SLOT=0
SRC_URI=mirror://ubuntu/pool/universe/h/human-icon-theme/human-icon-theme_0.36.tar.gz https://www.gentoo.org/images/gentoo-logo.svg
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=215b0e44d3cddd27704353f3289bf257
diff --git a/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08 b/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
index 55d71119f7f4..a57dac493308 100644
--- a/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
+++ b/metadata/md5-cache/x11-themes/nou-icon-theme-09.02.08
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Scalable icon theme called Nou
EAPI=7
HOMEPAGE=http://www.silvestre.com.ar/
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/Nou-090208.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=f87992c3da9ac122ee65d46736afecf6
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20
index 4650770d811c..3ffee04df577 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-19.09.20
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=An official icon theme from the Numix Project
EAPI=7
HOMEPAGE=https://github.com/numixproject
+INHERIT=xdg
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/19.09.20.tar.gz -> numix-icon-theme-19.09.20.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=21c888c340d670573413991d3f43b5a4
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07
index 0fccb71adb2a..071176a56c1d 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-20.06.07
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=An official icon theme from the Numix Project
EAPI=7
HOMEPAGE=https://github.com/numixproject
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=https://github.com/numixproject/numix-icon-theme/archive/20.06.07.tar.gz -> numix-icon-theme-20.06.07.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=bedf0cbdbc3483b9966f50bf587719dc
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20
index fceb9ca995c5..7194f0dad190 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.09.20
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Icon theme from the Numix project
EAPI=7
HOMEPAGE=https://github.com/numixproject
+INHERIT=xdg
KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=x11-themes/numix-icon-theme
SLOT=0
SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.09.20.tar.gz -> numix-icon-theme-circle-19.09.20.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=d75733f3a34ad750c525b3522b88becf
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19
index 3aed31cecf8e..1277cf992295 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-20.09.19
@@ -3,10 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Icon theme from the Numix project
EAPI=7
HOMEPAGE=https://github.com/numixproject
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=x11-themes/numix-icon-theme
SLOT=0
SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/20.09.19.tar.gz -> numix-icon-theme-circle-20.09.19.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=dc01a1e890c33b8fc37919a1e2fc1aaa
diff --git a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1 b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1
index 071ae38c25db..29d96650ff4a 100644
--- a/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1
+++ b/metadata/md5-cache/x11-themes/nuovo-icon-theme-0.5-r1
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A scalable icon theme called Nuovo
EAPI=7
HOMEPAGE=http://www.silvestre.com.ar/
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/dlg-nuovo-0.5.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=4fe2aefdbb58ea9860ab2838aa54ac4e
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
index ed2240c7d311..d2f2ddc0b0a3 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install postinst postrm preinst
DESCRIPTION=icon theme for Linux
EAPI=7
HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+INHERIT=gnome2-utils xdg-utils
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200901.tar.gz -> papirus-icon-theme-20200901.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
_md5_=13af74fec53925a4432760951309eb2e
diff --git a/metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1 b/metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1
index 6ea607eb725c..6fd6bdaea5ef 100644
--- a/metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1
+++ b/metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5
DESCRIPTION=Skins for SMPlayer
EAPI=7
HOMEPAGE=https://www.smplayer.info/
+INHERIT=qmake-utils
KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 GPL-2 LGPL-3
RDEPEND=media-video/smplayer
SLOT=0
SRC_URI=mirror://sourceforge/smplayer/smplayer-skins-15.2.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=2c20c4d76152df9386ffa74c30b2c534
diff --git a/metadata/md5-cache/x11-themes/smplayer-themes-18.6.0 b/metadata/md5-cache/x11-themes/smplayer-themes-18.6.0
index d03a800bbb58..f88303d48e96 100644
--- a/metadata/md5-cache/x11-themes/smplayer-themes-18.6.0
+++ b/metadata/md5-cache/x11-themes/smplayer-themes-18.6.0
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5
DESCRIPTION=Icon themes for smplayer
EAPI=7
HOMEPAGE=https://www.smplayer.info/
+INHERIT=qmake-utils
KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86
LICENSE=CC-BY-2.5 CC-BY-SA-2.5 CC-BY-SA-3.0 CC0-1.0 GPL-2 GPL-3+ LGPL-3
RDEPEND=media-video/smplayer
SLOT=0
SRC_URI=mirror://sourceforge/smplayer/smplayer-themes-18.6.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47
_md5_=61da8eb5519aa4ec96526939f090078e
diff --git a/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27 b/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
index fc4d62dd76eb..f77644302e7a 100644
--- a/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
+++ b/metadata/md5-cache/x11-themes/tangerine-icon-theme-0.27
@@ -4,6 +4,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=a derivative of the standard Tango theme, using a more orange approach
EAPI=7
HOMEPAGE=https://packages.ubuntu.com/gutsy/x11/tangerine-icon-theme
+INHERIT=xdg
IUSE=minimal
KEYWORDS=amd64 x86
LICENSE=CC-BY-SA-2.5 LGPL-2.1
@@ -11,5 +12,5 @@ RDEPEND=!minimal? ( || ( x11-themes/adwaita-icon-theme kde-frameworks/oxygen-ico
RESTRICT=binchecks strip
SLOT=0
SRC_URI=mirror://ubuntu/pool/universe/t/tangerine-icon-theme/tangerine-icon-theme_0.27.tar.gz https://www.gentoo.org/images/gentoo-logo.svg
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=4837658906ab41842037f44e0b1d6922
diff --git a/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1 b/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1
index 5c10acceefa3..3124cc7101a0 100644
--- a/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1
+++ b/metadata/md5-cache/x11-themes/tango-icon-theme-0.8.90-r1
@@ -4,6 +4,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=SVG and PNG icon theme from the Tango project
EAPI=7
HOMEPAGE=http://tango.freedesktop.org
+INHERIT=xdg
IUSE=minimal png
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
@@ -11,5 +12,5 @@ RDEPEND=!hppa? ( !minimal? ( x11-themes/adwaita-icon-theme ) ) >=x11-themes/hico
RESTRICT=binchecks strip
SLOT=0
SRC_URI=http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=e3c06b64aa3576a897a11c237bfae747
diff --git a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1 b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1
index 35e4fd815ce3..229b236bd154 100644
--- a/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1
+++ b/metadata/md5-cache/x11-themes/yasis-icon-theme-0.4.2-r1
@@ -3,9 +3,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Scalable icon theme called Yasis
EAPI=7
HOMEPAGE=http://www.silvestre.com.ar/
+INHERIT=xdg
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/yasis-0.4.2.tar.bz2
-_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
_md5_=af1e235c9e741048a2a1b009055ed962
diff --git a/metadata/md5-cache/x11-themes/zuki-themes-3.32.2 b/metadata/md5-cache/x11-themes/zuki-themes-3.32.2
index e80780da0242..b2552a699c02 100644
--- a/metadata/md5-cache/x11-themes/zuki-themes-3.32.2
+++ b/metadata/md5-cache/x11-themes/zuki-themes-3.32.2
@@ -2,6 +2,7 @@ DEFINED_PHASES=compile configure install
DESCRIPTION=Zuki themes for GTK, gnome-shell and more
EAPI=6
HOMEPAGE=https://github.com/lassekongo83/zuki-themes
+INHERIT=eapi7-ver
IUSE=gnome-shell mate xfce
KEYWORDS=amd64 x86
LICENSE=GPL-3
diff --git a/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2 b/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
index cfb46bb2f338..157da383f63b 100644
--- a/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
+++ b/metadata/md5-cache/x11-wm/aewm++-1.1.5-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
DESCRIPTION=A window manager with more modern features than aewm
EAPI=6
HOMEPAGE=https://github.com/frankhale/aewmpp
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext
SLOT=0
SRC_URI=mirror://gentoo/aewm++-1.1.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=4c554bedca9e6e2be3b2599acfd85f0d
diff --git a/metadata/md5-cache/x11-wm/aewm-1.3.12-r1 b/metadata/md5-cache/x11-wm/aewm-1.3.12-r1
index 518957594883..de52db1145c2 100644
--- a/metadata/md5-cache/x11-wm/aewm-1.3.12-r1
+++ b/metadata/md5-cache/x11-wm/aewm-1.3.12-r1
@@ -3,10 +3,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs
DESCRIPTION=A minimalistic X11 window manager
EAPI=7
HOMEPAGE=https://www.red-bean.com/decklin/aewm/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=MIT 9wm
RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft
SLOT=0
SRC_URI=https://www.red-bean.com/decklin/aewm/aewm-1.3.12.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=f2c7b2fa7af36b34a4b2340e15cf4a59
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9.10 b/metadata/md5-cache/x11-wm/bspwm-0.9.10
index 078d781fd87a..88305583b56f 100644
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.10
+++ b/metadata/md5-cache/x11-wm/bspwm-0.9.10
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
DESCRIPTION=Tiling window manager based on binary space partitioning
EAPI=7
HOMEPAGE=https://github.com/baskerville/bspwm/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=amd64 ~x86
LICENSE=BSD-2
RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
SLOT=0
SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.10.tar.gz -> bspwm-0.9.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=adcb74740e1f3964f5d7384e46febfde
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9.9 b/metadata/md5-cache/x11-wm/bspwm-0.9.9
index 9027e86e9868..b8466235a9fe 100644
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.9
+++ b/metadata/md5-cache/x11-wm/bspwm-0.9.9
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
DESCRIPTION=Tiling window manager based on binary space partitioning
EAPI=7
HOMEPAGE=https://github.com/baskerville/bspwm/
+INHERIT=toolchain-funcs
IUSE=examples
KEYWORDS=amd64 ~x86
LICENSE=BSD-2
RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
SLOT=0
SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.9.tar.gz -> bspwm-0.9.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=5af84a4674c34dfe56e03f9ac1ad4d85
diff --git a/metadata/md5-cache/x11-wm/cwm-6.6 b/metadata/md5-cache/x11-wm/cwm-6.6
index cb9d60d4e8a9..e920b1430f4a 100644
--- a/metadata/md5-cache/x11-wm/cwm-6.6
+++ b/metadata/md5-cache/x11-wm/cwm-6.6
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
EAPI=7
HOMEPAGE=https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
+INHERIT=desktop toolchain-funcs
KEYWORDS=amd64 arm ~arm64 x86
LICENSE=ISC
RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
SLOT=0
SRC_URI=https://github.com/leahneukirchen/cwm/archive/v6.6.tar.gz -> cwm-6.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=34655a33b79941c1e89f7eeb16a02342
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1 b/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
index 21f3f6b13c99..f470fd91c723 100644
--- a/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
+++ b/metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXrandr x11-base/xorg-proto
DESCRIPTION=A minimalist, no frills window manager for X
EAPI=6
HOMEPAGE=http://www.6809.org.uk/evilwm/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
LICENSE=MIT 9wm
RDEPEND=x11-libs/libXext x11-libs/libXrandr
SLOT=0
SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.0.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a4b4276521df67d34ea927691fb2bbd4
diff --git a/metadata/md5-cache/x11-wm/evilwm-1.1.1 b/metadata/md5-cache/x11-wm/evilwm-1.1.1
index ec206e0c485e..b8274c500d69 100644
--- a/metadata/md5-cache/x11-wm/evilwm-1.1.1
+++ b/metadata/md5-cache/x11-wm/evilwm-1.1.1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11 x11-base/xorg-proto
DESCRIPTION=A minimalist, no frills window manager for X
EAPI=6
HOMEPAGE=http://www.6809.org.uk/evilwm/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris
LICENSE=MIT 9wm
RDEPEND=x11-libs/libXext x11-libs/libXrandr x11-libs/libX11
SLOT=0
SRC_URI=http://www.6809.org.uk/evilwm/evilwm-1.1.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=86c96e8546f84c0b478191f4096c4547
diff --git a/metadata/md5-cache/x11-wm/lumina-1.6.0 b/metadata/md5-cache/x11-wm/lumina-1.6.0
index 8c0bafa1a0f6..110fb156a1d4 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.6.0
+++ b/metadata/md5-cache/x11-wm/lumina-1.6.0
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarativ
DESCRIPTION=Lumina desktop environment
EAPI=7
HOMEPAGE=https://lumina-desktop.org/
+INHERIT=qmake-utils l10n xdg-utils
IUSE=desktop-utils
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
SLOT=0
SRC_URI=https://github.com/trueos/lumina/archive/v1.6.0.tar.gz -> lumina-1.6.0.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 l10n 8cdd85e169b835d518bc2fd59f780d8e xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=e11bc947dd7b9cdb79f758e72117894e
diff --git a/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1 b/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1
index 57e84ab19424..b78f09191666 100644
--- a/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1
+++ b/metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/libXext x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11
DESCRIPTION=Simple EWMH compatible window manager with titlebars and frames
EAPI=6
HOMEPAGE=https://github.com/segin/matwm2
+INHERIT=toolchain-funcs
IUSE=debug xft xinerama
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=x11-libs/libXext x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
SLOT=0
SRC_URI=https://github.com/segin/matwm2/archive/0.1.2pre3.tar.gz -> matwm2-0.1.2_pre3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=bb7645f716c4651bda79beea7ac6c34d
diff --git a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100 b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
index aff128dbca49..80cb6a2b8431 100644
--- a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
+++ b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
EAPI=7
HOMEPAGE=https://notionwm.net/
+INHERIT=lua-single toolchain-funcs readme.gentoo-r1
IUSE=nls xinerama +xrandr lua_single_target_lua5-1 lua_single_target_lua5-2
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
@@ -12,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) xrandr? (
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/raboof/notion/archive/3-2015061300.tar.gz -> notion-3_p2015061300.tar.gz
-_eclasses_=lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=72c4d9ecc074c3c5564901e84e43cb47
diff --git a/metadata/md5-cache/x11-wm/sithwm-1.2.3 b/metadata/md5-cache/x11-wm/sithwm-1.2.3
index 45a6fa2dfb6d..18e2c33cd14e 100644
--- a/metadata/md5-cache/x11-wm/sithwm-1.2.3
+++ b/metadata/md5-cache/x11-wm/sithwm-1.2.3
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
DESCRIPTION=Minimalist Window Manager for X
EAPI=7
HOMEPAGE=https://sithwm.darkside.no/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ MIT 9wm
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://sithwm.darkside.no/sn/sithwm-1.2.3.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=3e710039a20d970934819700c014b07c
diff --git a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2 b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
index 5097f0512bdf..4cb36e866281 100644
--- a/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
+++ b/metadata/md5-cache/x11-wm/treewm-0.4.5-r2
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm x11-
DESCRIPTION=WindowManager that arranges the windows in a tree (not in a list)
EAPI=7
HOMEPAGE=http://treewm.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/libXpm
SLOT=0
SRC_URI=mirror://sourceforge/treewm/treewm-0.4.5.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=a6d50022fba380dc6382962fe491a3d2
diff --git a/metadata/md5-cache/x11-wm/wmfs-20180520 b/metadata/md5-cache/x11-wm/wmfs-20180520
index 140bb705c2f3..1a69f22cc769 100644
--- a/metadata/md5-cache/x11-wm/wmfs-20180520
+++ b/metadata/md5-cache/x11-wm/wmfs-20180520
@@ -3,11 +3,12 @@ DEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft
DESCRIPTION=Window Manager From Scratch, A tiling window manager highly configurable
EAPI=7
HOMEPAGE=https://github.com/xorg62/wmfs
+INHERIT=toolchain-funcs
IUSE=+imlib2 +xinerama
KEYWORDS=~amd64
LICENSE=BSD
RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/wmfs-20180520.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
_md5_=6ba0613d890a7a82876664dacd98430b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.1 b/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.1
index 449a890c92d6..9b8b3781f1fc 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.1
@@ -4,6 +4,7 @@ DEPEND=x11-libs/libX11 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xf
DESCRIPTION=A calculator plugin for the Xfce4 panel
EAPI=7
HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-calculator-plugin
+INHERIT=xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=x11-libs/libX11 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
index e6e11813171f..532ab2a77585 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 >=xfce-base/l
DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.24 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3 b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
index da0e7c24f065..c0927a0b59dc 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-diskperf-plugin-2.6.3
@@ -4,6 +4,7 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
DESCRIPTION=A panel plug-in for disk usage and performance statistics
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=BSD-2
RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.1 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.1
index 36e2fef9eaae..d2fc12cf3192 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.5.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.16:3 >=xfce-base/libxfce4ui-4.12:=
DESCRIPTION=A panel plug-in which adds classic eyes to your every step
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.16:3 >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.2 b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.2
index 8063d0a68e77..e24f104e9186 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.2
@@ -4,6 +4,7 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=
DESCRIPTION=A filesystem guard plug-in for the Xfce panel
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=BSD-2
RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.1.1 b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.1.1
index 5a5233df050a..d5ea645f3dc6 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.1.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.1.1
@@ -4,6 +4,7 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
DESCRIPTION=Cyclically spawned executable output on the panel
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1+
RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.4.0 b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.4.0
index 8e599a5057cd..2768eb1a9177 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.4.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-indicator-plugin-2.4.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.18:3= x11-libs/libX1
DESCRIPTION=A panel plugin that uses indicator-applet to show new messages
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin
+INHERIT=xdg-utils
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=dev-libs/libindicator-12.10.1:3= >=x11-libs/gtk+-3.18:3= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfce4-panel-4.11:= >=xfce-base/xfconf-4.13:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.2.3 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.2.3
index c6bd0a198e3b..76cc207edace 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.2.3
@@ -4,6 +4,7 @@ DEPEND=xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel
DESCRIPTION=A panel plug-in to show state of Caps, Num and Scroll Lock keys
EAPI=7
HOMEPAGE=https://github.com/oco2000/xfce4-kbdleds-plugin
+INHERIT=xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
index 9175a35f7fae..06cf3720a14e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.3.0
@@ -3,6 +3,7 @@ DEPEND=>=dev-libs/glib-2.42:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=x
DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
EAPI=7
HOMEPAGE=https://www.spurint.org/projects/xfce4-mailwatch-plugin/
+INHERIT=xdg-utils
IUSE=ipv6 ssl
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.5 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.5
index da3ebda4c7f2..2bd0a533fd92 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.5
@@ -4,6 +4,7 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
DESCRIPTION=An mount plug-in for the Xfce panel
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.2 b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.2
index fdac309dbf5d..2d94e6303de2 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.2
@@ -3,6 +3,7 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.13.5:= l
DESCRIPTION=Music Player Daemon (mpd) panel plugin
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin
+INHERIT=xdg-utils
IUSE=+libmpd
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=ISC
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.9.0 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.9.0
index b20bed3fa226..229d61b7f743 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.9.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.9.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14
DESCRIPTION=Xfce4 panel sticky notes plugin
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.8 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.8
index 9bad0d862f64..3f758ad38ff1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.8
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.8
@@ -4,6 +4,7 @@ DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.
DESCRIPTION=Xfce4 screenshooter application and panel plugin
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
+INHERIT=xdg-utils
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.2 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.2
index 9d9ccbe52145..f585f1cfd839 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.2
@@ -4,6 +4,7 @@ DEPEND=x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXmu x11-libs/l
DESCRIPTION=Easy to use task manager
EAPI=7
HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
+INHERIT=xdg-utils
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXmu x11-libs/libwnck:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/xfconf-4.14:=
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fbbdd3a76230..4bba93753708 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 20 May 2021 02:20:12 +0000
+Thu, 20 May 2021 02:56:47 +0000