summaryrefslogtreecommitdiff
path: root/app-dicts
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
commitd87262dd706fec50cd150aab3e93883b6337466d (patch)
tree246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-dicts
parent71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-dicts')
-rw-r--r--app-dicts/Manifest.gzbin52153 -> 57239 bytes
-rw-r--r--app-dicts/aspell-af-0.50.012
-rw-r--r--app-dicts/aspell-af/Manifest3
-rw-r--r--app-dicts/aspell-af/aspell-af-0.50.0.ebuild12
-rw-r--r--app-dicts/aspell-af/metadata.xml5
-rw-r--r--app-dicts/aspell-be-0.01-r113
-rw-r--r--app-dicts/aspell-be/Manifest4
-rw-r--r--app-dicts/aspell-be/aspell-be-0.01-r1.ebuild21
-rw-r--r--app-dicts/aspell-be/files/aspell5-be-0.01-official.patch12
-rw-r--r--app-dicts/aspell-be/metadata.xml8
-rw-r--r--app-dicts/aspell-bg-4.1.012
-rw-r--r--app-dicts/aspell-bg/Manifest3
-rw-r--r--app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild13
-rw-r--r--app-dicts/aspell-bg/metadata.xml5
-rw-r--r--app-dicts/aspell-br-0.50.212
-rw-r--r--app-dicts/aspell-br/Manifest3
-rw-r--r--app-dicts/aspell-br/aspell-br-0.50.2.ebuild12
-rw-r--r--app-dicts/aspell-br/metadata.xml5
-rw-r--r--app-dicts/aspell-ca-2.1.5.112
-rw-r--r--app-dicts/aspell-ca/Manifest3
-rw-r--r--app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild13
-rw-r--r--app-dicts/aspell-ca/metadata.xml5
-rw-r--r--app-dicts/aspell-cs-0.60.2004061412
-rw-r--r--app-dicts/aspell-cs/Manifest3
-rw-r--r--app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild19
-rw-r--r--app-dicts/aspell-cs/metadata.xml5
-rw-r--r--app-dicts/aspell-cy-0.50.312
-rw-r--r--app-dicts/aspell-cy/Manifest3
-rw-r--r--app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild12
-rw-r--r--app-dicts/aspell-cy/metadata.xml5
-rw-r--r--app-dicts/aspell-da-1.7.4212
-rw-r--r--app-dicts/aspell-da/Manifest3
-rw-r--r--app-dicts/aspell-da/aspell-da-1.7.42.ebuild17
-rw-r--r--app-dicts/aspell-da/metadata.xml5
-rw-r--r--app-dicts/aspell-de-0.60_pre2003022212
-rw-r--r--app-dicts/aspell-de-alt-2.1.1-r112
-rw-r--r--app-dicts/aspell-de-alt/Manifest4
-rw-r--r--app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild22
-rw-r--r--app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch59
-rw-r--r--app-dicts/aspell-de-alt/metadata.xml7
-rw-r--r--app-dicts/aspell-de/Manifest3
-rw-r--r--app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild19
-rw-r--r--app-dicts/aspell-de/metadata.xml5
-rw-r--r--app-dicts/aspell-el-0.50.312
-rw-r--r--app-dicts/aspell-el/Manifest3
-rw-r--r--app-dicts/aspell-el/aspell-el-0.50.3.ebuild12
-rw-r--r--app-dicts/aspell-el/metadata.xml5
-rw-r--r--app-dicts/aspell-en-2016.11.20.012
-rw-r--r--app-dicts/aspell-en-2017.01.22.012
-rw-r--r--app-dicts/aspell-en/Manifest5
-rw-r--r--app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild15
-rw-r--r--app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild15
-rw-r--r--app-dicts/aspell-en/metadata.xml5
-rw-r--r--app-dicts/aspell-eo-2.1.20000225.212
-rw-r--r--app-dicts/aspell-eo/Manifest3
-rw-r--r--app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild20
-rw-r--r--app-dicts/aspell-eo/metadata.xml5
-rw-r--r--app-dicts/aspell-es-1.9a12
-rw-r--r--app-dicts/aspell-es/Manifest3
-rw-r--r--app-dicts/aspell-es/aspell-es-1.9a.ebuild19
-rw-r--r--app-dicts/aspell-es/metadata.xml5
-rw-r--r--app-dicts/aspell-et-0.1.21.112
-rw-r--r--app-dicts/aspell-et/Manifest3
-rw-r--r--app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild13
-rw-r--r--app-dicts/aspell-et/metadata.xml5
-rw-r--r--app-dicts/aspell-fi-0.7.012
-rw-r--r--app-dicts/aspell-fi/Manifest3
-rw-r--r--app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild13
-rw-r--r--app-dicts/aspell-fi/metadata.xml5
-rw-r--r--app-dicts/aspell-fo-0.51.012
-rw-r--r--app-dicts/aspell-fo/Manifest3
-rw-r--r--app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild12
-rw-r--r--app-dicts/aspell-fo/metadata.xml5
-rw-r--r--app-dicts/aspell-fr-0.6012
-rw-r--r--app-dicts/aspell-fr/Manifest3
-rw-r--r--app-dicts/aspell-fr/aspell-fr-0.60.ebuild22
-rw-r--r--app-dicts/aspell-fr/metadata.xml5
-rw-r--r--app-dicts/aspell-ga-0.50.412
-rw-r--r--app-dicts/aspell-ga/Manifest3
-rw-r--r--app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild12
-rw-r--r--app-dicts/aspell-ga/metadata.xml5
-rw-r--r--app-dicts/aspell-gl-0.5.212
-rw-r--r--app-dicts/aspell-gl/Manifest3
-rw-r--r--app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild20
-rw-r--r--app-dicts/aspell-gl/metadata.xml5
-rw-r--r--app-dicts/aspell-he-1.0.012
-rw-r--r--app-dicts/aspell-he/Manifest3
-rw-r--r--app-dicts/aspell-he/aspell-he-1.0.0.ebuild13
-rw-r--r--app-dicts/aspell-he/metadata.xml5
-rw-r--r--app-dicts/aspell-hr-0.51.012
-rw-r--r--app-dicts/aspell-hr/Manifest3
-rw-r--r--app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild12
-rw-r--r--app-dicts/aspell-hr/metadata.xml5
-rw-r--r--app-dicts/aspell-hu-0.99.4.212
-rw-r--r--app-dicts/aspell-hu/Manifest3
-rw-r--r--app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild19
-rw-r--r--app-dicts/aspell-hu/metadata.xml5
-rw-r--r--app-dicts/aspell-hy-0.10.012
-rw-r--r--app-dicts/aspell-hy/Manifest3
-rw-r--r--app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild19
-rw-r--r--app-dicts/aspell-hy/metadata.xml5
-rw-r--r--app-dicts/aspell-is-0.51.1.012
-rw-r--r--app-dicts/aspell-is/Manifest3
-rw-r--r--app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild12
-rw-r--r--app-dicts/aspell-is/metadata.xml5
-rw-r--r--app-dicts/aspell-it-2.4.2007090112
-rw-r--r--app-dicts/aspell-it/Manifest3
-rw-r--r--app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild19
-rw-r--r--app-dicts/aspell-it/metadata.xml8
-rw-r--r--app-dicts/aspell-la-6.0.20020503.012
-rw-r--r--app-dicts/aspell-la/Manifest3
-rw-r--r--app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild19
-rw-r--r--app-dicts/aspell-la/metadata.xml5
-rw-r--r--app-dicts/aspell-lt-1.0.112
-rw-r--r--app-dicts/aspell-lt/Manifest3
-rw-r--r--app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild19
-rw-r--r--app-dicts/aspell-lt/metadata.xml5
-rw-r--r--app-dicts/aspell-nl-0.50.212
-rw-r--r--app-dicts/aspell-nl/Manifest3
-rw-r--r--app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild12
-rw-r--r--app-dicts/aspell-nl/metadata.xml5
-rw-r--r--app-dicts/aspell-no-0.50.212
-rw-r--r--app-dicts/aspell-no/Manifest3
-rw-r--r--app-dicts/aspell-no/aspell-no-0.50.2.ebuild12
-rw-r--r--app-dicts/aspell-no/metadata.xml5
-rw-r--r--app-dicts/aspell-pl-6.0.20120418.012
-rw-r--r--app-dicts/aspell-pl/Manifest3
-rw-r--r--app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild20
-rw-r--r--app-dicts/aspell-pl/metadata.xml5
-rw-r--r--app-dicts/aspell-pt-0.50.2-r112
-rw-r--r--app-dicts/aspell-pt-br-6.0.2009070212
-rw-r--r--app-dicts/aspell-pt-br/Manifest3
-rw-r--r--app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild22
-rw-r--r--app-dicts/aspell-pt-br/metadata.xml5
-rw-r--r--app-dicts/aspell-pt/Manifest3
-rw-r--r--app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild20
-rw-r--r--app-dicts/aspell-pt/metadata.xml5
-rw-r--r--app-dicts/aspell-ro-3.3.212
-rw-r--r--app-dicts/aspell-ro/Manifest3
-rw-r--r--app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild15
-rw-r--r--app-dicts/aspell-ro/metadata.xml8
-rw-r--r--app-dicts/aspell-ru-0.99.1-r112
-rw-r--r--app-dicts/aspell-ru/Manifest3
-rw-r--r--app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild27
-rw-r--r--app-dicts/aspell-ru/metadata.xml5
-rw-r--r--app-dicts/aspell-sk-2.01.212
-rw-r--r--app-dicts/aspell-sk/Manifest3
-rw-r--r--app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild13
-rw-r--r--app-dicts/aspell-sk/metadata.xml5
-rw-r--r--app-dicts/aspell-sl-0.50.012
-rw-r--r--app-dicts/aspell-sl/Manifest3
-rw-r--r--app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild12
-rw-r--r--app-dicts/aspell-sl/metadata.xml5
-rw-r--r--app-dicts/aspell-sr-0.6012
-rw-r--r--app-dicts/aspell-sr/Manifest3
-rw-r--r--app-dicts/aspell-sr/aspell-sr-0.60.ebuild19
-rw-r--r--app-dicts/aspell-sr/metadata.xml5
-rw-r--r--app-dicts/aspell-sv-0.51.012
-rw-r--r--app-dicts/aspell-sv/Manifest3
-rw-r--r--app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild12
-rw-r--r--app-dicts/aspell-sv/metadata.xml5
-rw-r--r--app-dicts/aspell-uk-1.4.0.012
-rw-r--r--app-dicts/aspell-uk/Manifest3
-rw-r--r--app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild13
-rw-r--r--app-dicts/aspell-uk/metadata.xml5
-rw-r--r--app-dicts/aspell-vi-0.01.1.112
-rw-r--r--app-dicts/aspell-vi/Manifest3
-rw-r--r--app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild13
-rw-r--r--app-dicts/aspell-vi/metadata.xml5
-rw-r--r--app-dicts/bookview-3.2.112
-rw-r--r--app-dicts/bookview/Manifest5
-rw-r--r--app-dicts/bookview/bookview-3.2.1.ebuild34
-rw-r--r--app-dicts/bookview/files/Bookview.ad1
-rw-r--r--app-dicts/bookview/files/bookview-3.2.1-gentoo.diff14
-rw-r--r--app-dicts/bookview/metadata.xml8
-rw-r--r--app-dicts/canna-2ch-2003082712
-rw-r--r--app-dicts/canna-2ch-2004051912
-rw-r--r--app-dicts/canna-2ch/Manifest7
-rw-r--r--app-dicts/canna-2ch/canna-2ch-20030827.ebuild31
-rw-r--r--app-dicts/canna-2ch/canna-2ch-20040519.ebuild29
-rw-r--r--app-dicts/canna-2ch/files/052ch.dics.dir2
-rw-r--r--app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch18
-rw-r--r--app-dicts/canna-2ch/metadata.xml11
-rw-r--r--app-dicts/canna-cannadic-0.95c11
-rw-r--r--app-dicts/canna-cannadic/Manifest4
-rw-r--r--app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild28
-rw-r--r--app-dicts/canna-cannadic/files/05cannadic.dics.dir3
-rw-r--r--app-dicts/canna-cannadic/metadata.xml8
-rw-r--r--app-dicts/dictd-devils-0-r111
-rw-r--r--app-dicts/dictd-devils/Manifest3
-rw-r--r--app-dicts/dictd-devils/dictd-devils-0-r1.ebuild22
-rw-r--r--app-dicts/dictd-devils/metadata.xml5
-rw-r--r--app-dicts/dictd-dicts-1.09
-rw-r--r--app-dicts/dictd-dicts/Manifest2
-rw-r--r--app-dicts/dictd-dicts/dictd-dicts-1.0.ebuild24
-rw-r--r--app-dicts/dictd-dicts/metadata.xml5
-rw-r--r--app-dicts/dictd-elements-2000.22.07-r111
-rw-r--r--app-dicts/dictd-elements/Manifest3
-rw-r--r--app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild23
-rw-r--r--app-dicts/dictd-elements/metadata.xml5
-rw-r--r--app-dicts/dictd-foldoc-2001.03.13-r111
-rw-r--r--app-dicts/dictd-foldoc/Manifest3
-rw-r--r--app-dicts/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild23
-rw-r--r--app-dicts/dictd-foldoc/metadata.xml5
-rw-r--r--app-dicts/dictd-gazetteer-1.2-r111
-rw-r--r--app-dicts/dictd-gazetteer/Manifest3
-rw-r--r--app-dicts/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild23
-rw-r--r--app-dicts/dictd-gazetteer/metadata.xml5
-rw-r--r--app-dicts/dictd-jargon-4.2.3-r111
-rw-r--r--app-dicts/dictd-jargon/Manifest3
-rw-r--r--app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild24
-rw-r--r--app-dicts/dictd-jargon/metadata.xml5
-rw-r--r--app-dicts/dictd-misc-1.5b-r111
-rw-r--r--app-dicts/dictd-misc/Manifest3
-rw-r--r--app-dicts/dictd-misc/dictd-misc-1.5b-r1.ebuild26
-rw-r--r--app-dicts/dictd-misc/metadata.xml5
-rw-r--r--app-dicts/dictd-vera-1.2211
-rw-r--r--app-dicts/dictd-vera-1.2311
-rw-r--r--app-dicts/dictd-vera/Manifest5
-rw-r--r--app-dicts/dictd-vera/dictd-vera-1.22.ebuild35
-rw-r--r--app-dicts/dictd-vera/dictd-vera-1.23.ebuild35
-rw-r--r--app-dicts/dictd-vera/metadata.xml5
-rw-r--r--app-dicts/dictd-web1913-1.4-r111
-rw-r--r--app-dicts/dictd-web1913/Manifest3
-rw-r--r--app-dicts/dictd-web1913/dictd-web1913-1.4-r1.ebuild23
-rw-r--r--app-dicts/dictd-web1913/metadata.xml5
-rw-r--r--app-dicts/dictd-wn-3.0_p3311
-rw-r--r--app-dicts/dictd-wn/Manifest3
-rw-r--r--app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild26
-rw-r--r--app-dicts/dictd-wn/metadata.xml5
-rw-r--r--app-dicts/dikt-2s_p113
-rw-r--r--app-dicts/dikt/Manifest3
-rw-r--r--app-dicts/dikt/dikt-2s_p1.ebuild40
-rw-r--r--app-dicts/dikt/metadata.xml11
-rw-r--r--app-dicts/duali-data-0.1b-r110
-rw-r--r--app-dicts/duali-data/Manifest3
-rw-r--r--app-dicts/duali-data/duali-data-0.1b-r1.ebuild38
-rw-r--r--app-dicts/duali-data/metadata.xml8
-rw-r--r--app-dicts/eblook-1.6.111
-rw-r--r--app-dicts/eblook/Manifest3
-rw-r--r--app-dicts/eblook/eblook-1.6.1.ebuild28
-rw-r--r--app-dicts/eblook/metadata.xml5
-rw-r--r--app-dicts/edictionary-2.6-r110
-rw-r--r--app-dicts/edictionary/Manifest3
-rw-r--r--app-dicts/edictionary/edictionary-2.6-r1.ebuild26
-rw-r--r--app-dicts/edictionary/metadata.xml8
-rw-r--r--app-dicts/freedict-deu-eng-1.011
-rw-r--r--app-dicts/freedict-deu-eng/Manifest3
-rw-r--r--app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild11
-rw-r--r--app-dicts/freedict-deu-eng/metadata.xml8
-rw-r--r--app-dicts/freedict-eng-fra-1.011
-rw-r--r--app-dicts/freedict-eng-fra/Manifest3
-rw-r--r--app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild11
-rw-r--r--app-dicts/freedict-eng-fra/metadata.xml8
-rw-r--r--app-dicts/freedict-eng-ita-1.011
-rw-r--r--app-dicts/freedict-eng-ita/Manifest3
-rw-r--r--app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild12
-rw-r--r--app-dicts/freedict-eng-ita/metadata.xml8
-rw-r--r--app-dicts/freedict-eng-swe-1.011
-rw-r--r--app-dicts/freedict-eng-swe/Manifest3
-rw-r--r--app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild12
-rw-r--r--app-dicts/freedict-eng-swe/metadata.xml8
-rw-r--r--app-dicts/freedict-fra-eng-1.011
-rw-r--r--app-dicts/freedict-fra-eng/Manifest3
-rw-r--r--app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild12
-rw-r--r--app-dicts/freedict-fra-eng/metadata.xml8
-rw-r--r--app-dicts/freedict-ita-eng-1.011
-rw-r--r--app-dicts/freedict-ita-eng/Manifest3
-rw-r--r--app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild12
-rw-r--r--app-dicts/freedict-ita-eng/metadata.xml8
-rw-r--r--app-dicts/gnome-dictionary-3.24.113
-rw-r--r--app-dicts/gnome-dictionary/Manifest3
-rw-r--r--app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild40
-rw-r--r--app-dicts/gnome-dictionary/metadata.xml11
-rw-r--r--app-dicts/gwaei-3.6.213
-rw-r--r--app-dicts/gwaei/Manifest3
-rw-r--r--app-dicts/gwaei/gwaei-3.6.2.ebuild73
-rw-r--r--app-dicts/gwaei/metadata.xml21
-rw-r--r--app-dicts/ipadic-2.7.0-r211
-rw-r--r--app-dicts/ipadic/Manifest4
-rw-r--r--app-dicts/ipadic/files/ipadic-2.7.0-r2-gentoo.patch30
-rw-r--r--app-dicts/ipadic/ipadic-2.7.0-r2.ebuild30
-rw-r--r--app-dicts/ipadic/metadata.xml11
-rw-r--r--app-dicts/kasumi-2.5-r112
-rw-r--r--app-dicts/kasumi/Manifest4
-rw-r--r--app-dicts/kasumi/files/kasumi-desktop.patch13
-rw-r--r--app-dicts/kasumi/kasumi-2.5-r1.ebuild27
-rw-r--r--app-dicts/kasumi/metadata.xml11
-rw-r--r--app-dicts/libydpdict-1.0.29
-rw-r--r--app-dicts/libydpdict/Manifest3
-rw-r--r--app-dicts/libydpdict/libydpdict-1.0.2.ebuild21
-rw-r--r--app-dicts/libydpdict/metadata.xml5
-rw-r--r--app-dicts/mecab-ipadic-2.7.0.2007080111
-rw-r--r--app-dicts/mecab-ipadic/Manifest3
-rw-r--r--app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild22
-rw-r--r--app-dicts/mecab-ipadic/metadata.xml14
-rw-r--r--app-dicts/mecab-naist-jdic-0.6.3b_p2011101311
-rw-r--r--app-dicts/mecab-naist-jdic/Manifest3
-rw-r--r--app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild24
-rw-r--r--app-dicts/mecab-naist-jdic/metadata.xml11
-rw-r--r--app-dicts/mecab-unidic-2.1.210
-rw-r--r--app-dicts/mecab-unidic/Manifest3
-rw-r--r--app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild18
-rw-r--r--app-dicts/mecab-unidic/metadata.xml11
-rw-r--r--app-dicts/metadata.xml34
-rw-r--r--app-dicts/migemo-dict-20081210
-rw-r--r--app-dicts/migemo-dict/Manifest3
-rw-r--r--app-dicts/migemo-dict/metadata.xml8
-rw-r--r--app-dicts/migemo-dict/migemo-dict-200812.ebuild29
-rw-r--r--app-dicts/myspell-af-2008070111
-rw-r--r--app-dicts/myspell-af/Manifest3
-rw-r--r--app-dicts/myspell-af/metadata.xml8
-rw-r--r--app-dicts/myspell-af/myspell-af-20080701.ebuild27
-rw-r--r--app-dicts/myspell-bg-4.311
-rw-r--r--app-dicts/myspell-bg/Manifest3
-rw-r--r--app-dicts/myspell-bg/metadata.xml8
-rw-r--r--app-dicts/myspell-bg/myspell-bg-4.3.ebuild40
-rw-r--r--app-dicts/myspell-ca-2.3.011
-rw-r--r--app-dicts/myspell-ca/Manifest3
-rw-r--r--app-dicts/myspell-ca/metadata.xml5
-rw-r--r--app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild36
-rw-r--r--app-dicts/myspell-cs-2011022411
-rw-r--r--app-dicts/myspell-cs/Manifest3
-rw-r--r--app-dicts/myspell-cs/metadata.xml5
-rw-r--r--app-dicts/myspell-cs/myspell-cs-20110224.ebuild29
-rw-r--r--app-dicts/myspell-cy-2013070811
-rw-r--r--app-dicts/myspell-cy/Manifest3
-rw-r--r--app-dicts/myspell-cy/metadata.xml8
-rw-r--r--app-dicts/myspell-cy/myspell-cy-20130708.ebuild26
-rw-r--r--app-dicts/myspell-da-2.111
-rw-r--r--app-dicts/myspell-da-2.311
-rw-r--r--app-dicts/myspell-da/Manifest5
-rw-r--r--app-dicts/myspell-da/metadata.xml5
-rw-r--r--app-dicts/myspell-da/myspell-da-2.1.ebuild27
-rw-r--r--app-dicts/myspell-da/myspell-da-2.3.ebuild28
-rw-r--r--app-dicts/myspell-de-2015.12.2811
-rw-r--r--app-dicts/myspell-de/Manifest5
-rw-r--r--app-dicts/myspell-de/metadata.xml5
-rw-r--r--app-dicts/myspell-de/myspell-de-2015.12.28.ebuild54
-rw-r--r--app-dicts/myspell-de_1901-2012092911
-rw-r--r--app-dicts/myspell-de_1901-2016040311
-rw-r--r--app-dicts/myspell-de_1901/Manifest5
-rw-r--r--app-dicts/myspell-de_1901/metadata.xml10
-rw-r--r--app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild36
-rw-r--r--app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild38
-rw-r--r--app-dicts/myspell-el-0.811
-rw-r--r--app-dicts/myspell-el-0.911
-rw-r--r--app-dicts/myspell-el/Manifest6
-rw-r--r--app-dicts/myspell-el/metadata.xml4
-rw-r--r--app-dicts/myspell-el/myspell-el-0.8.ebuild27
-rw-r--r--app-dicts/myspell-el/myspell-el-0.9.ebuild27
-rw-r--r--app-dicts/myspell-en-2016090111
-rw-r--r--app-dicts/myspell-en-2017010111
-rw-r--r--app-dicts/myspell-en-2017050111
-rw-r--r--app-dicts/myspell-en/Manifest7
-rw-r--r--app-dicts/myspell-en/metadata.xml4
-rw-r--r--app-dicts/myspell-en/myspell-en-20160901.ebuild39
-rw-r--r--app-dicts/myspell-en/myspell-en-20170101.ebuild39
-rw-r--r--app-dicts/myspell-en/myspell-en-20170501.ebuild39
-rw-r--r--app-dicts/myspell-eo-1.0-r111
-rw-r--r--app-dicts/myspell-eo/Manifest3
-rw-r--r--app-dicts/myspell-eo/metadata.xml8
-rw-r--r--app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild34
-rw-r--r--app-dicts/myspell-es-0.711
-rw-r--r--app-dicts/myspell-es-2.311
-rw-r--r--app-dicts/myspell-es/Manifest47
-rw-r--r--app-dicts/myspell-es/metadata.xml12
-rw-r--r--app-dicts/myspell-es/myspell-es-0.7.ebuild49
-rw-r--r--app-dicts/myspell-es/myspell-es-2.3.ebuild44
-rw-r--r--app-dicts/myspell-et-2003060611
-rw-r--r--app-dicts/myspell-et/Manifest3
-rw-r--r--app-dicts/myspell-et/metadata.xml5
-rw-r--r--app-dicts/myspell-et/myspell-et-20030606.ebuild36
-rw-r--r--app-dicts/myspell-fo-0.4.211
-rw-r--r--app-dicts/myspell-fo/Manifest4
-rw-r--r--app-dicts/myspell-fo/metadata.xml5
-rw-r--r--app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild30
-rw-r--r--app-dicts/myspell-fr-4.5-r111
-rw-r--r--app-dicts/myspell-fr/Manifest6
-rw-r--r--app-dicts/myspell-fr/metadata.xml5
-rw-r--r--app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild54
-rw-r--r--app-dicts/myspell-ga-2006031611
-rw-r--r--app-dicts/myspell-ga-2016021311
-rw-r--r--app-dicts/myspell-ga/Manifest6
-rw-r--r--app-dicts/myspell-ga/metadata.xml5
-rw-r--r--app-dicts/myspell-ga/myspell-ga-20060316.ebuild24
-rw-r--r--app-dicts/myspell-ga/myspell-ga-20160213.ebuild29
-rw-r--r--app-dicts/myspell-gl-200603169
-rw-r--r--app-dicts/myspell-gl-2013101311
-rw-r--r--app-dicts/myspell-gl/Manifest4
-rw-r--r--app-dicts/myspell-gl/metadata.xml5
-rw-r--r--app-dicts/myspell-gl/myspell-gl-20060316.ebuild35
-rw-r--r--app-dicts/myspell-gl/myspell-gl-20131013.ebuild29
-rw-r--r--app-dicts/myspell-he-2010.11.0511
-rw-r--r--app-dicts/myspell-he-2012.08.1511
-rw-r--r--app-dicts/myspell-he/Manifest5
-rw-r--r--app-dicts/myspell-he/metadata.xml5
-rw-r--r--app-dicts/myspell-he/myspell-he-2010.11.05.ebuild26
-rw-r--r--app-dicts/myspell-he/myspell-he-2012.08.15.ebuild26
-rw-r--r--app-dicts/myspell-hr-2006031611
-rw-r--r--app-dicts/myspell-hr-2008081311
-rw-r--r--app-dicts/myspell-hr/Manifest5
-rw-r--r--app-dicts/myspell-hr/metadata.xml5
-rw-r--r--app-dicts/myspell-hr/myspell-hr-20060316.ebuild23
-rw-r--r--app-dicts/myspell-hr/myspell-hr-20080813.ebuild27
-rw-r--r--app-dicts/myspell-hu-1.6.111
-rw-r--r--app-dicts/myspell-hu/Manifest5
-rw-r--r--app-dicts/myspell-hu/metadata.xml8
-rw-r--r--app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild42
-rw-r--r--app-dicts/myspell-ia-2006031611
-rw-r--r--app-dicts/myspell-ia-2014051811
-rw-r--r--app-dicts/myspell-ia/Manifest6
-rw-r--r--app-dicts/myspell-ia/metadata.xml5
-rw-r--r--app-dicts/myspell-ia/myspell-ia-20060316.ebuild23
-rw-r--r--app-dicts/myspell-ia/myspell-ia-20140518.ebuild29
-rw-r--r--app-dicts/myspell-id-2.011
-rw-r--r--app-dicts/myspell-id/Manifest3
-rw-r--r--app-dicts/myspell-id/metadata.xml5
-rw-r--r--app-dicts/myspell-id/myspell-id-2.0.ebuild27
-rw-r--r--app-dicts/myspell-is-2012.09.0111
-rw-r--r--app-dicts/myspell-is/Manifest3
-rw-r--r--app-dicts/myspell-is/metadata.xml5
-rw-r--r--app-dicts/myspell-is/myspell-is-2012.09.01.ebuild26
-rw-r--r--app-dicts/myspell-it-20081129-r111
-rw-r--r--app-dicts/myspell-it/Manifest3
-rw-r--r--app-dicts/myspell-it/metadata.xml8
-rw-r--r--app-dicts/myspell-it/myspell-it-20081129-r1.ebuild37
-rw-r--r--app-dicts/myspell-kk-1.1.211
-rw-r--r--app-dicts/myspell-kk/Manifest3
-rw-r--r--app-dicts/myspell-kk/metadata.xml15
-rw-r--r--app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild25
-rw-r--r--app-dicts/myspell-km-1.611
-rw-r--r--app-dicts/myspell-km/Manifest3
-rw-r--r--app-dicts/myspell-km/metadata.xml5
-rw-r--r--app-dicts/myspell-km/myspell-km-1.6.ebuild26
-rw-r--r--app-dicts/myspell-ku-0.2111
-rw-r--r--app-dicts/myspell-ku/Manifest3
-rw-r--r--app-dicts/myspell-ku/metadata.xml8
-rw-r--r--app-dicts/myspell-ku/myspell-ku-0.21.ebuild26
-rw-r--r--app-dicts/myspell-lt-1.2.111
-rw-r--r--app-dicts/myspell-lt-1.311
-rw-r--r--app-dicts/myspell-lt/Manifest6
-rw-r--r--app-dicts/myspell-lt/metadata.xml8
-rw-r--r--app-dicts/myspell-lt/myspell-lt-1.2.1.ebuild30
-rw-r--r--app-dicts/myspell-lt/myspell-lt-1.3.ebuild26
-rw-r--r--app-dicts/myspell-lv-1.0.011
-rw-r--r--app-dicts/myspell-lv-1.1.011
-rw-r--r--app-dicts/myspell-lv-1.3.011
-rw-r--r--app-dicts/myspell-lv/Manifest7
-rw-r--r--app-dicts/myspell-lv/metadata.xml12
-rw-r--r--app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild27
-rw-r--r--app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild29
-rw-r--r--app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild29
-rw-r--r--app-dicts/myspell-mi-2006031611
-rw-r--r--app-dicts/myspell-mi-20060316-r111
-rw-r--r--app-dicts/myspell-mi/Manifest4
-rw-r--r--app-dicts/myspell-mi/metadata.xml5
-rw-r--r--app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild26
-rw-r--r--app-dicts/myspell-mi/myspell-mi-20060316.ebuild22
-rw-r--r--app-dicts/myspell-mk-2006031611
-rw-r--r--app-dicts/myspell-mk-2009121111
-rw-r--r--app-dicts/myspell-mk/Manifest5
-rw-r--r--app-dicts/myspell-mk/metadata.xml5
-rw-r--r--app-dicts/myspell-mk/myspell-mk-20060316.ebuild22
-rw-r--r--app-dicts/myspell-mk/myspell-mk-20091211.ebuild26
-rw-r--r--app-dicts/myspell-ms-2006031611
-rw-r--r--app-dicts/myspell-ms-2010040711
-rw-r--r--app-dicts/myspell-ms/Manifest5
-rw-r--r--app-dicts/myspell-ms/metadata.xml5
-rw-r--r--app-dicts/myspell-ms/myspell-ms-20060316.ebuild22
-rw-r--r--app-dicts/myspell-ms/myspell-ms-20100407.ebuild26
-rw-r--r--app-dicts/myspell-nb-2.0.1011
-rw-r--r--app-dicts/myspell-nb/Manifest3
-rw-r--r--app-dicts/myspell-nb/metadata.xml5
-rw-r--r--app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild38
-rw-r--r--app-dicts/myspell-nl-2.10g11
-rw-r--r--app-dicts/myspell-nl/Manifest4
-rw-r--r--app-dicts/myspell-nl/metadata.xml5
-rw-r--r--app-dicts/myspell-nl/myspell-nl-2.10g.ebuild44
-rw-r--r--app-dicts/myspell-nn-2.0.1011
-rw-r--r--app-dicts/myspell-nn/Manifest3
-rw-r--r--app-dicts/myspell-nn/metadata.xml5
-rw-r--r--app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild37
-rw-r--r--app-dicts/myspell-pl-2013030611
-rw-r--r--app-dicts/myspell-pl/Manifest5
-rw-r--r--app-dicts/myspell-pl/metadata.xml8
-rw-r--r--app-dicts/myspell-pl/myspell-pl-20130306.ebuild46
-rw-r--r--app-dicts/myspell-pt-2012042012
-rw-r--r--app-dicts/myspell-pt-br-3.0.011
-rw-r--r--app-dicts/myspell-pt-br/Manifest4
-rw-r--r--app-dicts/myspell-pt-br/metadata.xml5
-rw-r--r--app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild32
-rw-r--r--app-dicts/myspell-pt/Manifest4
-rw-r--r--app-dicts/myspell-pt/metadata.xml8
-rw-r--r--app-dicts/myspell-pt/myspell-pt-20120420.ebuild35
-rw-r--r--app-dicts/myspell-ro-3.3.1011
-rw-r--r--app-dicts/myspell-ro/Manifest5
-rw-r--r--app-dicts/myspell-ro/metadata.xml8
-rw-r--r--app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild33
-rw-r--r--app-dicts/myspell-ru-2006031611
-rw-r--r--app-dicts/myspell-ru-2015071111
-rw-r--r--app-dicts/myspell-ru-20150711-r111
-rw-r--r--app-dicts/myspell-ru-20150711-r211
-rw-r--r--app-dicts/myspell-ru/Manifest10
-rw-r--r--app-dicts/myspell-ru/metadata.xml12
-rw-r--r--app-dicts/myspell-ru/myspell-ru-20060316.ebuild25
-rw-r--r--app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild31
-rw-r--r--app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild29
-rw-r--r--app-dicts/myspell-ru/myspell-ru-20150711.ebuild25
-rw-r--r--app-dicts/myspell-sk-2011022411
-rw-r--r--app-dicts/myspell-sk/Manifest3
-rw-r--r--app-dicts/myspell-sk/metadata.xml5
-rw-r--r--app-dicts/myspell-sk/myspell-sk-20110224.ebuild29
-rw-r--r--app-dicts/myspell-sl-2012.01.0411
-rw-r--r--app-dicts/myspell-sl/Manifest3
-rw-r--r--app-dicts/myspell-sl/metadata.xml5
-rw-r--r--app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild29
-rw-r--r--app-dicts/myspell-sq-1.6.411
-rw-r--r--app-dicts/myspell-sq/Manifest3
-rw-r--r--app-dicts/myspell-sq/metadata.xml5
-rw-r--r--app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild28
-rw-r--r--app-dicts/myspell-sv-2.1411
-rw-r--r--app-dicts/myspell-sv/Manifest5
-rw-r--r--app-dicts/myspell-sv/metadata.xml5
-rw-r--r--app-dicts/myspell-sv/myspell-sv-2.14.ebuild39
-rw-r--r--app-dicts/myspell-sw-2006031611
-rw-r--r--app-dicts/myspell-sw-2011010611
-rw-r--r--app-dicts/myspell-sw/Manifest5
-rw-r--r--app-dicts/myspell-sw/metadata.xml5
-rw-r--r--app-dicts/myspell-sw/myspell-sw-20060316.ebuild22
-rw-r--r--app-dicts/myspell-sw/myspell-sw-20110106.ebuild28
-rw-r--r--app-dicts/myspell-tn-2006031611
-rw-r--r--app-dicts/myspell-tn/Manifest3
-rw-r--r--app-dicts/myspell-tn/metadata.xml5
-rw-r--r--app-dicts/myspell-tn/myspell-tn-20060316.ebuild22
-rw-r--r--app-dicts/myspell-uk-1.6.511
-rw-r--r--app-dicts/myspell-uk/Manifest3
-rw-r--r--app-dicts/myspell-uk/metadata.xml5
-rw-r--r--app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild29
-rw-r--r--app-dicts/myspell-zu-2006031611
-rw-r--r--app-dicts/myspell-zu-2010012611
-rw-r--r--app-dicts/myspell-zu/Manifest5
-rw-r--r--app-dicts/myspell-zu/metadata.xml8
-rw-r--r--app-dicts/myspell-zu/myspell-zu-20060316.ebuild23
-rw-r--r--app-dicts/myspell-zu/myspell-zu-20100126.ebuild28
-rw-r--r--app-dicts/opendict-0.6.714
-rw-r--r--app-dicts/opendict/Manifest3
-rw-r--r--app-dicts/opendict/metadata.xml11
-rw-r--r--app-dicts/opendict/opendict-0.6.7.ebuild89
-rw-r--r--app-dicts/prime-dict-1.0.0-r314
-rw-r--r--app-dicts/prime-dict/Manifest3
-rw-r--r--app-dicts/prime-dict/metadata.xml11
-rw-r--r--app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild32
-rw-r--r--app-dicts/stardict-cdict-en-zh-big5-2.4.213
-rw-r--r--app-dicts/stardict-cdict-en-zh-big5/Manifest3
-rw-r--r--app-dicts/stardict-cdict-en-zh-big5/metadata.xml15
-rw-r--r--app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-cdict-en-zh-gb-2.4.213
-rw-r--r--app-dicts/stardict-cdict-en-zh-gb/Manifest3
-rw-r--r--app-dicts/stardict-cdict-en-zh-gb/metadata.xml15
-rw-r--r--app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-cedict-zh-en-big5-2.4.213
-rw-r--r--app-dicts/stardict-cedict-zh-en-big5/Manifest3
-rw-r--r--app-dicts/stardict-cedict-zh-en-big5/metadata.xml15
-rw-r--r--app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-cedict-zh-en-gb-2.4.213
-rw-r--r--app-dicts/stardict-cedict-zh-en-gb/Manifest3
-rw-r--r--app-dicts/stardict-cedict-zh-en-gb/metadata.xml15
-rw-r--r--app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-dictd-devils-2.4.213
-rw-r--r--app-dicts/stardict-dictd-devils/Manifest3
-rw-r--r--app-dicts/stardict-dictd-devils/metadata.xml11
-rw-r--r--app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild14
-rw-r--r--app-dicts/stardict-freedict-eng-deu-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-deu/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-deu/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild14
-rw-r--r--app-dicts/stardict-freedict-eng-fra-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-fra/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-fra/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-eng-ita-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-ita/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-ita/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-eng-lat-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-lat/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-lat/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-eng-rus-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-rus/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-rus/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-eng-spa-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-spa/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-spa/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-eng-swe-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-swe/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-swe/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-eng-tur-2.4.213
-rw-r--r--app-dicts/stardict-freedict-eng-tur/Manifest3
-rw-r--r--app-dicts/stardict-freedict-eng-tur/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-tur-deu-2.4.213
-rw-r--r--app-dicts/stardict-freedict-tur-deu/Manifest3
-rw-r--r--app-dicts/stardict-freedict-tur-deu/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-freedict-tur-eng-2.4.213
-rw-r--r--app-dicts/stardict-freedict-tur-eng/Manifest3
-rw-r--r--app-dicts/stardict-freedict-tur-eng/metadata.xml11
-rw-r--r--app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-jmdict-en-ja-2.4.2-r113
-rw-r--r--app-dicts/stardict-jmdict-en-ja/Manifest3
-rw-r--r--app-dicts/stardict-jmdict-en-ja/metadata.xml15
-rw-r--r--app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild17
-rw-r--r--app-dicts/stardict-jmdict-ja-en-2.4.2-r113
-rw-r--r--app-dicts/stardict-jmdict-ja-en/Manifest3
-rw-r--r--app-dicts/stardict-jmdict-ja-en/metadata.xml15
-rw-r--r--app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild17
-rw-r--r--app-dicts/stardict-langdao-en-zh-gb-2.4.213
-rw-r--r--app-dicts/stardict-langdao-en-zh-gb/Manifest3
-rw-r--r--app-dicts/stardict-langdao-en-zh-gb/metadata.xml15
-rw-r--r--app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-langdao-zh-en-gb-2.4.213
-rw-r--r--app-dicts/stardict-langdao-zh-en-gb/Manifest3
-rw-r--r--app-dicts/stardict-langdao-zh-en-gb/metadata.xml15
-rw-r--r--app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-mova-smiley-2.4.213
-rw-r--r--app-dicts/stardict-mova-smiley/Manifest3
-rw-r--r--app-dicts/stardict-mova-smiley/metadata.xml11
-rw-r--r--app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild14
-rw-r--r--app-dicts/stardict-oxford-en-zh-gb-2.4.213
-rw-r--r--app-dicts/stardict-oxford-en-zh-gb/Manifest3
-rw-r--r--app-dicts/stardict-oxford-en-zh-gb/metadata.xml15
-rw-r--r--app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-quick-eng-fra-2.4.213
-rw-r--r--app-dicts/stardict-quick-eng-fra/Manifest3
-rw-r--r--app-dicts/stardict-quick-eng-fra/metadata.xml11
-rw-r--r--app-dicts/stardict-quick-eng-fra/stardict-quick-eng-fra-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-quick-eng-jpn-2.4.213
-rw-r--r--app-dicts/stardict-quick-eng-jpn/Manifest3
-rw-r--r--app-dicts/stardict-quick-eng-jpn/metadata.xml15
-rw-r--r--app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-quick-jpn-eng-2.4.213
-rw-r--r--app-dicts/stardict-quick-jpn-eng/Manifest3
-rw-r--r--app-dicts/stardict-quick-jpn-eng/metadata.xml15
-rw-r--r--app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild15
-rw-r--r--app-dicts/stardict-quick-ru-en-2.4.213
-rw-r--r--app-dicts/stardict-quick-ru-en/Manifest3
-rw-r--r--app-dicts/stardict-quick-ru-en/metadata.xml11
-rw-r--r--app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-xdict-en-zh-big5-2.4.213
-rw-r--r--app-dicts/stardict-xdict-en-zh-big5/Manifest3
-rw-r--r--app-dicts/stardict-xdict-en-zh-big5/metadata.xml15
-rw-r--r--app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-xdict-en-zh-gb-2.4.213
-rw-r--r--app-dicts/stardict-xdict-en-zh-gb/Manifest3
-rw-r--r--app-dicts/stardict-xdict-en-zh-gb/metadata.xml15
-rw-r--r--app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-xdict-zh-en-big5-2.4.213
-rw-r--r--app-dicts/stardict-xdict-zh-en-big5/Manifest3
-rw-r--r--app-dicts/stardict-xdict-zh-en-big5/metadata.xml15
-rw-r--r--app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-xdict-zh-en-gb-2.4.213
-rw-r--r--app-dicts/stardict-xdict-zh-en-gb/Manifest3
-rw-r--r--app-dicts/stardict-xdict-zh-en-gb/metadata.xml11
-rw-r--r--app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild16
-rw-r--r--app-dicts/sword-ab-1.312
-rw-r--r--app-dicts/sword-ab/Manifest3
-rw-r--r--app-dicts/sword-ab/metadata.xml8
-rw-r--r--app-dicts/sword-ab/sword-ab-1.3.ebuild13
-rw-r--r--app-dicts/sword-abbott-1.112
-rw-r--r--app-dicts/sword-abbott/Manifest3
-rw-r--r--app-dicts/sword-abbott/metadata.xml8
-rw-r--r--app-dicts/sword-abbott/sword-abbott-1.1.ebuild13
-rw-r--r--app-dicts/sword-abs_essay_goodsam_swb-1.012
-rw-r--r--app-dicts/sword-abs_essay_goodsam_swb/Manifest3
-rw-r--r--app-dicts/sword-abs_essay_goodsam_swb/metadata.xml8
-rw-r--r--app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild13
-rw-r--r--app-dicts/sword-acv-2.012
-rw-r--r--app-dicts/sword-acv/Manifest3
-rw-r--r--app-dicts/sword-acv/metadata.xml8
-rw-r--r--app-dicts/sword-acv/sword-acv-2.0.ebuild12
-rw-r--r--app-dicts/sword-afr1953-1.212
-rw-r--r--app-dicts/sword-afr1953/Manifest3
-rw-r--r--app-dicts/sword-afr1953/metadata.xml8
-rw-r--r--app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild12
-rw-r--r--app-dicts/sword-akjv-1.412
-rw-r--r--app-dicts/sword-akjv/Manifest3
-rw-r--r--app-dicts/sword-akjv/metadata.xml8
-rw-r--r--app-dicts/sword-akjv/sword-akjv-1.4.ebuild12
-rw-r--r--app-dicts/sword-alb-1.212
-rw-r--r--app-dicts/sword-alb/Manifest3
-rw-r--r--app-dicts/sword-alb/metadata.xml8
-rw-r--r--app-dicts/sword-alb/sword-alb-1.2.ebuild12
-rw-r--r--app-dicts/sword-aleppo-1.112
-rw-r--r--app-dicts/sword-aleppo/Manifest3
-rw-r--r--app-dicts/sword-aleppo/metadata.xml8
-rw-r--r--app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild12
-rw-r--r--app-dicts/sword-amtract-1.112
-rw-r--r--app-dicts/sword-amtract/Manifest3
-rw-r--r--app-dicts/sword-amtract/metadata.xml8
-rw-r--r--app-dicts/sword-amtract/sword-amtract-1.1.ebuild12
-rw-r--r--app-dicts/sword-arasvd-1.112
-rw-r--r--app-dicts/sword-arasvd/Manifest3
-rw-r--r--app-dicts/sword-arasvd/metadata.xml8
-rw-r--r--app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild12
-rw-r--r--app-dicts/sword-armeastern-1.112
-rw-r--r--app-dicts/sword-armeastern/Manifest3
-rw-r--r--app-dicts/sword-armeastern/metadata.xml8
-rw-r--r--app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild12
-rw-r--r--app-dicts/sword-armwestern-1.112
-rw-r--r--app-dicts/sword-armwestern/Manifest3
-rw-r--r--app-dicts/sword-armwestern/metadata.xml8
-rw-r--r--app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild12
-rw-r--r--app-dicts/sword-asv-1.312
-rw-r--r--app-dicts/sword-asv/Manifest3
-rw-r--r--app-dicts/sword-asv/metadata.xml8
-rw-r--r--app-dicts/sword-asv/sword-asv-1.3.ebuild12
-rw-r--r--app-dicts/sword-barnes-1.112
-rw-r--r--app-dicts/sword-barnes/Manifest3
-rw-r--r--app-dicts/sword-barnes/metadata.xml8
-rw-r--r--app-dicts/sword-barnes/sword-barnes-1.1.ebuild12
-rw-r--r--app-dicts/sword-bashautin-1.512
-rw-r--r--app-dicts/sword-bashautin/Manifest3
-rw-r--r--app-dicts/sword-bashautin/metadata.xml8
-rw-r--r--app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild12
-rw-r--r--app-dicts/sword-bbe-1.312
-rw-r--r--app-dicts/sword-bbe/Manifest3
-rw-r--r--app-dicts/sword-bbe/metadata.xml8
-rw-r--r--app-dicts/sword-bbe/sword-bbe-1.3.ebuild12
-rw-r--r--app-dicts/sword-br_en-1.112
-rw-r--r--app-dicts/sword-br_en/Manifest3
-rw-r--r--app-dicts/sword-br_en/metadata.xml8
-rw-r--r--app-dicts/sword-br_en/sword-br_en-1.1.ebuild12
-rw-r--r--app-dicts/sword-bulcarigradnt-1.012
-rw-r--r--app-dicts/sword-bulcarigradnt/Manifest3
-rw-r--r--app-dicts/sword-bulcarigradnt/metadata.xml8
-rw-r--r--app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild12
-rw-r--r--app-dicts/sword-bulveren-1.012
-rw-r--r--app-dicts/sword-bulveren/Manifest3
-rw-r--r--app-dicts/sword-bulveren/metadata.xml8
-rw-r--r--app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild12
-rw-r--r--app-dicts/sword-burjudson-1.112
-rw-r--r--app-dicts/sword-burjudson/Manifest3
-rw-r--r--app-dicts/sword-burjudson/metadata.xml8
-rw-r--r--app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild12
-rw-r--r--app-dicts/sword-bwe-1.012
-rw-r--r--app-dicts/sword-bwe/Manifest3
-rw-r--r--app-dicts/sword-bwe/metadata.xml8
-rw-r--r--app-dicts/sword-bwe/sword-bwe-1.0.ebuild12
-rw-r--r--app-dicts/sword-byz-1.1012
-rw-r--r--app-dicts/sword-byz/Manifest3
-rw-r--r--app-dicts/sword-byz/metadata.xml8
-rw-r--r--app-dicts/sword-byz/sword-byz-1.10.ebuild12
-rw-r--r--app-dicts/sword-cbc-1.112
-rw-r--r--app-dicts/sword-cbc/Manifest3
-rw-r--r--app-dicts/sword-cbc/metadata.xml8
-rw-r--r--app-dicts/sword-cbc/sword-cbc-1.1.ebuild12
-rw-r--r--app-dicts/sword-chamorro-2.712
-rw-r--r--app-dicts/sword-chamorro/Manifest3
-rw-r--r--app-dicts/sword-chamorro/metadata.xml8
-rw-r--r--app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild12
-rw-r--r--app-dicts/sword-chincvs-1.012
-rw-r--r--app-dicts/sword-chincvs/Manifest3
-rw-r--r--app-dicts/sword-chincvs/metadata.xml8
-rw-r--r--app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild12
-rw-r--r--app-dicts/sword-chincvt-1.012
-rw-r--r--app-dicts/sword-chincvt/Manifest3
-rw-r--r--app-dicts/sword-chincvt/metadata.xml8
-rw-r--r--app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild12
-rw-r--r--app-dicts/sword-chiun-2.012
-rw-r--r--app-dicts/sword-chiun/Manifest3
-rw-r--r--app-dicts/sword-chiun/metadata.xml8
-rw-r--r--app-dicts/sword-chiun/sword-chiun-2.0.ebuild12
-rw-r--r--app-dicts/sword-chiuns-2.012
-rw-r--r--app-dicts/sword-chiuns/Manifest3
-rw-r--r--app-dicts/sword-chiuns/metadata.xml8
-rw-r--r--app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild12
-rw-r--r--app-dicts/sword-clarke-1.012
-rw-r--r--app-dicts/sword-clarke/Manifest3
-rw-r--r--app-dicts/sword-clarke/metadata.xml8
-rw-r--r--app-dicts/sword-clarke/sword-clarke-1.0.ebuild12
-rw-r--r--app-dicts/sword-common-1.312
-rw-r--r--app-dicts/sword-common/Manifest3
-rw-r--r--app-dicts/sword-common/metadata.xml8
-rw-r--r--app-dicts/sword-common/sword-common-1.3.ebuild12
-rw-r--r--app-dicts/sword-cro-1.012
-rw-r--r--app-dicts/sword-cro/Manifest3
-rw-r--r--app-dicts/sword-cro/metadata.xml8
-rw-r--r--app-dicts/sword-cro/sword-cro-1.0.ebuild12
-rw-r--r--app-dicts/sword-czebkr-1.112
-rw-r--r--app-dicts/sword-czebkr/Manifest3
-rw-r--r--app-dicts/sword-czebkr/metadata.xml8
-rw-r--r--app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild12
-rw-r--r--app-dicts/sword-czecep-1.412
-rw-r--r--app-dicts/sword-czecep/Manifest3
-rw-r--r--app-dicts/sword-czecep/metadata.xml8
-rw-r--r--app-dicts/sword-czecep/sword-czecep-1.4.ebuild12
-rw-r--r--app-dicts/sword-czekms-1.412
-rw-r--r--app-dicts/sword-czekms/Manifest3
-rw-r--r--app-dicts/sword-czekms/metadata.xml8
-rw-r--r--app-dicts/sword-czekms/sword-czekms-1.4.ebuild12
-rw-r--r--app-dicts/sword-czenkb-1.112
-rw-r--r--app-dicts/sword-czenkb/Manifest3
-rw-r--r--app-dicts/sword-czenkb/metadata.xml8
-rw-r--r--app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild12
-rw-r--r--app-dicts/sword-daily-1.012
-rw-r--r--app-dicts/sword-daily/Manifest3
-rw-r--r--app-dicts/sword-daily/metadata.xml8
-rw-r--r--app-dicts/sword-daily/sword-daily-1.0.ebuild12
-rw-r--r--app-dicts/sword-dan-2.112
-rw-r--r--app-dicts/sword-dan/Manifest3
-rw-r--r--app-dicts/sword-dan/metadata.xml8
-rw-r--r--app-dicts/sword-dan/sword-dan-2.1.ebuild12
-rw-r--r--app-dicts/sword-darby-1.112
-rw-r--r--app-dicts/sword-darby/Manifest3
-rw-r--r--app-dicts/sword-darby/metadata.xml8
-rw-r--r--app-dicts/sword-darby/sword-darby-1.1.ebuild12
-rw-r--r--app-dicts/sword-dbd-1.112
-rw-r--r--app-dicts/sword-dbd/Manifest3
-rw-r--r--app-dicts/sword-dbd/metadata.xml8
-rw-r--r--app-dicts/sword-dbd/sword-dbd-1.1.ebuild12
-rw-r--r--app-dicts/sword-diaglott-1.112
-rw-r--r--app-dicts/sword-diaglott/Manifest3
-rw-r--r--app-dicts/sword-diaglott/metadata.xml8
-rw-r--r--app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild12
-rw-r--r--app-dicts/sword-drc-1.112
-rw-r--r--app-dicts/sword-drc/Manifest3
-rw-r--r--app-dicts/sword-drc/metadata.xml8
-rw-r--r--app-dicts/sword-drc/sword-drc-1.1.ebuild12
-rw-r--r--app-dicts/sword-dtn-1.012
-rw-r--r--app-dicts/sword-dtn/Manifest3
-rw-r--r--app-dicts/sword-dtn/metadata.xml8
-rw-r--r--app-dicts/sword-dtn/sword-dtn-1.0.ebuild12
-rw-r--r--app-dicts/sword-dutkant-1.112
-rw-r--r--app-dicts/sword-dutkant/Manifest3
-rw-r--r--app-dicts/sword-dutkant/metadata.xml8
-rw-r--r--app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild12
-rw-r--r--app-dicts/sword-dutsvv-1.512
-rw-r--r--app-dicts/sword-dutsvv/Manifest3
-rw-r--r--app-dicts/sword-dutsvv/metadata.xml8
-rw-r--r--app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild12
-rw-r--r--app-dicts/sword-easton-1.212
-rw-r--r--app-dicts/sword-easton/Manifest3
-rw-r--r--app-dicts/sword-easton/metadata.xml8
-rw-r--r--app-dicts/sword-easton/sword-easton-1.2.ebuild12
-rw-r--r--app-dicts/sword-emtv-1.312
-rw-r--r--app-dicts/sword-emtv/Manifest3
-rw-r--r--app-dicts/sword-emtv/metadata.xml8
-rw-r--r--app-dicts/sword-emtv/sword-emtv-1.3.ebuild12
-rw-r--r--app-dicts/sword-esperanto-1.612
-rw-r--r--app-dicts/sword-esperanto/Manifest3
-rw-r--r--app-dicts/sword-esperanto/metadata.xml8
-rw-r--r--app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild12
-rw-r--r--app-dicts/sword-est-1.112
-rw-r--r--app-dicts/sword-est/Manifest3
-rw-r--r--app-dicts/sword-est/metadata.xml8
-rw-r--r--app-dicts/sword-est/sword-est-1.1.ebuild12
-rw-r--r--app-dicts/sword-family-1.112
-rw-r--r--app-dicts/sword-family/Manifest3
-rw-r--r--app-dicts/sword-family/metadata.xml8
-rw-r--r--app-dicts/sword-family/sword-family-1.1.ebuild12
-rw-r--r--app-dicts/sword-farsiopv-1.012
-rw-r--r--app-dicts/sword-farsiopv/Manifest3
-rw-r--r--app-dicts/sword-farsiopv/metadata.xml8
-rw-r--r--app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild12
-rw-r--r--app-dicts/sword-finbiblia-1.112
-rw-r--r--app-dicts/sword-finbiblia/Manifest3
-rw-r--r--app-dicts/sword-finbiblia/metadata.xml8
-rw-r--r--app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild12
-rw-r--r--app-dicts/sword-finney-1.112
-rw-r--r--app-dicts/sword-finney/Manifest3
-rw-r--r--app-dicts/sword-finney/metadata.xml8
-rw-r--r--app-dicts/sword-finney/sword-finney-1.1.ebuild12
-rw-r--r--app-dicts/sword-finpr-1.212
-rw-r--r--app-dicts/sword-finpr/Manifest3
-rw-r--r--app-dicts/sword-finpr/metadata.xml8
-rw-r--r--app-dicts/sword-finpr/sword-finpr-1.2.ebuild12
-rw-r--r--app-dicts/sword-finpr92-1.112
-rw-r--r--app-dicts/sword-finpr92/Manifest3
-rw-r--r--app-dicts/sword-finpr92/metadata.xml8
-rw-r--r--app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild12
-rw-r--r--app-dicts/sword-frebbb-1.112
-rw-r--r--app-dicts/sword-frebbb/Manifest3
-rw-r--r--app-dicts/sword-frebbb/metadata.xml8
-rw-r--r--app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild12
-rw-r--r--app-dicts/sword-frecrampon-1.112
-rw-r--r--app-dicts/sword-frecrampon/Manifest3
-rw-r--r--app-dicts/sword-frecrampon/metadata.xml8
-rw-r--r--app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild12
-rw-r--r--app-dicts/sword-frecrl-1.212
-rw-r--r--app-dicts/sword-frecrl/Manifest3
-rw-r--r--app-dicts/sword-frecrl/metadata.xml8
-rw-r--r--app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild12
-rw-r--r--app-dicts/sword-frelsg-1.312
-rw-r--r--app-dicts/sword-frelsg/Manifest3
-rw-r--r--app-dicts/sword-frelsg/metadata.xml8
-rw-r--r--app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild12
-rw-r--r--app-dicts/sword-fremartin-1.212
-rw-r--r--app-dicts/sword-fremartin/Manifest3
-rw-r--r--app-dicts/sword-fremartin/metadata.xml8
-rw-r--r--app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild12
-rw-r--r--app-dicts/sword-fresegond-1.612
-rw-r--r--app-dicts/sword-fresegond/Manifest3
-rw-r--r--app-dicts/sword-fresegond/metadata.xml8
-rw-r--r--app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild12
-rw-r--r--app-dicts/sword-geneva-1.112
-rw-r--r--app-dicts/sword-geneva/Manifest3
-rw-r--r--app-dicts/sword-geneva/metadata.xml8
-rw-r--r--app-dicts/sword-geneva/sword-geneva-1.1.ebuild12
-rw-r--r--app-dicts/sword-geneva1599-1.112
-rw-r--r--app-dicts/sword-geneva1599/Manifest3
-rw-r--r--app-dicts/sword-geneva1599/metadata.xml8
-rw-r--r--app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild12
-rw-r--r--app-dicts/sword-gerelb1871-1.112
-rw-r--r--app-dicts/sword-gerelb1871/Manifest3
-rw-r--r--app-dicts/sword-gerelb1871/metadata.xml8
-rw-r--r--app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild12
-rw-r--r--app-dicts/sword-gerelb1905-1.512
-rw-r--r--app-dicts/sword-gerelb1905/Manifest3
-rw-r--r--app-dicts/sword-gerelb1905/metadata.xml8
-rw-r--r--app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild12
-rw-r--r--app-dicts/sword-gerlut1545-1.212
-rw-r--r--app-dicts/sword-gerlut1545/Manifest3
-rw-r--r--app-dicts/sword-gerlut1545/metadata.xml8
-rw-r--r--app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild12
-rw-r--r--app-dicts/sword-gersch-1.112
-rw-r--r--app-dicts/sword-gersch/Manifest3
-rw-r--r--app-dicts/sword-gersch/metadata.xml8
-rw-r--r--app-dicts/sword-gersch/sword-gersch-1.1.ebuild12
-rw-r--r--app-dicts/sword-greekhebrew-1.112
-rw-r--r--app-dicts/sword-greekhebrew/Manifest3
-rw-r--r--app-dicts/sword-greekhebrew/metadata.xml8
-rw-r--r--app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild12
-rw-r--r--app-dicts/sword-hebmodern-1.112
-rw-r--r--app-dicts/sword-hebmodern/Manifest3
-rw-r--r--app-dicts/sword-hebmodern/metadata.xml8
-rw-r--r--app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild12
-rw-r--r--app-dicts/sword-hebrewgreek-1.112
-rw-r--r--app-dicts/sword-hebrewgreek/Manifest3
-rw-r--r--app-dicts/sword-hebrewgreek/metadata.xml8
-rw-r--r--app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild12
-rw-r--r--app-dicts/sword-heretics-1.112
-rw-r--r--app-dicts/sword-heretics/Manifest3
-rw-r--r--app-dicts/sword-heretics/metadata.xml8
-rw-r--r--app-dicts/sword-heretics/sword-heretics-1.1.ebuild12
-rw-r--r--app-dicts/sword-hitchcock-1.312
-rw-r--r--app-dicts/sword-hitchcock/Manifest3
-rw-r--r--app-dicts/sword-hitchcock/metadata.xml8
-rw-r--r--app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild12
-rw-r--r--app-dicts/sword-hnv-1.812
-rw-r--r--app-dicts/sword-hnv/Manifest3
-rw-r--r--app-dicts/sword-hnv/metadata.xml8
-rw-r--r--app-dicts/sword-hnv/sword-hnv-1.8.ebuild12
-rw-r--r--app-dicts/sword-hunkar-1.712
-rw-r--r--app-dicts/sword-hunkar/Manifest3
-rw-r--r--app-dicts/sword-hunkar/metadata.xml8
-rw-r--r--app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild12
-rw-r--r--app-dicts/sword-hunuj-1.212
-rw-r--r--app-dicts/sword-hunuj/Manifest3
-rw-r--r--app-dicts/sword-hunuj/metadata.xml8
-rw-r--r--app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild12
-rw-r--r--app-dicts/sword-icelandic-1.112
-rw-r--r--app-dicts/sword-icelandic/Manifest3
-rw-r--r--app-dicts/sword-icelandic/metadata.xml8
-rw-r--r--app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild12
-rw-r--r--app-dicts/sword-institutes-1.212
-rw-r--r--app-dicts/sword-institutes/Manifest3
-rw-r--r--app-dicts/sword-institutes/metadata.xml8
-rw-r--r--app-dicts/sword-institutes/sword-institutes-1.2.ebuild12
-rw-r--r--app-dicts/sword-isbe-1.612
-rw-r--r--app-dicts/sword-isbe/Manifest3
-rw-r--r--app-dicts/sword-isbe/metadata.xml8
-rw-r--r--app-dicts/sword-isbe/sword-isbe-1.6.ebuild12
-rw-r--r--app-dicts/sword-isv-1.512
-rw-r--r--app-dicts/sword-isv/Manifest3
-rw-r--r--app-dicts/sword-isv/metadata.xml8
-rw-r--r--app-dicts/sword-isv/sword-isv-1.5.ebuild12
-rw-r--r--app-dicts/sword-itadio-1.012
-rw-r--r--app-dicts/sword-itadio/Manifest3
-rw-r--r--app-dicts/sword-itadio/metadata.xml8
-rw-r--r--app-dicts/sword-itadio/sword-itadio-1.0.ebuild12
-rw-r--r--app-dicts/sword-itarive-1.012
-rw-r--r--app-dicts/sword-itarive/Manifest3
-rw-r--r--app-dicts/sword-itarive/metadata.xml8
-rw-r--r--app-dicts/sword-itarive/sword-itarive-1.0.ebuild12
-rw-r--r--app-dicts/sword-jfb-2.212
-rw-r--r--app-dicts/sword-jfb/Manifest3
-rw-r--r--app-dicts/sword-jfb/metadata.xml8
-rw-r--r--app-dicts/sword-jfb/sword-jfb-2.2.ebuild12
-rw-r--r--app-dicts/sword-josephus-1.112
-rw-r--r--app-dicts/sword-josephus/Manifest3
-rw-r--r--app-dicts/sword-josephus/metadata.xml8
-rw-r--r--app-dicts/sword-josephus/sword-josephus-1.1.ebuild12
-rw-r--r--app-dicts/sword-jps-1.212
-rw-r--r--app-dicts/sword-jps/Manifest3
-rw-r--r--app-dicts/sword-jps/metadata.xml8
-rw-r--r--app-dicts/sword-jps/sword-jps-1.2.ebuild12
-rw-r--r--app-dicts/sword-jst-1.112
-rw-r--r--app-dicts/sword-jst/Manifest3
-rw-r--r--app-dicts/sword-jst/metadata.xml8
-rw-r--r--app-dicts/sword-jst/sword-jst-1.1.ebuild12
-rw-r--r--app-dicts/sword-jubilee2000-1.112
-rw-r--r--app-dicts/sword-jubilee2000/Manifest3
-rw-r--r--app-dicts/sword-jubilee2000/metadata.xml8
-rw-r--r--app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild12
-rw-r--r--app-dicts/sword-kekchi-1.512
-rw-r--r--app-dicts/sword-kekchi/Manifest3
-rw-r--r--app-dicts/sword-kekchi/metadata.xml8
-rw-r--r--app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild12
-rw-r--r--app-dicts/sword-kjv-2.312
-rw-r--r--app-dicts/sword-kjv/Manifest3
-rw-r--r--app-dicts/sword-kjv/metadata.xml8
-rw-r--r--app-dicts/sword-kjv/sword-kjv-2.3.ebuild12
-rw-r--r--app-dicts/sword-kjvd-1.112
-rw-r--r--app-dicts/sword-kjvd/Manifest3
-rw-r--r--app-dicts/sword-kjvd/metadata.xml8
-rw-r--r--app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild12
-rw-r--r--app-dicts/sword-klv-2.212
-rw-r--r--app-dicts/sword-klv/Manifest3
-rw-r--r--app-dicts/sword-klv/metadata.xml8
-rw-r--r--app-dicts/sword-klv/sword-klv-2.2.ebuild12
-rw-r--r--app-dicts/sword-klven_iklingon-2.112
-rw-r--r--app-dicts/sword-klven_iklingon/Manifest3
-rw-r--r--app-dicts/sword-klven_iklingon/metadata.xml8
-rw-r--r--app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild12
-rw-r--r--app-dicts/sword-klviklingon_en-2.112
-rw-r--r--app-dicts/sword-klviklingon_en/Manifest3
-rw-r--r--app-dicts/sword-klviklingon_en/metadata.xml8
-rw-r--r--app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild13
-rw-r--r--app-dicts/sword-korean-1.112
-rw-r--r--app-dicts/sword-korean/Manifest3
-rw-r--r--app-dicts/sword-korean/metadata.xml8
-rw-r--r--app-dicts/sword-korean/sword-korean-1.1.ebuild12
-rw-r--r--app-dicts/sword-la_en-1.112
-rw-r--r--app-dicts/sword-la_en/Manifest3
-rw-r--r--app-dicts/sword-la_en/metadata.xml8
-rw-r--r--app-dicts/sword-la_en/sword-la_en-1.1.ebuild12
-rw-r--r--app-dicts/sword-latvian-1.112
-rw-r--r--app-dicts/sword-latvian/Manifest3
-rw-r--r--app-dicts/sword-latvian/metadata.xml8
-rw-r--r--app-dicts/sword-latvian/sword-latvian-1.1.ebuild12
-rw-r--r--app-dicts/sword-lightfoot-1.012
-rw-r--r--app-dicts/sword-lightfoot/Manifest3
-rw-r--r--app-dicts/sword-lightfoot/metadata.xml8
-rw-r--r--app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild12
-rw-r--r--app-dicts/sword-litv-1.312
-rw-r--r--app-dicts/sword-litv/Manifest3
-rw-r--r--app-dicts/sword-litv/metadata.xml8
-rw-r--r--app-dicts/sword-litv/sword-litv-1.3.ebuild12
-rw-r--r--app-dicts/sword-luther-1.112
-rw-r--r--app-dicts/sword-luther/Manifest3
-rw-r--r--app-dicts/sword-luther/metadata.xml8
-rw-r--r--app-dicts/sword-luther/sword-luther-1.1.ebuild12
-rw-r--r--app-dicts/sword-mak-1.012
-rw-r--r--app-dicts/sword-mak/Manifest3
-rw-r--r--app-dicts/sword-mak/metadata.xml8
-rw-r--r--app-dicts/sword-mak/sword-mak-1.0.ebuild12
-rw-r--r--app-dicts/sword-manxgaelic-1.112
-rw-r--r--app-dicts/sword-manxgaelic/Manifest3
-rw-r--r--app-dicts/sword-manxgaelic/metadata.xml8
-rw-r--r--app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild12
-rw-r--r--app-dicts/sword-maori-1.112
-rw-r--r--app-dicts/sword-maori/Manifest3
-rw-r--r--app-dicts/sword-maori/metadata.xml8
-rw-r--r--app-dicts/sword-maori/sword-maori-1.1.ebuild12
-rw-r--r--app-dicts/sword-mhc-1.612
-rw-r--r--app-dicts/sword-mhc/Manifest3
-rw-r--r--app-dicts/sword-mhc/metadata.xml8
-rw-r--r--app-dicts/sword-mhc/sword-mhc-1.6.ebuild12
-rw-r--r--app-dicts/sword-mhcc-1.112
-rw-r--r--app-dicts/sword-mhcc/Manifest3
-rw-r--r--app-dicts/sword-mhcc/metadata.xml8
-rw-r--r--app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild12
-rw-r--r--app-dicts/sword-mkjv-1.312
-rw-r--r--app-dicts/sword-mkjv/Manifest3
-rw-r--r--app-dicts/sword-mkjv/metadata.xml8
-rw-r--r--app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild12
-rw-r--r--app-dicts/sword-montgomery-1.312
-rw-r--r--app-dicts/sword-montgomery/Manifest3
-rw-r--r--app-dicts/sword-montgomery/metadata.xml8
-rw-r--r--app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild12
-rw-r--r--app-dicts/sword-murdock-1.212
-rw-r--r--app-dicts/sword-murdock/Manifest3
-rw-r--r--app-dicts/sword-murdock/metadata.xml8
-rw-r--r--app-dicts/sword-murdock/sword-murdock-1.2.ebuild12
-rw-r--r--app-dicts/sword-nave-1.112
-rw-r--r--app-dicts/sword-nave/Manifest3
-rw-r--r--app-dicts/sword-nave/metadata.xml8
-rw-r--r--app-dicts/sword-nave/sword-nave-1.1.ebuild12
-rw-r--r--app-dicts/sword-norsk-1.512
-rw-r--r--app-dicts/sword-norsk/Manifest3
-rw-r--r--app-dicts/sword-norsk/metadata.xml8
-rw-r--r--app-dicts/sword-norsk/sword-norsk-1.5.ebuild12
-rw-r--r--app-dicts/sword-orthodoxy-1.012
-rw-r--r--app-dicts/sword-orthodoxy/Manifest3
-rw-r--r--app-dicts/sword-orthodoxy/metadata.xml8
-rw-r--r--app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild12
-rw-r--r--app-dicts/sword-packard-1.212
-rw-r--r--app-dicts/sword-packard/Manifest3
-rw-r--r--app-dicts/sword-packard/metadata.xml8
-rw-r--r--app-dicts/sword-packard/sword-packard-1.2.ebuild12
-rw-r--r--app-dicts/sword-personal-1.012
-rw-r--r--app-dicts/sword-personal/Manifest3
-rw-r--r--app-dicts/sword-personal/metadata.xml8
-rw-r--r--app-dicts/sword-personal/sword-personal-1.0.ebuild12
-rw-r--r--app-dicts/sword-peshitta-1.112
-rw-r--r--app-dicts/sword-peshitta/Manifest3
-rw-r--r--app-dicts/sword-peshitta/metadata.xml8
-rw-r--r--app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild12
-rw-r--r--app-dicts/sword-pilgrim-1.012
-rw-r--r--app-dicts/sword-pilgrim/Manifest3
-rw-r--r--app-dicts/sword-pilgrim/metadata.xml8
-rw-r--r--app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild12
-rw-r--r--app-dicts/sword-pnt-1.112
-rw-r--r--app-dicts/sword-pnt/Manifest3
-rw-r--r--app-dicts/sword-pnt/metadata.xml8
-rw-r--r--app-dicts/sword-pnt/sword-pnt-1.1.ebuild12
-rw-r--r--app-dicts/sword-practice-1.012
-rw-r--r--app-dicts/sword-practice/Manifest3
-rw-r--r--app-dicts/sword-practice/metadata.xml8
-rw-r--r--app-dicts/sword-practice/sword-practice-1.0.ebuild12
-rw-r--r--app-dicts/sword-rkjnt-1.012
-rw-r--r--app-dicts/sword-rkjnt/Manifest3
-rw-r--r--app-dicts/sword-rkjnt/metadata.xml8
-rw-r--r--app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild12
-rw-r--r--app-dicts/sword-rnkjv-1.512
-rw-r--r--app-dicts/sword-rnkjv/Manifest3
-rw-r--r--app-dicts/sword-rnkjv/metadata.xml8
-rw-r--r--app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild12
-rw-r--r--app-dicts/sword-robinson-2.012
-rw-r--r--app-dicts/sword-robinson/Manifest3
-rw-r--r--app-dicts/sword-robinson/metadata.xml8
-rw-r--r--app-dicts/sword-robinson/sword-robinson-2.0.ebuild12
-rw-r--r--app-dicts/sword-romcor-1.212
-rw-r--r--app-dicts/sword-romcor/Manifest3
-rw-r--r--app-dicts/sword-romcor/metadata.xml8
-rw-r--r--app-dicts/sword-romcor/sword-romcor-1.2.ebuild12
-rw-r--r--app-dicts/sword-rotherham-1.612
-rw-r--r--app-dicts/sword-rotherham/Manifest3
-rw-r--r--app-dicts/sword-rotherham/metadata.xml8
-rw-r--r--app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild12
-rw-r--r--app-dicts/sword-rst-1.612
-rw-r--r--app-dicts/sword-rst/Manifest3
-rw-r--r--app-dicts/sword-rst/metadata.xml8
-rw-r--r--app-dicts/sword-rst/sword-rst-1.6.ebuild12
-rw-r--r--app-dicts/sword-rusmakarij-1.112
-rw-r--r--app-dicts/sword-rusmakarij/Manifest3
-rw-r--r--app-dicts/sword-rusmakarij/metadata.xml8
-rw-r--r--app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild12
-rw-r--r--app-dicts/sword-rwebster-1.312
-rw-r--r--app-dicts/sword-rwebster/Manifest3
-rw-r--r--app-dicts/sword-rwebster/metadata.xml8
-rw-r--r--app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild12
-rw-r--r--app-dicts/sword-rwp-1.912
-rw-r--r--app-dicts/sword-rwp/Manifest3
-rw-r--r--app-dicts/sword-rwp/metadata.xml8
-rw-r--r--app-dicts/sword-rwp/sword-rwp-1.9.ebuild12
-rw-r--r--app-dicts/sword-saoa-1.012
-rw-r--r--app-dicts/sword-saoa/Manifest3
-rw-r--r--app-dicts/sword-saoa/metadata.xml8
-rw-r--r--app-dicts/sword-saoa/sword-saoa-1.0.ebuild12
-rw-r--r--app-dicts/sword-scofield-1.012
-rw-r--r--app-dicts/sword-scofield/Manifest3
-rw-r--r--app-dicts/sword-scofield/metadata.xml8
-rw-r--r--app-dicts/sword-scofield/sword-scofield-1.0.ebuild12
-rw-r--r--app-dicts/sword-scotsgaelic-1.212
-rw-r--r--app-dicts/sword-scotsgaelic/Manifest3
-rw-r--r--app-dicts/sword-scotsgaelic/metadata.xml8
-rw-r--r--app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild12
-rw-r--r--app-dicts/sword-sme-1.712
-rw-r--r--app-dicts/sword-sme/Manifest3
-rw-r--r--app-dicts/sword-sme/metadata.xml8
-rw-r--r--app-dicts/sword-sme/sword-sme-1.7.ebuild12
-rw-r--r--app-dicts/sword-smith-1.312
-rw-r--r--app-dicts/sword-smith/Manifest3
-rw-r--r--app-dicts/sword-smith/metadata.xml8
-rw-r--r--app-dicts/sword-smith/sword-smith-1.3.ebuild12
-rw-r--r--app-dicts/sword-sparv-1.512
-rw-r--r--app-dicts/sword-sparv/Manifest3
-rw-r--r--app-dicts/sword-sparv/metadata.xml8
-rw-r--r--app-dicts/sword-sparv/sword-sparv-1.5.ebuild12
-rw-r--r--app-dicts/sword-sparvg2004-1.012
-rw-r--r--app-dicts/sword-sparvg2004/Manifest3
-rw-r--r--app-dicts/sword-sparvg2004/metadata.xml8
-rw-r--r--app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild12
-rw-r--r--app-dicts/sword-spasev-1.112
-rw-r--r--app-dicts/sword-spasev/Manifest3
-rw-r--r--app-dicts/sword-spasev/metadata.xml8
-rw-r--r--app-dicts/sword-spasev/sword-spasev-1.1.ebuild12
-rw-r--r--app-dicts/sword-spavnt-1.212
-rw-r--r--app-dicts/sword-spavnt/Manifest3
-rw-r--r--app-dicts/sword-spavnt/metadata.xml8
-rw-r--r--app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild12
-rw-r--r--app-dicts/sword-spurious-1.012
-rw-r--r--app-dicts/sword-spurious/Manifest3
-rw-r--r--app-dicts/sword-spurious/metadata.xml8
-rw-r--r--app-dicts/sword-spurious/sword-spurious-1.0.ebuild12
-rw-r--r--app-dicts/sword-strongsgreek-1.212
-rw-r--r--app-dicts/sword-strongsgreek/Manifest3
-rw-r--r--app-dicts/sword-strongsgreek/metadata.xml8
-rw-r--r--app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild12
-rw-r--r--app-dicts/sword-strongshebrew-1.212
-rw-r--r--app-dicts/sword-strongshebrew/Manifest3
-rw-r--r--app-dicts/sword-strongshebrew/metadata.xml8
-rw-r--r--app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild12
-rw-r--r--app-dicts/sword-swahili-1.112
-rw-r--r--app-dicts/sword-swahili/Manifest3
-rw-r--r--app-dicts/sword-swahili/metadata.xml8
-rw-r--r--app-dicts/sword-swahili/sword-swahili-1.1.ebuild12
-rw-r--r--app-dicts/sword-tagalog-1.112
-rw-r--r--app-dicts/sword-tagalog/Manifest3
-rw-r--r--app-dicts/sword-tagalog/metadata.xml8
-rw-r--r--app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild12
-rw-r--r--app-dicts/sword-tcr-1.112
-rw-r--r--app-dicts/sword-tcr/Manifest3
-rw-r--r--app-dicts/sword-tcr/metadata.xml8
-rw-r--r--app-dicts/sword-tcr/sword-tcr-1.1.ebuild12
-rw-r--r--app-dicts/sword-tdavid-1.112
-rw-r--r--app-dicts/sword-tdavid/Manifest3
-rw-r--r--app-dicts/sword-tdavid/metadata.xml8
-rw-r--r--app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild12
-rw-r--r--app-dicts/sword-tfg-1.512
-rw-r--r--app-dicts/sword-tfg/Manifest3
-rw-r--r--app-dicts/sword-tfg/metadata.xml8
-rw-r--r--app-dicts/sword-tfg/sword-tfg-1.5.ebuild12
-rw-r--r--app-dicts/sword-tisch-1.312
-rw-r--r--app-dicts/sword-tisch/Manifest3
-rw-r--r--app-dicts/sword-tisch/metadata.xml8
-rw-r--r--app-dicts/sword-tisch/sword-tisch-1.3.ebuild12
-rw-r--r--app-dicts/sword-torrey-1.312
-rw-r--r--app-dicts/sword-torrey/Manifest3
-rw-r--r--app-dicts/sword-torrey/metadata.xml8
-rw-r--r--app-dicts/sword-torrey/sword-torrey-1.3.ebuild12
-rw-r--r--app-dicts/sword-tr-1.212
-rw-r--r--app-dicts/sword-tr/Manifest3
-rw-r--r--app-dicts/sword-tr/metadata.xml8
-rw-r--r--app-dicts/sword-tr/sword-tr-1.2.ebuild12
-rw-r--r--app-dicts/sword-tsk-1.412
-rw-r--r--app-dicts/sword-tsk/Manifest3
-rw-r--r--app-dicts/sword-tsk/metadata.xml8
-rw-r--r--app-dicts/sword-tsk/sword-tsk-1.4.ebuild12
-rw-r--r--app-dicts/sword-twenty-1.112
-rw-r--r--app-dicts/sword-twenty/Manifest3
-rw-r--r--app-dicts/sword-twenty/metadata.xml8
-rw-r--r--app-dicts/sword-twenty/sword-twenty-1.1.ebuild12
-rw-r--r--app-dicts/sword-tyndale-1.012
-rw-r--r--app-dicts/sword-tyndale/Manifest3
-rw-r--r--app-dicts/sword-tyndale/metadata.xml8
-rw-r--r--app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild12
-rw-r--r--app-dicts/sword-ukjv-1.112
-rw-r--r--app-dicts/sword-ukjv/Manifest3
-rw-r--r--app-dicts/sword-ukjv/metadata.xml8
-rw-r--r--app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild12
-rw-r--r--app-dicts/sword-ukrainian-1.312
-rw-r--r--app-dicts/sword-ukrainian/Manifest3
-rw-r--r--app-dicts/sword-ukrainian/metadata.xml8
-rw-r--r--app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild12
-rw-r--r--app-dicts/sword-uma-1.212
-rw-r--r--app-dicts/sword-uma/Manifest3
-rw-r--r--app-dicts/sword-uma/metadata.xml8
-rw-r--r--app-dicts/sword-uma/sword-uma-1.2.ebuild12
-rw-r--r--app-dicts/sword-umgreek-1.612
-rw-r--r--app-dicts/sword-umgreek/Manifest3
-rw-r--r--app-dicts/sword-umgreek/metadata.xml8
-rw-r--r--app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild12
-rw-r--r--app-dicts/sword-vulgate-1.112
-rw-r--r--app-dicts/sword-vulgate/Manifest3
-rw-r--r--app-dicts/sword-vulgate/metadata.xml8
-rw-r--r--app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild12
-rw-r--r--app-dicts/sword-vulgate_hebps-1.112
-rw-r--r--app-dicts/sword-vulgate_hebps/Manifest3
-rw-r--r--app-dicts/sword-vulgate_hebps/metadata.xml8
-rw-r--r--app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild12
-rw-r--r--app-dicts/sword-web-1.812
-rw-r--r--app-dicts/sword-web/Manifest3
-rw-r--r--app-dicts/sword-web/metadata.xml8
-rw-r--r--app-dicts/sword-web/sword-web-1.8.ebuild12
-rw-r--r--app-dicts/sword-webster-1.212
-rw-r--r--app-dicts/sword-webster/Manifest3
-rw-r--r--app-dicts/sword-webster/metadata.xml8
-rw-r--r--app-dicts/sword-webster/sword-webster-1.2.ebuild12
-rw-r--r--app-dicts/sword-webstersdict-1.112
-rw-r--r--app-dicts/sword-webstersdict/Manifest3
-rw-r--r--app-dicts/sword-webstersdict/metadata.xml8
-rw-r--r--app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild13
-rw-r--r--app-dicts/sword-wesley-1.112
-rw-r--r--app-dicts/sword-wesley/Manifest3
-rw-r--r--app-dicts/sword-wesley/metadata.xml8
-rw-r--r--app-dicts/sword-wesley/sword-wesley-1.1.ebuild12
-rw-r--r--app-dicts/sword-weymouth-1.112
-rw-r--r--app-dicts/sword-weymouth/Manifest3
-rw-r--r--app-dicts/sword-weymouth/metadata.xml8
-rw-r--r--app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild12
-rw-r--r--app-dicts/sword-whnu-1.1012
-rw-r--r--app-dicts/sword-whnu/Manifest3
-rw-r--r--app-dicts/sword-whnu/metadata.xml8
-rw-r--r--app-dicts/sword-whnu/sword-whnu-1.10.ebuild12
-rw-r--r--app-dicts/sword-wlc-1.412
-rw-r--r--app-dicts/sword-wlc/Manifest3
-rw-r--r--app-dicts/sword-wlc/metadata.xml8
-rw-r--r--app-dicts/sword-wlc/sword-wlc-1.4.ebuild12
-rw-r--r--app-dicts/sword-wulfila-1.012
-rw-r--r--app-dicts/sword-wulfila/Manifest3
-rw-r--r--app-dicts/sword-wulfila/metadata.xml8
-rw-r--r--app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild12
-rw-r--r--app-dicts/sword-wycliffe-1.012
-rw-r--r--app-dicts/sword-wycliffe/Manifest3
-rw-r--r--app-dicts/sword-wycliffe/metadata.xml8
-rw-r--r--app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild12
-rw-r--r--app-dicts/sword-xhosa-1.112
-rw-r--r--app-dicts/sword-xhosa/Manifest3
-rw-r--r--app-dicts/sword-xhosa/metadata.xml8
-rw-r--r--app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild12
-rw-r--r--app-dicts/sword-ylt-1.112
-rw-r--r--app-dicts/sword-ylt/Manifest3
-rw-r--r--app-dicts/sword-ylt/metadata.xml8
-rw-r--r--app-dicts/sword-ylt/sword-ylt-1.1.ebuild12
-rw-r--r--app-dicts/verbiste-0.1.38-r113
-rw-r--r--app-dicts/verbiste-0.1.4113
-rw-r--r--app-dicts/verbiste-0.1.4413
-rw-r--r--app-dicts/verbiste/Manifest7
-rw-r--r--app-dicts/verbiste/metadata.xml8
-rw-r--r--app-dicts/verbiste/verbiste-0.1.38-r1.ebuild68
-rw-r--r--app-dicts/verbiste/verbiste-0.1.41.ebuild66
-rw-r--r--app-dicts/verbiste/verbiste-0.1.44.ebuild66
-rw-r--r--app-dicts/wnn-ldic-1.0410
-rw-r--r--app-dicts/wnn-ldic/Manifest3
-rw-r--r--app-dicts/wnn-ldic/metadata.xml8
-rw-r--r--app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild39
-rw-r--r--app-dicts/wordnet-3.0-r413
-rw-r--r--app-dicts/wordnet-3.0-r513
-rw-r--r--app-dicts/wordnet-3.113
-rw-r--r--app-dicts/wordnet/Manifest11
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch20
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-format-security.patch48
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch12
-rw-r--r--app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch133
-rw-r--r--app-dicts/wordnet/metadata.xml12
-rw-r--r--app-dicts/wordnet/wordnet-3.0-r4.ebuild71
-rw-r--r--app-dicts/wordnet/wordnet-3.0-r5.ebuild75
-rw-r--r--app-dicts/wordnet/wordnet-3.1.ebuild94
-rw-r--r--app-dicts/ydpdict-1.0.212
-rw-r--r--app-dicts/ydpdict/Manifest3
-rw-r--r--app-dicts/ydpdict/metadata.xml5
-rw-r--r--app-dicts/ydpdict/ydpdict-1.0.2.ebuild42
1349 files changed, 4111 insertions, 10803 deletions
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index d6cefa5d334c..cc5471d0b1b5 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
Binary files differ
diff --git a/app-dicts/aspell-af-0.50.0 b/app-dicts/aspell-af-0.50.0
new file mode 100644
index 000000000000..d58f1cc57b84
--- /dev/null
+++ b/app-dicts/aspell-af-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Afrikaans language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/af/aspell-af-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=f4b50c0597839befe9f62083b354379d
diff --git a/app-dicts/aspell-af/Manifest b/app-dicts/aspell-af/Manifest
deleted file mode 100644
index 4efb5c279930..000000000000
--- a/app-dicts/aspell-af/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-af-0.50-0.tar.bz2 256111 BLAKE2B d2f5cfb6d1e3f71319283d1487bb27765daead18a9b709cb9dd0b58b0f1579649cae3d1b59e4cb28c470b1924bf670e3c89f75a1abe7fa02fd4ad779750647f3 SHA512 8ca7b892745bebe5dfda1319141c5efc53fbad1444066d585cc2d6479c51c85c31307a6977a0647b0c4add4a5b7baa9adb370996e25db4e1c98f1c10991fd649
-EBUILD aspell-af-0.50.0.ebuild 294 BLAKE2B e3ac2abc18fa1b2354bb19546e025e04fca4ff5cc9d2802df1b1cc234d09940d2a7cb1180178b0f1730939e50d29e77eb13f8a659f3fdfd553dc42aafc0a46e3 SHA512 2e70789e53d6ad1b8e63eb8f5314436988099266a23d5a2473a2b6a222122c049f67bba33447c439e5b61f58cfbc35d9daae875d6b52a49d9e95527d0f1b92a7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
deleted file mode 100644
index b05a2281825d..000000000000
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Afrikaans"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-af/metadata.xml b/app-dicts/aspell-af/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-af/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-be-0.01-r1 b/app-dicts/aspell-be-0.01-r1
new file mode 100644
index 000000000000..a5707f0d21a8
--- /dev/null
+++ b/app-dicts/aspell-be-0.01-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Belarusian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+IUSE=classic
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/be/aspell5-be-0.01.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=2c79586736a8fd1c05dcb2d8c5681ff4
diff --git a/app-dicts/aspell-be/Manifest b/app-dicts/aspell-be/Manifest
deleted file mode 100644
index 8a43b20ec202..000000000000
--- a/app-dicts/aspell-be/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX aspell5-be-0.01-official.patch 506 BLAKE2B 0172ae29930012aee31b25a227765dd01d7656a0c27b2dc62d306e5e4693682123ab081878fa8a78b87f4dcfa9355bfb62e6874a7ce111847e84c448ca7a9b66 SHA512 adf3b65dfae9de761d6971e2894abe3d97b30bc8185e2039128e501fa097dcbccb140e740cec2bfcde3d47b010f5bcc359f8b78ff31eed7d3da0b6edfc265c22
-DIST aspell5-be-0.01.tar.bz2 653405 BLAKE2B 7a7acadf75a754fd389b1bda94c5a437ba04db01beaaeea8a2cb2a3eba276150f680983e8292d5b80f3d5134501bfefad8538d96d2a459eeb698f0cd5f2a77a0 SHA512 320334c9944c44c9a61d24798ecd7603c4dc9fee99035d48d19759ecf2c1ac8ae21a0afde050d6527566e2404c1df4f75e313cec598b7faa93506142ea3c1022
-EBUILD aspell-be-0.01-r1.ebuild 507 BLAKE2B d72eb50c6cefd591823781508a71cfe2399fb1458e68a367f02b0fca7770921a26cf9bb69ada7138aaa0ef150961491be61acba1adfce1d3ab24e92f25c4628a SHA512 bc254db72d9d23f6d0e60ef2270c87a17a3ff0e99013727a905ed39c2ba718b35f41672ec56a94c4f26020f3c1a874a6408a2ce5c49e8b6bd26012981cd4164f
-MISC metadata.xml 244 BLAKE2B c544a3cb01d4997c270248b3f9a06d9d45d0d4196e2215301b17404870dabfeecdd7f42a3dadb25015e039e759fe59d90c3ab59b5b8baf076fbcab236564003b SHA512 4ef4e5c63d3c90792ac5dfa5465831bb960292260a8b93401b6087fa7f31f8ea0e47cba61beb73df46b8e8cc40676c3e4bcd8e43b8333ff5415cedd03c7b74e4
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
deleted file mode 100644
index 0a67bf10a774..000000000000
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Belarusian"
-
-inherit aspell-dict-r1
-
-SRC_URI="mirror://gnu/aspell/dict/be/aspell5-be-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="classic"
-
-S="${WORKDIR}/aspell5-be-${PV}"
-
-src_prepare() {
- use classic || local PATCHES=( "${FILESDIR}"/aspell5-be-${PV}-official.patch )
- default
-}
diff --git a/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch b/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch
deleted file mode 100644
index 8574baad88ca..000000000000
--- a/app-dicts/aspell-be/files/aspell5-be-0.01-official.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- aspell5-be-0.01.orig/be_BY.alias 2004-07-06 00:40:25.000000000 +0300
-+++ aspell5-be-0.01/be_BY.alias 2006-04-15 10:33:22.000000000 +0300
-@@ -1,2 +1,2 @@
- # Generated with Aspell Dicts "proc" script version 0.60.2
--add be.multi
-+add be_SU.multi
---- aspell5-be-0.01.orig/belarusian.alias 2004-07-06 00:40:25.000000000 +0300
-+++ aspell5-be-0.01/belarusian.alias 2006-04-15 10:33:37.000000000 +0300
-@@ -1,2 +1,2 @@
- # Generated with Aspell Dicts "proc" script version 0.60.2
--add be.multi
-+add be_SU.multi
diff --git a/app-dicts/aspell-be/metadata.xml b/app-dicts/aspell-be/metadata.xml
deleted file mode 100644
index 42facba49d0e..000000000000
--- a/app-dicts/aspell-be/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="classic">Support classic spelling by default</flag>
-</use>
-</pkgmetadata>
diff --git a/app-dicts/aspell-bg-4.1.0 b/app-dicts/aspell-bg-4.1.0
new file mode 100644
index 000000000000..1b2223a95941
--- /dev/null
+++ b/app-dicts/aspell-bg-4.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Bulgarian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/bg/aspell6-bg-4.1-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=3fa5f43b5e5a6f5bdd0643fc3db0b7fa
diff --git a/app-dicts/aspell-bg/Manifest b/app-dicts/aspell-bg/Manifest
deleted file mode 100644
index ff178077b3f1..000000000000
--- a/app-dicts/aspell-bg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-bg-4.1-0.tar.bz2 138940 BLAKE2B 5a694e3ffc89bb6f3254c269cb73730bf725a39661a1418f54ca85f845292b6fd7aec948df38bb4fe954946be65adfb162112cdf68b5808c017af75188bbfa54 SHA512 73ba292e9e78be21a9bd32d802a3f87b5b8200b64fcdc6e8bb47c834eb9dfd855a3397e8deb83e7879dc0dab7b118ae117832032fb9a450976c929bf12926881
-EBUILD aspell-bg-4.1.0.ebuild 311 BLAKE2B 3c1bc64680ea30cf9feedb7d68acc1810cf0c814dd78d01b6bad2b10e73629b307b23fc0e38c18e8871f453fa839422eed6aefff2939b082feadb386762f875d SHA512 5f51af4f2acdb91245faf77062c3b1cc7e5804365cb8f4f46c0081fcd61e1b9b08e7727dec6285a660e6a3914af75cc8df8f70a4927830ddda5b19a5e9f0c686
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
deleted file mode 100644
index 8542657dae46..000000000000
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Bulgarian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-bg/metadata.xml b/app-dicts/aspell-bg/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-bg/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-br-0.50.2 b/app-dicts/aspell-br-0.50.2
new file mode 100644
index 000000000000..3eb61ad9d1e9
--- /dev/null
+++ b/app-dicts/aspell-br-0.50.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Breton language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/br/aspell-br-0.50-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=1d8376c55114124e1346b47fcc57cb94
diff --git a/app-dicts/aspell-br/Manifest b/app-dicts/aspell-br/Manifest
deleted file mode 100644
index 9e27277e35f6..000000000000
--- a/app-dicts/aspell-br/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-br-0.50-2.tar.bz2 68055 BLAKE2B f301543386e81bb14a48c22f35897ae9cce296719a501ffab92b733766f5078b86dc1f70ea1eafe851e569e909b73d2c7ef473647f8a4be7bae35e75a9e7ff76 SHA512 02f2ce7a350adb87a0f32dd4748f067230a0f3faf195f8c7237bc0520cc0a7aa6475f96de933ae650611f8b9a41deaaeb57c2228ed95950a41e5defccba9e67c
-EBUILD aspell-br-0.50.2.ebuild 291 BLAKE2B 053bac9eed673663e0192e4ac11333ce6766b45fc5ca992d1975c3b20c165517f7425dde5a8c4aac4b2c08b6dcd80ed030565ca192e4292e9ee0434d0eacb9c2 SHA512 9cb205aaed441a3a0e0dd35ed59eebe90d5e5374bc5a51a31a58bc285303daf4f4469322db0f1009461085d22ce94b3733ede2f1af69da8d132521dcfcf983ae
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
deleted file mode 100644
index 57add5a98488..000000000000
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Breton"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-br/metadata.xml b/app-dicts/aspell-br/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-br/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-ca-2.1.5.1 b/app-dicts/aspell-ca-2.1.5.1
new file mode 100644
index 000000000000..6a176565da23
--- /dev/null
+++ b/app-dicts/aspell-ca-2.1.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Catalan language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=0cc2fed31b2d7ca6fc82ab167fedba0a
diff --git a/app-dicts/aspell-ca/Manifest b/app-dicts/aspell-ca/Manifest
deleted file mode 100644
index 642a90413475..000000000000
--- a/app-dicts/aspell-ca/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-ca-2.1.5-1.tar.bz2 227561 BLAKE2B a7b26408eb583ca56967508f00d9c617e6e4bec364f6c807813d5f6485c549b9b62f02ea5464c32c3b3a84477d8fb6e768c11fda7d262b56ff0b24d57e19fde0 SHA512 9f3baef829948a4979c03dcc380caf3fa249912fa94d375a41df4d34d62ffdbf781a777eb437d101bdf99873e9d515a4d27ebef08f71ff435f07e845194c9f0a
-EBUILD aspell-ca-2.1.5.1.ebuild 309 BLAKE2B bd7f3b2d1acc4546db9a34bf4df97b9f3f0ebb5d9ee8c0518377e823cd0398cc44f5eb90d6ede8de1a7456c6f31e27a263e047ea8a460f58aa93440092e6acf9 SHA512 2ef8511f8b2902ef072a23b98e009b4bf27663442ce4ad30822d7f493650a98eae10e81a10cf74cd8caa85f3e34c52893aa6fef1e0a245aa84f5ac663d4bba8e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
deleted file mode 100644
index b3e1044a9340..000000000000
--- a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Catalan"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-ca/metadata.xml b/app-dicts/aspell-ca/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-ca/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-cs-0.60.20040614 b/app-dicts/aspell-cs-0.60.20040614
new file mode 100644
index 000000000000..38da8f1357cf
--- /dev/null
+++ b/app-dicts/aspell-cs-0.60.20040614
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Czech language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/cs/aspell6-cs-20040614-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=4b8ed0f74bd4cc13657fe8ad5f1d8fa4
diff --git a/app-dicts/aspell-cs/Manifest b/app-dicts/aspell-cs/Manifest
deleted file mode 100644
index a8fde2e9183a..000000000000
--- a/app-dicts/aspell-cs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-cs-20040614-1.tar.bz2 451507 BLAKE2B 7a7c910fd52d15f9513e30db5ed6ed7116d92ce02c401d8f11222e64c1ca6aa332cab3152b3b27904bd59fb542e957517b52f2bae1878c17652a17f575d3e6bf SHA512 b4d3e46907a00c7de4d19766dc29f089ec119b736de1340ff5f56be9d0a1c8c90fa2b156173f312c13c589750ec7551e79bd7aa092d31fa6d5f05ed0b4b12c9a
-EBUILD aspell-cs-0.60.20040614.ebuild 414 BLAKE2B f9b454362eca4a6c228c6517b05e226fa001c09b2fd6f2f6b7c7df3ff041ddeed12dc956a47351e41df74e3b58e121d5539529bcba5a65a2010c0af90cad9891 SHA512 d66a4f283a5688825b28c2f5cc9111dac599701d86113c8c8b714833be36594f51e12c2cb4ff69770af9a2a74ce674ae51edd319d413159bda9f0e95fced4d7c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild b/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
deleted file mode 100644
index 8eb7d9e49ba6..000000000000
--- a/app-dicts/aspell-cs/aspell-cs-0.60.20040614.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Czech"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell6-cs-20040614-1"
-
-SRC_URI="mirror://gnu/aspell/dict/cs/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-cs/metadata.xml b/app-dicts/aspell-cs/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-cs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-cy-0.50.3 b/app-dicts/aspell-cy-0.50.3
new file mode 100644
index 000000000000..952c99c5c02c
--- /dev/null
+++ b/app-dicts/aspell-cy-0.50.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Welsh language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/cy/aspell-cy-0.50-3.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=f90b37cbe5abdd969aa666fd955fd4c5
diff --git a/app-dicts/aspell-cy/Manifest b/app-dicts/aspell-cy/Manifest
deleted file mode 100644
index 36242e75c5f6..000000000000
--- a/app-dicts/aspell-cy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-cy-0.50-3.tar.bz2 117652 BLAKE2B 68abfa88829f8574229bbe35626bc3c7df7789e063abe9c70c054212bbf159ae704f4a0204d63e362d49582c2300d0e2453d486c7bba039c8141f93232a38045 SHA512 feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b
-EBUILD aspell-cy-0.50.3.ebuild 290 BLAKE2B cf51fd22e71b300cab5369868814978999ea5a82fb435ba0c4931a49afe43e0ce4c945c42370c3706dd71d4894d10571a674829b6501753eda84dd9f4c2c8842 SHA512 7def922d1057f2dafc4274b3b47ee15fc94fd0ba7880a818348fbb876ea8dcdc0184149b946402fac6fba77e3f830f4c5dd1d461a05d4a78e4af19d902994e44
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
deleted file mode 100644
index b1de268550bd..000000000000
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Welsh"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-cy/metadata.xml b/app-dicts/aspell-cy/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-cy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-da-1.7.42 b/app-dicts/aspell-da-1.7.42
new file mode 100644
index 000000000000..054d84f2e3ba
--- /dev/null
+++ b/app-dicts/aspell-da-1.7.42
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Danish language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://da.speling.org
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=http://da.speling.org/filer/new_aspell-da-1.7.42.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=2e5d599d9eb434429456b97d61bda976
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
deleted file mode 100644
index 2159b74cbd6b..000000000000
--- a/app-dicts/aspell-da/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST new_aspell-da-1.7.42.tar.bz2 235483 BLAKE2B 0d5ac9c7457b460410734a36e376387d9aaa4444771dcafb85c80b0d2ca4441b906ef485d5016e9d51985147b9759c4677664c01dd9d68c340ba947efac0d932 SHA512 97d3bc95800d5115ce640a3939bf6c94998f1090f1484da3ffb1104318200ca3650d2b32120c36030b87b4b929b95b8f764f6f51dee66ee916700318f6b4e755
-EBUILD aspell-da-1.7.42.ebuild 417 BLAKE2B 0a5ee5e86d67b982c1374ec34e52aff700dbf95cf6017c7d3164f74dd0c9e65c8cd22a3a7ed84b09e450e2271181df7043e6cb3fc861518a584b98c9c65737a1 SHA512 4870e8906b5fd6fe83da96405b9497d1d9134158121c561f5d77755eb0806ff48904365f8deb458da70f4d11dcb348ae70a49d92c7c481605ee9bd85b6bbd6aa
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
deleted file mode 100644
index 6aa816b27d4c..000000000000
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Danish"
-
-inherit aspell-dict-r1
-
-HOMEPAGE="http://da.speling.org"
-SRC_URI="http://da.speling.org/filer/new_${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-IUSE=""
-
-S="${WORKDIR}/new_${P}"
diff --git a/app-dicts/aspell-da/metadata.xml b/app-dicts/aspell-da/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-da/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-de-0.60_pre20030222 b/app-dicts/aspell-de-0.60_pre20030222
new file mode 100644
index 000000000000..768fb5e36e9d
--- /dev/null
+++ b/app-dicts/aspell-de-0.60_pre20030222
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=German and Swiss-German language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=001310c1e656f497b74645701d1aa1f7
diff --git a/app-dicts/aspell-de-alt-2.1.1-r1 b/app-dicts/aspell-de-alt-2.1.1-r1
new file mode 100644
index 000000000000..a071457bc77c
--- /dev/null
+++ b/app-dicts/aspell-de-alt-2.1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=German (traditional orthography) language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/de-alt/aspell6-de-alt-2.1-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=3f439081ba9250aa5ddb6b1f0106ddff
diff --git a/app-dicts/aspell-de-alt/Manifest b/app-dicts/aspell-de-alt/Manifest
deleted file mode 100644
index 70dc19b64b3e..000000000000
--- a/app-dicts/aspell-de-alt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX aspell-de-alt-2.1.1-dict-name.patch 1843 BLAKE2B c465d3ff766ea3749011a7ea0a502284e1ba31112cb21149edbf7a909cc4e45bced0ee165649117038a1072cd7d5165d89f9ed17237fbf1ea0b4942a0e54bd45 SHA512 2ad6133fd907cfacb1d33dad879c0b101869b9ec67f33d3689052c5f25a35244fb98e19ea6105f5c8f000ef3412fcc567f1a242decf7eee0ff29784d22d040a0
-DIST aspell6-de-alt-2.1-1.tar.bz2 247116 BLAKE2B 45428b341fd7d2cdf098d6d85956b8e41794ad7a725cd7f3c703bcdb9995c6c18f89e78f06ddc14b7c570b21eea4d72e944ba293b2272d8c5d5a2a5447427327 SHA512 823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4
-EBUILD aspell-de-alt-2.1.1-r1.ebuild 475 BLAKE2B 5e72064aca9c30ae500d5e48d7d6266dd788c33ba48cb6f8a5149451af2ee75575aa878e521b6180618eacbcfc9a3561ff5709e17a2870ecac92d872da5353db SHA512 a158330a6b1485d727afbba689624fc60c73775fc8109795ca1cb5255f5e7c9ac232280065b5ff18c8e7a38b9647aa690ffcbc4c3fc796a9a9655eab0fb4077a
-MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
deleted file mode 100644
index af3af00fef72..000000000000
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="German (traditional orthography)"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-dict-name.patch" )
-
-src_install() {
- aspell-dict-r1_src_install
-
- newdoc doc/README README.hk
- dodoc doc/README.bj
-}
diff --git a/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch b/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch
deleted file mode 100644
index 103f19222dcb..000000000000
--- a/app-dicts/aspell-de-alt/files/aspell-de-alt-2.1.1-dict-name.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Aspell dictionaries should be named LANGUAGE[_REGION][-VARIETY][-SIZE],
-therefore this patch adds de-1901 and de_DE-1901 as such alias names.
-See also: http://www.iana.org/assignments/language-subtag-registry
-
---- a/Makefile.pre
-+++ b/Makefile.pre
-@@ -7,7 +7,8 @@
- data_files = de-alt.dat de-alt_phonet.dat de-alt_affix.dat
- doc_files = README COPYING Copyright
- extra_files = configure info Makefile.pre
--multi_files = de-alt.multi deutsch-alt.alias german-old.alias
-+multi_files = de-alt.multi deutsch-alt.alias german-old.alias \
-+ de-1901.alias de_DE-1901.alias
- rws_files = de-alt.rws
-
- distdir=aspell6-${lang}-${version}
---- a/README
-+++ b/README
-@@ -1,4 +1,4 @@
--GNU Aspell 0.60 German - Old Spelling (Deutsch - Alter Spelling) Dictionary Package
-+GNU Aspell 0.60 German - Old Spelling (Deutsch - alte Rechtschreibung) Dictionary Package
- Version 2.1-1
- 2004-11-03
- Original Word List By:
-@@ -46,7 +46,7 @@
- with "--lang=de-alt". You may also chose the dictionary directly
- with the "-d" or "--master" option of Aspell. You can chose from any of
- the following dictionaries:
-- de-alt (deutsch-alt german-old)
-+ de-alt (deutsch-alt german-old de-1901 de_DE-1901)
- Whereas the names in parentheses are alternate names for the
- dictionary preceding the parentheses.
-
---- a/de-1901.alias
-+++ b/de-1901.alias
-@@ -0,0 +1 @@
-+add de-alt.multi
---- a/de_DE-1901.alias
-+++ b/de_DE-1901.alias
-@@ -0,0 +1 @@
-+add de-alt.multi
---- a/info
-+++ b/info
-@@ -1,5 +1,5 @@
- name_english German - Old Spelling
--name_ascii Deutsch - Alter Spelling
-+name_ascii Deutsch - alte Rechtschreibung
- lang de-alt
- data-file de-alt_phonet.dat
- data-file de-alt_affix.dat
-@@ -13,7 +13,7 @@
- version 2.1-1
- accurate true
- complete true
--alias de-alt german-old deutsch-alt
-+alias de-alt german-old deutsch-alt de-1901 de_DE-1901
- dict:
- name de-alt
- add de-alt
diff --git a/app-dicts/aspell-de-alt/metadata.xml b/app-dicts/aspell-de-alt/metadata.xml
deleted file mode 100644
index c665e48637be..000000000000
--- a/app-dicts/aspell-de-alt/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>ulm@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/aspell-de/Manifest b/app-dicts/aspell-de/Manifest
deleted file mode 100644
index 9f2cdce6e772..000000000000
--- a/app-dicts/aspell-de/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-de-20030222-1.tar.bz2 274407 BLAKE2B ed69c0a3c1e63599d99a811b7b2d54c5dc4699f776d4c97fb5d295250df64e6189378c2bdadf8ce1b38a5a49046020b220e528ae69f20be01af5f771dba3bc37 SHA512 2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6
-EBUILD aspell-de-0.60_pre20030222.ebuild 476 BLAKE2B 58799495658273c127f70cdc2015c2525341134670b61251cdcb097f53ea93a05f1a08ba0cdc0ce52eff1dc7de79cc91035a75152ea4847ee0221414f1a6a469 SHA512 07d9345b2aa8bfb22b51e3ccb23bb7079cb8c4f839099a248400d6bd4cda2ec54fc68a429542d79d10cc10e5af7769e575312e7449d3bf0e215ed8ab6b032967
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
deleted file mode 100644
index 626832fa9e79..000000000000
--- a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="German and Swiss-German"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P=aspell6-de-20030222-1
-
-SRC_URI="mirror://gnu/aspell/dict/de/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-de/metadata.xml b/app-dicts/aspell-de/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-de/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-el-0.50.3 b/app-dicts/aspell-el-0.50.3
new file mode 100644
index 000000000000..8d10a82c9428
--- /dev/null
+++ b/app-dicts/aspell-el-0.50.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Greek language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/el/aspell-el-0.50-3.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=ff018c50793a083669f9a1541684bd90
diff --git a/app-dicts/aspell-el/Manifest b/app-dicts/aspell-el/Manifest
deleted file mode 100644
index edb83d15dde5..000000000000
--- a/app-dicts/aspell-el/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-el-0.50-3.tar.bz2 328225 BLAKE2B c032ad4c549cd2ff4d3dbc2cd142f6405d339bccb4040034ca225203666da8eb7c9b153a9ee58472dba6c3de5dd9e10dc338c4e46fa27e7cae3225ea8bc0b79c SHA512 405a21dc3e6ad04ea7a6b3ff69fb77382cc8f20b95e9c1788ec77a38ad1d4eafabc3a5e996a68cd5a2a385927244a2cf81cc5dcc68a1c7d42fc31a95d9068cfc
-EBUILD aspell-el-0.50.3.ebuild 290 BLAKE2B 0ed26327b5217240facecd767147202f30d2487b410710c12e888ad0655ae7893cc8532b5b4c6a275df60c966e3a4cf68f162b658a442e83e98a626fdcf0a3f9 SHA512 40ba45908aaf2cc50ce8df5a04e95c35a1f844f8b5d36bf83583852615e7ac351f991dec499de2f625dd7a947f5b9008f91dd159ffc28dbbb6fbd65918b785b7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
deleted file mode 100644
index b6763f48f91b..000000000000
--- a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Greek"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-el/metadata.xml b/app-dicts/aspell-el/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-el/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-en-2016.11.20.0 b/app-dicts/aspell-en-2016.11.20.0
new file mode 100644
index 000000000000..6d4759fdee47
--- /dev/null
+++ b/app-dicts/aspell-en-2016.11.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2016.11.20-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503 estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9bea218bcc35a2db90d4d38e6c50401f
diff --git a/app-dicts/aspell-en-2017.01.22.0 b/app-dicts/aspell-en-2017.01.22.0
new file mode 100644
index 000000000000..fb9778434d65
--- /dev/null
+++ b/app-dicts/aspell-en-2017.01.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=English (US, British, Canadian) language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=myspell-en_CA-KevinAtkinson public-domain Princeton Ispell
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/en/aspell6-en-2017.01.22-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503 estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0007b682944de1a78a0b15f6548849f9
diff --git a/app-dicts/aspell-en/Manifest b/app-dicts/aspell-en/Manifest
deleted file mode 100644
index d86457c27261..000000000000
--- a/app-dicts/aspell-en/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST aspell6-en-2016.11.20-0.tar.bz2 184650 BLAKE2B 2ece9532bb14243a1470048a16f29df2e90fa6f9399c9c66831f7f4a743be8d6c257a3cd36e5b506ccf8968f03cdd0dd785302e135007e9dd23f8c58767f1d39 SHA512 acf4c0bac9dba5b001481da159768ee65decea480c6c601ca0733091558406a84a7d8efb47c1806b032d8e22e96927787a29f8e4e93563a01361e4cfaf3a3519
-DIST aspell6-en-2017.01.22-0.tar.bz2 184409 BLAKE2B 8a2e214996f412943581a2ac31c315e585ba234484b44d7563b27338dfbbc2947d19854fcb5417736a1c32b7fd8d6b033efc86d2a6dd81256218a72df09eab86 SHA512 2721ffdc7f2823b9104a0d7cfa10d1ba9581432dcbb2584b9519e56a621520177eef55ea5bf9803503c429201141ce0ed4001e75c6b9385bca2fbf8986617a66
-EBUILD aspell-en-2016.11.20.0.ebuild 618 BLAKE2B b92d6905d092d844450bd5bda9a6c7677a80d234035c2883a9e93d0c4f201b39f7e4b526bb252f098cce4d0759c19caaa1210a56b210020feb95aae9623ef2c3 SHA512 ff683fd05294622b8999eeec2524f64c2ca070ce501426e08fe1b1d5ad508bdcbcb9a86d722eafa8383b8c7e121a81b2f95a4bdcffe06d18ccaf8f380139a9a0
-EBUILD aspell-en-2017.01.22.0.ebuild 628 BLAKE2B f3fd0e118d12fd561ebb8aa9380f95106a5db2a5b67ded343c390e7dc97553cc9e0bf9449168e80bc1ef5192e412655677e6f4496af47b6a8a8d3677f9af8512 SHA512 1acc4bbb00700bcf2e555e742c419caface629647409263782f9ee0669499bca3822fa3913fea935998bf2f2df74bcda6d2cb38efe3b07669cce197c5b215836
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild b/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
deleted file mode 100644
index 766666647da7..000000000000
--- a/app-dicts/aspell-en/aspell-en-2016.11.20.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="English (US, British, Canadian)"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1 versionator
-
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
-
-LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild b/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
deleted file mode 100644
index c97317a58443..000000000000
--- a/app-dicts/aspell-en/aspell-en-2017.01.22.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="English (US, British, Canadian)"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1 versionator
-
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(replace_version_separator 3 '-').tar.bz2"
-
-LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/aspell-en/metadata.xml b/app-dicts/aspell-en/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-en/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-eo-2.1.20000225.2 b/app-dicts/aspell-eo-2.1.20000225.2
new file mode 100644
index 000000000000..556fbfe191d8
--- /dev/null
+++ b/app-dicts/aspell-eo-2.1.20000225.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Esperanto language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=fbdf1d3af19a6cebe1836c82b976f73f
diff --git a/app-dicts/aspell-eo/Manifest b/app-dicts/aspell-eo/Manifest
deleted file mode 100644
index 3c7045db0230..000000000000
--- a/app-dicts/aspell-eo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-eo-2.1.20000225a-2.tar.bz2 71591 BLAKE2B 3e8624857ae9c7a1256849dfe65a2b5a9de396516973b3e00075d5bdc507598b414ad745df41e2f8b746aeb43d0296186dd1b8163af84a0bb709ac5a2847cab9 SHA512 172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda
-EBUILD aspell-eo-2.1.20000225.2.ebuild 475 BLAKE2B 6f6eb78a9e4a0d4b0dd99bc632043fa3458262b1307bb59efab993094c141584f82d612d2e5be441345191577d68b15b3be40679a9457f62dc8066139727093b SHA512 831a315e96a20091cc07dd341160db067865f62d4c8528e31517ae303eb7ad2e85720809e57352a81b13cf9627327a17c5dae507847a009fe7cc045b2a88b159
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
deleted file mode 100644
index b4d83f953113..000000000000
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Esperanto"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P=${P%.*}a-${PV##*.}
-MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
-
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-eo/metadata.xml b/app-dicts/aspell-eo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-eo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-es-1.9a b/app-dicts/aspell-es-1.9a
new file mode 100644
index 000000000000..712b411bffe3
--- /dev/null
+++ b/app-dicts/aspell-es-1.9a
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Spanish language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/es/aspell6-es-1.9a-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=d7776e4484c3347c0eb3a843cca62f75
diff --git a/app-dicts/aspell-es/Manifest b/app-dicts/aspell-es/Manifest
deleted file mode 100644
index eadeb1fa48e2..000000000000
--- a/app-dicts/aspell-es/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-es-1.9a-1.tar.bz2 132542 BLAKE2B df33c5c38633573b1616c480c2df4b53bd1b6afc6d749f558c22d56482df9977cc5aa366a0e9a7b5b1bdfc12b92bf4e38957e23b3bf8dca38b0dfe00824ff365 SHA512 7ea228104231a4af395787da41eb14f27b6b864f1512c9ccb72b5f19b4327a0e4ccc37fdc31085b33da83a0b3b45bfe608f0a1361da8297dff2bcd96096f4c06
-EBUILD aspell-es-1.9a.ebuild 432 BLAKE2B 27a68be2a7669a73a58845728a48bed6912e9478840cbfa1b8855a3231a25515a3e4672df5f7092a4e94169c504261cd3fb0f55e26ec86bdad38b425dcc81c55 SHA512 e5cfd21d6da9b2dcd1f8f00baf31caeaaa05c48ec5b1045c903aff98459b990d62b603108332dc8aea0a82f01096e218ec7e46168a95909c80b17f31121d4806
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-es/aspell-es-1.9a.ebuild b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
deleted file mode 100644
index d8ae5c99c2ff..000000000000
--- a/app-dicts/aspell-es/aspell-es-1.9a.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Spanish"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="${P/aspell/aspell6}-1"
-
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/metadata.xml b/app-dicts/aspell-es/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-es/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-et-0.1.21.1 b/app-dicts/aspell-et-0.1.21.1
new file mode 100644
index 000000000000..4119ad7254aa
--- /dev/null
+++ b/app-dicts/aspell-et-0.1.21.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Estonian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/et/aspell6-et-0.1.21-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=931a81866652992fadf9d0cd3f305583
diff --git a/app-dicts/aspell-et/Manifest b/app-dicts/aspell-et/Manifest
deleted file mode 100644
index 39edc223ebc5..000000000000
--- a/app-dicts/aspell-et/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-et-0.1.21-1.tar.bz2 338155 BLAKE2B fb6c1ebe5d63d88d85935675c6f78ae8dc55cc4e0dda2f18370813049042fdd356343b8d98faebe788732c1ae199b851afcfea30e8734e3167bb00579ec08551 SHA512 b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae
-EBUILD aspell-et-0.1.21.1.ebuild 310 BLAKE2B ff4172ccacd777212d711e7f9cca1722dcaf19265a15a0d6c107182d9c58171a4805c679509a8fff98b7df0d9736887c3d2e547e92701d4ccee80e0b2da0a01a SHA512 568d302ba4b1b86b0ae6a2e6aaa03e577f7acfe92923287aecc38781dbd744b56f25f15ec691fd9aacbd594460e9fcfa128beeb22f53ec29fc690625185eb0c7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
deleted file mode 100644
index fd36d838091a..000000000000
--- a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Estonian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-et/metadata.xml b/app-dicts/aspell-et/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-et/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-fi-0.7.0 b/app-dicts/aspell-fi-0.7.0
new file mode 100644
index 000000000000..4dae0f47433e
--- /dev/null
+++ b/app-dicts/aspell-fi-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Finnish language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fi/aspell6-fi-0.7-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=a7e5e585110453364c0ebeca0f340f35
diff --git a/app-dicts/aspell-fi/Manifest b/app-dicts/aspell-fi/Manifest
deleted file mode 100644
index bdbbefd6eec4..000000000000
--- a/app-dicts/aspell-fi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-fi-0.7-0.tar.bz2 209249 BLAKE2B 89b5e385f618a1aabbe0b3e688bd21cad1d15ff9945f61048d72a8d59dbe7551c6314de16dc34249370432459483b7badeae606dc48380d345aa977136c0a4ab SHA512 d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7
-EBUILD aspell-fi-0.7.0.ebuild 309 BLAKE2B 48b75454aaf532d1305f85c25a27b1b51fcebd4569b66d298f6c1bca72a9ff0d471b05b80133a97468fe69bf090d54806092501a1b61d5b2c561d432f4f1ecd7 SHA512 b300e2142dd67bca5176967b294a7adfc9104207d9f283e72b444c8261d0f568f1b5f54bb72eec835f7e7963f594cd086171a302d96d9bc4b9b219d235caa425
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
deleted file mode 100644
index c75b86e7294e..000000000000
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Finnish"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-fi/metadata.xml b/app-dicts/aspell-fi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-fi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-fo-0.51.0 b/app-dicts/aspell-fo-0.51.0
new file mode 100644
index 000000000000..cbcdd46ef245
--- /dev/null
+++ b/app-dicts/aspell-fo-0.51.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Faroese language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fo/aspell-fo-0.51-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=ebece09b775e4bc137d1849fa0c13a4a
diff --git a/app-dicts/aspell-fo/Manifest b/app-dicts/aspell-fo/Manifest
deleted file mode 100644
index 545abca699ef..000000000000
--- a/app-dicts/aspell-fo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-fo-0.51-0.tar.bz2 161169 BLAKE2B 2d607954fdd15c07c425b6d53bd10e0226193f45fcadf56b4eba1cea81bfb569519e71295a54058164eb8762fb5e9db8846410a01b009278393e78ee94081fe7 SHA512 8177e302816f0ddf05653656d07489be02dd5d12eb178f5e627034030f38e9b612f41a49fe4a1c092bfc3d6edc4dfcb0ec8326005251a3b36f80e1ca234d4c28
-EBUILD aspell-fo-0.51.0.ebuild 292 BLAKE2B 46930b0ed932dd10c56232bc2435a48184858a98c9778d4d23937c13bd7ed676803f2c77e81cfd4de664f8f5722ff3dbcfcee8efeca87f94ee943a7f2cac0890 SHA512 839daa8af7b744cded3fe099f5f4252015abdc391dd7462f094e4c0641760e10b32a3c95b79eaf59a38f7e002a7a20f5529313b83975c2e84e743407d8bedcf6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
deleted file mode 100644
index 8ff848bd2ce1..000000000000
--- a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Faroese"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-fo/metadata.xml b/app-dicts/aspell-fo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-fo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-fr-0.60 b/app-dicts/aspell-fr-0.60
new file mode 100644
index 000000000000..65d5f51adc55
--- /dev/null
+++ b/app-dicts/aspell-fr-0.60
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=French language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=c8eff0733f54f86ab50a4634f5b883fa
diff --git a/app-dicts/aspell-fr/Manifest b/app-dicts/aspell-fr/Manifest
deleted file mode 100644
index 5036607ed8f1..000000000000
--- a/app-dicts/aspell-fr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-fr-0.50-3.tar.bz2 283086 BLAKE2B 674199a56d676ab65c414741e669b099a0f08f2010f3981caf30daff6726e516586aa771190eebf83570093c28a8732761a9166f587a933860a037f1dd561e0e SHA512 bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b
-EBUILD aspell-fr-0.60.ebuild 553 BLAKE2B 1470cb73cc191bc21082b64cef8cd570e6bdd7163c11d74e549e66a13adabb43970188cebc6fda60cdea58043fa306f07a8c452a4734ddf8e00231fb3ed61ed6 SHA512 a3854a09e71fd00f8820bedd3d78df21ff7eb8ce4f0d17cb0b1ef4823a9313d1a0f3fbd0f8887910cee02c756a8f12877941bf1f1350de02eb53c1b35188b3e0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild b/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
deleted file mode 100644
index 93b3cd25bcec..000000000000
--- a/app-dicts/aspell-fr/aspell-fr-0.60.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="French"
-ASPELL_VERSION=6
-
-# This is a hack to allow for using the French 0.50 dictionary until I have
-# the time to do this properly. Do not stabilise this.
-
-inherit aspell-dict-r1
-
-MY_P="aspell-fr-0.50-3"
-
-SRC_URI="mirror://gnu/aspell/dict/fr/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-fr/metadata.xml b/app-dicts/aspell-fr/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-fr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-ga-0.50.4 b/app-dicts/aspell-ga-0.50.4
new file mode 100644
index 000000000000..a5db8b377fe0
--- /dev/null
+++ b/app-dicts/aspell-ga-0.50.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Irish language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ga/aspell-ga-0.50-4.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=48bc1b2ca2d14717324347a19f77e10e
diff --git a/app-dicts/aspell-ga/Manifest b/app-dicts/aspell-ga/Manifest
deleted file mode 100644
index 4eb40d0195ca..000000000000
--- a/app-dicts/aspell-ga/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-ga-0.50-4.tar.bz2 394776 BLAKE2B d065dff80c1405d48e39d22e7f8ca789a264763b1caa978a1dfa568b7d5d4c2382bbf5e1cf3626905a9c1bda37bb9389868fc944027eaad4e47b31a452668fef SHA512 631d4e8a6088633be3863e04818b576af861bfbdb90b1641f792c74ca1f61a7d71b1167ae5585245767d628a44e215c2804dd4c2b050c279ee892810203fae0a
-EBUILD aspell-ga-0.50.4.ebuild 290 BLAKE2B c9f7558915ee4bf4c8c7231829930057c3a008d647209a84d7620599740d64d89c2ca6c39a67417752507f8badc9655e8f7421d7c8d141c5b0f2526e14680c54 SHA512 992b5937e10c41df38012629fa50eba60998103e23252ed983c9bb5e2fb7b44344501668a9846d20a3000ffac771b455ee0a1b16b25295f14ef697ffb64c6ac0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
deleted file mode 100644
index 35256b300ec3..000000000000
--- a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Irish"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-ga/metadata.xml b/app-dicts/aspell-ga/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-ga/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-gl-0.5.2 b/app-dicts/aspell-gl-0.5.2
new file mode 100644
index 000000000000..7e133a769b4c
--- /dev/null
+++ b/app-dicts/aspell-gl-0.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Galician language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/gl/aspell6-gl-0.5a-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=cd03e0080516dfce4178a3b6c65e3fc3
diff --git a/app-dicts/aspell-gl/Manifest b/app-dicts/aspell-gl/Manifest
deleted file mode 100644
index 3473edd7f3f8..000000000000
--- a/app-dicts/aspell-gl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-gl-0.5a-2.tar.bz2 80043 BLAKE2B 9c2c4601695e5fa5b64d0047e942f797bd37e2c2245421cb3a236a52fd64ba3524e1131c6e0e1deca777cb793d03e786ad4ad8804eadafe3bc17adf779f4b074 SHA512 9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714
-EBUILD aspell-gl-0.5.2.ebuild 474 BLAKE2B f4de1ae2557922afb1695e17d75189fa9079b775505de16a92ed65dbb530c914ab5529e44d64d35c3244ff014cbf12bafe2f280485e8cfdc11a4b5531cc2e819 SHA512 a1ac16270f69b8710e13b16d8bfd0ecd10cc801e123e77cb4c59ace87f13feadb1436af2f587646f95bce0fd77c562482a9e18bb66988d7fd9e4ef442fb9eb11
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
deleted file mode 100644
index b7e89a02bb88..000000000000
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Galician"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P=${P%.*}a-${PV##*.}
-MY_P=aspell${ASPELL_VERSION}-${MY_P/aspell-/}
-
-SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-gl/metadata.xml b/app-dicts/aspell-gl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-gl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-he-1.0.0 b/app-dicts/aspell-he-1.0.0
new file mode 100644
index 000000000000..2f9332a678e3
--- /dev/null
+++ b/app-dicts/aspell-he-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Hebrew language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/he/aspell6-he-1.0-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=82a80924ffc4193e70323db0151225a4
diff --git a/app-dicts/aspell-he/Manifest b/app-dicts/aspell-he/Manifest
deleted file mode 100644
index 689575586623..000000000000
--- a/app-dicts/aspell-he/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-he-1.0-0.tar.bz2 122781 BLAKE2B 24df4f12d3dda89e6654bccdfb4290baa883ea21f761046129a4baede917f2861b829dff93349b9ab441b5c2ef556702a0ebfcdf682a8e7ab00c746e2f9d9e1f SHA512 4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88
-EBUILD aspell-he-1.0.0.ebuild 308 BLAKE2B ce7d78f664a9389605b6cd030ca1f7739afd0dc86fd44f16f7173606bddf0f01fea21be96350df680fa1868d3746b740ee57411a806fe8411efc9777e1ddbc46 SHA512 1b6b0189a27e644831ef575d96a6fab818d1c7e6b5a81d5ed7bb907aebb19fe0b905e7a37700b5056af13f46269727fe0a7b8316ee69a3284ce149d02c7c3e85
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
deleted file mode 100644
index fb0da0d1207b..000000000000
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Hebrew"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-he/metadata.xml b/app-dicts/aspell-he/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-he/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-hr-0.51.0 b/app-dicts/aspell-hr-0.51.0
new file mode 100644
index 000000000000..f089e3de84f1
--- /dev/null
+++ b/app-dicts/aspell-hr-0.51.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Croatian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hr/aspell-hr-0.51-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=e16e9dc2def41612d17bb601d892139e
diff --git a/app-dicts/aspell-hr/Manifest b/app-dicts/aspell-hr/Manifest
deleted file mode 100644
index acbe8c8c47e6..000000000000
--- a/app-dicts/aspell-hr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-hr-0.51-0.tar.bz2 208118 BLAKE2B 34328a99833dbbdb1e14e5d66c3870a576fd137d38711fbc1c57738057433d1eb7a996dd32ae87942d8bf1c3efd4dbf669d4d5ddc83764caecb8ce36fc2afd3f SHA512 d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad
-EBUILD aspell-hr-0.51.0.ebuild 293 BLAKE2B 94c09ba89134004d6983966d5027412985e255055b68ab4f6ee0dd05751ba6d39a1b2194669eb8b882a292cfaf90d2ab8248f361b4face1b4bc631b1c7a80876 SHA512 c6f7ebd2f9d6118484eedccce1d8ef3c67fe26af794c352cc62ddaa03bfd0f5cd34fbe6b5c380fa861b3d20295166c29cb4fe17eb1cce01cac3f5f1c1c2200ef
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
deleted file mode 100644
index cf9a479afa52..000000000000
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Croatian"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-hr/metadata.xml b/app-dicts/aspell-hr/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-hr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-hu-0.99.4.2 b/app-dicts/aspell-hu-0.99.4.2
new file mode 100644
index 000000000000..8bfd14a3271a
--- /dev/null
+++ b/app-dicts/aspell-hu-0.99.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Hungarian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hu/aspell6-hu-0.99.4.2-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=91e9fb9b69548eb355046cd3c9aea69c
diff --git a/app-dicts/aspell-hu/Manifest b/app-dicts/aspell-hu/Manifest
deleted file mode 100644
index 348cfc9350b3..000000000000
--- a/app-dicts/aspell-hu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-hu-0.99.4.2-0.tar.bz2 375949 BLAKE2B 933844253b8280d01e4f37f141e566548b3eecfdb16a2fcfeb026698d64667faedeae512d582b7ceb900753c5e2b1fba6b474bb4d85e598c432d0ac0010a9d31 SHA512 95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320
-EBUILD aspell-hu-0.99.4.2.ebuild 418 BLAKE2B 8c3dce6b682509d52b74e7a502c5d4b961bca1e9d2c20e5c8e73cdd4633db9d2f86667096ae097a3e6a8735d1831311dcac6a46f58736fa9e22ba4829cce482f SHA512 02a34f1699a8f7d2ee465651dcc517b4b58b1e066eea13061acddebc0b33d43b0325b74565b734002cbc494db80bce11b6ae8ab56882e40b8dae53f739c3f309
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
deleted file mode 100644
index 2149a4ff7785..000000000000
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Hungarian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell6-hu-0.99.4.2-0"
-
-SRC_URI="mirror://gnu/aspell/dict/hu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-hu/metadata.xml b/app-dicts/aspell-hu/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-hu/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-hy-0.10.0 b/app-dicts/aspell-hy-0.10.0
new file mode 100644
index 000000000000..65e2683e9d69
--- /dev/null
+++ b/app-dicts/aspell-hy-0.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Armenian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/hy/aspell6-hy-0.10.0-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=122c2035c07a5d2bce3454ea10f809fd
diff --git a/app-dicts/aspell-hy/Manifest b/app-dicts/aspell-hy/Manifest
deleted file mode 100644
index 48768082053a..000000000000
--- a/app-dicts/aspell-hy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-hy-0.10.0-0.tar.bz2 191872 BLAKE2B bb74a82446b35a487bf61c27349e9c8c047bf9f9e12cb48b884b7aeb19eee4df7c7e4efb86292338540ae23d4081caf88b63409f06617e6a6da82e9bf7648957 SHA512 b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3
-EBUILD aspell-hy-0.10.0.ebuild 413 BLAKE2B 8498c907e8d75c59e744c85cca87fe690127bd1fd6ce2b11fa8f9c145941793234df7bbc17e79b92bc2076f512d32d82c247f545beb093a865298e9f92632c52 SHA512 ffc3cb5c5ed74cd8a36b2557a860d00a5d12ec4bee4b2dac0085866ae91869f203e60358c81f8f581f8249b2289995c2547b974d3c2810bee7bf611b01d2fafe
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
deleted file mode 100644
index 92865ec5448f..000000000000
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Armenian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P=aspell6-hy-0.10.0-0
-
-SRC_URI="mirror://gnu/aspell/dict/hy/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-hy/metadata.xml b/app-dicts/aspell-hy/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-hy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-is-0.51.1.0 b/app-dicts/aspell-is-0.51.1.0
new file mode 100644
index 000000000000..3af8a8295793
--- /dev/null
+++ b/app-dicts/aspell-is-0.51.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Icelandic language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/is/aspell-is-0.51.1-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=8e6aaec30b5b9eff8a45208e7bffb131
diff --git a/app-dicts/aspell-is/Manifest b/app-dicts/aspell-is/Manifest
deleted file mode 100644
index df15051b120f..000000000000
--- a/app-dicts/aspell-is/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-is-0.51.1-0.tar.bz2 323850 BLAKE2B d3d15c594380ae173f94862eedaee8255a0d98f5e6552ea24fffbf0400d88a858d6d9eb56b35a314b3ae9440929eb525c41ea57f99c43dff0032da68ab8ebf95 SHA512 b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2
-EBUILD aspell-is-0.51.1.0.ebuild 294 BLAKE2B 695a84df5ede4f87d30f3769de003229a4cb0d807b498730d1a5efbc4f721360f305066dc8279d62fa0831b468a538ffca6a4ba22f29db28275a23a28a83e2f3 SHA512 1404973d9e71da03a519060417fb84ca01fcca4b6ffed516f86221a64ddeb2e695f3f382daaeaae42372ee3b357db62e3eb75b3e0ebbdce527ea3bc29d949314
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
deleted file mode 100644
index 53f77a4fafc2..000000000000
--- a/app-dicts/aspell-is/aspell-is-0.51.1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Icelandic"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-is/metadata.xml b/app-dicts/aspell-is/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-is/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-it-2.4.20070901 b/app-dicts/aspell-it-2.4.20070901
new file mode 100644
index 000000000000..6ec1be213072
--- /dev/null
+++ b/app-dicts/aspell-it-2.4.20070901
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Italian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://sourceforge/linguistico/aspell6-it-2.4-20070901-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=15a8251f0a8d32e6b384382fcd77e3c6
diff --git a/app-dicts/aspell-it/Manifest b/app-dicts/aspell-it/Manifest
deleted file mode 100644
index c25b8d2f8e86..000000000000
--- a/app-dicts/aspell-it/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-it-2.4-20070901-0.tar.bz2 261419 BLAKE2B d377690df133647c8345eed4178d91c03a2a6813f444833ae5c78a0960577fa2d8d259a5b04e053770e2df832260ae817c387ddd814593fe2e6ddf5f95eb50a1 SHA512 6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9
-EBUILD aspell-it-2.4.20070901.ebuild 458 BLAKE2B 04eeab71978bc44c620329f201bdc91f42ab2528ace9aac693b7d2f45f552f44dd47fe71fb210513191b50c82f39a58c1cc14c111c2763264fe04a7180ae6216 SHA512 4912a3406bf271331a58dabbff738e0f955f7b84ae06cc84bfb4ca83085d2994e785239bd7ac71057868fe9d3d2beb74405f9de674822e9f4e9d02a3fca4651e
-MISC metadata.xml 248 BLAKE2B 2c1fcd90482f1cfffb25b908862709cebdefed604a40a5611ebd3e8831829c1b07aab4911cb5962aa9bc0587832d8a01ed43558a6fad30feed29b9ae0ff97161 SHA512 1d44fa5baaf032845df65374a83f1eb1459100ced59d260a19456fff81ce7dc1c074cd34b1ad37b172af7cdee476fe0de39aa3a280e311816dd8bdd9c98a61ad
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
deleted file mode 100644
index 1a237ac5f188..000000000000
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Italian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell${ASPELL_VERSION}-${PN#aspell-}-${PV%.*}-${PV##*.}-0"
-
-SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-it/metadata.xml b/app-dicts/aspell-it/metadata.xml
deleted file mode 100644
index 3338c5556542..000000000000
--- a/app-dicts/aspell-it/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">linguistico</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/aspell-la-6.0.20020503.0 b/app-dicts/aspell-la-6.0.20020503.0
new file mode 100644
index 000000000000..c98a5f497f11
--- /dev/null
+++ b/app-dicts/aspell-la-6.0.20020503.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Latin language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=e27036be8f4648386ed645c56cd3f64a
diff --git a/app-dicts/aspell-la/Manifest b/app-dicts/aspell-la/Manifest
deleted file mode 100644
index 54d5d523260c..000000000000
--- a/app-dicts/aspell-la/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-la-20020503-0.tar.bz2 42722 BLAKE2B 344e4cbf586e93894be20dff7ba44f79d775abe27b3ae3624fbdbc0d4f22c916b6e518bfd0c1d37d69e09d8b9acc50a32622013ecbda5d7ca2ebaadc07358ee6 SHA512 b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f
-EBUILD aspell-la-6.0.20020503.0.ebuild 414 BLAKE2B 12905549f32785884806377c67a024c6f7a2f99e525b97c7ad5432d0b7c0bc7555d348dac9c10c4761d184351e2a17a5507cc04525d5adf8f74bf39e587ecd84 SHA512 6c27c91793406f94bf14dc116f3234066a66236d87b97656b8dab798055d1a5abc822f6f90410faac66d7b8cd95bd5b3b8c5845799a4fa03c72826dea7accfbc
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
deleted file mode 100644
index bc0d0a95a3f6..000000000000
--- a/app-dicts/aspell-la/aspell-la-6.0.20020503.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Latin"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell6-la-20020503-0"
-
-SRC_URI="mirror://gnu/aspell/dict/la/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-la/metadata.xml b/app-dicts/aspell-la/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-la/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-lt-1.0.1 b/app-dicts/aspell-lt-1.0.1
new file mode 100644
index 000000000000..60a703a8d281
--- /dev/null
+++ b/app-dicts/aspell-lt-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Lithuanian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/lt/aspell6-lt-1.0-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=79556e3ee929bdc989f70a2b3c72521d
diff --git a/app-dicts/aspell-lt/Manifest b/app-dicts/aspell-lt/Manifest
deleted file mode 100644
index afbde113ce95..000000000000
--- a/app-dicts/aspell-lt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-lt-1.0-1.tar.bz2 155409 BLAKE2B 5beb2cad8c018dcb5b06701ec467464ea2b472c9cebaba966c0c495899de11c0b1fac29cf3d359cc1b8bf85fc890172dcd476206ac7b5b6eec99a619055ad34f SHA512 478acf95f4a7f7a705ddf481650a35f565b200886eb6b42bfcaa4669021b43a99e1f06ca3459d60afbf4cc0b3d111e9394308bc1fc6ec2ac920c9e7aa7f42b31
-EBUILD aspell-lt-1.0.1.ebuild 416 BLAKE2B 7728def977a62eab3b42599a911d2c5db590e26e797c4b99fd6e81a052040c82f65057fa2563972f9a8e03b46620041da08ad6ce039fd4cf1d2fe8eaebe4d1b6 SHA512 38918a2fb3e25e1a0fdfce8bfb8a35afebb180df4b075afcd5bc79a66b22f69643df08377de01e6044ab194dade395b67b95b12ee832533addcb73044ee5b52c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
deleted file mode 100644
index 8f1afd00dd33..000000000000
--- a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Lithuanian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell6-lt-1.0-1"
-
-SRC_URI="mirror://gnu/aspell/dict/lt/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-lt/metadata.xml b/app-dicts/aspell-lt/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-lt/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-nl-0.50.2 b/app-dicts/aspell-nl-0.50.2
new file mode 100644
index 000000000000..a13bb7b9d65a
--- /dev/null
+++ b/app-dicts/aspell-nl-0.50.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Dutch language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=freedist
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=b414b48b0e8fdb0cf3d46a37ff9a055f
diff --git a/app-dicts/aspell-nl/Manifest b/app-dicts/aspell-nl/Manifest
deleted file mode 100644
index 01bd2f053334..000000000000
--- a/app-dicts/aspell-nl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-nl-0.50-2.tar.bz2 428365 BLAKE2B 91bd81eb0925994961c8f11b28b74a87ec4dd4d0b03db4f6e4510329f3da9db7d50b93398f3bfbca0a33b67e8ba3871ff868562bc95028b40d8efcae2d995e99 SHA512 bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152
-EBUILD aspell-nl-0.50.2.ebuild 354 BLAKE2B 73b76d79ffb53e561b03f6a59037722d52311ea2ffc412f21b05b08ee1d35236914ba1f05f638fafbbbe7af99fe9b98f41cce0980e5d52792524a6da220f6307 SHA512 bf6ba85aafe3d430f2094e12390be1854da48f4f225fb3d94b1e50d805063139f2293c050e79cd26c8ce13470226314150ea7ce07f04b3ced533f6a6de55affa
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
deleted file mode 100644
index d21a77ed3ede..000000000000
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Dutch"
-
-inherit aspell-dict-r1
-
-LICENSE="freedist"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
diff --git a/app-dicts/aspell-nl/metadata.xml b/app-dicts/aspell-nl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-nl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-no-0.50.2 b/app-dicts/aspell-no-0.50.2
new file mode 100644
index 000000000000..04915eddfd8d
--- /dev/null
+++ b/app-dicts/aspell-no-0.50.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Norwegian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/no/aspell-no-0.50-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=2305be1275cf78b04327c446fb848994
diff --git a/app-dicts/aspell-no/Manifest b/app-dicts/aspell-no/Manifest
deleted file mode 100644
index 5a626f643d90..000000000000
--- a/app-dicts/aspell-no/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-no-0.50-2.tar.bz2 286696 BLAKE2B f5719a12cc3f139c53cd7cc5a9a0ca6841ed12e4ed3c5c000100c7b196dc896c1bf5c5514224f9fa5cf269f65e88e9858b9348db888b77661e51bf6c0e5b35c6 SHA512 b07bf649ffce60a5dfa1e771fa0669d246afcc192155be027ad4db7eaba8e5ebce4456d83cec2100020938cda87d5e194c68039df9d4fa726013de4b6d5f5e4a
-EBUILD aspell-no-0.50.2.ebuild 294 BLAKE2B 987fdacf19918c033af2673590101e6202e0bf2ca6343e0b54ffff0ea3a5da8c1861a70db20e5504e9675500757ed898c218892d3b604101047941c8b8a6197c SHA512 d60ea59a30b128fae95455bfb106aae6ec5cde6b3b874fa944a3bf098f3346beaedfd81a1cf0a3dfc6401e49cc6b634379bbf56851c9c0c301c4d5f684736e8a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
deleted file mode 100644
index 70d6161e8609..000000000000
--- a/app-dicts/aspell-no/aspell-no-0.50.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Norwegian"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-no/metadata.xml b/app-dicts/aspell-no/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-no/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-pl-6.0.20120418.0 b/app-dicts/aspell-pl-6.0.20120418.0
new file mode 100644
index 000000000000..25088ae0e690
--- /dev/null
+++ b/app-dicts/aspell-pl-6.0.20120418.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Polish language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://www.sjp.pl/slownik/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=http://www.sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20120418-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503 estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2d6bced39d16e4d0262536fd8c74d208
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
deleted file mode 100644
index 77c0bdabdb67..000000000000
--- a/app-dicts/aspell-pl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sjp-aspell6-pl-6.0_20120418-0.tar.bz2 579320 BLAKE2B d338a7b6cc804604e80cab20cf3b6c6d219377a7c4de4d513626e6b787b8aa32e4ab2a7925ea9bc1d0b224fc6770755e3c6ef3440a34c8adb187352b7e106c06 SHA512 58f6734d035f0b4831a7de48f4f0dc2394206e287cdefec95849a8a46f3bf2303f81228f24b52ace0a4f444cad2f354b30bb3598f3ff1930c17a4d54d808fe9e
-EBUILD aspell-pl-6.0.20120418.0.ebuild 538 BLAKE2B 7e5c0d3bcc1fb74acb929853b0ef2c58747fd9b4ce45a60b745cd4b573b6ee7f74e91f24c66b4c043391fd915646103f7a336af1a1399d450fc50b8a054c837b SHA512 75f48206c39f323bbb1f7dfd5e87bb2535c3940e646e84617898ee1212563918236c3e5b42f0d12419825b8312d69939c0364b9071c37ff5129edd330e791a4a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
deleted file mode 100644
index c6455af410a7..000000000000
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Polish"
-ASPELL_VERSION=6
-
-inherit versionator aspell-dict-r1
-
-MY_P="${PN/aspell/aspell6}-$(replace_version_separator 2 _ $(replace_version_separator 3 -))"
-
-HOMEPAGE="http://www.sjp.pl/slownik/"
-SRC_URI="http://www.sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-pl/metadata.xml b/app-dicts/aspell-pl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-pl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-pt-0.50.2-r1 b/app-dicts/aspell-pt-0.50.2-r1
new file mode 100644
index 000000000000..c545d4453eb9
--- /dev/null
+++ b/app-dicts/aspell-pt-0.50.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Portuguese language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/pt/aspell-pt-0.50-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=b7b58305c75f169be146a2f9e847dae2
diff --git a/app-dicts/aspell-pt-br-6.0.20090702 b/app-dicts/aspell-pt-br-6.0.20090702
new file mode 100644
index 000000000000..4b893f0c5bdf
--- /dev/null
+++ b/app-dicts/aspell-pt-br-6.0.20090702
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Brazilian Portuguese language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=!<app-dicts/aspell-pt-0.50.2-r1 >=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=3d7027ab32a885f70de048fcdd3bab69
diff --git a/app-dicts/aspell-pt-br/Manifest b/app-dicts/aspell-pt-br/Manifest
deleted file mode 100644
index d6ecccdaaa2d..000000000000
--- a/app-dicts/aspell-pt-br/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-pt_BR-20090702-0.tar.bz2 865676 BLAKE2B dd98250d378b15f321850e88de4a464ffa5e00183fda06990be9132406be268bf5144d4d500836df0e6f1d8f1601d8a38f3ed96ca00f3d9bacb5398dbfa9a945 SHA512 4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1
-EBUILD aspell-pt-br-6.0.20090702.ebuild 501 BLAKE2B 32a725726fe3b4335451e94a3c07016eb6a38f79c5f4a3b8b245ec49706f47702d5997458c9dcfb9de1874e928717a0f4f358696f0056b1e2f42d5bb4cf7c27a SHA512 142416588236aaf77498a4992054e58381bfea1c919e4f76a0e58f19cba32bf04fb642b2feaba7e359de59b3bd9795d50e472a8d512098442280d2b7db339c08
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
deleted file mode 100644
index 9eaddb36cd2a..000000000000
--- a/app-dicts/aspell-pt-br/aspell-pt-br-6.0.20090702.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Brazilian Portuguese"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell6-pt_BR-20090702-0"
-
-SRC_URI="mirror://gnu/aspell/dict/pt_BR/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-# Contains a conflict
-RDEPEND="!<app-dicts/aspell-pt-0.50.2-r1"
diff --git a/app-dicts/aspell-pt-br/metadata.xml b/app-dicts/aspell-pt-br/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-pt-br/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-pt/Manifest b/app-dicts/aspell-pt/Manifest
deleted file mode 100644
index efb9a2a97d6d..000000000000
--- a/app-dicts/aspell-pt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-pt-0.50-2.tar.bz2 201341 BLAKE2B ad924c197e7e72ea5be7a8f779fd7b144ac23e69ab6f089c338485c9fc4f5624a814b0f0f85d030647fe22e9390f03b873a05bd1cb26997986c30b5af0b10ef4 SHA512 21f115eae4507ca6e8c726476ba40910886e2ed17161cddbe493b2fe1c55a30703f033f8062eb0b9543d85541aa15e9ecab508cb3bb7403881315ecdb0bc55cd
-EBUILD aspell-pt-0.50.2-r1.ebuild 469 BLAKE2B 25223ab7c96a9ac1716282dff6d45b1eff1765824d3f5707bbb649497826d34708d32c37d4f19bb0b93a5ff27ad0d478997ca5ccc4ab40d3f51bed7a33e0c65b SHA512 4c4e74d221463695a79044d16d7974938b7940752fd472b1b44edbaeeb3f45e047e51d570aa51a7e2365b02b03311ff2bd40b605a1a9fac539ef9bbf82c15fa3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild b/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
deleted file mode 100644
index 3c1e8a18170a..000000000000
--- a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Portuguese"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_install() {
- aspell-dict-r1_src_install
-
- rm "${ED%/}"/usr/$(get_libdir)/aspell-0.60/pt_BR* || die
- rm "${ED%/}"/usr/$(get_libdir)/aspell-0.60/brazilian.alias || die
-}
diff --git a/app-dicts/aspell-pt/metadata.xml b/app-dicts/aspell-pt/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-pt/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-ro-3.3.2 b/app-dicts/aspell-ro-3.3.2
new file mode 100644
index 000000000000..a14a8e330a73
--- /dev/null
+++ b/app-dicts/aspell-ro-3.3.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Romanian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net http://rospell.sourceforge.net/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=1a76ade001b764c934100175e5148385
diff --git a/app-dicts/aspell-ro/Manifest b/app-dicts/aspell-ro/Manifest
deleted file mode 100644
index da84dc0877ba..000000000000
--- a/app-dicts/aspell-ro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell5-ro-3.3-2.tar.bz2 444966 BLAKE2B 078a10fd3cdcc0771f48cfcaa606c626328becdb98ad8d53b31d2b08dd32d532caa5edcb1649900e29fddb81d960c35e6b6af74aa8e20b15c2f6dd3bf48b8957 SHA512 0027334b6201e24b038d78d5b01b8495a661dc41df44b099b6c27156d11f33c26db1dd7bc9dbf45263695820b20da3891da58a30584f5e285579dec199b5acd3
-EBUILD aspell-ro-3.3.2.ebuild 372 BLAKE2B 0f59d3e0de06b12bbf36cb935b8c89410f0c098d7e80a7375252c4867f9f75b50e5ca9eaaf860f499763105fb94b72252b459ca293b2b6507e522f50f6dd2607 SHA512 af08fb03724f1dd8d18d45667ab14a008c57b5e9fe38c4e1fb6af907574a662e8c36a283a1759d0a66e8be8c4df9082cd2c7fc549a92cf4f43680de623439367
-MISC metadata.xml 244 BLAKE2B cd51ca64142dd29c7b2538142821322696100f916c76acf1472a3fe8a955786d3ec5ae1cc5bbed2daf2fa40cb2239901d25b7c3059bc14aa1571796ca35b9f06 SHA512 ab747cf65f0d06ab770b00b35ac0da826824bfe088c30dc729ec32d3e1c3dd2d00f9d701a351fdb1ba1c02a16706076bcd920e2fea34758c7352320e186054c5
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
deleted file mode 100644
index 5c0bb468bae5..000000000000
--- a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Romanian"
-ASPELL_VERSION=5
-
-inherit aspell-dict-r1
-
-HOMEPAGE="http://aspell.net http://rospell.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-ro/metadata.xml b/app-dicts/aspell-ro/metadata.xml
deleted file mode 100644
index 52e01edbbc73..000000000000
--- a/app-dicts/aspell-ro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">rospell</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/aspell-ru-0.99.1-r1 b/app-dicts/aspell-ru-0.99.1-r1
new file mode 100644
index 000000000000..f65146368a19
--- /dev/null
+++ b/app-dicts/aspell-ru-0.99.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Russian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=5c8bf455d3e430399d3b58cf34c4590b
diff --git a/app-dicts/aspell-ru/Manifest b/app-dicts/aspell-ru/Manifest
deleted file mode 100644
index 5ca3b8f15c58..000000000000
--- a/app-dicts/aspell-ru/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-ru-0.99f7-1.tar.bz2 427312 BLAKE2B e039744dff54dbad3dacafd63f5e4874b119b01da57929f403d535958b80b33e90a5429fdcfcc3d2fff2beb0e97e67fa0bd8af03c6a1ca2980d7c7718843c0e6 SHA512 789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430
-EBUILD aspell-ru-0.99.1-r1.ebuild 593 BLAKE2B f0a2b24786be44e8514c9b5e2cb6a07c8312d474fde23dbfc46b7e3307948902e09519c4e42c4e8f00484d4a2de47ef645c7037841525bc1dfc752173b08d5a0 SHA512 3147bcb0ca1864094e82b68d6ec31a08e3b47f7407603db43bdeefdf0826f755487d99b9721bbce4d967582b2043e55012768a43ee926213acdc5b1fcf200812
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
deleted file mode 100644
index 201df4b33f97..000000000000
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Russian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-# very strange filename not supported by the gentoo naming scheme
-MY_P="aspell6-ru-0.99f7-1"
-
-SRC_URI="mirror://gnu/aspell/dict/ru/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- einfo "Setting default dictionary to ru-yeyo"
- cp -v ru-yeyo.multi ru.multi || die
-}
diff --git a/app-dicts/aspell-ru/metadata.xml b/app-dicts/aspell-ru/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-ru/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-sk-2.01.2 b/app-dicts/aspell-sk-2.01.2
new file mode 100644
index 000000000000..a403a5376e64
--- /dev/null
+++ b/app-dicts/aspell-sk-2.01.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Slovak language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/sk/aspell6-sk-2.01-2.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=c0f83ebecc069ba29edf4a6f70404277
diff --git a/app-dicts/aspell-sk/Manifest b/app-dicts/aspell-sk/Manifest
deleted file mode 100644
index 91ca622142bf..000000000000
--- a/app-dicts/aspell-sk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-sk-2.01-2.tar.bz2 338933 BLAKE2B b306850bb72e8bb60dec32853afe6e7cd0796f92730e54ba25c6051c65ba5e53e1d5dcb091866adc3dd90d8013863b419d1c98f4e474f6b29754da326eb5a72f SHA512 020de459d4ff9c6e0c88428d43c9feea346bf8fadb9fa1233e9e54471ee23f970524a9a47cc6a45d04d6857387c9d9d1ecc1af2062325298354ee6c2d9c314b4
-EBUILD aspell-sk-2.01.2.ebuild 308 BLAKE2B 6eeb18029c98c5366b5b2231b515b02deca2583633366c1f71a84b5a86010d916a1557487c0c511bf63e89bf34d221920bf62e3478832a877dd4321425711c7d SHA512 0b0886d04cd07f59e3cdb0e3e056fff21ff61a080295bd0d8f36dfdde241317f0401f846deeadbb7d63befbe9fc71ab3b8373a7056a13e60ecef408a90dbbc40
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
deleted file mode 100644
index a466beccc0de..000000000000
--- a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Slovak"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-sk/metadata.xml b/app-dicts/aspell-sk/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-sk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-sl-0.50.0 b/app-dicts/aspell-sl-0.50.0
new file mode 100644
index 000000000000..c49c33f6ec82
--- /dev/null
+++ b/app-dicts/aspell-sl-0.50.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Slovenian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/sl/aspell-sl-0.50-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=d95cb3aa61957a73670cd2f827bfd7c8
diff --git a/app-dicts/aspell-sl/Manifest b/app-dicts/aspell-sl/Manifest
deleted file mode 100644
index 9a85705dfc33..000000000000
--- a/app-dicts/aspell-sl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-sl-0.50-0.tar.bz2 215463 BLAKE2B d3583a18cd10d81a443938e8c1430061ad004c964fe84eb79cd721006eee7ae4c422130d8dbee6cbd588ebbec33fc766a0d19eaaa4fc4b5ef60357b6d96fb188 SHA512 17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f
-EBUILD aspell-sl-0.50.0.ebuild 294 BLAKE2B 667cacca4b9d1d075433f8bdeda29fb25b6a0bb9d9e36f38a1a32145a493e7daae89f986a4d04eb962670961065ea9dbfd94ae0fc9e878fa623fdcf2a8eba53c SHA512 9c0b329e0d87a5cbebe61dcdda88a4e72940e13765b2cdf83d72090e413538912b0e900b1c09e643a0787980e88644c286273324a31494580eaee5c159e06648
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
deleted file mode 100644
index 4603b96781e3..000000000000
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Slovenian"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-sl/metadata.xml b/app-dicts/aspell-sl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-sl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-sr-0.60 b/app-dicts/aspell-sr-0.60
new file mode 100644
index 000000000000..80f3ce107211
--- /dev/null
+++ b/app-dicts/aspell-sr-0.60
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Serbian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=http://srpski.org/aspell/aspell6-sr-0.02.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=90887e1e5474baf8bdf61abe5a75f6ea
diff --git a/app-dicts/aspell-sr/Manifest b/app-dicts/aspell-sr/Manifest
deleted file mode 100644
index a8d1dc959575..000000000000
--- a/app-dicts/aspell-sr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-sr-0.02.tar.bz2 574923 BLAKE2B 3fa85bb2a24716a51c33447fa15fdc833059d49db62f36d7f11dc21baa926c2918c869d5e7052f6d729c038af1aa1e12f47c6476349b6f34989c6fbbbe3ce34c SHA512 3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395
-EBUILD aspell-sr-0.60.ebuild 409 BLAKE2B ad7f76a390505440a00ed29a97e26b64ea61909e25a38709d10986127552a366fcd1e9a51b18dd2853cd81e7531155e5c3269dd61d73c6243943459db02d2af6 SHA512 7fd98d83aeef0d711a105d8b030110dd4b9561d20f15e3aef6ce5b690248ca6ce0221187bb659e7c0a803ce0785ba3af9f919d00fcd138ea379f1d38f4be0f99
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild b/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
deleted file mode 100644
index de7d122e577c..000000000000
--- a/app-dicts/aspell-sr/aspell-sr-0.60.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Serbian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-MY_P="aspell6-sr-0.02"
-
-SRC_URI="http://srpski.org/aspell/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/aspell-sr/metadata.xml b/app-dicts/aspell-sr/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-sr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-sv-0.51.0 b/app-dicts/aspell-sv-0.51.0
new file mode 100644
index 000000000000..5e35b5d7ab46
--- /dev/null
+++ b/app-dicts/aspell-sv-0.51.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.50
+DESCRIPTION=Swedish language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.50
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/sv/aspell-sv-0.51-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=820a4487b3fb0c3369c1fbd573034a7e
diff --git a/app-dicts/aspell-sv/Manifest b/app-dicts/aspell-sv/Manifest
deleted file mode 100644
index 1b9de3d83e7a..000000000000
--- a/app-dicts/aspell-sv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell-sv-0.51-0.tar.bz2 93942 BLAKE2B d089e13e67849ef5fe51b7c7cae1c8e35e47363358842349118fec3685f987d3e87301942d16f95df914f39d1d7594f2f257596812c20cfaf1e728a2a1d12df8 SHA512 f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c
-EBUILD aspell-sv-0.51.0.ebuild 353 BLAKE2B 730c22d24b5b2e0aa61d678b122cdb0f9e38329cde01e8652503f553f376a94f871f355817379f16322a2dab23cd5b55f55516b956163d2ab207995d38778100 SHA512 378b5a6ce17bb1ef7f880dc5e8c4a698709ef8159d74e071a13e305208896785e79092a417600394b6e2333e5dfa21c6228952e46ee2a2f5d9ccaf7ae796490a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
deleted file mode 100644
index ec843d806e25..000000000000
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Swedish"
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
diff --git a/app-dicts/aspell-sv/metadata.xml b/app-dicts/aspell-sv/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-sv/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-uk-1.4.0.0 b/app-dicts/aspell-uk-1.4.0.0
new file mode 100644
index 000000000000..718fd63b5205
--- /dev/null
+++ b/app-dicts/aspell-uk-1.4.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Ukrainian language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/uk/aspell6-uk-1.4.0-0.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=951340569bf49c2fd2655a368c32447e
diff --git a/app-dicts/aspell-uk/Manifest b/app-dicts/aspell-uk/Manifest
deleted file mode 100644
index df09c746aaa5..000000000000
--- a/app-dicts/aspell-uk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-uk-1.4.0-0.tar.bz2 226767 BLAKE2B c91ef5132126b477a827b576005ede885932226659c96192a7a176f36db952c802550939dd659bd1b341442acfbd840a8811202a44f054070e9eb3d31ec8bb0f SHA512 2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799
-EBUILD aspell-uk-1.4.0.0.ebuild 320 BLAKE2B 22f2e649e3f40d5709cefa1e9fc3db990c758a31a882a30197ac4c1d673b85ca7913fac31b4f953dd6183e1615cb47feb105f04f0221edea08ac8fa9797c19a2 SHA512 434d7e92d0bb63af0aca26b7528c1714da23ef266ad84961a554a15e7e01d52ccb5eed2f86b21c09289d4d1e4585b70f69d9dada8a2588ebf4cb3c56eafe8add
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
deleted file mode 100644
index e6d6236f2ddd..000000000000
--- a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Ukrainian"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-uk/metadata.xml b/app-dicts/aspell-uk/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-uk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/aspell-vi-0.01.1.1 b/app-dicts/aspell-vi-0.01.1.1
new file mode 100644
index 000000000000..1118173a0b97
--- /dev/null
+++ b/app-dicts/aspell-vi-0.01.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=app-text/aspell-0.60
+DESCRIPTION=Vietnamese language dictionary for aspell
+EAPI=6
+HOMEPAGE=http://aspell.net
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=app-text/aspell-0.60
+SLOT=0
+SRC_URI=mirror://gnu/aspell/dict/vi/aspell6-vi-0.01.1-1.tar.bz2
+_eclasses_=aspell-dict-r1 340906f655106dec40252eccc43e3503
+_md5_=fa716ab7d8ffc3c36ccbbb77701d3ded
diff --git a/app-dicts/aspell-vi/Manifest b/app-dicts/aspell-vi/Manifest
deleted file mode 100644
index 944e781745cb..000000000000
--- a/app-dicts/aspell-vi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspell6-vi-0.01.1-1.tar.bz2 30843 BLAKE2B 73bc289d65bd76d29bfb1db25ba9e2a8845997e10eea26d98989d7d3b3d8c78715e797ee6a726a02632150b744dbead32392199886e2d4f2732a77e686b9627c SHA512 d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5
-EBUILD aspell-vi-0.01.1.1.ebuild 312 BLAKE2B 31234244cd652b09c91c188bd6f70f9ff5c9cb79945c74ed3fd8ca7f810b51f67631dd9cb7d5264adba2194f5034d673f8792d0dda0f7aceb523cd89507b414f SHA512 4371936daa2fdba1b37d9a68acf5b518bb980a99219efaa045c6a91b40b77b39f4076350448d7bbd08713dbbbae53bc75fc8f4c278717da3e32c421828786d8c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
deleted file mode 100644
index 9372a23f3e2e..000000000000
--- a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ASPELL_LANG="Vietnamese"
-ASPELL_VERSION=6
-
-inherit aspell-dict-r1
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/aspell-vi/metadata.xml b/app-dicts/aspell-vi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/aspell-vi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/bookview-3.2.1 b/app-dicts/bookview-3.2.1
new file mode 100644
index 000000000000..4c67772c5c68
--- /dev/null
+++ b/app-dicts/bookview-3.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=dev-lang/tk-8.3 >=sys-apps/sed-4
+DESCRIPTION=NDTP client written in Tcl/Tk
+EAPI=0
+HOMEPAGE=http://www.sra.co.jp/people/m-kasahr/bookview/
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/tk-8.3
+SLOT=0
+SRC_URI=ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/bookview-3.2.1.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ec0aa7c82c0a9628e021996bd8fd3008
diff --git a/app-dicts/bookview/Manifest b/app-dicts/bookview/Manifest
deleted file mode 100644
index 38784d73cde9..000000000000
--- a/app-dicts/bookview/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX Bookview.ad 20 BLAKE2B 1ddb8b0e075113cc16778b8e91bc04e4ae08676137562dccc31d70e0c64c7c820836dbbc3439fe567aa752a36d4aed75cb316934dfcd04e488a88813b704b6ef SHA512 805f0b8c643ab4b5d858042d4b7aaff491c070569845e8f605996dd47c15b83afad112dedb6e2afc1cdafa34b349ad966e6c1ccd32bc0aae6f785d7308f7a8ac
-AUX bookview-3.2.1-gentoo.diff 339 BLAKE2B 8566217f390f4c183b9fb9455bb7643e6e5636c56d77f5767ddfa5cd6184696702e96e620270728cddcb6ba5aa8dcb6b1f8644acc8d0ae70af924c00cef96d7d SHA512 c625f720ddf4f7e20aaa132b2fa93d022b2b0837a009024b61ab51e8d60ee2ccae65e5f155e60f9d6fc2c3f4e75b3f2f2d9f11720409518db5b2ab0f62bd47fa
-DIST bookview-3.2.1.tar.gz 311798 BLAKE2B 624f8130db7e3bfe9b290728bb20a93a4b218e51a299ac65ec5d5de22a3d65fcd33e471c58e948d3224255022af938e2ef695276f364f55285c6ef39f68fa517 SHA512 f5afa5d116a97f176a5a3194c50bd9b8eeff812c79844e0f3d617a9416ea5597e171888e8820034fbaf49812e95e6a5fee8701eb8702184ae3dc7ff37e3671d2
-EBUILD bookview-3.2.1.ebuild 693 BLAKE2B 57003c1e83090c6cd2da66131ffa1df6e2fae3eda995814b58702ddefeb11d21bbccc1b34d5c74a1b5bed5dec01cd21c546fae7071f3e6108d79c2589a878e2a SHA512 73e62b46100120ba799bd8c0db374de00eb4ed265f73f96094257b877639280d38b797c922537a8b13df54364a5d491341dbaca6229c1c87f17956aa07523a8c
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-dicts/bookview/bookview-3.2.1.ebuild b/app-dicts/bookview/bookview-3.2.1.ebuild
deleted file mode 100644
index 5093c1a5b930..000000000000
--- a/app-dicts/bookview/bookview-3.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="NDTP client written in Tcl/Tk"
-HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/bookview/"
-SRC_URI="ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.3"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_unpack() {
- unpack ${A}
- cd "${S}/bookview"
- epatch "${FILESDIR}/${P}-gentoo.diff"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- insinto /etc/X11/app-defaults
- newins "${FILESDIR}/Bookview.ad" Bookview
-
- dodoc AUTHORS ChangeLog* INSTALL NEWS README
-}
diff --git a/app-dicts/bookview/files/Bookview.ad b/app-dicts/bookview/files/Bookview.ad
deleted file mode 100644
index 7fb486fd8beb..000000000000
--- a/app-dicts/bookview/files/Bookview.ad
+++ /dev/null
@@ -1 +0,0 @@
-Bookview*font: 7x14
diff --git a/app-dicts/bookview/files/bookview-3.2.1-gentoo.diff b/app-dicts/bookview/files/bookview-3.2.1-gentoo.diff
deleted file mode 100644
index 3a3064a10594..000000000000
--- a/app-dicts/bookview/files/bookview-3.2.1-gentoo.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- bookview.in.ORIG 2004-11-03 18:39:28.000000000 +0900
-+++ bookview.in 2004-11-22 21:22:42.000000000 +0900
-@@ -120,6 +120,11 @@
- # Bitmap size.
- set bitmap_size 16
-
-+# Read Xresource
-+if { [ file readable "@sysconfdir@/X11/app-defaults/Bookview" ] } {
-+ option readfile "@sysconfdir@/X11/app-defaults/Bookview"
-+}
-+
- #
- # Startup
- #
diff --git a/app-dicts/bookview/metadata.xml b/app-dicts/bookview/metadata.xml
deleted file mode 100644
index c921b96adf6c..000000000000
--- a/app-dicts/bookview/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/canna-2ch-20030827 b/app-dicts/canna-2ch-20030827
new file mode 100644
index 000000000000..d24503854dff
--- /dev/null
+++ b/app-dicts/canna-2ch-20030827
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=canna? ( app-i18n/canna )
+DESCRIPTION=Japanese Canna dictionary for 2channelers
+EAPI=6
+HOMEPAGE=http://omaemona.sourceforge.net/packages/Canna
+IUSE=canna
+KEYWORDS=alpha ~amd64 ppc ppc64 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=mirror://gentoo/canna-2ch-20030827.tar.gz
+_eclasses_=cannadic 6d8054590c0aef2c11c567e1a815c052 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f8f99b7305a28d5fd5004d89ea775f9a
diff --git a/app-dicts/canna-2ch-20040519 b/app-dicts/canna-2ch-20040519
new file mode 100644
index 000000000000..4714ef3c5e7f
--- /dev/null
+++ b/app-dicts/canna-2ch-20040519
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=canna? ( app-i18n/canna )
+DESCRIPTION=Japanese Canna dictionary for 2channelers
+EAPI=6
+HOMEPAGE=http://omaemona.sourceforge.net/packages/Canna
+IUSE=canna
+KEYWORDS=alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~naota/files/canna-2ch-20040519.tar.gz
+_eclasses_=cannadic 6d8054590c0aef2c11c567e1a815c052 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c21b160484961c813c046ee077a90c66
diff --git a/app-dicts/canna-2ch/Manifest b/app-dicts/canna-2ch/Manifest
deleted file mode 100644
index 403742be1c97..000000000000
--- a/app-dicts/canna-2ch/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 052ch.dics.dir 64 BLAKE2B 2c5c8acf76dfc1afce87371dbb896411bb79064a09bddd5605e0ce642cc4bb60752944f2e6a93722cc51f10f37659300fe68a8edfd359ba2c5543ea5112360e3 SHA512 5b1bbcd84a1cb5ba6a16e3f980493a51c123e6286231e4e8a12042479930e4d48392a70edfdafce8a1c218639a19f0aa5ddf4d39d2290a12b6adaea291c0fb13
-AUX canna-2ch-20030827-gentoo.patch 472 BLAKE2B b871a6222a23176e752e896b74ca9d0588065db0906f1379a7e18e75192c7f679894855169fa58128d7872d2a525845bfb9eee43a77d87357dad8a6614e89dfd SHA512 87e9da06fd4cd7679f2b1499dfbb1a4f2a49fea86ff090b1dd9816f356e43cc8a1744d4c8c5150502b8557045460cb08e4a9b7cb2b421ad81ce1c9c2a234646e
-DIST canna-2ch-20030827.tar.gz 51757 BLAKE2B 4fa31c65a650a986f38b3b338c7ccdb89d197f578f0bc896bd80c23e078a9bda1cbe12d7c43054fde7f9e760711d6ace56489410501910377250449e909a3b33 SHA512 9cc5a78461ac0d6acb9eebae2ae2a71b02b368fc9ec61741b6459a3baab734e20b37d14bd939d44b03c3ee8b8b9c926d045aeb48ca0fd42d42f88fc02d136d0b
-DIST canna-2ch-20040519.tar.gz 53168 BLAKE2B 247b30f7a97258eac52f9a1d32bd2a785dcfaccd50430fd251a287a80b7a7ab12d1f2c4894d9eb026552f033854b50fbc967a50b66b84d3d5fe68e1954beb6fb SHA512 62b6f633fd0d345e09ce1e0603f61fe1363880ecdc72932e7a8d6d4c17a23be619a749974a3f54a78642396834888f628f047f1a88db3c8d36a758468bd6d296
-EBUILD canna-2ch-20030827.ebuild 720 BLAKE2B 52188a87402f493f2ce95b5bf3d2823edeb51173cd841e6a5cd3232d8b17a302270b649c5ebf258b7e38eb969d3105ab49a13ddc18649903642d414a342336d6 SHA512 184115c46673751e5af6c42d88553c82a5f5e0005a34d3fa2a06d1168051b9e983bf69958e7abe16cd0de70d81ab65c269c06d9b172bb153fa55b5ae5fa679a6
-EBUILD canna-2ch-20040519.ebuild 711 BLAKE2B c6c70b2eaac96f88b679e5f1312f9ea8193b5bae3fc36e582f48fe78ac1dd9018e04492656c69a48dfb0e624400673b2f0edbc8b73034ab2c9850ffbba83aedb SHA512 05fb3b15e987a0a3da2e509a7292b396d973788ee8cf02aeef162728ffed85e95ca2ece812efabb37139694de1dd2207516f03e92bf5e8c269d85ff85e22ba2f
-MISC metadata.xml 322 BLAKE2B 387badfc988d38cce4610565153297b4e346e4e7cba3de038b764c5d276accd880d1e53d1b4a5bc1059908f729f1b38cf93e74c1af2a8aa32f7ce8b5c6a95f19 SHA512 a922bc9b936b97ac46a995b11559345553fea4b9870d5e97afe1886a360e8820ae0fb6041f0d125310acbc786da0840152779d60e6131af665e7ee8440e680d2
diff --git a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
deleted file mode 100644
index 45e27b445d44..000000000000
--- a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic
-
-DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#SRC_URI="http://omaemona.sourceforge.net/packages/Canna/2ch.t"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
-IUSE="canna"
-
-DEPEND="canna? ( app-i18n/canna )"
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/"${P}-gentoo.patch )
-
-CANNADICS="2ch"
-DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
-
-src_compile() {
- # Anthy users do not need binary dictionary
- if use canna; then
- mkbindic nichan.ctd || die
- fi
-}
diff --git a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
deleted file mode 100644
index d6b5eb2ddbda..000000000000
--- a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic
-
-DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
-SRC_URI="https://dev.gentoo.org/~naota/files/${P}.tar.gz"
-#SRC_URI="http://omaemona.sourceforge.net/packages/Canna/2ch.t"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="canna"
-
-DEPEND="canna? ( app-i18n/canna )"
-S="${WORKDIR}/${PN}"
-
-CANNADICS="2ch"
-DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
-
-src_compile() {
- # Anthy users do not need binary dictionary
- if use canna; then
- mkbindic nichan.ctd || die
- fi
-}
diff --git a/app-dicts/canna-2ch/files/052ch.dics.dir b/app-dicts/canna-2ch/files/052ch.dics.dir
deleted file mode 100644
index 1ddc85d64336..000000000000
--- a/app-dicts/canna-2ch/files/052ch.dics.dir
+++ /dev/null
@@ -1,2 +0,0 @@
-nichan.cbd(nichan.mwd) -2ch---
-nichan.cld(nichan.mwd) -2ch---
diff --git a/app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch b/app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch
deleted file mode 100644
index 67f28e304dc4..000000000000
--- a/app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/nichan.ctd
-+++ b/nichan.ctd
-@@ -2439,7 +2439,6 @@
- ¤¿¤¯¤­¤å¤¦ #T35 Âðµå
- ¤¿¤°¤Á¤Ë¤Ã¤­ #T35 ÅĸýÆüµ­
- ¤¿¤±¤·¤¯¤ó #JNM ¤¿¤±¤··¯
--¤¿¤±¤·¤¯¤ó #JNMUC ¤¿¤±¤··¯
- ¤¿¤±¤À¤­¤¾¤Ì #JN ÉðÅĵ³¤¾¤Ì
- ¤¿¤±¤À¤­¤Ð #JN ÉðÅĵ³ÇÏ
- ¤¿¤±¤À¤­¤Ð¤°¤ó¤À¤ó #T35 ÉðÅĵ³ÇÏ·³ÃÄ
-@@ -4585,7 +4584,6 @@
- ¤ä¤í¤ª¤¦¤è #CJ ¥ä¥í¡¼¥¦¥è
- ¤ä¤í¤ª¤¦¤è #CJ ¥ä¥í¡Ý¥¦¥è
- ¤ä¤ï¤é¤Á¤ã¤ó #JNM ¥ä¥ï¥é¤Á¤ã¤ó
--¤ä¤ï¤é¤Á¤ã¤ó #JNMUC ¥ä¥ï¥é¤Á¤ã¤ó
- ¤ä¤ó¤¸¤ã¤ó #KK ¥ä¥ó¥¸¥ã¥ó
- ¤ä¤ó¤¸¤ã¤ó #T35 ¥ä¥ó¥¸¥ã¥ó
- ¤ä¤ó¤ä¤ó #CJ ¤ä¤ó¤ä¤ó
diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
deleted file mode 100644
index 95f2f679f0e5..000000000000
--- a/app-dicts/canna-2ch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">omaemona</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/canna-cannadic-0.95c b/app-dicts/canna-cannadic-0.95c
new file mode 100644
index 000000000000..2cac08815229
--- /dev/null
+++ b/app-dicts/canna-cannadic-0.95c
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=app-i18n/canna
+DESCRIPTION=Japanese dictionary as a supplement/replacement to Canna3.5b2
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=alpha amd64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/cannadic-0.95c.tar.gz
+_eclasses_=cannadic 6d8054590c0aef2c11c567e1a815c052 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9041f6461c138a087c850cab624b3ad0
diff --git a/app-dicts/canna-cannadic/Manifest b/app-dicts/canna-cannadic/Manifest
deleted file mode 100644
index e901d07e6bc2..000000000000
--- a/app-dicts/canna-cannadic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 05cannadic.dics.dir 101 BLAKE2B 7ab80f9b113dcf0f57774b4cff5f78aa3f8640208f70424fe963fd904aa58ec7be369161a409007dbb97ae727d345eaf4f58e2855e64900ffa412b7d4c76c0a4 SHA512 6edc05f44046021b78954b598cb1b23ab0dc270278af1e52c92c752f5a3b14170771fc83d682b3cbeb0dffcca9831f4f2ac2a9f9975dca72f3e2ab3b0a7dbda2
-DIST cannadic-0.95c.tar.gz 1028308 BLAKE2B 1da5594fa27522693141ee0dd4afbc1b78be3f5839f85624aeedcdbd1757c27b760f1f1fa165fb77812ed8e952e91747dd16ba135359dd86d3417a9e07d43c13 SHA512 46092c45a49c823ad41a4aed690981bd5885e257a3a4fc23077b2f87bdd131e93438e3989b4abddbc6db1e949c0c21d41db00fcc204b5425ab0b107669bc144a
-EBUILD canna-cannadic-0.95c.ebuild 598 BLAKE2B 37c5882d8a8ddd3e9f3ce1b0293c18cda4255e7192709cb1324cb89ffa9d038cd662561b4593678a297545b2d921d7a3f633e5d5cf0b992785c109a30b4e05dc SHA512 cbc8b10cb81d88b47ac6ba8cd55c4f108f6958f41ed98fea76daaa1de4a0d5fd26277116e4f928193db6a3d093a7824e5eed1f15654027eba143786f128e66b2
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
deleted file mode 100644
index 574705b2d17a..000000000000
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic
-
-MY_P="${P/canna-/}"
-
-DESCRIPTION="Japanese dictionary as a supplement/replacement to Canna3.5b2"
-#HOMEPAGE="http://cannadic.oucrc.org/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-i18n/canna"
-S="${WORKDIR}/${MY_P}"
-
-CANNADICS="gcanna gcannaf"
-DICSDIRFILE="${FILESDIR}/05cannadic.dics.dir"
-
-src_compile() {
- emake maindic
-}
diff --git a/app-dicts/canna-cannadic/files/05cannadic.dics.dir b/app-dicts/canna-cannadic/files/05cannadic.dics.dir
deleted file mode 100644
index fbbd5b4cd819..000000000000
--- a/app-dicts/canna-cannadic/files/05cannadic.dics.dir
+++ /dev/null
@@ -1,3 +0,0 @@
-gcanna.cbd(gcanna.mwd) -gcanna---
-gcanna.cld(gcanna.mwd) -gcanna---
-gcannaf.ctd(.swd) -gcannaf---
diff --git a/app-dicts/canna-cannadic/metadata.xml b/app-dicts/canna-cannadic/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-dicts/canna-cannadic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/dictd-devils-0-r1 b/app-dicts/dictd-devils-0-r1
new file mode 100644
index 000000000000..3fee4e855269
--- /dev/null
+++ b/app-dicts/dictd-devils-0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=The Devil's Dictionary for dict
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/devils-dict-pre.tar.gz
+_md5_=6b5e3a1bc266a1109b096d910de828ca
diff --git a/app-dicts/dictd-devils/Manifest b/app-dicts/dictd-devils/Manifest
deleted file mode 100644
index f834c6bd6619..000000000000
--- a/app-dicts/dictd-devils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST devils-dict-pre.tar.gz 175823 BLAKE2B caf11573aa4a8e1774a15a54eab7ed0a9069588498d51d382e030da7dccca2fb7e03170506becfcdb8246f8802655bca22abe568d839cee608e5310951328d93 SHA512 b085f0b8e8ead1070f31fdcfff7489b09550a92c50fb5e4018f2a953b456871900eee65e91f916e4be155ded20cb906d683bdc5fb5b5370201ce664d8fd8c40d
-EBUILD dictd-devils-0-r1.ebuild 473 BLAKE2B f765850dd8b31fbafcfe2ebea7ca533d896102bc86ee7111abf2c43eb318c0ed54f9c26983902202fc04010d432116cd670d151dc5c010ecc50f6e3317b9b106 SHA512 12969f43bd2975ac1473abeaf0c8132934be6da9121834d39bba4943530a3e8acaf94cec5bce44d7080b93e259605a3f9140c3bc4c67037af57ba77a60c3af0b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-devils/dictd-devils-0-r1.ebuild b/app-dicts/dictd-devils/dictd-devils-0-r1.ebuild
deleted file mode 100644
index 60386b4e3a78..000000000000
--- a/app-dicts/dictd-devils/dictd-devils-0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=devils-dict-pre
-S=${WORKDIR}
-DESCRIPTION="The Devil's Dictionary for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-src_install() {
- insinto /usr/lib/dict
- doins devils.dict.dz devils.index || die
-}
diff --git a/app-dicts/dictd-devils/metadata.xml b/app-dicts/dictd-devils/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-devils/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-dicts-1.0 b/app-dicts/dictd-dicts-1.0
new file mode 100644
index 000000000000..6337e5fbc1cc
--- /dev/null
+++ b/app-dicts/dictd-dicts-1.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A package to simplify installation of all dictd dictionaries
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=app-dicts/dictd-devils app-dicts/dictd-elements app-dicts/dictd-foldoc app-dicts/dictd-gazetteer app-dicts/dictd-jargon app-dicts/dictd-misc app-dicts/dictd-vera app-dicts/dictd-web1913 app-dicts/dictd-wn
+SLOT=0
+_md5_=7f88f02a2142beb63c6891751ad261e4
diff --git a/app-dicts/dictd-dicts/Manifest b/app-dicts/dictd-dicts/Manifest
deleted file mode 100644
index 57125448b00d..000000000000
--- a/app-dicts/dictd-dicts/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD dictd-dicts-1.0.ebuild 529 BLAKE2B 5b100850bdf6c37351e2100f7f1e67d88cdfe2ed0d0f9c86e449e43b4181280267aad13eed4d4d628b9374efefdb36a7376110b7a3fee44a1e91bb3d73ad1718 SHA512 183d546f31e163134f0146bc42701bb296674c48fd6873ae5f19f26307175efa9472ec753de4969bf512c8d17aaf01b3d5727da7f1b047c4febdb302c89c86a3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-dicts/dictd-dicts-1.0.ebuild b/app-dicts/dictd-dicts/dictd-dicts-1.0.ebuild
deleted file mode 100644
index ac3c5ee852fb..000000000000
--- a/app-dicts/dictd-dicts/dictd-dicts-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A package to simplify installation of all dictd dictionaries"
-
-SLOT="0"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.dict.org/"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=""
-
-RDEPEND="app-dicts/dictd-devils
- app-dicts/dictd-elements
- app-dicts/dictd-foldoc
- app-dicts/dictd-gazetteer
- app-dicts/dictd-jargon
- app-dicts/dictd-misc
- app-dicts/dictd-vera
- app-dicts/dictd-web1913
- app-dicts/dictd-wn"
diff --git a/app-dicts/dictd-dicts/metadata.xml b/app-dicts/dictd-dicts/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-dicts/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-elements-2000.22.07-r1 b/app-dicts/dictd-elements-2000.22.07-r1
new file mode 100644
index 000000000000..3d372c58ae5d
--- /dev/null
+++ b/app-dicts/dictd-elements-2000.22.07-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=The elements database for dict
+EAPI=0
+HOMEPAGE=http://www.dict.org
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/elements-20001107-pre.tar.gz
+_md5_=6866edd85e627ba770313ad5ddaffe5b
diff --git a/app-dicts/dictd-elements/Manifest b/app-dicts/dictd-elements/Manifest
deleted file mode 100644
index ccbbab759f7c..000000000000
--- a/app-dicts/dictd-elements/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST elements-20001107-pre.tar.gz 16934 BLAKE2B 5b351c30cdc8fc6161a1ff1c2ccfc0b3ae9456d8fec9b57215ff20b07b99b4b267fd1824981458eb9e27ba6d628f5aa23b282dfe4a529752f7301447fc10b3c1 SHA512 93c8426582e0715eb1f261ab60b15da48943464993a027693617f699a4a2ee89d33f19ba820ae046e1221d8d57139d54987a2abf35b6c59ba26c2b66199cf51b
-EBUILD dictd-elements-2000.22.07-r1.ebuild 482 BLAKE2B 089b43283193a0bbecd876458e57380615c5da7b8f780eec8830c3f5608e8280acd51795f61789518418e6aa8dcab38ac0b3335bcded2a10dfed537ef834ef49 SHA512 4b07239e5475daddfbae6e989f7695f5c65688d027d97cdbab09d6b71d5a2609d14b9f72bded4ccdd9784a92b50576dcacc495737aeaf4b53e2cd1ac2db9fe93
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild b/app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
deleted file mode 100644
index 235d658d2fec..000000000000
--- a/app-dicts/dictd-elements/dictd-elements-2000.22.07-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=elements-20001107-pre
-DESCRIPTION="The elements database for dict"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-HOMEPAGE="http://www.dict.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/lib/dict
- doins elements.dict.dz elements.index || die
-}
diff --git a/app-dicts/dictd-elements/metadata.xml b/app-dicts/dictd-elements/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-elements/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-foldoc-2001.03.13-r1 b/app-dicts/dictd-foldoc-2001.03.13-r1
new file mode 100644
index 000000000000..d4defc619213
--- /dev/null
+++ b/app-dicts/dictd-foldoc-2001.03.13-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=The Free On-line Dictionary of Computing for dict
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/foldoc-20010313.tar.gz
+_md5_=4b4e239d7d396b91bfa735411fa7b331
diff --git a/app-dicts/dictd-foldoc/Manifest b/app-dicts/dictd-foldoc/Manifest
deleted file mode 100644
index a593e07f5ddd..000000000000
--- a/app-dicts/dictd-foldoc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST foldoc-20010313.tar.gz 2166599 BLAKE2B 5f9c7cf2875ef75dd278a94fa2eecdbbad7b891442e1755fc801fde80861d6adcf66d76c93580660440f2c5eb0fb5f234fa4ee0e4b9adbd930cbfdb6855db6bb SHA512 bcea2e6e350e7dc9c7811dd7904ea646ace3e2d6421c9f8f04a14e317fde07a0a8f3028ec7d108ee6fdeba21fd6a72e17d67f4e13d53ccb582908e73df6c1a53
-EBUILD dictd-foldoc-2001.03.13-r1.ebuild 492 BLAKE2B a836f13817e4731ea94aa8127de9ada0d22b9623cfa50520fc6b30035b1eb530374e0c43e2d456db1ea0ceb5c322d1234a966495db9702093ba96580654cdb3c SHA512 e190abaa7eb77b8f87bc2bddb8d2c17a0a41b1c26bc3dab229e4cafd9264e06fb033624f059004105398d0fd5121dede401509a55e44acc42967ad776ce59b49
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild b/app-dicts/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild
deleted file mode 100644
index 761d5e5c095c..000000000000
--- a/app-dicts/dictd-foldoc/dictd-foldoc-2001.03.13-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=foldoc-20010313
-DESCRIPTION="The Free On-line Dictionary of Computing for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/lib/dict
- doins foldoc.dict.dz foldoc.index || die
-}
diff --git a/app-dicts/dictd-foldoc/metadata.xml b/app-dicts/dictd-foldoc/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-foldoc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-gazetteer-1.2-r1 b/app-dicts/dictd-gazetteer-1.2-r1
new file mode 100644
index 000000000000..96d0ac033876
--- /dev/null
+++ b/app-dicts/dictd-gazetteer-1.2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=The original U.S. Gazetteer Place and Zipcode Files for dict
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/dict-gazetteer-1.2-pre.tar.gz
+_md5_=c507ab520f3088455eeeeb30fd7e7305
diff --git a/app-dicts/dictd-gazetteer/Manifest b/app-dicts/dictd-gazetteer/Manifest
deleted file mode 100644
index 6e5758aba342..000000000000
--- a/app-dicts/dictd-gazetteer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict-gazetteer-1.2-pre.tar.gz 2209944 BLAKE2B 92ab4e48cab546d7ad50594c91d7d6b4d3b1b6fd00f6cafc359f462a1012a4281c3afa9e806c349a80c890810984dffa74d7ab5dad32289477a5a854727b0cc5 SHA512 e50d19e0d823aac5119cc8ff9d602a42a2721447e32013dff6278cb98c939eec219ca5cecb75a3f7495e11ae0b458b90498fd3b55c768298fc814a8e1870b009
-EBUILD dictd-gazetteer-1.2-r1.ebuild 518 BLAKE2B 644b329e57eb0756894f0d298578deae81b636264ffc6600d0ff3cacf9f719e0f0a84ecf9930c09ca3e79341238e0d87b4c6aeb6bf25d45c0cea8ead3d9811c8 SHA512 616b7040fcde6cdbb377032c255071c79af2e08813811881dacf209247e56942670fbd14d0925542b560c634471abc5866985d061dae03a4c94a64a6afe938ed
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild b/app-dicts/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild
deleted file mode 100644
index a0cc8e5eef2a..000000000000
--- a/app-dicts/dictd-gazetteer/dictd-gazetteer-1.2-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=dict-gazetteer-${PV}-pre
-DESCRIPTION="The original U.S. Gazetteer Place and Zipcode Files for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/lib/dict
- doins gazetteer.dict.dz gazetteer.index || die
-}
diff --git a/app-dicts/dictd-gazetteer/metadata.xml b/app-dicts/dictd-gazetteer/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-gazetteer/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-jargon-4.2.3-r1 b/app-dicts/dictd-jargon-4.2.3-r1
new file mode 100644
index 000000000000..dc7256963067
--- /dev/null
+++ b/app-dicts/dictd-jargon-4.2.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=Jargon lexicon
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 sparc ppc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/jargon_4.2.3.tar.gz
+_md5_=ea5279587f6c650815f9813c031d6118
diff --git a/app-dicts/dictd-jargon/Manifest b/app-dicts/dictd-jargon/Manifest
deleted file mode 100644
index 3bc36c4ac4c8..000000000000
--- a/app-dicts/dictd-jargon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jargon_4.2.3.tar.gz 650370 BLAKE2B ba3198fbd371fc9cef53edc465ad165364981deb315d5abc0d7dcd9d0cfee4afd3bad9554845ac2c5f98d547081890b474eba3557b9f61e69a235708f8841745 SHA512 7eba12c741cc2be7ab77c061fde38f7f083bf54d37428c3b6eb567bdde7002b6e70fd73411e354c8b5124ec2d7dd9ef1030b7cf8dec3d0b89ac450cf20ed22c7
-EBUILD dictd-jargon-4.2.3-r1.ebuild 476 BLAKE2B adab8d0851f94428669efae06c01e12e0f232f0157869b39873ccdef0f7f7e60b5bcf634650774fd708e70f0e38084a5f06e78cb77994423c1ccca07b218fed0 SHA512 a592dd0e555b6da3e0a1e5c019daca5cea1750be51491ee7c71a1f3bab2c554b6b94470de1ae787e3cb8a4a91d01215be303d1c63386074adef62f6a718eecc6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild b/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
deleted file mode 100644
index 909a51f65649..000000000000
--- a/app-dicts/dictd-jargon/dictd-jargon-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${PN/dictd-/}_${PV}
-DESCRIPTION="Jargon lexicon"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 sparc ppc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install () {
- dodoc README
- insinto /usr/lib/dict
- doins jargon.dict.dz jargon.index || die
-}
diff --git a/app-dicts/dictd-jargon/metadata.xml b/app-dicts/dictd-jargon/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-jargon/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-misc-1.5b-r1 b/app-dicts/dictd-misc-1.5b-r1
new file mode 100644
index 000000000000..b209134b5a39
--- /dev/null
+++ b/app-dicts/dictd-misc-1.5b-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=Easton's 1897 Bible Dictionary for dict
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/dict-misc-1.5b-pre.tar.gz
+_md5_=de6e68ca272238756c177d991e542b2f
diff --git a/app-dicts/dictd-misc/Manifest b/app-dicts/dictd-misc/Manifest
deleted file mode 100644
index 4369ed9e1f13..000000000000
--- a/app-dicts/dictd-misc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict-misc-1.5b-pre.tar.gz 2167909 BLAKE2B a7b5a0bdcf84d4eb882f5ee836ef8c8885d4c2b3c1557297d0d13caf54902b398de6ec5c8eefe019f114f846faa56ee5c6b64b94aa5f6b9acaf797dc946eeb79 SHA512 74229be89dbda5ff7d83fee187e5b9d0d29890365b6699bb57ef3178ae33ac76af88cbf1dc629224adb4ec90db6ffc3b744851dea7285910e401792010a3be4a
-EBUILD dictd-misc-1.5b-r1.ebuild 562 BLAKE2B 14e8c7ff5024f654cca9bb32cee5a3ce70d0064a18ebe108e4c75737a1c1ba491a72f01b329ba6f2ccd89dc152dce7a943728d2997238fc181092011cd787bad SHA512 2f5cb0a585072c7c927ceb5104738a362e053ff74acd42aa67eecb5928e99ffa0c7f2bbc4bc06e12f2479aaa5fd08e4db5cb851ba959cf046d450383fab7e264
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-misc/dictd-misc-1.5b-r1.ebuild b/app-dicts/dictd-misc/dictd-misc-1.5b-r1.ebuild
deleted file mode 100644
index 611708a2e14e..000000000000
--- a/app-dicts/dictd-misc/dictd-misc-1.5b-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${P/dictd/dict}-pre
-DESCRIPTION="Easton's 1897 Bible Dictionary for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/lib/dict
- doins easton.dict.dz easton.index \
- hitchcock.dict.dz hitchcock.index \
- world95.dict.dz world95.index \
- || die
-}
diff --git a/app-dicts/dictd-misc/metadata.xml b/app-dicts/dictd-misc/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-misc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-vera-1.22 b/app-dicts/dictd-vera-1.22
new file mode 100644
index 000000000000..a3da9c4d047d
--- /dev/null
+++ b/app-dicts/dictd-vera-1.22
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
+EAPI=5
+HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
+KEYWORDS=amd64 ppc ppc64 sparc x86
+LICENSE=FDL-1.3
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=mirror://gnu/vera/vera-1.22.tar.gz
+_md5_=5ce6613b4df77910588a108d7c6692b6
diff --git a/app-dicts/dictd-vera-1.23 b/app-dicts/dictd-vera-1.23
new file mode 100644
index 000000000000..dfa6517c3389
--- /dev/null
+++ b/app-dicts/dictd-vera-1.23
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
+EAPI=5
+HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=FDL-1.3
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=mirror://gnu/vera/vera-1.23.tar.gz
+_md5_=d4b6b418e5c0268d4918b2d69b28f061
diff --git a/app-dicts/dictd-vera/Manifest b/app-dicts/dictd-vera/Manifest
deleted file mode 100644
index 8cf198bb2245..000000000000
--- a/app-dicts/dictd-vera/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vera-1.22.tar.gz 229397 BLAKE2B ad3e195a10a03191292c0161b0ee98c591f80d1cae3b4432a2b953451f6257c5583c13aee14e6cac48551dc33bc171722ed202d3c231c68314f91464b7166a02 SHA512 3fe10ae52d8aa593bc4ce23eaffbf8d1cbc0127fcce3538508389335a9e1bc2964d1ca8915616b0711cc9da36f8ea231e050dbeddf75bef799f21e538731234a
-DIST vera-1.23.tar.gz 236439 BLAKE2B fdbecb4bf2abdac0a858be29fe544474dab69623967e2e9c8f8e02188ce7b8a8f39a099bcf7ff6e0d846afb0ec0cedd8e4ec64ba1b27a66eee963f3de088a4c1 SHA512 f16f2d24715131f60238c49f43d79bcd02b47c8e999de381c2139289f05859659a9f3ae79e3ed8d4b3dae447666cb8391ad7a072dff91275857b901fd0748c78
-EBUILD dictd-vera-1.22.ebuild 882 BLAKE2B 9b0658eca1928a339f695e2ea505948fe469562c714dfcc2c2a8364714be775d50075073f08aa4156e0a2e3b46b4d5312199aa08e16c09dfdd68ad644527b4e1 SHA512 3dd6091b4d7f4c13c98811c89b486eec2ffa7b5463f54bab784793c9d33ff1b266f3fd7ef2ae130a7d8408e0e0608e4d05e13f2e312ac425c4c68a8d4d3e336b
-EBUILD dictd-vera-1.23.ebuild 887 BLAKE2B a3f9a34da68241ed3545ad47447875f234852d5d1d01992cf5ed9983a0c5adbbe3a455cfcc9f110568d14e4ad1b67df2e933f3e2aa9df0c536569eb067750bcc SHA512 6772fa5fcbb49054362a02f1f8e549c7043268618acf4c911fef1e476ee2d5e97c0321246da11a54ba93b28ff81e7877f4d57927979a736f78573885da12ae83
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-vera/dictd-vera-1.22.ebuild b/app-dicts/dictd-vera/dictd-vera-1.22.ebuild
deleted file mode 100644
index cf8e02f8feee..000000000000
--- a/app-dicts/dictd-vera/dictd-vera-1.22.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict"
-HOMEPAGE="http://home.snafu.de/ohei/vera/vueber-e.html"
-SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="FDL-1.3"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/vera-${PV}
-
-src_compile () {
-# sed -f debian/dict-vera/sedfile vera.? >vera1 || die
-# sed '1,2!s/^/ /' vera. > vera || die
-# cat vera1>>vera || die
- cat vera.[0-9a-z] | /usr/bin/dictfmt -f -u http://home.snafu.de/ohei \
- -s "V.E.R.A. -- Virtual Entity of Relevant Acronyms" \
- vera || die
- /usr/bin/dictzip -v vera.dict || die
-}
-
-src_install () {
- dodir /usr/lib/dict
- insinto /usr/lib/dict
- doins vera.dict.dz
- doins vera.index
- dodoc changelog README
-}
diff --git a/app-dicts/dictd-vera/dictd-vera-1.23.ebuild b/app-dicts/dictd-vera/dictd-vera-1.23.ebuild
deleted file mode 100644
index fb0b405a0537..000000000000
--- a/app-dicts/dictd-vera/dictd-vera-1.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict"
-HOMEPAGE="http://home.snafu.de/ohei/vera/vueber-e.html"
-SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="FDL-1.3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/vera-${PV}
-
-src_compile () {
-# sed -f debian/dict-vera/sedfile vera.? >vera1 || die
-# sed '1,2!s/^/ /' vera. > vera || die
-# cat vera1>>vera || die
- cat vera.[0-9a-z] | /usr/bin/dictfmt -f -u http://home.snafu.de/ohei \
- -s "V.E.R.A. -- Virtual Entity of Relevant Acronyms" \
- vera || die
- /usr/bin/dictzip -v vera.dict || die
-}
-
-src_install () {
- dodir /usr/lib/dict
- insinto /usr/lib/dict
- doins vera.dict.dz
- doins vera.index
- dodoc changelog README
-}
diff --git a/app-dicts/dictd-vera/metadata.xml b/app-dicts/dictd-vera/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-vera/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-web1913-1.4-r1 b/app-dicts/dictd-web1913-1.4-r1
new file mode 100644
index 000000000000..87d526152219
--- /dev/null
+++ b/app-dicts/dictd-web1913-1.4-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=Webster's Revised Unabridged Dictionary (1913) for dict
+EAPI=0
+HOMEPAGE=http://www.dict.org/
+KEYWORDS=x86 ppc sparc amd64 ppc64
+LICENSE=GPL-2
+RDEPEND=>=app-text/dictd-1.5.5
+SLOT=0
+SRC_URI=ftp://ftp.dict.org/pub/dict/pre/dict-web1913-1.4-pre.tar.gz
+_md5_=6445bca1041509b3ecb96fb721c51a30
diff --git a/app-dicts/dictd-web1913/Manifest b/app-dicts/dictd-web1913/Manifest
deleted file mode 100644
index 9d42df72e45c..000000000000
--- a/app-dicts/dictd-web1913/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict-web1913-1.4-pre.tar.gz 13147422 BLAKE2B ef142f5bdb20b2def00feee6bfa58b5056c156918fa2e51882f83cc8738ad3f8a646900249a83c0c287363676dc8c1d26d104adfc931ce3384bdc6cb879c7f60 SHA512 028aece920edf52672f7abf59d962f539b6704722a781296108d648a3327506bf8b2b486ecc97688e9de37a265f8f30342c8b147fcb101c46269b43c2d2b55e1
-EBUILD dictd-web1913-1.4-r1.ebuild 498 BLAKE2B 448e387b331a21cf712b3ec6eef99f5d015fb8d623ed8d835672dc00314e1f5fe8b191d0d6b9893affd184e6ff6ff117bf9d17a0a9a39516d4a7639e9e447660 SHA512 2bd30635bc0a55d85391999f5074be1f59fc2eb81485e08e70803f7728c5ee7411f1ce156b623a31c683d381f26867092433a7f40d588f15614f959e2739ba66
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-web1913/dictd-web1913-1.4-r1.ebuild b/app-dicts/dictd-web1913/dictd-web1913-1.4-r1.ebuild
deleted file mode 100644
index 9b370780015d..000000000000
--- a/app-dicts/dictd-web1913/dictd-web1913-1.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P=${P/td/t}-pre
-DESCRIPTION="Webster's Revised Unabridged Dictionary (1913) for dict"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="ftp://ftp.dict.org/pub/dict/pre/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc amd64 ppc64"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/lib/dict
- doins web1913.dict.dz web1913.index || die
-}
diff --git a/app-dicts/dictd-web1913/metadata.xml b/app-dicts/dictd-web1913/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-web1913/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dictd-wn-3.0_p33 b/app-dicts/dictd-wn-3.0_p33
new file mode 100644
index 000000000000..cdb5ddc45f05
--- /dev/null
+++ b/app-dicts/dictd-wn-3.0_p33
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=app-text/dictd-1.5.5
+DESCRIPTION=WordNet for dict
+EAPI=6
+HOMEPAGE=https://wordnet.princeton.edu/
+KEYWORDS=amd64 ppc ppc64 sparc x86
+LICENSE=Princeton
+SLOT=0
+SRC_URI=mirror://debian/pool/main/w/wordnet/dict-wn_3.0-33_all.deb
+_eclasses_=unpacker 87633b2194cdb56adaa1f5a5c8862c44
+_md5_=247b7e277af3b96a1f943cde15d42e5f
diff --git a/app-dicts/dictd-wn/Manifest b/app-dicts/dictd-wn/Manifest
deleted file mode 100644
index 51f41a45ae2f..000000000000
--- a/app-dicts/dictd-wn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict-wn_3.0-33_all.deb 10610306 BLAKE2B 9d9aeff72582e4ee3ede5e8b3872515cfe0acb1e17a14cecd7d492a36fe5e509515048e7c2978cf453abdbfb19dac89b496b78e2b8fc25e2924c8ea818e8713a SHA512 94a72c4fc8d8864abfb4372742f82534977d9472ef3751e58dd017e4ee78db0d541614c54a47634c9d1fbc25eec136f6dc5146845e971f87447ff091ac0278cb
-EBUILD dictd-wn-3.0_p33.ebuild 515 BLAKE2B 2edeff1e507c48692a653f97d6b90bd952fde52586f66236c05a1b7bd9a01ccab8317f8f4c784ebd86a4fb2a2f59118413e9521f60e2f8f073a5d87a1851f113 SHA512 e7dcfbaec02f8f6261d9aae7ed6b8e51b538f372961f182e6e82f8902b31ecf8bafe92ba07c61aae9fa615289c18d780d642884d0a4d75d4c675738e85b074c1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild b/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild
deleted file mode 100644
index 3b7a66430c38..000000000000
--- a/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit unpacker
-
-DESCRIPTION="WordNet for dict"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="mirror://debian/pool/main/w/wordnet/dict-wn_${PV/_p/-}_all.deb"
-
-LICENSE="Princeton"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_install() {
- insinto /usr/lib/dict
- doins usr/share/dictd/{wn.dict.dz,wn.index}
-}
diff --git a/app-dicts/dictd-wn/metadata.xml b/app-dicts/dictd-wn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/dictd-wn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/dikt-2s_p1 b/app-dicts/dikt-2s_p1
new file mode 100644
index 000000000000..b9e962236381
--- /dev/null
+++ b/app-dicts/dikt-2s_p1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=A dictionary application that implements the Dict protocol
+EAPI=6
+HOMEPAGE=https://www.dikt.tv/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 5656d5465214c16946f295475046ea21 kde5-functions 475002208a2233f4ab555934b2b0ed0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4efbd95f33a9395d2ab4da70f8b13e7
diff --git a/app-dicts/dikt/Manifest b/app-dicts/dikt/Manifest
deleted file mode 100644
index 31d7e3250ce2..000000000000
--- a/app-dicts/dikt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dikt-2s1.tar.xz 52620 BLAKE2B 7afbefdf136b4aaf81ca30399263760a10366c362f07cf620a2c42ab10e5cd6b1eb3ada308f99d7a80a077089cc189ca634d5fdb30a30063dc12fc5e748ad555 SHA512 b7b26ace5ce6326191047d0d0515db2b88e790475be569d7bb994879046aa26c93a663d6bef31f8e8b233377ebd602355fb11b275f3aec910f99a5372fcde682
-EBUILD dikt-2s_p1.ebuild 930 BLAKE2B ddf2152810b18f97807b39726c4f27b8fe9e706e8a30a1c4f391b9ad9f846fd9eed2597269e70570cc21277e0e3d8a9ebac3df5fee0b08901d8746c528afb3cc SHA512 8fb48b23b7ec7352cf8f4acdc9aed51e12d1633f3df75199e4f6805599fb0f6a0abc092513eea266ed872d6e97e94fbf8581b119fa793593ccf59d116661d2df
-MISC metadata.xml 326 BLAKE2B 624268b9a2d4f8983ec8169bd8104664b0c801608dfdc5b14bab148ed403d7953fef7d1dcdc9bb38fe96537caa8039d727be4c1f8e2583177940cf86b24c6340 SHA512 5916d213c1415f8acd3c51547b307708e108381384001ac3cb940ae74d7c20313f0917128b9b20f6d30693f08f29ffb721e55586d6ce9b8b5d99fc72c9e35dc0
diff --git a/app-dicts/dikt/dikt-2s_p1.ebuild b/app-dicts/dikt/dikt-2s_p1.ebuild
deleted file mode 100644
index 883017e4880e..000000000000
--- a/app-dicts/dikt/dikt-2s_p1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/_p/}
-
-inherit kde5
-
-DESCRIPTION="A dictionary application that implements the Dict protocol"
-HOMEPAGE="https://www.dikt.tv/"
-SRC_URI="https://bitbucket.org/dikt/code/downloads/${MY_P}.txz -> ${MY_P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
- !app-dicts/dikt:4
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/dikt/metadata.xml b/app-dicts/dikt/metadata.xml
deleted file mode 100644
index 3ce8c1cc9be6..000000000000
--- a/app-dicts/dikt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
- <remote-id type="bitbucket">dikt/code</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/duali-data-0.1b-r1 b/app-dicts/duali-data-0.1b-r1
new file mode 100644
index 000000000000..d7d9ac4722b0
--- /dev/null
+++ b/app-dicts/duali-data-0.1b-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DEPEND=>=app-text/duali-0.2.0-r1
+DESCRIPTION=Dictionary data for the Arab dictionary project duali
+EAPI=6
+HOMEPAGE=https://www.arabeyes.org/Duali
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/arabeyes/duali-data-0.1b.tar.gz
+_md5_=80ada95f80fd2c3a8ca7db33aa638f2d
diff --git a/app-dicts/duali-data/Manifest b/app-dicts/duali-data/Manifest
deleted file mode 100644
index 45df3dbea630..000000000000
--- a/app-dicts/duali-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST duali-data-0.1b.tar.gz 1155647 BLAKE2B d347f558308258972e4a17e5ef19d775a9e0676e64e48937e96149b8b09f5d6c497d7f1dd87d3505ac3b87f50e47910996689d7a8af8be04e02d4eb84f47f7b2 SHA512 c8aea8c02e91991d9ee9149ae20d5a40d6a88c7a54d13a9d1fcbf94ad4bedb177ed18cc9330fd2c4565684299d8f9359d213e27ebd46e129c41d4a7c42fa9d9c
-EBUILD duali-data-0.1b-r1.ebuild 1021 BLAKE2B 4530e45f3592d82c136604acf7c7dc703aa7298101d633c5af35ec0597c6fcb47f20adae10d7b7632a182ad008fe86c52dcc4c6146eea8d3e0ca7e0f088339ad SHA512 8fd9bf6554a8906b6a927e757ed23e3b7f8e7228dcfc4fa70b260addeebcb4b76fa2b7c7f823e876d79d0133c5c3241987d1da33c2b44350921727a106673a23
-MISC metadata.xml 245 BLAKE2B 7dc5df660e9e3cc71fcd39abbcc77edc7890bd44fa6e2d68556b914e6a35c6e6526e281b6aa286a0f12893a527669c2fbf64d63c8ad555137e222832edaf2cc1 SHA512 5cf81ad67c841f8eb5a71ef18b6ae6c344d68fb63c80c21f4a9b9a0060de938264530276a152eb5451dd88a5955f04a48c8cd4d034be6bc7a1922b5e4f43539f
diff --git a/app-dicts/duali-data/duali-data-0.1b-r1.ebuild b/app-dicts/duali-data/duali-data-0.1b-r1.ebuild
deleted file mode 100644
index 29fa249f7b2c..000000000000
--- a/app-dicts/duali-data/duali-data-0.1b-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dictionary data for the Arab dictionary project duali"
-HOMEPAGE="https://www.arabeyes.org/Duali"
-SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=">=app-text/duali-0.2.0-r1"
-RDEPEND=""
-
-src_compile() {
- dict2db --path ./ || die 'failed to compile databases'
-}
-
-src_install() {
- dodoc README
-
- insinto /usr/share/duali
- doins tableab tableac tablebc
-
- # The dict2db script (and the spellchecker itself) use the python
- # anydbm module, which means we kinda don't know what file suffix is
- # going to pop out in src_compile. The fact that app-text/duali
- # requires python[gdbm] means that we should at least get the gdbm
- # database format (e.g. stemsdb) if not stems.db.
- if [[ -e stems.db ]]; then
- doins stems.db prefixes.db suffixes.db
- else
- doins stemsdb prefixesdb suffixesdb
- fi
-}
diff --git a/app-dicts/duali-data/metadata.xml b/app-dicts/duali-data/metadata.xml
deleted file mode 100644
index c8c6479d60fe..000000000000
--- a/app-dicts/duali-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">arabeyes</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/eblook-1.6.1 b/app-dicts/eblook-1.6.1
new file mode 100644
index 000000000000..98e98f6d14d8
--- /dev/null
+++ b/app-dicts/eblook-1.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/eb-3.3.4
+DESCRIPTION=Interactive search utility for electronic dictionaries
+EAPI=4
+HOMEPAGE=http://openlab.ring.gr.jp/edict/eblook/
+KEYWORDS=~amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/eb-3.3.4
+SLOT=0
+SRC_URI=http://openlab.ring.gr.jp/edict/eblook/dist/eblook-1.6.1.tar.gz
+_md5_=20c4ddbee6886795efbd84082631ab66
diff --git a/app-dicts/eblook/Manifest b/app-dicts/eblook/Manifest
deleted file mode 100644
index 2c7b55194373..000000000000
--- a/app-dicts/eblook/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eblook-1.6.1.tar.gz 440727 BLAKE2B 313dcc89fea9dbc8dac8c9fda618cf4e39d0cfef4f67ba7cf2ab29e3b1c8dc0559407c1f1c68c9994594b784acb445c6fe988456e14da324bd38c89de23f3ffe SHA512 36f4f383a53a0332a2dec0e40d2743c93d35c9f51a7de2d2706bbc18a4fde215d4e345feb175bebf428c1760cb32e73148fb9b336fcde8c0d8b924ee6ecfd6a4
-EBUILD eblook-1.6.1.ebuild 571 BLAKE2B 1607e198c2b9b097be393ccb02816d2296dc9e31811e365d955720a131dccdf7df88056aa226e65df8850434243d98027c5232a735af8153f9a4740d9da16f6e SHA512 03c60fb350104aea1a060f9e12e28406f14c97f0daccb5dc012b0ed43d5c3f7aaf663899216ba3a6539578c7884fc6f2c4ea1fa5b223d86a390c683ce358c23c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/eblook/eblook-1.6.1.ebuild b/app-dicts/eblook/eblook-1.6.1.ebuild
deleted file mode 100644
index c99eec6320c0..000000000000
--- a/app-dicts/eblook/eblook-1.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Interactive search utility for electronic dictionaries"
-HOMEPAGE="http://openlab.ring.gr.jp/edict/eblook/"
-SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/eb-3.3.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P%_*}"
-
-src_prepare() {
- sed \
- -e 's:LDFAGS:LDFLAGS:g' \
- -i configure || die
-}
-
-src_configure() {
- econf --with-eb-conf=/etc/eb.conf
-}
diff --git a/app-dicts/eblook/metadata.xml b/app-dicts/eblook/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/eblook/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/edictionary-2.6-r1 b/app-dicts/edictionary-2.6-r1
new file mode 100644
index 000000000000..50ecb33e7b4d
--- /dev/null
+++ b/app-dicts/edictionary-2.6-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl
+DESCRIPTION=Command line dictionary and thesaurus
+EAPI=6
+HOMEPAGE=http://edictionary.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/edictionary/edict-2.6.tar.gz
+_md5_=bcdada8b925e70c8f435260bdc1be21f
diff --git a/app-dicts/edictionary/Manifest b/app-dicts/edictionary/Manifest
deleted file mode 100644
index 263d9703e4e8..000000000000
--- a/app-dicts/edictionary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST edict-2.6.tar.gz 51300 BLAKE2B dd074c4b4d771921c21cc63e3960951ff6e62e8485ee2a9e967751670562e29ae434d7a2a79886797093f315bdba2134f7d45c024a0657c4a53314d96c66fbce SHA512 03a9977df6d150e7e99805f8dc5f62e1f6d84360d79684210a4cbd8105ccf541777513c99bf77934a9b8e26e4aad8d88b84146b165d9e1a21dff80587f900677
-EBUILD edictionary-2.6-r1.ebuild 581 BLAKE2B 3f7c9910a9276c1d223fa6a6c20c70628c81538fb7215b2b6cd3b018012659e9a290f376fb9d00ae0070025adca6150dafea328e335ad6771628169282861786 SHA512 8232b9c399252cf75950d5dea47e96e3a217c7be30324ea710c3bc2f002f3acb58bf72d7a8aa0782c2d838a8818e13f8f9c98ed901d553804cec82df8cf781e1
-MISC metadata.xml 248 BLAKE2B e8f2543e96039d68fbb9cfc7d37070cdd0f1384241be51a2c64ceed812e96f24b0add8562844e76d6a8e0bd4323f28756320869014737373418465e9ab0205d0 SHA512 29dd3bc3af7e298f231bb050316417291c18d86e8a1f00600fcedb46b1704837b15efacb859f2b8df7db20f9931256bb6137781512bf2aac5356abfb41584f5c
diff --git a/app-dicts/edictionary/edictionary-2.6-r1.ebuild b/app-dicts/edictionary/edictionary-2.6-r1.ebuild
deleted file mode 100644
index a0ae02ba223b..000000000000
--- a/app-dicts/edictionary/edictionary-2.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="edict"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line dictionary and thesaurus"
-HOMEPAGE="http://edictionary.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-lang/perl"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_install() {
- make prefix="${ED}/usr/bin" install
- dodoc Changelog ReleaseNotes README TODO
-}
diff --git a/app-dicts/edictionary/metadata.xml b/app-dicts/edictionary/metadata.xml
deleted file mode 100644
index da5ae83a313a..000000000000
--- a/app-dicts/edictionary/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">edictionary</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/freedict-deu-eng-1.0 b/app-dicts/freedict-deu-eng-1.0
new file mode 100644
index 000000000000..2fed8b654018
--- /dev/null
+++ b/app-dicts/freedict-deu-eng-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedict for language translation from German to English
+EAPI=6
+HOMEPAGE=http://freedict.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-text/dictd
+SLOT=0
+SRC_URI=http://freedict.sourceforge.net/download/linux/deu-eng.tar.gz
+_eclasses_=freedict 2bc659a64b6743fb2efcb7d2cea78f22
+_md5_=37c162b8cb87f525fee473bd036aa231
diff --git a/app-dicts/freedict-deu-eng/Manifest b/app-dicts/freedict-deu-eng/Manifest
deleted file mode 100644
index 7d7327d1d04c..000000000000
--- a/app-dicts/freedict-deu-eng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deu-eng.tar.gz 2113223 BLAKE2B 555d893e7f676bc19b54abe0a25ad9e55af3c76b3a1e3e82dbfceb2a1f8492f9e3836d0870880bb03c311e4787e6b0a04bf793bfc22326b24fdef65f7006b3c2 SHA512 44679d0c75054fc843279b88643298bb365862571e8ad9a27190216bf67aeed5b97e6d099de6c4c9af191a80499a644b107b960588a86e921ec57a76fde4c6aa
-EBUILD freedict-deu-eng-1.0.ebuild 199 BLAKE2B 35d3408cff0167fb6ba56b9486aca1ff472162294d90eb4c6aeaa9f16f225a05283e3b8698d05bd106ff67cd9a26d37518800f4064e78eb844465b0a33523e74 SHA512 9ade975678c63b7ec91cfb791e627eb5895c9bf3032ff85ef9e2bfe3760fdd3be2327de97ed57a4fea798313566b590997fb4521e9c8a1d19cadec5c98fb6769
-MISC metadata.xml 245 BLAKE2B 750cee34046e85e993c19513d9faf89b41d2f3efcfe1c81e5aae665b92491863a5bf17cf72b05b9b59c65ac981b859edf7348cd5c4ce89ee5ff415fe20d7f52a SHA512 464ccd737e084f5f74765a07183611d1b557b7d444806be83848755aac45f1c5971100b0387bc7a741af86bc30c687ccacd45bdb0d6cba2430c1f5004c0ad845
diff --git a/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild b/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
deleted file mode 100644
index 7918050aae69..000000000000
--- a/app-dicts/freedict-deu-eng/freedict-deu-eng-1.0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORLANG="German"
-TOLANG="English"
-inherit freedict
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/app-dicts/freedict-deu-eng/metadata.xml b/app-dicts/freedict-deu-eng/metadata.xml
deleted file mode 100644
index 9d61bce2ec93..000000000000
--- a/app-dicts/freedict-deu-eng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">freedict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/freedict-eng-fra-1.0 b/app-dicts/freedict-eng-fra-1.0
new file mode 100644
index 000000000000..9fc5431104eb
--- /dev/null
+++ b/app-dicts/freedict-eng-fra-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedict for language translation from English to French
+EAPI=6
+HOMEPAGE=http://freedict.sourceforge.net/
+KEYWORDS=alpha ~amd64 ~hppa ~mips ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=app-text/dictd
+SLOT=0
+SRC_URI=http://freedict.sourceforge.net/download/linux/eng-fra.tar.gz
+_eclasses_=freedict 2bc659a64b6743fb2efcb7d2cea78f22
+_md5_=c98f29ca88b42f5233b1eccfa814cdf2
diff --git a/app-dicts/freedict-eng-fra/Manifest b/app-dicts/freedict-eng-fra/Manifest
deleted file mode 100644
index b175bc83ebf0..000000000000
--- a/app-dicts/freedict-eng-fra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eng-fra.tar.gz 212980 BLAKE2B a731793e43ed753583d3f2642f7d81e471fbdc37c81535be43d020bb25074473dca4b7861a41022937eaa4c985deafad8bd116cd551ad3a81ba621cacd60766e SHA512 820152732941ccb12b8005780e91eeceb2cc2c239bc1d56cbdc800a98ac28bbff3f882d9fa327642bbb2df7f305b0e78b01c1794a021cca8f9315e030a83c62d
-EBUILD freedict-eng-fra-1.0.ebuild 226 BLAKE2B b3ddc71b7f3ae81b519ace2b636a0f4f4df38d4e72e4c587a6ea7d6d5349ce6355e1edf7bd00d9b6e35f884e08ecf1fa8d6c69b8c07e9dd1a784289ee3e9a1bc SHA512 4f5174bf42990c4d3e9808f870c37531768f50a000e1fec70a0623fcc02c76b11c73ebe5ecb7b4703fca8a89128ed64b9872f5b4de8c397609d59ffc7375224c
-MISC metadata.xml 245 BLAKE2B 750cee34046e85e993c19513d9faf89b41d2f3efcfe1c81e5aae665b92491863a5bf17cf72b05b9b59c65ac981b859edf7348cd5c4ce89ee5ff415fe20d7f52a SHA512 464ccd737e084f5f74765a07183611d1b557b7d444806be83848755aac45f1c5971100b0387bc7a741af86bc30c687ccacd45bdb0d6cba2430c1f5004c0ad845
diff --git a/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild b/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
deleted file mode 100644
index 4709e7c0ba3f..000000000000
--- a/app-dicts/freedict-eng-fra/freedict-eng-fra-1.0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORLANG="English"
-TOLANG="French"
-inherit freedict
-
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/freedict-eng-fra/metadata.xml b/app-dicts/freedict-eng-fra/metadata.xml
deleted file mode 100644
index 9d61bce2ec93..000000000000
--- a/app-dicts/freedict-eng-fra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">freedict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/freedict-eng-ita-1.0 b/app-dicts/freedict-eng-ita-1.0
new file mode 100644
index 000000000000..46ea8d9ef089
--- /dev/null
+++ b/app-dicts/freedict-eng-ita-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedict for language translation from English to Italian
+EAPI=6
+HOMEPAGE=http://freedict.sourceforge.net/
+KEYWORDS=alpha ~amd64 ~hppa ~mips ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=app-text/dictd
+SLOT=0
+SRC_URI=http://freedict.sourceforge.net/download/linux/eng-ita.tar.gz
+_eclasses_=freedict 2bc659a64b6743fb2efcb7d2cea78f22
+_md5_=254299895a10d5aec2b210ef7fcc19e0
diff --git a/app-dicts/freedict-eng-ita/Manifest b/app-dicts/freedict-eng-ita/Manifest
deleted file mode 100644
index c9749c889e70..000000000000
--- a/app-dicts/freedict-eng-ita/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eng-ita.tar.gz 76372 BLAKE2B e7b44baa9656b8c2bb7e826fd14d0d843d4e4597a172975be90f7d9dbe41412a8d54981537b7bb02de835e31197a1471a90c605e35c302276e82f1bb3a5fc2be SHA512 030a1877153938c287cd6e8729af47bc419d8464836f48b105c28533d2c46ea509ae56e10a1e3b3affd85d2bbf6efb2f3bc1e6feb49adbeafab8f178f4838fa9
-EBUILD freedict-eng-ita-1.0.ebuild 228 BLAKE2B a8c4ff145d9c0a03f68ecd39be0bc2cb506efe02bef804d87f3ddf920b19aa67dc6bdb63da8b69eacb2f27cbd22c40c4d8cfdb32aefeefadeefe95205167698f SHA512 508a0205a9a3b0a49a96d32c49ea332bd942b7a3c70f88ab8cd884ab41b087a61df8b554f23fea387780742f31b11125aa0f68b3a47dbe64039590cabea479e8
-MISC metadata.xml 245 BLAKE2B 750cee34046e85e993c19513d9faf89b41d2f3efcfe1c81e5aae665b92491863a5bf17cf72b05b9b59c65ac981b859edf7348cd5c4ce89ee5ff415fe20d7f52a SHA512 464ccd737e084f5f74765a07183611d1b557b7d444806be83848755aac45f1c5971100b0387bc7a741af86bc30c687ccacd45bdb0d6cba2430c1f5004c0ad845
diff --git a/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild b/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
deleted file mode 100644
index b4a3f490fbeb..000000000000
--- a/app-dicts/freedict-eng-ita/freedict-eng-ita-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc sparc x86"
-
-FORLANG="English"
-TOLANG="Italian"
-inherit freedict
-
-IUSE=""
diff --git a/app-dicts/freedict-eng-ita/metadata.xml b/app-dicts/freedict-eng-ita/metadata.xml
deleted file mode 100644
index 9d61bce2ec93..000000000000
--- a/app-dicts/freedict-eng-ita/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">freedict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/freedict-eng-swe-1.0 b/app-dicts/freedict-eng-swe-1.0
new file mode 100644
index 000000000000..82899a5c6535
--- /dev/null
+++ b/app-dicts/freedict-eng-swe-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedict for language translation from English to Swedish
+EAPI=6
+HOMEPAGE=http://freedict.sourceforge.net/
+KEYWORDS=alpha ~amd64 ~hppa ~mips ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=app-text/dictd
+SLOT=0
+SRC_URI=http://freedict.sourceforge.net/download/linux/eng-swe.tar.gz
+_eclasses_=freedict 2bc659a64b6743fb2efcb7d2cea78f22
+_md5_=607544c7b7ac1ca833246805cf70f266
diff --git a/app-dicts/freedict-eng-swe/Manifest b/app-dicts/freedict-eng-swe/Manifest
deleted file mode 100644
index 37b2237a9e5a..000000000000
--- a/app-dicts/freedict-eng-swe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eng-swe.tar.gz 126735 BLAKE2B c9b0e4c5c79f32c75486187d67bafe37d1197cbfb114ad269ee3e3e8cfd3ec904e8f303d46291a6a6535e0f374fc750c8afe5968d435370eb27532d580f9f033 SHA512 3075d5b4928ec3285f70ec22f5f501fb4823f888dc2eb218380efd83c786f9a9063f0709b6c59abf70f86a5b5005f45f2e376d6d1a03fb434dc479794bc45662
-EBUILD freedict-eng-swe-1.0.ebuild 228 BLAKE2B 667f5f2de4a9f5c91a707618f1415b43a715dca505f3a3160047fc9716ed08930907c02dfc82adfc494e1f85ae3aa0d72e2d8f3f0679a9fdc20e4e021df7dcd7 SHA512 1576868793b9e7e5bad38a1b4259d12659aec92da708b031f6da1cff435cfcfb9a00f4d1b089573878ff8736801457ba13b53de9d3f4ae6a453cb04140871090
-MISC metadata.xml 245 BLAKE2B 750cee34046e85e993c19513d9faf89b41d2f3efcfe1c81e5aae665b92491863a5bf17cf72b05b9b59c65ac981b859edf7348cd5c4ce89ee5ff415fe20d7f52a SHA512 464ccd737e084f5f74765a07183611d1b557b7d444806be83848755aac45f1c5971100b0387bc7a741af86bc30c687ccacd45bdb0d6cba2430c1f5004c0ad845
diff --git a/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild b/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
deleted file mode 100644
index ee1b392fcd3b..000000000000
--- a/app-dicts/freedict-eng-swe/freedict-eng-swe-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc sparc x86"
-
-FORLANG="English"
-TOLANG="Swedish"
-inherit freedict
-
-IUSE=""
diff --git a/app-dicts/freedict-eng-swe/metadata.xml b/app-dicts/freedict-eng-swe/metadata.xml
deleted file mode 100644
index 9d61bce2ec93..000000000000
--- a/app-dicts/freedict-eng-swe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">freedict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/freedict-fra-eng-1.0 b/app-dicts/freedict-fra-eng-1.0
new file mode 100644
index 000000000000..bab5b5407292
--- /dev/null
+++ b/app-dicts/freedict-fra-eng-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedict for language translation from French to English
+EAPI=6
+HOMEPAGE=http://freedict.sourceforge.net/
+KEYWORDS=alpha ~amd64 ~hppa ~mips ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=app-text/dictd
+SLOT=0
+SRC_URI=http://freedict.sourceforge.net/download/linux/fra-eng.tar.gz
+_eclasses_=freedict 2bc659a64b6743fb2efcb7d2cea78f22
+_md5_=af42562528271e26d87b4507ac5fde02
diff --git a/app-dicts/freedict-fra-eng/Manifest b/app-dicts/freedict-fra-eng/Manifest
deleted file mode 100644
index 2100f466775d..000000000000
--- a/app-dicts/freedict-fra-eng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fra-eng.tar.gz 192146 BLAKE2B 8b5fbcba1a4b603325d235a3af117d161503ef93e30839bd85de6de19912473d11408be03ab1fa6745f8f9ca3a18cd4f5060019f6e8c6f6c9080ab3d10327f64 SHA512 93ea5c277b18af15fc9c3dff93d62b0bafdfb34b6db9178cdeac9b6678af18914adcff70afabfa62138f5a7e86235fa52d7dedb37af473678bedcfa6df020afd
-EBUILD freedict-fra-eng-1.0.ebuild 227 BLAKE2B a1fbdc4f64863757475725fd29c75db0c92b4081a978dce8b160ad5920cfd35d2d7fa75dd9f59c00e0695437c5f24a202e7ff99d8f2de9bc57d389f47fa149cc SHA512 ddcbf282570d7a385421274718b9b113aa34007bd9c36d5b5dc6cf7873951f4c7210133b644b62b2a9305e3db73349f3ff167263cef6a29517e84b121c35edfb
-MISC metadata.xml 245 BLAKE2B 750cee34046e85e993c19513d9faf89b41d2f3efcfe1c81e5aae665b92491863a5bf17cf72b05b9b59c65ac981b859edf7348cd5c4ce89ee5ff415fe20d7f52a SHA512 464ccd737e084f5f74765a07183611d1b557b7d444806be83848755aac45f1c5971100b0387bc7a741af86bc30c687ccacd45bdb0d6cba2430c1f5004c0ad845
diff --git a/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild b/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
deleted file mode 100644
index f796f9e6e037..000000000000
--- a/app-dicts/freedict-fra-eng/freedict-fra-eng-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc sparc x86"
-
-FORLANG="French"
-TOLANG="English"
-inherit freedict
-
-IUSE=""
diff --git a/app-dicts/freedict-fra-eng/metadata.xml b/app-dicts/freedict-fra-eng/metadata.xml
deleted file mode 100644
index 9d61bce2ec93..000000000000
--- a/app-dicts/freedict-fra-eng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">freedict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/freedict-ita-eng-1.0 b/app-dicts/freedict-ita-eng-1.0
new file mode 100644
index 000000000000..3fad4ec0d830
--- /dev/null
+++ b/app-dicts/freedict-ita-eng-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedict for language translation from Italian to English
+EAPI=6
+HOMEPAGE=http://freedict.sourceforge.net/
+KEYWORDS=alpha ~amd64 ~hppa ~mips ppc sparc x86
+LICENSE=GPL-2+
+RDEPEND=app-text/dictd
+SLOT=0
+SRC_URI=http://freedict.sourceforge.net/download/linux/ita-eng.tar.gz
+_eclasses_=freedict 2bc659a64b6743fb2efcb7d2cea78f22
+_md5_=9174dda8e4f67dbeab64a437d0694318
diff --git a/app-dicts/freedict-ita-eng/Manifest b/app-dicts/freedict-ita-eng/Manifest
deleted file mode 100644
index da56b42adf10..000000000000
--- a/app-dicts/freedict-ita-eng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ita-eng.tar.gz 65443 BLAKE2B 0301aab3f704b24ab063c501bd308ec87f63b30fbd65012be443bbf728b102d26033194367e75464a6a3cf1b917cc11c5ecb339604a3826d67482865a9ec3de9 SHA512 69124f68a417d5a6516441a993c0a2c1729d1336544459168e417c4c5586d3e8a3d88be82fd664238da348c6950a95408088028a7130b9f5d78cb8bbed22519a
-EBUILD freedict-ita-eng-1.0.ebuild 228 BLAKE2B 24303307c1239a03786a5c2b9c5f5baaab56d9d3c553d59fdd5f42fcfb1a6b5d85d4fd85dd37684ef888012185dc66ef886887e5a4c8961e92c8aa4bbe4390ec SHA512 58c13c1e06f0fb10599b8ec0268b44f36b09fa47d9f88e3ffe95106b78a444c4b6474d438e5b02243cc589127749add820facc1555f042b296fb224cd4e7908f
-MISC metadata.xml 245 BLAKE2B 750cee34046e85e993c19513d9faf89b41d2f3efcfe1c81e5aae665b92491863a5bf17cf72b05b9b59c65ac981b859edf7348cd5c4ce89ee5ff415fe20d7f52a SHA512 464ccd737e084f5f74765a07183611d1b557b7d444806be83848755aac45f1c5971100b0387bc7a741af86bc30c687ccacd45bdb0d6cba2430c1f5004c0ad845
diff --git a/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild b/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
deleted file mode 100644
index 4231cb0c1f4e..000000000000
--- a/app-dicts/freedict-ita-eng/freedict-ita-eng-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="alpha ~amd64 ~hppa ~mips ppc sparc x86"
-
-FORLANG="Italian"
-TOLANG="English"
-inherit freedict
-
-IUSE=""
diff --git a/app-dicts/freedict-ita-eng/metadata.xml b/app-dicts/freedict-ita-eng/metadata.xml
deleted file mode 100644
index 9d61bce2ec93..000000000000
--- a/app-dicts/freedict-ita-eng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">freedict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/gnome-dictionary-3.24.1 b/app-dicts/gnome-dictionary-3.24.1
new file mode 100644
index 000000000000..d9fe87fc73f3
--- /dev/null
+++ b/app-dicts/gnome-dictionary-3.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dictionary utility for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
+IUSE=debug +introspection ipv6
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.42:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.21.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
+SLOT=0/10
+SRC_URI=mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=85a031dfce3bbd92255dc793a96bfd63
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
deleted file mode 100644
index 35962b0f8a7e..000000000000
--- a/app-dicts/gnome-dictionary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3
-EBUILD gnome-dictionary-3.24.1.ebuild 1032 BLAKE2B 226863b951121fe5190d892b087237493ce32c83869bb7402026afba37de83c09fa3e0d6b016374194f0a412be7a7dda402af4520ac485d1c6ebcacb3a0fed35 SHA512 0650e59d1c2cdaf26f2c2617b886e80a9118fbb2337c3a1acef5445e0f64327ed87939739821fdbf21fde6c2f594a868a88e12e71a7a7e4bc49a8a7a1068f39d
-MISC metadata.xml 316 BLAKE2B 61e50cf64e718dff6380a8840d59f5679e8f084efadcda41cfb45af74177d1121af1db7485fe57690090b0d1deaceaf9d53733fe39447827643c1785b4c68f3d SHA512 c46d3611dc1954a3229a98892c23aa1ebbc74c572dc5562660fce3390cfb74252515ee3a3048418c855c8165a5cea8e5df1fc10c94f81915eac400d7c58850aa
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
deleted file mode 100644
index 21f7fccae549..000000000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Dictionary utility for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="0/10" # subslot = suffix of libgdict-1.0.so
-IUSE="debug +introspection ipv6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.42:2[dbus]
- x11-libs/cairo:=
- >=x11-libs/gtk+-3.21.1:3
- x11-libs/pango
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gsettings-desktop-schemas
- !<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.15
- >=dev-util/intltool-0.40
- dev-util/itstool
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable introspection) \
- $(use_enable ipv6)
-}
diff --git a/app-dicts/gnome-dictionary/metadata.xml b/app-dicts/gnome-dictionary/metadata.xml
deleted file mode 100644
index a7272621102e..000000000000
--- a/app-dicts/gnome-dictionary/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<slots>
- <subslots>libgdict-1.0 soname version</subslots>
-</slots>
-</pkgmetadata>
diff --git a/app-dicts/gwaei-3.6.2 b/app-dicts/gwaei-3.6.2
new file mode 100644
index 000000000000..df31a7898573
--- /dev/null
+++ b/app-dicts/gwaei-3.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app-text/gnome-doc-utils-0.14.0 ) hunspell? ( app-text/hunspell ) nls? ( virtual/libintl ) mecab? ( app-text/mecab ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/scrollkeeper-dtd ) gtk? ( x11-themes/gnome-icon-theme-symbolic >=app-text/gnome-doc-utils-0.14.0 ) nls? ( >=sys-devel/gettext-0.17 ) app-text/rarian dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Japanese-English Dictionary for GNOME
+EAPI=4
+HOMEPAGE=http://gwaei.sourceforge.net/
+IUSE=gtk hunspell nls test mecab
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-misc/curl-7.20.0 >=dev-libs/glib-2.31 gtk? ( x11-libs/gtk+:3 >=app-text/gnome-doc-utils-0.14.0 ) hunspell? ( app-text/hunspell ) nls? ( virtual/libintl ) mecab? ( app-text/mecab )
+SLOT=0
+SRC_URI=mirror://sourceforge/gwaei/gwaei-3.6.2.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac52830e0fa62b5f182435c918df8a58
diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest
deleted file mode 100644
index d90afc29dada..000000000000
--- a/app-dicts/gwaei/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gwaei-3.6.2.tar.xz 547592 BLAKE2B 0a0f90639b81158ef6bfc69f0f74ad70af65ae9462c93f6e507d6a1087c424da9689f2308300c5d4b8090143d8d9e2f7fe183719e37fa463ffe2b937714b7463 SHA512 96876f7e15ff5e166dcd116e2286294b7b375e55723684e4e3dec31aba46d1c89ccd70007fc01cab97a5fd5e671ec073c3f69525ff7e68126851e587d4f20c3b
-EBUILD gwaei-3.6.2.ebuild 1340 BLAKE2B 75ce0f16f3c9a35bacdf00140aa99cfc37275563d760c9a27ba9ecb4b9bfb54ee64850a70b25feafb15d1f74cfb010a10ad661842415e8357dbcda8e0dc5dc2a SHA512 461fb40875e4ee90d69dbe9418c35f7ad123fed878fd32103c7f6810fd02efc5248c631580e9f228b8029206a00f93ca32c1c5a64d0e00e61d596055c00f8261
-MISC metadata.xml 762 BLAKE2B 96509839f9438ea2d387e73790629af5db6f7307dd7dc009489ee9aac1520ac53efb6cf855ceaa3a272cb128b60e2bd068f61e0375c104985d30198c10a1995a SHA512 2fade949182ab7d2a48a98f24c45f806cc84fdb481c8357c282fffc44c7a02a36dcb58f3c7ec586ee87c7a98b04522c33cc01135bfddeb49044ee2791b8b820b
diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild
deleted file mode 100644
index d1e6c6457f68..000000000000
--- a/app-dicts/gwaei/gwaei-3.6.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit gnome2-utils eutils
-
-DESCRIPTION="Japanese-English Dictionary for GNOME"
-HOMEPAGE="http://gwaei.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gwaei/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk hunspell nls test mecab"
-
-RDEPEND=">=net-misc/curl-7.20.0
- >=dev-libs/glib-2.31
- gtk? (
- x11-libs/gtk+:3
- >=app-text/gnome-doc-utils-0.14.0
- )
- hunspell? ( app-text/hunspell )
- nls? ( virtual/libintl )
- mecab? ( app-text/mecab )"
-DEPEND="${RDEPEND}
- test? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/scrollkeeper-dtd
- )
- gtk? (
- x11-themes/gnome-icon-theme-symbolic
- >=app-text/gnome-doc-utils-0.14.0
- )
- nls? ( >=sys-devel/gettext-0.17 )
- app-text/rarian
- dev-util/intltool
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- $(use_with gtk gnome) \
- $(use_enable nls) \
- $(use_with hunspell) \
- $(use_with mecab) \
- --disable-static \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- find "${D}" -name '*.la' -delete
-
- dodoc AUTHORS README
-}
-
-pkg_preinst() {
- if use gtk ; then
- gnome2_schemas_savelist
- fi
-}
-
-pkg_postinst() {
- if use gtk ; then
- gnome2_schemas_update
- fi
-}
-
-pkg_postrm() {
- if use gtk ; then
- gnome2_schemas_update
- fi
-}
diff --git a/app-dicts/gwaei/metadata.xml b/app-dicts/gwaei/metadata.xml
deleted file mode 100644
index 1f08d05dc89b..000000000000
--- a/app-dicts/gwaei/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <longdescription lang="en">
- gWaei is a drop-in replacement for Gjiten. The main feature of
- this dictonary program is regular expression support. For example,
- you can use periods in place of unknown Kanji of a word to search
- for it.
- </longdescription>
- <use>
- <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support</flag>
- <flag name="hunspell">Enable <pkg>app-text/hunspell</pkg> spellchecking and morphological analysis</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">gwaei</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/ipadic-2.7.0-r2 b/app-dicts/ipadic-2.7.0-r2
new file mode 100644
index 000000000000..53d4e83daff7
--- /dev/null
+++ b/app-dicts/ipadic-2.7.0-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-text/chasen-2.3.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Japanese dictionary for ChaSen
+EAPI=4
+HOMEPAGE=http://sourceforge.jp/projects/ipadic/
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=ipadic
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/ipadic/24435/ipadic-2.7.0.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9e976bc64ac9874f781ced3abd63cb59
diff --git a/app-dicts/ipadic/Manifest b/app-dicts/ipadic/Manifest
deleted file mode 100644
index ab66474b0a2a..000000000000
--- a/app-dicts/ipadic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ipadic-2.7.0-r2-gentoo.patch 896 BLAKE2B 69c2fb6a2379359d8060a59d0041faebd780769a0983e6797ed16d8143e0d05a046f82a0352a53226219c4888d91fd51b339a284e4e37f85d11c22e11a58f4a7 SHA512 0e6fa8f84c978c96d0fe8eebbda3166d298fa9709eec8025025e5705db04d08b3e7581f9341dad84808dba52c6dac2498743a4514701fa74289608287f3b2a82
-DIST ipadic-2.7.0.tar.gz 4300102 BLAKE2B bc6c60eb79c12dc06a30c021d5df2016f5b9c8a41540edfda3d9010716096ac25ee6a1a34b23690c86799eaa4c60fc68c499c0a20afbef865c07ec51b9ddcf40 SHA512 0c4617733d3a786f4a9d0773c50cd76da5433921dc4eb4f759b8b3c0fd3c0db411696068ee795a893063e1a7ab1bdb6afc740331c5fdd2c3ebc914324f4e33c3
-EBUILD ipadic-2.7.0-r2.ebuild 613 BLAKE2B 40a8d59f47ee03254702599421c33192f718f0c2d9104a0692dfa185273118dd9da9794a4d467f295ca4db347026927e71bf1b214e567d879cc37738657806b4 SHA512 a546f27a9757f5859344b6d9e6b2a2a9cd60421f360bd5e7f866993c7986ad807992ca30b52f47995e1ba0ddb8f9b49f8a58062b01f3c6a08425a010a7e19418
-MISC metadata.xml 313 BLAKE2B 29d8fd0791c9ef1edc0c84bec6d51512b47510bf511fe987d1d4e3ec9ebe235cde890508a545d4e8e16a7ab73d988261348fdfa94a44f294ae57d8bf8d8e9de1 SHA512 3319aeaacecbac0b8005dc910cfbb7357d068d920c739230fbeb61b1653d433efcadad1d07674d01ff092d9cbf8cd4f11ee317234b44b747bef6cf2fa0b1132b
diff --git a/app-dicts/ipadic/files/ipadic-2.7.0-r2-gentoo.patch b/app-dicts/ipadic/files/ipadic-2.7.0-r2-gentoo.patch
deleted file mode 100644
index 8c701a363ec5..000000000000
--- a/app-dicts/ipadic/files/ipadic-2.7.0-r2-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur ipadic-2.7.0.orig/Makefile.am ipadic-2.7.0/Makefile.am
---- ipadic-2.7.0.orig/Makefile.am 2003-09-13 14:37:17.000000000 +0900
-+++ ipadic-2.7.0/Makefile.am 2011-09-02 11:03:33.044589641 +0900
-@@ -11,18 +11,18 @@
- EXTRA_DIST = $(pre_data) $(lexical_dic) $(manual_files) @PACKAGE@.spec
- CLEANFILES = $(gen_data)
- #
--matrix.cha table.cha:
-+matrix.cha table.cha chadic.lex chadic.dat:
- $(MKDICDIR)/makemat
-
--chadic.da:
-+chadic.da: table.cha
- $(MKDICDIR)/makeda chadic *.dic
-
--install-data-local:
-- if test -f @CHASEN_CHASENRC_PATH@ ; then \
-- echo "Please modify @CHASEN_CHASENRC_PATH@"; \
-- else \
-- cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
-- fi
-+#install-data-local:
-+# if test -f @CHASEN_CHASENRC_PATH@ ; then \
-+# echo "Please modify @CHASEN_CHASENRC_PATH@"; \
-+# else \
-+# cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
-+# fi
-
- sjis-dist: dist
- gtar xzvf ipadic-@VERSION@.tar.gz
diff --git a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild b/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
deleted file mode 100644
index 5c5669004c10..000000000000
--- a/app-dicts/ipadic/ipadic-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit autotools eutils
-
-DESCRIPTION="Japanese dictionary for ChaSen"
-HOMEPAGE="http://sourceforge.jp/projects/ipadic/"
-SRC_URI="mirror://sourceforge.jp/${PN}/24435/${P}.tar.gz"
-
-LICENSE="ipadic"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=app-text/chasen-2.3.1"
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}/${PF}-gentoo.patch"
- eautoreconf
-}
-
-src_install () {
- default
-
- insinto /etc
- doins chasenrc
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-dicts/ipadic/metadata.xml b/app-dicts/ipadic/metadata.xml
deleted file mode 100644
index 96adbff6dce0..000000000000
--- a/app-dicts/ipadic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge-jp">ipadic</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/kasumi-2.5-r1 b/app-dicts/kasumi-2.5-r1
new file mode 100644
index 000000000000..2ab457af7856
--- /dev/null
+++ b/app-dicts/kasumi-2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=app-i18n/anthy virtual/libiconv x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Anthy dictionary maintenance tool
+EAPI=6
+HOMEPAGE=http://kasumi.osdn.jp/
+IUSE=nls
+KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-i18n/anthy virtual/libiconv x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/kasumi/41436/kasumi-2.5.tar.gz
+_md5_=37846cc1d6f66270d1cc2d34de523fcc
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
deleted file mode 100644
index 73bdc03dbed9..000000000000
--- a/app-dicts/kasumi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kasumi-desktop.patch 368 BLAKE2B 2d54d40cf569f3bad3552fc7461fcda4be17245937b14ac183d035410698a15efa1e2d1280055b2d21cee14e3dafa48c5c27a94f525e6948f37c7eea20193c5a SHA512 c45d95fe9d39b79fda38715ac00567b1993584f47b1e6040d7ec3c93f913d0d61f2667e07d3fcf6335e7ecf5f8978627b42f639caacf5da7a1e89d25faa8b35d
-DIST kasumi-2.5.tar.gz 279587 BLAKE2B 3f2b807f76bfe1915ef978b18cf3f26efc8f64c903bc0e271f0875c1f7d5611307e2587093f2f289d9ade95370725fb13d16253ae7dfa6a063c525b727f7bd15 SHA512 066dda59d84b456c514a896b376bfc6df8ac64404f06fbfa8c369381acb6d260b1f22874885be2eab844f8f3776b944a5c700a966464ebef74d82c28bc97f970
-EBUILD kasumi-2.5-r1.ebuild 589 BLAKE2B d76a28c455ee16fa2f646cccd3f5f283abd136b1f3a3dcff0564495659ee707d609fd4f76543420b1e7ca6d6b99542f0003f26d84048be31485cde37674e6d75 SHA512 f32f4f42c15704a5a745e044a0bf818eb0bcfdca793c9c2e430beb72974c393bff818b99b86715fbd923ab4d94d5b960dd13a75449566679d7d3dc849b5cca8e
-MISC metadata.xml 323 BLAKE2B 7b24481a26431b43922ac5dbb7baa6e36179920e3f80c33c05aa76ee7773a5dd709585bb0a7cab12c3a5208da9717bc9caadb962f7937c3722c681e470750722 SHA512 b6a8ed90fab75456464706096931ee1cd739b0019ccd9fb25c1e863ab0d95365a54feaa30e7c37158edb5062e07564d1839f89f4adbf641cd4815deb717c01c2
diff --git a/app-dicts/kasumi/files/kasumi-desktop.patch b/app-dicts/kasumi/files/kasumi-desktop.patch
deleted file mode 100644
index a61dc0e11d51..000000000000
--- a/app-dicts/kasumi/files/kasumi-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/kasumi.desktop.in
-+++ b/kasumi.desktop.in
-@@ -8,8 +8,8 @@
- Comment=Edit Anthy dictionary.
- Comment[ja]=Anthy ã®å€‹äººè¾žæ›¸ã«å˜èªžã‚’登録ã€å‰Šé™¤ã€ç·¨é›†ã™ã‚‹ãƒ„ールã§ã™ã€‚
- Exec=kasumi
--Icon=kasumi.png
-+Icon=/usr/share/pixmaps/kasumi.png
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=Applications;Settings;
-+Categories=Settings;
diff --git a/app-dicts/kasumi/kasumi-2.5-r1.ebuild b/app-dicts/kasumi/kasumi-2.5-r1.ebuild
deleted file mode 100644
index c0b6a4f5f4a8..000000000000
--- a/app-dicts/kasumi/kasumi-2.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Anthy dictionary maintenance tool"
-HOMEPAGE="http://kasumi.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/41436/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND="app-i18n/anthy
- virtual/libiconv
- x11-libs/gtk+:2
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
-
-src_configure() {
- econf $(use_enable nls)
-}
diff --git a/app-dicts/kasumi/metadata.xml b/app-dicts/kasumi/metadata.xml
deleted file mode 100644
index 0f46e249b607..000000000000
--- a/app-dicts/kasumi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge-jp">kasumi</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/libydpdict-1.0.2 b/app-dicts/libydpdict-1.0.2
new file mode 100644
index 000000000000..f0a5899abc35
--- /dev/null
+++ b/app-dicts/libydpdict-1.0.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Library for handling the Collins Dictionary database
+EAPI=5
+HOMEPAGE=http://toxygen.net/ydpdict/
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://toxygen.net/ydpdict/libydpdict-1.0.2.tar.gz
+_md5_=b7294a232c428b5150af34fdaa41259f
diff --git a/app-dicts/libydpdict/Manifest b/app-dicts/libydpdict/Manifest
deleted file mode 100644
index a01735a04a80..000000000000
--- a/app-dicts/libydpdict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libydpdict-1.0.2.tar.gz 297184 BLAKE2B 1e7e4aa905c5e3468b914ed48a1307edcfce8f563a2e5a622a2a47442b12025265b3c60350898b9dbc080af345635a85516444240699476af1ae59c5c58682bf SHA512 ccf2335e627a820a580c4cc95e04eca372f88232c4ca4d86bd5c8c5f9af1756f4642addaf39fa2702d3abe816d31f650d86cb480dbaf5f66f0a20b66cf5181b5
-EBUILD libydpdict-1.0.2.ebuild 415 BLAKE2B c3a2c82b282ce9404bd2f55ed58ae91c2085d79fd5be1d70ac0b8c33ddf3b4d34cf90efbffcc09a32cd065fff9d343df716a5326066d4286509983252b004cf0 SHA512 21880f8de0b67a683ab18235ba6f125c2cc466f72351485b1354de0dbfa4afc27bb2ec5e47d9dec4f2fcdf131b74dca4e97c511b988a59df8f8c92a8cb5bb5f1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/libydpdict/libydpdict-1.0.2.ebuild b/app-dicts/libydpdict/libydpdict-1.0.2.ebuild
deleted file mode 100644
index deac724709f1..000000000000
--- a/app-dicts/libydpdict/libydpdict-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Library for handling the Collins Dictionary database"
-HOMEPAGE="http://toxygen.net/ydpdict/"
-SRC_URI="http://toxygen.net/ydpdict/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS
-}
diff --git a/app-dicts/libydpdict/metadata.xml b/app-dicts/libydpdict/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/libydpdict/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/mecab-ipadic-2.7.0.20070801 b/app-dicts/mecab-ipadic-2.7.0.20070801
new file mode 100644
index 000000000000..fec43200a92a
--- /dev/null
+++ b/app-dicts/mecab-ipadic-2.7.0.20070801
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=app-text/mecab[unicode=]
+DESCRIPTION=IPA dictionary for MeCab
+EAPI=5
+HOMEPAGE=http://mecab.sourceforge.net/
+IUSE=unicode
+KEYWORDS=amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=ipadic
+SLOT=0
+SRC_URI=mirror://sourceforge/mecab/mecab-ipadic-2.7.0-20070801.tar.gz
+_md5_=47d1d8a3362ada81e529616b593bddad
diff --git a/app-dicts/mecab-ipadic/Manifest b/app-dicts/mecab-ipadic/Manifest
deleted file mode 100644
index 0469aae179de..000000000000
--- a/app-dicts/mecab-ipadic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mecab-ipadic-2.7.0-20070801.tar.gz 12208105 BLAKE2B 448aed0389a18be5cb8161c600827190353b884cbbce4b86b122098b9ce15a2d838da93b37c608bf66dcbac7ec84c11aef1b87ba7907d1a4cf5bcfcf4a491da1 SHA512 35ea662cb62f1967849f7ed5781bd6dafef0fe20d63e88d9a0057666e57ed23d5a0e6fb8d0701a0cc4da43a1050c1b02463bb862decc71c36b7fc2acdc158d86
-EBUILD mecab-ipadic-2.7.0.20070801.ebuild 518 BLAKE2B 9d4ea7fed7d5603163b682933ee8fc1d7a6200d6924e020d1e8914233ec9a51d9bfc4c82f77a0defc3168e59df122f42f2bb1e38e7c2669bbcf8216551dec176 SHA512 c1302f4faa35ced7675f8df78ca02e31b8e97585fb2eb6dcc3bdce84fa60e79948d5bdb60aa9ff096c8279f3a05ad6d7a6257c42cbf014cc46033803930c9f97
-MISC metadata.xml 401 BLAKE2B 38623c00dbd106c4b81eb7a4957b97f2eaffc0c9b535b6d8c820c59b2826ee073da1f7ee4925c4a92c3e026a05df7bcc84140768f3b28585a58f542869676df2 SHA512 743955c4b8873cc0ed6883156a4a07711269bb338063898f99d4c6346cb77a3a42b6222b7f6f00529db51a6f632ad1c66a58603c59a2fc4691b698277eeb4658
diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
deleted file mode 100644
index c1b211621986..000000000000
--- a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="${PN}-${PV%.*}-${PV/*.}"
-
-DESCRIPTION="IPA dictionary for MeCab"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mecab/${MY_P}.tar.gz"
-
-LICENSE="ipadic"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="unicode"
-
-DEPEND="app-text/mecab[unicode=]"
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- econf $(use_with unicode charset UTF-8)
-}
diff --git a/app-dicts/mecab-ipadic/metadata.xml b/app-dicts/mecab-ipadic/metadata.xml
deleted file mode 100644
index ad11001c7070..000000000000
--- a/app-dicts/mecab-ipadic/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>hattya@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">mecab</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/mecab-naist-jdic-0.6.3b_p20111013 b/app-dicts/mecab-naist-jdic-0.6.3b_p20111013
new file mode 100644
index 000000000000..fb1f96fcb80c
--- /dev/null
+++ b/app-dicts/mecab-naist-jdic-0.6.3b_p20111013
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=app-text/mecab[unicode=]
+DESCRIPTION=NAIST Japanese Dictionary
+EAPI=5
+HOMEPAGE=http://sourceforge.jp/projects/naist-jdic/
+IUSE=unicode
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/naist-jdic/53500/mecab-naist-jdic-0.6.3b-20111013.tar.gz
+_md5_=979635e5600153f048fd056edfc42a89
diff --git a/app-dicts/mecab-naist-jdic/Manifest b/app-dicts/mecab-naist-jdic/Manifest
deleted file mode 100644
index 63170a796236..000000000000
--- a/app-dicts/mecab-naist-jdic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mecab-naist-jdic-0.6.3b-20111013.tar.gz 14974238 BLAKE2B a665e0679be18ea7207d9fffcf7fbbd0a91f4e365209d2c711d9d97b093396daae235fc887af8eb4634db68fb36a8ad283742a48f1bdf6e289d8b4fdf73c1564 SHA512 03d04505d3d8d097d1389af987e87aca43d56ef36b0def9eb85e19ee15ffe3598d3acb1c78c6dde3b31519419acb87c595aaad594dd116b98ac5cabb82a2e61c
-EBUILD mecab-naist-jdic-0.6.3b_p20111013.ebuild 516 BLAKE2B 1649ca58f6ff277525f7cf7a307784721dc3454f6003a1b7f2743ec16392e27615657ea58dd71544d57e78c31c1cf045b11029f8ba7d5d2e32ab38d18a71c52e SHA512 4d54a9462de914ccc80b63f1e484f85a91be5d342f34369f82e8ec9b6a2307ece21ca4e5b4285940a95a09b1e88d80e4f8666a8d4dcea97ab62df2d29afa459d
-MISC metadata.xml 327 BLAKE2B bba34ada2e5ed248d9f19f2a261a22ff61390825e7ad9c4dc17954b0446527cc037509f7cddbe2ddcadc996e5590a08bde008c4e08e007050c4f60a81eaff502 SHA512 012a1e3503e09cf6a938e1bddb5e893534dd4baf8b4422d5df5dbb81c5eed4e565f726c47f198fffabcc1b406b4bfe589df9b713346ff9ea92babfb67543dfad
diff --git a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild b/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild
deleted file mode 100644
index 995e15f3c829..000000000000
--- a/app-dicts/mecab-naist-jdic/mecab-naist-jdic-0.6.3b_p20111013.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="${P/_p/-}"
-
-DESCRIPTION="NAIST Japanese Dictionary"
-HOMEPAGE="http://sourceforge.jp/projects/naist-jdic/"
-SRC_URI="mirror://sourceforge.jp/naist-jdic/53500/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="unicode"
-
-DEPEND="app-text/mecab[unicode=]"
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- econf $(use_with unicode charset UTF-8)
-}
diff --git a/app-dicts/mecab-naist-jdic/metadata.xml b/app-dicts/mecab-naist-jdic/metadata.xml
deleted file mode 100644
index 7e862390276e..000000000000
--- a/app-dicts/mecab-naist-jdic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge-jp">naist-jdic</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/mecab-unidic-2.1.2 b/app-dicts/mecab-unidic-2.1.2
new file mode 100644
index 000000000000..2110ac13da7d
--- /dev/null
+++ b/app-dicts/mecab-unidic-2.1.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-text/mecab
+DESCRIPTION=IPA dictionary for MeCab
+EAPI=5
+HOMEPAGE=https://osdn.jp/projects/unidic/
+KEYWORDS=~amd64
+LICENSE=|| ( BSD GPL-2 LGPL-2.1 )
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/unidic/58338/unidic-mecab-2.1.2_src.zip
+_md5_=72804f7ed3c74361353d6cddba9b5fa1
diff --git a/app-dicts/mecab-unidic/Manifest b/app-dicts/mecab-unidic/Manifest
deleted file mode 100644
index 7c92041fead1..000000000000
--- a/app-dicts/mecab-unidic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unidic-mecab-2.1.2_src.zip 140517811 BLAKE2B 38001714023c1de6ea5388ccc6ab9f5a910c0f40ba1f5cfee861e6a733797ee6ea528eeeb185a4354c084f71189d73478f64719bc3e0b6424cc24a8088d419e1 SHA512 db80feab873851df874781fe81430ee90e238f166b90e77755a112602e0f22a7c4c5deb4ce8bcd357d258d8d806d917652e6723bf2a1b786942952fbbcb52782
-EBUILD mecab-unidic-2.1.2.ebuild 411 BLAKE2B f561de6fda2cd4d35287bb78722fa0b9021233bdfd67084d7cbae5e427d99f40b9a1131a7478718bd1bed4dee9e2eb5c8464833b11d3a22822946f4ed543ed85 SHA512 73195268c0e3b718b7df01f9fb1cb4389d9e66192c7c7eb0f63ce54aaf9effb6266431b5c41f75e18d00ea0e17eecfbb221898ba3f8b60f0e9fc51654664c245
-MISC metadata.xml 323 BLAKE2B 582a4a8283b2e05987975ea80f86fd2e91712cf520de09e3f57644fdb7ee73aebb86c6d890e2104afe73f595627b2722974341d1239bed5d7329197e635721bf SHA512 34f88065057adfe7913513f2c6a39820448f7672c7f6664fae1e472ee71dc912522b29eff3c22996a53517ce9a176e44e58515cdf3ca00e73c8ad184e058fe9b
diff --git a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
deleted file mode 100644
index e46bc6ad2af6..000000000000
--- a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="unidic-mecab-${PV}_src"
-
-DESCRIPTION="IPA dictionary for MeCab"
-HOMEPAGE="https://osdn.jp/projects/unidic/"
-SRC_URI="mirror://sourceforge.jp/unidic/58338/${MY_P}.zip"
-
-LICENSE="|| ( BSD GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-text/mecab"
-S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/mecab-unidic/metadata.xml b/app-dicts/mecab-unidic/metadata.xml
deleted file mode 100644
index 07b34f7a085b..000000000000
--- a/app-dicts/mecab-unidic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge-jp">unidic</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/metadata.xml b/app-dicts/metadata.xml
deleted file mode 100644
index f5ff4bd53af5..000000000000
--- a/app-dicts/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
- <longdescription lang="en">
- The app-dicts category contains dictionary and word-list packages.
- </longdescription>
- <longdescription lang="de">
- The Kategorie app-dicts enthält Wörterbücher und Wortlisten.
- </longdescription>
- <longdescription lang="es">
- La categoría app-dicts contiene paquetes de diccionarios y
- para listar palabras.
- </longdescription>
- <longdescription lang="ja">
- app-dictsカテゴリã«ã¯è¾žæ›¸ã¨ãƒ¯ãƒ¼ãƒ‰ãƒªã‚¹ã¨ãƒ‘ッケージãŒå«ã¾ã‚Œã¾ã™ã€‚
- </longdescription>
- <longdescription lang="nl">
- De app-dict categorie bevat woordenboeken en andere woordlijsten.
- </longdescription>
- <longdescription lang="vi">
- Nhóm app-dicts chứa các gói vỠtừ điển.
- </longdescription>
- <longdescription lang="it">
- La categoria app-dicts contiene pacchetti di dizionari ed elenchi di parole.
- </longdescription>
- <longdescription lang="pt">
- A categoria app-dicts contém pacotes relacionados a dicionários e
- listas de palavras.
- </longdescription>
- <longdescription lang="pl">
- Kategoria app-dicts zawiera słowniki oraz listy wyrazów.
- </longdescription>
-</catmetadata>
-
diff --git a/app-dicts/migemo-dict-200812 b/app-dicts/migemo-dict-200812
new file mode 100644
index 000000000000..d463c1607181
--- /dev/null
+++ b/app-dicts/migemo-dict-200812
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Dictionary files for the Migemo and C/Migemo
+EAPI=0
+HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
+IUSE=unicode
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/migemo-dict-200812.tar.bz2
+_md5_=a8234bc2910eb9ff644cd46cefbd7663
diff --git a/app-dicts/migemo-dict/Manifest b/app-dicts/migemo-dict/Manifest
deleted file mode 100644
index be94eeefb116..000000000000
--- a/app-dicts/migemo-dict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST migemo-dict-200812.tar.bz2 1467494 BLAKE2B 25f4da49e0e1970df9f43a26f72f1ae85c89ee0d3b708e7f7ea46a2b3b133c59a3990a44e6e578335d3c836027543fc695334573613674ad4e100c06da3eac0b SHA512 cc42d62247c5ff0c3a4ff30a7c135173f94c4f49685df997b305486502b86144428dc104a77361d5ceff91683b0b663d0c68174300d628f70f6999cf7667f3c0
-EBUILD migemo-dict-200812.ebuild 642 BLAKE2B 1ad13dd249669c9c985edba9b6dc0c10b569aabd49a71dbf6810c36a9e178585f56aab3134ebb816e5daa11e52abef4b037a34afb607bbbc0d1da937930c3351 SHA512 777364011a86600e80bb968755ac06e77d04919c671fe0cd4ce2597d40a265616cca10fffd88f2ab5f3557a16da48b865807045e7aaee94b2d4e7ee7bc6d9331
-MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-dicts/migemo-dict/metadata.xml b/app-dicts/migemo-dict/metadata.xml
deleted file mode 100644
index 6f2ca22da233..000000000000
--- a/app-dicts/migemo-dict/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/migemo-dict/migemo-dict-200812.ebuild b/app-dicts/migemo-dict/migemo-dict-200812.ebuild
deleted file mode 100644
index 8245e4067d6e..000000000000
--- a/app-dicts/migemo-dict/migemo-dict-200812.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE="unicode"
-
-DESCRIPTION="Dictionary files for the Migemo and C/Migemo"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- if use unicode ; then
- iconv -f euc-jp -t utf-8 migemo-dict > "${T}/migemo-dict"
- else
- cp migemo-dict "${T}/migemo-dict"
- fi
-}
-
-src_install() {
- insinto /usr/share/migemo
- doins "${T}/migemo-dict"
-}
diff --git a/app-dicts/myspell-af-20080701 b/app-dicts/myspell-af-20080701
new file mode 100644
index 000000000000..bc29532e1d23
--- /dev/null
+++ b/app-dicts/myspell-af-20080701
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Afrikaans dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.services.openoffice.org/project/dict_af
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/1109/0/dict-af.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=a33b5d179d2033d8d6a6e462a1956712
diff --git a/app-dicts/myspell-af/Manifest b/app-dicts/myspell-af/Manifest
deleted file mode 100644
index 4b1d3c1a8b74..000000000000
--- a/app-dicts/myspell-af/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict-af.oxt 1668991 BLAKE2B e0d45644c466041a8758164bb80f9b9e333e7a62c401d32f456e60aebd75de0fe98f919e02a856a17ed9ccdb011bd0f564946e5c32cdf764e7f7c47eda425fe8 SHA512 40a479af0371b9ea0342ea9faf5c74c4ff33eaf1207187a00bcefcee42e71f4ece59701d91e86172f1d941a7074da6ff2931d4085dec354b93e1c4be20a9f725
-EBUILD myspell-af-20080701.ebuild 558 BLAKE2B 6f6c004da4ae36f9c273a3bacb105ba745bad1356e93881f31c42622010cd636867b4e6a406ef38900ac09ac9b5385d23314b193e8508f2f2e21af8f36bdc92c SHA512 d127a44b93f3eb7a2ce08a8753391f91edfdd4e35e9575f193787b459315cbbb6cd04be06e82f2bd710e92a68b2539fa057c50041d9b567aa2aef6d80fc167c8
-MISC metadata.xml 251 BLAKE2B c3fd5444bf91aeb5fca487fd3f35d92e951cba5581257ac67bad06e898b67385cde86db9395f03734daf6fa65f76a3217d86e8745c62d0ceef001aa2a62749b5 SHA512 8efa4d577315623dc1527c04418d7e142f1583cec26341ce4b49f21e4cec496f5db3ecb782db80910c9a2df0a7df94af5d22361e458c01cd8dd79bd593292220
diff --git a/app-dicts/myspell-af/metadata.xml b/app-dicts/myspell-af/metadata.xml
deleted file mode 100644
index 259f3e2c2134..000000000000
--- a/app-dicts/myspell-af/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">aoo-extensions</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-af/myspell-af-20080701.ebuild b/app-dicts/myspell-af/myspell-af-20080701.ebuild
deleted file mode 100644
index 76f59d3f03e5..000000000000
--- a/app-dicts/myspell-af/myspell-af-20080701.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "af_ZA.aff"
- "af_ZA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_af_ZA.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Afrikaans dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.services.openoffice.org/project/dict_af"
-SRC_URI="mirror://sourceforge/aoo-extensions/1109/0/dict-af.oxt"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-bg-4.3 b/app-dicts/myspell-bg-4.3
new file mode 100644
index 000000000000..3610773fb0e7
--- /dev/null
+++ b/app-dicts/myspell-bg-4.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Bulgarian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://bgoffice.sourceforge.net/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=mirror://sourceforge/bgoffice/OOo-full-pack-bg-4.3.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=a7b8bb03f9d41456bfb489af72f9bbe0
diff --git a/app-dicts/myspell-bg/Manifest b/app-dicts/myspell-bg/Manifest
deleted file mode 100644
index 22432bfe0714..000000000000
--- a/app-dicts/myspell-bg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST OOo-full-pack-bg-4.3.zip 1360735 BLAKE2B a1f7920364efe085717a16992cbd4d0ab0aaa3b751b1364aaaa652265563369ef1cd13978afe9f6a221f17ff02595acbc36edfd9e6a19a67bcd4b195d40566c3 SHA512 1c4acf0c8377c6ec3f0dd26c84a5232be88b1fecabcb08dfae4f45bf819c770427731cbf1b01d65d3a182cccc3d0bcaabf3ab85735221e2ff09fc47bd66341d7
-EBUILD myspell-bg-4.3.ebuild 759 BLAKE2B e9e78835b1baef5e6eeb2ef354532b83bf835baebc16702e925d1b25c51c1d9a43bfed105df56babbd2e427765b3b0b311d483c1dab49719b4c3ad510cc3d68f SHA512 ea8d8403d8c022272fdff34636692a7d850e6e73eaf18f69272146310e0ec0bbad47d9c5cce323405bf2d4ec9007a71f046a4a07b0521e7251a33523dcdad728
-MISC metadata.xml 245 BLAKE2B af884440fd3655c1aa95b71b946a07820486fb90858dcf4fa1bd213017822d302f74b3118b2a52d5de088d22d9f024e7ac9ef4b306fb64ed160b0e711f6460ac SHA512 fe73d9e659f1a766a2b2f1a80c8a06bfee27b14a613af8d9fb33e5c9ac69d3c26b71f7a151e3a4ccd443bb75489b4d1c3bf979fe08cf84c274d44af843e8b63e
diff --git a/app-dicts/myspell-bg/metadata.xml b/app-dicts/myspell-bg/metadata.xml
deleted file mode 100644
index d65e3d570768..000000000000
--- a/app-dicts/myspell-bg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">bgoffice</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-bg/myspell-bg-4.3.ebuild b/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
deleted file mode 100644
index 9fa6cf51cf41..000000000000
--- a/app-dicts/myspell-bg/myspell-bg-4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="OOo-full-pack-bg-${PV}"
-
-MYSPELL_DICT=(
- "bg_BG.aff"
- "bg_BG.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_bg_BG.dic"
-)
-
-MYSPELL_THES=(
- "th_bg_BG.dat"
- "th_bg_BG.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Bulgarian dictionaries for myspell/hunspell"
-HOMEPAGE="http://bgoffice.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bgoffice/${MY_P}.zip"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- # remove licenses that are suffixed with txt
- # so they are not picked by install dodoc
- rm -rf *.txt || die
-}
diff --git a/app-dicts/myspell-ca-2.3.0 b/app-dicts/myspell-ca-2.3.0
new file mode 100644
index 000000000000..f06e3892c9ee
--- /dev/null
+++ b/app-dicts/myspell-ca-2.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+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
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt -> myspell-ca-2.3.0.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=e875b38b482e6cbc4c6f7b2fe66510d3
diff --git a/app-dicts/myspell-ca/Manifest b/app-dicts/myspell-ca/Manifest
deleted file mode 100644
index f1bcfcc98b1a..000000000000
--- a/app-dicts/myspell-ca/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-ca-2.3.0.oxt 441719 BLAKE2B 4f58648eac1f77a6e1e2cc571a2528d474c961ce15cab00b822638937bfe450330f4decc8744284b66e5e2b5d58ccf2b03110303d86286e1aa5e7508fd2362a8 SHA512 77513fa6b2d819963bc03aece59aeb2fe6df7674c0fea4fa9a406e6c27efdfbca3ebfc4b36aca4275d79f09678ab58a56c3d6470a815a2192b2ffc4e01c779bf
-EBUILD myspell-ca-2.3.0.ebuild 831 BLAKE2B 61a81439ccc996084498f057c48652603501fa1358c62f85a4eaeab1d965ea2274467abe767698d15cd0d3563216c4b68a877ef0310cf618d239a81cd7f7a5b1 SHA512 20e1735f52e2488e22616742cb762c7ac77d975542a4d155f008e1708941c4c5addaa32c7d7d4a9240f104d176fc834c05dfc6881b7bfc75c5ab0010f2b7bb00
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ca/metadata.xml b/app-dicts/myspell-ca/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-ca/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild b/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
deleted file mode 100644
index 0429eda9f813..000000000000
--- a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "ca_ES.aff"
- "ca_ES.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Catalan dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.softcatala.org/wiki/Rebost:Corrector_ortogr%C3%A0fic_de_catal%C3%A0_%28general%29_per_a_l%27OpenOffice.org"
-SRC_URI="http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- default
- # rename to conform the common naming scheme
- mv catalan.aff ca_ES.aff || die
- mv catalan.dic ca_ES.dic || die
-
- # remove licenses
- rm -rf LICENSES-en.txt LLICENCIES-ca.txt || die
-}
diff --git a/app-dicts/myspell-cs-20110224 b/app-dicts/myspell-cs-20110224
new file mode 100644
index 000000000000..f93d28fa04e3
--- /dev/null
+++ b/app-dicts/myspell-cs-20110224
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Czech dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://www.liberix.cz/doplnky/slovniky/ooo/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 MIT
+SLOT=0
+SRC_URI=http://www.liberix.cz/doplnky/slovniky/ooo//dict-cs-2.oxt -> myspell-cs-20110224.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=45064976541ecfef64f8ac7d4c414ac3
diff --git a/app-dicts/myspell-cs/Manifest b/app-dicts/myspell-cs/Manifest
deleted file mode 100644
index 2093307e0286..000000000000
--- a/app-dicts/myspell-cs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-cs-20110224.zip 1440618 BLAKE2B d90ae82b86ac0e01bc8a5b43bfcb5f7c95f216d5781dd050d798b942291c345966f7f535d74cbd17e5b42a387d0b2c7a7ed02a23bfe93c9bbb2fd0bcf5c192cd SHA512 9f2ed5e10771c00635f382c676b2f9184374b4c20a7d2262d3c441feae4d9dcddbd611cdaf74cb035c76c969d73d913d6116d9c1a4ab0a7a754bfbd8253c1ca5
-EBUILD myspell-cs-20110224.ebuild 563 BLAKE2B b090a117ef679d3aa9fc80a248368d309b6a1e2ff7b09fe11f9e1d27db603b3163ffe3bb87136bac590b09a40fa4d0bab07d619c6b2700d743f46e19ef2461a5 SHA512 232b4ac89ed71741a84a3f3f36c00a3ad74b347445d849972e9d02afa590f958dc63c6c76fcaef48999104f0c2c7ff8d2db46bf8e357a9f7aebf9edda0883e30
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-cs/metadata.xml b/app-dicts/myspell-cs/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-cs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
deleted file mode 100644
index a0986dc2a1fa..000000000000
--- a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "cs_CZ.aff"
- "cs_CZ.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_cs_CZ.dic"
-)
-
-MYSPELL_THES=(
- "th_cs_CZ_v3.dat"
- "th_cs_CZ_v3.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Czech dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.liberix.cz/doplnky/slovniky/ooo/"
-SRC_URI="${HOMEPAGE}/dict-cs-2.oxt -> ${P}.zip"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-cy-20130708 b/app-dicts/myspell-cy-20130708
new file mode 100644
index 000000000000..0d9cf3f54bf0
--- /dev/null
+++ b/app-dicts/myspell-cy-20130708
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+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
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> myspell-cy-20130708.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=e1b03fb7cebdf4f8fefd916bd54ee0e6
diff --git a/app-dicts/myspell-cy/Manifest b/app-dicts/myspell-cy/Manifest
deleted file mode 100644
index e389873e96f5..000000000000
--- a/app-dicts/myspell-cy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-cy-20130708.oxt 691468 BLAKE2B 09476ee1d5c945563957e9115613b4fd8e04018127ec4b1dadb776b23674a87ecaededb2ea3d420ff3ff10639d381bb97fe287ab3fd0474c9c5b505a1eb599d5 SHA512 3faa794d0fb62a3f9545afb9740d217b24357be1769082beb8d3fec54fcf5eee9e7ec5b54a316b10e48135db48406d814bdfa3f0448e3c527772fb4e69f17edd
-EBUILD myspell-cy-20130708.ebuild 679 BLAKE2B 7a67fcef920bfc7cf9ee0550e396521ee613357c2bd3fee75cbaf9193dab7db86e5c36eb5b52fa067ad589d19a85ff4ca6741c5860f415edd2e83834366ac032 SHA512 0131ab47e64a9927eed2e401e10d16af1a3c83e6b22210dc8ec36dafa8634c72f7c17821ef81f296da22a51afd7f45cb77c2de30fa8dd6bd5ff1cc25f5cf87ca
-MISC metadata.xml 251 BLAKE2B 928eca9aec48183d696373da08b57694ab299774b0be0d2f98fdff84edb3485e9d50ea98695fcdff577b9b72a87e4c47f0d169cafe64f7a84d2962ad0b68b266 SHA512 b89fc6e0fc9b26b3f92f879713d50a150a05549e97ca8125e54e19b00910b5c54269fb59cb822db6a48ec3bbe028f837b34b3fa29e53b11cdd0fdb7a336f8ba6
diff --git a/app-dicts/myspell-cy/metadata.xml b/app-dicts/myspell-cy/metadata.xml
deleted file mode 100644
index f45efbecf865..000000000000
--- a/app-dicts/myspell-cy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">aoo-extensions</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild b/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
deleted file mode 100644
index 396e9dfc4bed..000000000000
--- a/app-dicts/myspell-cy/myspell-cy-20130708.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "cy_GB.aff"
- "cy_GB.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Welsh dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.openoffice.org/en/project/gwirydd-sillafu-cymraeg-welsh-language-spell-checker"
-SRC_URI="mirror://sourceforge/aoo-extensions/geiriadur-cy.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-da-2.1 b/app-dicts/myspell-da-2.1
new file mode 100644
index 000000000000..9cae5bd9bf2c
--- /dev/null
+++ b/app-dicts/myspell-da-2.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Danish dictionaries for myspell/hunspell
+EAPI=4
+HOMEPAGE=https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-2.1.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=2b4aeed26748d5b5a62482525bafdffb
diff --git a/app-dicts/myspell-da-2.3 b/app-dicts/myspell-da-2.3
new file mode 100644
index 000000000000..b95c9febd969
--- /dev/null
+++ b/app-dicts/myspell-da-2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Danish dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/2.3/@@download/file/dict-da-2-3.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=c59723e42d045991fe0791eb499081c4
diff --git a/app-dicts/myspell-da/Manifest b/app-dicts/myspell-da/Manifest
deleted file mode 100644
index ae7604a5bb69..000000000000
--- a/app-dicts/myspell-da/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dict-da-2-3.oxt 1861736 BLAKE2B 18c22f55012a9701cff1ecadc53dece7cdc2e59619c1704159343960951096c49ab970bb248d844eaf24379053ea7ac35bd89b4741aa54cfb4b711e99320b256 SHA512 28428096ba6d79801fdf47a61bedc06c9ee2d667ae32307bd57f9b7cdc1cb06e84ac2bd78fba11c87dd35dc88d78c5e0f81588e5145267577ca0992b35ea301a
-DIST dict-da-2.1.oxt 1695432 BLAKE2B 284129ac82ef9b2847b533caf80e8f26cf5a3e8a8e0b65b6c56f1c5fcde0b14f2b1fa717c5e1ddd1c2acfaf4e866f91fa8fa6820b5ea493ef7c67e73bc79a369 SHA512 4dab6e4dcb2cf782ddff11126e4eebda9281c45aaf480f6c8afb655f59c23bfb29f17d9698bcfaf04b0c95d20b897c1401e363337726947aedc2411927cf233b
-EBUILD myspell-da-2.1.ebuild 683 BLAKE2B bd850fa5cdcda80f8d25e1f24e5179a176798d724b645f06095360058ba6c3d87146982a71dc752f98290fc8338051c2475fa99721fe73647deb933cdaa3ee35 SHA512 581f58fbd7c5b4a7c21c4d0ff84a8642227ad80745db791bcc9d109a79c961da14ca3d974a79fa83ee7717ab02fb948398f3c06aa7cbf87c804157c28829dfc9
-EBUILD myspell-da-2.3.ebuild 827 BLAKE2B 341b8be8e9a1b03a06f5285622d205bd9212ce12be64916ddde8149d9c115c2f6138c1055a5490328199ce5d77a3660cd571c4755b0ad24cba29b52c85946a65 SHA512 dd96e171b193feddca7c607ff3dc1912038adda0c9be53a688336e524571495e4541938e23f369f4af43ba3d4fa0bbf25bbade15155f21cc16c73c002235ffa1
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-da/metadata.xml b/app-dicts/myspell-da/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-da/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-da/myspell-da-2.1.ebuild b/app-dicts/myspell-da/myspell-da-2.1.ebuild
deleted file mode 100644
index f64b905c5f43..000000000000
--- a/app-dicts/myspell-da/myspell-da-2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYSPELL_DICT=(
- "da_DK.aff"
- "da_DK.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_da_DK.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Danish dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary"
-SRC_URI="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-da/myspell-da-2.3.ebuild b/app-dicts/myspell-da/myspell-da-2.3.ebuild
deleted file mode 100644
index 4cf84f6b5f7d..000000000000
--- a/app-dicts/myspell-da/myspell-da-2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "da_DK.aff"
- "da_DK.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_da_DK.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Danish dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary"
-SRC_URI="https://extensions.libreoffice.org/extension-center/stavekontrolden-danish-dictionary/pscreleasefolder.2011-09-30.0280139318/2.1/dict-da-${PV}.oxt"
-SRC_URI="https://extensions.libreoffice.org/extensions/stavekontrolden-danish-dictionary/${PV}/@@download/file/dict-da-${PV/./-}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-de-2015.12.28 b/app-dicts/myspell-de-2015.12.28
new file mode 100644
index 000000000000..4140623372ff
--- /dev/null
+++ b/app-dicts/myspell-de-2015.12.28
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=German dictionaries for myspell/hunspell
+EAPI=5
+HOMEPAGE=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/2015.12.28/@@download/file/dict-de_at-frami_2015-12-28.oxt https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/2015.12.28/@@download/file/dict-de_de-frami_2015-12-28.oxt https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/2015.12.28/@@download/file/dict-de_ch-frami_2015-12-28.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=fecd9a8a79d72fbc3ea315eaee6594ba
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
deleted file mode 100644
index e99add437135..000000000000
--- a/app-dicts/myspell-de/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dict-de_at-frami_2015-12-28.oxt 8110628 BLAKE2B 13652ee81381d766c151ed53889d0f5e1aed0fcc34c19edf2ff84e25d1d303cf95a3b1fbe3ffe6617991f497fbe46e2ce1305c2ef8109afb58677289b5832ae9 SHA512 2d4188174fb3f7cb2ca175d54342395980497183c0c6ea233217491226b19a0f19f806935e0eb3798229db89fd3ebf93cb5b210ba326dcb1cc8b862c48aecd02
-DIST dict-de_ch-frami_2015-12-28.oxt 8101312 BLAKE2B fd2da123f768b1ac1d66524272570fee0c237028d736100a5fb742418173120c54b8d3ee9e138b07699dc72372661e671bd8cf27eca7cefb0f39c84e49f286db SHA512 b62ad082fbef3785b5cd29bb530a4f5367771af6237d10a9ee922f0deaff0ccdd7c0a9cd93a9218444b07bf278efdb18f497660513af4b8862998ab3bb434f5a
-DIST dict-de_de-frami_2015-12-28.oxt 8110832 BLAKE2B 5bf8014e4c21f3d35296a13a9413caa0f2535cf7de39a774b4a16eef4ddb543b7d80e8fc5ac871f46442304e13cf7472b2d9188d2cc7173cca3b6dde582730ee SHA512 242cfa3f9f8046badbd56560d05cc47a2b0bc89b263f9141443b3401981e91a1124d1c2f76ae77ea017b02a34567cf4c160c31e2250f90d095a74b92dd3d636a
-EBUILD myspell-de-2015.12.28.ebuild 1394 BLAKE2B 5757368238631bfe9b4489cfd557c6e5a1d9f6b3056c93369852ce568f4852d87e6e9faebec68362fdabd993a850252d728d013ce5044dac3bfc005b036a626e SHA512 c32532ca35a03f2debb9dd05e5911651648827e65e47f1cefd1b8e94096613f9e1d1f390761d613c6c07b078bd1dda399de95bf2d86bfc6486ae7f446346d322
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-de/metadata.xml b/app-dicts/myspell-de/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-de/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
deleted file mode 100644
index e59de7b24f20..000000000000
--- a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "de_AT.aff"
- "de_AT.dic"
- "de_DE.aff"
- "de_DE.dic"
- "de_CH.aff"
- "de_CH.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_de_AT.dic"
- "hyph_de_DE.dic"
- "hyph_de_CH.dic"
-)
-
-MYSPELL_THES=(
- "th_de_AT_v2.dat"
- "th_de_AT_v2.idx"
- "th_de_DE_v2.dat"
- "th_de_DE_v2.idx"
- "th_de_CH_v2.dat"
- "th_de_CH_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="German dictionaries for myspell/hunspell"
-HOMEPAGE="
- https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries
- https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
- https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries
-"
-SRC_URI="
- https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/${PV}/@@download/file/dict-de_at-frami_${PV//./-}.oxt
- https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/${PV}/@@download/file/dict-de_de-frami_${PV//./-}.oxt
- https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/${PV}/@@download/file/dict-de_ch-frami_${PV//./-}.oxt
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- # rename the tarballs
- for i in *_frami.*; do
- mv "${i}" "${i/_frami}" || die
- done
-}
diff --git a/app-dicts/myspell-de_1901-20120929 b/app-dicts/myspell-de_1901-20120929
new file mode 100644
index 000000000000..1f7245084c48
--- /dev/null
+++ b/app-dicts/myspell-de_1901-20120929
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=German (traditional orthography) dictionaries for myspell/hunspell
+EAPI=5
+HOMEPAGE=http://www.j3e.de/myspell/ http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( GPL-2 GPL-3 )
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries/pscreleasefolder.2011-11-04.1209635399/2012.09.29/dict-de_de-1901_oldspell_2012-09-29.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=7b7920f624ff80910a40795f4c53bdce
diff --git a/app-dicts/myspell-de_1901-20160403 b/app-dicts/myspell-de_1901-20160403
new file mode 100644
index 000000000000..58e5ed2d17a3
--- /dev/null
+++ b/app-dicts/myspell-de_1901-20160403
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( GPL-2 GPL-3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_oldspell_2016-04-03.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=77b724aa5b4aef4248bfb724709f5b61
diff --git a/app-dicts/myspell-de_1901/Manifest b/app-dicts/myspell-de_1901/Manifest
deleted file mode 100644
index ce96f8dc2058..000000000000
--- a/app-dicts/myspell-de_1901/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dict-de_de-1901_oldspell_2012-09-29.oxt 4807281 BLAKE2B 39998a25f9361be7ac1b6374178efd213b349fc5965f81a532d833d4f5a32e7fdf4b1c89d6e927a87cb5b93e165491545e8b859ae8ff85e1d261d077d780b0ea SHA512 15afe6157c6a1fbd723610440f98e823217d91fd0accf54975797ca20b3f47d6beb14c2ce118a44d17815c05e6dab923ea1ec3759237c6c4758344d805776cde
-DIST dict-de_de-1901_oldspell_2016-04-03.oxt 8197279 BLAKE2B 5f930ee3d727ad7e6ce37ca1062a200b09d3a922a446dde201c192842c898e5754b7405cf92dd58f9981bb4445d7223131f30f336a39d1c84001f8a61cd08eca SHA512 af6a353e52505895e4084378d91578956452d7db402a14073e6b2387d7b5377bcf652414bf90e113d976f24e082adf138ba138d54fa321c55bcb2c4d93c83cdc
-EBUILD myspell-de_1901-20120929.ebuild 1161 BLAKE2B 07a035879471bb288a2bebddf28cf3b6a55fc78e73bca95b0750280c9b5fb9e8781de32fc59ec98055fe3b22c6d4db34b3dc5901f63bfa838fd9b7930fa5003b SHA512 bf40ac2ebdbd2a4ce2dfafafdb4ed20e161e6c664c1feb386673a556f3a4ecc4372e2bd8d76b91964a0f30b22fdec29e9d8ae00b0f5d65b08607842d9f93e9fb
-EBUILD myspell-de_1901-20160403.ebuild 1307 BLAKE2B 746a563de13eadb4309fc6a355612f2660180f718655c377ebab30cac1257e3a2f6d0a474dabc772903d0a8af8f47a0bdef7fd954a8fa23ee0cc371dfd924309 SHA512 5098110d03c5c58ca23515a1d724bdeb9035e33a85258ede9ad3bdf27b7de33ab77d84a9c852310cb6fa1a69f74722c18c813780dfa38cc41c7f59758a69cbb3
-MISC metadata.xml 306 BLAKE2B 8640f4712e7722fe1f5bbc3438553f6edb19f0902777ab739303e54f0563fdbd44b6370e06bf065f4dbadb96638fb013fb87851305983a6f19d88af6222b9b7a SHA512 48f580db3509626b7c45b9025b9f80405e6585d29dfb63c8dc9035c1ca8e55aa5fd55ee70ba4e675ed8bd1e5a15369bb9ed0236accbdad618c7b9df33c2d642f
diff --git a/app-dicts/myspell-de_1901/metadata.xml b/app-dicts/myspell-de_1901/metadata.xml
deleted file mode 100644
index 5b771b476e04..000000000000
--- a/app-dicts/myspell-de_1901/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>ulm@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">aoo-extensions</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild
deleted file mode 100644
index 680905fdf432..000000000000
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "de_DE_1901.aff"
- "de_DE_1901.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_de_DE_1901.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="German (traditional orthography) dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.j3e.de/myspell/
- http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries"
-SRC_URI="http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries/pscreleasefolder.2011-11-04.1209635399/${PV:0:4}.${PV:4:2}.${PV:6:2}/dict-de_de-1901_oldspell_${PV:0:4}-${PV:4:2}-${PV:6:2}.oxt"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-src_prepare() {
- # Nicely rename; http://www.iana.org/assignments/language-subtag-registry
- mv de_DE_OLDSPELL.aff de_DE_1901.aff || die
- mv de_DE_OLDSPELL.dic de_DE_1901.dic || die
- mv hyph_de_DE_OLDSPELL.dic hyph_de_DE_1901.dic || die
- # Remove thesaurus for new spelling to avoid installing its readme file
- rm th_de_DE_v2* || die
-}
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
deleted file mode 100644
index 21d8c13f5031..000000000000
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "de_DE_1901.aff"
- "de_DE_1901.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_de_DE_1901.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="German (traditional orthography) dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.j3e.de/myspell/
- http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries"
-#SRC_URI="http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries/pscreleasefolder.2011-11-04.1209635399/${PV:0:4}.${PV:4:2}.${PV:6:2}/dict-de_de-1901_oldspell_${PV:0:4}-${PV:4:2}-${PV:6:2}.oxt"
-SRC_URI="mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_oldspell_${PV:0:4}-${PV:4:2}-${PV:6:2}.oxt"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-
-src_prepare() {
- default
- # Nicely rename; http://www.iana.org/assignments/language-subtag-registry
- mv de_DE_OLDSPELL.aff de_DE_1901.aff || die
- mv de_DE_OLDSPELL.dic de_DE_1901.dic || die
- mv hyph_de_DE_OLDSPELL.dic hyph_de_DE_1901.dic || die
- # Remove thesaurus for new spelling to avoid installing its readme file
- rm th_de_DE_v2* || die
-}
diff --git a/app-dicts/myspell-el-0.8 b/app-dicts/myspell-el-0.8
new file mode 100644
index 000000000000..40f6e5ace43a
--- /dev/null
+++ b/app-dicts/myspell-el-0.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Greek dictionaries for myspell/hunspell
+EAPI=4
+HOMEPAGE=http://elspell.math.upatras.gr
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=http://elspell.math.upatras.gr/files/ooffice/el_GR-0.8.zip http://elspell.math.upatras.gr/files/ooffice/hyph_el.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=ab1b5bf165d56d3d7e2bd3bd2ab3cb05
diff --git a/app-dicts/myspell-el-0.9 b/app-dicts/myspell-el-0.9
new file mode 100644
index 000000000000..3b49137d1e6d
--- /dev/null
+++ b/app-dicts/myspell-el-0.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Greek dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://elspell.math.upatras.gr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=http://elspell.math.upatras.gr/files/ooffice/el_GR-0.9.zip http://elspell.math.upatras.gr/files/ooffice/hyph_el.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=91aa1a79d04a1f065fb29971e055eb84
diff --git a/app-dicts/myspell-el/Manifest b/app-dicts/myspell-el/Manifest
deleted file mode 100644
index 5e99754f8d9c..000000000000
--- a/app-dicts/myspell-el/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST el_GR-0.8.zip 1532950 BLAKE2B a68eb9ad9819b4d5192cac1276a0e3a6e44dd9e89857ff208d5ff4883a26a8b4eac16c0de7a999c068aa60299d1cda9fa2149f25fa4dc672a56d065b8946556a SHA512 b8209890259dc0c003cf3219363f2270eb879cc8b6f34752b1b49ce07cd7461e0d948faf39b5b54760ad36c29264632f0fa2b4c91fec40d3e44cebf3789c42fb
-DIST el_GR-0.9.zip 2120747 BLAKE2B 5fe5030227b3f65bf04a7ecf055c5159120badae250ef8c718836e6115238b12391f82a656767313338ece98bce91e099d6f12f7e9e9f2f202dbdd6a14bfb6ba SHA512 8eb9d951bab3caf09f53e7ee98ff155ade8d9198533264ebdd53b413e38d9b84e5101938c1abb3e220e0764c98186fb2f5480be50e98e7effb7bcc8c961eaa49
-DIST hyph_el.zip 2224 BLAKE2B eb5c5ba1b856a9edc5bb78b583af442ccdacc3d7270b1e1d61081382b195fcc3637ef83a4e35eff79146a21360353145128adabfb494976a6998f1dbccfd062d SHA512 259a1ad3b4f38cf6aa67027cd3354488b298375450ed99b07e4ea8d355e90211caabfc40ce71af73e5d354348541bf8a486aecced23f75a4fe9abb8f6c2ac3c3
-EBUILD myspell-el-0.8.ebuild 557 BLAKE2B 1d5927dfa382f8c16ffb9ed9b8878f928fa1af5ddb55fbfec3da1a4f1fdacf359a146946d2c8d59d9f962144e8c0227ed2dacb9cc8c103ea9eaaa67fb3f82029 SHA512 68767446a34d6598929fc09fc5349bebf999790c5c90ad8a495ce443dd59c787743d8073827549d0b398436408ec40b076d8f53d47a5d0ec1add2c4e748ff5d0
-EBUILD myspell-el-0.9.ebuild 573 BLAKE2B e83469c08e4b37f13c389c7c07ea82c6b8ccb073d523d60569ea84c8e4aa6941aac9dd824d8cfd0dd95caeb0a0cb716a1c45c9b80f4e838925719cd87dd6facd SHA512 6aa20fc6a687c516bde059e7b369c6727047335cf28c9f096bcbc0a7fd635225660cef6e85a543d4ab16ddda3e609dec6a9ddf0e37dd9009036f9bca896d17d5
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-dicts/myspell-el/metadata.xml b/app-dicts/myspell-el/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-dicts/myspell-el/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-dicts/myspell-el/myspell-el-0.8.ebuild b/app-dicts/myspell-el/myspell-el-0.8.ebuild
deleted file mode 100644
index a30db844ecdd..000000000000
--- a/app-dicts/myspell-el/myspell-el-0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYSPELL_DICT=(
- "el_GR.aff"
- "el_GR.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_el.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Greek dictionaries for myspell/hunspell"
-HOMEPAGE="http://elspell.math.upatras.gr"
-SRC_URI="${HOMEPAGE}/files/ooffice/el_GR-${PV}.zip ${HOMEPAGE}/files/ooffice/hyph_el.zip"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-el/myspell-el-0.9.ebuild b/app-dicts/myspell-el/myspell-el-0.9.ebuild
deleted file mode 100644
index 6bd28a6db0ff..000000000000
--- a/app-dicts/myspell-el/myspell-el-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "el_GR.aff"
- "el_GR.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_el.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Greek dictionaries for myspell/hunspell"
-HOMEPAGE="http://elspell.math.upatras.gr"
-SRC_URI="${HOMEPAGE}/files/ooffice/el_GR-${PV}.zip ${HOMEPAGE}/files/ooffice/hyph_el.zip"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-en-20160901 b/app-dicts/myspell-en-20160901
new file mode 100644
index 000000000000..b2b65300c0b4
--- /dev/null
+++ b/app-dicts/myspell-en-20160901
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=English dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2016.09.01/@@download/file/dict-en.oxt -> dict-en-20160901.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=a713ffd114ca881794e71e7645dfd20b
diff --git a/app-dicts/myspell-en-20170101 b/app-dicts/myspell-en-20170101
new file mode 100644
index 000000000000..90472be14ee1
--- /dev/null
+++ b/app-dicts/myspell-en-20170101
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=English dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2017-01.01/@@download/file/dict-en-20170101.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=c86c7be1f0aa1779a66b81892e564e2d
diff --git a/app-dicts/myspell-en-20170501 b/app-dicts/myspell-en-20170501
new file mode 100644
index 000000000000..22b27910f188
--- /dev/null
+++ b/app-dicts/myspell-en-20170501
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=English dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/english-dictionaries/2017-05.01/@@download/file/dict-en-20170501.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=153d6b9ecc9707f0afb22bf7e68270e6
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
deleted file mode 100644
index 76006043b2ec..000000000000
--- a/app-dicts/myspell-en/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST dict-en-20160901.oxt 6025820 BLAKE2B b4b698d63e31c478ec15eea8fa90afba6fafebb90c88618094ab3535af0effb5777e9be313f8a72a460ac32379c699308a791a79ad977d326d9161857a793dc8 SHA512 f52b1fe8c32c6f7dad389d43f52356ecc989365113593513c61a36ad6fed03c6eab7e08c9a07b281c1a30bdf6dbe2d201bc2ed83c6b1fce1006e16de969a30b0
-DIST dict-en-20170101.oxt 5960816 BLAKE2B 65505ed6e8323f28377728ac29e550cf151688517b83209b055966be4e7e14465aacc1d1677d22bc005089d7623e78e63bf91dcdffcde3a790532dba87b54615 SHA512 fae05d3e4bdc9bbd5dda6eb2c0de2f5d0860973e75fe0931bcb0d0e0a5015fb6042beec7f811bee0011f519d13d0f3b52b09fbd906a75340bf311177885ccc1d
-DIST dict-en-20170501.oxt 5964856 BLAKE2B 71a19b8c5215dde7d2779a259310bb3b098c0e6493000e77e7c0433efbf5faf03e8a4eae85ba500142f72838a6b0b9dba173c0025c1568d367d7093548ac0a1a SHA512 df8b2f15903d650b5fe9499dd278d2831f98aba421e83d38e7807e42c3c2304fc7921f12663589a7195de6d298be6103e3f7a58b15755512bd1db0e4c4f7c5d5
-EBUILD myspell-en-20160901.ebuild 945 BLAKE2B b60c638db7d9e4d789fabc017c769d375e12bde8949a0711b23ca4dbe51a7798b0e737e645155c70280306dbc4e703975850ecddb02fb51f4ffebaa40357158f SHA512 79eccaa71b8e4133fbfd974caa61678d232fcb1fb7047d07e2d8887485ab1b0679eeef5ebd3307dbf70ccaf92b593e15defb76dec41f65818e14dfbe05746a93
-EBUILD myspell-en-20170101.ebuild 930 BLAKE2B 05df7aead57950f6ce4e9894664cf1f6f440aa7a6e42022e69c2b37a8fa390fe5611e53ad00a8c0530a7967ede6c59d6f090e73a06c527271d06f03f53bb95c5 SHA512 c064e21034ae2c29a988aa09d7b8561a4ae710ef604d4c08b62cbf5ccf582e124d990ae6d7fd33282740f403990d461424cfe0637b36adb3558643ce3660fb47
-EBUILD myspell-en-20170501.ebuild 940 BLAKE2B 2e0e5145cff1187cd6d58fa80193dbf6314cd9cdd1e39b155f208eb2a910db0db9365c28977a233e839e8a7671c390c1868030ea5e9ffd58c41a2930e7b62999 SHA512 9698197f6c1ebed54609164e299e68374d3267b4748534274d46b8bcaf529564706bd59ce25b0f68a296216617856fe5f45d8c56731a2239d04c1d032ce4bb95
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-dicts/myspell-en/metadata.xml b/app-dicts/myspell-en/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/app-dicts/myspell-en/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-dicts/myspell-en/myspell-en-20160901.ebuild b/app-dicts/myspell-en/myspell-en-20160901.ebuild
deleted file mode 100644
index 7fc9b1cc89f6..000000000000
--- a/app-dicts/myspell-en/myspell-en-20160901.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
- "en_AU.aff"
- "en_AU.dic"
- "en_CA.aff"
- "en_CA.dic"
- "en_GB.aff"
- "en_GB.dic"
- "en_US.aff"
- "en_US.dic"
- "en_ZA.aff"
- "en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
- "th_en_US_v2.dat"
- "th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en.oxt -> dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20170101.ebuild b/app-dicts/myspell-en/myspell-en-20170101.ebuild
deleted file mode 100644
index 971a5a8d437a..000000000000
--- a/app-dicts/myspell-en/myspell-en-20170101.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
- "en_AU.aff"
- "en_AU.dic"
- "en_CA.aff"
- "en_CA.dic"
- "en_GB.aff"
- "en_GB.dic"
- "en_US.aff"
- "en_US.dic"
- "en_ZA.aff"
- "en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
- "th_en_US_v2.dat"
- "th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20170501.ebuild b/app-dicts/myspell-en/myspell-en-20170501.ebuild
deleted file mode 100644
index 8a91e263b3ae..000000000000
--- a/app-dicts/myspell-en/myspell-en-20170501.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
- "en_AU.aff"
- "en_AU.dic"
- "en_CA.aff"
- "en_CA.dic"
- "en_GB.aff"
- "en_GB.dic"
- "en_US.aff"
- "en_US.dic"
- "en_ZA.aff"
- "en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
- "th_en_US_v2.dat"
- "th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-eo-1.0-r1 b/app-dicts/myspell-eo-1.0-r1
new file mode 100644
index 000000000000..ce94e5ec6f5f
--- /dev/null
+++ b/app-dicts/myspell-eo-1.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Esperanto dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://nlp.fi.muni.cz/projekty/esperanto_spell_checker/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-3 MPL-1.1
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/3377/1/1.0-dev.oxt -> myspell-eo-1.0.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=d56c1fc7b4ee6838c2d54ec0cfa84c07
diff --git a/app-dicts/myspell-eo/Manifest b/app-dicts/myspell-eo/Manifest
deleted file mode 100644
index 8dcaa980d135..000000000000
--- a/app-dicts/myspell-eo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-eo-1.0.oxt 186407 BLAKE2B 9bf51c6fa343d5417811580f0db36d5d5c5d37b6939ee545a87ef1b3f661fa5268ff92dafddb8ff9b4ad7512c5d578bfa20c6bcf276c5a00d90cdbd67ee7197c SHA512 b5cf3a14672fb0e6b810e5b4d811f430b3c3cc38cf09a0083b7e26471597c6df055242349a2a239607621301f71527e8bf225dc03de727c5863e7b7b1c821824
-EBUILD myspell-eo-1.0-r1.ebuild 699 BLAKE2B 3d1b15027db335b1b288818048a6242dd5bb97cad17b2416a542819b9e5afac16acce3f721f60cbd62f09442f84841189c6fa17f95908ed26cecb2eaba594076 SHA512 89219002ac0c87e5127907acd469ba1282038bcf90ae579b441dc34055550a8e05ef5e67dfa0350878ba302cf04a2858c72b631aaf4531e5aeacb6f1ead5d5fc
-MISC metadata.xml 251 BLAKE2B c3fd5444bf91aeb5fca487fd3f35d92e951cba5581257ac67bad06e898b67385cde86db9395f03734daf6fa65f76a3217d86e8745c62d0ceef001aa2a62749b5 SHA512 8efa4d577315623dc1527c04418d7e142f1583cec26341ce4b49f21e4cec496f5db3ecb782db80910c9a2df0a7df94af5d22361e458c01cd8dd79bd593292220
diff --git a/app-dicts/myspell-eo/metadata.xml b/app-dicts/myspell-eo/metadata.xml
deleted file mode 100644
index 259f3e2c2134..000000000000
--- a/app-dicts/myspell-eo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">aoo-extensions</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild b/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
deleted file mode 100644
index e05f6123750f..000000000000
--- a/app-dicts/myspell-eo/myspell-eo-1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "eo_l3.aff"
- "eo_l3.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Esperanto dictionaries for myspell/hunspell"
-HOMEPAGE="http://nlp.fi.muni.cz/projekty/esperanto_spell_checker/"
-SRC_URI="mirror://sourceforge/aoo-extensions/3377/1/${PV}-dev.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- default
-
- # move the dicts for nicer name
- mv literumilo.aff eo_l3.aff || die
- mv literumilo.dic eo_l3.dic || die
-}
diff --git a/app-dicts/myspell-es-0.7 b/app-dicts/myspell-es-0.7
new file mode 100644
index 000000000000..a5b8f8f965c1
--- /dev/null
+++ b/app-dicts/myspell-es-0.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://rla-es.forja.rediris.es/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 LGPL-3 MPL-1.1
+SLOT=0
+SRC_URI=http://forja.rediris.es/frs/download.php/2933/es_ANY.oxt -> es_ANY-0.7.oxt http://forja.rediris.es/frs/download.php/2934/es_VE.oxt -> es_VE-0.7.oxt http://forja.rediris.es/frs/download.php/2935/es_UY.oxt -> es_UY-0.7.oxt http://forja.rediris.es/frs/download.php/2936/es_SV.oxt -> es_SV-0.7.oxt http://forja.rediris.es/frs/download.php/2937/es_PY.oxt -> es_PY-0.7.oxt http://forja.rediris.es/frs/download.php/2938/es_PR.oxt -> es_PR-0.7.oxt http://forja.rediris.es/frs/download.php/2939/es_PE.oxt -> es_PE-0.7.oxt http://forja.rediris.es/frs/download.php/2940/es_PA.oxt -> es_PA-0.7.oxt http://forja.rediris.es/frs/download.php/2941/es_NI.oxt -> es_NI-0.7.oxt http://forja.rediris.es/frs/download.php/2942/es_MX.oxt -> es_MX-0.7.oxt http://forja.rediris.es/frs/download.php/2943/es_HN.oxt -> es_HN-0.7.oxt http://forja.rediris.es/frs/download.php/2944/es_GT.oxt -> es_GT-0.7.oxt http://forja.rediris.es/frs/download.php/2945/es_ES.oxt -> es_ES-0.7.oxt http://forja.rediris.es/frs/download.php/2946/es_EC.oxt -> es_EC-0.7.oxt http://forja.rediris.es/frs/download.php/2947/es_DO.oxt -> es_DO-0.7.oxt http://forja.rediris.es/frs/download.php/2948/es_CU.oxt -> es_CU-0.7.oxt http://forja.rediris.es/frs/download.php/2949/es_CR.oxt -> es_CR-0.7.oxt http://forja.rediris.es/frs/download.php/2950/es_CO.oxt -> es_CO-0.7.oxt http://forja.rediris.es/frs/download.php/2951/es_CL.oxt -> es_CL-0.7.oxt http://forja.rediris.es/frs/download.php/2952/es_BO.oxt -> es_BO-0.7.oxt http://forja.rediris.es/frs/download.php/2953/es_AR.oxt -> es_AR-0.7.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=b8c7ea8e38000589d9581e1b78b75ffe
diff --git a/app-dicts/myspell-es-2.3 b/app-dicts/myspell-es-2.3
new file mode 100644
index 000000000000..f0568a3bc919
--- /dev/null
+++ b/app-dicts/myspell-es-2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://github.com/sbosio/rla-es
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 LGPL-3 MPL-1.1
+SLOT=0
+SRC_URI=https://github.com/sbosio/rla-es/releases/download/v2.3/es_ANY.oxt -> es_ANY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_AR.oxt -> es_AR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_BO.oxt -> es_BO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CL.oxt -> es_CL-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CO.oxt -> es_CO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CR.oxt -> es_CR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CU.oxt -> es_CU-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_DO.oxt -> es_DO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_EC.oxt -> es_EC-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_ES.oxt -> es_ES-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_GT.oxt -> es_GT-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_HN.oxt -> es_HN-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_MX.oxt -> es_MX-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_NI.oxt -> es_NI-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PA.oxt -> es_PA-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PE.oxt -> es_PE-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PH.oxt -> es_PH-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PR.oxt -> es_PR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PY.oxt -> es_PY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_SV.oxt -> es_SV-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_US.oxt -> es_US-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_UY.oxt -> es_UY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_VE.oxt -> es_VE-2.3.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=d7786565e0c324e6c3777bfa5ab34a40
diff --git a/app-dicts/myspell-es/Manifest b/app-dicts/myspell-es/Manifest
deleted file mode 100644
index 876eee1bc58c..000000000000
--- a/app-dicts/myspell-es/Manifest
+++ /dev/null
@@ -1,47 +0,0 @@
-DIST es_ANY-0.7.oxt 1415886 BLAKE2B d7a74ba997abe1ffc2b59f6d8ffb12b652b2ce540f6e5ec8ac60e363a1e07e7b72bee030a24739a93626de45c700fddaec35d1112a20a33756717283d4ee892c SHA512 ea4e015bbaa86865537b0079b71160881abb78f651757aee784e032374f8cc96f2296b0f83081bd2543d35a246a2deca384ddd8a28a37f26b82d306b19ace3cd
-DIST es_ANY-2.3.oxt 1460673 BLAKE2B b7865fae1c555e99518e3f0f5b668742176cec6807753d50587edbd70aa0b88be3c70fd33f7fae0490827c084ef0e176bce41d71e982dc938aabc74aa327d683 SHA512 2131ec088aa4c46e4236b974f77f3a80299f816d3b493816b17eea5a4b7c7b5631efbb15fa3a2bec804db7e6723e02b5a894614c7966626662a5f778676dcb6c
-DIST es_AR-0.7.oxt 1437556 BLAKE2B a6f888d67c147f02c758c7c9f8949cfbcabcd03559b16bff0d409960adfca7f40527935dd106dd179f55efc65bf41713ebbb50fd330427e5313abf9424ef7941 SHA512 2c996a92cd3aba6edb979641025e45362d8079061423296430eaef113354f14defdfeb1e23c1d0b8a8157fdc914f07e7fde8c51560091a389e242a5b68552088
-DIST es_AR-2.3.oxt 1414045 BLAKE2B 52b898d26fc384a579147e0d20f34e0591ab7a4f13feb35a92cd070a9aa3f972f971ffd8025ea4a438570100300e163af4ed4cd80ff108ad1d31ec62089a1062 SHA512 c28217ebb49bd94b808787953440ab9702b3d46e0faa43e39f25e9dfbad915e4310be6fcaeb7ac16775bde5ea73641db79a53908dd11e9d16321c041afd4925f
-DIST es_BO-0.7.oxt 1435774 BLAKE2B c5907b14b157c1a48e29eb0d794112adf1578d73cd2bb7351164c793ab58da46387106b9a1b58be4024347701ba1c72f7b3fefa8ea3e2e984a06ebf2c309e26e SHA512 04549045546444c84f623552f6264d17ffe4cadd77f81b8e2828978f6172e275b203eb83aec1dfac17acbf3466cc3562d825071116de6af8c52510feaa7fc9de
-DIST es_BO-2.3.oxt 1411131 BLAKE2B 95510383e378a28d26bd4f58d479b1f419f6636e66f73562cb376b8422388b2c0a4c2cf8cc58f48d11dd55acf680498c9bbb0ac412bf3cf9ce9a63ddf8109ffe SHA512 ee15be0b8e96ffd2eff6c3adca60db9cf9e4a1eb9c6af3da29c3874283153b00c4c843313853c0bdcc277602fbb95c8d3e8abe15e25596e92804499e5f083590
-DIST es_CL-0.7.oxt 1436928 BLAKE2B ef1596c311a761cfb87c099ef54a88f89c3fcd755036268329bbc8d9d01de46c73d7890ccb376d3acbb2c838394c0f48cf8afe48811b8af95d4cf44855073f38 SHA512 13ff5459f83e06aba63e248fcd024aaa49afd38a65ff04ffca5a833e3f8a828cd3dde60629e8eb377ee6bdc86c5e686fa65867f2223b1f0861a9dc74fb020263
-DIST es_CL-2.3.oxt 1412287 BLAKE2B 14435cd7ae8700b0134c9e0b504c8fdb15c26a2f393167117294414243a98281f7d0620b719ab2fadfbb95bbc04fc618fc849b27de1a2010056e74207a2982b4 SHA512 824a38e7d508c1b3aafc7f9fd0173b9d752ec5edb9d07c40b2affca693a73f73aff5f816b45e901b67efd365dc34ed86e15af6c118173d8b1d5f39eb277d5bc2
-DIST es_CO-0.7.oxt 1437795 BLAKE2B 6da274fed6c1a272ae63b434698f2b9843428ece9edd9bef558489f5c88d8247e5b861b4933802a57fc10406b639c2559b024384702051eb1bd169c1c1c3879b SHA512 b071add498b9c60bb1db94dda7e2896ab109165d65142b4ac539e88434d9880b7b5d437769cc0475ce432f45b1832d648bed7925adc9cf4e678e183f5cdb5374
-DIST es_CO-2.3.oxt 1430059 BLAKE2B ff9999eb44326a53b16f02d3f63aa3bdd6f2df56f94dca6a3962a18b3161b889146746e6437cd39ce800314d78bfab41c6967dbcb837e17219490490371d9791 SHA512 3a709100eb6cb15b5f1bb20447372dbc67bd27536fd6515b9b1f35447d1b5bffdea0f0b9aee42ba43f81d5c4f5b5c857749ee86c60dd9590bd48df3c688a446a
-DIST es_CR-0.7.oxt 1434858 BLAKE2B 5e3c7e9d19da1fae59e7a2cafa55dc956ffb324e0447edc6ded94f3d304b1be72b3fe17ace1a586c0d364fa49ae4ec52ca16a27044e266db9ce9e0a0f0dd829e SHA512 1ed3dc04e5bf187fa2ed4a4f8326537760541ef38d60abc33d729961eeac75e206e7e50dfe3e85bf0053e42a7307779f2508a16b04df5e4ab2752091182b2a68
-DIST es_CR-2.3.oxt 1409988 BLAKE2B 8064c0c89b25cad263076bb307881c4ff13d694081c903c111f7312b0bef824c3687b0cbe6453f7c67977082c0f793379632d300dacea31b3d70deb63efa1772 SHA512 a6c2b65f0975e554dd35465113b21a0b3821ed51028c68f52b2a72ae6b2796e43b0e7f21b1aff7491186d614d1b997a9483371a93e3a77bf12bf81efaa5429cf
-DIST es_CU-0.7.oxt 1435506 BLAKE2B 0d23267162aad97ad8098c203c3946ae322f9eb15a99072874a138bf0aa06d751ab25eb69ab8c821214595dd9bb37b5a72179c61ac637e15dfca08e4dab3809c SHA512 b60fa3d092512e43610695b507e4e2c09065bf9a2c50971c9a8074bf93896e19d512847aab9190b2215da4481e514ce7fe23a851d27eafc24704bc7a3f4756a3
-DIST es_CU-2.3.oxt 1410740 BLAKE2B 73c6e7f3b80069e447d9d583df95f9269f8907674ac2011448e3699476810c70df80cad30360b2d64b7c71885bef3105e2f2dc7f6614c580f537a4258a7183ff SHA512 a6098f7521521e84373d143c423265e8c87e7e7b8ef328d16e4a9da40ef54b5417d19e86539753c541814cb040c7cffec07d7d020715b9f68409e3312a37f155
-DIST es_DO-0.7.oxt 1434782 BLAKE2B 225c30dfb78a1cae05aa50e157d9ea8a380310ed6b45ab2f5face2d1c466eac7af6ef88b00b501f5af138147a575a6044802bf25500838975c1ede4b5adf4054 SHA512 621be08835598664de6a6f1e865c1293ee62d0581d429bdc6675991838483d9bfd9be38d08cdbeab8d03ad7709f20dc2af38ad054718fd6e2b74913bfac1f5b6
-DIST es_DO-2.3.oxt 1409943 BLAKE2B 34b88b9202761f34d706a64c9243db2c8f29e63a8e7679319e60b77896a77df2ee292e7e123e738a266a5048934bf77b3e38d4ceeb2dd78bf4dcda7d6c6e69f8 SHA512 02bc65cd2d0cccf50bc3ef027356b759a6400531e809dda8d4bdb33e15b3b84d6a2274b6a38c0242c8c7e896a2b8515ca6607cdf2b09786140a9753867be952e
-DIST es_EC-0.7.oxt 1435564 BLAKE2B 7a8656255361a014324dc37fa9aa1e1336c207b3e0a28f88ce6b0064de0d3d8e98901c39ed9d5910f91c4c08a03b697fd7634a01b00f0b34cc7e2e8b6a314958 SHA512 30bf5b228ddc3afafd6e17e0ecaad10266f30bf1738a7d67472112bfb5f08cef29e681f63d3613a6fe71b0897b92a9bf9eafd90bf0d50f4f81697828fc6b00dc
-DIST es_EC-2.3.oxt 1410704 BLAKE2B 3cd523b8ea3a521aa0bd2bb585bfe6cc9447781c83f96ed20c807f1da1f9e7370606ac38acff8e24148799db6a666c1fd1b5edccd56d2e17c006cdb0537cc4a5 SHA512 5038d08e4b2f41d51a0deafd7948eb05de33b641e10fb1e7167badd823fa9dd7844c2e0617f0cf102f3818ef761fbae903b596f82d9576c288f33233f74e2362
-DIST es_ES-0.7.oxt 1438691 BLAKE2B fa0cb94cb3c36c024ca66e7d7314c21ca27d17b0d57241d44c7926c773a34c1b1809c540bfb3a71fe55e5f57c47700c024ead3205b43cff52de1e3cb88362ba5 SHA512 6eb23eac189d6e0586a69b2e68c6aadf5eeb6ed204d222a76bff955604c0d7f6c55fd5b195959a542357d943da73eb0390d60b38bb07eecf49e73df28f586f51
-DIST es_ES-2.3.oxt 1416213 BLAKE2B f68b9c18f40dab2b84a6bb2ac1f5d9d4b9c153cedc2b886423f86380c67c046908a4ae05e6a9e88ce669b92469c6b97bf3ec310855b3458e0929fc436fa70a95 SHA512 566f22be881024ff45b2a20b69ffb20abbe4fd144fbd18abfa292e17e0a2f73a18b7f0459a2f4ef8f50832b2ce6974830ffd7de5674378202124641978b8b5a8
-DIST es_GT-0.7.oxt 1434939 BLAKE2B 028397a1834a229ad1c888d03b6a6d700d2c8006a3c532c5be82cfd51d00aa1aaf06fc5091c90c2ab24cacbd21fbbbaa311ab7d4b46da844f25e0aea19ccdd4d SHA512 162e59309532e6cad7ad49866375970b3ad788a11ae6b63ac9c182da5aa50948139c0eb9f2e727909da4744a095099ab5bb18ee2f73b0e1c63921dad8dbca4ad
-DIST es_GT-2.3.oxt 1410064 BLAKE2B 7ff365cd68482578afd87ba6887279036bd9f7e434097cdf3dd9dbc04e1ee228c56894a527041bcee4d958f2ca734e3a67527bf68bfb6d2b651779d1efe864dd SHA512 1090e0ba07e026fdfce65fc4ad75fa4fb4c9ac13172a5acd94e4549b7347c482f0da0a180e7d057807c93170ac03e258e17d75e9b2455b3c6e2011aef6079c8b
-DIST es_HN-0.7.oxt 1435398 BLAKE2B eff8ce7278b6cd8b1306d3c777c4fbe988c31384e4bd31febc7941e0a2e1cdadb1838bc46477e275cf991825a2fa946b22cbd3ba53bbaf52755722479addeaae SHA512 3d8050c22d27a32b5ebc72862ed7066b3e58083c9cd6847824361d656ba4f8b122121509bfce303edf1b3b0a0e9cdd31671caac28662299879eb1cacc19d81b1
-DIST es_HN-2.3.oxt 1410551 BLAKE2B 2b62e149d8a73fb015b3e6d658796818409fe04d658b5c5081f45f89d054093cb4397fe3a0eb37d8847eecbe9832367b1807ce01ba523b4f7f5d6c702ac879c6 SHA512 4ba1f02228d436a4f4d907381841213ce3a42fadedd3cc916b665b506d1d112bb23aeb87f40147eaf619e919b9b06d58a8aead018edd3bb73593fc429bb07e02
-DIST es_MX-0.7.oxt 1435177 BLAKE2B b10c5d40dd3913b42b170adf38abd9cb10860610e395768191701c3754c42b8fd5df2bf8b52c69c172fe384d19df3fd7d2439c972d1fcfcc65ec5fb82c69b367 SHA512 6e560d630da72f627c0f5a603adc9bacb102edc106c9bd7ca831c7b4c808441cbf73eaa3f75c5953b89548d071a97e81fa57d5b2542e0be6c6d993d74b09020e
-DIST es_MX-2.3.oxt 1421023 BLAKE2B fc1c7fda66f66189af3098f36faf6b8f5e313931ee5d490be83c580bc7707fd0022bcec361707795071d262a4cdfe6eecdb2742d7baa5d2fd43fd9dba6b09b51 SHA512 10716a744e9889bc3baaad6163c1dad06e6756dbea95166866834480b562c0fa5abce01bd2d5e4b05f19e522e1726e073dd7afef3a9d8e6bfc0d2f4b28bd0a2c
-DIST es_NI-0.7.oxt 1435054 BLAKE2B b58bcabb0c5c033e6f5f9c27c69ffeaebc5dff0984fb447b273cf88cc93799807b48ab07f9a901815cca497fec8870de5c0ccebf1091ea264fbf6edb63d0bbe8 SHA512 e86e0748a04ed3ce74f4309764d08063c0e01b9f1568f1de7e08bd8c22cd2d0ba6a3dea3afa272d2d697644bed8e0fa19c7d7940fa87393de30fcdaee095e483
-DIST es_NI-2.3.oxt 1410217 BLAKE2B ed401084f3a025abcd812a6022786682f91e2cd02a34ee37af0313703eb3d634506f5300f9b50b44004b95ad6d5906f593b21322ae6b5239143acbd0855e0927 SHA512 598896a853d81d1424e4927df634ca0e40c0e774a62e0f29bc1105d63fc586362c10ccc26a5f3becbc134a7b041272670bf971ea5bedb121f37cda5c7ace56c8
-DIST es_PA-0.7.oxt 1434970 BLAKE2B d87cdf1db1dce6c1a23acf9c2fb37f1053393755940c0f379b9ac56bd3f1f4abf070f66042fb43c2f96773afd9e07376d9706a6fb4cd2dd2f2432bc8ff60814d SHA512 172898dbe6a9b6ebe767797e08952af50fa0148059f215f4662c215b0df1b6333dec6d81bd3c629a538a96cfc571ed4ad1337d6a9e6d7bb941ad0a609a8cf588
-DIST es_PA-2.3.oxt 1410102 BLAKE2B 59fd0f5d657a2b3bfc6e9b878ed2b75b8929998d6f1b2d050273e0a2847e80bcf055ac4800975441bef225dfc556e7eced368f3d69ca9619e5bed42078d70cd7 SHA512 d54856ddd5a7af78813f4fd15f49e790682a2fb699557dcdfafd4cc94ea1794b0d641eed7dbcac4c2f9360ae673f5c51654f0240bd9e9ea7260ce84819f85526
-DIST es_PE-0.7.oxt 1434282 BLAKE2B 824243d8351192a4c50c4d1729d9bc927adcb618376665e5ed00977e6079002db9f88f72fd3d74b80a2b2f2f07ea7ae605676b42e28efa6b4e91a42c5e98505f SHA512 60ad75c363fb3e5612bf8b423975aedd32b7738073e0e863c42de3be7d22bf3a050d3d09a5a8a6a65ad8e36fd7a516f1c6c3775f9ad76696657d9eb8a4e2336e
-DIST es_PE-2.3.oxt 1417405 BLAKE2B 4cc5894c8cb199fa08c7f46ef3a5505a64b79e27d004be1bee7119207732aaed5fd965ae1bb5e5d7c2044f0cc2bcaf417a889b973f7f202e9c296f113232f64f SHA512 f76cc2fa18cb509bead6a5fb27bdb9007e54806ed8d130568b33154ede14150dede81248ee46476d4bcbefc349c78d566dc15e7c58a7c12d7ccf0a1ac18fcdad
-DIST es_PH-2.3.oxt 1442511 BLAKE2B 718441cac52cdfa979bd65f5acfbecdd488d1e89b9002b89ccb6ac0c9bfd25a6f483fc29d3d413afb949e7a74d53859d66471b0b5f945cd0563cc6f941f7e25d SHA512 d041cb89e89b9509150fedcbc39a317ce0a42ac72811e689f73879c76db264573899fb40c16c314374911b167c1f47c573ff97ac83bc88c659377f81bba511ee
-DIST es_PR-0.7.oxt 1435436 BLAKE2B 1f9af2c0f24dca0ac94d256438210b9ba6a21000469b0a88d4077c977b049303b08cd26744a765af9f8b1e48104cd995a4cec5d69bbfa7be7e9c74147626e695 SHA512 002767cd23709a3b2dd2a2616642fbb1b1d674a21507ee21c830741e04234fc32b0fd6a8b762c24183d44d9f7a233c8304b580ff3d96b7c87b10f43393e3a604
-DIST es_PR-2.3.oxt 1410569 BLAKE2B 1c673d5602a5347529dab58562a00c96e4a4c7fd02f2cfbad50ef2cb4bab35f7121a030264a9db46dafe9faa6f8de23c9feaacacca576dc4575d9ff734e2bbfd SHA512 92e6d9f16bd63696d64b8ce214c3fc19721ad3a17b2b5f82a2bf38c5ca42f42a62d9c0a06e1668e5ee7ab076781ae794e9a9abd40a564d36faae367d0adf28ef
-DIST es_PY-0.7.oxt 1434869 BLAKE2B 88da4c119a88b7a0455075da6a0a972354a303c2ff86e91cd71da0a21cea12961554ea2da72aea71c72dc3dc7dc1dd45c7a1b089a86067ca1c4693a7b579403a SHA512 10d785338250506ebf8bf3a8cbb79413c817e4e25f9153b4b8af9c0a7a422079d5d2bb9411e4989ceb7503d0a65ce926352af242bfa0a3de9c23e3dc6ef889c0
-DIST es_PY-2.3.oxt 1409970 BLAKE2B ed133f59c0a50b7aa4ffb0dca3942e6f0b4917e65428933f831b15d5ebefc3a1fca3317b85da84c5f6d99f9868071060ec1bed237709560d0d5853f2fe4df02f SHA512 885af32d996aa88dcf2848b3edbd13043c6542cff78c0ed8bb52f764b73843f11abc6572a87890c69ec42a5a5baf8c20c131a080d8d7df6e9327d02cbbe38a33
-DIST es_SV-0.7.oxt 1435063 BLAKE2B 031f65260cae0d74cb1d7e6cf922a6134ebdb0a85f91633f3e37a4fc523a04ef49931a1267f39068e5ee2748c501f73b9c17d5d0edd20f0f881d04642973a1e7 SHA512 30baf8e0191b10f107914728f09c5d193264932f4a78ad7cf8ad55bad9e80ae9cc42802ea69e4b5cbd5ea5871a8fb45c04728b29d51e2d4f24a9e4c1f1a62d57
-DIST es_SV-2.3.oxt 1410203 BLAKE2B 1cf9d6715136b9a509a0ebce7be157b792446c4132b62b657cd3b5fffb1a227231794e9e802a8e0ea3e22c80f6e3dbb79fb25a01f818744f338bc04fef224979 SHA512 56c3ecbac7c2a5b9b8b6b848060a094934badc335d0f832f04b1b9a0ad262b2de5c75e1c05a05520f3a7b44791045635df3499d9fa37f812a2d7adc54321336f
-DIST es_US-2.3.oxt 1411395 BLAKE2B 350c53e62a49eee1b7c3c465ef4c7d7e1f846c524ce0e0e55244f3fd9be88fca50d0ff9a67db0959af074fb6e0fc4e596587063fcc16652a16ad13efd9b93be4 SHA512 eaae90c940c3c76616bd57a52f1c8f7d61be46bb4a54732befd06d292ecf99d6844f6ae02fea214647a9fb7f83c7ce12062608214c67a284ac07155c979c0093
-DIST es_UY-0.7.oxt 1435883 BLAKE2B 3880e74f3184887c5b73b10188e8bbad87501d9001a066b27e64fc5dde877b68d25eca5fcac9a16ad331bcc890633bc19b0e91f5c2576b13081c1212eef89102 SHA512 ed0cfb3c8d097e4c56f92e239c6f27e1e794baa2ab4b81fe6eaa03dce00716c303d8d3bff20e163723c8a885029b9ae3f9e10d232d5c94f344b1a36261b86f1e
-DIST es_UY-2.3.oxt 1411016 BLAKE2B 51dc5d52b13ea15432669c7bc518ecea0e9c26df0245449c8f17e9a4b3d5b4b14c87052827fc96c7780b21f6597c08c36551316d705d84dfaf90d7ec4c7aadbb SHA512 a6f19361afb5bea47ba823c69ad57577f311ba78c7e43dcc3216aece1e7baf84a8b4490f13c582d5b1f1f3fdb16b48850d1d7adc882f2d3b5b39af65caf86ac7
-DIST es_VE-0.7.oxt 1435033 BLAKE2B 4b0c3bf2d0b4aed3db2d2cd2a895692a9e3ffec16d0f91795f2f8f462f22783bd4240359670ce0f0e35383d0b0ff1f78c3be130134604de6c9b3515f63b599ca SHA512 e70ab6b64931dd0f572625564295844d471e68d0e6d38dba5e2c27646d5caf416a412f179e31ac647ace9fcc673a40727abd1375c1edd69d80246b4888380969
-DIST es_VE-2.3.oxt 1411856 BLAKE2B d746113298bce3db8c8c4d4ee8caf369f809ef73971612fc207470ba1ebfc67521235e855fa6243d2b6850184f273723c7d83a0b8d22293c3abd9fb550826ff2 SHA512 4d10b818e4d00f60f07f9f64d519b02f549298cfb1da6a344504cd8953fb54793607c662ff2f0505dfa9924e1d1ba45c1ef6d2d6bc4cf2d37d3d1bef99078569
-EBUILD myspell-es-0.7.ebuild 1237 BLAKE2B 8a567e251f9bda7d627937e7658e583a08f43f6a6c227fd04411b33d2ead5c9bd55ce59dc45bb1f562129041c3ac184e4345541cc9c664f4121e4a70436e38af SHA512 86867d2ed2f2d94db05b12ee42c7432f73f43371068fca4654845ee197fbdc2dabfb8b51479e3a6e1e2f6f4a44be05b37eeaa21fa2566876cf85c778e0bc4b83
-EBUILD myspell-es-2.3.ebuild 990 BLAKE2B d2b47ee6ebb36232ffc8b23c4cb4bba9c7fb73409dee3363b1de83d1660bb8df50718a11d3a37a6820bfdb04dc8512783622174f06e4209bebc766fc47f433c6 SHA512 33c29c593bf02119062ee03ecb6b787f09efb177a2474316c676fe2e2605aa1bcbcec788e12c47e1cfe174655e28a70d75a4482834ae915565c33d9003b6a171
-MISC metadata.xml 365 BLAKE2B 36efea9be90b8f961b59106b4b60a02fa787ed84f639c68101d093a825d10dfb7ec0e46a14bc47cf6d7b271e039f7c3d7103dcc2bafa60a4a69e185e8f9c8908 SHA512 728f0f7cc5ff04ddf7724efdabc86b7e767dfe5e4383a266547360f712a583664355ee5e528366d42300c2837fb5134cb4708c80dec10014bb9fb69929418e51
diff --git a/app-dicts/myspell-es/metadata.xml b/app-dicts/myspell-es/metadata.xml
deleted file mode 100644
index 896f786eae07..000000000000
--- a/app-dicts/myspell-es/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>boris2.9@gmail.com</email>
- <name>Boris Carvajal</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/myspell-es/myspell-es-0.7.ebuild b/app-dicts/myspell-es/myspell-es-0.7.ebuild
deleted file mode 100644
index b71e7e0cc087..000000000000
--- a/app-dicts/myspell-es/myspell-es-0.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# yay for modern download tools like redmine and their unique IDs as part of
-# the URL - this means that someone needs to check the download page if there
-# are new releases:
-# http://forja.rediris.es/frs/?group_id=341
-# When checking ensure you update id above as well as the order of MUTATIONS if
-# necessary.
-MUTATIONS="es_ANY es_VE es_UY es_SV es_PY es_PR es_PE es_PA es_NI es_MX es_HN
-es_GT es_ES es_EC es_DO es_CU es_CR es_CO es_CL es_BO es_AR"
-d_id=2933
-
-MYSPELL_DICT=( )
-MYSPELL_HYPH=(
- "hyph_es_ANY.dic"
-)
-MYSPELL_THES=(
- "th_es_ES_v2.dat"
- "th_es_ES_v2.idx"
-)
-
-SRC_URI=""
-for i in ${MUTATIONS}; do
- MYSPELL_DICT+=(
- "${i}.dic"
- "${i}.aff"
- )
- SRC_URI+=" http://forja.rediris.es/frs/download.php/${d_id}/${i}.oxt -> ${i}-${PV}.oxt"
- let d_id=${d_id}+1
-done
-unset i d_id
-
-inherit myspell-r2
-
-DESCRIPTION="Spanish dictionaries for myspell/hunspell"
-HOMEPAGE="http://rla-es.forja.rediris.es/"
-LICENSE="GPL-3 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- # remove license files
- rm -rf {GPL,LGPL,MPL}*
- default
-}
diff --git a/app-dicts/myspell-es/myspell-es-2.3.ebuild b/app-dicts/myspell-es/myspell-es-2.3.ebuild
deleted file mode 100644
index 93987efe68b5..000000000000
--- a/app-dicts/myspell-es/myspell-es-2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MUTATIONS=(
- "es_ANY" "es_AR" "es_BO" "es_CL" "es_CO" "es_CR" "es_CU" "es_DO" "es_EC"
- "es_ES" "es_GT" "es_HN" "es_MX" "es_NI" "es_PA" "es_PE" "es_PH" "es_PR"
- "es_PY" "es_SV" "es_US" "es_UY" "es_VE"
-)
-
-MYSPELL_DICT=( )
-MYSPELL_HYPH=(
- "hyph_es_ANY.dic"
-)
-MYSPELL_THES=(
- "th_es_ES_v2.dat"
- "th_es_ES_v2.idx"
-)
-
-SRC_URI=""
-for i in "${MUTATIONS[@]}"; do
- MYSPELL_DICT+=(
- "${i}.dic"
- "${i}.aff"
- )
- SRC_URI+=" https://github.com/sbosio/rla-es/releases/download/v${PV}/${i}.oxt -> ${i}-${PV}.oxt"
-done
-unset i MUTATIONS
-
-inherit myspell-r2
-
-DESCRIPTION="Spanish dictionaries for myspell/hunspell"
-HOMEPAGE="https://github.com/sbosio/rla-es"
-LICENSE="GPL-3 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- # remove license files
- rm {GPL,LGPL,MPL}* || die
- default
-}
diff --git a/app-dicts/myspell-et-20030606 b/app-dicts/myspell-et-20030606
new file mode 100644
index 000000000000..6e7ce646914c
--- /dev/null
+++ b/app-dicts/myspell-et-20030606
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Estonian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://www.meso.ee/~jjpp/speller/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3
+SLOT=0
+SRC_URI=http://www.meso.ee/~jjpp/speller/ispell-et_20030606.tar.gz
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=06c891afde506eabffd32acef74feb2c
diff --git a/app-dicts/myspell-et/Manifest b/app-dicts/myspell-et/Manifest
deleted file mode 100644
index 093a6ca2f1d4..000000000000
--- a/app-dicts/myspell-et/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ispell-et_20030606.tar.gz 3421339 BLAKE2B 75b68d38cf8d3f563774445545fa95139f58d1917bab778d127bd0b7fe4c32eb2b8dbc7dcde7dccc3e8f02b3827bf19978302bba19ecb7068c32e7c1177b6f8d SHA512 f8ec8e5dd38a0e8c0682b79f5207a8d707ff48ba7950387e4c20a4d08f8c8525b511b6ba79ad8445e0ebe9e0ea2f91e15409f3ab64305480fb64ece056dbea67
-EBUILD myspell-et-20030606.ebuild 692 BLAKE2B 4a7dad730be1e5a28117a1f1990180e49e4161004b4721a2e1defbb0c910775542ef929f5f9fb3180a6d0271866d99f693246e969d15607e6b85d49a943d2f25 SHA512 b47a6fc61dbbe7dba313e9a859664da9f8968dad47d7ee1d26303376c5229469abd0bb1b60e0c65c439ac5fd707c5f06207c15baa6a7ae61ac1c52c5930e07d7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-et/metadata.xml b/app-dicts/myspell-et/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-et/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-et/myspell-et-20030606.ebuild b/app-dicts/myspell-et/myspell-et-20030606.ebuild
deleted file mode 100644
index 523450c84504..000000000000
--- a/app-dicts/myspell-et/myspell-et-20030606.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "latin-9/et_EE.aff"
- "latin-9/et_EE.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_et_EE.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Estonian dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.meso.ee/~jjpp/speller/"
-SRC_URI="http://www.meso.ee/~jjpp/speller/ispell-et_${PV}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/ispell-et-${PV}"
-
-src_prepare() {
- default
- # naming handling to be inline with others
- mv hyph_et.dic hyph_et_EE.dic || die
-
-}
diff --git a/app-dicts/myspell-fo-0.4.2 b/app-dicts/myspell-fo-0.4.2
new file mode 100644
index 000000000000..87b50b2cb7d3
--- /dev/null
+++ b/app-dicts/myspell-fo-0.4.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Faroese dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://fo.speling.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=http://fo.speling.org/filer/myspell-fo-0.4.2.tar.bz2 http://fo.speling.org/filer/hyph_fo_FO-20040420a.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=1cb31475736969e3b884594ddfd772ca
diff --git a/app-dicts/myspell-fo/Manifest b/app-dicts/myspell-fo/Manifest
deleted file mode 100644
index 72b9d08e32e3..000000000000
--- a/app-dicts/myspell-fo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hyph_fo_FO-20040420a.zip 16430 BLAKE2B 4cfecb7de08575c7d35302b3c81c5e8b729f0dcecb3325e9ffb1c07a4477258317f00d991715534f50ba26585945a39db7b58ffc8115f85d23c74e534ef09269 SHA512 c1cf2593668558c44ab7cbb8fb3ce915cf59eec25a07de9834ef24d2783e56beea708d6666975059b2f33807279d0085d4910145f4bd410b4c736a0a7620f187
-DIST myspell-fo-0.4.2.tar.bz2 1395379 BLAKE2B a4709f50cbec7c642025100e4e2111c0935b566cd93b1747aa0c73e1fa8d5e64554236be9948731f26cbb998ff7df5212fcd7a97320bb81dc9b9f4185559e3fd SHA512 7f5622a6acdd948d884ed445ee34ec0cc9596b92628bd3bfc4f32bf5e27d88ec4684e800a6cc4c1add73d0f32050b87d0ad2f1a1a97739fc113edb977c2c296a
-EBUILD myspell-fo-0.4.2.ebuild 589 BLAKE2B 76eb328e06581e60ef547f42baf55f5108caa5a04088ef648b66dc251c9a3734df337bb4a29a87237d9a2951e5e7210328b08b6ad561c47c6816c28a4091cfef SHA512 12899d2122345066dc493d79c0407d0ac21f42ea321f50d863546105fc122b4c8118cf16b9df39368c5624a7314a7e0e07a90e4524b6830c7f870bdd104c8dbf
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-fo/metadata.xml b/app-dicts/myspell-fo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-fo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild b/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
deleted file mode 100644
index c57824e02719..000000000000
--- a/app-dicts/myspell-fo/myspell-fo-0.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "${P}/fo_FO.aff"
- "${P}/fo_FO.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_fo_FO.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Faroese dictionaries for myspell/hunspell"
-HOMEPAGE="http://fo.speling.org/"
-SRC_URI="
- http://fo.speling.org/filer/${P}.tar.bz2
- http://fo.speling.org/filer/hyph_fo_FO-20040420a.zip
-"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-fr-4.5-r1 b/app-dicts/myspell-fr-4.5-r1
new file mode 100644
index 000000000000..be14c4c133d8
--- /dev/null
+++ b/app-dicts/myspell-fr-4.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=French dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/dictionnaires-francais
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-macos
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-moderne-v4.5.oxt http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-v4.5.oxt http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.5/ooo-dictionnaire-fr-reforme1990-v4.5.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=cf5cdb833d49f2ca7ef42a27645f652e
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
deleted file mode 100644
index 0433931a32f1..000000000000
--- a/app-dicts/myspell-fr/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt 2271004 BLAKE2B 80c5c43a096c595e8cf5687336e69df5300bf52a84dbd331da6bada5b8bd430d94ac608cd51569ffceb63e3f4ee1f20ac3c7c2583ae02389805a6c1a841ce47b SHA512 7cfec4838551ff8a14db97cea08ae5280de4cd35ac1b49346484790dff18f156ef5cf2f05e90d61d1809e91780d77cfff3cf59d01f91f949580244e257a1c17b
-DIST ooo-dictionnaire-fr-classique-v4.5.oxt 2251909 BLAKE2B 3ea0901efcee126b2702efebe279cb32b0e496d6b92b8e2a9dd16671bd999b6357086faf99ced6db5f4babe726ee933f3f85858c84a80c8b656b945b23d2aaa7 SHA512 f45b1e12b24e2ef2a9e3944b310631ee5c52ef7cd94a9d2d461ec91b320b40e6d380db7820d386ad75627873b6033e80451b2371f0a42817ead77ce5f03edf77
-DIST ooo-dictionnaire-fr-moderne-v4.5.oxt 2248032 BLAKE2B 4e935186b621810f468e6915e61c7389aa95f8d8e00d8960bd1a9cb8622521669c6147c0b535fffa85a36abb9fcb739a45c00bd9036e5d019953c5b7d13321d5 SHA512 b493f0c57d3d48b93a2c0d9fbd065728ed011c68d11286def203a0b798fe02381acdb2927805475c69c1ff7d0a7ff53469e84581c4724dd57bf0211d85c52655
-DIST ooo-dictionnaire-fr-reforme1990-v4.5.oxt 2255388 BLAKE2B d804bb80698f1ffb8b77dc8c3efa0841437de1389a7fda870fbb4a71914c42055153ff92629481b3e669bec2fa00258b43ff3d92acf08335e11559bb5dec6fae SHA512 39630fb67ecd4afd528a8c255c405945d866e57fb2becc0e79b6c16ec0e0510101d106c0342dd43f26befd3dd0ca3e4094360aaa0d91a090ecdea49158383ed5
-EBUILD myspell-fr-4.5-r1.ebuild 1653 BLAKE2B 29e63d5a8a9e34b5ffce072962ca3a551e7bc45106700e81cacf43a6f6e95913feb73055b6560509206d0c4afa5ec99c4e409f65f60484e00104088c4d75c188 SHA512 33198586e66c9dfe9163738dbe91d815d4dec778bd9841c37210879facfe1b94b92bbccc4a236a95191986376c014ade5d07252656aed8d0ee7b59dd4f1d99d9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-fr/metadata.xml b/app-dicts/myspell-fr/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-fr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
deleted file mode 100644
index 56c5d6037d0a..000000000000
--- a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "fr-moderne.aff"
- "fr-moderne.dic"
- "fr-classique.aff"
- "fr-classique.dic"
- "fr_FR.aff"
- "fr_FR.dic"
- "fr-reforme1990.aff"
- "fr-reforme1990.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_fr_FR_v3.dic"
-)
-
-MYSPELL_THES=(
- "th_fr_FR_v3.dat"
- "th_fr_FR_v3.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="French dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/dictionnaires-francais"
-SRC_URI="
- http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-moderne-v${PV}.oxt
- http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-v${PV}.oxt
- http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-reforme1990-v${PV}.oxt
- http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-reforme1990-v${PV}.oxt
-"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-macos"
-IUSE=""
-
-src_prepare() {
- default
- # the default should be classique+reforme1990
- # renaming to fr_FR
- mv fr-classique+reforme1990.aff fr_FR.aff || die
- mv fr-classique+reforme1990.dic fr_FR.dic || die
-
- # move the hyphen/thes to common used name
- # versions determined from README files
- mv hyph_fr.dic hyph_fr_FR_v3.dic || die
- mv thes_fr.dat th_fr_FR_v3.dat || die
- mv thes_fr.idx th_fr_FR_v3.idx || die
-}
diff --git a/app-dicts/myspell-ga-20060316 b/app-dicts/myspell-ga-20060316
new file mode 100644
index 000000000000..d22a03e9016e
--- /dev/null
+++ b/app-dicts/myspell-ga-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Irish dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/ http://borel.slu.edu/ispell/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-ga_IE-20060316.zip mirror://gentoo/myspell-hyph_ga_IE-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=bfa4d52c5be598d63a53c8e1b2360950
diff --git a/app-dicts/myspell-ga-20160213 b/app-dicts/myspell-ga-20160213
new file mode 100644
index 000000000000..0408ee73fe81
--- /dev/null
+++ b/app-dicts/myspell-ga-20160213
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> myspell-ga-20160213.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=a4aa51aa41934f57ae2c69a885f4fb92
diff --git a/app-dicts/myspell-ga/Manifest b/app-dicts/myspell-ga/Manifest
deleted file mode 100644
index abaa2e5ed99b..000000000000
--- a/app-dicts/myspell-ga/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST myspell-ga-20160213.oxt 8475451 BLAKE2B f8fbd0c763df5022142ec824eb7771ee14d0091a9defc5578b5cc830e02d646f031907fd970f69320a8668465c9aa50aa978d05d293fe8c4be24e553052340ec SHA512 bf1d17c8edd174a84c853489a6404da51a21fd47e7abbbd6f1bac98753a6327c6ada7213ffb0fa6bf5ecd62510e8119e35697ae868db00b2086503a801895d0b
-DIST myspell-ga_IE-20060316.zip 256050 BLAKE2B 0cdbf120951fe300d10e0fecbe53041818fdbc5fa4a50a010eeabfb482042a2f9d1e3b68618df01d20eee0dcc5bcc799500d2efaa680116fb55e27d41be9d150 SHA512 6eb181b6869d25388951640757ded3fd44738486076ca16fd8c42f52691814471968de2d29b65bb41b9285d466ff3b2cc77d27d9ad38f1275d3309b20ecdee20
-DIST myspell-hyph_ga_IE-20060316.zip 20249 BLAKE2B ddefb1107ed50072d92571e188ecee855fbd49357160ffc9311fb0fb878759147fb1b975d0c93fb8df1a31e30d3fff8e383bbef0c8bd6a0c7b70af8659001a52 SHA512 edd314e32b39e08be9cd32d55af4289f74e1b6700b34a631f47174ef9c55cd809213d07e1e1b8646f7e1260ab408bcb5dfdb5a25d8da735596901b358d8b1dc1
-EBUILD myspell-ga-20060316.ebuild 584 BLAKE2B d226e7fb3a2586afa093e25eddbc35f5839d3e51652af174fe74645f4af521386025a2a6c9e2a5b87d8a84d0bd91860f455d352d0c5969014a4012ea49d7a32e SHA512 cfdb60a13821a198749589b7df27d8a9826e71f5d409d70a39d73a23874ac8d25184a26b8b7ff4876ac802f87599800abbcb0c55718308e5fdd8ba201af355bf
-EBUILD myspell-ga-20160213.ebuild 668 BLAKE2B 3a48c2eaacf36773c3779dbaa19cffcd106ac9bae6efa517dcf3a5e888d45c4e274ffa19c987d6d7b8fdce6b9ccd8532aae069dabb1be6497e10c1e5d16bf1ac SHA512 0e944d265cfc65169115f38702d6168524a7e22ce5849898b34613e2cd9540c0b3012e8b3a6ec510810c1eb20be3e55622033e9e180705b8efa804986ed401c6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ga/metadata.xml b/app-dicts/myspell-ga/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-ga/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-ga/myspell-ga-20060316.ebuild b/app-dicts/myspell-ga/myspell-ga-20060316.ebuild
deleted file mode 100644
index 04a1668e40a8..000000000000
--- a/app-dicts/myspell-ga/myspell-ga-20060316.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"ga,IE,ga_IE,Irish (Ireland),ga_IE.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-"ga,IE,hyph_ga_IE,Irish (Ireland),hyph_ga_IE.zip"
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Irish dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="http://lingucomponent.openoffice.org/ http://borel.slu.edu/ispell/"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild b/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
deleted file mode 100644
index 29484ac3f0c3..000000000000
--- a/app-dicts/myspell-ga/myspell-ga-20160213.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "ga_IE.aff"
- "ga_IE.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_ga_IE.dic"
-)
-
-MYSPELL_THES=(
- "th_ga_IE_v2.dat"
- "th_ga_IE_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Irish dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.openoffice.org/en/project/irish-language-spell-checker-thesaurus-and-hyphenation-patterns"
-SRC_URI="mirror://sourceforge/aoo-extensions/focloiri-gaeilge-4.8.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-gl-20060316 b/app-dicts/myspell-gl-20060316
new file mode 100644
index 000000000000..0be8b1543fc6
--- /dev/null
+++ b/app-dicts/myspell-gl-20060316
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Galician dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-dicts/myspell-es
+SLOT=0
+_md5_=3bd6e1748ef35f870f45472fbbcccd7d
diff --git a/app-dicts/myspell-gl-20131013 b/app-dicts/myspell-gl-20131013
new file mode 100644
index 000000000000..8167a12dd786
--- /dev/null
+++ b/app-dicts/myspell-gl-20131013
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Galician dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.openoffice.org/en/project/corrector-ortografico-hunspell-para-galego
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> myspell-gl-20131013.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=e0b172f55a88c250e2404350ef422747
diff --git a/app-dicts/myspell-gl/Manifest b/app-dicts/myspell-gl/Manifest
deleted file mode 100644
index 4e48d5804296..000000000000
--- a/app-dicts/myspell-gl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST myspell-gl-20131013.oxt 771221 BLAKE2B cee0815ae69d00334cca4341ed5c694c3d8f97a3904f5427b7deb94d706947e536adc890b2bfbff41c666b8ae6c5c277edc4843f4c4ef4131548145a42b2313d SHA512 ae13d7137e6b8e51570bcbeba00f73d9887a24556c2409249a39858d385168a03aff3ec2cf3222cad50686a4169debbe310a05ce3bd40aaab408de3ed01885ee
-EBUILD myspell-gl-20060316.ebuild 853 BLAKE2B 06bcb1ecbc191afd72455973fc6f0b555fb76a4a1e8da5b9842f73a248eadb7beb2b786d2329a09f8f0063cfa1389f64e2efd16506f11ae9d3a2f48e2b49455a SHA512 ebf0df5e7af2e436e5b0ad22bc6ea3805e917f226ea049ecac0843c41593024aa0acf6d0725361d70467331a8387318446cd43b41347a1f089827188d4e39482
-EBUILD myspell-gl-20131013.ebuild 655 BLAKE2B 03826f8e4cc9c4c06a8b788e956df4f0f9ff83f0a30ae5b9ae605a52ada9ef67142cf8f148fe74c578ba5627dc1c6cae5de3ded631d8909751e1f03108fa5f52 SHA512 1733472cc10c52939721610e7e36c89c96c8d39bc0911ab23b7d9e762a8ecfb3cf3f72f15daac773e0dbad6c51001cb569c8b1706861cf656d5710c992d93174
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-gl/metadata.xml b/app-dicts/myspell-gl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-gl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-gl/myspell-gl-20060316.ebuild b/app-dicts/myspell-gl/myspell-gl-20060316.ebuild
deleted file mode 100644
index 394d655ab0b4..000000000000
--- a/app-dicts/myspell-gl/myspell-gl-20060316.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# Note; since the Galician dictionary uses the Spanish
-# hypenation file, it causes collision problems with
-# app-dicts/myspell-es. So the Galician dictionary
-# is actually installed by the app-dicts/myspell-es
-# package instead.
-
-#MYSPELL_SPELLING_DICTIONARIES=(
-#"gl,ES,gl_ES,Galician (Spain),gl_ES.zip"
-#)
-
-#MYSPELL_HYPHENATION_DICTIONARIES=(
-#"gl,ES,hyph_es_ES,Galician (Spain),hyph_es_ES.zip"
-#)
-
-#MYSPELL_THESAURUS_DICTIONARIES=(
-#)
-
-#inherit myspell
-
-DESCRIPTION="Galician dictionaries for myspell/hunspell"
-LICENSE="GPL-2 LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SLOT="0"
-
-RDEPEND="app-dicts/myspell-es"
diff --git a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild b/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
deleted file mode 100644
index 8a64dfc62da8..000000000000
--- a/app-dicts/myspell-gl/myspell-gl-20131013.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "gl_ES.aff"
- "gl_ES.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_gl.dic"
-)
-
-MYSPELL_THES=(
- "thesaurus_gl.dat"
- "thesaurus_gl.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Galician dictionaries for myspell/hunspell"
-LICENSE="GPL-2 LGPL-2.1"
-HOMEPAGE="https://extensions.openoffice.org/en/project/corrector-ortografico-hunspell-para-galego"
-SRC_URI="mirror://sourceforge/aoo-extensions/hunspell-gl-13.10.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-he-2010.11.05 b/app-dicts/myspell-he-2010.11.05
new file mode 100644
index 000000000000..7f5e25e8bf17
--- /dev/null
+++ b/app-dicts/myspell-he-2010.11.05
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Hebrew dictionaries for myspell/hunspell
+EAPI=4
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/hebrew-he-spell-check-dictionary
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/hebrew-he-spell-check-dictionary/releases/2010-11-05/hebrew-dictionary -> myspell-he-2010.11.05.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=376411b56649b5da0d5f2c6860287f2e
diff --git a/app-dicts/myspell-he-2012.08.15 b/app-dicts/myspell-he-2012.08.15
new file mode 100644
index 000000000000..237cc41efde7
--- /dev/null
+++ b/app-dicts/myspell-he-2012.08.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Hebrew dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary/2012-08-15/@@download/file/dict-he-2012-08-15.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=516c3496858a1851e94c75aa5801d590
diff --git a/app-dicts/myspell-he/Manifest b/app-dicts/myspell-he/Manifest
deleted file mode 100644
index 8944ce7cb098..000000000000
--- a/app-dicts/myspell-he/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dict-he-2012-08-15.oxt 882585 BLAKE2B 3cc76818f6f7cfb0cef72b5d944c2024ba7b3daa031b940965a850f0652f664a78039f29d8d7cc97a3b2dde0b67f203a5b6c6dcb80b2007de569f8524c6a2fa8 SHA512 418feb49dba0ec97b63c44909ca8d2192c4c78ed59b9440d3962d6e2095db11f03c3598533c8fecd9cf46f098e96008b8cc298172ab08cc6b24b7df5623438c7
-DIST myspell-he-2010.11.05.oxt 631099 BLAKE2B 8566a85b28da947896690620aae5b7d28eb430e421fe3e369c986996575b9b8806ab173468d47cbe5dad950f6d38cd4fd038e111c759d302d5552fb7ee6e038c SHA512 c6c4fe6a8b69b6898c441472ed91ecc8e03a02abe795895eb4dd4f06f2ae9a96ff809323922990d518a2f59218e04aaf931b278d0c76ee0b50e75af9a84aff4f
-EBUILD myspell-he-2010.11.05.ebuild 640 BLAKE2B fa49007a0e3d611f4711d3025c8b8f22aa118c48b47ed0f597d2e0ac25a3eba7cfe0c450a5ab06123b236afa82b003277a60faa8dfde1466a86f305050df1502 SHA512 b47e8e6ce1e20404ffa047165e74f4a0de83f7e87d694c244f90775ead4d62a3c9a22d409f3611fb85fa71f156c4092544b5cdbed8c00debfead49f03f4199e4
-EBUILD myspell-he-2012.08.15.ebuild 646 BLAKE2B 935b03383ca17c0d7c1585013492cb0eac69a150b6ebdcd9d06da5f9c848ac35bd780ce44012001cbcc16ac030916232bdad2e199f3f05e32aa6b3ab81fd823c SHA512 c39427ab08b956709d8734f9300797770d6a1891b4037976e4c6523cddab0c18be8dad4cf36a02daba7cf788c842c6aedec208e8a99e1d08b3bdf3a2fd332295
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-he/metadata.xml b/app-dicts/myspell-he/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-he/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-he/myspell-he-2010.11.05.ebuild b/app-dicts/myspell-he/myspell-he-2010.11.05.ebuild
deleted file mode 100644
index 4d20fb069e19..000000000000
--- a/app-dicts/myspell-he/myspell-he-2010.11.05.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYSPELL_DICT=(
- "he_IL.aff"
- "he_IL.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Hebrew dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/hebrew-he-spell-check-dictionary"
-SRC_URI="http://extensions.libreoffice.org/extension-center/hebrew-he-spell-check-dictionary/releases/${PV//./-}/hebrew-dictionary -> ${P}.oxt"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild b/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
deleted file mode 100644
index 5463360eecd5..000000000000
--- a/app-dicts/myspell-he/myspell-he-2012.08.15.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "he_IL.aff"
- "he_IL.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Hebrew dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary"
-SRC_URI="https://extensions.libreoffice.org/extensions/hebrew-he-spell-check-dictionary/${PV//./-}/@@download/file/dict-he-${PV//./-}.oxt"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-hr-20060316 b/app-dicts/myspell-hr-20060316
new file mode 100644
index 000000000000..9d7e9ea78b4d
--- /dev/null
+++ b/app-dicts/myspell-hr-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Croatian dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-hr_HR-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=6b76db40c7304c7fcfc398f19b81259c
diff --git a/app-dicts/myspell-hr-20080813 b/app-dicts/myspell-hr-20080813
new file mode 100644
index 000000000000..a3338b127386
--- /dev/null
+++ b/app-dicts/myspell-hr-20080813
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Croatian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.openoffice.org/en/project/croatian-dictionary-and-hyphenation-patterns
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/dict-hr.oxt -> myspell-hr-20080813.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=b9829b4311d8ff408ccfc1a6fe21bfef
diff --git a/app-dicts/myspell-hr/Manifest b/app-dicts/myspell-hr/Manifest
deleted file mode 100644
index cb789369ccc3..000000000000
--- a/app-dicts/myspell-hr/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-hr-20080813.oxt 1808648 BLAKE2B f7944c0cfeb02c82dfeb82ceabd241dc192c1b16696b80d5e09aac2235d7d64e7a8184d52159678989e2f9fabb088d3d1ca2e4bf9915262ab6973e1680d48e0f SHA512 178a9e51ade7e54b5e32c9b0cb10bbb6e8da1913456d660f79a991f97c59aa965c2b17912f1910adfd6b8e47aaeb94ad9066bfad2e7ad038c0b739c57bd5c18a
-DIST myspell-hr_HR-20060316.zip 882838 BLAKE2B f3f15afcfcbb7e20e51208b6672d9c0005cc51ef347761970449a9c7384315fc02d754aac150e312cde548c4e6dc09bed8757edf3f0bcdee507052bd4cabd986 SHA512 48748d3bc3f796916ca53f4c106b1994c540952935643a2fa762099855d66ba5d5af1836762b3d86f6dcf28014f41806a23970bea98d08ec051f294bbf560496
-EBUILD myspell-hr-20060316.ebuild 514 BLAKE2B c7c5cf769006b7e09a840a99e8b2c5ec3e6ad5829df1350b6b74e1b9ef4fa749cb5fd8dde645cebabf13a237b2854d1b7881d72cd0d3233fb1be611e45c94970 SHA512 7a5b45f3352d094cdd22f0be8ceebd99085d739f8f0162941013fb6b1b8164d2469175e53cc5cfb3949fa0977f8d0cab342d0b352e501230059968bd8a64defd
-EBUILD myspell-hr-20080813.ebuild 601 BLAKE2B d4cf80a6bc819bb30663587b01e2575f5eb4ddecaa7514afe8f48672e9a61183adf9d3459bc430c0cb9899c397554aeed474a08e873ffcf5fab29c00f8ba0736 SHA512 56d537ca5e668f84b24727e01cc8d4d3af3067330925f5343547c168c210803f5e99c1ab2c169acd8be5929c8ec6beb87d77a328b85d78055786f132c25a32a8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-hr/metadata.xml b/app-dicts/myspell-hr/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-hr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-hr/myspell-hr-20060316.ebuild b/app-dicts/myspell-hr/myspell-hr-20060316.ebuild
deleted file mode 100644
index 003613174f48..000000000000
--- a/app-dicts/myspell-hr/myspell-hr-20060316.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"hr,HR,hr_HR,Croatian (Croatia),hr_HR.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Croatian dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild b/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
deleted file mode 100644
index 1b6e2ed545fc..000000000000
--- a/app-dicts/myspell-hr/myspell-hr-20080813.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "hr_HR.aff"
- "hr_HR.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_hr.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Croatian dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="https://extensions.openoffice.org/en/project/croatian-dictionary-and-hyphenation-patterns"
-SRC_URI="mirror://sourceforge/aoo-extensions/dict-hr.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-hu-1.6.1 b/app-dicts/myspell-hu-1.6.1
new file mode 100644
index 000000000000..69fad46d72d6
--- /dev/null
+++ b/app-dicts/myspell-hu-1.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g app-arch/unzip
+DESCRIPTION=Hungarian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://magyarispell.sourceforge.net/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=mirror://sourceforge/magyarispell/hu_HU-1.6.1.tar.gz mirror://sourceforge/magyarispell/huhyphn_v20110815_LibO.tar.gz http://downloadarchive.documentfoundation.org/libreoffice/old/3.6.0.4/rpm/x86/LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e myspell-r2 d7a80fcc3949917840a5c8f1a967004c preserve-libs ef207dc62baddfddfd39a164d9797648 rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ca6c89cb32e00456de22633bd55c714e
diff --git a/app-dicts/myspell-hu/Manifest b/app-dicts/myspell-hu/Manifest
deleted file mode 100644
index 2189c8f84f32..000000000000
--- a/app-dicts/myspell-hu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz 3764761 BLAKE2B f85c0dcad7dcbcd0a644720a4a0fb48098918be5cb38bc4168134c4db29002449763b864449299a099e15b91a7bc42f7d0e726a6bef945862eceb8cf5e13a48e SHA512 088a2c898299b61ff10f9397f68aba404bac4de7ead1880088dd16f841b7b403059a82bde7a5e719dda772e494f02d014255782f8e5c43c7a8eb2c07358c66bf
-DIST hu_HU-1.6.1.tar.gz 730641 BLAKE2B 53d08ee9aa073e4a2b5810a90b1a4a8ec42f95b507f0b9c3f1ac401cac39d4d667f18886745352ced180441f231651829bf8480a7a98b336c53cd1fb61337f8d SHA512 7ae1f99b16b714158c33b41ee5c7a3aaeb84bf59a1d1c13a02b0ba30972bfd2b3dd0d04a28997f0f5a97943a89d3cf9f0da55fb219ce24917ae1e3aed0a5484f
-DIST huhyphn_v20110815_LibO.tar.gz 545413 BLAKE2B b65bc84c01a5a34a1650e6fb6d491f71afd8486e9b8f49b4d3d41850f6e2086518ac7360287f376015551e7897033bada50435d67d81e26015cc57dfda05e08e SHA512 147d3d74c5d7278075bdf3734492662c723970630da10e5b1520f960d3f3d89916cd674d44f3b27ccf8e9b81031a75bbf6311614a296f76a39b1de576ad34b10
-EBUILD myspell-hu-1.6.1.ebuild 1252 BLAKE2B 1a0c0890d81e31dcdf4d2d0b1d03a6cc9e700a85f5a3c12f8c74f97ee2a89a87dc1aa8040ae53c9c4d9f2f842b1f701f2b0bc2732712806e56ee6e26f86d97e3 SHA512 b2370894e77765671daa214f12d05f88fea50599955d0cba04152618a2c46ca2cf949c21b730572f2e647ddc90f24b1423022ea8eec17681a0780d5ce192cacc
-MISC metadata.xml 249 BLAKE2B 30ee4deacf37c3f6ecf1758e662b80b27d84029d4f4470c71b18bf59348d8895a2952c17479b4bff26059a321d4e5c7da4a36c21c61559fc1101902fabd65b6c SHA512 299dc08d560c23938a5edb4e218464570a497f42c75e2fc3023ac49704b53a3e66ead8b2f69a081209c06f8ef3df847b029ecf0611d0708030416ec22937a029
diff --git a/app-dicts/myspell-hu/metadata.xml b/app-dicts/myspell-hu/metadata.xml
deleted file mode 100644
index 1048ea16a140..000000000000
--- a/app-dicts/myspell-hu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">magyarispell</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild b/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
deleted file mode 100644
index 9d2b0bc7e3c2..000000000000
--- a/app-dicts/myspell-hu/myspell-hu-1.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "hu_HU-${PV}/hu_HU.aff"
- "hu_HU-${PV}/hu_HU.dic"
-)
-
-MYSPELL_HYPH=(
- "huhyphn_v20110815_LibO/hyph_hu_HU.dic"
-)
-
-MYSPELL_THES=(
- "opt/libreoffice3.6/share/extensions/dict-hu/th_hu_HU_v2.dat"
- "opt/libreoffice3.6/share/extensions/dict-hu/th_hu_HU_v2.idx"
-)
-
-inherit rpm myspell-r2
-
-DESCRIPTION="Hungarian dictionaries for myspell/hunspell"
-HOMEPAGE="http://magyarispell.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/magyarispell/hu_HU-${PV}.tar.gz
- mirror://sourceforge/magyarispell/huhyphn_v20110815_LibO.tar.gz
- http://downloadarchive.documentfoundation.org/libreoffice/old/3.6.0.4/rpm/x86/LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz
-"
-# Hyphen seems to have no releases but was not updated in last 4 years, just use
-# one arived version from libreoffice and be done with it. If it needs update
-# users can ope a bug.
-
-LICENSE="GPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
- myspell-r2_src_unpack
-
- rpm_unpack ./LibO_3.6.0.4_Linux_x86_langpack-rpm_hu/RPMS/libreoffice3.6-dict-hu-3.6.0.4-104.i586.rpm
-}
diff --git a/app-dicts/myspell-ia-20060316 b/app-dicts/myspell-ia-20060316
new file mode 100644
index 000000000000..a71ac5ffe7aa
--- /dev/null
+++ b/app-dicts/myspell-ia-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Interlingua dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-ia_ANY-20060316.zip mirror://gentoo/myspell-hyph_ia_ANY-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=436699ac2de32a6541554a6f1a4ed808
diff --git a/app-dicts/myspell-ia-20140518 b/app-dicts/myspell-ia-20140518
new file mode 100644
index 000000000000..3c7c080e2801
--- /dev/null
+++ b/app-dicts/myspell-ia-20140518
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/dict-ia-2014-05-18.oxt -> myspell-ia-20140518.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=7fe2ac0306e59e68e0a8105bece00595
diff --git a/app-dicts/myspell-ia/Manifest b/app-dicts/myspell-ia/Manifest
deleted file mode 100644
index 2a16137a9f39..000000000000
--- a/app-dicts/myspell-ia/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST myspell-hyph_ia_ANY-20060316.zip 2364 BLAKE2B 0d71e8736900e51b2174dfc99dc332c74792082153e59a41b89d6948f5ee776753fb7a2803e505092c76ae821428ba7c169ba7798ba6304e11e51d09b9535456 SHA512 8c74c9a8795f392d460e67aac4aed2c53e080e4a493155369b2b2a85cdb8a440fc4ba6c8dd9ae150bec3bc1a91972ff7d9e1bd26781800e0b127f0284277b534
-DIST myspell-ia-20140518.oxt 224790 BLAKE2B a35c1beb10858ef259f11766dda60b6311a25532e11c983cb75f6bcf9bd4bd21af34b9372ae1e9fc1f64228c3155433868d0388350b10ff47c096f4e11126a1c SHA512 12f0bb5f14f1a7931f04143a670782b5c4764dbf2540da144cd6f1343cd06eba030007108a399f550daaf1f2161831e8f20a7db363d6857639a23a03e644bc4b
-DIST myspell-ia_ANY-20060316.zip 182850 BLAKE2B 6e8c4adb78faf897dcf1deb529a2e8f2ecffbdfd9f06e945114de9bdbd1adafee89b27cc23b7ecf3172fe267872d318b7dd37046e693b0ba2a8d7088f2d93d8a SHA512 80be07c6ce8184c7005dba109ff089f888d653db2d2431dcadf296e9515ff91370380248405a579eaa410f101560e47cadf076533cda79e9e52f6fb12c98dda0
-EBUILD myspell-ia-20060316.ebuild 566 BLAKE2B 70a98e2f277ffa0cbe215b6224a5327fe57bb3941fda4d03550c81571dcd2f2a13b734691aea058d77ee8f5a8bedeae41226da60feeedf09129e8df38cb42712 SHA512 ff93fe1e8688535af7a9496d96e4c57ac202eebbd7a75a2ad3d9333f6e1ec42e75f8588d90a9126ee6e315ff83822496f25d2bc577ba475e93785640fb2d2113
-EBUILD myspell-ia-20140518.ebuild 663 BLAKE2B 93f6493f5c61e28b27936367936ffb5bd3fbc58c72f4acc88946190b7993b162787b9b7351ae0cb4f58b7f1b20433ddcbad1d82823d0a8f6a7a52e7cf52405a6 SHA512 c89916a7c59b5691bfb64db1e61b61f882fe0c7859baf3a303f378480b5fc5182d111ea2bb5539a3513aed43b7191bc386700f5272e9b9a28293b4e69e5e1f9a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ia/metadata.xml b/app-dicts/myspell-ia/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-ia/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-ia/myspell-ia-20060316.ebuild b/app-dicts/myspell-ia/myspell-ia-20060316.ebuild
deleted file mode 100644
index 11af6b8dc66f..000000000000
--- a/app-dicts/myspell-ia/myspell-ia-20060316.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"ia,ANY,ia,Interlingua (ANY locale),ia_ANY.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-"ia,ANY,hyph_ia,Interlingua (ANY locale),hyph_ia_ANY.zip"
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Interlingua dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild b/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
deleted file mode 100644
index 3983ff9fc08a..000000000000
--- a/app-dicts/myspell-ia/myspell-ia-20140518.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV::4}-${PV:4:2}-${PV:6}
-
-MYSPELL_DICT=(
- "ia.aff"
- "ia.dic"
-)
-
-MYSPELL_HYPH=(
- "ia-hyph.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Interlingua dictionaries for myspell/hunspell"
-LICENSE="GPL-3"
-HOMEPAGE="https://extensions.openoffice.org/en/project/interlingua-dictionario-orthographic-e-regulas-de-division-de-parolas"
-SRC_URI="mirror://sourceforge/aoo-extensions/dict-ia-${MY_PV}.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-id-2.0 b/app-dicts/myspell-id-2.0
new file mode 100644
index 000000000000..22ee742ba214
--- /dev/null
+++ b/app-dicts/myspell-id-2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Indonesian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/2.0/id_id.oxt -> myspell-id-2.0.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=640ca97276f9a3cee46f25e7a16dc197
diff --git a/app-dicts/myspell-id/Manifest b/app-dicts/myspell-id/Manifest
deleted file mode 100644
index 7549b5e2a395..000000000000
--- a/app-dicts/myspell-id/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-id-2.0.oxt 135667 BLAKE2B 86de36a18c9bd52d68c0115b1d5d2ba6906f508c7db2dd521ea1c42c1de989304b35ff1bd47b86ebf80ad1ceba037e25ad3b11fd02cf620ab1d0fbf84bbdf16d SHA512 43d5e0ba4d582528d15d0f533d7bc1ef89023d1155cf5959d3df9fbaf7a1fc48c35402b774e1b8aa7475edbe5ddb2fefebbef596c3cfd73021215ac210bc47df
-EBUILD myspell-id-2.0.ebuild 683 BLAKE2B 6bd5b8d619d49133eca388c46ca8fbbc143698484fab4180146fb54ab4d6e6a20e79668ebcdcfd152dc8af5aa21a90f68c6062b3b412e63d48eb8ebffba384c0 SHA512 276839a2660428fa566b6f27919be5b6cc10ca7289bf9eb1e092ed460ca25fef0c930cea772bba4ac1930d515a6c89e70556f00be0af5db377e7e958b8e9f7d4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-id/metadata.xml b/app-dicts/myspell-id/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-id/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-id/myspell-id-2.0.ebuild b/app-dicts/myspell-id/myspell-id-2.0.ebuild
deleted file mode 100644
index a51e0cf0c48e..000000000000
--- a/app-dicts/myspell-id/myspell-id-2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "id_ID.aff"
- "id_ID.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_id_ID.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Indonesian dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius"
-SRC_URI="http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/${PV}/id_id.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-is-2012.09.01 b/app-dicts/myspell-is-2012.09.01
new file mode 100644
index 000000000000..01f4c0f7260e
--- /dev/null
+++ b/app-dicts/myspell-is-2012.09.01
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Icelandic dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=CC-BY-SA-3.0
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/2012.09.01/hunspell-is-2012.09.01.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=fdcc6bbb63b126c851bf6f4e33a3470e
diff --git a/app-dicts/myspell-is/Manifest b/app-dicts/myspell-is/Manifest
deleted file mode 100644
index 50d261508a80..000000000000
--- a/app-dicts/myspell-is/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hunspell-is-2012.09.01.oxt 678230 BLAKE2B f8a4fa14c1cc9c89213a236d38fbd6b3621fbbaa4803eb3bb70761ec387cddc0404546c3b9ee719c104c0321f5736394506993e153e0b575b790376d2081818f SHA512 39af86809f735e5f0698b060d514bc2d9d53cc4ec7ef4edb6edbd92674af337ea48fc69bfaddb2dc2532be74ae5a079068cd691212042bac70a622d1f02eebe6
-EBUILD myspell-is-2012.09.01.ebuild 673 BLAKE2B df9d93aed30cd8c7ab7bf5ef8de6aac8e40a22dd10ebdb52fb7952f60610292bc0b6b6138b6921d82f006008a33af02263940cfeed9c05d9669f60c34903eb8f SHA512 b59d84c16ec6348595992d42d6b7c4bd4fb4183cdff3c217f33e4d235b8fcd14dff74eaebdabcba8d21eefea7ceed284f616358e9e1a51c43add7f438b622278
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-is/metadata.xml b/app-dicts/myspell-is/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-is/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild b/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
deleted file mode 100644
index ebd97627ea77..000000000000
--- a/app-dicts/myspell-is/myspell-is-2012.09.01.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "is.aff"
- "is.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Icelandic dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project"
-SRC_URI="http://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project/releases/${PV}/hunspell-is-${PV}.oxt"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-it-20081129-r1 b/app-dicts/myspell-it-20081129-r1
new file mode 100644
index 000000000000..95a4378f571e
--- /dev/null
+++ b/app-dicts/myspell-it-20081129-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Italian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/linguistico/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=AGPL-3 GPL-3 LGPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/linguistico/Dizionari.IT_20081129.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=066b34ad790ac751f3d485094bf7bb7a
diff --git a/app-dicts/myspell-it/Manifest b/app-dicts/myspell-it/Manifest
deleted file mode 100644
index ce59a078e045..000000000000
--- a/app-dicts/myspell-it/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Dizionari.IT_20081129.oxt 1433036 BLAKE2B 0e0aa03fafa34957a00b054070de67aec3f742d4cf177c6185c8a6b8a4005ea94f4041fb2e29a0ab7fa87a7d04c5f2148f98bd446e196470104ccf1b3ad97a0c SHA512 f0576f62448d368680545a66bf99d3d44c75562a0b5bc72c9020cef707c5543182ea1f45934826970b9e3ea588b9f2e29686cd08f7b8fdddcfdbd067e6536071
-EBUILD myspell-it-20081129-r1.ebuild 792 BLAKE2B b6703d9ffb49a5283eb323ec7d5107b57133371323170935cd31027807858188a6d422dcb3a10806cb46dfc64e3bd9b4e1a497af9e431cddb6fbfe3a8c217de2 SHA512 9e297463af4e50b3a1248553cbc56a59b9592e84d573f52ae041b04e347dff223c67765d2c407951dad037fc30f66c66219d2eb2c81b12e2c4da7bb776e907aa
-MISC metadata.xml 248 BLAKE2B 2c1fcd90482f1cfffb25b908862709cebdefed604a40a5611ebd3e8831829c1b07aab4911cb5962aa9bc0587832d8a01ed43558a6fad30feed29b9ae0ff97161 SHA512 1d44fa5baaf032845df65374a83f1eb1459100ced59d260a19456fff81ce7dc1c074cd34b1ad37b172af7cdee476fe0de39aa3a280e311816dd8bdd9c98a61ad
diff --git a/app-dicts/myspell-it/metadata.xml b/app-dicts/myspell-it/metadata.xml
deleted file mode 100644
index 3338c5556542..000000000000
--- a/app-dicts/myspell-it/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">linguistico</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild b/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
deleted file mode 100644
index dfca78f79f29..000000000000
--- a/app-dicts/myspell-it/myspell-it-20081129-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "it_IT.aff"
- "it_IT.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_it_IT.dic"
-)
-
-MYSPELL_THES=(
- "th_it_IT.dat"
- "th_it_IT.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Italian dictionaries for myspell/hunspell"
-HOMEPAGE="https://sourceforge.net/projects/linguistico/"
-SRC_URI="mirror://sourceforge/linguistico/Dizionari.IT_${PV}.oxt"
-
-LICENSE="AGPL-3 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- default
- # remove useless license files.
- rm -rf agpl3-en.txt gpl3-en.txt it_IT_license.txt \
- lgpl3-en.txt th_it_IT_copyright_licenza.txt \
- th_it_IT_lettera_in_inglese.txt || die
-}
diff --git a/app-dicts/myspell-kk-1.1.2 b/app-dicts/myspell-kk-1.1.2
new file mode 100644
index 000000000000..0d2e40dee87d
--- /dev/null
+++ b/app-dicts/myspell-kk-1.1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Kazakh dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://github.com/kergalym/myspell-kk
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2+
+SLOT=0
+SRC_URI=https://github.com/kergalym/myspell-kk/archive/1.1.2.tar.gz -> myspell-kk-1.1.2.tar.gz
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=2687943c6aa89a453c1979b755420f4b
diff --git a/app-dicts/myspell-kk/Manifest b/app-dicts/myspell-kk/Manifest
deleted file mode 100644
index 8db212bcdfbd..000000000000
--- a/app-dicts/myspell-kk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-kk-1.1.2.tar.gz 310307 BLAKE2B b760b807c1dd6814ac89a8b0aa99cac4c28948e43d389d26627967cadb0de76173e09a53e21c1c96713ef3f4d234a594471b512d4481f2e686fc95259a243cdd SHA512 1373f7af6767a9d81b3fd03207775999eb4be7757ccbe26a849f9b3c47d7dbf0b4e8cfd3e4e6436b45478ab01dc23f7d255c2a9f7100193c6b9b3b0f7935d751
-EBUILD myspell-kk-1.1.2.ebuild 614 BLAKE2B 822c4183af0fdae943b01cbad23db7df1aa282eb67b9298d96d4bf1242f4ecbebcc0f8ad55ef9b35f6bda17d837e70a069a9d98e76a7275872c389b3b26a7797 SHA512 6eb6b8f2c34f336009a5b82e54ebfce1876dd6d7e9df625cb5cf60b326fc4456141c8bd1a1afd8bef848a3a5074f66a9854bef132947f42bb88f79acf2c405a0
-MISC metadata.xml 449 BLAKE2B 84aa1da65f19ac5da191ea172992d27e489f6d0cc5725b0fe60c212a78bdc8dd0bc97fad7b2e9c4916255fbc6275646011b3a10bd75fa9e1c0e02f7c86562ce3 SHA512 867a4fb1664a64beaa720c06f0ae026d533ad2eefa208007bdc0a37846b687aa510c86e34f5b376d386711e17400dd62f0b6f06751cadc5cba9898cc7d4f1188
diff --git a/app-dicts/myspell-kk/metadata.xml b/app-dicts/myspell-kk/metadata.xml
deleted file mode 100644
index 54467ae98a34..000000000000
--- a/app-dicts/myspell-kk/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>kegalym2@mail.ru</email>
- <name>Galym Kerimbekov</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
- <remote-id type="github">kergalym/myspell-kk</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild b/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
deleted file mode 100644
index 2bf60fe77cfe..000000000000
--- a/app-dicts/myspell-kk/myspell-kk-1.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "kk_KZ.aff"
- "kk_KZ.dic"
- "kk_noun_adj.aff"
- "kk_noun_adj.dic"
- "kk_test.aff"
- "kk_test.dic"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Kazakh dictionaries for myspell/hunspell"
-HOMEPAGE="https://github.com/kergalym/myspell-kk"
-SRC_URI="https://github.com/kergalym/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-S="${WORKDIR}/${P}" # override eclass assignment
diff --git a/app-dicts/myspell-km-1.6 b/app-dicts/myspell-km-1.6
new file mode 100644
index 000000000000..3ca42f1587e6
--- /dev/null
+++ b/app-dicts/myspell-km-1.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Khmer dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/1.6/sbbic-khmer-spelling-checker-1.6.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=57b00be1d34e6bbd51437bf21111d7d1
diff --git a/app-dicts/myspell-km/Manifest b/app-dicts/myspell-km/Manifest
deleted file mode 100644
index 811a71e85891..000000000000
--- a/app-dicts/myspell-km/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sbbic-khmer-spelling-checker-1.6.oxt 355760 BLAKE2B f9b87b3ab40204cb756440b0d705156c9b7d7d2220db9a1baba8b3c5247b6cee76c7326e7e5f69d6f7f2ae926b0e865fd7dc2f1c38db40608ddaee5159f407b2 SHA512 0cbe28a5b9c1c7aebe8cb14ab76115dd3d08c75f20200bd0685d05b5d462b2c53b3e658b150d58a44dcf1589df99eb92a68aae3f5d5afb63591ae19a338230b8
-EBUILD myspell-km-1.6.ebuild 651 BLAKE2B a4ea77222c918fadd805ef1c118ace7bde5ef77f29d5f6a0db3fd69d261b69ae9f531b0ec0e835c22c479a02c730b076a44ef5139aa2950fa925fece0ba72113 SHA512 df09e2496147fd8d51a8b585918790b5ea6826682cc1db87f15cb17841c01e70922b6ad9316c61dd07f2d31c23d1dcc151cbb5948c3e03d86b65f0654a3d72ce
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-km/metadata.xml b/app-dicts/myspell-km/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-km/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-km/myspell-km-1.6.ebuild b/app-dicts/myspell-km/myspell-km-1.6.ebuild
deleted file mode 100644
index e0c375acfb5e..000000000000
--- a/app-dicts/myspell-km/myspell-km-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "km_KH.aff"
- "km_KH.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Khmer dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version"
-SRC_URI="http://extensions.libreoffice.org/extension-center/khmer-spelling-checker-sbbic-version/releases/${PV}/sbbic-khmer-spelling-checker-${PV}.oxt"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-ku-0.21 b/app-dicts/myspell-ku-0.21
new file mode 100644
index 000000000000..49d90a644b63
--- /dev/null
+++ b/app-dicts/myspell-ku-0.21
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Kurdish dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://code.google.com/p/hunspell-ku/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 LGPL-3 MPL-1.1
+SLOT=0
+SRC_URI=mirror://sourceforge/myspellkurdish/ku_TR-021.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=93ead29c551947c2f04f738fec39f5cc
diff --git a/app-dicts/myspell-ku/Manifest b/app-dicts/myspell-ku/Manifest
deleted file mode 100644
index af4447d6cc9d..000000000000
--- a/app-dicts/myspell-ku/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ku_TR-021.zip 42128 BLAKE2B c53a982eafd0e55e78eb7f37339e652070129c32065807fcdee8a83fcc1246adbf5053fb3c45adecfccd8e12da2dc149924b1803695be5a32816fdbefc09f5d4 SHA512 2f9eb5bfb6532ba603451061cbabc9859930eb0cb8549ef409b5e92767d5dfdcfff1cae81e7d8ed59a888e4babe730e661c82a2d51bf40c74392f64a7572a194
-EBUILD myspell-ku-0.21.ebuild 544 BLAKE2B ad3ce5283ce8d6c70ac9597451d62edd7197a9380924ab3067de2208544c7473a5af019ab9128e69882d2709905ef368a7231b1ed324774ae28dd7b003ac3bf9 SHA512 6500bbbd80b8f3c035c0c14ab7ac58e60328b86c311e510ca2d8422d29f7ea691bfd36ebe767c2452234db5238c62a2bf9b3a4053b0077513979df0120600afb
-MISC metadata.xml 251 BLAKE2B 481d3df677e0d401d036acc39e6a9a880fd6aac1ecaec623041a9202502ec9926021f10968b23df10f807d79e538eb71542e61dc3c3a7103280dead23120e6f9 SHA512 065a583724711930f3f184e5a94a08e3d1fd3ac7b3a70e213605f2b5888cae66426f3172fb8733a02166883e3ac5b713fc07eb3745af403f2b3339b3162b7578
diff --git a/app-dicts/myspell-ku/metadata.xml b/app-dicts/myspell-ku/metadata.xml
deleted file mode 100644
index ba509b7417f2..000000000000
--- a/app-dicts/myspell-ku/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">myspellkurdish</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-ku/myspell-ku-0.21.ebuild b/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
deleted file mode 100644
index de2f4b5eace1..000000000000
--- a/app-dicts/myspell-ku/myspell-ku-0.21.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "ku_TR/ku_TR.aff"
- "ku_TR/ku_TR.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Kurdish dictionaries for myspell/hunspell"
-HOMEPAGE="https://code.google.com/p/hunspell-ku/"
-SRC_URI="mirror://sourceforge/myspellkurdish/ku_TR-${PV/./}.zip"
-
-LICENSE="GPL-3 LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-lt-1.2.1 b/app-dicts/myspell-lt-1.2.1
new file mode 100644
index 000000000000..cf2cd40a9ef4
--- /dev/null
+++ b/app-dicts/myspell-lt-1.2.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Lithuanian dictionaries for myspell/hunspell
+EAPI=4
+HOMEPAGE=ftp://ftp.akl.lt/ispell-lt/
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD LPPL-1.3b
+SLOT=0
+SRC_URI=ftp://ftp.akl.lt/ispell-lt//lt_LT-1.2.1.zip ftp://ftp.akl.lt/ispell-lt//hyph_lt_LT.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=28d3529b98dcc42752b92a1f87503cc0
diff --git a/app-dicts/myspell-lt-1.3 b/app-dicts/myspell-lt-1.3
new file mode 100644
index 000000000000..9a7a26cf1469
--- /dev/null
+++ b/app-dicts/myspell-lt-1.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Lithuanian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://launchpad.net/ispell-lt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD LPPL-1.3b
+SLOT=0
+SRC_URI=https://launchpad.net/ispell-lt/main/1.3/+download/myspell-lt-1.3.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=73a9f1ac0effe2bab1bada8d4b83372d
diff --git a/app-dicts/myspell-lt/Manifest b/app-dicts/myspell-lt/Manifest
deleted file mode 100644
index baf9442a4ccc..000000000000
--- a/app-dicts/myspell-lt/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST hyph_lt_LT.zip 4839 BLAKE2B 01399d5e2d52b8654419a328e384287387ba7df1ac315924d1951995785b52ae13b40874ee93c533a26edeee8aad9a7ecc48354dc0505277cf91b4e97b527f7b SHA512 8a21d90590b8bac8eb8de78c30e74bb12c15deba02c0553c93d46bd18c08f39a4097ec0b5e4a2394dee0726aff0abe89e3a226415a50a358aaeafedf7bfe4e0e
-DIST lt_LT-1.2.1.zip 360373 BLAKE2B b9ccad4650c94e0a2ac8f07faab590de3781773b4936235741252daaed18c05ba1d3e58037d47d61e9faf3e0cf6284148f75155f9c2562e39fa62c141d99fb63 SHA512 ebc6e688bc94d3cfa4b872594775d6f62bfd9b1666765e189b7f47efa2c7ec27d32b4f49405cc9fb372ea071f5b2b685b800b949eec285a7d1fee52b74d82b31
-DIST myspell-lt-1.3.zip 339657 BLAKE2B 9549d1968d3b60a2b712360dab35fe696369afbdb34097eb7484ea0497b67becb43592878cec5e64691e0069babc9d56817b4d170dbb1ef092d50de64b076420 SHA512 e18f22efb665e3c4cfe0398bafc9e0626c4322009e4b056f3f5cb074778af851bd463be05c55e1bb0bfbc1a04d06d022a3aa37c89e7efac2aa38b525ab415cf2
-EBUILD myspell-lt-1.2.1.ebuild 556 BLAKE2B 655d97a618adff9e09be923d0bbc75148e1e2e4bbeb294ffbc6ca0fce7d68e0cfafcec8c169cea762e2ed6558d09e9c0041a7b2ab924a9424e8566cd0899f63b SHA512 5c396b6141732d03757a9a83d8e00057c486d248815f21db403608609eb3760e79ac40fc76f39a9616e1a1dbd7692b74d130562fc35d86e93e760b09c4829ecf
-EBUILD myspell-lt-1.3.ebuild 547 BLAKE2B 155b5a49bb8f77ace8b940fe6ffec80d83be0c91a198225538eaf89ad9cb8c8d8b6dc137c8525cc3607dff3e345ba6145681d8955d1b6ec4bd24bbd851eacd14 SHA512 8f446934ae295dd9aa1012b6023ebe49b1476b7d9cecf40adf3e6c06367990c0ca3521626109412925e7078e4a07b8205815df66565732034c1848b6c9c67048
-MISC metadata.xml 244 BLAKE2B 1d2da72e348a40f2390d722aa2a081d633bb3f7c4269f9780eb6e092cc124abfe030e29f18ab119fd7df4c52cb2caee07d6d536bec2e9b84cd254bbddb28ed08 SHA512 e07e0b634f9300d3256fc47c9425afff7bbc9241f235830401002d55ce701e1bdfa1a45dd56c4c81307040560900a1768da3c82f0242c3b1d949446f259efa51
diff --git a/app-dicts/myspell-lt/metadata.xml b/app-dicts/myspell-lt/metadata.xml
deleted file mode 100644
index 181f1558f9f1..000000000000
--- a/app-dicts/myspell-lt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="launchpad">ispell-lt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-lt/myspell-lt-1.2.1.ebuild b/app-dicts/myspell-lt/myspell-lt-1.2.1.ebuild
deleted file mode 100644
index 04f628667196..000000000000
--- a/app-dicts/myspell-lt/myspell-lt-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MYSPELL_DICT=(
- "lt_LT-${PV}/lt_LT.aff"
- "lt_LT-${PV}/lt_LT.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_lt_LT.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Lithuanian dictionaries for myspell/hunspell"
-HOMEPAGE="ftp://ftp.akl.lt/ispell-lt/"
-SRC_URI="
- ${HOMEPAGE}/lt_LT-${PV}.zip
- ${HOMEPAGE}/hyph_lt_LT.zip
-"
-
-LICENSE="BSD LPPL-1.3b"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild b/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
deleted file mode 100644
index 80b39b55093c..000000000000
--- a/app-dicts/myspell-lt/myspell-lt-1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "${P}/lt_LT.aff"
- "${P}/lt_LT.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Lithuanian dictionaries for myspell/hunspell"
-HOMEPAGE="https://launchpad.net/ispell-lt"
-SRC_URI="https://launchpad.net/ispell-lt/main/${PV}/+download/${P}.zip"
-
-LICENSE="BSD LPPL-1.3b"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-lv-1.0.0 b/app-dicts/myspell-lv-1.0.0
new file mode 100644
index 000000000000..284901457324
--- /dev/null
+++ b/app-dicts/myspell-lv-1.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Latvian dictionaries for myspell/hunspell
+EAPI=5
+HOMEPAGE=http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://dict.dv.lv/download/lv_LV-1.0.0.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=c3ec140dece99d77c6a4d1b1bf81700e
diff --git a/app-dicts/myspell-lv-1.1.0 b/app-dicts/myspell-lv-1.1.0
new file mode 100644
index 000000000000..ed890dbf9882
--- /dev/null
+++ b/app-dicts/myspell-lv-1.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip app-arch/unzip
+DESCRIPTION=Latvian dictionaries for myspell/hunspell
+EAPI=5
+HOMEPAGE=http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://dict.dv.lv/download/lv_LV-1.1.0.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=f800d89901c6701b089c200bb9b1fbf9
diff --git a/app-dicts/myspell-lv-1.3.0 b/app-dicts/myspell-lv-1.3.0
new file mode 100644
index 000000000000..874d567e05aa
--- /dev/null
+++ b/app-dicts/myspell-lv-1.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://dict.dv.lv/download/lv_LV-1.3.0.zip -> myspell-lv-1.3.0.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=508814f77d279aeea9ebb8759113f0ee
diff --git a/app-dicts/myspell-lv/Manifest b/app-dicts/myspell-lv/Manifest
deleted file mode 100644
index 0fc7588c5453..000000000000
--- a/app-dicts/myspell-lv/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST lv_LV-1.0.0.zip 369295 BLAKE2B cdff7bd2c595c8b349d4c44449d0b436cc7f83ae3dd95e19a3c19f96275ede59ab434d7f915ddf32c60d410cd0285dc70e19b5293f7f7722d76d87316492238b SHA512 c97509edc3e1c018f6a5237fe56d4fc4da4f18a69b3003284bbff6dbb13f57a575c59d0763266af2d83ec0cf51b0e8ae67b20a383f41251e0002cf01538b823d
-DIST lv_LV-1.1.0.zip 371240 BLAKE2B a8741b7ea9cb05e63bc297efa2f725469427e84c8448fec38faf501ac4b207c6a0ea4aa4d1d978f8426523bbde959c37159d12f1d46e3142f8570a85b4f61b6e SHA512 4083311c1f5afd315ba348f92a221155137f2d32c0cd3f8869ba43cbbdecb1375c8dc444ef2b70631a18265e5ec72517a9d6ca8cad7e5e39a570a98ee075bfe8
-DIST myspell-lv-1.3.0.zip 374356 BLAKE2B 6924d09c4a7f70e840dce48a0d5e7807bd3210a13d79c3c7daa6de89cf58acf9d38099b03f1c0bf0420144fd867d2b737167e248457cf4bccad505bc46c00e66 SHA512 fbb53475870cd0200403e75ea3f84c8534b4fac349093515821e98a8e1f3bd839fdec0543a2e4ded1bacab93052babbf8ffbee4742d291bfc91f2d768b4ac445
-EBUILD myspell-lv-1.0.0.ebuild 616 BLAKE2B a1bcb7a31270d5d2d6dddec373906dc9fb692af497cb8e6751a282ee8acb2f1e00eda7e287d78e08d9f5a9e1dbd8e82074099a6746e60df0f1cbba236a38d8bb SHA512 a903091fcca44ab32c489b04d0cadefb4212d4c6d06f2e5de1631269f96f6c9b62d36d1a127a54c2cc80f1e4df179e2f20d5fb860237cdf73c50a2865039b82f
-EBUILD myspell-lv-1.1.0.ebuild 650 BLAKE2B cbb4f8b248a4ece9639d62f113784c1b206eb10edaf3849702923ca63caf7b02cf30e524f769bbe942c279c355463888f3eb8c3b9ce4c16247c2f6664ac3d493 SHA512 15f0e174c44786a11db1d72204321c4e833dc2454483342a6d179e5cd1ccb5155d6fe1008283d88691cbcb1cba027e07c55ad554db17551a428d25bf639211cd
-EBUILD myspell-lv-1.3.0.ebuild 664 BLAKE2B 2f2a801e8020806378d44b6ea5de6c83f14d565a052d55162f559c572b4107c19c71751910bd367d9af918222382866d376f2de5ac2707342338ad38aa3d6465 SHA512 39470a718233c956a0c7c66fe516689f2031d6be27c3f00622ddcaa8cea802d1de81bdae60efc258256d87acb31f3734726cd94ec17f5ad77e5825101c13362d
-MISC metadata.xml 364 BLAKE2B 8b892dc24c5b95700d5e1bb4249ad8c4ad44fc084642456507f43a0f3588ff49ae85c5cf7ff0557f75360cb56278d5817172a0135e03a8193f1fff1166bbab5e SHA512 3f9bc136c05930b5243d428083655a3cd2a6bc344797792e563bfd5e654bd57603271c98fb3b650a247e6b458ec647286fe903525e2e4cb8495fd014c6127ea5
diff --git a/app-dicts/myspell-lv/metadata.xml b/app-dicts/myspell-lv/metadata.xml
deleted file mode 100644
index 4e0da686a621..000000000000
--- a/app-dicts/myspell-lv/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>maris.gis@gmail.com</email>
- <name>Maris Nartiss</name>
- </maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
deleted file mode 100644
index 3d0acfee6939..000000000000
--- a/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "lv_LV.aff"
- "lv_LV.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_lv_LV.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Latvian dictionaries for myspell/hunspell"
-HOMEPAGE="http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis"
-SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild
deleted file mode 100644
index 452a7e1eac6e..000000000000
--- a/app-dicts/myspell-lv/myspell-lv-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "lv_LV.aff"
- "lv_LV.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_lv_LV.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Latvian dictionaries for myspell/hunspell"
-HOMEPAGE="http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis"
-SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/unzip"
diff --git a/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
deleted file mode 100644
index c2f330737749..000000000000
--- a/app-dicts/myspell-lv/myspell-lv-1.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "lv_LV.aff"
- "lv_LV.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_lv_LV.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Latvian dictionaries for myspell/hunspell"
-HOMEPAGE="http://dict.dv.lv/home.php?prj=lv https://extensions.libreoffice.org/extensions/latviesu-valodas-pareizrakstibas-parbaudes-modulis"
-SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip -> ${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/unzip"
diff --git a/app-dicts/myspell-mi-20060316 b/app-dicts/myspell-mi-20060316
new file mode 100644
index 000000000000..4dd2acacf901
--- /dev/null
+++ b/app-dicts/myspell-mi-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Maori dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-mi_NZ-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=621c9a9fcbdfcc7fc7300450f33c343b
diff --git a/app-dicts/myspell-mi-20060316-r1 b/app-dicts/myspell-mi-20060316-r1
new file mode 100644
index 000000000000..f4863f3caaaa
--- /dev/null
+++ b/app-dicts/myspell-mi-20060316-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Maori dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-mi_NZ-20060316.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=e15aa9cc6db6b8c9b9aa5dfb556d8563
diff --git a/app-dicts/myspell-mi/Manifest b/app-dicts/myspell-mi/Manifest
deleted file mode 100644
index 882b73ff5a08..000000000000
--- a/app-dicts/myspell-mi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST myspell-mi_NZ-20060316.zip 78777 BLAKE2B 4e694d2ee35c86d677ec9abef3346e4c47364c80ae327178cab8556a514dc810f71af589349e5730367a9ac952165fe634545d426f8352bbe99096d22cf33e83 SHA512 391f70bbd7d66ede4c8df7f7d5544bc7f40c3e97b80b509ce887e74770f9183ca98475715dbf9e6ceecb3445d1d3c5c1de35d1ea540e13a3a17eef690c91925d
-EBUILD myspell-mi-20060316-r1.ebuild 505 BLAKE2B d9105c1d4553c9a14cd0345d15a424b0b179cb84f276fa0db49d43b487adf0a91b50b84d5b447291afc723e1d6256399364b8bb27a37357bd8a8bfe030df181d SHA512 e30dd3b803d00cd9563725eeee4ebfc785ad176f05d3986764b10c9315469367d22fa79fec9cf8d9f8189d3064d3417dbdb400da81259537bc4642a5dd90fffe
-EBUILD myspell-mi-20060316.ebuild 504 BLAKE2B 23ff69938299a10ded2a22b49ecfd607f071f864e94ef515567214f342104551ed88f2b7c5af2fc8465b9540681852d3fed15c772305152f26a6c0763bb219a1 SHA512 de8e4858b92a0837a2e50705d289fd62b0283f15a543e8d85c212f23c2afaaddcf92161f322ab899dd038d72d566d3456bcbe5ba53878b1a39fe65cf13536644
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-mi/metadata.xml b/app-dicts/myspell-mi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-mi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
deleted file mode 100644
index aeb2b7bc734c..000000000000
--- a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "mi_NZ.aff"
- "mi_NZ.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Maori dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-SRC_URI="mirror://gentoo/myspell-mi_NZ-${PV}.zip"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316.ebuild
deleted file mode 100644
index b3542b5a440e..000000000000
--- a/app-dicts/myspell-mi/myspell-mi-20060316.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"mi,NZ,mi_NZ,Maori (New Zealand),mi_NZ.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Maori dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-mk-20060316 b/app-dicts/myspell-mk-20060316
new file mode 100644
index 000000000000..ab5c5d75c9f1
--- /dev/null
+++ b/app-dicts/myspell-mk-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Macedonian dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-mk_MK-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=c70a5ac6ce265d4aa5376b32cc8a7020
diff --git a/app-dicts/myspell-mk-20091211 b/app-dicts/myspell-mk-20091211
new file mode 100644
index 000000000000..41314b2cf543
--- /dev/null
+++ b/app-dicts/myspell-mk-20091211
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Macedonian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.openoffice.org/en/project/macedonian-spellchecker-dictionary
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/dict-mk.oxt -> myspell-mk-20091211.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=c46a961ce852ff0b9b7001fd955d9e1a
diff --git a/app-dicts/myspell-mk/Manifest b/app-dicts/myspell-mk/Manifest
deleted file mode 100644
index 7006574ba52d..000000000000
--- a/app-dicts/myspell-mk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-mk-20091211.oxt 488927 BLAKE2B ef9f9178729dc1af3968583c96e96ca322f609cff91c5c9ae2b6b852e6d3bf5dc71d539eedbe3c88cb3e9028efe18442822746aa7d2dc134000d26ee17034b61 SHA512 7dab57512c208e705b122100b20fd93587d42dac95d9fa701477b5940d715964e6aa71b20abcf6b16eb4f7706d0c0026f1b01815f63b1b85b0a2e0ce0ac40376
-DIST myspell-mk_MK-20060316.zip 631595 BLAKE2B 6fb5f2ca224fbe3786eee3b2b748bd7fbc5e45b1dc544b37040bc8a847da4884c155aa942f4f62f8b5ac8478b61171e236ba2ff34ece0eeabfe9abca68a4a6bc SHA512 c6522c631d9416ca5b2102c7e616f8b7eac88f83002986a2f4e5bb159abd81aae718718fc49271ad4ba4e89657a90834c5de8ceec4f93313d27576b513debd22
-EBUILD myspell-mk-20060316.ebuild 509 BLAKE2B 83c126e6d9372651cd733d26f7ed15b31329fd7552ff1d2795ba411027c45453c4eaed8f5aef690830003a4d1bc326cbb710105db12a74c2556f80089c86e83e SHA512 a610787695f4dfdfa1baaa0f14842e98184b3ed06fe15a60943b2b2dad7e0d248efe71ff8484cab8c6afc7e8e7665d7deb4a5e8185e7eb90dd5232a4e901cc0a
-EBUILD myspell-mk-20091211.ebuild 575 BLAKE2B 26d5f374fc48583ef988f019d099e60d1c9d87a380cc7584617c5556d44787f2b85345e353e8ffee1e34d09c8443d9c0a54037f6364ca37d52e1708187c36162 SHA512 1147b01251b26bdd74760edb62def66f2220295bb08e91160077881579702f6f8603c8734b6ed7c60057dcf7aa94fb84f1bd77cf4694732abcd829dbc3c029d7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-mk/metadata.xml b/app-dicts/myspell-mk/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-mk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-mk/myspell-mk-20060316.ebuild b/app-dicts/myspell-mk/myspell-mk-20060316.ebuild
deleted file mode 100644
index 8ce1154a31c0..000000000000
--- a/app-dicts/myspell-mk/myspell-mk-20060316.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"mk,MK,mk_MK,Macedonian (Macedonia),mk_MK.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Macedonian dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild b/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
deleted file mode 100644
index cf66024c1534..000000000000
--- a/app-dicts/myspell-mk/myspell-mk-20091211.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "mk_MK.aff"
- "mk_MK.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Macedonian dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="https://extensions.openoffice.org/en/project/macedonian-spellchecker-dictionary"
-SRC_URI="mirror://sourceforge/aoo-extensions/dict-mk.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-ms-20060316 b/app-dicts/myspell-ms-20060316
new file mode 100644
index 000000000000..b1a55769104b
--- /dev/null
+++ b/app-dicts/myspell-ms-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Malay dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=FDL-1.2
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-ms_MY-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=9efc59ce7963234ec7e87b69e803f946
diff --git a/app-dicts/myspell-ms-20100407 b/app-dicts/myspell-ms-20100407
new file mode 100644
index 000000000000..387083f5b036
--- /dev/null
+++ b/app-dicts/myspell-ms-20100407
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Malay dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-malay-dictionary
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=FDL-1.2
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/ms_my.oxt -> myspell-ms-20100407.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=3d8e61eb98b5a372a47c94a7c31f4656
diff --git a/app-dicts/myspell-ms/Manifest b/app-dicts/myspell-ms/Manifest
deleted file mode 100644
index 94c5ea644fa4..000000000000
--- a/app-dicts/myspell-ms/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-ms-20100407.oxt 79342 BLAKE2B dd66ab939c604003bf7cdd582ac02367a214c20f7314703d375c954e33a3cd8a00366eba66d11af97859ec756d2b3453edf09d3db5d8d90bba56b1681535c9f1 SHA512 9773766c8d2a0bee3d9f055b18449432dff4cf08417cece77fa76b016961f85073efe87baec13cea26c505a7438dbea60ae91909dacbd73c254606ea012a96dd
-DIST myspell-ms_MY-20060316.zip 87736 BLAKE2B 1435a5acf646cf2926f961ef04209273da4e5b678cadacf7a6b337b96441700138ecec0ec316daaef8ff058008417cc65dd1d75bb84e5664973d4514da126500 SHA512 93709c34991c9d72f4ed18f07ca15140c4398a2b1755b02f0e6131a167a82a08e8d4f9f9023bc8c8807324922b3563a37cbf14b772d291b04d7fe30ee66d0a3a
-EBUILD myspell-ms-20060316.ebuild 500 BLAKE2B 735b5da5cad8c514e37c1511921b9c653b8e5556d4d13591ae32aa174b9330eb1f380afacf813173d0db46c300a35867bf1dc930355128c090b009b85b70b40d SHA512 941db4b8fea388bb6a6578f98b0196ecda4fed29400c2d73082a239ecc7838d7e5407e38cbc48bc7c2b88c814cd367ceef571c63a6c8581541350b0fbdfce77a
-EBUILD myspell-ms-20100407.ebuild 574 BLAKE2B b5d1cef8fec16697cad2ed697879ad1531e359cf2dfb36598e5ecfba3b6f405f07d1e02929739ea60da0ed75f4592458118beef2cfc65cdcf1d443ffc55ca055 SHA512 63134934ab108b4d51bf4483b03ca25e50ac15b000d17ad4f12b5bc6c02d16230fc259a706a056ae4d9b2a4cce0699d067036730790c54c01f351f068792fa8d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-ms/metadata.xml b/app-dicts/myspell-ms/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-ms/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-ms/myspell-ms-20060316.ebuild b/app-dicts/myspell-ms/myspell-ms-20060316.ebuild
deleted file mode 100644
index a183f4c3be75..000000000000
--- a/app-dicts/myspell-ms/myspell-ms-20060316.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"ms,MY,ms_MY,Malay (Malaysia),ms_MY.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Malay dictionaries for myspell/hunspell"
-LICENSE="FDL-1.2"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild b/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
deleted file mode 100644
index 7cc38da9fa71..000000000000
--- a/app-dicts/myspell-ms/myspell-ms-20100407.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "ms_MY.aff"
- "ms_MY.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Malay dictionaries for myspell/hunspell"
-LICENSE="FDL-1.2"
-HOMEPAGE="https://extensions.openoffice.org/en/project/kamus-bahasa-malaysia-malay-dictionary"
-SRC_URI="mirror://sourceforge/aoo-extensions/ms_my.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-nb-2.0.10 b/app-dicts/myspell-nb-2.0.10
new file mode 100644
index 000000000000..fcd8c9bc7f49
--- /dev/null
+++ b/app-dicts/myspell-nb-2.0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Norwegian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://spell-norwegian.alioth.debian.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-2.0.10.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=c31dd1f4d3631049f98dec22b0dd5f52
diff --git a/app-dicts/myspell-nb/Manifest b/app-dicts/myspell-nb/Manifest
deleted file mode 100644
index bfe77740ed06..000000000000
--- a/app-dicts/myspell-nb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST no_NO-pack2-2.0.10.zip 3221701 BLAKE2B b064fa40f9ee6429d5309040270f9c5dea655a0f6810d2ed876345a031a12b7d6318ff4e7b9ff32b7ea4f3b4aea7d6679bd7d971bdbf5557dd9edfee28327211 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c
-EBUILD myspell-nb-2.0.10.ebuild 690 BLAKE2B 3b508320246f47cb0ceef6434cdc73382459ea033654d79bbbfb7644f1f5660e9763cc39d27a4809d90d1348e4234cbc9f9891544bba74d0d90e6ab1ab239f69 SHA512 6ad4d0eb247f2007e833e960cd577b6ff01c8e7a0c1756291f796c1ed1ea542cc57c04bf1293db46e08e25d894842b0ca35e0549aa54b64747b8d5e6a26894b4
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nb/metadata.xml b/app-dicts/myspell-nb/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-nb/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild b/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
deleted file mode 100644
index 0171ccad56b4..000000000000
--- a/app-dicts/myspell-nb/myspell-nb-2.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "nb_NO.aff"
- "nb_NO.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_nb_NO.dic"
-)
-
-MYSPELL_THES=(
- "th_nb_NO_v2.dat"
- "th_nb_NO_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
- default
- myspell-r2_src_unpack
-
- for i in *.zip; do
- unzip ${i} || die
- done
-}
diff --git a/app-dicts/myspell-nl-2.10g b/app-dicts/myspell-nl-2.10g
new file mode 100644
index 000000000000..81d6a2f6e6e9
--- /dev/null
+++ b/app-dicts/myspell-nl-2.10g
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Dutch dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://www.opentaal.org
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2 CC-BY-3.0
+SLOT=0
+SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=3d0dc659f5b0344e02fa90cc65cb2e69
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
deleted file mode 100644
index 61ca00a27b55..000000000000
--- a/app-dicts/myspell-nl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
-DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
-EBUILD myspell-nl-2.10g.ebuild 1093 BLAKE2B d37ef2480a0b9ca3ce3d64132f5ff46b43f13a216449093ab1fe793e3f79b44723e3342be7a9ce49e9e06a125569a9c83021fed395e0532f73750ba49cf175b3 SHA512 5de3e7c0283484b48cee4f775d1ed19774eb0177c32096c42a98e4b55618316c556a9154eaf66806a5a8a3a12a94ce9a62ea312e1417a8c6ad88c3f23bfdeaec
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nl/metadata.xml b/app-dicts/myspell-nl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-nl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g.ebuild
deleted file mode 100644
index 56b4625bc85c..000000000000
--- a/app-dicts/myspell-nl/myspell-nl-2.10g.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "nl_NL.aff"
- "nl_NL.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_nl_NL.dic"
-)
-
-MYSPELL_THES=(
- "th_nl_NL_v2.dat"
- "th_nl_NL_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Dutch dictionaries for myspell/hunspell"
-HOMEPAGE="https://www.opentaal.org"
-# Thesarus is not versioned at all, I suppose we could bump it with each dict
-# release, or when people say that the download uri checksum changed.
-SRC_URI="
- https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-${PV//./}-voor-openofficeorg-3?bid=20&agree=1 -> ${P}.oxt
- https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> ${P}_thes.oxt
-"
-
-LICENSE="BSD-2 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
- default
- # thesarus has ugly name
- mv th_nl_v2.dat th_nl_NL_v2.dat || die
- mv th_nl_v2.idx th_nl_NL_v2.idx || die
-
- # remove dutch translated license so it aint installed
- rm -rf licentie* || die
-}
diff --git a/app-dicts/myspell-nn-2.0.10 b/app-dicts/myspell-nn-2.0.10
new file mode 100644
index 000000000000..73efb05c8731
--- /dev/null
+++ b/app-dicts/myspell-nn-2.0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Norwegian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://spell-norwegian.alioth.debian.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-2.0.10.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=bf8f2c61a529f1923b3e32a86a068bb2
diff --git a/app-dicts/myspell-nn/Manifest b/app-dicts/myspell-nn/Manifest
deleted file mode 100644
index e0ef46d55a62..000000000000
--- a/app-dicts/myspell-nn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST no_NO-pack2-2.0.10.zip 3221701 BLAKE2B b064fa40f9ee6429d5309040270f9c5dea655a0f6810d2ed876345a031a12b7d6318ff4e7b9ff32b7ea4f3b4aea7d6679bd7d971bdbf5557dd9edfee28327211 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c
-EBUILD myspell-nn-2.0.10.ebuild 681 BLAKE2B 907c75d823e180157585a3d80547fde8d1db4256bd26c34714caba7cce3c7f3a28d2280be672e393b9d9f7991c55f44ddefe8b1023ed7f90d63ca09c463c4575 SHA512 5e219e679c893d8f4e98254049ef46d4df397d4b9eedd4a5151e1b8cc3694222d1d0c6f1ef6a8f962f4c28755e3d78bc533b7b169e144660f918acfdd53f1fd2
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nn/metadata.xml b/app-dicts/myspell-nn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-nn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
deleted file mode 100644
index 68b6af91cdd7..000000000000
--- a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "nn_NO.aff"
- "nn_NO.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_nn_NO.dic"
-)
-
-MYSPELL_THES=(
- "th_nn_NO_v2.dat"
- "th_nn_NO_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
- myspell-r2_src_unpack
-
- for i in *.zip; do
- unzip ${i} || die
- done
-}
diff --git a/app-dicts/myspell-pl-20130306 b/app-dicts/myspell-pl-20130306
new file mode 100644
index 000000000000..20b88a8d9383
--- /dev/null
+++ b/app-dicts/myspell-pl-20130306
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Polish dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://www.sjp.pl/slownik/en/ https://sourceforge.net/projects/synonimy/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1
+SLOT=0
+SRC_URI=http://sjp.pl/slownik/ort/sjp-myspell-pl-20130306.zip http://www.openoffice.org/pl/pliki/hyph_pl_PL.zip -> myspell-pl-20130306-hyph.zip mirror://sourceforge/synonimy/OOo2-Thesaurus-1.5.zip -> myspell-pl-20130306-thes.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=dafb93ad087ffdbbcc68222cb173c93c
diff --git a/app-dicts/myspell-pl/Manifest b/app-dicts/myspell-pl/Manifest
deleted file mode 100644
index b35c67d66734..000000000000
--- a/app-dicts/myspell-pl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-pl-20130306-hyph.zip 14013 BLAKE2B aef123b7936d2e15b632955b56e3ab7d7043185d3e236c43f65dd626ee65986662beb8ab65eb25c23a631acc2e5b2af6ae8c3a75117b7e933101fc121a68ecd2 SHA512 931c9fb2e58b0c5d65edc19a7f4bde7e0ccef496d76466944c8b0e249506370145d21c10d9209b6703dddd58887651ac8a2cc7579a1aab8deeed0ccac2908605
-DIST myspell-pl-20130306-thes.zip 1576689 BLAKE2B ebd21dcf7670821d6fa4db4a7d5448cccf8b6e0094e5e8c91a962fc44f5fb14c30e219c8555d2ddb9155c1f36521c939057e18d84f2a399203e504fd738b6ea3 SHA512 c9f5c9c0e5acb0f079c99120ec517d37d39155af22c727bcd9b3af987afc9e217ae0d84539e491246c6a4bfcd2667b556b141ff7003df06927ce873f4572aca2
-DIST sjp-myspell-pl-20130306.zip 1126237 BLAKE2B e627de2424dbbe0ea20750d41ebb809cc95b237e8a635e6a31d0a149dc67cf3747d6561055210deddcdda35ba09775d7d140996fbc11a174cb2e4e0fc7fac172 SHA512 1cd53dfe956be6ab23f10c95a28a7589c4859fb41a217b643870c2662e68bf94c96be421f0437ca196fbdce4ca4bc60696e07a1d783a238c544b35cec7f25ec5
-EBUILD myspell-pl-20130306.ebuild 1007 BLAKE2B f2f2ed63caab5f68721d6d25cab4573826d96d68274d111861b869b03c02afb4dc15a0005f534b1e67aabfd52cf8b1184a07a2a3fd6c645436d9c2e1dd710c5f SHA512 2f7949a7b0d918474fc1b06b5a34683cecbc0b07fd6fa1449510f24d54c6703021a4268e1d421f55f48502f1d54156b21c19648f35704a003d3cf8c73061a7ef
-MISC metadata.xml 245 BLAKE2B a2cb964a56e337421895ef1898f907e27fc87cfc5052a075d2937155c9f95424e553f22dbbfc80e1f1688451575c6e04a160d73c5704e942b48d6b968fc967a0 SHA512 1eb2f8e5640bf08d3a88088e524ca87629b75899bf0c3c81edc984ed0249416ac3d79ba9baed4662ae9acad4e2c0b534b8e89ec94600c1637821cbef55fbb616
diff --git a/app-dicts/myspell-pl/metadata.xml b/app-dicts/myspell-pl/metadata.xml
deleted file mode 100644
index 31acb15ab056..000000000000
--- a/app-dicts/myspell-pl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">synonimy</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild b/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
deleted file mode 100644
index c0c0224583ef..000000000000
--- a/app-dicts/myspell-pl/myspell-pl-20130306.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "pl_PL.aff"
- "pl_PL.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_pl_PL.dic"
-)
-
-MYSPELL_THES=(
- "th_pl_PL_v2.dat"
- "th_pl_PL_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Polish dictionaries for myspell/hunspell"
-# dict is bumped every day but nothing changes, RECHECK BEFORE DOING VERSION BUMP!
-# hyphen has no website
-# thesarus released last in 2k8
-HOMEPAGE="
- http://www.sjp.pl/slownik/en/
- https://sourceforge.net/projects/synonimy/
-"
-SRC_URI="
- http://sjp.pl/slownik/ort/sjp-myspell-pl-${PV}.zip
- http://www.openoffice.org/pl/pliki/hyph_pl_PL.zip -> ${P}-hyph.zip
- mirror://sourceforge/synonimy/OOo2-Thesaurus-1.5.zip -> ${P}-thes.zip
-"
-LICENSE="CC-SA-1.0 LGPL-3 GPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_unpack() {
- myspell-r2_src_unpack
-
- # ZIPCEPTION!
- unzip hyph_pl_PL.zip
- unzip pl_PL.zip
-}
diff --git a/app-dicts/myspell-pt-20120420 b/app-dicts/myspell-pt-20120420
new file mode 100644
index 000000000000..8f77c5e1bcba
--- /dev/null
+++ b/app-dicts/myspell-pt-20120420
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Portuguese dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main
+IUSE=+preao
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 MIT
+SLOT=0
+SRC_URI=http://darkstar.ist.utl.pt/openoffice.org/pt/oo3x-pt-PT.oxt preao? ( http://darkstar.ist.utl.pt/openoffice.org/pt/oo3x-pt-PT-preao.oxt )
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=95ec86f1506b903ba3a5e0f9a3a5b827
diff --git a/app-dicts/myspell-pt-br-3.0.0 b/app-dicts/myspell-pt-br-3.0.0
new file mode 100644
index 000000000000..c86230bafe0e
--- /dev/null
+++ b/app-dicts/myspell-pt-br-3.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Brazilian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3 MPL-1.1
+SLOT=0
+SRC_URI=http://pt-br.libreoffice.org/assets/VeroptBRV300AOG.oxt http://wiki.documentfoundation.org/images/f/ff/DicSin-BR.oxt -> myspell-pt-br-3.0.0-thes.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=ae1bc4b1285385dfa12e1688376f7a64
diff --git a/app-dicts/myspell-pt-br/Manifest b/app-dicts/myspell-pt-br/Manifest
deleted file mode 100644
index f9922737535f..000000000000
--- a/app-dicts/myspell-pt-br/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST VeroptBRV300AOG.oxt 1834826 BLAKE2B 479c26994a35bf3083e713f469dcdb5f5224150654e6b05b99e1bbec67be0cc5fd8a8ef774ca1807a08cfb79113836ce09db4194660f49528cbaa67dc0475e27 SHA512 1211af8aba9d9d9eae2ec9885a922d2ad70097d55c3628080754e00f30d46c061eb3eead634c7c4729837c96d722a6f3b615fd85f12b57afe417151c0e332351
-DIST myspell-pt-br-3.0.0-thes.oxt 4561516 BLAKE2B 5016f8ffdb64ae3d6545fd723b502c6bccf6d95f88faa8f1ff41c32033046b25ff00e56bf09eeb70fa03ce5bcfd86a75b5602eaa9219f01495a7171861c7bf67 SHA512 194e8b547ca65a1b7d3c8fbffe6674f539e116840dc546e3ebba03a58d67d6ae649d0387f1addcc05e8df1a80f7941b036580acaa984df016b1ba55c7597a260
-EBUILD myspell-pt-br-3.0.0.ebuild 704 BLAKE2B ff5b4045b682e3673d90de47968909b0149d44b310521daecbec6a269cc15fe8048abb4526786195cfcd427baa387a927f38adb5fcc4e94b571f3cd29c5e90ff SHA512 23f7b873b19510be2e1362aae8e2b2b95156564db7b225d6b82069b77c23c8dc84b18d1afa1cd6cf1baeb74d46a0b4ec152104e134672c5e6d8ffe95d13deb69
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-pt-br/metadata.xml b/app-dicts/myspell-pt-br/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-pt-br/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild b/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
deleted file mode 100644
index f3c7273ec2bc..000000000000
--- a/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "pt_BR.aff"
- "pt_BR.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_pt_BR.dic"
-)
-
-MYSPELL_THES=(
- "th_pt_BR.dat"
- "th_pt_BR.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Brazilian dictionaries for myspell/hunspell"
-HOMEPAGE="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico/"
-SRC_URI="
- http://pt-br.libreoffice.org/assets/VeroptBRV${PV//./}AOG.oxt
- http://wiki.documentfoundation.org/images/f/ff/DicSin-BR.oxt -> ${P}-thes.oxt
-"
-
-LICENSE="LGPL-3 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-pt/Manifest b/app-dicts/myspell-pt/Manifest
deleted file mode 100644
index 17019a2bcd90..000000000000
--- a/app-dicts/myspell-pt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST oo3x-pt-PT-preao.oxt 556799 BLAKE2B 60d8872af24f05469f6ff333da730c177696635f380282c27a0c71d577df29d871204220b7ac80ba8fbfd6a9431086aa75d9c10aa4965658be05b11656228b23 SHA512 41087a2371a1ac55075eb4891df57f22e272d89b85d800ecab2bbb2cc41f1f603c1bcc518dc2ecfb6653976177f25237f4f1aa790d66ec2947b62c1604d3935b
-DIST oo3x-pt-PT.oxt 556415 BLAKE2B 699cc5b92b19f6da8dcd29dbe54a6e399835a68f55ea691081d560d35977de715634b51356ed53960b6d464a6443db6a4caaff9c09cd4d21f337a1aa1134390d SHA512 1485efe050c90a0d23243a333ec886a47b46ee148096e0f19c2232768ab09ad3bc055dc01813a00593eadb754125ebd9662ce81a3489898cf700536c517c20ad
-EBUILD myspell-pt-20120420.ebuild 838 BLAKE2B 9660e6fa37409dc4e69bc5ea772891ec787ab1e279e3bcc6895cfacecb8d0293b0671028b003f21cfe2c7bcc6e3392cc4658d3dbdde01d512b4279fb9bd3ff5c SHA512 366f0208e118878cf663d07a22c2a378cee4a09cea996df0357729a2e0f30c5e13df5a4afb0701d7c2f74c3ba134b818e593bb76883174c358123378f9a5e592
-MISC metadata.xml 266 BLAKE2B 19a1631103d51c752aafab8b232fef81fb6b29d5f740ecd65221f2d4da42bbb7151790c26611be36baad354ebc6c15181b2665b029308c5a8467c88e9fa746d3 SHA512 a99c72a9c9892ccce74ffafd630ae1d90ad4b40716a4da60a03c3aa70a5e65be0c0a154aac664de81ba14b28ef1d9b0e2c0d2b6056b26e6941974fdc740b67ff
diff --git a/app-dicts/myspell-pt/metadata.xml b/app-dicts/myspell-pt/metadata.xml
deleted file mode 100644
index 0044978bf6ae..000000000000
--- a/app-dicts/myspell-pt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="preao">Use the pre ortographic agreement version of the dictionary</flag>
-</use>
-</pkgmetadata>
diff --git a/app-dicts/myspell-pt/myspell-pt-20120420.ebuild b/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
deleted file mode 100644
index aa89ed653b76..000000000000
--- a/app-dicts/myspell-pt/myspell-pt-20120420.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "pt_PT.aff"
- "pt_PT.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_pt_PT.dic"
-)
-
-MYSPELL_THES=(
- "th_pt_PT.dat"
- "th_pt_PT.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Portuguese dictionaries for myspell/hunspell"
-HOMEPAGE="http://natura.di.uminho.pt/wiki/doku.php?id=dicionarios:main"
-# The dicts are not versioned.
-# Version is determined by its date of upload to the server.
-# Check at: http://darkstar.ist.utl.pt/openoffice.org/pt/
-SRC_URI="
- http://darkstar.ist.utl.pt/openoffice.org/pt/oo3x-pt-PT.oxt
- preao? ( http://darkstar.ist.utl.pt/openoffice.org/pt/oo3x-pt-PT-preao.oxt )
-"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+preao"
diff --git a/app-dicts/myspell-ro-3.3.10 b/app-dicts/myspell-ro-3.3.10
new file mode 100644
index 000000000000..e7c8aa26c502
--- /dev/null
+++ b/app-dicts/myspell-ro-3.3.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Romanian dictionaries for myspell/hunspell
+EAPI=5
+HOMEPAGE=https://rospell.wordpress.com
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=mirror://sourceforge/rospell/ro_RO.3.3.10.zip mirror://sourceforge/rospell/hyph_ro_RO.3.3.10.zip mirror://sourceforge/rospell/th_ro_RO.3.3.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=d9ad0f26b812187191e012e6dc35dcfa
diff --git a/app-dicts/myspell-ro/Manifest b/app-dicts/myspell-ro/Manifest
deleted file mode 100644
index fe55eb112d7b..000000000000
--- a/app-dicts/myspell-ro/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hyph_ro_RO.3.3.10.zip 18504 BLAKE2B c221026e723aa2f414bbebe720744d847b1dd6600dc4a15ade331d47d81a652b0e4961be60a789528aa78c7b2e44522f1f27b862b35bd54e041fb5b1abc10e6e SHA512 0901b514a5dd287f87e53c50b59df3fe61ef8e169ab1baee48d65f18bf8f400d2437539f1ae12f8afbc691e13650b0fd2367c466d30096d46d90d0d5d926206a
-DIST ro_RO.3.3.10.zip 1216442 BLAKE2B d4b6df9feae759e1bc667f7463e0905643227af5eb0935338f7b1dc0d8ecfdc43b685b4091daf1769b4f4646303bba7ad0e10ab5c4b5c15f2e54180881332d4a SHA512 192d53fc087fb96306c46092a2b5cac9c28528f741c686d3b5e80c11c7bfdd16e1e406cfc1c32a99d72e2db01722e539b28c716379f38a3703e6954c8f9f2170
-DIST th_ro_RO.3.3.zip 1235156 BLAKE2B 7231c3d324b352dc419634952e932882eb1f825a2dfecaae4428c5fb45346db2af3a38a652b2bcdd2ae0a53f2dc98524c57fe2c78cdd79e48b4cc64955c3a820 SHA512 6204706c2b325a08ac31205e0c6834e1720a7bab9231859e3ae33d58e516607a338631c6a8cb52fe79ffc79297529e8b2a509c28df6e45766a56054a54d180e4
-EBUILD myspell-ro-3.3.10.ebuild 667 BLAKE2B 26c5e06275cabb8b955bc3ad825a1414a91a142836d000d437b9dc12357b3b5f91e8e00247b53ac3d78e4c9372d290e72692475f5fab6fad674991db3ae97bfe SHA512 a0a00d2eeb618fc2efad1b19412508e116b4503383b4697eddb730942c142a65f8cad04ebc7980c848ba26dcd0837bc3652c0c412bcd5d29803bac3b9e65f5b6
-MISC metadata.xml 244 BLAKE2B cd51ca64142dd29c7b2538142821322696100f916c76acf1472a3fe8a955786d3ec5ae1cc5bbed2daf2fa40cb2239901d25b7c3059bc14aa1571796ca35b9f06 SHA512 ab747cf65f0d06ab770b00b35ac0da826824bfe088c30dc729ec32d3e1c3dd2d00f9d701a351fdb1ba1c02a16706076bcd920e2fea34758c7352320e186054c5
diff --git a/app-dicts/myspell-ro/metadata.xml b/app-dicts/myspell-ro/metadata.xml
deleted file mode 100644
index 52e01edbbc73..000000000000
--- a/app-dicts/myspell-ro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">rospell</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
deleted file mode 100644
index bdcb11f5828f..000000000000
--- a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "ro_RO.aff"
- "ro_RO.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_ro_RO.dic"
-)
-
-MYSPELL_THES=(
- "th_ro_RO.dat"
- "th_ro_RO.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Romanian dictionaries for myspell/hunspell"
-HOMEPAGE="https://rospell.wordpress.com"
-SRC_URI="
- mirror://sourceforge/rospell/ro_RO.${PV}.zip
- mirror://sourceforge/rospell/hyph_ro_RO.${PV}.zip
- mirror://sourceforge/rospell/th_ro_RO.3.3.zip
-"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-ru-20060316 b/app-dicts/myspell-ru-20060316
new file mode 100644
index 000000000000..1f4ba640c0b2
--- /dev/null
+++ b/app-dicts/myspell-ru-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Russian dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd
+LICENSE=LGPL-2.1 myspell-ru_RU-AlexanderLebedev
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-ru_RU-20060316.zip mirror://gentoo/myspell-ru_RU_ye-20060316.zip mirror://gentoo/myspell-ru_RU_yo-20060316.zip mirror://gentoo/myspell-hyph_ru_RU-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=d81c59576dc66f7947dea7722a18b46a
diff --git a/app-dicts/myspell-ru-20150711 b/app-dicts/myspell-ru-20150711
new file mode 100644
index 000000000000..98ac293d72a1
--- /dev/null
+++ b/app-dicts/myspell-ru-20150711
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
+EAPI=5
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/russian-dictionary-pack
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/russian-dictionary-pack/releases/0.4.0/dict_pack_ru-aot-0-4-0.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=b84029f1600aba5885302e2f49c09978
diff --git a/app-dicts/myspell-ru-20150711-r1 b/app-dicts/myspell-ru-20150711-r1
new file mode 100644
index 000000000000..c0b4be1cd11c
--- /dev/null
+++ b/app-dicts/myspell-ru-20150711-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
+EAPI=5
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/russian-dictionary-pack
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/russian-dictionary-pack/releases/0.4.0/dict_pack_ru-aot-0-4-0.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=b41ba28ca5ff434d4f91780dadbc7f42
diff --git a/app-dicts/myspell-ru-20150711-r2 b/app-dicts/myspell-ru-20150711-r2
new file mode 100644
index 000000000000..de8f7cd24f2e
--- /dev/null
+++ b/app-dicts/myspell-ru-20150711-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+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
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/extensions/russian-dictionary-pack/0.4.0/@@download/file/dict_pack_ru-aot-0-4-0.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=19513819cc7e66183303f2311b40bbfe
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
deleted file mode 100644
index 2586be8efe26..000000000000
--- a/app-dicts/myspell-ru/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST dict_pack_ru-aot-0-4-0.oxt 1509261 BLAKE2B bdda8be3d0a9266285215ffaa4ad8916312c7904266ed34dffc832b4761887d7d316793c5b0863fdb4cf95808b7afaa24914598c1cdd839e3e073f08aee1fab6 SHA512 00e63f5abcfbb2fecd72dc2a2b80dc5ebb4d16aac909b2f63670235edadd0d22a5ed3ae0508bfdb273a85f32ee60df4e84dc620fa1a44f42543848b71a9d1b01
-DIST myspell-hyph_ru_RU-20060316.zip 11089 BLAKE2B 71154cc8e7386e1749b66a13ec3ea15fb9d853829adc91f27f8b72ff4111bd2d951e5e1ea7989e609c06ff46b64c18c8ef0f50562a173b43de997348152d6270 SHA512 4538a4fbdd61adafe321258fb4a9b1896d10747adf8203bd3a5eaa40ee15a9d5d3d8304a19a644f676a1224ac36f5d47ae7a10cbcae22ccbd2f8af49bf5e92ac
-DIST myspell-ru_RU-20060316.zip 467216 BLAKE2B 48371a17d9c200de59773a04bcc4a757b0cdac968d178a1e1605da1ddcb2c4b0501eb48752fe22104c56be0a67e75ae631da097af4160b6bff350933ee77e5e4 SHA512 2a1d62cd79d58ca093f477006e436e728ff2cf063c3b0e1ce127a0c83835afe7fce7846e9ec3577e848c9d911565b4fdff8475508bbbe29f2d9523fe0a858617
-DIST myspell-ru_RU_ye-20060316.zip 984889 BLAKE2B 9dffaa2479e2307964ae0227b07af16bc26ae6f6459be91daa20825b60d1c9b80332cee2ace8f97c503975bd3e9937936df3b07e4bdacd5ba093e542ef68ea58 SHA512 5d1e39166b8666ee2be599cd74872a80b34bba11ff389ca74919a0b2fca7f7e66dfd71188b97f08686161e5af54164b82d0fe86c9097c3aaad6c22432f867e19
-DIST myspell-ru_RU_yo-20060316.zip 470326 BLAKE2B 4538db16a39dc2c7607d1bb3a1150c1021b5d567f11695d838abffb2896124ba0a207761f1044d541af1613383554927a3128d025083430e53b8fdea54c28c38 SHA512 4a4a85d9dff96de6fbc9b78c74f22fafae3abe143ababed7041df3b06bda3127c6fc44631cc2bfa33f4672b06db2871cf3062acb8355524b926716f1db639b19
-EBUILD myspell-ru-20060316.ebuild 691 BLAKE2B 32d5d78c694e4e7991d91add72c75b831c87f8cee1925e69b97ca4f451efb6de170b267dc176ceebfd25d31733988d114ee65579b023c2d2d983a6f2838da8c3 SHA512 147ae7ddad129d133c4ac9b7957d61c67a5370f17e9e9f9a5666d78457cad2905ce1487df6a060f4a72f5790f2eeb61baa0e950f26649190b0df9a731175526c
-EBUILD myspell-ru-20150711-r1.ebuild 934 BLAKE2B f88c7a020b75261f71285d6de7ac1f3609235680bf99426f1b618f5de28897e9cafeeceb253f15798ab657885feba21ca8a5d4759bf0e9289530f2c593928c1c SHA512 4ef4d289ffe1fb3763b84b24e48cf329892c813bbd646f0e899b60ae2d2b901c4d97337f3fcf2d6a817471b33092547fb493254aa5a4290de40e74f72e158c2d
-EBUILD myspell-ru-20150711-r2.ebuild 855 BLAKE2B 8783bac3cb754beb680bc8168b56af7ede65812822fc6680114c772a10bc79a5f3e55439b37b37d35a3e1b010abb0276d85d379697b838401acf69ef67047031 SHA512 a0a57baaf072aafcda4e313e5772401274932dd3cdb331ca45c45b3426fd0f73d7fe72b934a34a4110d6d7fbd364af4ce9850a4e5651ac38bb6841219a076263
-EBUILD myspell-ru-20150711.ebuild 756 BLAKE2B 2633c2c9adc06c15fdb76070412fb29422574606df069effafc1761b29ad3c8bb9ee9d2cd2105d60f9657fa45ee36e3414e0ded53b31abdf18884843758115d5 SHA512 05b32d7e12c2eb222a9fef2aa15382d37565d1569843f951c88165dad1646056b43f5504d551dafdbfe997f59bcc1094c0697a6c1e4c55b80f292f1e968fe25f
-MISC metadata.xml 379 BLAKE2B f35e408ff77d8701d7a57652c11b991b9c44c6e49bf9047ae732ec5cba0ceba6003a1fe35ab295700b6a144ec112fa55361fd4c9b1779925ef0dd783c3253058 SHA512 07e5293f5bd387c07b78f995d74e4839bb34bb18b38337cf46f866381961f4812e7bd6dda51d185efa281dae08d0a166b0d909eed2bfb60f235cfea2ae54b139
diff --git a/app-dicts/myspell-ru/metadata.xml b/app-dicts/myspell-ru/metadata.xml
deleted file mode 100644
index 0f317aff4119..000000000000
--- a/app-dicts/myspell-ru/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>perfect007gentleman@gmail.com</email>
- <name>Perfect Gentleman</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/myspell-ru/myspell-ru-20060316.ebuild b/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
deleted file mode 100644
index b2287a79f068..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20060316.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"ru,RU,ru_RU,Russian (Russia),ru_RU.zip"
-"ru,RU,ru_RU_ie,Russian_ye (Russia),ru_RU_ye.zip"
-"ru,RU,ru_RU_yo,Russian_yo (Russia),ru_RU_yo.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-"ru,RU,hyph_ru_RU,Russian (Russia),hyph_ru_RU.zip"
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Russian dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1 myspell-ru_RU-AlexanderLebedev"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd"
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
deleted file mode 100644
index cb0e268cf3b0..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=( russian-aot.{dic,aff} )
-
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extension-center"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.0"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/russian-dictionary-pack"
-SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY_PN}-0-4-0.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
-
-src_install() {
- myspell-r2_src_install
- dosym ../hunspell/russian-aot.dic /usr/share/myspell/ru_RU.dic
- dosym ../hunspell/russian-aot.aff /usr/share/myspell/ru_RU.aff
-}
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
deleted file mode 100644
index 1ed79c8030ee..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=( ru_RU.{dic,aff} )
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extensions"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.0"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/russian-dictionary-pack"
-SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/file/${MY_PN}-${MY_PV//./-}.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd"
-
-src_prepare() {
- default
- mv russian-aot.dic ru_RU.dic || die
- mv russian-aot.aff ru_RU.aff || die
-}
diff --git a/app-dicts/myspell-ru/myspell-ru-20150711.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
deleted file mode 100644
index 490f36780e4d..000000000000
--- a/app-dicts/myspell-ru/myspell-ru-20150711.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=( russian-aot.{dic,aff} )
-
-MYSPELL_HYPH=( hyph_ru_RU.dic )
-
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
-
-inherit myspell-r2
-
-EXT="extension-center"
-DICT="russian-dictionary-pack"
-MY_PN="dict_pack_ru-aot"
-MY_PV="0.4.0"
-
-DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/russian-dictionary-pack"
-SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY_PN}-0-4-0.oxt"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd"
diff --git a/app-dicts/myspell-sk-20110224 b/app-dicts/myspell-sk-20110224
new file mode 100644
index 000000000000..63fc41ef56d6
--- /dev/null
+++ b/app-dicts/myspell-sk-20110224
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Slovak dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://www.liberix.cz/doplnky/slovniky/ooo/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.liberix.cz/doplnky/slovniky/ooo/dict-sk.oxt -> myspell-sk-20110224.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=e05477ffcd5446e1dd343ac7a12a5890
diff --git a/app-dicts/myspell-sk/Manifest b/app-dicts/myspell-sk/Manifest
deleted file mode 100644
index 3ddacc0b5f66..000000000000
--- a/app-dicts/myspell-sk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-sk-20110224.zip 1351228 BLAKE2B c2f5862083d541e9d9d0f169150e06a120c527cb63b19d1275095c47d1205424eaa48f1567eba381098523f317fca6dc6704b2b62355e2d44e179ee4aed78cfe SHA512 853790825816b3c2ad547c072f38d4441dc35fe6435d602de3741cae6a2ba4890e42fefe38dfda8f7bcfc2db61461a1a4220faee0edaf06c51875a1516fedf1b
-EBUILD myspell-sk-20110224.ebuild 640 BLAKE2B 1e16b01429a993b3cfc834c3b5b3800036edb89ec180eb66e1a2606320aa33b5c3668c949ff6b0dad5ed25a8c8bb0a479b2a99edb1459801a9cfe8be3b4af4bf SHA512 76e95bd53e1997fec9e90941353eaa97d9fe5900dd7e927831ca90b642d0bf40a05269fe7a81f8b8630bd242f7331bb5879a7eaa83042d31ed6e3c6c7f5faf2a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sk/metadata.xml b/app-dicts/myspell-sk/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-sk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild b/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
deleted file mode 100644
index b8c7559a2c5a..000000000000
--- a/app-dicts/myspell-sk/myspell-sk-20110224.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sk_SK/sk_SK.aff"
- "sk_SK/sk_SK.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_sk_SK/hyph_sk_SK.dic"
-)
-
-MYSPELL_THES=(
- "thes_sk_SK_v2/th_sk_SK_v2.dat"
- "thes_sk_SK_v2/th_sk_SK_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Slovak dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.liberix.cz/doplnky/slovniky/ooo/"
-SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-sk.oxt -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-sl-2012.01.04 b/app-dicts/myspell-sl-2012.01.04
new file mode 100644
index 000000000000..e23040145fe3
--- /dev/null
+++ b/app-dicts/myspell-sl-2012.01.04
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Slovenian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 LGPL-2.1
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/2012.01.04/pack-sl.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=88e87ab27a65b186e88b0bb584907c6c
diff --git a/app-dicts/myspell-sl/Manifest b/app-dicts/myspell-sl/Manifest
deleted file mode 100644
index bfbd723f42fd..000000000000
--- a/app-dicts/myspell-sl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pack-sl.oxt 1506739 BLAKE2B 801c7dd557c534c3b83e1360a765555b146eb23387a12e8ec779f9f4878760b9a87115ab97d6eb667bdde72bc367ee4c59d28fc2492cff764b5b44d33244c94f SHA512 7309e1f9e5c42ed41c660a195421b5dbfc9995c4970641c9da087d0f4f44126c5a98ddeaaae13f7ba563314cfaf981c8216c45d80fae2fda1d7c49fd943c32ee
-EBUILD myspell-sl-2012.01.04.ebuild 671 BLAKE2B 2baf0b46178d49cc49280b9728d67659f18d1b9f201d33d167e142e05cd316110a11ee3b4c316da65f5f1a90df5261c5dd9eded48d688bfdea98017f817f0426 SHA512 fb29d10082bc08e871d6a27473c13ddd8b88096d100e758e218cb38b3ca55ea9ae381381700d511e9ecbd86c9d13e4963d22a42805d6e484ec88cb730caf8a65
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sl/metadata.xml b/app-dicts/myspell-sl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-sl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild b/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
deleted file mode 100644
index 1249270dd9b0..000000000000
--- a/app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sl_SI.aff"
- "sl_SI.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_sl_SI.dic"
-)
-
-MYSPELL_THES=(
- "th_sl_SI_v2.dat"
- "th_sl_SI_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Slovenian dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack"
-SRC_URI="http://extensions.libreoffice.org/extension-center/slovenian-dictionary-pack/releases/${PV}/pack-sl.oxt"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-sq-1.6.4 b/app-dicts/myspell-sq-1.6.4
new file mode 100644
index 000000000000..d96d2aca6a73
--- /dev/null
+++ b/app-dicts/myspell-sq-1.6.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Albanian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://www.shkenca.org/k6i/albanian_dictionary_for_myspell_en.html
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.shkenca.org/shkarkime/myspell-sq_AL-1.6.4.zip
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=bd328b40daffce85109291b1ec163771
diff --git a/app-dicts/myspell-sq/Manifest b/app-dicts/myspell-sq/Manifest
deleted file mode 100644
index ac2e2cc16bd4..000000000000
--- a/app-dicts/myspell-sq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-sq_AL-1.6.4.zip 666207 BLAKE2B 8f6eaadf9f3ee3bbc28d1300f6d3d6a917f3dd9d7cb9b8b26a2f1b47b3564c56c12c240ce123da241bbc82d9b0c9484003b5920e5e5d8927403548590ca7aaa4 SHA512 4db1e2cae0c308973166e977d3c5c78ba02f0466bb60bd0d3971c84933274510442f8cfb22eeb6d47fd33e8dfb30e70ce11adc1114da1548a1a3b68f19619930
-EBUILD myspell-sq-1.6.4.ebuild 574 BLAKE2B 7102b35babbc8216841eaa7e21f22ce720d843a8a7337a1a3dad585622ce2c6299784f831d298436371e54c41dbe2d4cacbfcb86a4e744a311d992c3bb2d82e7 SHA512 b835511e370f84b63140478c8c0afd264bf70e6d65d3a6d2e84c1cacb2ed213ee7d4a8ec3683d6a91fcd805edc227dcb2a1f0e3e80abdacc07a4bcf888478012
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sq/metadata.xml b/app-dicts/myspell-sq/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-sq/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild b/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
deleted file mode 100644
index f673f929185a..000000000000
--- a/app-dicts/myspell-sq/myspell-sq-1.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sq_AL.dic"
- "sq_AL.aff"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Albanian dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.shkenca.org/k6i/albanian_dictionary_for_myspell_en.html"
-SRC_URI="http://www.shkenca.org/shkarkime/${PN}_AL-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN}_AL-${PV}"
diff --git a/app-dicts/myspell-sv-2.14 b/app-dicts/myspell-sv-2.14
new file mode 100644
index 000000000000..f88a6886e14a
--- /dev/null
+++ b/app-dicts/myspell-sv-2.14
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Swedish dictionaries for myspell/hunspell
+EAPI=5
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan http://extensions.libreoffice.org/extension-center/swedish-hyphenation http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=CC-BY-SA-3.0 GPL-2 LGPL-3
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/2.14/ooo_swedish_dict_2.14.oxt http://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> myspell-sv-2.14-hyph.oxt http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> myspell-sv-2.14-thes.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=58e11fb314978f15a8b5adea495d93cf
diff --git a/app-dicts/myspell-sv/Manifest b/app-dicts/myspell-sv/Manifest
deleted file mode 100644
index 0a90f19adce1..000000000000
--- a/app-dicts/myspell-sv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-sv-2.14-hyph.oxt 44382 BLAKE2B 2f25cd604c79d51549d47110d06e8877431bd9be521a57e7eeb172817d32b2f11b07e6c1c212c4f6f9d49ce7a4d3b54ecdb18bbab41a7cd26bc3c8de9a553fc1 SHA512 0f71809d2d401bb917037bb50a2fa88ffe825cac081cb14e9378ffeebc447144b733a9d4fd99cc5bc1f1a37835cc880210512ccc79341a4ba8c6cb5dcc38fc40
-DIST myspell-sv-2.14-thes.oxt 306542 BLAKE2B 0a5ebf5577e6fb8c492b13529ea904d1aceded3814e97f79e8581c55122cc647e4a32ce2bba148b123f97612aef156c5b6f425e8940d1cf80b808c259eef6fd5 SHA512 e637dc92bfc9bc86ccf10710fac1b036a99b0abc2888d30ea7dbdaca1c3cbec57fd7a184648d922b120a26f7c151b7cc043f783fb35b7e121ae22458f0a72103
-DIST ooo_swedish_dict_2.14.oxt 1288382 BLAKE2B 54a46792386e794dc836e0178929cdad75e29007ac981aaeeeb74da996d765ff8d737796568576662431c95899824d6460f099c6814fed673844ba295967627b SHA512 77ab715ccb66c7e14ed84189dd0847c809824a3cf0881ee39d08f6d4ef89eccfeafcdbde1759bfa8224650b1907760d9a48f40e464211ae12593ed5525d6372b
-EBUILD myspell-sv-2.14.ebuild 1194 BLAKE2B 7bfd509dcd05ea56758d954b766c8781fd77d982a218b04605241f6993fdd53e62612663b7d2a224bd1a5eadaebeb458343b89cece8bceece594cb8953f799b2 SHA512 b6cd4d619c0a1c16e56188473dc255ce0e4f01a7ab49362ff7a21ba9e062628b243b7fca5915f9d36aa8b81b66bafb078ec28db1722b983cbc0669d846a86591
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sv/metadata.xml b/app-dicts/myspell-sv/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-sv/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild b/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
deleted file mode 100644
index 67d5167e040b..000000000000
--- a/app-dicts/myspell-sv/myspell-sv-2.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
- "sv_FI.aff"
- "sv_FI.dic"
- "sv_SE.aff"
- "sv_SE.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_sv_SE.dic"
-)
-
-MYSPELL_THES=(
- "th_sv_SE.dat"
- "th_sv_SE.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Swedish dictionaries for myspell/hunspell"
-HOMEPAGE="
- http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan
- http://extensions.libreoffice.org/extension-center/swedish-hyphenation
- http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex
-"
-SRC_URI="
- http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan/releases/${PV}/ooo_swedish_dict_${PV}.oxt
- http://extensions.libreoffice.org/extension-center/swedish-hyphenation/releases/1.10/hyph_sv_se.oxt -> ${P}-hyph.oxt
- http://extensions.libreoffice.org/extension-center/swedish-thesaurus-based-on-synlex/releases/1.3/swedishthesaurus.oxt -> ${P}-thes.oxt
-"
-
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-sw-20060316 b/app-dicts/myspell-sw-20060316
new file mode 100644
index 000000000000..abf94207ead9
--- /dev/null
+++ b/app-dicts/myspell-sw-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Kiswahili dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-sw_KE-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=71131ddd2188839de91ea2e077ad7b14
diff --git a/app-dicts/myspell-sw-20110106 b/app-dicts/myspell-sw-20110106
new file mode 100644
index 000000000000..87759502de61
--- /dev/null
+++ b/app-dicts/myspell-sw-20110106
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Kiswahili dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.openoffice.org/en/project/swahili-dictionary
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> myspell-sw-20110106.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=5d4dc37a96070d92f69ba44eef7d535b
diff --git a/app-dicts/myspell-sw/Manifest b/app-dicts/myspell-sw/Manifest
deleted file mode 100644
index 6c9a5922a5db..000000000000
--- a/app-dicts/myspell-sw/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-sw-20110106.oxt 423064 BLAKE2B 32e74434714c62b4f5248775ac0ca0262d774a339c84899c822d0099ba1d90830620f748796d246373b566f5b1bbeddbb0b46fd3cf5d9c02168e2f0c18263dbf SHA512 734e760fb3ed95905f7ececc38ad3d4d87f77d5a953e5427d6d242ec73567a35311fea26d1298edb5d1650d6e07a6859c82bff8a6f309d226307873067cc7e98
-DIST myspell-sw_KE-20060316.zip 193118 BLAKE2B c71dc2b85a360e89f824b5df299c424ecc4f5dd198a6213a29f26d78e436fc899f1febc015700eaa63c13295a818633934af15f8cf874773ab01cd5f6d4d1121 SHA512 0ba002f3264ef66d1caa938640fb26709cf2ec45b65f73982311924b2a317bc8ed73bc8942569ab68d54bfe6b8a5f57e869473ea60de790707fe430eaa24b8d4
-EBUILD myspell-sw-20060316.ebuild 507 BLAKE2B 7271ff2741a6a495ee3ab7bee64b65b602a0870c91dce5dee49d9ed25edd7cbad3d3ba8b708a6ef52c168b0eca76f951e11d1827518eb98045bd8ad1b0376601 SHA512 e703b7638c65a942f501559283e752ad895b8857ac9fecf470244dcfe1381a89c7b63c320518fa7f1c10210b19db93299a91ccfea72b9d55548f00a1ff3080dc
-EBUILD myspell-sw-20110106.ebuild 588 BLAKE2B 220e35ce43d612052ce60c4eb9fb2034a98a5fb13032f615d253aa6542c86f6030b5f26f183feb5fa4cca48b9cea8ae55e12a1854089e6ffb333dfe589f7e55d SHA512 d07a9ac1cc51a403df299131ddffe08f50b8c8809cfc9afc18af5275b32c56d96265bac4f12b92d27d03589f4c34ce36f398e7ef8dce4508c6513d5ff174f096
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-sw/metadata.xml b/app-dicts/myspell-sw/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-sw/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-sw/myspell-sw-20060316.ebuild b/app-dicts/myspell-sw/myspell-sw-20060316.ebuild
deleted file mode 100644
index 15f6c1a7e6c7..000000000000
--- a/app-dicts/myspell-sw/myspell-sw-20060316.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"sw,KE,sw_KE,Kiswahili (Africa),sw_KE.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Kiswahili dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild b/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
deleted file mode 100644
index e81657974645..000000000000
--- a/app-dicts/myspell-sw/myspell-sw-20110106.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "sw_KE.aff"
- "sw_KE.dic"
- "sw_TZ.aff"
- "sw_TZ.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Kiswahili dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="https://extensions.openoffice.org/en/project/swahili-dictionary"
-SRC_URI="mirror://sourceforge/aoo-extensions/dicts.sw.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-tn-20060316 b/app-dicts/myspell-tn-20060316
new file mode 100644
index 000000000000..d01cbc4d5faf
--- /dev/null
+++ b/app-dicts/myspell-tn-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Setswana dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-tn_ZA-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=6604ffc4d1b63709338635ca4b43395f
diff --git a/app-dicts/myspell-tn/Manifest b/app-dicts/myspell-tn/Manifest
deleted file mode 100644
index 472ec34101aa..000000000000
--- a/app-dicts/myspell-tn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST myspell-tn_ZA-20060316.zip 17125 BLAKE2B 74832b044863dd74c4b486d7ad57aec20c3caa32dc87ccecade5b3e19c2ad9fdfd2fd76525eb174e473db7c29c2c71f934f158adb8f40314e5b6d8967b61d869 SHA512 5cf59152ff423686e736356525fd3b35059158b410e8229ea7707597b99b0f5933b4a03f5ba9f851d77d02b7ef06d72b3dd37f690064f1d2d3902c459d0be50d
-EBUILD myspell-tn-20060316.ebuild 502 BLAKE2B f66b6fbcaaabaf11d8b295896d70234d1fc3d883395126f354a69b3805440486941d79a381d094e9333378c142312e758a8c579cc6334cda23478912caadca38 SHA512 3d6ba19f0c7812135e2a9b4393a02ee99bec26ed32f2ad694d9550063cce4b4a7160bcea7344b1dc688259b1f54636828cffe32b4c823fedd8266bc9755ee70a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-tn/metadata.xml b/app-dicts/myspell-tn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-tn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild b/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
deleted file mode 100644
index 114b3571a7da..000000000000
--- a/app-dicts/myspell-tn/myspell-tn-20060316.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"tn,ZA,tn_ZA,Setswana (Africa),tn_ZA.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Setswana dictionaries for myspell/hunspell"
-LICENSE="GPL-2"
-HOMEPAGE="http://lingucomponent.openoffice.org/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-uk-1.6.5 b/app-dicts/myspell-uk-1.6.5
new file mode 100644
index 000000000000..992709fc9212
--- /dev/null
+++ b/app-dicts/myspell-uk-1.6.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3 LGPL-2.1 MPL-1.1
+SLOT=0
+SRC_URI=http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/1.6.5/dict-uk_ua-1.6.5.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=d541bdad97945d86b310ae349c0c44d5
diff --git a/app-dicts/myspell-uk/Manifest b/app-dicts/myspell-uk/Manifest
deleted file mode 100644
index 54eb1dc0d6f8..000000000000
--- a/app-dicts/myspell-uk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dict-uk_ua-1.6.5.oxt 854246 BLAKE2B f8fba14ad3a57279993dc7f98b0084ba9a1f30054ce88747dfe817e3873394643b5365c2bcf9640065ba30263946580f6d510fc22c6cdcd7df6583ce01de2d91 SHA512 e1b74e299909af291e40674a6b783eacd289b16c7419e3311ea153c47520e06db70ff45a497db6d3f1cbe44bff10260e9fa6c7382d7a87e3efb2211ce1cb5ce8
-EBUILD myspell-uk-1.6.5.ebuild 718 BLAKE2B 8426ecaad9367b7bac162e413a8cf532c31085f859402d4c62fe6cabb8d62df6e66e8b5722f449e5232a3576836e8f55965359a0bc4b926a62b592116b2e6b59 SHA512 9befb1f5459f354f285500c308ed9fceb38fd8fdff6dbda54fff29ff60315b56f60972dd51bbcbab9468b68e1955ac2686d21997b7fc2f4c783d7563ceba287e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-uk/metadata.xml b/app-dicts/myspell-uk/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/myspell-uk/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild b/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
deleted file mode 100644
index 976ffda1ffb1..000000000000
--- a/app-dicts/myspell-uk/myspell-uk-1.6.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
- "uk_UA.aff"
- "uk_UA.dic"
-)
-
-MYSPELL_HYPH=(
- "hyph_uk_UA.dic"
-)
-
-MYSPELL_THES=(
- "th_uk_UA.dat"
- "th_uk_UA.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
-HOMEPAGE="http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus"
-SRC_URI="http://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus/releases/${PV}/dict-uk_ua-${PV}.oxt"
-
-LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/myspell-zu-20060316 b/app-dicts/myspell-zu-20060316
new file mode 100644
index 000000000000..dc206f8b5ff1
--- /dev/null
+++ b/app-dicts/myspell-zu-20060316
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Zulu dictionaries for myspell/hunspell
+EAPI=0
+HOMEPAGE=http://lingucomponent.openoffice.org/ http://translate.sourceforge.net/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://gentoo/myspell-zu_ZA-20060316.zip
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e myspell a0259d47cff590f8fd5ab7027c637c59 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=dd0cd98a87e308fdfeaef1b2f1091f4f
diff --git a/app-dicts/myspell-zu-20100126 b/app-dicts/myspell-zu-20100126
new file mode 100644
index 000000000000..72e9948e38b4
--- /dev/null
+++ b/app-dicts/myspell-zu-20100126
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Zulu dictionaries for myspell/hunspell
+EAPI=6
+HOMEPAGE=https://extensions.openoffice.org/en/project/zulu-spell-checker
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/aoo-extensions/dict-zu_za-2010.01.26.oxt -> myspell-zu-20100126.oxt
+_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
+_md5_=81771e80e31eb7c61dbb0695649d3b7e
diff --git a/app-dicts/myspell-zu/Manifest b/app-dicts/myspell-zu/Manifest
deleted file mode 100644
index 969186bf57e2..000000000000
--- a/app-dicts/myspell-zu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST myspell-zu-20100126.oxt 393165 BLAKE2B 0c31ab3746ffece8546415e051641c26f14cac80306e5326cd6616e953c34d810a6b3b9a44860450da720975e6e73bf0b1cc0661b92f95c3005ebdf8dabde3a9 SHA512 0eeafbcfff3459ec65d0fcd3b845d0cf7b1deecc1ce1364fb45cab092b17986971a3518190355e6ce863514df4bf822804cd9006fd40c0bd03eb5ad6129c3b8e
-DIST myspell-zu_ZA-20060316.zip 290607 BLAKE2B 24952faa606fd7477fdaac81915ad31486fba8ad47533036b578ec281ef6946f2d418442d161f75f69350f722e771a67c40567f74359bd0885b36bbcf80dbc62 SHA512 dd504ef7969657243eb59aa5b85dd988602b5045666cdbf0787d4ebe492ea34d42edd8e4f9b58136e80add420c9ecc577d3285755fff3e17e668580cd2b82937
-EBUILD myspell-zu-20060316.ebuild 569 BLAKE2B 587e5e210b9c48554b00f8a9e3a886cdeb08e22fa25bcc220707cdf9933d81c189c034b6f8d728b2d8115d14c6c9ca1d014bcdf39f1d309da1eeb6c5c15e076e SHA512 1fc317207c462e9edfd209ec390343ec6472d1dd4be6e94670f0ce34d58befee226216172446724121bd82ed73789b49fbb8b1ca2be19e9335b5a74ebdad26e2
-EBUILD myspell-zu-20100126.ebuild 602 BLAKE2B ee2082799e31ab35ce8ecb6dd9624e3abb0394ffba9cd937e445833b0b0cca4f33e694b7c96e566969bb51b08d145fc06ac3969658a434c380c3319f11ba5e50 SHA512 db2424bb61b616bda648aef4590286a4bbbd90441b41e9b3e7ddc691099b93c75062413efe07dae9e61d2800910ec98e71bdfc24a130b1d675da75b398a8a8a8
-MISC metadata.xml 246 BLAKE2B 4a746dc47f5e6f3ffcbaf1d8f66266a27edb57410ef7bc86230a8228e3ebb290202764649625f2e4e5cdd9b8308614714f9737a3225b42647237297194afbb2f SHA512 24064c771ba24adfc07416caded3b3863dc6f735e1c218fba431c289374755536e7664d021be8865fad9cd6508a824a82f4099ef93b84c93db4a32c1ce788a6f
diff --git a/app-dicts/myspell-zu/metadata.xml b/app-dicts/myspell-zu/metadata.xml
deleted file mode 100644
index e85069744735..000000000000
--- a/app-dicts/myspell-zu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">translate</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/myspell-zu/myspell-zu-20060316.ebuild b/app-dicts/myspell-zu/myspell-zu-20060316.ebuild
deleted file mode 100644
index dde4d009e5cf..000000000000
--- a/app-dicts/myspell-zu/myspell-zu-20060316.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MYSPELL_SPELLING_DICTIONARIES=(
-"zu,ZA,zu_ZA,Zulu (Africa),zu_ZA.zip"
-"zu,ZA,zu_ZA,Zulu (Africa),zu_ZA.zip"
-)
-
-MYSPELL_HYPHENATION_DICTIONARIES=(
-)
-
-MYSPELL_THESAURUS_DICTIONARIES=(
-)
-
-inherit myspell
-
-DESCRIPTION="Zulu dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="http://lingucomponent.openoffice.org/ http://translate.sourceforge.net/"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild b/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
deleted file mode 100644
index 0ed05d879cf1..000000000000
--- a/app-dicts/myspell-zu/myspell-zu-20100126.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV::4}.${PV:4:2}.${PV:6}
-
-MYSPELL_DICT=(
- "zu_ZA.aff"
- "zu_ZA.dic"
-)
-
-MYSPELL_HYPH=(
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Zulu dictionaries for myspell/hunspell"
-LICENSE="LGPL-2.1"
-HOMEPAGE="https://extensions.openoffice.org/en/project/zulu-spell-checker"
-SRC_URI="mirror://sourceforge/aoo-extensions/dict-zu_za-${MY_PV}.oxt -> ${P}.oxt"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/app-dicts/opendict-0.6.7 b/app-dicts/opendict-0.6.7
new file mode 100644
index 000000000000..0573bd37a416
--- /dev/null
+++ b/app-dicts/opendict-0.6.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=OpenDict is a free cross-platform dictionary program
+EAPI=6
+HOMEPAGE=http://opendict.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/opendict/files/opendict-0.6.7.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d53b4b3e46f145382187b0159dfbbdbb
diff --git a/app-dicts/opendict/Manifest b/app-dicts/opendict/Manifest
deleted file mode 100644
index 868033875a08..000000000000
--- a/app-dicts/opendict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST opendict-0.6.7.tar.gz 169580 BLAKE2B 665fe181bf16d8e923470568b6685149075b6c5a9afe2deffe6ee4ff792b4e6a2c166f3ce4297f59fc57cd11efe299a93518c4fb5e929b13270d04f172a62146 SHA512 ef97ec84591bda4d8d4746fa4532de109cf03d89dfd5aa20e1775224c687b503759c020b2286e5cedd395ebce5db3b2a10495adc31fcc31dbd4fddfca6fee1f8
-EBUILD opendict-0.6.7.ebuild 2049 BLAKE2B 3cc51451ed9b8cf49a21141695ee6c8e33ff673d2e651e162e01a240667af0bf840f983f0ed47f5b8c95fd4ca5209fc17fb55fe2f8a7fce03cecfaf42aa02276 SHA512 30cd657a497536afa6c95de547ea48c50d3dd2e8e6af77b35d018fbc9522f43c6b5474f7967c829c07e635b38d99dc5501ac2f15d464cc201d557ed67bcea1ea
-MISC metadata.xml 339 BLAKE2B 3233d939c71c80bd1d803ef77bafb2d50022497ef3f580171d9bd37aa260c0b5d7e7d306a5bd98ab8a2bdd6b052048032887579c5064d7684b9aa43aa4a53ffd SHA512 49affe3fdde01f9c9726abbf3088e9332fd2aad7c47cb7591eee9d23dd18caf4877c2858e457b236bfec2318baa5e3cbf8184ae431825d6d28a01557a58daf98
diff --git a/app-dicts/opendict/metadata.xml b/app-dicts/opendict/metadata.xml
deleted file mode 100644
index e41fb4b553e3..000000000000
--- a/app-dicts/opendict/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>wxwidgets@gentoo.org</email>
- <name>Gentoo wxWidgets Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">opendict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/opendict/opendict-0.6.7.ebuild b/app-dicts/opendict/opendict-0.6.7.ebuild
deleted file mode 100644
index 99c27f354f2b..000000000000
--- a/app-dicts/opendict/opendict-0.6.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="OpenDict is a free cross-platform dictionary program"
-HOMEPAGE="http://opendict.sourceforge.net/"
-SRC_URI="mirror://sourceforge/opendict/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="If you want system-wide plugins, unzip them into
-${ROOT}usr/share/${PN}/dictionaries/plugins
-
-Some are available from http://opendict.sourceforge.net/?cid=3"
-
-src_prepare() {
- sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \
- -i "${S}/lib/info.py"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # override gnome2_src_configure
- default
-}
-
-src_compile() {
- # evil makefile
- :
-}
-
-src_install() {
- # makefile is broken, do it manually
-
- dodir /usr/share/${PN}/dictionaries/plugins # global dictionary plugins folder
-
- # Needed by GUI
- insinto /usr/share/${PN}
- doins "${S}"/copying.html
-
- insinto /usr/share/${PN}/pixmaps
- doins "${S}"/pixmaps/*
-
- DHOME="$(python_get_sitedir)/opendict"
- insinto "${DHOME}/lib"
- doins -r "${S}"/lib/*
- exeinto "${DHOME}"
- python_fix_shebang opendict.py
- doexe opendict.py
-
- dosym "${DHOME}/opendict.py" /usr/bin/opendict
-
- domenu misc/${PN}.desktop
-
- insinto /usr/share/icons/hicolor/24x24/apps/
- newins "${S}/pixmaps/icon-24x24.png" opendict.png
- insinto /usr/share/icons/hicolor/32x32/apps/
- newins "${S}/pixmaps/icon-32x32.png" opendict.png
- insinto /usr/share/icons/hicolor/48x48/apps/
- newins "${S}/pixmaps/icon-48x48.png" opendict.png
- insinto /usr/share/icons/hicolor/scalable/apps/
- newins "${S}/pixmaps/SVG/icon-rune.svg" opendict.svg
-
- doman opendict.1
- dodoc README.txt TODO.txt doc/Plugin-HOWTO.html
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/app-dicts/prime-dict-1.0.0-r3 b/app-dicts/prime-dict-1.0.0-r3
new file mode 100644
index 000000000000..cb8cfa3355d3
--- /dev/null
+++ b/app-dicts/prime-dict-1.0.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DESCRIPTION=Dictionary files for PRIME input method
+EAPI=5
+HOMEPAGE=http://taiyaki.org/prime/
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
+KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc6e554452c394c2f9a4721173bc3cf6
diff --git a/app-dicts/prime-dict/Manifest b/app-dicts/prime-dict/Manifest
deleted file mode 100644
index 4268aa62bdd1..000000000000
--- a/app-dicts/prime-dict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST prime-dict-1.0.0.tar.gz 6756593 BLAKE2B 7348e7a46dcf5a6d15ec2c5e09c4d89e724d912071a11b48b52f9e6cff62c0c52b7736da322a69ed6662e03c4b987702691174d48331e4ed692887d72b9169c0 SHA512 0cad16048baeeca982feaa3e95f7afaabaa94f511e1e80ad332cf106ea39e226f3119bcdc9636010cb5d5e0aef10dec0b8fc4d42b743e32c51971cb45e85dabf
-EBUILD prime-dict-1.0.0-r3.ebuild 635 BLAKE2B 530851c4144eff17f401fe4e8e36b7b3a6bed1f8df153e33456bafb22e5bde00fafa4aac39c4cacd7f18777e8617784744808ec46bedc855c415d5e29c749736 SHA512 094cd7184e7ce5e83aa1703822cfe0443677a8859c7455ac40b40560f18b341eb45bf68597e8a731091617216786c2e6ae70d6ff848954e024b4c9697944a510
-MISC metadata.xml 312 BLAKE2B 1a3aff27feacdc44eef84b804f34de6cca67a6ddd6b9e7bfe255eeeca051d7a70fc885fffa8bec7f1e1235704ade9f54815ee9b13db8eee73a18410b5fd9df16 SHA512 4c8a557ae5d0d62d8614e4ecbaf530c763a5420bc2ec18e8e6909f32fb342d55f4923b649cbc9585cfcc0a73afa40babf709dd95a7c19828dc09ad2ea4403346
diff --git a/app-dicts/prime-dict/metadata.xml b/app-dicts/prime-dict/metadata.xml
deleted file mode 100644
index d6a695114fe8..000000000000
--- a/app-dicts/prime-dict/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge-jp">prime</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
deleted file mode 100644
index 818212f88dd0..000000000000
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-ng
-
-DESCRIPTION="Dictionary files for PRIME input method"
-HOMEPAGE="http://taiyaki.org/prime/"
-SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-each_ruby_configure() {
- econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')" || die
-}
-
-each_ruby_compile() {
- emake
-}
-
-each_ruby_install() {
- emake DESTDIR="${D}" install
-}
-
-all_ruby_install() {
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-dicts/stardict-cdict-en-zh-big5-2.4.2 b/app-dicts/stardict-cdict-en-zh-big5-2.4.2
new file mode 100644
index 000000000000..4a73014462f4
--- /dev/null
+++ b/app-dicts/stardict-cdict-en-zh-big5-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_TW/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-cdict-big5-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=9cb5a4cc39685b2ac07094ebed4b689f
diff --git a/app-dicts/stardict-cdict-en-zh-big5/Manifest b/app-dicts/stardict-cdict-en-zh-big5/Manifest
deleted file mode 100644
index ed129fcd035a..000000000000
--- a/app-dicts/stardict-cdict-en-zh-big5/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-cdict-big5-2.4.2.tar.bz2 4489767 BLAKE2B 448af91242f32c5575daa813c250ede2f1e714718b7ef26ae6599440013cc26d23369313f56425515f253ebfa17ede6ec9a70d6a3af8c1dca5da86a22fe6690b SHA512 54adeaebf0d807346abd6dde556edeb8d701e5a323dcdff1b05316d7415bdcda0646e7ab2f977d54f6aba3242df9367f54b31d98c996d6426501bf49efdf82cd
-EBUILD stardict-cdict-en-zh-big5-2.4.2.ebuild 322 BLAKE2B 8b42fa3e83f79c21102fc31bb94c29abe6ba2688f5f1d512120418cf80b580a37ca4e98baf140074029ba1efc06843ea991495aae8fe09b9354e7b7be29337a2 SHA512 a9107244448526b97db70cf0069bcbb6fae9295fb4010e49fde1c6bf9dfa52d5cde6103efb5f2fdbd136dfded67bad4aa88786a1ac375c116b3297519440d1cf
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild b/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
deleted file mode 100644
index a6bbd3c0ebd5..000000000000
--- a/app-dicts/stardict-cdict-en-zh-big5/stardict-cdict-en-zh-big5-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Traditional Chinese (BIG5)"
-DICT_PREFIX="cdict-"
-DICT_SUFFIX="big5"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_TW/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-cdict-en-zh-gb-2.4.2 b/app-dicts/stardict-cdict-en-zh-gb-2.4.2
new file mode 100644
index 000000000000..274986682370
--- /dev/null
+++ b/app-dicts/stardict-cdict-en-zh-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-cdict-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=feadab5829a32c0fb69d767740918465
diff --git a/app-dicts/stardict-cdict-en-zh-gb/Manifest b/app-dicts/stardict-cdict-en-zh-gb/Manifest
deleted file mode 100644
index 77f9f72abf49..000000000000
--- a/app-dicts/stardict-cdict-en-zh-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-cdict-gb-2.4.2.tar.bz2 4483233 BLAKE2B ec4805a7ebf7ce300b0c5026a0d7b423c2ea430a46e8bedd3485427e467748db093874585135610e891044d8a050169e4cd6b6e488bfc310839160a8d045f6c4 SHA512 25b2c624d2a277f0ff0ea9d1d2f609ea1bd9c9469cd843e79f242769629be2b7e70b564ace9f15e5d0eb4c5be89dd2ae159ee01eceee37b959d373221bfa87ae
-EBUILD stardict-cdict-en-zh-gb-2.4.2.ebuild 322 BLAKE2B 970bf3cd9c77125fb57d1265774f7e8ab4aa2b03399b24d77d863c7ca384c5d47c981c2e67e487f08898f8954c72176b66e4ae0d06944f7418458db732bfdab3 SHA512 0116f5cb4f8a477f60fa3983c81b06a3f839c3113959ee39096296ac229567f5aeb668058dc754e2654145d61dda180329c154ff5a4b6fbc524c9b664cbe3533
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
deleted file mode 100644
index 574e3d74f5d7..000000000000
--- a/app-dicts/stardict-cdict-en-zh-gb/stardict-cdict-en-zh-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Simplified Chinese (GB)"
-DICT_PREFIX="cdict-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-cedict-zh-en-big5-2.4.2 b/app-dicts/stardict-cedict-zh-en-big5-2.4.2
new file mode 100644
index 000000000000..f59acb92fbc2
--- /dev/null
+++ b/app-dicts/stardict-cedict-zh-en-big5-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_TW/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-cedict-big5-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=4671bbe01a9d3b0754bc99186f374457
diff --git a/app-dicts/stardict-cedict-zh-en-big5/Manifest b/app-dicts/stardict-cedict-zh-en-big5/Manifest
deleted file mode 100644
index 7b99645c2008..000000000000
--- a/app-dicts/stardict-cedict-zh-en-big5/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-cedict-big5-2.4.2.tar.bz2 548514 BLAKE2B 7079ea1a4afadcd42f9c48bfdc424d9f92e8b3c6a7346b3bf10ff67e04255fdb48d7445e509cdd4421c0eeb4a20ee2deff07d76ae614898f116eae12950967a7 SHA512 3244688c6ad4f81c9d4b42ca576a667ee597fd14a44dc8f2256dd1d5790435e02ee0df3dba5db332188a9257a184c3cc1905cbeaf445c5995de1ac10e71d51cb
-EBUILD stardict-cedict-zh-en-big5-2.4.2.ebuild 323 BLAKE2B 55e8407eb6ced7b6834315bde58064e517ba24de1b1042d72ca2f3febdab50d01bc231f38c8e1d5d85fc643414d2d6614f00115b00ae3d8cda7b9210b6ae9310 SHA512 a7a9a44a1490fbe33bf904b07500eaa0b25ea5bb732e3092deaef9053ab993b5cc9fe6c302e27e5f0c95af4c8213aff49e97616b4faa602fbee1ef47ba5a5fe3
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild b/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
deleted file mode 100644
index 21979b95a9b1..000000000000
--- a/app-dicts/stardict-cedict-zh-en-big5/stardict-cedict-zh-en-big5-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Traditional Chinese (BIG5)"
-TO_LANG="English"
-DICT_PREFIX="cedict-"
-DICT_SUFFIX="big5"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_TW/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-cedict-zh-en-gb-2.4.2 b/app-dicts/stardict-cedict-zh-en-gb-2.4.2
new file mode 100644
index 000000000000..4f37b88c66e6
--- /dev/null
+++ b/app-dicts/stardict-cedict-zh-en-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-cedict-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=bbe34db76e352667489b6e289448bd24
diff --git a/app-dicts/stardict-cedict-zh-en-gb/Manifest b/app-dicts/stardict-cedict-zh-en-gb/Manifest
deleted file mode 100644
index 52e4a1bfd1d2..000000000000
--- a/app-dicts/stardict-cedict-zh-en-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-cedict-gb-2.4.2.tar.bz2 520907 BLAKE2B db069c2979083462c3936cbcb163d025b8d546a8b41a41307d2ba7b4b306025dad2d043ce171dca71835deab958e1c6e5cd11aa339630ec7c02bb08c8df3c4ce SHA512 8b151f2bfb98d0f0b4ed5b178ab1ff72d92c4ba8989bdaf2f04f00a4d7097a624351716ea735a7ce0ddd4111b4afe4fc07e8dbcd583d8364d97ca14c2e20773d
-EBUILD stardict-cedict-zh-en-gb-2.4.2.ebuild 323 BLAKE2B 2c872587b56a761bd871ebcfb61e0ced84f245eb8ed46ebdcf920c9a93651aaf1c2f06a01a68b5edd52b870fbb6d5be3c4d338923396871268806bbd542faec3 SHA512 00f61dca362588ee8d7e7b8e28dfca34e44e3337cc4a8ed0ba1f094aec3b876a546e820767eefdd82454615b6d9975ee3142fdb7367fa83653e11cc1ea77a14e
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
deleted file mode 100644
index cdcca3f2ef9b..000000000000
--- a/app-dicts/stardict-cedict-zh-en-gb/stardict-cedict-zh-en-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Simplified Chinese (GB)"
-TO_LANG="English"
-DICT_PREFIX="cedict-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-dictd-devils-2.4.2 b/app-dicts/stardict-dictd-devils-2.4.2
new file mode 100644
index 000000000000..96018450bba0
--- /dev/null
+++ b/app-dicts/stardict-dictd-devils-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary for Dictd.org's Devil's Dictionary
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/dict.org/
+IUSE=gzip
+KEYWORDS=~amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.dict.org_devils-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=159b6d827455a100a4dc41a01498e639
diff --git a/app-dicts/stardict-dictd-devils/Manifest b/app-dicts/stardict-dictd-devils/Manifest
deleted file mode 100644
index cc4eb147a619..000000000000
--- a/app-dicts/stardict-dictd-devils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.dict.org_devils-2.4.2.tar.bz2 177420 BLAKE2B dee3640b8f8a2d9b01a2303b5605d496925eff49f0a12b7611e8ffc4ed27ea6949e47201b705ee8037dc04243290f43627fac3f0fbb74ea1ee7bf58958826ebb SHA512 ae2bddfc7c931ee4f995f6129ce4424c98193188f0a51e14e701145b86f0f5b33ab4c85928cd6fce9d5de5e0b44453ada26a1d04bcdf5676fe872e2372f99484
-EBUILD stardict-dictd-devils-2.4.2.ebuild 328 BLAKE2B 8d6c2e304da1d20cfb03db2c43eba021fafba954cd298f2be52b7f7bc34965d629c82fecfda7c8d96d71f767900746ae32c42bc16e141f259c282034e6f6fa9f SHA512 0ffe607235523df28868f612710e3813d000dd4bc1729b37e218948934d56ea16cfedbc14347ad96e4f1a59279e0968843bdcb7c95b2b0b4ad9ed6d8ce0c4900
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-dictd-devils/metadata.xml b/app-dicts/stardict-dictd-devils/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-dictd-devils/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild b/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
deleted file mode 100644
index 292ab3a606f7..000000000000
--- a/app-dicts/stardict-dictd-devils/stardict-dictd-devils-2.4.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DICT_PREFIX="dictd_www.dict.org_"
-
-inherit stardict
-
-DESCRIPTION="Stardict Dictionary for Dictd.org's Devil's Dictionary"
-HOMEPAGE="http://download.huzheng.org/dict.org/"
-
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-deu-2.4.2 b/app-dicts/stardict-freedict-eng-deu-2.4.2
new file mode 100644
index 000000000000..3147117c9338
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-deu-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to German
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-deu-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=876e26696845f4a72b0e8aa5b65d236c
diff --git a/app-dicts/stardict-freedict-eng-deu/Manifest b/app-dicts/stardict-freedict-eng-deu/Manifest
deleted file mode 100644
index 151257170877..000000000000
--- a/app-dicts/stardict-freedict-eng-deu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-deu-2.4.2.tar.bz2 2152861 BLAKE2B 1aa116f2e13e0599f0bb8ac0b494d7410b2fbfa1b0b502af7cb5b5569c9906758bfdb84970841909d5436a3dc7cdad8609ff67a7965bf62949516d0042169d4e SHA512 a2acbb7d6f29f4d8addbb338daccfada92daeee3f2f2684f10e980b09ea950fe8c50e3781907412142b8a973bff88fa2d3f85583607991fc7fffe0b210cf70bf
-EBUILD stardict-freedict-eng-deu-2.4.2.ebuild 300 BLAKE2B e5329ddc46ab9ce0865fb131a3a2b57089fdd306b263b7d49b73422f72984829746f7f58ba14f2f316e700c3a9c5081c8b836ffe47d8785f6bdba8effcf00500 SHA512 fe58fe9a997dc02d6467aaf05d59a4c593e626cba9669da5c7b814f631343a3565eb2bc887c66e220f12c79eec8e9422d0fef625b5f87169b4f2c217d611efa2
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-deu/metadata.xml b/app-dicts/stardict-freedict-eng-deu/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-deu/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
deleted file mode 100644
index c9fffe23601f..000000000000
--- a/app-dicts/stardict-freedict-eng-deu/stardict-freedict-eng-deu-2.4.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="German"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-fra-2.4.2 b/app-dicts/stardict-freedict-eng-fra-2.4.2
new file mode 100644
index 000000000000..780d9d03b567
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-fra-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to French
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-fra-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=cdb588590ac4875600558d3b44212c9b
diff --git a/app-dicts/stardict-freedict-eng-fra/Manifest b/app-dicts/stardict-freedict-eng-fra/Manifest
deleted file mode 100644
index 5c94c654944e..000000000000
--- a/app-dicts/stardict-freedict-eng-fra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-fra-2.4.2.tar.bz2 217079 BLAKE2B c92a2af4eb434d5acd78b35014813aaf387c39046d86e91e43d9a9a32ae5598c3d6f841f3e901b603906b4f837f812cdee198cf8f01f6bc65034b0553d8d3edb SHA512 a86c11f10998401421604e3136ec81a2ae1a7e1a0e3f6946a7a6a0fb59b9e6a5ea9fe50a66852371a4c53649bbf5d30b003653b8c77e61b7b8ce51c4524c10cd
-EBUILD stardict-freedict-eng-fra-2.4.2.ebuild 301 BLAKE2B 5362736e8521a48357014f05c15fd7dcbc920c35dbb81ffb9b4779735089dd631aabda06cd73003c871091b4202274dba10b5b2b88b901a77204b2cdfb58ee12 SHA512 b34b9fa7e5561ae0ae95ad7cb44b069ed595536117dece21e1f72c4faf88c3c1ca27497117206600d689e7bb713b542bc30219f91ec47edf0d0d3168eaa032e4
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-fra/metadata.xml b/app-dicts/stardict-freedict-eng-fra/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-fra/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
deleted file mode 100644
index fdfe419c891f..000000000000
--- a/app-dicts/stardict-freedict-eng-fra/stardict-freedict-eng-fra-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="French"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-ita-2.4.2 b/app-dicts/stardict-freedict-eng-ita-2.4.2
new file mode 100644
index 000000000000..6ffedd4aef60
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-ita-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Italian
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-ita-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=f1aaf8c4c128595cc57a405593206bf2
diff --git a/app-dicts/stardict-freedict-eng-ita/Manifest b/app-dicts/stardict-freedict-eng-ita/Manifest
deleted file mode 100644
index 6ca1cea5e431..000000000000
--- a/app-dicts/stardict-freedict-eng-ita/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-ita-2.4.2.tar.bz2 75395 BLAKE2B ab077ab591ffa1e0de951881e72447a423fc872e79fd6ec57842d02e9215d66291d64ce89248808a67c4321b74380e7c914bfb828b86fbffb7711d985a13de32 SHA512 157761fe100bbbee252a48d01073e34540019dcb81ea614f85731b75ed621dec1e34042f777ecb02b4a021d1e2224c8873223f96730baf2ef52b4ad26e2393d0
-EBUILD stardict-freedict-eng-ita-2.4.2.ebuild 302 BLAKE2B f79c9812ee206bbaafbedd1b8aef4d4aca99c94d2bfeb3fc3fbb52a68f80f629b213924f41be339da5c3b27547517994539b8e05158371cea27104c4d3c77aad SHA512 628f6dbc93150aa6325484419734be383b4049e03ee336f3ca5e12afa0d0e94cc7c5c64788560cb8ec29f131f5b7b73c43cdda6662f0ac6a7491107dbc7fa75c
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-ita/metadata.xml b/app-dicts/stardict-freedict-eng-ita/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-ita/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
deleted file mode 100644
index 5ac32f69c919..000000000000
--- a/app-dicts/stardict-freedict-eng-ita/stardict-freedict-eng-ita-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Italian"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-lat-2.4.2 b/app-dicts/stardict-freedict-eng-lat-2.4.2
new file mode 100644
index 000000000000..22516352f661
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-lat-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Latin
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-lat-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=1661f6642ffae327a5d7a326a9859e86
diff --git a/app-dicts/stardict-freedict-eng-lat/Manifest b/app-dicts/stardict-freedict-eng-lat/Manifest
deleted file mode 100644
index 8ecddcf4ba2d..000000000000
--- a/app-dicts/stardict-freedict-eng-lat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-lat-2.4.2.tar.bz2 66078 BLAKE2B 6b5a533681a6b34cd07c10d85ec031257d56e678122e5900df625c4277c5964ee6582b81f53939c6bd4b9c692c0d60c52361c95a4ffc8a64e32aece682e8b9c3 SHA512 2a69500a7a3e04260065a962ae7eae4df870d2620f7afb7f1a7574bb62399a696d4b9f675d3e67a1150f818268f04c6ecc722a9d6c7bd6c3e9ec6ad66e63c303
-EBUILD stardict-freedict-eng-lat-2.4.2.ebuild 300 BLAKE2B a70f4775da45bc3d3bc20d14c4766c251eeaaabe2333cdfd3478cc6d9ff378648ef3909876e5807a6800b653c77ab86d91f57bb34a7b86453b17be7d9e7787c5 SHA512 9b87e309c786420e303f8934af4f758c1c59645f3be57f7d5669867fb42df5cb7c4d74340c899eada7a3e6b0d5317a39443464131ab390208384e80655f0d654
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-lat/metadata.xml b/app-dicts/stardict-freedict-eng-lat/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-lat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
deleted file mode 100644
index 8a997dda9948..000000000000
--- a/app-dicts/stardict-freedict-eng-lat/stardict-freedict-eng-lat-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Latin"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-rus-2.4.2 b/app-dicts/stardict-freedict-eng-rus-2.4.2
new file mode 100644
index 000000000000..70109faba066
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-rus-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Russian
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-rus-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=4102c748dafbf47f7a3494d0a93c52b4
diff --git a/app-dicts/stardict-freedict-eng-rus/Manifest b/app-dicts/stardict-freedict-eng-rus/Manifest
deleted file mode 100644
index 025fffb6a1ab..000000000000
--- a/app-dicts/stardict-freedict-eng-rus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-rus-2.4.2.tar.bz2 52290 BLAKE2B ffdfe8c0a2f316202ebaacf9cfef7a2cfe42e591024a146710ec484853b18f14807d2702b42b5594452846c003c0422408b9d6ad31073c4cdcc1bb89be91f4aa SHA512 5619725fdc7e506dc94c35a578d7416589e2f8e27d1f159673ebdea7e70a7c4e49dd3222bcfdc7e086240b9b2225c2e8c7c8cf727557b1f5c81ba754601cd63d
-EBUILD stardict-freedict-eng-rus-2.4.2.ebuild 302 BLAKE2B ab84c4d7f3fcfaebcc26720e52db9981c58391870cc076d337dd84f3bf166cec49318f373bb561dded21b15dc6fbc206763cc76f804fba97ccb8bd64a0999aaa SHA512 d6846355425c900a830a8d0589ab1239a4236e90b549aff83717aafcc7e43c2ee07647a1baa2bf07e404b4f8cb027e6f5ba7e988129c89b0057d4944e8a7673e
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-rus/metadata.xml b/app-dicts/stardict-freedict-eng-rus/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-rus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
deleted file mode 100644
index fba06832b014..000000000000
--- a/app-dicts/stardict-freedict-eng-rus/stardict-freedict-eng-rus-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Russian"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-spa-2.4.2 b/app-dicts/stardict-freedict-eng-spa-2.4.2
new file mode 100644
index 000000000000..8ee84f7144f1
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-spa-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Spanish
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-spa-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=c0d457e45bb7947be8a5a64172bfb231
diff --git a/app-dicts/stardict-freedict-eng-spa/Manifest b/app-dicts/stardict-freedict-eng-spa/Manifest
deleted file mode 100644
index e033b1b551d7..000000000000
--- a/app-dicts/stardict-freedict-eng-spa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-spa-2.4.2.tar.bz2 139711 BLAKE2B d41586773742f9c6faef2c0a3d2121e9868c03ed47fa3c0c30ebc42af4b10cf893034a1eb6f93f69e9a5736ba51db125bd9e4f359fce6dab3cb8dc0f34a4ee50 SHA512 3a9ff0f38764d76f9159e3bda63c4469f8923c56197c32069eaff40ed856b8afbebf4bcea0e111ad25705751b922304df670e518f028dec94390200246fa4a5a
-EBUILD stardict-freedict-eng-spa-2.4.2.ebuild 302 BLAKE2B 80e2e222220ca2f278a2e3c3164bbad74df00041e2063264af5fb16c5d32796294b8a058771ec1433d1852e0154bc39b092d5c201f85abbfaed226c9605bd5c9 SHA512 cc625e886bbdc385992e67e0bddddcd12493d2b7a6a37210f24acb5c28858eba60bac8f1296214439b13d97c435bff906b47cd834a3dc80aa89df26ccae55bc5
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-spa/metadata.xml b/app-dicts/stardict-freedict-eng-spa/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-spa/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
deleted file mode 100644
index 082f4c32111d..000000000000
--- a/app-dicts/stardict-freedict-eng-spa/stardict-freedict-eng-spa-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Spanish"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-swe-2.4.2 b/app-dicts/stardict-freedict-eng-swe-2.4.2
new file mode 100644
index 000000000000..841fde48e267
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-swe-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Swedish
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.freedict.de_eng-swe-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=5f642b4885d8740aefd457f53ad66555
diff --git a/app-dicts/stardict-freedict-eng-swe/Manifest b/app-dicts/stardict-freedict-eng-swe/Manifest
deleted file mode 100644
index fc136abab04e..000000000000
--- a/app-dicts/stardict-freedict-eng-swe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.freedict.de_eng-swe-2.4.2.tar.bz2 127421 BLAKE2B f792aa5100f9cb89fc8e80c815ba1536315e889b2c71d6ddd22b08114bb555af53192b43c35007ab022e8152e06ce4cd361dacc97211595361d515215f80b752 SHA512 947e8bc61f00276d4a213bd3e5bf189949633ef645507f22e5c0db53ed1e779daaaff491458fde823fb4f32ab2a38cd88db29efe10aa1787e49a78ae9ad1580f
-EBUILD stardict-freedict-eng-swe-2.4.2.ebuild 302 BLAKE2B 6a10f1ff6a87e64f8c7bdfc0aa00d03e3460f0ab3473bebe9286a0ff9ceda2a07f6536ad1e3e89245e55c1bc135da06d4df3a589e2f3a260630b9a526bd70821 SHA512 32fbe013e37f5b4b6c320c6ab905673cd246b5550f4bbc3bd5fddc86085209f54b96dc68e8d06ec6fbb5cc0b17931575ce9fae83cf1e96f179289dc576b39ad8
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-swe/metadata.xml b/app-dicts/stardict-freedict-eng-swe/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-swe/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
deleted file mode 100644
index 60eb4d1cadfd..000000000000
--- a/app-dicts/stardict-freedict-eng-swe/stardict-freedict-eng-swe-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Swedish"
-DICT_PREFIX="dictd_www.freedict.de_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-eng-tur-2.4.2 b/app-dicts/stardict-freedict-eng-tur-2.4.2
new file mode 100644
index 000000000000..2d84d9b4e6fc
--- /dev/null
+++ b/app-dicts/stardict-freedict-eng-tur-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Turkish
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-freedict-eng-tur-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=9983db4d08d80e1fb610a126c0f62f19
diff --git a/app-dicts/stardict-freedict-eng-tur/Manifest b/app-dicts/stardict-freedict-eng-tur/Manifest
deleted file mode 100644
index 01691401185e..000000000000
--- a/app-dicts/stardict-freedict-eng-tur/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-freedict-eng-tur-2.4.2.tar.bz2 1910557 BLAKE2B a1cb5acde133f831eaa22d7e8f44a3105a37d39f1039738fe7703df5d12c394269321a560a59919b029f698bbbdcbba491fa6686157b80ff2e8f6fdfe82872a5 SHA512 10845e466c976644f868df1078bb0bb48e7f7a701577e6f42d99b12488fb52a6c83816a1b461f5df0c43323ef87d596947088693ecc523db2f41815cea6a20b7
-EBUILD stardict-freedict-eng-tur-2.4.2.ebuild 289 BLAKE2B b11455f4a0d9976925a242e8915d8069d0b469a13e202b4f14946b002d2023865dbce3a0839b9dc129629962b2af86cc252c8ec359d2f6b51147625e60e652bf SHA512 013ce78c081b061eae3a76910ee3c56a4a0e2a92681081e577eb9bfc6a3557050d01d34becadc4a2d3774865838cf9bc161b12521d1ea4f649f1f3551c5d938c
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-eng-tur/metadata.xml b/app-dicts/stardict-freedict-eng-tur/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-eng-tur/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild b/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
deleted file mode 100644
index 42c60d4db6e5..000000000000
--- a/app-dicts/stardict-freedict-eng-tur/stardict-freedict-eng-tur-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Turkish"
-DICT_PREFIX="freedict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-tur-deu-2.4.2 b/app-dicts/stardict-freedict-tur-deu-2.4.2
new file mode 100644
index 000000000000..7591ba3ce55c
--- /dev/null
+++ b/app-dicts/stardict-freedict-tur-deu-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Turkish to German
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-freedict-tur-deu-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=f51e28aa5de0950b52d3d606ed799a80
diff --git a/app-dicts/stardict-freedict-tur-deu/Manifest b/app-dicts/stardict-freedict-tur-deu/Manifest
deleted file mode 100644
index 150e4d338284..000000000000
--- a/app-dicts/stardict-freedict-tur-deu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-freedict-tur-deu-2.4.2.tar.bz2 15723 BLAKE2B 07f70625a95f0a1ad39071e5707abf2246f7f570a9a277a2b9721dc6e28201a331394693852c638b640d9fd0849d8626cf6575766c7603830746cc5251321cad SHA512 013927aa3588a3c4384c331b8ccaf9752521aa68d3e6a2a133eebcd440312664f00727e822c28c76deaf5bbda4017c10f33d374a2ef8afad780dc3f1e7200c95
-EBUILD stardict-freedict-tur-deu-2.4.2.ebuild 288 BLAKE2B 53906d96537686fbd742598d10f8259f85814e7eba16bd8048d8d0d4745b8c0dc784892d1319d1c39bff819b01a2db76f849c4eef62723464e04c7ef461312a1 SHA512 d2942040a0c1f786070def31c789ef0014491723191deedaf946154890036449b17853d5dbb82ead506d40529d73f282d99eac15d2fcdf2576bb1ad6d7392b2b
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-tur-deu/metadata.xml b/app-dicts/stardict-freedict-tur-deu/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-tur-deu/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
deleted file mode 100644
index 953535140ddf..000000000000
--- a/app-dicts/stardict-freedict-tur-deu/stardict-freedict-tur-deu-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Turkish"
-TO_LANG="German"
-DICT_PREFIX="freedict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-freedict-tur-eng-2.4.2 b/app-dicts/stardict-freedict-tur-eng-2.4.2
new file mode 100644
index 000000000000..691fab4ed7f4
--- /dev/null
+++ b/app-dicts/stardict-freedict-tur-eng-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Turkish to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/freedict.de/
+IUSE=gzip
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-freedict-tur-eng-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=28b76e571bb294ed50495c332af0f2fa
diff --git a/app-dicts/stardict-freedict-tur-eng/Manifest b/app-dicts/stardict-freedict-tur-eng/Manifest
deleted file mode 100644
index d974cdd6b54a..000000000000
--- a/app-dicts/stardict-freedict-tur-eng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-freedict-tur-eng-2.4.2.tar.bz2 15434 BLAKE2B 51dcb3bcea56575ef4f6755a798b9374c62a28865166a9e6b8b0e956656322269bc0940f47c4f9e49d8d5337623127485d41ed70125e344880e9e25a59a7a20d SHA512 d064bc0554211ce68ec8c6667a363ee4d42f8b90bfbf4eb797be79ec2e8b1c1b55a96c144a45438d509d5414d9dced5a61e5ee440849329beac4eb5eb6dc8798
-EBUILD stardict-freedict-tur-eng-2.4.2.ebuild 289 BLAKE2B c4c8a9818446ba6fa4a8b5f9335daf806694f8142fd9f0428f4c42dbea8c516875c4a0c82fa9e2d51848e11cfe7c1794423d246a13422109b030d84cf29348e9 SHA512 9a11a22641a7eeab3c335699a998dfd5a8b17b14c8eb5892fbd63af3a9e736e65ac23a1f115a211209d41d8bc4a5a568e6325df56e74e0c6e55b1df04e845f55
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-freedict-tur-eng/metadata.xml b/app-dicts/stardict-freedict-tur-eng/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-freedict-tur-eng/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild b/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
deleted file mode 100644
index f602e94aecee..000000000000
--- a/app-dicts/stardict-freedict-tur-eng/stardict-freedict-tur-eng-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Turkish"
-TO_LANG="English"
-DICT_PREFIX="freedict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/freedict.de/"
-
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-jmdict-en-ja-2.4.2-r1 b/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
new file mode 100644
index 000000000000..6171580d17ab
--- /dev/null
+++ b/app-dicts/stardict-jmdict-en-ja-2.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Japanese
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/ja/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc sparc x86
+LICENSE=GDLS
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-en-ja-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=33f6c2ab21332eec3a8f44320baa7d2d
diff --git a/app-dicts/stardict-jmdict-en-ja/Manifest b/app-dicts/stardict-jmdict-en-ja/Manifest
deleted file mode 100644
index 93c202712803..000000000000
--- a/app-dicts/stardict-jmdict-en-ja/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-jmdict-en-ja-2.4.2.tar.bz2 2343208 BLAKE2B 132b890925f0741a18f42f61bb9faff7563180cf81e2dc6ddd0c8074cb47bf072875afd72d7b0db27a906e5db0fc1c92a958803c7d5f955153baee45414802b5 SHA512 1d1091ec5fe137cb5fc441ea7d14e573989f6a7fd63004be7a917a0de4ce75ca13d1b8ce08bf778bcedd4decf12cac7385454d6942fda2f1634bdd0f6a058877
-EBUILD stardict-jmdict-en-ja-2.4.2-r1.ebuild 350 BLAKE2B e482ca21b2d9163160f1d90fd2edec48b1ee248366cfdee01b566fd2e8f9e55deb5deeb4d5762a8651c95d5e67ca85db7d11da68bc6751291d44b0a8cb1a16cb SHA512 1d60bf9ed4e64663447620d61db67e8fd2001dcb377ed88e1583710a8782ff3fffe36c0c34b518094f149e59ebcc418582a6121063e253320d26b92b930a9e6d
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-jmdict-en-ja/metadata.xml b/app-dicts/stardict-jmdict-en-ja/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-jmdict-en-ja/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild b/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
deleted file mode 100644
index bc05e195f10f..000000000000
--- a/app-dicts/stardict-jmdict-en-ja/stardict-jmdict-en-ja-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Japanese"
-DICT_PREFIX="jmdict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/ja/"
-SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
-
-LICENSE="GDLS"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-jmdict-ja-en-2.4.2-r1 b/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
new file mode 100644
index 000000000000..562121f2b97a
--- /dev/null
+++ b/app-dicts/stardict-jmdict-ja-en-2.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Japanese to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/ja/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc sparc x86
+LICENSE=GDLS
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://download.huzheng.org/ja/stardict-jmdict-ja-en-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=ccfbbb2319155df05a1614fbba476927
diff --git a/app-dicts/stardict-jmdict-ja-en/Manifest b/app-dicts/stardict-jmdict-ja-en/Manifest
deleted file mode 100644
index c9f823cffbc0..000000000000
--- a/app-dicts/stardict-jmdict-ja-en/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-jmdict-ja-en-2.4.2.tar.bz2 4017230 BLAKE2B fa3e1b1d8526ec38edc09a0ae5350766db537e7929257d28290a08f2d7fe9d731dd7c6238e68ce1be988cd57cd582655ba291c425c0e30348660339a8b26330c SHA512 9a6c49cce6c22d58bfec64c2b7948a569890c6c357db5a2de5f87a8cafdbbde38d579a37142880daf278a7b200d8ceda64bb5a3af5e233381b5378064e7676d8
-EBUILD stardict-jmdict-ja-en-2.4.2-r1.ebuild 350 BLAKE2B a6286b33573a28afd400c19c28967d800855fe58cdd229189d6e0e1015560742e82633246365a9111ec9bbb444249577503006b81543cae704552ed745ee11e8 SHA512 6eade09b64529fbb2e5e423b20582cafb6b072de7b28c36133e989406eb74982554e90524248e0467d310c4d6c94798272ab47290c37e09faf7b2c967fbc6625
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-jmdict-ja-en/metadata.xml b/app-dicts/stardict-jmdict-ja-en/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-jmdict-ja-en/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild b/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
deleted file mode 100644
index 5f763f89377d..000000000000
--- a/app-dicts/stardict-jmdict-ja-en/stardict-jmdict-ja-en-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Japanese"
-TO_LANG="English"
-DICT_PREFIX="jmdict-"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/ja/"
-SRC_URI="http://download.huzheng.org/ja/${P}.tar.bz2"
-
-LICENSE="GDLS"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-langdao-en-zh-gb-2.4.2 b/app-dicts/stardict-langdao-en-zh-gb-2.4.2
new file mode 100644
index 000000000000..47d0b11910be
--- /dev/null
+++ b/app-dicts/stardict-langdao-en-zh-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-langdao-ec-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=c3e2cc94b07ed20a752793054ab8b650
diff --git a/app-dicts/stardict-langdao-en-zh-gb/Manifest b/app-dicts/stardict-langdao-en-zh-gb/Manifest
deleted file mode 100644
index 25965800719b..000000000000
--- a/app-dicts/stardict-langdao-en-zh-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-langdao-ec-gb-2.4.2.tar.bz2 8743872 BLAKE2B 1c2b0857e8022560ebca3513dfdb9de32bbac185ed5871d7cedd9b133364cfc484425101c9298b981f1a2991800ff1ba478e9fcf66394f3b18425203145b4df3 SHA512 0d108814f04a3a1e3947ccda09b5c89101d819a8fdfee16fcb1c8c8eacca0213adeb396f3237d66b461b9a262f0892e8209607e1a16594e957ccbd4960020a7c
-EBUILD stardict-langdao-en-zh-gb-2.4.2.ebuild 324 BLAKE2B af0d344157c1d7284520800669d6319ef581c705343e9401055b08e1315d10f0dbd9e059bbb0fad0a9e6c093608443a81827f7fb02923e15883658c122aa1cc2 SHA512 66a3a564c728f777e4fa3a9ef68ff892c06cf211d52ecc59253a50dcacc8da251704fdf583831ad89c2d91ca6358fc07f5a52af6c2e7433e10f16d8c05fcea3a
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
deleted file mode 100644
index e6f2b5a44eb0..000000000000
--- a/app-dicts/stardict-langdao-en-zh-gb/stardict-langdao-en-zh-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Simplified Chinese (GB)"
-DICT_PREFIX="langdao-ec-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-langdao-zh-en-gb-2.4.2 b/app-dicts/stardict-langdao-zh-en-gb-2.4.2
new file mode 100644
index 000000000000..7192f6e94475
--- /dev/null
+++ b/app-dicts/stardict-langdao-zh-en-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ~ppc sparc x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-langdao-ce-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=18bdce15e22fe4332c99a33150352653
diff --git a/app-dicts/stardict-langdao-zh-en-gb/Manifest b/app-dicts/stardict-langdao-zh-en-gb/Manifest
deleted file mode 100644
index dfa628018a99..000000000000
--- a/app-dicts/stardict-langdao-zh-en-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-langdao-ce-gb-2.4.2.tar.bz2 7345014 BLAKE2B 6ba9ee32c580bf57f16821b999535d8bf2d5fe12e1a48d7d11b31f9aedce75d732aae1181957ced5ee212e43f7e2f1d766908bffed1369c4f1c925f40c6d8fb3 SHA512 e72069732799f61d3ac4649febf859e7f32fe75453c2c275c4fa8948765823e8afb94494204dbe52c28d9f4c36e91e0fdb76b7be720f7de5ce17a1ac323500d6
-EBUILD stardict-langdao-zh-en-gb-2.4.2.ebuild 325 BLAKE2B d970bd3791f0c4c39cee7260e0dab2ccad092d9ae8368e794d11ab467a313445f64a2b94754653bd51d2c63682bb6206bbdec15fd4f01fe4800fef74b58b0f1d SHA512 05f70024a3607bed2a1d446cc94d45d53ae5aa28f56b979377006618b3ec6617dc28aa3e1665a75a7a5c49a289c57252c90f223e0de4451e2f99d8ea9377c10e
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
deleted file mode 100644
index 2f77e37e702c..000000000000
--- a/app-dicts/stardict-langdao-zh-en-gb/stardict-langdao-zh-en-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Simplified Chinese (GB)"
-TO_LANG="English"
-DICT_PREFIX="langdao-ce-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ~ppc sparc x86"
-IUSE=""
diff --git a/app-dicts/stardict-mova-smiley-2.4.2 b/app-dicts/stardict-mova-smiley-2.4.2
new file mode 100644
index 000000000000..898cbe2fecad
--- /dev/null
+++ b/app-dicts/stardict-mova-smiley-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary for Mova.org's Smiley Dictionary
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/mova.org/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-dictd_www.mova.org_smiley-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=d18fe45d53cce2c7dfde86e1b2840d31
diff --git a/app-dicts/stardict-mova-smiley/Manifest b/app-dicts/stardict-mova-smiley/Manifest
deleted file mode 100644
index a2ff602b2a4d..000000000000
--- a/app-dicts/stardict-mova-smiley/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-dictd_www.mova.org_smiley-2.4.2.tar.bz2 3625 BLAKE2B c1d467fe64bdb91a9478294e34a3b21b3aabf96657f268f4efbed99034e438b04e0e16ac9269a508451fa2b992e5feb9ecec50ad0bfd0d663ae2b0c853f5c019 SHA512 bb9900449affee53d7051ca8f247318fed4c97802051b3a2b78801780ac77d0f5bb21e6286feb9054f265d59f543eb80c49471918f2c1d323bfae350f37b89b2
-EBUILD stardict-mova-smiley-2.4.2.ebuild 329 BLAKE2B 8ccff5e840ad1fe86711e8c1cd8a74a96ed9a842fc24f950d5102c71a052fb1ecb614eff5a23ed22b167d80c8553a62a26ab8b9d9372c3a41595291e4872b241 SHA512 a4d0cac59e4e221f69ebba69e88553a897abe29d192e0bdb2f40866de5007721f72a583e26d3c67ea0261140d615c319e57733aabfe19eeeb43f23a819781308
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-mova-smiley/metadata.xml b/app-dicts/stardict-mova-smiley/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-mova-smiley/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild b/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
deleted file mode 100644
index 1ee09828d54f..000000000000
--- a/app-dicts/stardict-mova-smiley/stardict-mova-smiley-2.4.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DICT_PREFIX="dictd_www.mova.org_"
-
-inherit stardict
-
-DESCRIPTION="Stardict Dictionary for Mova.org's Smiley Dictionary"
-HOMEPAGE="http://download.huzheng.org/mova.org/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-oxford-en-zh-gb-2.4.2 b/app-dicts/stardict-oxford-en-zh-gb-2.4.2
new file mode 100644
index 000000000000..9e811cac243e
--- /dev/null
+++ b/app-dicts/stardict-oxford-en-zh-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-oxford-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=372a9e45f7f5fb494cdb0f4987c92768
diff --git a/app-dicts/stardict-oxford-en-zh-gb/Manifest b/app-dicts/stardict-oxford-en-zh-gb/Manifest
deleted file mode 100644
index 34c01dd7e044..000000000000
--- a/app-dicts/stardict-oxford-en-zh-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-oxford-gb-2.4.2.tar.bz2 7673526 BLAKE2B 9f4dadffd457e83b3244ca490ff7867975398f00b348aa1f2fab5918b9e9343de2a9d25a9e7db5031562a4523b918312de5695193adbb66e46f7a1d43f34cd0f SHA512 f5cdd87f6a90a714ec0d71a9883e504a8bc1113ff80ccec0c85cc8d862ca1048327822f2dabb163eafb1542b85e634c082c1fcf936ccb5459620e081f69f3e88
-EBUILD stardict-oxford-en-zh-gb-2.4.2.ebuild 330 BLAKE2B a9d61094b4a55439b32088ceb0a2d048b61fe5e2b9c1546fb0e7b9e9a93e728c252f83bd432dbb6987fc32310c0906a41f1979087e1085c826960af898abe63b SHA512 049e550df35eee7d51e2abb1f0dd027cc7e5a47ebdae5172b523e629bfe613b02661727a58be8e51801c87418b85259fab49158193722b7aa769b0afce1e333e
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
deleted file mode 100644
index 8c5a34b6ee37..000000000000
--- a/app-dicts/stardict-oxford-en-zh-gb/stardict-oxford-en-zh-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Simplified Chinese (GB)"
-DICT_PREFIX="oxford-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-eng-fra-2.4.2 b/app-dicts/stardict-quick-eng-fra-2.4.2
new file mode 100644
index 000000000000..3896575fd745
--- /dev/null
+++ b/app-dicts/stardict-quick-eng-fra-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to French
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/Quick/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-quick_eng-fra-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=0ca75e0bf35ddf10ec0b904d38afe88f
diff --git a/app-dicts/stardict-quick-eng-fra/Manifest b/app-dicts/stardict-quick-eng-fra/Manifest
deleted file mode 100644
index 7bae66aa5e04..000000000000
--- a/app-dicts/stardict-quick-eng-fra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-quick_eng-fra-2.4.2.tar.bz2 304397 BLAKE2B e0cd957240b27c3e04a6c5ea6a3736fe0772c7e34d0075f341ddf06d186cbda5f10ea0385e897451603d13d029b69f32e4ff954f21369fddf96d136a05a2b2e2 SHA512 148195c11de68df7e6a69015cc7d741d38b6afe9cea8e2fcf320d7b21e24c01ab9a856c9d1a87086274b35c00639db1eb9f16bf9e3730532f7d4a274bbe78606
-EBUILD stardict-quick-eng-fra-2.4.2.ebuild 283 BLAKE2B 894d6a443eae4aef9998e90c0f47c013ddfcd7e350aaaf7a88e529a49544e05398300a13892e43a01f65a70284af0009064d7aae986714ad649f83c933e11c8a SHA512 93f3b0fa3bf96b6b61a1fdf6dd4b68d18c99306d13c07c4b4896c9f06c483b55c690711f0c087d16e59d9ad8c59f7999a97a3c3e15941068f704b0a5d2db4e0e
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-quick-eng-fra/metadata.xml b/app-dicts/stardict-quick-eng-fra/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-quick-eng-fra/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-quick-eng-fra/stardict-quick-eng-fra-2.4.2.ebuild b/app-dicts/stardict-quick-eng-fra/stardict-quick-eng-fra-2.4.2.ebuild
deleted file mode 100644
index bb47ed6f0d4d..000000000000
--- a/app-dicts/stardict-quick-eng-fra/stardict-quick-eng-fra-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="French"
-DICT_PREFIX="quick_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/Quick/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-eng-jpn-2.4.2 b/app-dicts/stardict-quick-eng-jpn-2.4.2
new file mode 100644
index 000000000000..a608f9930ddf
--- /dev/null
+++ b/app-dicts/stardict-quick-eng-jpn-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Japanese Romaji
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/Quick/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-quick_eng-jpn-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=99fb02e4d891eecd33f3530466e444b1
diff --git a/app-dicts/stardict-quick-eng-jpn/Manifest b/app-dicts/stardict-quick-eng-jpn/Manifest
deleted file mode 100644
index 13fb1ef7bc3d..000000000000
--- a/app-dicts/stardict-quick-eng-jpn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-quick_eng-jpn-2.4.2.tar.bz2 792487 BLAKE2B f6d2e6b5b32e663c18f1984bb892aec5f9eba946bc2fac843b3577dbc338b2f18f2bff101cc5db236a7231a792cc24b978ec2ca46a58785b0fc4908c98de520f SHA512 82202a1741af52e8dd841e24e3b670165bd60780c31a3d97a9a62f82d94ab3e61b036b93405f938bf585b6356593c4678079e521616282ee5f626b92d0ece1f0
-EBUILD stardict-quick-eng-jpn-2.4.2.ebuild 292 BLAKE2B 95f88f73fc1ac1b5ed4b736bfbe8be0d18fdfa943ccd0aec7a57ada04003c7d454f35e688d59d966712e6ab9abdc91e9e9bf78dcbb140c4a2d318fd47ba74bb6 SHA512 bdedfd1c5084db962f0d0c8e93b31e66de416965f680e513b37c13d4b0621a01c025ff32da29eff8d4e0fb29e48d402e3a04ef8d6d728b1ae6f375697d099496
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-quick-eng-jpn/metadata.xml b/app-dicts/stardict-quick-eng-jpn/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-quick-eng-jpn/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild b/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
deleted file mode 100644
index 75e7279248f5..000000000000
--- a/app-dicts/stardict-quick-eng-jpn/stardict-quick-eng-jpn-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Japanese Romaji"
-DICT_PREFIX="quick_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/Quick/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-jpn-eng-2.4.2 b/app-dicts/stardict-quick-jpn-eng-2.4.2
new file mode 100644
index 000000000000..82d1bc988191
--- /dev/null
+++ b/app-dicts/stardict-quick-jpn-eng-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Japanese Romaji to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/Quick/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-quick_jpn-eng-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=d55e395f4c4fd1127f69723ec9f15f40
diff --git a/app-dicts/stardict-quick-jpn-eng/Manifest b/app-dicts/stardict-quick-jpn-eng/Manifest
deleted file mode 100644
index 3574c6be0bb1..000000000000
--- a/app-dicts/stardict-quick-jpn-eng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-quick_jpn-eng-2.4.2.tar.bz2 842456 BLAKE2B ed1cf7a875595cb8bd7b90c00784446b45a61f35af460543a3699cf38a5f1458c8099ddb169044edcc028a2265e627731159bb1e51fd3a83c7036ac168a88b67 SHA512 bc188995ea1d333b66e70f54fea73d31dd2a1f50c3d2eb3a11f3ae785a2d136fbbc1f8656ff5c2206cd6ec2bebbfb7779765afacf9ae4a9761ef6d0761743c0c
-EBUILD stardict-quick-jpn-eng-2.4.2.ebuild 292 BLAKE2B 5a541f59971dc32c1f37df2c1b2e20f2ee84d7b0ab1867bc823ca6f57986dbada8e6bd0619737f82dc64d6187a5bbf7789428522490bb5208d3513dbee0f29b1 SHA512 8a3180a10fd5b267edded64e5197a851c36bc9e5e9786f487977464a6d5ca9bc3770ec755728e1e4bec96b99b1d40b9989e4fffa156aafbbd85e80f1d96095e4
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-quick-jpn-eng/metadata.xml b/app-dicts/stardict-quick-jpn-eng/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-quick-jpn-eng/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild b/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
deleted file mode 100644
index 77fd2960e98b..000000000000
--- a/app-dicts/stardict-quick-jpn-eng/stardict-quick-jpn-eng-2.4.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Japanese Romaji"
-TO_LANG="English"
-DICT_PREFIX="quick_"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/Quick/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-quick-ru-en-2.4.2 b/app-dicts/stardict-quick-ru-en-2.4.2
new file mode 100644
index 000000000000..1210c0a9be8b
--- /dev/null
+++ b/app-dicts/stardict-quick-ru-en-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Quick but still useful Russian to English dictionary
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/Quick/
+IUSE=gzip
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-quick_rus-eng-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=b2e29d5eb386fd36c4ca5263ec4c10e1
diff --git a/app-dicts/stardict-quick-ru-en/Manifest b/app-dicts/stardict-quick-ru-en/Manifest
deleted file mode 100644
index fda577feb9f4..000000000000
--- a/app-dicts/stardict-quick-ru-en/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-quick_rus-eng-2.4.2.tar.bz2 320743 BLAKE2B ef94437159ccd615e9e5a2d519f347eeb505039042b5714a6b53cc55544ba8996a8ad500709d41cbdcbffcdfd50e247b53a26606fcdd0a4b354a45826c7bb1cd SHA512 a9f2e7c94b888ce1bcb58d34de00fa66e160873048d6144adb56aaf45fcf361cd10ef35376a02560eef12466c18d7acce4e45c5872cb949e8ff9f3743e899169
-EBUILD stardict-quick-ru-en-2.4.2.ebuild 359 BLAKE2B ed54bc06f9111a4ad28626ba92702f7844b7f54670e2e1186356abfb6e29789f094ef308c886f634b887a6852dbdb2bd06d9bec795c96664a6c19cf9db0a12fe SHA512 85e4cde6c5111327cb571d7c93616eae415810bb40f19eb7d866f928dc2ac28222ef767f5131e6e309be62d718e8f0533a4cab51bf68b1d5630aa1fc08ddc1d3
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-quick-ru-en/metadata.xml b/app-dicts/stardict-quick-ru-en/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-quick-ru-en/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild b/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
deleted file mode 100644
index 366d6427604e..000000000000
--- a/app-dicts/stardict-quick-ru-en/stardict-quick-ru-en-2.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Russian"
-TO_LANG="English"
-DICT_PREFIX=""
-DICT_SUFFIX="quick_rus-eng"
-
-inherit stardict
-
-DESCRIPTION="Quick but still useful Russian to English dictionary"
-HOMEPAGE="http://download.huzheng.org/Quick/"
-
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-en-zh-big5-2.4.2 b/app-dicts/stardict-xdict-en-zh-big5-2.4.2
new file mode 100644
index 000000000000..7f9576da7341
--- /dev/null
+++ b/app-dicts/stardict-xdict-en-zh-big5-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Traditional Chinese (BIG5)
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_TW/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ec-big5-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=5e2212480e9344a1926cd757033668d2
diff --git a/app-dicts/stardict-xdict-en-zh-big5/Manifest b/app-dicts/stardict-xdict-en-zh-big5/Manifest
deleted file mode 100644
index a5522805b3e3..000000000000
--- a/app-dicts/stardict-xdict-en-zh-big5/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-xdict-ec-big5-2.4.2.tar.bz2 3565145 BLAKE2B 5dbaa6be1e1d284f6be2a6e38bd011596227abaca86b1c4b7fbaf7f879c5f32b21592c4ed2283a1a0ec46fbf1f328eadee39fe9c76ee99307aa3cf4593c2be34 SHA512 bb8cde597cdc197bd71d28795396d57c5504551f2811ace7c9c1d7b62105c95b49218a39c70a1e412129fcb4956f626a08d19768be0fa1e73f445d2cec8f2f84
-EBUILD stardict-xdict-en-zh-big5-2.4.2.ebuild 325 BLAKE2B dedf2033a13ed3407d802c19924d3092b2bc5c363e74bbc83ab2157c9c3fc7070b99fcfe00510fdb0c6583b8bb7d82e42342ee98530f130f11df37d763afda29 SHA512 9efafa7aeadaecf0764525e5da3b9b1134739251dc2bf398a797f50adcdf5688ef1cc0eaef40ca147fc0579403093de538278c9d6a5e21a90287c269625b00d8
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild b/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
deleted file mode 100644
index 85a5238eed1a..000000000000
--- a/app-dicts/stardict-xdict-en-zh-big5/stardict-xdict-en-zh-big5-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Traditional Chinese (BIG5)"
-DICT_PREFIX="xdict-ec-"
-DICT_SUFFIX="big5"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_TW/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-en-zh-gb-2.4.2 b/app-dicts/stardict-xdict-en-zh-gb-2.4.2
new file mode 100644
index 000000000000..fbaae4139478
--- /dev/null
+++ b/app-dicts/stardict-xdict-en-zh-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary English to Simplified Chinese (GB)
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ec-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=b51389cda9fb30da817a05aea7a8c32a
diff --git a/app-dicts/stardict-xdict-en-zh-gb/Manifest b/app-dicts/stardict-xdict-en-zh-gb/Manifest
deleted file mode 100644
index 03f3f27624ec..000000000000
--- a/app-dicts/stardict-xdict-en-zh-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-xdict-ec-gb-2.4.2.tar.bz2 3588346 BLAKE2B 28cfd8e614379a0cdbc3d31ce79401402b163621ce399667b772b3cb556bbeb1d7d6b0928a6ed74117768ef1531768da8e805d4e7f6d7f4540785700ed282951 SHA512 df868e9e48e093b172a49690a831ad492957a39748cc4f59615b995b39473a511c7a7d09a16af0062a3a525312c0650c673ee1cb1378e321f0a95733b76312bc
-EBUILD stardict-xdict-en-zh-gb-2.4.2.ebuild 325 BLAKE2B 4cc553e3f68f1f6a07c3695f2e9597fe8710f2d6f21bea2bd16de2de6348511a74e1c5d72cec9558051f0c6e9641171b79bd3845aedb485e799031c4b662570c SHA512 1c1782fe020223dc34f3d9fed59e6000febca513fe0ab2b545ef055d7e31f46728e94b01f17bc1d30cf87564581c9c6fcf5ad1b1e6996bb48f926e864c54d256
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild b/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
deleted file mode 100644
index b18cc42b001c..000000000000
--- a/app-dicts/stardict-xdict-en-zh-gb/stardict-xdict-en-zh-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="English"
-TO_LANG="Simplified Chinese (GB)"
-DICT_PREFIX="xdict-ec-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-zh-en-big5-2.4.2 b/app-dicts/stardict-xdict-zh-en-big5-2.4.2
new file mode 100644
index 000000000000..f64ae09baf92
--- /dev/null
+++ b/app-dicts/stardict-xdict-zh-en-big5-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Traditional Chinese (BIG5) to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_TW/
+IUSE=gzip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ce-big5-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=83156da90f3c820263f32bdd3c3a6110
diff --git a/app-dicts/stardict-xdict-zh-en-big5/Manifest b/app-dicts/stardict-xdict-zh-en-big5/Manifest
deleted file mode 100644
index 4a8b945da2ca..000000000000
--- a/app-dicts/stardict-xdict-zh-en-big5/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-xdict-ce-big5-2.4.2.tar.bz2 2397897 BLAKE2B 09b0b515553316ce57f99bf44489084c16f0315a191302ba374da2e9b2d5396afc41700e21bdd9f58a6e4d6ebecf6cb9b73be3d61dfe3a733ab6343a098c8a36 SHA512 d07fe8af3597f99696c98d90676ecc035aa1b2c4dc33160b4f347f93342b4dbbc3f9bf20b737d6502770ebb048e557508bea5cf0c516759093372b0111d1384a
-EBUILD stardict-xdict-zh-en-big5-2.4.2.ebuild 325 BLAKE2B df411f396235aac760fb0af6db8b3d484cdefef32864a1158533e262430cba3a75d4427d899c8adcec89f2f11cd27a695f86671a97a698512cfc326c7bd15958 SHA512 fd8887b6ef7194a8bf3c77e404e81d0fd4cac27edc2900a57470f9b20a1bf96ceeec85659cf11c38b1a5fbc343b6da9d3c1508bc822ee9784cf0228f76e96568
-MISC metadata.xml 423 BLAKE2B d88ef7607a56f49f17a9f3c7d61bb5b127a86df908f08695a27db85c5ddb960e3c48e93754945075c0f6a10b8380936b5707489eae31885e2331da6ae01d9574 SHA512 22ef931c364f0f1d613e8da3329f3f59ec769f252f14b0ba79dd9028f39c1291098748939bcd3c8c969b48511b2299d42bcb29dc9fce832eb8002a827e24c497
diff --git a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
deleted file mode 100644
index 4c29f0c11103..000000000000
--- a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild b/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
deleted file mode 100644
index c7287d103d7a..000000000000
--- a/app-dicts/stardict-xdict-zh-en-big5/stardict-xdict-zh-en-big5-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Traditional Chinese (BIG5)"
-TO_LANG="English"
-DICT_PREFIX="xdict-ce-"
-DICT_SUFFIX="big5"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_TW/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/stardict-xdict-zh-en-gb-2.4.2 b/app-dicts/stardict-xdict-zh-en-gb-2.4.2
new file mode 100644
index 000000000000..375e621cd515
--- /dev/null
+++ b/app-dicts/stardict-xdict-zh-en-gb-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=|| ( >=app-text/stardict-2.4.2 app-text/sdcv app-text/goldendict ) gzip? ( app-arch/gzip app-text/dictd )
+DESCRIPTION=Stardict Dictionary Simplified Chinese (GB) to English
+EAPI=6
+HOMEPAGE=http://download.huzheng.org/zh_CN/
+IUSE=gzip
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/stardict/stardict-xdict-ce-gb-2.4.2.tar.bz2
+_eclasses_=stardict 8d4771fbbd2a9aee09ef8040f10f28b3
+_md5_=6baacac9abf61b87ac91bf5050376e4e
diff --git a/app-dicts/stardict-xdict-zh-en-gb/Manifest b/app-dicts/stardict-xdict-zh-en-gb/Manifest
deleted file mode 100644
index 0fe645b54891..000000000000
--- a/app-dicts/stardict-xdict-zh-en-gb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardict-xdict-ce-gb-2.4.2.tar.bz2 2438365 BLAKE2B cd612c5c95023352c1bdf47d0a8a059f02c0b2c9dc47b3a7bbb046dbcabece80a80626f95d487798d982ae50d72a566178691dc1727eb1cc4e3b0d79b41b0317 SHA512 3b1b2cdf0bb69371c73a50930e2ba48cc04e8a6b7326a80417f12eac79792c40c0b4276a0ec696e26c43e6615b89f0f8abbc30320f71160c7902283be96eebe6
-EBUILD stardict-xdict-zh-en-gb-2.4.2.ebuild 325 BLAKE2B d99a9f480c5aedf2165a6877233a4ec129ccb38580de446b37dd747113930b1e3f6590ed4b3acd6995ac17f182ceb959aeccfd564f147d8ebcaf3e1214f97816 SHA512 91afbd5ab5fd550f3d0dd21c9dfbc3096cf45a76e952b5df2db2235b07683b291cd6dee2543aac5002d4e18e52f6914e6c78f56545652caedfc0cffc0959ae2d
-MISC metadata.xml 328 BLAKE2B f31c18a4ea28f902ec6e23ef096d6fe04f29429c62582426918626eb831f293c7d165f95c029e55a4d0454f569b074fdae3d5608f649a86366dd0c157245e7d5 SHA512 bf0673513244990efd597d4ec173db38edd6bcb7fb96acba9c759872b726c531efa94c61c4db034f90e09c9d3ba8e0e05333a85b2a94e11159650aa000f1c84f
diff --git a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
deleted file mode 100644
index a0f6c0a35827..000000000000
--- a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">stardict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild b/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
deleted file mode 100644
index ec50d69ea794..000000000000
--- a/app-dicts/stardict-xdict-zh-en-gb/stardict-xdict-zh-en-gb-2.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FROM_LANG="Simplified Chinese (GB)"
-TO_LANG="English"
-DICT_PREFIX="xdict-ce-"
-DICT_SUFFIX="gb"
-
-inherit stardict
-
-HOMEPAGE="http://download.huzheng.org/zh_CN/"
-
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
diff --git a/app-dicts/sword-ab-1.3 b/app-dicts/sword-ab-1.3
new file mode 100644
index 000000000000..18aa6fa9b564
--- /dev/null
+++ b/app-dicts/sword-ab-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Apostle's Bible
+EAPI=6
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=AB
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/AB-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=29468c206ccd7bcbc233435c4dad7a69
diff --git a/app-dicts/sword-ab/Manifest b/app-dicts/sword-ab/Manifest
deleted file mode 100644
index 94c1ad6215f1..000000000000
--- a/app-dicts/sword-ab/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AB-1.3.zip 1203602 BLAKE2B 632fcb2ebd5385ad1f6b5c172d209c02ad50fbc2b9416bf663adeaf05638cd7a3701221c279b3a9d372dcf9924d6a1c7fdaab5a3c006c6fae2fe93cf5b74c5b9 SHA512 3c8c3485c4648f8c46f264d5e28ee1bbecf7654a1c1f146518ae82051ded56928eabc0578f8ab9cd45becfd89e5d4497be545187a00b6dac6de5eb45e8b540ab
-EBUILD sword-ab-1.3.ebuild 317 BLAKE2B 6fe0a5a03e032a2e4fc51578aa1f49d8e10dbfc74fd5291f2f6785ff64aa7b6b63f36a2c7487fa1d3f20042d65513e3b6f72ca8048b13668af118e89641c9d26 SHA512 413b9c23f4ef74104aa9435eba80f0e99f961825fb1f5332a466c25fbd195ccc86a956eb200a790d53bf6f413c13730b8fd30e3a94fd099a5ad2557c26b7c11d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ab/metadata.xml b/app-dicts/sword-ab/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-ab/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-ab/sword-ab-1.3.ebuild b/app-dicts/sword-ab/sword-ab-1.3.ebuild
deleted file mode 100644
index 9e3721d96e9d..000000000000
--- a/app-dicts/sword-ab/sword-ab-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SWORD_MODULE="AB"
-
-inherit sword-module
-
-DESCRIPTION="The Apostle's Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AB"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-abbott-1.1 b/app-dicts/sword-abbott-1.1
new file mode 100644
index 000000000000..d85c2a702d73
--- /dev/null
+++ b/app-dicts/sword-abbott-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Illustrated New Testament
+EAPI=6
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Abbott-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=fba54edb657b88ad691df71b5a9d5d20
diff --git a/app-dicts/sword-abbott/Manifest b/app-dicts/sword-abbott/Manifest
deleted file mode 100644
index 74d757953ede..000000000000
--- a/app-dicts/sword-abbott/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Abbott-1.1.zip 435868 BLAKE2B 905e0a08b27a28f2de227738a3c2b48818c39cc4b5115c48ffaacdd817435ebd003cd71c0e011d18437a8a87277c2d352a4e344474b5b66de1d19133b975b9a4 SHA512 999fa69c552296140c6bb4309848b61c53e7cd96543b07d13b43bdf7250b55f33363961105058378fb4979a52e928fe2c1e0e6ff7655839fda0cd1fbc2a12fae
-EBUILD sword-abbott-1.1.ebuild 336 BLAKE2B 8abdbb4f11012a980ea10aa9df37c8cd036ea3c592e0a84da901c739072f31fa9cdac8d7117ad9d936b2aaa6a55df99821ef3336b459c4f03a99baf4f81e86b9 SHA512 f3e03c3b4a970a6546586be6115b0f37050c73e610fd8218c55f1a76f6f48113a4d3067548be0098b48a08dbcf5fa30fe5df316dcefa9073a70311eded5a7df3
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-abbott/metadata.xml b/app-dicts/sword-abbott/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-abbott/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild b/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
deleted file mode 100644
index 2cf857b5b306..000000000000
--- a/app-dicts/sword-abbott/sword-abbott-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SWORD_MODULE="Abbott"
-
-inherit sword-module
-
-DESCRIPTION="Illustrated New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Abbott"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-abs_essay_goodsam_swb-1.0 b/app-dicts/sword-abs_essay_goodsam_swb-1.0
new file mode 100644
index 000000000000..bfa876659b2e
--- /dev/null
+++ b/app-dicts/sword-abs_essay_goodsam_swb-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Essays on The Good Samaritan: Violence on the Road, Social World of Bandits
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ABS_Essay_GoodSam_SWB-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=10c8db104713e112775448d736131bc3
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/Manifest b/app-dicts/sword-abs_essay_goodsam_swb/Manifest
deleted file mode 100644
index 00ad0692d644..000000000000
--- a/app-dicts/sword-abs_essay_goodsam_swb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ABS_Essay_GoodSam_SWB-1.0.zip 9496 BLAKE2B 467ea43797c3aec9f7130b26bca1e3a7ec354c0dcafc66f6bdc34bd1f3a02b22f2acf954ae5a4e71bb19418d26766ddd401f073ec461a092404178317b7b195f SHA512 02489c6202b07da34ed6c503d8753f72f98e6d267d793f2506ae1d607223d5d1309d24c2c3d634cfdd8ab70611bd57323330aa103c956975309d8ab96851ae80
-EBUILD sword-abs_essay_goodsam_swb-1.0.ebuild 416 BLAKE2B 989f73f09e875184135222d9c66e02a2d11aa5a5c74b7efa714f3428ac75388a8920f7201845ebbe6bfd8a8ee919273483aba56f458fef33ec0481bdcf200ac7 SHA512 4366d99b786e87bfe456d019337ead0c69ad6eb5a8ee13e96c7176f2b41995830a52202991f52b86c4914f4f520d217927ef8d43ffc584b2838028f3a2570665
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml b/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-abs_essay_goodsam_swb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild b/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
deleted file mode 100644
index 6f3b8b21a939..000000000000
--- a/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SWORD_MODULE="ABS_Essay_GoodSam_SWB"
-
-inherit sword-module
-
-DESCRIPTION="Essays on The Good Samaritan: Violence on the Road, Social World of Bandits"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-acv-2.0 b/app-dicts/sword-acv-2.0
new file mode 100644
index 000000000000..7fe63cdf36ca
--- /dev/null
+++ b/app-dicts/sword-acv-2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=A Conservative Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ACV-2.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3af82e36bb702e00909b0c37ac2be55a
diff --git a/app-dicts/sword-acv/Manifest b/app-dicts/sword-acv/Manifest
deleted file mode 100644
index de3ccfb909e1..000000000000
--- a/app-dicts/sword-acv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ACV-2.0.zip 1396326 BLAKE2B 0aaf48548d4b6f7597b1d5339183d47ac35711a875dde8c42aeefe9345a2b7c19efa5ae58422f1feac93e98c521f4c4f09331f70f0e3d8f07b30fbb2c0ddf8a9 SHA512 913597446f8efda893bc27267a17c9de393d4dc6b6d865abc2d8c99f5b20f4bfc0b1107cd7d81a03c3c192bd8166ec5135d3e5eb9bfaf76998bc797eddf70dca
-EBUILD sword-acv-2.0.ebuild 326 BLAKE2B 0c7e170d40b44f83b3944107867c69d3ea47f02316a2e8aee384a423097895aa998573b291ce19084b41781145a988d3097f7ca59b1a69f0cae39654fce091f2 SHA512 f59b994865cfbdc9ccfc4f9412248675261009832af843a444743fa2e636e1a8eeee796920371c7ec5b2043bf6241efa14c759a2fec27c5dc07c428b4243a497
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-acv/metadata.xml b/app-dicts/sword-acv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-acv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-acv/sword-acv-2.0.ebuild b/app-dicts/sword-acv/sword-acv-2.0.ebuild
deleted file mode 100644
index 81afb0950738..000000000000
--- a/app-dicts/sword-acv/sword-acv-2.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ACV"
-
-inherit sword-module
-
-DESCRIPTION="A Conservative Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ACV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-afr1953-1.2 b/app-dicts/sword-afr1953-1.2
new file mode 100644
index 000000000000..c41b676d5d1e
--- /dev/null
+++ b/app-dicts/sword-afr1953-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Afrikaans Bybel
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Afr1953-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a1403fd3583604eabe3f38d23ae508c6
diff --git a/app-dicts/sword-afr1953/Manifest b/app-dicts/sword-afr1953/Manifest
deleted file mode 100644
index 91939315120e..000000000000
--- a/app-dicts/sword-afr1953/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Afr1953-1.2.zip 1447644 BLAKE2B fd740c4cb374c4a60fffc2ce478823a0d716d5db94bb3a14c0fa99367b9316ebd0402b64e40f70d0acff94e0fe7d36e851f348940ca8d2222d2e52ea1de6268c SHA512 fa41822db6a05728d676fbe6bf5d0a81ba3863ac07aaf1c5dd535df025783cb5d6ce8f32924027110dedf41f16e7dfaea5004f49936ede472697645b87caffb3
-EBUILD sword-afr1953-1.2.ebuild 322 BLAKE2B 4062f4a483c2601f8cbbd0de9bfffbc9a9b9c2fbaf7f64c5864bae812194035f92194421bb2a982bc04960d19871152d7a68a5126ae3297bf3b42d2cb9bae308 SHA512 29c827ed490887b2b71fc82b16b78df5bb6d9566a4a4a0d4acc3393b79d646a32c37c90bb5640d6c03928706a7476a1cbbdabe32f84f3a410d5bba9d1049d45c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-afr1953/metadata.xml b/app-dicts/sword-afr1953/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-afr1953/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild b/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
deleted file mode 100644
index cd7c4ef19434..000000000000
--- a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Afr1953"
-
-inherit sword-module
-
-DESCRIPTION="Afrikaans Bybel"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-akjv-1.4 b/app-dicts/sword-akjv-1.4
new file mode 100644
index 000000000000..330408739275
--- /dev/null
+++ b/app-dicts/sword-akjv-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=American King James Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/AKJV-1.4.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=6e8349d824d8d044236014d4a6f8f30c
diff --git a/app-dicts/sword-akjv/Manifest b/app-dicts/sword-akjv/Manifest
deleted file mode 100644
index da63c758dbd0..000000000000
--- a/app-dicts/sword-akjv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AKJV-1.4.zip 1402903 BLAKE2B 726e61e4fd3b9eace74627c5dfbd38424b0472e127c3ec762b6cd3f587bccfbd690330245b3a8b2ca12cdc47c9ccdaf6fc5d710bab9ff963d9fd9c5b3e641580 SHA512 6f9ac42e6b768d356520384dd063f4deef409e15380e7b17c94e0870717c4b37881e17b4fe5eef62a55b71092fd37507a4f0b3a42149757756896b3fb021612c
-EBUILD sword-akjv-1.4.ebuild 333 BLAKE2B f9c511834e533cf4d1808aeea2fd191d417707aab10ca574b2bcf543924be828725694ae822e703128a0a9e909bfc7b96991cc32b95aef9c6e81c59b970b0655 SHA512 e388e738f2269650217df208f0b43f8bc335301dd8952069e3f1d19795ba02796abde6fe1874d5fa4bcfffe2bbdeb1b5bfe375518f2d6369e098b68dcc21ba9d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-akjv/metadata.xml b/app-dicts/sword-akjv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-akjv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-akjv/sword-akjv-1.4.ebuild b/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
deleted file mode 100644
index c757428466ec..000000000000
--- a/app-dicts/sword-akjv/sword-akjv-1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="AKJV"
-
-inherit sword-module
-
-DESCRIPTION="American King James Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AKJV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-alb-1.2 b/app-dicts/sword-alb-1.2
new file mode 100644
index 000000000000..bd0da1be46a5
--- /dev/null
+++ b/app-dicts/sword-alb-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Albanian Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Alb-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e49975541ed25432e3e1e83253109bea
diff --git a/app-dicts/sword-alb/Manifest b/app-dicts/sword-alb/Manifest
deleted file mode 100644
index 8b016a623d69..000000000000
--- a/app-dicts/sword-alb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Alb-1.2.zip 1544025 BLAKE2B ea32989c2b6ee560891a248327bca8ba01d2db772cab085574a95c894c7c9c0eae8ba5d6b5917fce0a9c24e32fe5c0b87096a4219a0eebf8152976b7da4d130e SHA512 49cb89bf807cdacc006e66089be9ec74746f007c2143d3efe44d34b1d9d56bf8f2657f1fff1cef512430ca7fbf2fddadb5346b666756b54fcdd871b550915977
-EBUILD sword-alb-1.2.ebuild 313 BLAKE2B 29ecb40cdb847eda0cc5b769c1e103ae6182c59bd4849f4d7d8d364afcc480736e030fd6b6113f34e68626215223d2d6e7920e37d43679284fb41abb952be01a SHA512 8a396259df8109b3845d8d16d80c3c813e49925dea06116d7466c08898fa62c9311e796a3462d406bf340748720bfa6fe518093d77470c02ff44e7520efdb333
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-alb/metadata.xml b/app-dicts/sword-alb/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-alb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-alb/sword-alb-1.2.ebuild b/app-dicts/sword-alb/sword-alb-1.2.ebuild
deleted file mode 100644
index 1259bf6fb718..000000000000
--- a/app-dicts/sword-alb/sword-alb-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Alb"
-
-inherit sword-module
-
-DESCRIPTION="Albanian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-aleppo-1.1 b/app-dicts/sword-aleppo-1.1
new file mode 100644
index 000000000000..4154e86a3118
--- /dev/null
+++ b/app-dicts/sword-aleppo-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Aleppo Codex
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Aleppo-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=122abda691feaf1589e10600d8a68b12
diff --git a/app-dicts/sword-aleppo/Manifest b/app-dicts/sword-aleppo/Manifest
deleted file mode 100644
index 45dc7153144e..000000000000
--- a/app-dicts/sword-aleppo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Aleppo-1.1.zip 868170 BLAKE2B 133eb51afd1c7038e6d08969106fb1cff3b0210cd7470bc7c3b03593f2a561025db9af3259c94fae078429df0188763f3f0349c9a0d31473e8743cbb7f6cc491 SHA512 566cd9d7e533cd6653f39f2965c1750c9096db98ef9dbb151882f0f60396d60cd3f01e60f84a6c5b25d6af34f7d7d255cc6dfd9bb53223a542dd7d71704c9b08
-EBUILD sword-aleppo-1.1.ebuild 317 BLAKE2B e9b742756ad89c01d8354c027063cacdf8591a2fb956ef9af45d4fb566fab0ec233c91ff755eccbfb865d2621c9c3a7b91123be6dfd6177b64ce237f32853d66 SHA512 1123336352a72ae306ea83e412fe6e054f6d7186e08fd7c8d5eb318ec2e373b76809e6fb6678fcbd5ba48f8ec2058c8f3bc02e5981fd171a64767b9a3d5a1dc0
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-aleppo/metadata.xml b/app-dicts/sword-aleppo/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-aleppo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild b/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
deleted file mode 100644
index 79ed21790437..000000000000
--- a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Aleppo"
-
-inherit sword-module
-
-DESCRIPTION="Aleppo Codex"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-amtract-1.1 b/app-dicts/sword-amtract-1.1
new file mode 100644
index 000000000000..9ffb0bc05148
--- /dev/null
+++ b/app-dicts/sword-amtract-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=American Tract Society Bible Dictionary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/AmTract-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=257c9570c2e131302509a175756ce0b1
diff --git a/app-dicts/sword-amtract/Manifest b/app-dicts/sword-amtract/Manifest
deleted file mode 100644
index ecc198f8f36c..000000000000
--- a/app-dicts/sword-amtract/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AmTract-1.1.zip 758636 BLAKE2B 51ee5834e2082cf9b904e67add17b6547060084a8bf8817143e11f5c0567d99344259ff3c578d6252cbd61bbb2fc1e01210e4fa4d267de627845ad6e3382ff92 SHA512 5575030e76ec32261da220618dbf157213e0b7c630479b2d9966d9eb992f863b777bd38e3ef3502c01cd62fa84df85a7b0e35a4854e2366cb4aa088425602641
-EBUILD sword-amtract-1.1.ebuild 351 BLAKE2B b1ccf8cd968d2c06778eee11a26a63c63c5eb857fb9459562952db2d9d0e53d23ef9aabbf634ba259117bf2c06ffd34b0ac7c0b487ca692c25363c020dd3fa48 SHA512 de438cb7adf2d162bb0c990b3380306d2b9c1e49d595b10d162ccb085591fccdcd6be0149ce7f2f3d3629141ed1622a254e3ee7eea3229d369b5111228b012c7
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-amtract/metadata.xml b/app-dicts/sword-amtract/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-amtract/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-amtract/sword-amtract-1.1.ebuild b/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
deleted file mode 100644
index 044a5333b85b..000000000000
--- a/app-dicts/sword-amtract/sword-amtract-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="AmTract"
-
-inherit sword-module
-
-DESCRIPTION="American Tract Society Bible Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AmTract"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-arasvd-1.1 b/app-dicts/sword-arasvd-1.1
new file mode 100644
index 000000000000..5f66aee0f744
--- /dev/null
+++ b/app-dicts/sword-arasvd-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/AraSVD-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=adc51f714b3ca8e9278127c37c1a72dc
diff --git a/app-dicts/sword-arasvd/Manifest b/app-dicts/sword-arasvd/Manifest
deleted file mode 100644
index d662d924b7a8..000000000000
--- a/app-dicts/sword-arasvd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AraSVD-1.1.zip 1306354 BLAKE2B 571e38b2003243be7c72d9acee84bc550f87e21fa2c8e131596557774f2d2fe842ec695d778cf771507d83749f0a6cab7f0f8e9515429749076b8ef07816ef66 SHA512 928371a99b7d543a512b3adb3af70788ccdfddb174fd0a3267a0e724623658c3c04b15ef9e91389c5b9d21e0f34b1f1584234390a7bc74c90ee14625b711d250
-EBUILD sword-arasvd-1.1.ebuild 361 BLAKE2B 943904c87df38fa76f9dcce8140678f9edfa4763714faaecb7284f48773a651286d5c8c364def3c3b6ed95954dc49d5cc73492d83d8d5f9063a7ea8a62145b95 SHA512 460b785796a362542b3765f67b77566c0f6d386cb4c0b03b5281fef63abf216438be9e1c11f9724457dd2677e10ea81f63f5e9e58b9713a55aa1fba09dff8f89
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-arasvd/metadata.xml b/app-dicts/sword-arasvd/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-arasvd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild b/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
deleted file mode 100644
index c7ae38dba4b8..000000000000
--- a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="AraSVD"
-
-inherit sword-module
-
-DESCRIPTION="Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-armeastern-1.1 b/app-dicts/sword-armeastern-1.1
new file mode 100644
index 000000000000..00b674963c29
--- /dev/null
+++ b/app-dicts/sword-armeastern-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Eastern Armenian Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ArmEastern-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=37cc1dee182b827a8858fd39d9885496
diff --git a/app-dicts/sword-armeastern/Manifest b/app-dicts/sword-armeastern/Manifest
deleted file mode 100644
index 88e7567dfde3..000000000000
--- a/app-dicts/sword-armeastern/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ArmEastern-1.1.zip 334965 BLAKE2B b193bfa9f3f3472f1fd390c3aba61f7299d5d1dcc1a70eb5f88b4eae3bff68adca7302cfb1834c6fb8b95086e38651faa512f085201ad56f486e2cc71738ab4a SHA512 fb481aae1c58e5a4327afdac3f8134678f4e55488dfafa2976d2f77960c742bc371d86575a3d14ce703dae65523392d854baf1c48f186b8dad22e4e6088db860
-EBUILD sword-armeastern-1.1.ebuild 335 BLAKE2B 20079ad3f25d12ebbe6482f502509b806272a6bfc1edc43b41d41fb2d4d3bfc7af2257b7e04cd206f204bc7d5a94684265c168dfcadce6337b117e6de0863a47 SHA512 8f20534dc990095cbc19b1bcf5c5c4077eff465080b6b80be410b828a8b12920c6f0708840bfe8e0d579dda7bf3c84debac9d9675b5b3a7028fdf7ecf4045b9e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-armeastern/metadata.xml b/app-dicts/sword-armeastern/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-armeastern/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild b/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
deleted file mode 100644
index d2d5d9f3958b..000000000000
--- a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ArmEastern"
-
-inherit sword-module
-
-DESCRIPTION="Eastern Armenian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-armwestern-1.1 b/app-dicts/sword-armwestern-1.1
new file mode 100644
index 000000000000..d56ec7580c13
--- /dev/null
+++ b/app-dicts/sword-armwestern-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=1853 Western Armenian NT
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ArmWestern-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e386b947aec2f699860dca5189e56060
diff --git a/app-dicts/sword-armwestern/Manifest b/app-dicts/sword-armwestern/Manifest
deleted file mode 100644
index 16f6f625d0f3..000000000000
--- a/app-dicts/sword-armwestern/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ArmWestern-1.1.zip 428727 BLAKE2B c10066c0da1692b2b009f3b2e28c2445cbc949edb8c8c46c732a916118e5373f4070ec042b9c6db3911db2856d4b431fb15893dfc22fdc565d3a6c08259b984a SHA512 85fc4ba42c10da39103096afde9226ea206e52e69510ef3643acf54721233724c04e8185e32bd9663f62a33c8f1b70dc2a6d123f63f0679604aa58122db1fe46
-EBUILD sword-armwestern-1.1.ebuild 337 BLAKE2B 36ec6b0d5b6c6bbe6e9bf326bf90751796bf8e9c8744ac09e26d92a38231466c54fd761522e7c2dbca1342fe49759a66c2a6f2a27f4958f1b75a3f8d0164fdc8 SHA512 3a3d3a2e7e2744662a54a6c8fe7e4280ffb2b15f9c9f782eddeedef8e20740b1313211606fe076cfee726fef0532003bec42b42f8bd5e25e61b4a39431fa2a5d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-armwestern/metadata.xml b/app-dicts/sword-armwestern/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-armwestern/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild b/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
deleted file mode 100644
index 0318f09455ba..000000000000
--- a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ArmWestern"
-
-inherit sword-module
-
-DESCRIPTION="1853 Western Armenian NT"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-asv-1.3 b/app-dicts/sword-asv-1.3
new file mode 100644
index 000000000000..d6b902891095
--- /dev/null
+++ b/app-dicts/sword-asv-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=American Standard Version (1901)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ASV-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e2cadc1543310be95dfbdabf3ca3b623
diff --git a/app-dicts/sword-asv/Manifest b/app-dicts/sword-asv/Manifest
deleted file mode 100644
index 2cd588d52af8..000000000000
--- a/app-dicts/sword-asv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ASV-1.3.zip 1579461 BLAKE2B 9c0564aa98936f6b0b44f5ef75af23da0a64f50430832ed707ad6e076e5f463bb14afaae93933cc66933289c8388c336ec01a79562ec4e6ca0105042e2b0de42 SHA512 3f1275dd4e95e61f5f2d0da7721a1ab2efd66f2bf8b72a34365a187b6a467be64a006f6769b5e562be7aa6499ab7c41954ffa90976ec81687de5d8e485d43bf9
-EBUILD sword-asv-1.3.ebuild 336 BLAKE2B d5e7987338c5924098d9813c650029b5163044b20cbac6b715c5dc0e3d7acb7f5c641be2197204157d32498757d250676a863b8b1ff19f4fb684432f6fb658e8 SHA512 01967dc5192153912325ae07fa9845b52da0a8483533ad3e99cb5e3ea359074507b52fea69b89bde963a33e8bd93b31aa064607499b9e6549e9a06daca2207b1
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-asv/metadata.xml b/app-dicts/sword-asv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-asv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-asv/sword-asv-1.3.ebuild b/app-dicts/sword-asv/sword-asv-1.3.ebuild
deleted file mode 100644
index 0f3abbdaae23..000000000000
--- a/app-dicts/sword-asv/sword-asv-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ASV"
-
-inherit sword-module
-
-DESCRIPTION="American Standard Version (1901)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-barnes-1.1 b/app-dicts/sword-barnes-1.1
new file mode 100644
index 000000000000..cd00bd2dc9ee
--- /dev/null
+++ b/app-dicts/sword-barnes-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Barnes' New Testament Notes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Barnes-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=46a87db42d9e60950166fe85c97ceb8d
diff --git a/app-dicts/sword-barnes/Manifest b/app-dicts/sword-barnes/Manifest
deleted file mode 100644
index ccf991fbac93..000000000000
--- a/app-dicts/sword-barnes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Barnes-1.1.zip 5812838 BLAKE2B d3fce355f092035d389552e3269c6de0ef90cd0a1f14d009c0291efdb1041f9826f086a4afa9e6ff40a7aac6246a30535e3ea74421516c68fda0351c08fc6606 SHA512 5b63b6bcfc8cbd2513cb79c0a77d61cad7f963184eeabc7d1beb9036aeae4c60d91c109e4632c1b54bd8acf84bbff8d5160d12ae29d618c2eb17b249d4d567d3
-EBUILD sword-barnes-1.1.ebuild 337 BLAKE2B 7d082e81f34e92a34d1db89f9f61a9a907faa92766cee0fe6250bb15051c122b0820ac91a08314d3056d08165836f5c474e5e182c6a6ef6bc5f83adcef3fb663 SHA512 335f39cdfad6939c6bec6c8652b2d54a16b302ef16c6afc0e8eda19a084c911929878c206c4f510ae264a3c97a8c3c82614490d095d857a9260d1c270a9bbc90
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-barnes/metadata.xml b/app-dicts/sword-barnes/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-barnes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-barnes/sword-barnes-1.1.ebuild b/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
deleted file mode 100644
index d7052bd12088..000000000000
--- a/app-dicts/sword-barnes/sword-barnes-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Barnes"
-
-inherit sword-module
-
-DESCRIPTION="Barnes' New Testament Notes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Barnes"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-bashautin-1.5 b/app-dicts/sword-bashautin-1.5
new file mode 100644
index 000000000000..cd673bfc7953
--- /dev/null
+++ b/app-dicts/sword-bashautin-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=1571 Navarro-Labourdin Basque NT
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/BasHautin-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=50978fa9055371329a0b059c3281d8f0
diff --git a/app-dicts/sword-bashautin/Manifest b/app-dicts/sword-bashautin/Manifest
deleted file mode 100644
index 2ba69099fb5d..000000000000
--- a/app-dicts/sword-bashautin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BasHautin-1.5.zip 426714 BLAKE2B 8248a2e8ed16f8eda784a590584bb1516bfcc4f24172b2cdf05a5464efd46f064cc5469dd01f5b879c39d9f534d190b82edc64f77c6204e402b0372057497cd0 SHA512 a0266465dfc0c945398075cea549fd17601ee8d38f4d319b035c6a8425e1222c4e6cca46ccc52d6769c368eb4aaa592cea4ba2b60279e2ebeb64c8f4b834e5ff
-EBUILD sword-bashautin-1.5.ebuild 343 BLAKE2B ea39f5641976114c9e1913621cd368d0a3db5c794e466583fc50bda631b3b0d19942caf7fee03f7067fdf0dc7e4e146dcb794dcf4f278d310036aa8bb7e07078 SHA512 a78cdbceb3059cf42bb1e36d834ae59c5f4de4d0b56caa7f3c79b8b6f16c25337331d3f37b3a1b3babc616cd9150620fe8fc9b660c829e93704fe6cecdc86e49
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bashautin/metadata.xml b/app-dicts/sword-bashautin/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-bashautin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild b/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
deleted file mode 100644
index e2d53bcd0a34..000000000000
--- a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="BasHautin"
-
-inherit sword-module
-
-DESCRIPTION="1571 Navarro-Labourdin Basque NT"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-bbe-1.3 b/app-dicts/sword-bbe-1.3
new file mode 100644
index 000000000000..8d6402db94d0
--- /dev/null
+++ b/app-dicts/sword-bbe-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Bible in Basic English (1949/1964)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/BBE-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=eb0209feb651837b35b4eb43437655af
diff --git a/app-dicts/sword-bbe/Manifest b/app-dicts/sword-bbe/Manifest
deleted file mode 100644
index 4e8de4e90c47..000000000000
--- a/app-dicts/sword-bbe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BBE-1.3.zip 1391875 BLAKE2B cb7eeffa00a47160fe929cfff000d942cd9062bd0bce26a928a9b7330ea2d18a3a3436c036b5b8f65f0a17eeb052e34ec10d5429b4f058aaf109c3b20a58ec19 SHA512 9df323ea99b5b116937c22e1ae5b2b863220c52a7d488096968d63dd8b937a99a60691462f5604f3d22133058ce5744bf227d35421501362791043f520f34b3b
-EBUILD sword-bbe-1.3.ebuild 338 BLAKE2B 49bf580c8dc228bc8d9d516ebe259070a9994a11cad12c45d626b652ed62ca19094d6012e3f777579294fd467cd502138cb5037e2d2750b5232975f370aed955 SHA512 49ce9c2ed027750d3c67e811e820b4616ed0c854f619787b8b85b594370ef1c9a028cb69b8ceec6d1ae194dba949134c946b951c2e5306ba3e6e4fbea7878924
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bbe/metadata.xml b/app-dicts/sword-bbe/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-bbe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-bbe/sword-bbe-1.3.ebuild b/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
deleted file mode 100644
index 00406c2cfb99..000000000000
--- a/app-dicts/sword-bbe/sword-bbe-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="BBE"
-
-inherit sword-module
-
-DESCRIPTION="Bible in Basic English (1949/1964)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BBE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-br_en-1.1 b/app-dicts/sword-br_en-1.1
new file mode 100644
index 000000000000..54d31babcaf7
--- /dev/null
+++ b/app-dicts/sword-br_en-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Breton to English Glossary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/br_en-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=dc7caa67dabcd6caf14a216597aa350a
diff --git a/app-dicts/sword-br_en/Manifest b/app-dicts/sword-br_en/Manifest
deleted file mode 100644
index 819af349f7bb..000000000000
--- a/app-dicts/sword-br_en/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST br_en-1.1.zip 7001 BLAKE2B 12221b0721a6130f064775da5349fca06a07f0177e29a446759d9e6f19b6f0c5718b2dd8b96ae798d03b38f84c35178b0422497b3e8417050332d3e60f5d66fc SHA512 8f0ae9d5a34c081bea90517fd6754e219ce5368fe2afcb6ed33040aff815042c8cd53d536eb4edea38ed0444de7f8fded9fe5f43036a1dd0149ef8258255ac8c
-EBUILD sword-br_en-1.1.ebuild 334 BLAKE2B 6bb029ed1b25f4ea41ee269402a0e6fd69dcaa0c692a7f8e0c36977230fc8677c82ecf2db593ec712e5d50d4eee8e4f3f64e2a44b4624168b6d89f85a6649a96 SHA512 441eee05218cabdbb4d444d220f99573606dc3a523046122a447e3cd1b26407456cedbfb00b92ceeccdf08aac91a0903c8250b2fad3587f5647cdc1144e8c4ab
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-br_en/metadata.xml b/app-dicts/sword-br_en/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-br_en/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
deleted file mode 100644
index cb6440a5d742..000000000000
--- a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="br_en"
-
-inherit sword-module
-
-DESCRIPTION="Breton to English Glossary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-bulcarigradnt-1.0 b/app-dicts/sword-bulcarigradnt-1.0
new file mode 100644
index 000000000000..aef56ba2a384
--- /dev/null
+++ b/app-dicts/sword-bulcarigradnt-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Bulgarian New Testament from 1914, known as 'Tsarigrad Edition'
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulCarigradNT
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/BulCarigradNT-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=c59a7de02477c2adf1234e7fe678b911
diff --git a/app-dicts/sword-bulcarigradnt/Manifest b/app-dicts/sword-bulcarigradnt/Manifest
deleted file mode 100644
index 0823339c0550..000000000000
--- a/app-dicts/sword-bulcarigradnt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BulCarigradNT-1.0.zip 455451 BLAKE2B 48d2dda299b34cd3fd9e7c46b764776c8d5e2049811cf341a2279fe55a234f07ec41ac4e0bb21e31646c5f4801fda655845c2fccc44faa13219050dff2fc99db SHA512 78aceed97c425d4dc10ac13c4f1a7fbc4d3bddc63dcc56a35b0be50e455637bb330cfdf723bb353cbeb0988bef73c6bc982712154091d553cc66473834e1939a
-EBUILD sword-bulcarigradnt-1.0.ebuild 382 BLAKE2B f3f8080e8da628abaa5b5de78ec58cf750afedfc8fdf40587c2a64096e6422cbc6c39b6788f26fcd43015893b6d3549e6bc5ac356abb581459b0c3b3f9cc0f5c SHA512 a0836a082ec6cffdbe9d0aeff29e2ad3a5f61d47b3d71a57256aa325ec852707ed93ebb522413462f929cd616be54288240b3879b68bb3dfcdf8603c86528b45
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bulcarigradnt/metadata.xml b/app-dicts/sword-bulcarigradnt/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-bulcarigradnt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild b/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
deleted file mode 100644
index 4de3b8f15cf0..000000000000
--- a/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="BulCarigradNT"
-
-inherit sword-module
-
-DESCRIPTION="Bulgarian New Testament from 1914, known as 'Tsarigrad Edition'"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulCarigradNT"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-bulveren-1.0 b/app-dicts/sword-bulveren-1.0
new file mode 100644
index 000000000000..1750be331ebd
--- /dev/null
+++ b/app-dicts/sword-bulveren-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Veren's Contemporary Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/BulVeren-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=4d78f2a75cd90375fbfe11c11fd9c614
diff --git a/app-dicts/sword-bulveren/Manifest b/app-dicts/sword-bulveren/Manifest
deleted file mode 100644
index 926c2cb62897..000000000000
--- a/app-dicts/sword-bulveren/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BulVeren-1.0.zip 1827256 BLAKE2B c376e621ae066f3e29ffbfb1f9645e7e6ddd45b915cc38a4bd453f9200915bff4703fa2e3e8d241a0bd10441c9411bedeea6c9fb2c64ca4cc657c3d36ece850c SHA512 87f7499a27c155e9e4717849d26cf394ccb1f19943e8d7c8ba224ed8a3681a773bb38e6bfab7912138d451126f02626b46ea2265d810ca459110557aecf9518f
-EBUILD sword-bulveren-1.0.ebuild 335 BLAKE2B 4bfed76dcd83b215ec8cac171a62fb650b565cbc9231144438c520d3b94b7df09b8cdece0a4495451667578e4b679a1bc7ffc40e90f0a8088c99032e273b1a3b SHA512 e9cecab0a1aacdcf80a02b4b9525d3ab46d7dd9c40b79327caa3f91d19105eca9a82b56f6b435d355e5278feacc9ddf21b10e23a9255ccc731bcc5d5307e4a8a
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bulveren/metadata.xml b/app-dicts/sword-bulveren/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-bulveren/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild b/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
deleted file mode 100644
index 40f18028dbc6..000000000000
--- a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="BulVeren"
-
-inherit sword-module
-
-DESCRIPTION="Veren's Contemporary Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-burjudson-1.1 b/app-dicts/sword-burjudson-1.1
new file mode 100644
index 000000000000..aa424c997b57
--- /dev/null
+++ b/app-dicts/sword-burjudson-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=1835 Judson Burmese Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/BurJudson-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=50cd4c42aa500044c3fadc200a4e9d1a
diff --git a/app-dicts/sword-burjudson/Manifest b/app-dicts/sword-burjudson/Manifest
deleted file mode 100644
index eeb1040013fd..000000000000
--- a/app-dicts/sword-burjudson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BurJudson-1.1.zip 1990168 BLAKE2B f2073a2bdf41df690c5224a25ce8d2ce86bc1a896b5355de8bb1a7486bb0f06c807e23ebf04da16ff734c1a0f4a31e214740b4e3ce5fff31f6253dc0df7b7ca3 SHA512 49e3d9fcf0d12ed5923f81c4fd5d6e0c34b066d992ac9944617fb8dfc734e493f78a60d18966b86557b9477c5d5d5fde17699b5b1bcc8d0ed8dfad20677fdcae
-EBUILD sword-burjudson-1.1.ebuild 336 BLAKE2B 9b905cf1a4900835619453423f72acc81270ccfaab338f796af9029748965dc7eef7dc6339e441c598c3d59e19a02de6d4d7542bc278eef9e9b66d32213c81ac SHA512 b41f9e7a7bc5a0d2be61ef8a4cd057cc870dd150851b7787d707efe7a5ae438ff078a64f68674780fe92196d1c203ae16805548418ea83739f067e9ea9efeb3f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-burjudson/metadata.xml b/app-dicts/sword-burjudson/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-burjudson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild b/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
deleted file mode 100644
index a5e6e13259c1..000000000000
--- a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="BurJudson"
-
-inherit sword-module
-
-DESCRIPTION="1835 Judson Burmese Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-bwe-1.0 b/app-dicts/sword-bwe-1.0
new file mode 100644
index 000000000000..b6ef4b53a5a4
--- /dev/null
+++ b/app-dicts/sword-bwe-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Bible in Worldwide English
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/BWE-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7e60ea7cc422f4001590f969bc31c228
diff --git a/app-dicts/sword-bwe/Manifest b/app-dicts/sword-bwe/Manifest
deleted file mode 100644
index 6b3969cc71b1..000000000000
--- a/app-dicts/sword-bwe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BWE-1.0.zip 368050 BLAKE2B 81e7509e137186dac9680f6a8801baf25439484342f0932b47138991155bc3393c852526047c336c93362d4a5af998b7fdbb402929c95a2a2a1a91fe716cc70b SHA512 80b1122b837e8d987378ceed402b145ab859d979fba25e6017d414a1f3f6ad20562d903a676c5883b0465518b7ab4813aa7a0b546a32ee30590d82d68e78f2ff
-EBUILD sword-bwe-1.0.ebuild 325 BLAKE2B 1d9e262e906002923b00f61f8a41e8f420beeca16ef2b875c254974a5822c9875e55b8a42e387efdfe7e2501abecd275511a2f56a3e6f4e3fe14725ad4d2e702 SHA512 64d9149d1710234fd2f1a2e169ada88177736ed41b03f7248bbaa045512d41f778a361d174fee5deb70902105c514b75b15aff43c7a753737336954e14487a2f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bwe/metadata.xml b/app-dicts/sword-bwe/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-bwe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-bwe/sword-bwe-1.0.ebuild b/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
deleted file mode 100644
index bb8db4d983a2..000000000000
--- a/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="BWE"
-
-inherit sword-module
-
-DESCRIPTION="Bible in Worldwide English"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-byz-1.10 b/app-dicts/sword-byz-1.10
new file mode 100644
index 000000000000..458ca050f4c9
--- /dev/null
+++ b/app-dicts/sword-byz-1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Byzantine/Majority Text (2000)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Byz-1.10.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1e52210cd1008897de341954d9292881
diff --git a/app-dicts/sword-byz/Manifest b/app-dicts/sword-byz/Manifest
deleted file mode 100644
index 5b3bea909b2e..000000000000
--- a/app-dicts/sword-byz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Byz-1.10.zip 1263944 BLAKE2B ba0985666992db19bdac5d7960686d6ffd06fdc37d1444b5949e073e45d25dcf1f99ede807a9f5e9ed02fde7d412a9f06835557d8ca7a2097f83df5cdd5a082c SHA512 e47ed94aa465932191903f8199ab119ca6075807cf2c693c04cfecf27b2b128d3f757c57929151e16f8e014ffcb8ef303702642b8863100fd49e6a54120a3727
-EBUILD sword-byz-1.10.ebuild 329 BLAKE2B ee47b586baebfa64de795123f6856ef0aaaf890dbbabfaf92bf3ef663f4c91317862899da48460b5bb32b47911baa67a321619896b37251eb76a966db27db91a SHA512 390e3e148c23dc79c4f784943a05b7fcb29a8bc239a46f702d2a4569cf016ca968bf8839f3c6a44351ff6a5cd2e1f23003f13a993f69584b7b0d8b96d7bb5466
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-byz/metadata.xml b/app-dicts/sword-byz/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-byz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-byz/sword-byz-1.10.ebuild b/app-dicts/sword-byz/sword-byz-1.10.ebuild
deleted file mode 100644
index fbe57abfa51a..000000000000
--- a/app-dicts/sword-byz/sword-byz-1.10.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Byz"
-
-inherit sword-module
-
-DESCRIPTION="Byzantine/Majority Text (2000)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-cbc-1.1 b/app-dicts/sword-cbc-1.1
new file mode 100644
index 000000000000..ccdee1314946
--- /dev/null
+++ b/app-dicts/sword-cbc-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Condensed Biblical Cyclopedia
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/CBC-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=40f9ae638990022fc55cfcd6aaae2bd7
diff --git a/app-dicts/sword-cbc/Manifest b/app-dicts/sword-cbc/Manifest
deleted file mode 100644
index e370162995d8..000000000000
--- a/app-dicts/sword-cbc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CBC-1.1.zip 133815 BLAKE2B 8c281751fdc2c4d82713c0e03c7c24127f81f378802b3c01ed4d715b6b180d4053cf1e8710c405012d2b4d2ac5044dd4fed1fd6834e99483b5748decd2fde512 SHA512 3990ca230a0d700e24b2639ab7fa4c97ccc6a382eb810f48c8c6334424384ae91bf97a299c00ba041db8daa82f5481c89cb425d34d84dd4fb298dc29e3f50b78
-EBUILD sword-cbc-1.1.ebuild 333 BLAKE2B 5ec94f1642408f9092a7b4099cdaeebd205bf85d5c2d58d254cf540fb3d7e5d654fb1e2b4d34e550d7080def8b1bb9addddedda2217d904fd382ced2c16e089a SHA512 0adb484bb0ab7bc08d7f9168512736314a2f39e39a38d243b34628621d94488557d7c6e9a493984127b91a2567c14d738ff7bcd2e437db67460b7c1b33c70d2e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-cbc/metadata.xml b/app-dicts/sword-cbc/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-cbc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-cbc/sword-cbc-1.1.ebuild b/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
deleted file mode 100644
index afa14e92d4b4..000000000000
--- a/app-dicts/sword-cbc/sword-cbc-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="CBC"
-
-inherit sword-module
-
-DESCRIPTION="Condensed Biblical Cyclopedia"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CBC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-chamorro-2.7 b/app-dicts/sword-chamorro-2.7
new file mode 100644
index 000000000000..e43a10123496
--- /dev/null
+++ b/app-dicts/sword-chamorro-2.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Chamorro: Y Santa Biblia
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Chamorro-2.7.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1a5c94d75f03151e8d3a56ed3f794078
diff --git a/app-dicts/sword-chamorro/Manifest b/app-dicts/sword-chamorro/Manifest
deleted file mode 100644
index 82c08131ff5b..000000000000
--- a/app-dicts/sword-chamorro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Chamorro-2.7.zip 287951 BLAKE2B e493f8f1de66b78b5be96855256e36a10e9c51d75cd01412622ed18e2cec15306676c38051571abe7c3f129f233e01b0f4876ba742641addcbe58673e0593b55 SHA512 98aa82f8986b3010b4543dd86ed95902b4ab4a83397f3f1dc8fce5fdf069ef0a20259a3b52b35c08028293aa2a81b8087ce1f3ec38e3f8f08d1ca74d06bd48c6
-EBUILD sword-chamorro-2.7.ebuild 333 BLAKE2B 52a75889cd59ff6a84213ba24f78b65c318f98d51b46f3f4372c344d61682d356d6486d8ff480fe74baedea3ba6c963a663232264373afadbfeba4aab0b475e6 SHA512 98b47cdc6b9f822e38174d5d7887dfa2d768eca9b98a7b6e792623045014ad42ec95d30adfd9b6757e2f66d23f7494cd66129a25078abf1aac72dad5e422d736
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chamorro/metadata.xml b/app-dicts/sword-chamorro/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-chamorro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild b/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
deleted file mode 100644
index 658e6a064342..000000000000
--- a/app-dicts/sword-chamorro/sword-chamorro-2.7.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Chamorro"
-
-inherit sword-module
-
-DESCRIPTION="Chamorro: Y Santa Biblia"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Chamorro"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-chincvs-1.0 b/app-dicts/sword-chincvs-1.0
new file mode 100644
index 000000000000..d9c97438b6e4
--- /dev/null
+++ b/app-dicts/sword-chincvs-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=New Chinese Version Simplified
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ChiNCVs-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e1b20107d63847c897e98e50c7d18fe4
diff --git a/app-dicts/sword-chincvs/Manifest b/app-dicts/sword-chincvs/Manifest
deleted file mode 100644
index 0f16d270a1b6..000000000000
--- a/app-dicts/sword-chincvs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ChiNCVs-1.0.zip 1481069 BLAKE2B d42704b900f65aa805a49218b3cd27cbca4e72ce1885f5cad2f139542e0dea6d7671670e419baff054aa84f6a268d1e1f7dc44744619de604d2516b7af2584c7 SHA512 1cdeaaea9cb475ac73f5e6104f2baed09a3e7c003bd8e471f025eaab98dea30400cdb1619bb51db1c7065a192dcbe86fe99cda8145c9ff770f321273f24d4d2f
-EBUILD sword-chincvs-1.0.ebuild 337 BLAKE2B 49c37edc5ac6778862c0f7c335e376f9bda29ca7dc7e36d024c4b1ac96fc57c4a2c3f5976243444375cb92d5942a2c03b0934cc721c8d69dfad1fc38fbed41e3 SHA512 5029fc7fd3bd7f4952b0772e853d089e6eb2c46f6b2a8f7a20a02089ad68be655a7468383c3bb37696ea1e73d35a2f4a84db955d984b6a7ca84f8a896bbf3b78
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chincvs/metadata.xml b/app-dicts/sword-chincvs/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-chincvs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild b/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
deleted file mode 100644
index 0d2b23af8643..000000000000
--- a/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ChiNCVs"
-
-inherit sword-module
-
-DESCRIPTION="New Chinese Version Simplified"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-chincvt-1.0 b/app-dicts/sword-chincvt-1.0
new file mode 100644
index 000000000000..16d97058ca9d
--- /dev/null
+++ b/app-dicts/sword-chincvt-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=New Chinese Version Traditional
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ChiNCVt-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1bcd844167f9366505658e9b1d274b13
diff --git a/app-dicts/sword-chincvt/Manifest b/app-dicts/sword-chincvt/Manifest
deleted file mode 100644
index 881b93a32379..000000000000
--- a/app-dicts/sword-chincvt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ChiNCVt-1.0.zip 1481302 BLAKE2B 3e1c1892a38ca0ddfc4aed197993bc48d2c49e43bf59903f9e0a1780f0a22d3d12ef368a3987c940f389a0af83f4a3d2b760842ecd1c9e19acf78e18f5727121 SHA512 32e320c251e36b9cda9fa9a698d9de146ea0696e4d5bf6f9ed49239e59129aec92318bfa02b9d70112488bc6a2a0a6901cb68c329cb39021daee78f82318cf69
-EBUILD sword-chincvt-1.0.ebuild 338 BLAKE2B 9f6f1f3b9952c2c605b8694f96c1b74cda7911593bde50ff91328adbe33bb10337ff247d242dcc192568ad69f64cf7542de38dc7299ec21f282c18b9c3a1f5d3 SHA512 a6f0cb57a8b66567d170dc7a228543a301c831434ae15db4b2977af199bb6d30a6da5ef05d1219d4093375f0d3eeefa26853cc3d8319dfc9ee3e87857f6925db
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chincvt/metadata.xml b/app-dicts/sword-chincvt/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-chincvt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild b/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
deleted file mode 100644
index f3792e3beb56..000000000000
--- a/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ChiNCVt"
-
-inherit sword-module
-
-DESCRIPTION="New Chinese Version Traditional"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-chiun-2.0 b/app-dicts/sword-chiun-2.0
new file mode 100644
index 000000000000..920a29e87acb
--- /dev/null
+++ b/app-dicts/sword-chiun-2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Chinese Union Version Traditional
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ChiUn-2.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=6a86491b4a9783e241ef245024359692
diff --git a/app-dicts/sword-chiun/Manifest b/app-dicts/sword-chiun/Manifest
deleted file mode 100644
index 269d13e12ff7..000000000000
--- a/app-dicts/sword-chiun/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ChiUn-2.0.zip 2244478 BLAKE2B 09fa738e82b8b3845a830cc1798be749a05490bbe3b3e3936d073f15089e5b0c6b9568c56b03b3878ba2458109f5d38ecc0de40fd78dad2cd86d797467fca16d SHA512 ab8f0b04eda087b8589ef1ccd3c843ccd66ba4f96faa31e71b129ac010e3aedcf12bab387d2dce991c88ee78f11b5ca5525c6f458ea15bee48f12059926dbd7e
-EBUILD sword-chiun-2.0.ebuild 336 BLAKE2B 84fa3e9f774f24739a4994e845365749e484c41a531f552ce7c501918dd533b6e13f097401affd99f2a7e970e3be7105383bdc48c822ce998f977a985c545b6b SHA512 47e90a00142da5bb63c34c057acb3a3b81eb956d9ddb58fb72034e50b58114b76d92cb1fb2dd23380c01a646f6e94767f461b1f002123fb21f8690bd8d1b8922
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chiun/metadata.xml b/app-dicts/sword-chiun/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-chiun/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-chiun/sword-chiun-2.0.ebuild b/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
deleted file mode 100644
index f748e5e692e4..000000000000
--- a/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ChiUn"
-
-inherit sword-module
-
-DESCRIPTION="Chinese Union Version Traditional"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-chiuns-2.0 b/app-dicts/sword-chiuns-2.0
new file mode 100644
index 000000000000..a06b82910de6
--- /dev/null
+++ b/app-dicts/sword-chiuns-2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Chinese Union Version Simplified
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ChiUns-2.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=57662af2040229a65a4ff81c94199609
diff --git a/app-dicts/sword-chiuns/Manifest b/app-dicts/sword-chiuns/Manifest
deleted file mode 100644
index 65e3777e2656..000000000000
--- a/app-dicts/sword-chiuns/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ChiUns-2.0.zip 2241348 BLAKE2B fb9133899c38d552185a492f081f99d959082359020419e8e6292e6d9f9930678363790e3aa23bb474ca6044a2fbf522e9f3e5ea253bcab1d8cd509f34786e45 SHA512 ed11e0006ca6aed353a4691d1ba37885db4953dbc5593a9d41159136a3e55711e1da65536d3b9e9718b0c661b46fb058f4eaf1419168d3b6bfa0d716564192d0
-EBUILD sword-chiuns-2.0.ebuild 337 BLAKE2B 4e2b310d8e4750b5f3d7440622a25c06e00d0f277a735a79c064fcf0eb44554e62e86c835a336c34ec347b5b03d898b86e528f18009b0dc87ce0cfa6982ae69d SHA512 94e08deb746386511597640988cceea01218c30e22f93552e3a9be60b450623134759896bdbe899415fa926cee33d45573328eb8ec133a899193c7d25c032adb
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chiuns/metadata.xml b/app-dicts/sword-chiuns/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-chiuns/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild b/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
deleted file mode 100644
index 7af863e99d4a..000000000000
--- a/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ChiUns"
-
-inherit sword-module
-
-DESCRIPTION="Chinese Union Version Simplified"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-clarke-1.0 b/app-dicts/sword-clarke-1.0
new file mode 100644
index 000000000000..fa4285cea3c6
--- /dev/null
+++ b/app-dicts/sword-clarke-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Adam Clarke's Commentary on the Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Clarke-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=556fa9427efd268d794641d461aa62f3
diff --git a/app-dicts/sword-clarke/Manifest b/app-dicts/sword-clarke/Manifest
deleted file mode 100644
index 593c2f8b5047..000000000000
--- a/app-dicts/sword-clarke/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Clarke-1.0.zip 9722167 BLAKE2B 2b07fe56d1d188c79d7f4f04707f8ec57f4e062ce3f5822e04e9df7d1cbd1c1aa2803bbcfc83e6b9625ca8e351c9690fb8a78cde4600aea066db72d1e732698b SHA512 f383e897a16a3c2b68d62145a2952cfee1b0fdfea8848d7973ab5b453aaa4706beaaae9ac457bbd512cd8c45a7514b312563b408a238447e6f69d16f8664c849
-EBUILD sword-clarke-1.0.ebuild 347 BLAKE2B f1b927bd7c1de74a5373acbe93857a86c909912b8b3c28070c399ce9af9141bba047ed4f49b2389b5d2f213dd10ee3d80d8af71f114a2faa9ab6f64d236a5599 SHA512 f9e8977ddecbd81ea2f960252794d46542542c6261211e0ce174eeec277a1651afc3748da5edeb26f6e6f8ed9dc66ecc703430d8ea7444f6cd593bd8d19c3017
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-clarke/metadata.xml b/app-dicts/sword-clarke/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-clarke/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-clarke/sword-clarke-1.0.ebuild b/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
deleted file mode 100644
index cc0db3bc0d31..000000000000
--- a/app-dicts/sword-clarke/sword-clarke-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Clarke"
-
-inherit sword-module
-
-DESCRIPTION="Adam Clarke's Commentary on the Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Clarke"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-common-1.3 b/app-dicts/sword-common-1.3
new file mode 100644
index 000000000000..11e607ec8e9e
--- /dev/null
+++ b/app-dicts/sword-common-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Common Edition: New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Common
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Common-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a3914da91b6cc2377264bf4178695ab4
diff --git a/app-dicts/sword-common/Manifest b/app-dicts/sword-common/Manifest
deleted file mode 100644
index e5f66b479f75..000000000000
--- a/app-dicts/sword-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Common-1.3.zip 357456 BLAKE2B f96fc2ae120775c90d3b9fb7347fdf99770cce37fc8561f494c2b2d7da614a88c09f807d4b24a8f2e81645eb967660e2251e38bd5978ce1d660dc77d2b165e84 SHA512 b92d4c346883ca45d703208c5e3b70390a6a012e5d62fadc3fe937dd00b90e56eac4b0d7f845c008054d2ca3f7fafa12e90742b774633d0c0f951eed09960cc7
-EBUILD sword-common-1.3.ebuild 342 BLAKE2B 92fdf705091fe1f24daf17a1d9fe6f8423e1aafd9ca1d1073e96aec06e9ccd81103d1eea86d63e2cb578608eb4ffa3abab84bdabe31fe5d4e48c05f19bd7ade0 SHA512 822901bf69efb112bd4e431453119200a37beb01d834da3679ae4a9fc6b74485c602ec1a1581391951b1e098661eb4025f88fdd3080a3c21dc7d7a36646b9646
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-common/metadata.xml b/app-dicts/sword-common/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-common/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-common/sword-common-1.3.ebuild b/app-dicts/sword-common/sword-common-1.3.ebuild
deleted file mode 100644
index 262dcf423203..000000000000
--- a/app-dicts/sword-common/sword-common-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Common"
-
-inherit sword-module
-
-DESCRIPTION="The Common Edition: New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Common"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-cro-1.0 b/app-dicts/sword-cro-1.0
new file mode 100644
index 000000000000..632cfd59e5ad
--- /dev/null
+++ b/app-dicts/sword-cro-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Croatian Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Cro
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Cro-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=676c0f75e7edea3e6c2c1459a4bb68dd
diff --git a/app-dicts/sword-cro/Manifest b/app-dicts/sword-cro/Manifest
deleted file mode 100644
index 54045548a339..000000000000
--- a/app-dicts/sword-cro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Cro-1.0.zip 1466438 BLAKE2B 09b11d4369474f55bad69ef40fee11b902995f8d08af21cf1ec03c79045e5070ecc9f2e03d9fd68573490d64b191c70b3aece05f16f449c1d88c2185903b0b07 SHA512 7814ad640be617451aeaaac04441d3231fab27b6298e86e4fbd1e99f70a4be95419ab89dd5fde283969ea2c91192e2051eedb5d5191fc35425df0cd072e0a5da
-EBUILD sword-cro-1.0.ebuild 313 BLAKE2B 31f020d1f843d318879717c3feb50ca33f2dbd9299deb3bec39ab271b2cba4a4c95c2da1375a47ac747f6e9e25dc565560fd41502312dd5d53f72697545c56e8 SHA512 92d38b74fab9e237b13d389d14e0a3512929017f100c7d393a9dae8ea6257c9a4d7afc917f1e2db3866b6fd0da1c471f806da849ea715b24e14ed73cac8d0028
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-cro/metadata.xml b/app-dicts/sword-cro/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-cro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-cro/sword-cro-1.0.ebuild b/app-dicts/sword-cro/sword-cro-1.0.ebuild
deleted file mode 100644
index da3f3d2d928d..000000000000
--- a/app-dicts/sword-cro/sword-cro-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Cro"
-
-inherit sword-module
-
-DESCRIPTION="Croatian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Cro"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-czebkr-1.1 b/app-dicts/sword-czebkr-1.1
new file mode 100644
index 000000000000..da347a5aba71
--- /dev/null
+++ b/app-dicts/sword-czebkr-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Czech Bible Kralicka
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/CzeBKR-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=319cf1e6d7c37bfb4a12dbe95dd9c6c9
diff --git a/app-dicts/sword-czebkr/Manifest b/app-dicts/sword-czebkr/Manifest
deleted file mode 100644
index e014bb430d32..000000000000
--- a/app-dicts/sword-czebkr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CzeBKR-1.1.zip 1534887 BLAKE2B d701614bab254e2d162569f060ba8ff24a15c8a9a8fb34c8c165186d8f88064ac29246fc5b13ef7b816a7d0e2d6fc54c27404bd7c1830e544a5fecad80c2c3a3 SHA512 b2b2b4ba6643c59a81e2491b277d10034d53864c258bfad78b03fb9a90f1f89e5fab62b36cb7441e09ecb046eaa9678823bace2f48b959bf6388b9ff0c684b88
-EBUILD sword-czebkr-1.1.ebuild 325 BLAKE2B e822449a61975ac5334f10947beea552fd6c3c3ffdfb3e2852ff92a481e83b9561b90a3dabb6b24b3439657eed43515b530ee8109a6d23fbb31981fb023ba7f7 SHA512 1234be1f071c2bea8fe4db2e3d9abdfe5cea3264d75037b4b4ce95668dd1b46ee575d0f0994777dbd64a444f86104c4430bf47db0341644ef20be2fba40a481f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czebkr/metadata.xml b/app-dicts/sword-czebkr/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-czebkr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild b/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
deleted file mode 100644
index 7211b0cbff9c..000000000000
--- a/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="CzeBKR"
-
-inherit sword-module
-
-DESCRIPTION="Czech Bible Kralicka"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-czecep-1.4 b/app-dicts/sword-czecep-1.4
new file mode 100644
index 000000000000..5b87a824ba92
--- /dev/null
+++ b/app-dicts/sword-czecep-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Czech Ekumenicky Cesky preklad
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/CzeCEP-1.4.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=dec8dbe82282f80efeeb0d10ab3d1052
diff --git a/app-dicts/sword-czecep/Manifest b/app-dicts/sword-czecep/Manifest
deleted file mode 100644
index fb6ff60f261f..000000000000
--- a/app-dicts/sword-czecep/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CzeCEP-1.4.zip 1519391 BLAKE2B 57815835904c9108c8eab0a607d7f97f004e2a83f70433240579c52e3d2ea74ab5f496f183ba2426c690a59159762848b5962ceaecfdf503e25646a7dd4d8d56 SHA512 7ff886d15050bb79c5832f863ffb6e39850b107aedaa0ce0826dba41df393c0c86eedcb632f60b905f14929826dd27606c98eb638a2f57332e331d9563afbf1b
-EBUILD sword-czecep-1.4.ebuild 335 BLAKE2B 3a78c52d79a6e7f615707b2d25b029fd5f4a82f6574fd95b1800bab4dbb5ff9d1e0056f97e9d446f1ce3a32245081e98912cb72ce37eb018b0be31af49fb31d2 SHA512 5c9d37576facbf0bf22d57f18a5ccfec7498b9cf9ce89d72395ef7139560896b4edc57324d9b761b28c76935f3bf9acba239609fb9c26eb4abf019810dd80b07
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czecep/metadata.xml b/app-dicts/sword-czecep/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-czecep/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-czecep/sword-czecep-1.4.ebuild b/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
deleted file mode 100644
index 1a876a6058a9..000000000000
--- a/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="CzeCEP"
-
-inherit sword-module
-
-DESCRIPTION="Czech Ekumenicky Cesky preklad"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-czekms-1.4 b/app-dicts/sword-czekms-1.4
new file mode 100644
index 000000000000..26bc4507224a
--- /dev/null
+++ b/app-dicts/sword-czekms-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Czech Preklad KMS Nova smlouva
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeKMS
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/CzeKMS-1.4.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2a10fd60d9eb43e92b430e4b7359dd1f
diff --git a/app-dicts/sword-czekms/Manifest b/app-dicts/sword-czekms/Manifest
deleted file mode 100644
index e1b98603cdb7..000000000000
--- a/app-dicts/sword-czekms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CzeKMS-1.4.zip 376709 BLAKE2B bf3f3e145f7843c20f3eec8b5ee857031d256f791f4e7acbba5f225f9e4eef93a5841a61ba68ee732c141f7747c50fb2615ec5cafac95a14a185076e4869ccfc SHA512 506389690981378474a2de660fc2aa204d0f24200aacb740f53acf77fad1fdbd5f9f1b0e1ea119a4c4969382d2e12bf7f6f05353c9dff047c0cbaf40102c247c
-EBUILD sword-czekms-1.4.ebuild 335 BLAKE2B b735b3fa2a4d423e215e434d6b5e3fc9f889ba95a38a974f721b87e50cd4c87ff3ff87b1953818541967eccfbe1766017ff20dd84a85f71f958c6aa1df590dd0 SHA512 1e6538e847574e8b69098af4c1100f6f6deba68d4e07c998869dba1f6a071ffbfad9bcf7a0d331156d6bcb93b14459ea849a67ddc4bb1a72c7986aa7f065e7b3
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czekms/metadata.xml b/app-dicts/sword-czekms/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-czekms/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-czekms/sword-czekms-1.4.ebuild b/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
deleted file mode 100644
index cd15c1d8ffe5..000000000000
--- a/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="CzeKMS"
-
-inherit sword-module
-
-DESCRIPTION="Czech Preklad KMS Nova smlouva"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeKMS"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-czenkb-1.1 b/app-dicts/sword-czenkb-1.1
new file mode 100644
index 000000000000..c3a212c77986
--- /dev/null
+++ b/app-dicts/sword-czenkb-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Czech Nova kralicka Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeNKB
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/CzeNKB-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=44b693bc6c976aaff10404e2fa756749
diff --git a/app-dicts/sword-czenkb/Manifest b/app-dicts/sword-czenkb/Manifest
deleted file mode 100644
index 38a9f821e197..000000000000
--- a/app-dicts/sword-czenkb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CzeNKB-1.1.zip 385230 BLAKE2B bbe2557734a66a9c67a92636ed49a15a25a6e1700b7339ecf2234457351275f40e632efa6e38cbe267afbd29ee93c4f4a0fe74bebad61e68b9c81b6af3ed29f3 SHA512 1015d1f71e15174c15c7e485c314f00b8a3d24ac25a268c33d24287b1ef32f240403bc6bacba646018c377e1aea9e2901725c96fdc27cd820946ba5e36b37ec4
-EBUILD sword-czenkb-1.1.ebuild 330 BLAKE2B c5632add87aceb5d0ee45838e9ada3852281a48f615a32023d6fb75fbaee5a6fdda2d8ef8a5354d264a76e9804df1a2869e65f6926e40d9cb23385ab40af57ec SHA512 f23e6be5e49989cbf3a20bb2fb3a9a8f80c352538d0b41cd95ede6c62925e94ef03233e6564d73b740e7daea2e485e467e35735300d998201aa40b671e8d6287
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czenkb/metadata.xml b/app-dicts/sword-czenkb/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-czenkb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild b/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
deleted file mode 100644
index a4ae18c8967e..000000000000
--- a/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="CzeNKB"
-
-inherit sword-module
-
-DESCRIPTION="Czech Nova kralicka Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeNKB"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-daily-1.0 b/app-dicts/sword-daily-1.0
new file mode 100644
index 000000000000..80e4d79c3163
--- /dev/null
+++ b/app-dicts/sword-daily-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Jonathan Bagster's Daily Light on the Daily Path
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Daily
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Daily-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=93141c2deeb74d0762f038d0baf177e1
diff --git a/app-dicts/sword-daily/Manifest b/app-dicts/sword-daily/Manifest
deleted file mode 100644
index a5888637faad..000000000000
--- a/app-dicts/sword-daily/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Daily-1.0.zip 312387 BLAKE2B 46977f7d270031620447d833e2f20ea8af93c678c77bb3bd570b321f0430219d55423c7163286413ed8e10d90ef1ccca8e99a5c90fd79bcfe70da2e684860e22 SHA512 ab11a1e8918796d34ffadc90b4b0782c5ef021535de135817eae05b32f1271430d2bef02465e96c6def5926c67c0cca5e8f009591e33a2a718a10b7a9ce4983d
-EBUILD sword-daily-1.0.ebuild 356 BLAKE2B 324b3b8dd9a0f513f0c004bf23d10f8b825a378610ef447ee93d5f5eef4c6cbb219209d39cabe9d429699c5a34021119e88a2b249392b340d55d1a8161a9bb69 SHA512 cf69a1827f15c340579bef33453ca7db49d10c09506199430d8f6a589683910fde04beb3a2cdc3175ba3d6761e5e52098276ebe21d72fd48e9c32e1805205386
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-daily/metadata.xml b/app-dicts/sword-daily/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-daily/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-daily/sword-daily-1.0.ebuild b/app-dicts/sword-daily/sword-daily-1.0.ebuild
deleted file mode 100644
index cc392f36129c..000000000000
--- a/app-dicts/sword-daily/sword-daily-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Daily"
-
-inherit sword-module
-
-DESCRIPTION="Jonathan Bagster's Daily Light on the Daily Path"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Daily"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-dan-2.1 b/app-dicts/sword-dan-2.1
new file mode 100644
index 000000000000..5c19d685b7bd
--- /dev/null
+++ b/app-dicts/sword-dan-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Danske Bibel
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Dan
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Dan-2.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=b65154700a936684674043da5c521bb1
diff --git a/app-dicts/sword-dan/Manifest b/app-dicts/sword-dan/Manifest
deleted file mode 100644
index a7a0c1c4e2d0..000000000000
--- a/app-dicts/sword-dan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Dan-2.1.zip 1396887 BLAKE2B 374aaf90a3eee5d0a5c00c5e894421caadf5488bca04c171beb87f4ed51d7833da3e7c3ea0cc0b67696b5c31305d4425fed8b06c55d5ad475a0855a1aa323544 SHA512 e9b3553e4dc0aa4d668b005eb0dbca08a435a2775c5449d2e54e60f44abac3ebfb54de8eca9dee77c740d545e2d732f6b2044d297a384d8538ba53ed4cd24c83
-EBUILD sword-dan-2.1.ebuild 316 BLAKE2B 7968df38d6cf1f05a8a03d367926b9746720737df6cf867e4bc0b9a3465847b7b68586aa70d45ef06c25fb71d5b72303358dd2f66ca4b19a391b519f3ede8e2a SHA512 40b34bbeb3f0ba5aeae7d5bbb0e4ff3fde72aaeff865708332c9ca575034fd179ad9f7cc778226ea7c12b38e4458a56135772ad0c17d560e0bdfec2a0c392f69
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dan/metadata.xml b/app-dicts/sword-dan/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-dan/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-dan/sword-dan-2.1.ebuild b/app-dicts/sword-dan/sword-dan-2.1.ebuild
deleted file mode 100644
index 2c5c89235556..000000000000
--- a/app-dicts/sword-dan/sword-dan-2.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Dan"
-
-inherit sword-module
-
-DESCRIPTION="Danske Bibel"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Dan"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-darby-1.1 b/app-dicts/sword-darby-1.1
new file mode 100644
index 000000000000..2a8b33dd91ff
--- /dev/null
+++ b/app-dicts/sword-darby-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Darby Bible (1889)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Darby
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Darby-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=cb228012df0d36eb3389c94c776a3464
diff --git a/app-dicts/sword-darby/Manifest b/app-dicts/sword-darby/Manifest
deleted file mode 100644
index 050f646e2913..000000000000
--- a/app-dicts/sword-darby/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Darby-1.1.zip 1437387 BLAKE2B 9ad092707b159faf159b0f0570b01511740bc250f8a2267bc21b9c32374d0e01f6648796b0118f5b5195fa3d51788e2dce6bb79c63a65c48fa544ae2bdccf727 SHA512 3b0a053f43d6752830b60f1ccd9cd244774223ab6356c8f1e77859b1cebcda0cd5b1186e1db5f06c5e9e6dac96806fd9abd4f2a473537b7bbc461bd3b22b8365
-EBUILD sword-darby-1.1.ebuild 326 BLAKE2B 0b710674cdae7a3ae3d35e780c4636ad67c08843670b8980b2ea91725aa19e545fa28598edaa640231c3bd569f3623869c78d6c5176d9c212c745ce266db3ce2 SHA512 e8ca6d86b8a07115110472d514d70924f9c119963e1d690a109754592dc0dfb1a54e100a51b0da73047265cb3ca5e393279c70163a8f9d3b0a9d8fd1f1149066
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-darby/metadata.xml b/app-dicts/sword-darby/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-darby/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-darby/sword-darby-1.1.ebuild b/app-dicts/sword-darby/sword-darby-1.1.ebuild
deleted file mode 100644
index edc5e5454073..000000000000
--- a/app-dicts/sword-darby/sword-darby-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Darby"
-
-inherit sword-module
-
-DESCRIPTION="Darby Bible (1889)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Darby"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-dbd-1.1 b/app-dicts/sword-dbd-1.1
new file mode 100644
index 000000000000..0179569502dd
--- /dev/null
+++ b/app-dicts/sword-dbd-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Day By Day By Grace - Bob Hoekstra
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/DBD-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=9d41a642b29b271be57e4d08accf4533
diff --git a/app-dicts/sword-dbd/Manifest b/app-dicts/sword-dbd/Manifest
deleted file mode 100644
index d9744c39ac07..000000000000
--- a/app-dicts/sword-dbd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DBD-1.1.zip 356984 BLAKE2B f1720bb96f39d26175423bf7103a09ceae994567ddd3552a24b7c622806d15e05f0754fc29faac76fb5545d12a8cae9241ffb749051a953ee1494f2a9764868d SHA512 c190e7b3d0ac13b72107f0f4a177d38a4cda3fe6b9c62dbc9ecbce68d711e7ffb61a805ba8c77cf9fbe917d54da1e73e1a9174970b0848b79e05a8d299d000a9
-EBUILD sword-dbd-1.1.ebuild 333 BLAKE2B cccaffaf5dc109577cbb4e332218a871f84830a285b5b03debb6863c41c8741564f1664a11113efe915f18f38351c0df16aaf9b663d492abca533ff329b4f509 SHA512 f28706df1c0f4abf243378798475c08a211c66e7f4849ebe9ce38404e5820063f7bf00a4e907856a9605f846f60221a52ca1e3a93e3a69e74663c6728fea2c29
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dbd/metadata.xml b/app-dicts/sword-dbd/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-dbd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-dbd/sword-dbd-1.1.ebuild b/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
deleted file mode 100644
index 54df1583166e..000000000000
--- a/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="DBD"
-
-inherit sword-module
-
-DESCRIPTION="Day By Day By Grace - Bob Hoekstra"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-diaglott-1.1 b/app-dicts/sword-diaglott-1.1
new file mode 100644
index 000000000000..90f69bb043e3
--- /dev/null
+++ b/app-dicts/sword-diaglott-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Emphatic Diaglott
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Diaglott
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Diaglott-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=d0bec3b2b5046fb0f0ee39697b007f1c
diff --git a/app-dicts/sword-diaglott/Manifest b/app-dicts/sword-diaglott/Manifest
deleted file mode 100644
index 1afb356a8496..000000000000
--- a/app-dicts/sword-diaglott/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Diaglott-1.1.zip 364870 BLAKE2B e932e6f77d437e05fadabc2d1c9f53a3de03d0d3f57e1fc734a08d4c2a13ea8e0b994f91cf2c0d74c5e5b9881f7aef79b465bdf428be5551fa66776bf872e793 SHA512 f992bcc200b1bb86e03fd0bf209cbca70466a2bd1001df3063048d3dbb38c16cf70a5657ca6146664e21fa09bc383255ee1923de2287207116797554fa484c34
-EBUILD sword-diaglott-1.1.ebuild 335 BLAKE2B 69ec26acd804f0e3eaf446ab3b5cc6318da9ebcbdad9462df92920089403df4dcae294dce011b752b68ddb512632cd6760d4ad27e405f2b168999b47615ef89c SHA512 e1760641e7ce6dbe83c78a99bd1e31ac9cbb10811384652343dc8326d2cfb6ac2d0dda48791069c0122abd332366dd4f6e7910da2f7ea27e2f4a3394287329d8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-diaglott/metadata.xml b/app-dicts/sword-diaglott/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-diaglott/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild b/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild
deleted file mode 100644
index 2f4b0e4e70bb..000000000000
--- a/app-dicts/sword-diaglott/sword-diaglott-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Diaglott"
-
-inherit sword-module
-
-DESCRIPTION="The Emphatic Diaglott"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Diaglott"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-drc-1.1 b/app-dicts/sword-drc-1.1
new file mode 100644
index 000000000000..d15fc65e69b9
--- /dev/null
+++ b/app-dicts/sword-drc-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Douay-Rheims Bible, Challoner Revision
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/DRC-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a60e271299e2946ba6166a4c335accac
diff --git a/app-dicts/sword-drc/Manifest b/app-dicts/sword-drc/Manifest
deleted file mode 100644
index 085c4368a2e7..000000000000
--- a/app-dicts/sword-drc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DRC-1.1.zip 1424819 BLAKE2B 43f0e506e83f43cbc46420538810ba4844491558147cc4654b2fc1f5eb95faaa99d47d666fe6e6a9f2b77548c3ca8846d17d941f2661670e032738e258f2a3c0 SHA512 61c5ac8b30a9ef57f46129e91854f69203e06b38fdbeab22c020ac00b7024a27143af27ec33f9d23b68d6e824747784995bf929d389728b7fca7e5f87da81bf7
-EBUILD sword-drc-1.1.ebuild 337 BLAKE2B ea8bac5893c1567e79d0bd04ddccd12895567df01bc755e6e3912f982d8dc41683e9da6d9299800eae0ab1f54e441da19dd41b80b4034e951812bda19ec5d253 SHA512 1a97485ab4a203b48a97eb2a1e72e036c15f9b54abeb47bf6392ca4981e1d6cc46cfb0caa6378424b9b0ea172314af1cc67e07e446f9f5df2d4277f8ff3aa9a5
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-drc/metadata.xml b/app-dicts/sword-drc/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-drc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-drc/sword-drc-1.1.ebuild b/app-dicts/sword-drc/sword-drc-1.1.ebuild
deleted file mode 100644
index 444b87341383..000000000000
--- a/app-dicts/sword-drc/sword-drc-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="DRC"
-
-inherit sword-module
-
-DESCRIPTION="Douay-Rheims Bible, Challoner Revision"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-dtn-1.0 b/app-dicts/sword-dtn-1.0
new file mode 100644
index 000000000000..37b278d2dc30
--- /dev/null
+++ b/app-dicts/sword-dtn-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Darby Translation Notes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=DTN
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/DTN-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=d0e37f722fa3e06fdbf3889a1ca25673
diff --git a/app-dicts/sword-dtn/Manifest b/app-dicts/sword-dtn/Manifest
deleted file mode 100644
index 319621d5541a..000000000000
--- a/app-dicts/sword-dtn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DTN-1.0.zip 332136 BLAKE2B de4b3b2c16ec4465d434d3525a23983e583b89167b2406459c83fb7ca94dc2ea52f42822a79e36c82692264be03666d9525a96fe4f089856f8c4a23baa32a75b SHA512 589dc962404483f366ab293c00cb8f7a6144db222b16ebe3df24e87e553ed607b74d14150f44dfacf4798732633c3580c8b73a68c9642d689acedb856019d491
-EBUILD sword-dtn-1.0.ebuild 327 BLAKE2B 7da60ac8823ade3b3e69e59e22dfbafea8e0fc67f01ec928731f75b5d694090fd9e76bc79876f57d0ea30b203eb85bc6c1c58ab322d6fa64e0eaeaf572aa27f6 SHA512 d804a996be8c1f8b173c5dd7b08210fa877b19338d293b43dbb3aadabff44ec1a46fce2a912d06e94f4e5a5fe0eb34e57226293c39d077de6a5777cd7a35d70c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dtn/metadata.xml b/app-dicts/sword-dtn/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-dtn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-dtn/sword-dtn-1.0.ebuild b/app-dicts/sword-dtn/sword-dtn-1.0.ebuild
deleted file mode 100644
index 1f676e980e84..000000000000
--- a/app-dicts/sword-dtn/sword-dtn-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="DTN"
-
-inherit sword-module
-
-DESCRIPTION="Darby Translation Notes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DTN"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-dutkant-1.1 b/app-dicts/sword-dutkant-1.1
new file mode 100644
index 000000000000..c8afbc93d56d
--- /dev/null
+++ b/app-dicts/sword-dutkant-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Kanttekeningen Statenvertaling
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKant
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/DutKant-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=c69959fcfe55684798fb2d87effdad9c
diff --git a/app-dicts/sword-dutkant/Manifest b/app-dicts/sword-dutkant/Manifest
deleted file mode 100644
index ca17e2aca19e..000000000000
--- a/app-dicts/sword-dutkant/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DutKant-1.1.zip 4741315 BLAKE2B 1902d1e83d5c99620e1de25741b8a1e00c29f91fb50007470c48123939f0dd58b81caa918017dc4de699c2acfb7925187e17cbe3c9202ed000acbcef2e6521f7 SHA512 9a9076939aa9c14af2e1f9c3d98acc2225444465b3c2323c8d3930e02e21c80e573d8d874e3e51878125436411d0ae580f1cb1784166e9ae50d5ff2d81a9a830
-EBUILD sword-dutkant-1.1.ebuild 342 BLAKE2B 49707aac120872264546053ca1cfa7661d8eada28d246fb4229a66c2bc13547685a1167569800c67e5ecb9c116afb7f502f8287a2af8f3eee37f3f136da1f576 SHA512 8493c26f347bdda352b2f84a2581057ac8fdb33d839ba7b14d703eb6d8619ba78201dea1ce8c34fc1263b1dc4ab4dbefdb2c43f72e0da44412791e34ef6c38b6
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dutkant/metadata.xml b/app-dicts/sword-dutkant/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-dutkant/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild b/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild
deleted file mode 100644
index ec41f49933a5..000000000000
--- a/app-dicts/sword-dutkant/sword-dutkant-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="DutKant"
-
-inherit sword-module
-
-DESCRIPTION="Kanttekeningen Statenvertaling"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutKant"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-dutsvv-1.5 b/app-dicts/sword-dutsvv-1.5
new file mode 100644
index 000000000000..94b1a15ba3bb
--- /dev/null
+++ b/app-dicts/sword-dutsvv-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Dutch Statenvertaling
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/DutSVV-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1f5e7d1e9674dc997f10d42a837580ff
diff --git a/app-dicts/sword-dutsvv/Manifest b/app-dicts/sword-dutsvv/Manifest
deleted file mode 100644
index e93edfc1f741..000000000000
--- a/app-dicts/sword-dutsvv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST DutSVV-1.5.zip 1534052 BLAKE2B 35721a18962cda6b91627be29946ebb34751cf73b8825213c77c213e7e54c95b4c2b72a4a72dc0c83773fd0ba1abc8dfc7f112244c8f2ecec5cce63baf38ee20 SHA512 d974f707b30b35fb18b31146298a631a88103267bc75a584e93d3cf27879ace97c4229717e95fed9a382e49efe1434028f417fa614ec0a8c8ca8fe8d72bf5388
-EBUILD sword-dutsvv-1.5.ebuild 326 BLAKE2B 2f657c9570e4f633c542be906cf2595f970342fcbbf71973d6058b1204cd687a7570b024e0ce16d0a648ef80bd0d2be2f07ece825e3ff64ba28ab22749bc17e4 SHA512 8bc8bc3b142873f9cbb21214e3d2f313ffb86fba57654ddbd7c41beb9d51310a833b99b7cf58806553565d1702be4e62acdca92e9650dfc1854dc9ff958d58d0
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dutsvv/metadata.xml b/app-dicts/sword-dutsvv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-dutsvv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild b/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
deleted file mode 100644
index 43c45e8132d8..000000000000
--- a/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="DutSVV"
-
-inherit sword-module
-
-DESCRIPTION="Dutch Statenvertaling"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-easton-1.2 b/app-dicts/sword-easton-1.2
new file mode 100644
index 000000000000..c88bc471aba2
--- /dev/null
+++ b/app-dicts/sword-easton-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Easton's Bible Dictionary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Easton
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Easton-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=c13d22e44b2bec81a7f525aa7d520902
diff --git a/app-dicts/sword-easton/Manifest b/app-dicts/sword-easton/Manifest
deleted file mode 100644
index 8041b5c672b2..000000000000
--- a/app-dicts/sword-easton/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Easton-1.2.zip 1062020 BLAKE2B 20df61304d2da4a4aff3abbf7eac730f0c3c77aef59bee0f265d79120607daf0b36915821eb250041eef7c360ce0fc0971d83f3adc7f779aa7ed4fb77cc09975 SHA512 d0a9df9aac4b61f79511307943c847ddcf7eb5ebb718ec516579e68e647ad9f70973f8c32a3e27edbce228082b8663420f381cbe1fa8de724a4dddf56f0a69df
-EBUILD sword-easton-1.2.ebuild 335 BLAKE2B e030d52b486bcd65f41fdc13e46d4dbbbd830e2dcb18e3b4df8a9a7c10c279f8b68114bd07c959fae158cc0a1f6ceac7ac279d4d0b31605be94c15ea3b93a2d1 SHA512 cf4aef2e877549db350cf0bec6f2033142237d3d07801add9044baef881b25a78184d96ba07cf687b411e6a678be364498dcdc97bc97b74ebc15bb1558352f4a
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-easton/metadata.xml b/app-dicts/sword-easton/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-easton/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-easton/sword-easton-1.2.ebuild b/app-dicts/sword-easton/sword-easton-1.2.ebuild
deleted file mode 100644
index ba6738461e86..000000000000
--- a/app-dicts/sword-easton/sword-easton-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Easton"
-
-inherit sword-module
-
-DESCRIPTION="Easton's Bible Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Easton"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-emtv-1.3 b/app-dicts/sword-emtv-1.3
new file mode 100644
index 000000000000..fbb757286efb
--- /dev/null
+++ b/app-dicts/sword-emtv-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=English Majority Text Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/EMTV-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=174a6264886ac0efbc1177041b6dc569
diff --git a/app-dicts/sword-emtv/Manifest b/app-dicts/sword-emtv/Manifest
deleted file mode 100644
index b8c4594b6c3c..000000000000
--- a/app-dicts/sword-emtv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST EMTV-1.3.zip 486673 BLAKE2B ab6a4395cbfe344c650a6be7dd1e4c57e60867095520d081778e95eeb89e91a025fa16a5b20d05271528edb096d14f0d8bb46d167a28fe7564c65cb314fa58cc SHA512 ce8e0557f526b6ed383105e19fb101fb96919ddf97061542bccca92605ab8e5538223dd72301e82c3429846715be2dfe1e03b47f9218d7ca576f3109358010e4
-EBUILD sword-emtv-1.3.ebuild 330 BLAKE2B 895e3780e46f8916a27346ce0c034db8732ba2209df67963806fe3b721c4066418635215f8d0047bb0d97d3e52d7209c509a9e484664709fc7ed3c64f9c57c95 SHA512 07776d3d72456c09fa7b599f7d940eefd8cafb4dd0526f03ac45d5e593cc02efc8800c9ef28e294ca333b91b1790c36d2aac37532ec33f2d80be3657b465ea88
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-emtv/metadata.xml b/app-dicts/sword-emtv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-emtv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-emtv/sword-emtv-1.3.ebuild b/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
deleted file mode 100644
index 95aac9657362..000000000000
--- a/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="EMTV"
-
-inherit sword-module
-
-DESCRIPTION="English Majority Text Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-esperanto-1.6 b/app-dicts/sword-esperanto-1.6
new file mode 100644
index 000000000000..076ae48ab781
--- /dev/null
+++ b/app-dicts/sword-esperanto-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Esperanto Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Esperanto-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=b4802369a9486562013ea7e8cc689e65
diff --git a/app-dicts/sword-esperanto/Manifest b/app-dicts/sword-esperanto/Manifest
deleted file mode 100644
index a2d4e32715f6..000000000000
--- a/app-dicts/sword-esperanto/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Esperanto-1.6.zip 1391055 BLAKE2B e8871451bd2b67fca767ffcdfadac43aa2c568a5b05868b3c7078163bbcd1c0e808c261d291c561b7730f8762bd83b8ceba2ad497af781fe3c1326de0e1e766e SHA512 783e864df719e251b62c4f4a21f3baa9255f71d59dec8dee3074848ac33f93a0c26ee34f53af4c382978340ec32d6ee180d3403c11ce8682176b4820916cbd06
-EBUILD sword-esperanto-1.6.ebuild 326 BLAKE2B 99c9470f17f61dee14cc0026bcb7a0effcf67e5583f7ed6e17c4535a3d55b7f94bcc6d8bba3ec2141a8f29b0b36edaf7cf95ecd413d37f04e197dd485a89b16c SHA512 fde0728e10812076d3cfd63c98799c81a6a9038fb9b2adef2d6f266a2b5f0f6a40fd735866b08083ff7d46a5b4f70f0abf5a5f0869359691844992939d821128
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-esperanto/metadata.xml b/app-dicts/sword-esperanto/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-esperanto/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild b/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
deleted file mode 100644
index 3c0460fcfe7a..000000000000
--- a/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Esperanto"
-
-inherit sword-module
-
-DESCRIPTION="Esperanto Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-est-1.1 b/app-dicts/sword-est-1.1
new file mode 100644
index 000000000000..7fedf0adf047
--- /dev/null
+++ b/app-dicts/sword-est-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Estonian Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Est
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Est-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=568714e6b23ce22b3f0f56e7bbb46b5a
diff --git a/app-dicts/sword-est/Manifest b/app-dicts/sword-est/Manifest
deleted file mode 100644
index ef7e64096f67..000000000000
--- a/app-dicts/sword-est/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Est-1.1.zip 432871 BLAKE2B d23b6d61a67881ede7edf14637016073b8f0f3e8e1fe72a4fc8cd7833d66ab59865bad77ba7c55130da88f0cf0907b075a611bea9364964ef0361ca4bc33b252 SHA512 17c54578124884d143609098c641fb07b82937cb74515e4afe14c6e5006532406f84bc84c541c1d596d714127ff35074930491b0a8900f27ec9d9f848f14f4f9
-EBUILD sword-est-1.1.ebuild 313 BLAKE2B 6387fa56b7a75b017567de03e93ee4e6bd9bff48b21d01922c9b79b5410d61545e759a7e0b065830762bea2906b63ca57048af79d7f4c67fa15547170f18f4c7 SHA512 546114195fa4854bccbda1742d52ff1c5d15d73945613d063cf2442e12714dfe24a35ba341215161be1b24570f154e33f66a5a455ae8152658b941046314ccb4
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-est/metadata.xml b/app-dicts/sword-est/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-est/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-est/sword-est-1.1.ebuild b/app-dicts/sword-est/sword-est-1.1.ebuild
deleted file mode 100644
index 3c80a282466d..000000000000
--- a/app-dicts/sword-est/sword-est-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Est"
-
-inherit sword-module
-
-DESCRIPTION="Estonian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Est"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-family-1.1 b/app-dicts/sword-family-1.1
new file mode 100644
index 000000000000..6680994a5b84
--- /dev/null
+++ b/app-dicts/sword-family-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Family Bible Notes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Family
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Family-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=5d1040b156211f89f26d49098d71ff89
diff --git a/app-dicts/sword-family/Manifest b/app-dicts/sword-family/Manifest
deleted file mode 100644
index 9e6feac3ee47..000000000000
--- a/app-dicts/sword-family/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Family-1.1.zip 561669 BLAKE2B 46d1a6b028ae3299ef500eab80850dd05153772bcd55789ce8641178dc5e80c99197cabf0127a3c4bc0552f072911c3498f13a28e3a75d343b99b6d700a7552b SHA512 d6de98ddd7c2c79f0eebc0828bb2bd4115e47c6a06eba1b5c1cf55ff4074c7296fa7cb00361bea8c99fe820f3af7fceeab6340cb3ee58c7fd1cf897a448dbc78
-EBUILD sword-family-1.1.ebuild 323 BLAKE2B 82d3d3a74b32c291a05c09fb7d7fd6dd9b5b2be4ea014fa1799597fce16e3c59cb420db2d789861be8a14c7c5e496dacd1e6a6aa5ad12a6e525169cdfb9bf70a SHA512 6e6875c69e775edbaea5e04a43940d3e2ea53ca7b273add37e1b1f292f8298206c10c04023f51fa7b6e108271514584cdaf3da1fca8baac0ed6309f7a93d59e5
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-family/metadata.xml b/app-dicts/sword-family/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-family/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-family/sword-family-1.1.ebuild b/app-dicts/sword-family/sword-family-1.1.ebuild
deleted file mode 100644
index 7318c4d7b3a6..000000000000
--- a/app-dicts/sword-family/sword-family-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Family"
-
-inherit sword-module
-
-DESCRIPTION="Family Bible Notes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Family"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-farsiopv-1.0 b/app-dicts/sword-farsiopv-1.0
new file mode 100644
index 000000000000..7e9c7e2c17c9
--- /dev/null
+++ b/app-dicts/sword-farsiopv-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Persian Holy Bible (Tarjumeh-ye Ghadeem)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FarsiOPV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FarsiOPV-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2372a4d83088ec235b645ad6645d02c4
diff --git a/app-dicts/sword-farsiopv/Manifest b/app-dicts/sword-farsiopv/Manifest
deleted file mode 100644
index ae5807bac0da..000000000000
--- a/app-dicts/sword-farsiopv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FarsiOPV-1.0.zip 1592646 BLAKE2B 38a667f4b2a97594dade22939f78106e8e1f32f13f7be7deb788a8529bbdda9db46b69e1a568d8ffd96f5cf4a3155a0370f5be9c9fdd10a53196c79b2badfa5f SHA512 41c84bbff9bb0959963d1701dfd8a8f8420d9525cb1ca2bca793145ee8db0fcacd72b6eb1a50849d2a8e712de108c4d065638a64c0f458cb4463f2f6779fbfc4
-EBUILD sword-farsiopv-1.0.ebuild 349 BLAKE2B cc2970c272daab4d52ce083d22750d8553e89bab68d5fa0140d288a21d475a6bd1387cb7568bee793a318bdbc7034b816eb8f6953bc41533007294fdf1054018 SHA512 88f96ea6962c7dd34e3b3d93009707d738f2df2d58d769bc744cdaacf888a203b5dfffce6c05622ed3ecb9ec6b5fe32ab3a789b290eb94f904d47dca8da00bcb
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-farsiopv/metadata.xml b/app-dicts/sword-farsiopv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-farsiopv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild b/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
deleted file mode 100644
index b20186ed8ed5..000000000000
--- a/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FarsiOPV"
-
-inherit sword-module
-
-DESCRIPTION="Persian Holy Bible (Tarjumeh-ye Ghadeem)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FarsiOPV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-finbiblia-1.1 b/app-dicts/sword-finbiblia-1.1
new file mode 100644
index 000000000000..8b7665f1e0cd
--- /dev/null
+++ b/app-dicts/sword-finbiblia-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Finnish Biblia (1776)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinBiblia
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FinBiblia-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=af9ddcf36f9b59c899606a9350a64eca
diff --git a/app-dicts/sword-finbiblia/Manifest b/app-dicts/sword-finbiblia/Manifest
deleted file mode 100644
index cbdfe5272964..000000000000
--- a/app-dicts/sword-finbiblia/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FinBiblia-1.1.zip 1484005 BLAKE2B 57ff18669847b161a35ac377983cf6fc18df3a724395e160b0563de50d5e21cce8cfb749ea622554690b195c0e51b623d31caa50eefbfcb2cffe01e3a1ee98e1 SHA512 dd6c384651b3f526e54b1da097205c5ea8c74a697c5b7fa0cbdf2d4d771b140468bc2823bbe886544c484f8f0135162b49fe7184ec1eb4476d1f05f5c834d6db
-EBUILD sword-finbiblia-1.1.ebuild 337 BLAKE2B c3fe0bbfcea5e470395d56a8dd5f1d1d04a62829d4505347d547b78100fc0eb3015a5e9cbead92577340493f9cb0fdb78e5214fc3ab1ceb1110123903f15363c SHA512 86f3a76149af4ba126a58340c0319a6b23a0f79d75d62f3da60b752d3b337e4400c4a5464669556f84cafae9131b53e3202a7c6f2e622fd54d589fd223b4873a
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finbiblia/metadata.xml b/app-dicts/sword-finbiblia/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-finbiblia/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild b/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild
deleted file mode 100644
index 16754d9862d7..000000000000
--- a/app-dicts/sword-finbiblia/sword-finbiblia-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FinBiblia"
-
-inherit sword-module
-
-DESCRIPTION="Finnish Biblia (1776)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinBiblia"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-finney-1.1 b/app-dicts/sword-finney-1.1
new file mode 100644
index 000000000000..bc32418206f8
--- /dev/null
+++ b/app-dicts/sword-finney-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Sermons on Gospel Themes by Charles G. Finney (1792-1875)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Finney
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Finney-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1fb6ca5ff8e387137dd8ffc852c57532
diff --git a/app-dicts/sword-finney/Manifest b/app-dicts/sword-finney/Manifest
deleted file mode 100644
index 061f5db6e8d6..000000000000
--- a/app-dicts/sword-finney/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Finney-1.1.zip 277924 BLAKE2B 0f1193447f566a200a601205472e37c6979d241e2fc1de0c470efb9a391925ef7003c2532c7e0b5ff50d41eff923e5a430e837a1b085e84c61ab84310d3277a4 SHA512 a2bc30067f5f5d157d3fbd27cb7e9f02dbe8ed6cac4a59006afbda77dbd1c77104f7561b39f5de0dbffed29b3e9eebc3f3adc43e5f7e7a332f4d2615b965567b
-EBUILD sword-finney-1.1.ebuild 367 BLAKE2B fbc1eb71f3910123b5fd9f289e1dd8df88773906f3956b8b0df67dcd9abcbd695ec702fe2ce55c7b6801202e071a7f907c2e789728ad6cd192f541abb47bd62a SHA512 393e0a6940d469fa26f3beb48a2f25016979ad29fb3dfa5925f9be40d3904b7c36eef9c9215f65510c93964d62e470aa410246ce09e943fd39b4a9cb918cf06f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finney/metadata.xml b/app-dicts/sword-finney/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-finney/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-finney/sword-finney-1.1.ebuild b/app-dicts/sword-finney/sword-finney-1.1.ebuild
deleted file mode 100644
index 15122faec0b9..000000000000
--- a/app-dicts/sword-finney/sword-finney-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Finney"
-
-inherit sword-module
-
-DESCRIPTION="Sermons on Gospel Themes by Charles G. Finney (1792-1875)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Finney"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-finpr-1.2 b/app-dicts/sword-finpr-1.2
new file mode 100644
index 000000000000..0dbe86de1cec
--- /dev/null
+++ b/app-dicts/sword-finpr-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Finnish Pyh, Raamattu (1933/1938)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FinPR-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=919690b19a97672a50bf59d8d3b4061b
diff --git a/app-dicts/sword-finpr/Manifest b/app-dicts/sword-finpr/Manifest
deleted file mode 100644
index 4f55eb6ddef7..000000000000
--- a/app-dicts/sword-finpr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FinPR-1.2.zip 1514588 BLAKE2B 6858560320280b3d9e043ba7b8778dbcb52c0e9bc0e8aa998c1f999fa729ae80a2d088279b3bb50a27d83bb9a1ef060a4f117130206d35ba336a8f2fdc87d35c SHA512 f0cf531a1f27275e597cfb62a19ea2e88b0098366dc5d1bad564e1bce77a47e41f2806c66e226e3dde877a505a7a7e490bbc76f3a9335b270e04120d65c4cbae
-EBUILD sword-finpr-1.2.ebuild 341 BLAKE2B 53b7c1865ee4e084a9497c58489d6d0abc031bc33764cb6d729aeec9080d44ae9c57b0044e054a00c547626a894d26462e64b3ca03d425a10792eb505ff10a3d SHA512 8ef62fd1a30b4e01ceddf8c262ad92844da9b7e842d462c5c0afeace71eef5fb75cdb561980af4103edb94b77ca956cade04950486149db52a53862f423a7b7e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finpr/metadata.xml b/app-dicts/sword-finpr/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-finpr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-finpr/sword-finpr-1.2.ebuild b/app-dicts/sword-finpr/sword-finpr-1.2.ebuild
deleted file mode 100644
index 23e7c5453ac3..000000000000
--- a/app-dicts/sword-finpr/sword-finpr-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FinPR"
-
-inherit sword-module
-
-DESCRIPTION="Finnish Pyh, Raamattu (1933/1938)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-finpr92-1.1 b/app-dicts/sword-finpr92-1.1
new file mode 100644
index 000000000000..dae2c15abe0f
--- /dev/null
+++ b/app-dicts/sword-finpr92-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Finnish Pyh, Raamattu (1992)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FinPR92-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7a271511542995ae144e0003c24488c1
diff --git a/app-dicts/sword-finpr92/Manifest b/app-dicts/sword-finpr92/Manifest
deleted file mode 100644
index 6529224504e6..000000000000
--- a/app-dicts/sword-finpr92/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FinPR92-1.1.zip 1581196 BLAKE2B aa698c5e387d95b10f07fa4b2e47d1bac4f7d8572e227e1042eea08238cbf78cd11b7af9c240456ea5f3b97f9e93a42c543be758df415c8454221c8d053114fa SHA512 9287599c769b7133c9217f17402e51a5b6ef34615bcba79e56e8415ec65a26761594f2ed6eb14dc486a1a7c129bf720d39a6c7a4f792f01d1dc1edb1c85fda9f
-EBUILD sword-finpr92-1.1.ebuild 335 BLAKE2B 49631b307bd868121a073a4cd81be975efad72cebc5181b96ec86ba3af647da0ece1bdedbdd5c331ede4a9d9dfacaecf8a0eff86e4be046db58b30a1e6896778 SHA512 b116a1161fd19fde024304375533466ac500023eec156a6aa894d14bfea8449777546d1e72de4a85cb18fb3914e83b6ff60a55ba0f2b3fe1daed5716e8d79d99
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finpr92/metadata.xml b/app-dicts/sword-finpr92/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-finpr92/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild b/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
deleted file mode 100644
index c2516064c776..000000000000
--- a/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FinPR92"
-
-inherit sword-module
-
-DESCRIPTION="Finnish Pyh, Raamattu (1992)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-frebbb-1.1 b/app-dicts/sword-frebbb-1.1
new file mode 100644
index 000000000000..9ede07b3061d
--- /dev/null
+++ b/app-dicts/sword-frebbb-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=French Bible Bovet Bonnet (1900)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FreBBB-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a08b80fb35ad3e885fba8cb40b6ed13f
diff --git a/app-dicts/sword-frebbb/Manifest b/app-dicts/sword-frebbb/Manifest
deleted file mode 100644
index 96f647f61d23..000000000000
--- a/app-dicts/sword-frebbb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FreBBB-1.1.zip 1535395 BLAKE2B 8a9a9d1b60488064e862c58bbd393c2faed1ac3e65f59512fe76fcb8ff7024550575b7d1b429975ec5fcea719231423907cfda2f41765e6429c63f8036cdc42f SHA512 d97227362dad68a40006b07e717abc3aaffdded14bdd950f17ffc42abb20bf6645e2e6e1adb92b372d62edc4218c43ccecdb16c221c60d29a5490d55c29e0066
-EBUILD sword-frebbb-1.1.ebuild 337 BLAKE2B a131e91accc3cb7d7f3a71ca9436818d5369e42ae4941f54ed531b08c674ab80dbfc49e2ec6022f75503f93dd79dd3a1762d445cca5f71ea2c4f904671f65fa2 SHA512 e4ac1b15c3a17e47935833195427e49ee79616e6d7dcd3f5b2bfd8eeeb212fdf019c956e113e02d3824c249022129398ed6f4274f209378adfad13a609c7cb66
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frebbb/metadata.xml b/app-dicts/sword-frebbb/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-frebbb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild b/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
deleted file mode 100644
index 4fbec4504dba..000000000000
--- a/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FreBBB"
-
-inherit sword-module
-
-DESCRIPTION="French Bible Bovet Bonnet (1900)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-frecrampon-1.1 b/app-dicts/sword-frecrampon-1.1
new file mode 100644
index 000000000000..dc0ae05504c5
--- /dev/null
+++ b/app-dicts/sword-frecrampon-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=La Bible Augustin Crampon 1923
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FreCrampon-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=68616ed6f47de4b72496d55341df13bc
diff --git a/app-dicts/sword-frecrampon/Manifest b/app-dicts/sword-frecrampon/Manifest
deleted file mode 100644
index 92dffb29b6e7..000000000000
--- a/app-dicts/sword-frecrampon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FreCrampon-1.1.zip 1572977 BLAKE2B 81d710ba5404bc52306c25d714bc7dafce8f8d5d1f71e67a886f1a2322962c6dc3e4b13e62e198637622bafa163e1ca29c033a5d12374ab5ad7ca3d2d7165dfc SHA512 41853b727ed3807527135c83b3f1b9c0e7284cd74cf4bb7841d30712eac4405063b98c1d92cf31d97998982ac5a7b659e77e65d150e31bf017b3290be1e9f20a
-EBUILD sword-frecrampon-1.1.ebuild 343 BLAKE2B f8b7c126213b1f354b0b06f86f8abdae691343d87997f190618c30c92d34a92a7bc34744a131244280c52c225ca9076597d74c3bfe3c3ff3e9d414f0f6d82ff5 SHA512 6b7c4e1b417c8d63b244387cdb903d9c243e7bc0f6f43db3ae684e89efbc8b6761315d95d080ff8eb2a26d13752a22df961aac46da98f4425c0b1d572736f31b
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frecrampon/metadata.xml b/app-dicts/sword-frecrampon/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-frecrampon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild b/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
deleted file mode 100644
index 54f0d63e1ba2..000000000000
--- a/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FreCrampon"
-
-inherit sword-module
-
-DESCRIPTION="La Bible Augustin Crampon 1923"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-frecrl-1.2 b/app-dicts/sword-frecrl-1.2
new file mode 100644
index 000000000000..c521fcda7d40
--- /dev/null
+++ b/app-dicts/sword-frecrl-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=French Haitian Creole Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrl
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FreCrl-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=741fb1a4147798005a37d9532615638a
diff --git a/app-dicts/sword-frecrl/Manifest b/app-dicts/sword-frecrl/Manifest
deleted file mode 100644
index e6c16bd45877..000000000000
--- a/app-dicts/sword-frecrl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FreCrl-1.2.zip 1464601 BLAKE2B 884967a2a870392f6a225bd1625354a2e4d10004d7b5986be54a102d30af797676be6f080a612caa4b1b804bd724429569ed4b11e07a24411a71ef15e068e66b SHA512 3d792c230dbbf21193b7b8b908bdcd5194c487f10450de220360461b73ab0bf85c2a4b05df89f43bc25ca0adb14386c2b8308c7937b99c8cb27d2d231e113dbb
-EBUILD sword-frecrl-1.2.ebuild 334 BLAKE2B 7726ddc3c81967774cc73b2d1a926a5389cbdd08889bbb4e0941c67f66d0e5e9388ddf557105318205861bd4ec102b5197d108d1b4351669d23f9b7460c97850 SHA512 c35fe49a3560a2b6138e3a67567b2d70b973ddc79021c17e31cfce10d99848e2318232656c23f359b66a9814c52f95e65965685c6ba4ca66490aead666f8e650
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frecrl/metadata.xml b/app-dicts/sword-frecrl/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-frecrl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild b/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
deleted file mode 100644
index f18693556d5b..000000000000
--- a/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FreCrl"
-
-inherit sword-module
-
-DESCRIPTION="French Haitian Creole Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrl"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-frelsg-1.3 b/app-dicts/sword-frelsg-1.3
new file mode 100644
index 000000000000..b153549471e1
--- /dev/null
+++ b/app-dicts/sword-frelsg-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=French Louis Segond (1910)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSG
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FreLSG-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1050abf18d62cf045c9239c7c61878ea
diff --git a/app-dicts/sword-frelsg/Manifest b/app-dicts/sword-frelsg/Manifest
deleted file mode 100644
index bbd9258a0a1c..000000000000
--- a/app-dicts/sword-frelsg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FreLSG-1.3.zip 2317480 BLAKE2B 7aec1088410e12ea7627c045079765bb76b01c2f56237c24c59a3156a69a63f765d4caaa9a021f57ac886bf0dbfd4dca9c27ee9f2d76ec8bf0a69b93bbd0427a SHA512 3ace5e302caf20a91c3f0e1565a97f44e0a440f28d23b8f5fee2af8623094b17a52f8e5bf083c40f418aa65fb5c1464eedaea40a965f7b243780730c2ba2fba7
-EBUILD sword-frelsg-1.3.ebuild 331 BLAKE2B ecbac7cf6de9edc20b810b79181b1421fd4532292263fe67914816c6fa9b7b08ec61b5836f1e8a59b65a974c79368a6baebc6d105cafdf31c5c7f7c9ee10d1a1 SHA512 a8ae2dee709c24942033c9956ea58bca267c9860e18903d3c8a1e78d2c0fa38b4de9a6b0b8020457de620fd3ee9cd88ecf9a06eee5174bf729900d8ca15f3569
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frelsg/metadata.xml b/app-dicts/sword-frelsg/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-frelsg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild b/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
deleted file mode 100644
index 09ed60ea47f0..000000000000
--- a/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FreLSG"
-
-inherit sword-module
-
-DESCRIPTION="French Louis Segond (1910)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSG"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-fremartin-1.2 b/app-dicts/sword-fremartin-1.2
new file mode 100644
index 000000000000..2913e394c64d
--- /dev/null
+++ b/app-dicts/sword-fremartin-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=French Bible Martin (1744)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreMartin
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FreMartin-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=fb3d1b778f31f081673c9cbf6fdd2e64
diff --git a/app-dicts/sword-fremartin/Manifest b/app-dicts/sword-fremartin/Manifest
deleted file mode 100644
index 30601a741656..000000000000
--- a/app-dicts/sword-fremartin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FreMartin-1.2.zip 1665126 BLAKE2B 75a71ccb6d0ede290a77dbb17b99546e3ce6bf825e0592293fae553fbf01edfd7c38705a1ee63ee60823aa1b8ac8e2670522c2d520e594de12cc184a454fe7dd SHA512 76a53edf0cce3976eb56fbee4c60e33ec53c7b4cd71c582e62d81b503d419188b804774c957c54f637b7c551e584dc611c0e123f66f51476328c8d5be3591f1a
-EBUILD sword-fremartin-1.2.ebuild 337 BLAKE2B 6d9a4a996b71f31c9761816a1d47df7132153e19636e30d067795b0550539790ccca668599209cca80105b5ccf181f6d78d312a2ddf32483bf1483bccfd75732 SHA512 2ed772a7b034ea6f3b16aad7961e786dc4d01afa74f6dc9090fe86366211c6d3570f49953aef5c2694e2f6cbdc6cfca921614b695f2a72c2f2421a6e88acee6f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-fremartin/metadata.xml b/app-dicts/sword-fremartin/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-fremartin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild b/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
deleted file mode 100644
index 534b1e2918b9..000000000000
--- a/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FreMartin"
-
-inherit sword-module
-
-DESCRIPTION="French Bible Martin (1744)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreMartin"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-fresegond-1.6 b/app-dicts/sword-fresegond-1.6
new file mode 100644
index 000000000000..4d43b60e9e8c
--- /dev/null
+++ b/app-dicts/sword-fresegond-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=French Traduction de Louis Segond (1910)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/FreSegond-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=9f7052401f5b8dbdd520078c6696d625
diff --git a/app-dicts/sword-fresegond/Manifest b/app-dicts/sword-fresegond/Manifest
deleted file mode 100644
index 7cabf21cb2aa..000000000000
--- a/app-dicts/sword-fresegond/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FreSegond-1.6.zip 1501591 BLAKE2B 89b7654daa8bae515d5ab79cd5f5363ff81433210e8db05abb5014e1c0fff094ac34ea5da50ac183182d7ef7e472abd2edfc16507df903a4e4800e5e8cbae0f0 SHA512 9e9eced08926b8d4abe44c5dba0d5d664c4b7581dddf1c6f650319935b28f7993bf4c3cf4a8532fd376d75db463b3275a04869a108e4a9d68a7b30a2ad5c6cc5
-EBUILD sword-fresegond-1.6.ebuild 351 BLAKE2B c60ebd8df0acac04eb76c933d7afdc02a97ab0d04ae7e1f64fd876f4e64a612bc63f1da94c5fe9d01d17b19bb9fb0be046ee0347cf2b5d0e4fcaea4e4f3ec009 SHA512 3c3abac702e8313959c6d225f12801354294e74ca732a80fd63929a7c5acfa80c37b5ec05ae2853669861506ee43adcd7a40d3cc19d6ca55e7aa3ad3c826c2eb
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-fresegond/metadata.xml b/app-dicts/sword-fresegond/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-fresegond/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild b/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
deleted file mode 100644
index 785537e6f67b..000000000000
--- a/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="FreSegond"
-
-inherit sword-module
-
-DESCRIPTION="French Traduction de Louis Segond (1910)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-geneva-1.1 b/app-dicts/sword-geneva-1.1
new file mode 100644
index 000000000000..d45d14e6b0f4
--- /dev/null
+++ b/app-dicts/sword-geneva-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Geneva Bible Translation Notes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Geneva-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=cc8a759b9957b280f60eeca75b293fc9
diff --git a/app-dicts/sword-geneva/Manifest b/app-dicts/sword-geneva/Manifest
deleted file mode 100644
index d29e4b7b01fe..000000000000
--- a/app-dicts/sword-geneva/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Geneva-1.1.zip 1680206 BLAKE2B 1f4ab1f61b12a4fe9f7382be9445799e292f89cf61252688c79d5d09227927317f21cb6d722a63de51cdca32126522cd24a32727939410207de9b9a76b6c2110 SHA512 9bcc2760f6e7a620a6b625f7a01166510daed7bb0b5ec9cddb534f4d2c8b4cc95e15543e725346ca43b66d3e032be72da43dfdc078c8c7579e4f58dd66aaafd9
-EBUILD sword-geneva-1.1.ebuild 335 BLAKE2B 048e65444a38c81ca692e58b964bf7a5d86d1c8dcfcc17a2a5e9dce8546fa814a8c147fbfe41615e4c9f1e2f920a2dbf0cfb0df0f8af6b9983dbde2fb1cce57e SHA512 7108797aa313a13cbd047f5aab22e092162b5a29ab30ad2e9b1d8c46e88092167c2bac31ef5b08f62c7a7daf10bfc0bb757c3a56a3085da7632fd50650c9aeb5
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-geneva/metadata.xml b/app-dicts/sword-geneva/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-geneva/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-geneva/sword-geneva-1.1.ebuild b/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
deleted file mode 100644
index c1fab580b060..000000000000
--- a/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Geneva"
-
-inherit sword-module
-
-DESCRIPTION="Geneva Bible Translation Notes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-geneva1599-1.1 b/app-dicts/sword-geneva1599-1.1
new file mode 100644
index 000000000000..cbec93fe0cc3
--- /dev/null
+++ b/app-dicts/sword-geneva1599-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Geneva Bible (1599)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Geneva1599-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7f2aff12442614773d5d91bb093d5019
diff --git a/app-dicts/sword-geneva1599/Manifest b/app-dicts/sword-geneva1599/Manifest
deleted file mode 100644
index 3fdd8c7ca4d0..000000000000
--- a/app-dicts/sword-geneva1599/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Geneva1599-1.1.zip 1449107 BLAKE2B fb316611c5b8af0f702615197d3532a463930331b27d581f28b4863b92be65961542ea06b004a968fa066bfc60a28f5d84108fc5cb9cd21e5df92256f044132a SHA512 d89e8616ff06c9f6c1c39ecb7542568e9b3bcdc3c7de1aa38a6ea53a3eb87a9279b1a05f6804c2f3f00e5b47e68be6b01a8a768eac52b21f3c5a99fefe3ab8d5
-EBUILD sword-geneva1599-1.1.ebuild 332 BLAKE2B f25417d5180f53dd5aaefb0f9ffb46779ae165b65e15418345c0c19e12cc1d2b48453bf7b049377b274441fb1c01cd91b1cda52be8b723d7f3dec4bff7cc3fad SHA512 d4967d1f3b815b53669a01f739e07896fdc894c4da622fd301a22791fe58196e66107e43bc383bf4bc8e30f98c77caa7c17dbec1565c4c18862464a1a580a9f3
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-geneva1599/metadata.xml b/app-dicts/sword-geneva1599/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-geneva1599/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild b/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
deleted file mode 100644
index fdb100538074..000000000000
--- a/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Geneva1599"
-
-inherit sword-module
-
-DESCRIPTION="Geneva Bible (1599)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-gerelb1871-1.1 b/app-dicts/sword-gerelb1871-1.1
new file mode 100644
index 000000000000..8872be3d269c
--- /dev/null
+++ b/app-dicts/sword-gerelb1871-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=German Elberfelder (1871)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/GerElb1871-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3122a20ab1801aed57c09036c0cc51bb
diff --git a/app-dicts/sword-gerelb1871/Manifest b/app-dicts/sword-gerelb1871/Manifest
deleted file mode 100644
index 6ee9600cdd62..000000000000
--- a/app-dicts/sword-gerelb1871/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GerElb1871-1.1.zip 1733446 BLAKE2B 19f682151450fd65cee999aa2c9cc5f9a66fb4923755c11bab819dbf1ef11aa4d969f2c233020892bd8e8f3ba9a645eed88d70f0db40bc5a5f1651992b6d2260 SHA512 293d97bebf074de8cfad1b1cc0d62c47d29378b07c91ece870ab6a0c235a8c36572324d181a014c0b1ce46d56f67935bb17724a5ac4e9b7cf95aa0219a411d1c
-EBUILD sword-gerelb1871-1.1.ebuild 338 BLAKE2B affbc7e387efeb489a2504669345ff1af18e3f51a8addfa52464d488d493a6a168ecdc765923d334303f23a226c67d0da2235414949d64abbfc1fb1e14d7db22 SHA512 b5a8f6ec9224ae13925e13e9440f7bafef89efb180e6eea62804805cf560da70dc60bec178b945ba08b1d474843f93be1daa274d2f94874b1e8b3b03581c5079
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerelb1871/metadata.xml b/app-dicts/sword-gerelb1871/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-gerelb1871/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild b/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
deleted file mode 100644
index 26d20b84ab59..000000000000
--- a/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="GerElb1871"
-
-inherit sword-module
-
-DESCRIPTION="German Elberfelder (1871)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-gerelb1905-1.5 b/app-dicts/sword-gerelb1905-1.5
new file mode 100644
index 000000000000..0bcbe93edf00
--- /dev/null
+++ b/app-dicts/sword-gerelb1905-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=German Darby Unrevidierte Elberfelder (1905)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/GerElb1905-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=9463d424e90cdfd8f832499d1c70bb40
diff --git a/app-dicts/sword-gerelb1905/Manifest b/app-dicts/sword-gerelb1905/Manifest
deleted file mode 100644
index 7b15d7539bf6..000000000000
--- a/app-dicts/sword-gerelb1905/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GerElb1905-1.5.zip 1538434 BLAKE2B a4ade05700e585e284eba30b7f57e79247b4db3ffe41fb10e5601d75a98a3a0ada8c53b823364a76d4095250a3e9331e9bb378f816e11f1d519930ff4b1fa7e0 SHA512 da125670e2429a773b56ebd128a5daad6a101f7d5d9065c84e0e64ee96b0ea358807a047bb27aeae650dfba315bb5006492db8ce940c1b1afbefe2e4fc8e0820
-EBUILD sword-gerelb1905-1.5.ebuild 357 BLAKE2B e12551a5ea03a95f1943a6f53037c8e2b272f199d349a6ca6476251586906b1ab37de49e10037b58f428f3f8c4608b435c5cc99fe80344f2df0030c312bd2c40 SHA512 f8f35a408820d6080e40b5e58cc3342ccd6ec77b057de4582a16c9634dcb43593c46fca77506ce77b778fda7407b6d55e1dc9803421e1c45c5a4e450ff780a9e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerelb1905/metadata.xml b/app-dicts/sword-gerelb1905/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-gerelb1905/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild b/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
deleted file mode 100644
index 2c84870e463c..000000000000
--- a/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="GerElb1905"
-
-inherit sword-module
-
-DESCRIPTION="German Darby Unrevidierte Elberfelder (1905)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-gerlut1545-1.2 b/app-dicts/sword-gerlut1545-1.2
new file mode 100644
index 000000000000..76966239c630
--- /dev/null
+++ b/app-dicts/sword-gerlut1545-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=German Unrevidierte Luther Ubersetzung von 1545
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut1545
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/GerLut1545-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=24be076517d4c68b12f4b15f3a8bcd65
diff --git a/app-dicts/sword-gerlut1545/Manifest b/app-dicts/sword-gerlut1545/Manifest
deleted file mode 100644
index 00c9ad980aa7..000000000000
--- a/app-dicts/sword-gerlut1545/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GerLut1545-1.2.zip 1463147 BLAKE2B 42c144540398634c71731e5277d167c0fe66fbcfd41e198c57709cd7883b3318b862804c061ece2847926d0b72eb18b29c176184be7211e0e502ddb99ecaf844 SHA512 bc58a7661f68936ee035bf89c580da7ee9f0ea678f81f859956f0c7074df39894a91bee4e5032db8d1e6bf4c05744de876e4890b9a85ca8f18a4c33144103fed
-EBUILD sword-gerlut1545-1.2.ebuild 365 BLAKE2B dbab375eb30c34356c94a1244331001cfeac014e6a0078272e737570c8f1a35329e179b8181139865423dc4811a6e95ee13a9c204fd8756a40d21dc5f553bbf0 SHA512 2c584e8d4f1925ddfe39284596bf04ebef51aa45ca5db4af48bf190d3f6a268f1575b5144bc7289bcff10ab7730ab34db0e6a1595e0bf5a32ff180c012ca5139
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerlut1545/metadata.xml b/app-dicts/sword-gerlut1545/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-gerlut1545/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild b/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild
deleted file mode 100644
index 8419707c1a3d..000000000000
--- a/app-dicts/sword-gerlut1545/sword-gerlut1545-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="GerLut1545"
-
-inherit sword-module
-
-DESCRIPTION="German Unrevidierte Luther Ubersetzung von 1545"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerLut1545"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-gersch-1.1 b/app-dicts/sword-gersch-1.1
new file mode 100644
index 000000000000..daa23b4d61b0
--- /dev/null
+++ b/app-dicts/sword-gersch-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=German Schlachter Bibel (1951)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/GerSch-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=bd909c8e0f2e9eb192fd4829d7a9b266
diff --git a/app-dicts/sword-gersch/Manifest b/app-dicts/sword-gersch/Manifest
deleted file mode 100644
index 596516d45560..000000000000
--- a/app-dicts/sword-gersch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GerSch-1.1.zip 1573735 BLAKE2B d94aea6674c5c4cd7c59803b14c547abe6fd3c877b8cd2e71460b0358068a1516691f80ab783b9d3bad67a2b426ea169eeab1f7b3a92eacd5f82d453c0154b3e SHA512 483647dc8c7b2d691cc18ff58de6709894e04b50a6d9971bf8c2e5924677a73cd0fd4b7131793b9530cbeef6fb7e4456e1161d6861a1e500f9734c3f2160c396
-EBUILD sword-gersch-1.1.ebuild 335 BLAKE2B ae084fe870ae18ae4ef01e28c182f1f13682ded916a8cef24262b5b79be8742ca63f12679d17be8edfc9255b1ffe842f7853695e6ae606b4aacc3d233f55e75b SHA512 578815357036003d65a39353c0cecfbec8b14893d084e8c016e11a6458cc665c3b480343ac7ea7999a7b0e0124fc523e2ae3566a949cdf480bce1df214690d12
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gersch/metadata.xml b/app-dicts/sword-gersch/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-gersch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-gersch/sword-gersch-1.1.ebuild b/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
deleted file mode 100644
index 5f4b693a892e..000000000000
--- a/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="GerSch"
-
-inherit sword-module
-
-DESCRIPTION="German Schlachter Bibel (1951)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-greekhebrew-1.1 b/app-dicts/sword-greekhebrew-1.1
new file mode 100644
index 000000000000..aa24ca30cacd
--- /dev/null
+++ b/app-dicts/sword-greekhebrew-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Greek to Hebrew Dictionary of Septuagint Words
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=GreekHebrew
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/GreekHebrew-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a6de3767a6174907be4def3838c52477
diff --git a/app-dicts/sword-greekhebrew/Manifest b/app-dicts/sword-greekhebrew/Manifest
deleted file mode 100644
index c9962bcaced6..000000000000
--- a/app-dicts/sword-greekhebrew/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GreekHebrew-1.1.zip 127968 BLAKE2B 2af9aab6088b5179037500dcda5d28097e1a3e86708229363f18fa3152a8c8e3c08521861f77260d7f43f195c627195ba0205ed723d3e998c25df9baace8ba3a SHA512 60a816327cdbc392a73d47b9daf04908951a37f12840ade179e83970ca464ae725fd32690132273e6fd3a0c4f88aa17b180559c6947caeb649246cf7f1e62a27
-EBUILD sword-greekhebrew-1.1.ebuild 365 BLAKE2B c7da95792087f2c0183da752457d81b59b83c6078a49c2064aa0ba362e25089bf6aad0a038707108104a52f6f836973f09594fc864a975ec66832f0189e4228a SHA512 bfbc237bee786e8452d0ec7396d8df53378cfbfa7388a0dd64ef8f157c929935cd40fe3823fbd0da3eb21441585d1c86f14e8b0d9758b84f59b9eaed62966433
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-greekhebrew/metadata.xml b/app-dicts/sword-greekhebrew/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-greekhebrew/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild b/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild
deleted file mode 100644
index 94025c39a2f9..000000000000
--- a/app-dicts/sword-greekhebrew/sword-greekhebrew-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="GreekHebrew"
-
-inherit sword-module
-
-DESCRIPTION="Greek to Hebrew Dictionary of Septuagint Words"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GreekHebrew"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-hebmodern-1.1 b/app-dicts/sword-hebmodern-1.1
new file mode 100644
index 000000000000..410732d1040a
--- /dev/null
+++ b/app-dicts/sword-hebmodern-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Modern Hebrew Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/HebModern-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3c785f32731ecfba10303abd62d3059c
diff --git a/app-dicts/sword-hebmodern/Manifest b/app-dicts/sword-hebmodern/Manifest
deleted file mode 100644
index 2510cb066ae8..000000000000
--- a/app-dicts/sword-hebmodern/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HebModern-1.1.zip 1118288 BLAKE2B e25af40c06afb973336aa9b31f2afa5d94d4281d1cf4dee78b125a70f924c56d388b7e05947100347f7cdb8a5b82f46270773a4a172a6e5c2f8ec2bc9c9b2c81 SHA512 84449dcab4c27e7757f79e71e2097acf62ed60e4df0ed0a3a6561b069e9ed5214dcb8040b4b79d79a1b01b6bdc33b44ad5055f520383e2eb38dfa25fefb73e9c
-EBUILD sword-hebmodern-1.1.ebuild 334 BLAKE2B 345d436fde0e6c776389969c8da175e2fa76f4c4ea34107b3190083925635a7af82e1d9ce9b726914bd0f9f142579d76de8c477fb290894b0dc4ad24fe4e304a SHA512 be8efd2cd2fb01baedb3e1168fb8ce6f53f05826b0270fc5d2b52d0adba1e6626a5f006a112b9eab7bc0dd4086f82303f944eb65279af9bf5fec81e55feeedf5
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hebmodern/metadata.xml b/app-dicts/sword-hebmodern/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-hebmodern/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild b/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
deleted file mode 100644
index aee24e2e2c73..000000000000
--- a/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="HebModern"
-
-inherit sword-module
-
-DESCRIPTION="Modern Hebrew Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-hebrewgreek-1.1 b/app-dicts/sword-hebrewgreek-1.1
new file mode 100644
index 000000000000..ee3306796095
--- /dev/null
+++ b/app-dicts/sword-hebrewgreek-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Hebrew to Greek Dictionary of Septuagint Words
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebrewGreek
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/HebrewGreek-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7521eeb74fff8df04465d4268736f51f
diff --git a/app-dicts/sword-hebrewgreek/Manifest b/app-dicts/sword-hebrewgreek/Manifest
deleted file mode 100644
index ca354a6d2a22..000000000000
--- a/app-dicts/sword-hebrewgreek/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HebrewGreek-1.1.zip 144581 BLAKE2B 527607281375e34ed876a055dc88d40d1ec757fb87cbb928abdd153220794764d3cf441a60f54e1424602e8261ae8f9a9479ce34c507afad2e6b204cfc27dd4a SHA512 bc9e55d5f980329b6e47bafe544f00435db8168400f8fc74c8d21d135deb895d30d582a35a32ac6185ec5ec307b016c000c88b9576fbc954eabc9ee9cdf78503
-EBUILD sword-hebrewgreek-1.1.ebuild 365 BLAKE2B 6abe7d2179c7019ef4898a9a97a6f87d4f7cd829ca8a59caf9140b0822c59b8b6a76f15c4b03b71e00364486f8a205e2e296c462d1ce29396540083e844e03ee SHA512 babb0b08c2e8d83e5dc6e71a982bd135a71b879493a03d82709c6322f27a4930051979ff51e9e518423431f2f1f8362402f18395146e806f47019ef0f9a193ab
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hebrewgreek/metadata.xml b/app-dicts/sword-hebrewgreek/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-hebrewgreek/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild b/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild
deleted file mode 100644
index 475aae656498..000000000000
--- a/app-dicts/sword-hebrewgreek/sword-hebrewgreek-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="HebrewGreek"
-
-inherit sword-module
-
-DESCRIPTION="Hebrew to Greek Dictionary of Septuagint Words"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebrewGreek"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-heretics-1.1 b/app-dicts/sword-heretics-1.1
new file mode 100644
index 000000000000..a74a1a57f8b1
--- /dev/null
+++ b/app-dicts/sword-heretics-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Heretics by Gilbert K. Chesterton (1874-1936)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Heretics
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Heretics-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3e2dea97af122cdace9d8b5fdf6073c4
diff --git a/app-dicts/sword-heretics/Manifest b/app-dicts/sword-heretics/Manifest
deleted file mode 100644
index 73bdcbd448b9..000000000000
--- a/app-dicts/sword-heretics/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Heretics-1.1.zip 132755 BLAKE2B a7c91bd2caa83bc48b7ef8bc453a667cacca3599f607077bf7f2a26e3beecb2b2c78053a915c64c3bb90ba8a1791929d9ef96367fe37dc18f6b84cbc9ac434f8 SHA512 46769cf1b3f66277be54a8e7b315472ea34d5ec2bfc529062fb6b9495ffb9e5bd7bf12e1d24109b6fa87f8762c63ed01152179ab2a822c8965f5a867192fe020
-EBUILD sword-heretics-1.1.ebuild 359 BLAKE2B 5a12f5a5e15873d65b7af692ca19eea0cc80133b60a9ba1e2cf04869f477ee11f564c83b482090c9c328604eb927ae2f34c17be76a7f542b1baf5552e39bc53e SHA512 cc90ffc6afa4e7c9b19c6c1388071e86f054fd0441fb190caed2fde6ca8d44098d3b50eeb4c6dffe40f6eb20e40580e9a5735973b9a3cbabc6252e5a76c27ba3
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-heretics/metadata.xml b/app-dicts/sword-heretics/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-heretics/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-heretics/sword-heretics-1.1.ebuild b/app-dicts/sword-heretics/sword-heretics-1.1.ebuild
deleted file mode 100644
index d24599fe45b6..000000000000
--- a/app-dicts/sword-heretics/sword-heretics-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Heretics"
-
-inherit sword-module
-
-DESCRIPTION="Heretics by Gilbert K. Chesterton (1874-1936)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Heretics"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-hitchcock-1.3 b/app-dicts/sword-hitchcock-1.3
new file mode 100644
index 000000000000..9329b65b40e1
--- /dev/null
+++ b/app-dicts/sword-hitchcock-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Hitchcock's Bible Names
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Hitchcock
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Hitchcock-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=fc50cbead77ab57a304a3f1051a41564
diff --git a/app-dicts/sword-hitchcock/Manifest b/app-dicts/sword-hitchcock/Manifest
deleted file mode 100644
index 79bdab3bef47..000000000000
--- a/app-dicts/sword-hitchcock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Hitchcock-1.3.zip 44959 BLAKE2B 1233a3cdaccbe865ccef9f94ada8cfc1b399df7ece16cfc7848cdc5495cbe498ef1c130d43ab19d3c33ef9d6fca11ef303a6312a4b0ec24a53dede697e12ef90 SHA512 3900ee254025fcbeb38cb43548b8c0172bb390706c73370a0a0d15c1786f8b5285f2921822fde2b43e3cd8c5600a7414d0eb81571ffd09496e908721fac1b069
-EBUILD sword-hitchcock-1.3.ebuild 339 BLAKE2B d43bc38800e5ece213584d5d88257518d85a4fc5bef184bf8a0a7eb8166f5e469eeb680df7b57ca27854321f76305b1f28f76147b3b02fc2ca8945e1668cb7e1 SHA512 05ca637121393e0570a95c1fd18070b4816211c7784ecc02b09457f7333bc9ad8fb4085529cf3accb9fa55551ad70653949b5ca301c7eddd183783185b255a4f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hitchcock/metadata.xml b/app-dicts/sword-hitchcock/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-hitchcock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild b/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild
deleted file mode 100644
index b985e59b2dce..000000000000
--- a/app-dicts/sword-hitchcock/sword-hitchcock-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Hitchcock"
-
-inherit sword-module
-
-DESCRIPTION="Hitchcock's Bible Names"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Hitchcock"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-hnv-1.8 b/app-dicts/sword-hnv-1.8
new file mode 100644
index 000000000000..14caf8ad10fd
--- /dev/null
+++ b/app-dicts/sword-hnv-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Hebrew Names Version of the World English Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=HNV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/HNV-1.8.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=f648d24e59096ca3a61408277dc9b4f9
diff --git a/app-dicts/sword-hnv/Manifest b/app-dicts/sword-hnv/Manifest
deleted file mode 100644
index 97bca9ca66c3..000000000000
--- a/app-dicts/sword-hnv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HNV-1.8.zip 1515718 BLAKE2B c9765df4ba8b580df2aaada66a88dbaba42b462e616ef6a690a5c8b812d01e981a4b001566a40a6c5a12215356a676d94bcb2091f3b216d585d9e510acbbb0b4 SHA512 49bc4713c82de8bc51823a2f2b55bb331a14e6a673781e1534216209754d7b754b1c71b9b9e9e8984ca9c27a1c17a020bad5852c7de714916f729fcc6d693b73
-EBUILD sword-hnv-1.8.ebuild 351 BLAKE2B 32fea65261bbb504e1602a52898050f74eb74e0d4e52f4f38321b307c272a6c0499e6420bf1970e04a4611f9d5109147a1cf2fc6b8fa6f914b7758f6ca4ab068 SHA512 185d722a2b2aa27039598d07d78e2dd920e9834d0bd9e43b204a25e9e4ef675a4d88dbc8827ae90aecc9fae4384aa69ae347d35e673d905a437987f255305179
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hnv/metadata.xml b/app-dicts/sword-hnv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-hnv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-hnv/sword-hnv-1.8.ebuild b/app-dicts/sword-hnv/sword-hnv-1.8.ebuild
deleted file mode 100644
index 3a0ae42897c6..000000000000
--- a/app-dicts/sword-hnv/sword-hnv-1.8.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="HNV"
-
-inherit sword-module
-
-DESCRIPTION="Hebrew Names Version of the World English Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HNV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-hunkar-1.7 b/app-dicts/sword-hunkar-1.7
new file mode 100644
index 000000000000..9a6ea09bf3f9
--- /dev/null
+++ b/app-dicts/sword-hunkar-1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Hungarian Karoli
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/HunKar-1.7.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=653c8327eeb0f61a3388d5d1416bb0b5
diff --git a/app-dicts/sword-hunkar/Manifest b/app-dicts/sword-hunkar/Manifest
deleted file mode 100644
index 80594e4eb654..000000000000
--- a/app-dicts/sword-hunkar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HunKar-1.7.zip 1632910 BLAKE2B a868a63d84cccbdc4cb6ee2acd448a7331765005ad3e229310140fb37b0763b7fb08278c37bb47120443145cf31498bf44615059b50a34800d90fef439ba91cb SHA512 f4cc7adf551f650ac50153a6070770917945c20f97e8ce5f13acdd3ecbd3effc1c522a79792a6915101cc8c8ae4e91c62c68fbeb793a7787b89aff6b75e6203e
-EBUILD sword-hunkar-1.7.ebuild 321 BLAKE2B 1e5ac2c98138aedbca5b039090e77b0907d5b6b8af0457e400b0102e7f28a37c4d512d9a281da6f742f2e7416843bea3f22a5f65b4be0a283611df3f9a1e9341 SHA512 ed4946581dd4eeb9165ee72881116892ffd2dcb6482b1d8c1ca7fe0b34efc62ed5ff8d26a4ce0503c79ba47ca85eef4e9e283d34c478ed3842088761625decfd
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hunkar/metadata.xml b/app-dicts/sword-hunkar/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-hunkar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild b/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
deleted file mode 100644
index 6b533f29ee5b..000000000000
--- a/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="HunKar"
-
-inherit sword-module
-
-DESCRIPTION="Hungarian Karoli"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-hunuj-1.2 b/app-dicts/sword-hunuj-1.2
new file mode 100644
index 000000000000..96b0c731c4a1
--- /dev/null
+++ b/app-dicts/sword-hunuj-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=New Translation Bible of the Hungarian Bible Society
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/HunUj-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=8aeab0108ece1eb69a868151833b7be0
diff --git a/app-dicts/sword-hunuj/Manifest b/app-dicts/sword-hunuj/Manifest
deleted file mode 100644
index f761de0fd5d2..000000000000
--- a/app-dicts/sword-hunuj/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HunUj-1.2.zip 1775652 BLAKE2B 3f53a68b3fca71bed309a2cfd244f24d82f39ec24418872f92252166adb56f4a0195bd5cd1b0d8b95b9bd8d6b24fb6f1e7b58da39d097a01c8ca3e60936e23fb SHA512 87c51f9b275c078a30c84caa03643c24c9d7e42590626f2ee94b8e791adca7a618adff925322aba2abe263384257bade86ee8fb19373feafd11b4fbd6c9ec897
-EBUILD sword-hunuj-1.2.ebuild 355 BLAKE2B 53fc44030158ed436c0218c9184989362ab4d7be6ba1fcf8f0ba117446b1abb97f9e382732956a611529683e66971a528a6e10c80b4c162a2262d323dd6834c6 SHA512 e102952826d5f2e6cca3a1ea888ef976cce43213b8038bc83c06d5ca1d76c93d6392bcdd39b8584baf7b8c4821687ee31c198acea6c5260b7497aa2065357821
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hunuj/metadata.xml b/app-dicts/sword-hunuj/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-hunuj/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
deleted file mode 100644
index 1e184ba758da..000000000000
--- a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="HunUj"
-
-inherit sword-module
-
-DESCRIPTION="New Translation Bible of the Hungarian Bible Society"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-icelandic-1.1 b/app-dicts/sword-icelandic-1.1
new file mode 100644
index 000000000000..7397ce93d66e
--- /dev/null
+++ b/app-dicts/sword-icelandic-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Icelandic Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Icelandic
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Icelandic-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=48f5d36452c6a099a3f371424deb83a8
diff --git a/app-dicts/sword-icelandic/Manifest b/app-dicts/sword-icelandic/Manifest
deleted file mode 100644
index c7339f2a0e9a..000000000000
--- a/app-dicts/sword-icelandic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Icelandic-1.1.zip 1513390 BLAKE2B 7c64a6b120af6d2c14acf604bf014671d4dc65e11d2cd0882c1ce8169d280369a551d80b5c217ac76a76c58dbb82b1d5769aa6f7d681fe3df35f3d3cff87bcf7 SHA512 db973262bd6e98a7a32a674f9424dca1389c6f57d7e5917b2ea2cb8e9eda4f026ac6290c0e2ade8ec803350249723d492400eed1491885bbcf10bbb32f7e209f
-EBUILD sword-icelandic-1.1.ebuild 326 BLAKE2B a5774fe6f4f17f3824f0e43337dfe12cac6cfa3f3d17d94c7b060d4e8f2def29319ca8f1828ebc312bb100c7738b728bb45d4ecd8b9de2d3f87b36e2f5ca2cd7 SHA512 6f18ce7f6f18b6f59e82f58be9f8a93b664a3973e1e01b15cf6324118953c6d1c5b8a77f844f63569807fac58e199173aa215ff840fba95f27819e251a7970c2
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-icelandic/metadata.xml b/app-dicts/sword-icelandic/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-icelandic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild b/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
deleted file mode 100644
index 4c2a674ac86c..000000000000
--- a/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Icelandic"
-
-inherit sword-module
-
-DESCRIPTION="Icelandic Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Icelandic"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-institutes-1.2 b/app-dicts/sword-institutes-1.2
new file mode 100644
index 000000000000..9718a2496edf
--- /dev/null
+++ b/app-dicts/sword-institutes-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Calvin's Institutes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Institutes-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=301a155e5e14728e6672097cae47247b
diff --git a/app-dicts/sword-institutes/Manifest b/app-dicts/sword-institutes/Manifest
deleted file mode 100644
index f88ffdfa0db3..000000000000
--- a/app-dicts/sword-institutes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Institutes-1.2.zip 1417954 BLAKE2B ba9d3e4f235ff1a34e37cb49e36547bf9262bce6b5911ccb7b0ecd1110cf7dd8c26dee8dbf47ccb4aa538f3e3718e13c12f9b7dadc5053c292256fc48efaea01 SHA512 dad9fe61bc84a0761e2104695658be7661613e3237e65ad190d425452b189d8614adaf785f9df86ec2d26b57ccf9854c1f482acd8367bd8c29d7c88e8e9b5e12
-EBUILD sword-institutes-1.2.ebuild 337 BLAKE2B 7b0cca8c231afd4267e9ae3694a6ac1e98e908cafa45acb1268f294a68bcabab619e7ffd4ed9094aebbe7b4400ea29df89461be6671d230a549d26a803c46da4 SHA512 73dfcece7b4df285575c3306c4c1ae2fa3a348fe73cc3e050b713ba141233e9f6be2a242b05169cd4eabff88eae5758764c3b00cb8091b289c08a381ad1923d1
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-institutes/metadata.xml b/app-dicts/sword-institutes/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-institutes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-institutes/sword-institutes-1.2.ebuild b/app-dicts/sword-institutes/sword-institutes-1.2.ebuild
deleted file mode 100644
index 91633c56ef5c..000000000000
--- a/app-dicts/sword-institutes/sword-institutes-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Institutes"
-
-inherit sword-module
-
-DESCRIPTION="Calvin's Institutes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Institutes"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-isbe-1.6 b/app-dicts/sword-isbe-1.6
new file mode 100644
index 000000000000..52f1be0907b4
--- /dev/null
+++ b/app-dicts/sword-isbe-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=International Standard Bible Encyclopedia
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ISBE
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ISBE-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1ce5c3351b86287c0b584c6a24ca5843
diff --git a/app-dicts/sword-isbe/Manifest b/app-dicts/sword-isbe/Manifest
deleted file mode 100644
index 1e7f94cca50d..000000000000
--- a/app-dicts/sword-isbe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ISBE-1.6.zip 9318385 BLAKE2B 63816e7ef6ea2e4612c4ee792c2601c12803111f379f2a1daf4735639cbc7b92e3aeb27a2a24eb0946e877dcef9fddd0076d0752ba8273adecde61c35225b592 SHA512 6771eea36f78b42f3c0488cd52a4691658f4dbb295667b0abbf09ffc7cb3022bafc9fb080d3b487c19fbd01c87ef1f16bc35b12d1822f3185c6c05b89bd7326d
-EBUILD sword-isbe-1.6.ebuild 347 BLAKE2B c57499f22e5263d070623f186858b00c8a11becf27d99a90a38f3066acae646ed6f7733f0e8e1ef15cd74e308b46db2c1124cad4d7562ae798721e38e1262a0a SHA512 f0262fbe0fbe40e15ae74ef2aa1b4df6ff2edcb6c16bc45ff42025305ef162ec35621b0cdd44f2503d9a8c45bef310262f94e71eab86c47d74e7b072d2d02845
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-isbe/metadata.xml b/app-dicts/sword-isbe/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-isbe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-isbe/sword-isbe-1.6.ebuild b/app-dicts/sword-isbe/sword-isbe-1.6.ebuild
deleted file mode 100644
index 952af4c62392..000000000000
--- a/app-dicts/sword-isbe/sword-isbe-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ISBE"
-
-inherit sword-module
-
-DESCRIPTION="International Standard Bible Encyclopedia"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ISBE"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-isv-1.5 b/app-dicts/sword-isv-1.5
new file mode 100644
index 000000000000..067e5462d31e
--- /dev/null
+++ b/app-dicts/sword-isv-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=International Standard Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ISV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ISV-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=75d7e11d5d326b344cb68ae3e92ee1a0
diff --git a/app-dicts/sword-isv/Manifest b/app-dicts/sword-isv/Manifest
deleted file mode 100644
index 46b1b8280f45..000000000000
--- a/app-dicts/sword-isv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ISV-1.5.zip 532601 BLAKE2B 17bba89e7ab93def19ee5f489ab8748eda3c39e7cf779450796c12a3e737949b5dfbfb7c08df9739dfad7279e8e8a896cac0b4227cfa178819652f7add49afcc SHA512 ed0e0fd073f19f8286cd27b7041884ba401374e9a858ce132a2db4c2e9e98d6866d1c0cc368c798b80d25a303167fb4c843db649ec567e94b0a31b10a3da48c6
-EBUILD sword-isv-1.5.ebuild 329 BLAKE2B 422d0525165cf1d22f8b1a5cebcd659fe130fe22b3039d04f3b71750a932ed57b8aae2a19aa04ef4275ded386afb86fa19cd99c655be4cb52ae2f2b2fc663ea8 SHA512 35cb11ef734325414b6e6ef7cf2bbe12991d6856b5ab4aabab36dc485fbfda216a89e870841adb2fecb35ca1396ddf5d0e2d059db242f8e5e815684a604d14d6
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-isv/metadata.xml b/app-dicts/sword-isv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-isv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-isv/sword-isv-1.5.ebuild b/app-dicts/sword-isv/sword-isv-1.5.ebuild
deleted file mode 100644
index 11c8c32d91d9..000000000000
--- a/app-dicts/sword-isv/sword-isv-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ISV"
-
-inherit sword-module
-
-DESCRIPTION="International Standard Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ISV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-itadio-1.0 b/app-dicts/sword-itadio-1.0
new file mode 100644
index 000000000000..293af1f831b5
--- /dev/null
+++ b/app-dicts/sword-itadio-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Italian Giovanni Diodati Bibbia 1649
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ItaDio-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=d957cc87038539a8f77abda563a717c4
diff --git a/app-dicts/sword-itadio/Manifest b/app-dicts/sword-itadio/Manifest
deleted file mode 100644
index a7dddc4a8714..000000000000
--- a/app-dicts/sword-itadio/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ItaDio-1.0.zip 1530887 BLAKE2B caef079a979f10dcefc5b3b63f4d3c2455dbcf89241b6afd8186306120f30ed9da51212739d765b98c354038b115be15e3074f6960927762f89a7b5d2cea0868 SHA512 7e2338fa743cd98437015bbd0c52df27999bc70563d7b923b2d23eb60e6f18baa5e272170838662c4f4c20c0d6bb97e4eef4f2460bbedd400ba4be1467ce59a8
-EBUILD sword-itadio-1.0.ebuild 341 BLAKE2B 89c93e34e0246b1a7a0ce0d36a29aa3de81ce544a31e5339d3ae0b16b2ae399631ebe45c2c5f906aebe8dcdd6ada9ddf7d42f474664aa87f413e208d8c1bb14e SHA512 a8d5bf88efef714bad64fe4c1f7455ab27d545e7dd1b86cf65d632d723c56b5fe4111c032495d710f6f776584202db551e513de958dbcadff8fc7dbcbf6ba0d9
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-itadio/metadata.xml b/app-dicts/sword-itadio/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-itadio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-itadio/sword-itadio-1.0.ebuild b/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
deleted file mode 100644
index 619ab890c929..000000000000
--- a/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ItaDio"
-
-inherit sword-module
-
-DESCRIPTION="Italian Giovanni Diodati Bibbia 1649"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-itarive-1.0 b/app-dicts/sword-itarive-1.0
new file mode 100644
index 000000000000..f1fa574d4496
--- /dev/null
+++ b/app-dicts/sword-itarive-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Italian Riveduta Bibbia (1927)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ItaRive-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e001c21c59c77137dd1fe966f29112f6
diff --git a/app-dicts/sword-itarive/Manifest b/app-dicts/sword-itarive/Manifest
deleted file mode 100644
index 453eece0aa07..000000000000
--- a/app-dicts/sword-itarive/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ItaRive-1.0.zip 1528624 BLAKE2B a1dabd9a299b89b2b4bbc1449a807de407610b50c893abf8ae6945322171b23b1247557735f54f281dc7b6dd4a2589a6a492f2dc5c98f9eec35931ae04e2f197 SHA512 8dbbd97f4a35ec5493dc335ff280ae18054c539d5fe30096b857dd61ab566768f945176c013d57658851826d3874ae944fde111d4c9e89c875dfc55dbd569dc6
-EBUILD sword-itarive-1.0.ebuild 337 BLAKE2B 64c4c14f242bc7f163267d66254a26bf7e1e7c2e3310dec357ba5e655b84677054a91f546a82c8661cfdbffa9c5e996f7f51685265f4ddd00e744def89f07f37 SHA512 9d3972d9768be392e2492b16cdefcb2394b82a7417b39eec475a67f5922c6e59ec740c72d5d850da6d6d737621c2b4b992de61b67eeb256d82778a296379520c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-itarive/metadata.xml b/app-dicts/sword-itarive/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-itarive/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-itarive/sword-itarive-1.0.ebuild b/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
deleted file mode 100644
index cb59e8a12513..000000000000
--- a/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ItaRive"
-
-inherit sword-module
-
-DESCRIPTION="Italian Riveduta Bibbia (1927)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-jfb-2.2 b/app-dicts/sword-jfb-2.2
new file mode 100644
index 000000000000..360ca47f0a92
--- /dev/null
+++ b/app-dicts/sword-jfb-2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Jamieson Fausset Brown Bible Commentary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=JFB
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/JFB-2.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=02adf4c2206905c11f1f3c144fc0c5b7
diff --git a/app-dicts/sword-jfb/Manifest b/app-dicts/sword-jfb/Manifest
deleted file mode 100644
index 89536abe1672..000000000000
--- a/app-dicts/sword-jfb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST JFB-2.2.zip 5949350 BLAKE2B 4c8b2a0732f226fa602beee9d7e241e94f466e3389bfa5da46c97c8a2ff350e75a8481086c72b27660d1cd11bfc03343af2d784d837b6332867856a045e13528 SHA512 adacd2ad40e1a7fdb2d57b7665e675df201dc8de0ea6c3b352dc094e6a54c846efdecd33d54fe480fb1fe08d43df54d28f929ca0a191aa86214475b151c99007
-EBUILD sword-jfb-2.2.ebuild 343 BLAKE2B 74690a2ddb8a149f0c6d1d30fd9ea7be0c69193c89802acccea33385b023d2b926b80cdbce7e64a6a279b5aa9b9f201bd6a879c8e6685a34800cbb0945b4a03a SHA512 882e7700324e0c68dda7cd8120e4c4c4aadebadd00da26ff6a377d7090b93ac855e38af38367fbcac5d5acf2df9992729cbdfe58b24ed824bf4379f970545d9d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jfb/metadata.xml b/app-dicts/sword-jfb/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-jfb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-jfb/sword-jfb-2.2.ebuild b/app-dicts/sword-jfb/sword-jfb-2.2.ebuild
deleted file mode 100644
index 116520117d3e..000000000000
--- a/app-dicts/sword-jfb/sword-jfb-2.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="JFB"
-
-inherit sword-module
-
-DESCRIPTION="Jamieson Fausset Brown Bible Commentary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=JFB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-josephus-1.1 b/app-dicts/sword-josephus-1.1
new file mode 100644
index 000000000000..786a60df33b3
--- /dev/null
+++ b/app-dicts/sword-josephus-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Josephus: The Complete Works
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Josephus-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3ed397e9d2998978980ee5602d9741fd
diff --git a/app-dicts/sword-josephus/Manifest b/app-dicts/sword-josephus/Manifest
deleted file mode 100644
index 02fafbfd2c08..000000000000
--- a/app-dicts/sword-josephus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Josephus-1.1.zip 1633099 BLAKE2B 5e1a5d7e887e13729534f61e41a64cfd0e25f8e1574c6f677122c707885d1acdfd4c34b3edfec5420fef47d4f97b7fcec48fbcabe27a894cdd4b24f2b1087978 SHA512 9f8b4f29cc16d966f71fbe65c583eb7b69e5635f5bafbb7a9b3998d70240807513e9ff0f5f2752dc45bc137f65f74bcf539dda4b97ac83ced41a3b1b2e8c2d2c
-EBUILD sword-josephus-1.1.ebuild 342 BLAKE2B 72663b3fc0a65341db51138eed70b0a1d7ca1d9e5a0e040be469ed51f91f82f575296694c770f0b6b82e4a5203ed036889385de50c826008ff532b41b6b18bbd SHA512 5685bc9a085b841066e5e8a15810683514ffc3c10975583ca3feb79b0062f629fc9e1fc0c77ea173c1cd0e109602d8b0e57d52c2b8d429b792989c89785b7d70
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-josephus/metadata.xml b/app-dicts/sword-josephus/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-josephus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-josephus/sword-josephus-1.1.ebuild b/app-dicts/sword-josephus/sword-josephus-1.1.ebuild
deleted file mode 100644
index 1266fb6991c0..000000000000
--- a/app-dicts/sword-josephus/sword-josephus-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Josephus"
-
-inherit sword-module
-
-DESCRIPTION="Josephus: The Complete Works"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Josephus"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-jps-1.2 b/app-dicts/sword-jps-1.2
new file mode 100644
index 000000000000..2837cb036be4
--- /dev/null
+++ b/app-dicts/sword-jps-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Jewish Publication Society Old Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=JPS
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/JPS-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=aba802f396c8c3195c4e5a1b798e452e
diff --git a/app-dicts/sword-jps/Manifest b/app-dicts/sword-jps/Manifest
deleted file mode 100644
index b99209694e0c..000000000000
--- a/app-dicts/sword-jps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST JPS-1.2.zip 1086344 BLAKE2B 0d9875acda95a2fc204b9b21ee8828c89bf3d915f7d65543eef27f4ab17d3aa9ba3deb9b909601a6e4ba92aeb4a4e6fa7e9299cbdd4ac323e3692370206ffbb3 SHA512 fcc9dc8b552aa5074aab74086d2e3dd8f12b5419d1d9208bb3ea4bc86117bac5d69e3d3ef118d507317aa076ae1480774973d30904234cc6d478822b324c1844
-EBUILD sword-jps-1.2.ebuild 344 BLAKE2B 3116d4b0c5a3ec42baad13594bf588730857c3cf1890491f168abdab99d584b09f786be56005c0fac82e57425eb9922bd6adc2356755f4ec6effd10265a38a5c SHA512 d4fd91c7d09cf377856e15e8fb63d6dc4f5788d8f10a4ba7ee7f94b08d212a6a663a246847095db228a1b5d80973b77c1d22b886a8461017db8214d47f2ec0ae
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jps/metadata.xml b/app-dicts/sword-jps/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-jps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-jps/sword-jps-1.2.ebuild b/app-dicts/sword-jps/sword-jps-1.2.ebuild
deleted file mode 100644
index 50d8ff7327ce..000000000000
--- a/app-dicts/sword-jps/sword-jps-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="JPS"
-
-inherit sword-module
-
-DESCRIPTION="Jewish Publication Society Old Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=JPS"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-jst-1.1 b/app-dicts/sword-jst-1.1
new file mode 100644
index 000000000000..02e0bba41eab
--- /dev/null
+++ b/app-dicts/sword-jst-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Joseph Smith Translation
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=JST
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/JST-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=34e74518381df3615e097e64ce6793e4
diff --git a/app-dicts/sword-jst/Manifest b/app-dicts/sword-jst/Manifest
deleted file mode 100644
index b9aac8427c23..000000000000
--- a/app-dicts/sword-jst/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST JST-1.1.zip 1446738 BLAKE2B ad5bd12e82d6aec2bcac4f2052852bbf619b08e9fe135750b0eb6b1fcab31f8acf2227f24a7b2f998eb8b9f9991def6c052619db75b85de251cae1a8f53c692c SHA512 0fe3fdae23d95dcaab3ff7b3a6c7768d4f98e15c2771584bd501e35738f8b1d164c1706ee5d5da0ecc6c62ec955fd23dcd9cb7df55671685cc0d640abd7bed11
-EBUILD sword-jst-1.1.ebuild 328 BLAKE2B 3c5d179b72ae45a0bd1f2098dc06ab8edca6de4acd801445e92587138d5b1f6af6db2cfe6e1367623dc111c8e23732492fc2c54122b13aaf164b0b866e73e3bd SHA512 c2f9fa26c7fc9e5bd6d0f62ee3294c7097156f884435d69c3e6e2b6de6cd4b381a83dbaf148f65d44b7da9f5db452a3a845569904bc4bae39900df0cd66f191b
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jst/metadata.xml b/app-dicts/sword-jst/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-jst/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-jst/sword-jst-1.1.ebuild b/app-dicts/sword-jst/sword-jst-1.1.ebuild
deleted file mode 100644
index 1e1d80522c23..000000000000
--- a/app-dicts/sword-jst/sword-jst-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="JST"
-
-inherit sword-module
-
-DESCRIPTION="Joseph Smith Translation"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=JST"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-jubilee2000-1.1 b/app-dicts/sword-jubilee2000-1.1
new file mode 100644
index 000000000000..b805340eab37
--- /dev/null
+++ b/app-dicts/sword-jubilee2000-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=English Jubilee 2000 Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Jubilee2000
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Jubilee2000-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=8ca589cfe4419553fe4c8e0bd4a7d0f1
diff --git a/app-dicts/sword-jubilee2000/Manifest b/app-dicts/sword-jubilee2000/Manifest
deleted file mode 100644
index c138058e4a4e..000000000000
--- a/app-dicts/sword-jubilee2000/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Jubilee2000-1.1.zip 1457787 BLAKE2B 95c846f65b30e053fd4c686577359db7af796a72e7e44b596a463db02eb9e09bc4c4982e5e9ad3fcdc4332514a8e4ecb4046afe7f64cc51aa34beae1a2ff269a SHA512 d8efc7bbf96873bfdbcce77e4747c716cccbea9a47b85260242f114d23763c9c92c1ace50a987ba9c908e92a2379b89f34a057082bb1d1cb6e9718ad3c944927
-EBUILD sword-jubilee2000-1.1.ebuild 345 BLAKE2B ebe986d509dc86d7a7346f7c121178c855f046df6379fbbaa5815d9401314f7070622f126b1f293901fac57172bdd86a4f727165cf748a7af104c2da3d01d1ed SHA512 390031bd2fa2d582f7dc2706b831c5204c431f0c2101dccac97092d8924d7396afd286c6117cbb635b6c2219a88c0a3973e126aaca47640da4938aa4ebcb9f2b
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-jubilee2000/metadata.xml b/app-dicts/sword-jubilee2000/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-jubilee2000/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild b/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild
deleted file mode 100644
index c796843a03a4..000000000000
--- a/app-dicts/sword-jubilee2000/sword-jubilee2000-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Jubilee2000"
-
-inherit sword-module
-
-DESCRIPTION="English Jubilee 2000 Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Jubilee2000"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-kekchi-1.5 b/app-dicts/sword-kekchi-1.5
new file mode 100644
index 000000000000..87ce53f1742c
--- /dev/null
+++ b/app-dicts/sword-kekchi-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Kekchi Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Kekchi-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=0a0d32b2075d4fa0aed1feb20e936427
diff --git a/app-dicts/sword-kekchi/Manifest b/app-dicts/sword-kekchi/Manifest
deleted file mode 100644
index 4b191996baea..000000000000
--- a/app-dicts/sword-kekchi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Kekchi-1.5.zip 1676116 BLAKE2B b15c9b40738e306d06837b07823e5bf95bc7355fdeb858af2c6b4aa89c1b474fb40b9c58c14688b1bff90176a03fc0a781a3112fcc3b049f4216115e20911ed9 SHA512 e45f32509e478b9ab2c71cd0abd532784c879608f83602eef548e93d4af868e598ff342fbe4a53100991050fefb06ac570a1389f0849cb27dbbedc957241573f
-EBUILD sword-kekchi-1.5.ebuild 321 BLAKE2B 8d0c778b9a02e8e16c220cd462c456d6a53e1b6a94570ce5e521ba02c6e8623d5499102b8fc2bf5e89348ab0f84f85eca332762de2852b0e549ba4af63aa45f5 SHA512 5230bdbdb01ea8f49139542f706f4713fe43ae8700816bc3af653ed8c4db6ae7ef2fe76ebd0a1b46516ceb71e7d68229d3423e54a483b084602993ad14ba718d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kekchi/metadata.xml b/app-dicts/sword-kekchi/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-kekchi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild b/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
deleted file mode 100644
index afc4c38844b7..000000000000
--- a/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Kekchi"
-
-inherit sword-module
-
-DESCRIPTION="Kekchi Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-kjv-2.3 b/app-dicts/sword-kjv-2.3
new file mode 100644
index 000000000000..16dfd30d4a13
--- /dev/null
+++ b/app-dicts/sword-kjv-2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=King James Version (1769) with Strongs Numbers and Morphology
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/KJV-2.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=d7ceef45e2574b58b35220ba41dc58fc
diff --git a/app-dicts/sword-kjv/Manifest b/app-dicts/sword-kjv/Manifest
deleted file mode 100644
index 88ec273d006c..000000000000
--- a/app-dicts/sword-kjv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST KJV-2.3.zip 3641094 BLAKE2B cdcd9efa60675075e3578efe5684d7fa7756c6940a365bc623433c370d2a1acd5d4547f7f37d74f92e9a6d7a15587f067e3bb52f4d1496f4be44ff34e2203ed0 SHA512 2d635ef0824994e9fc70e1a8c03323eb346af00b7e4b2351825451a5b045f3e9977c385ce3a3c82bfc1ef9009247aca082a3f755ca781ce71c2591899d410af2
-EBUILD sword-kjv-2.3.ebuild 360 BLAKE2B 47ee63c68ae66d9d04d5b5087c3c5b7ed740814fb25ed1776a91e8d5625f6114ae40a5b3a61622053563140af6c0e5c7d888909dc031a65334410b05febd45e1 SHA512 1788d960eef0bf4d6fd70a8b9836a622789c2fc8766b2b6627c9b8fce4178ce961e9a1c7cace5fe83d880aeb1c4b35095444cf19113580f17cfd24b71ae5f87b
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kjv/metadata.xml b/app-dicts/sword-kjv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-kjv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-kjv/sword-kjv-2.3.ebuild b/app-dicts/sword-kjv/sword-kjv-2.3.ebuild
deleted file mode 100644
index 5c61de04a92f..000000000000
--- a/app-dicts/sword-kjv/sword-kjv-2.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="KJV"
-
-inherit sword-module
-
-DESCRIPTION="King James Version (1769) with Strongs Numbers and Morphology"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-kjvd-1.1 b/app-dicts/sword-kjvd-1.1
new file mode 100644
index 000000000000..c8e172b951c9
--- /dev/null
+++ b/app-dicts/sword-kjvd-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=King James Dictionary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVD
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/KJVD-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a5cc974c46bcfbec216da676a990942e
diff --git a/app-dicts/sword-kjvd/Manifest b/app-dicts/sword-kjvd/Manifest
deleted file mode 100644
index 0d45893945f6..000000000000
--- a/app-dicts/sword-kjvd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST KJVD-1.1.zip 102890 BLAKE2B 70f9bc653e77209f32983564ab5386101c6d1b60b157b76271cb19dbd9bd709f11878a89319ac9a178151352995565688a82f4689ddcf326c76f4aa78cc2850b SHA512 80f761b4ea83af42d36a46df92002de100ba37cade66d8c06528d0a5a52ac8a029e0add06433887c256771323324393e9bd18e9b1e043768e878a818cc17b9fb
-EBUILD sword-kjvd-1.1.ebuild 327 BLAKE2B 9467a6c6d2e1e02b57825b004d61871957263a2e31c95f9337ff7bce425d349314bed465e99899ce14c1d5092ff413a7d76d16443b9f5635eb52d358ca9551e3 SHA512 20d2bd284420838b9b082e289be0a555979c4eb2a71bd3cd8078e01434b2fd324a6ed0fca672368edd4b5009e3a5fe0882c014d2907fca9ca7d42c4527e78e13
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kjvd/metadata.xml b/app-dicts/sword-kjvd/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-kjvd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild b/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild
deleted file mode 100644
index d33229795642..000000000000
--- a/app-dicts/sword-kjvd/sword-kjvd-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="KJVD"
-
-inherit sword-module
-
-DESCRIPTION="King James Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVD"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-klv-2.2 b/app-dicts/sword-klv-2.2
new file mode 100644
index 000000000000..285f2d652546
--- /dev/null
+++ b/app-dicts/sword-klv-2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Klingon Language Version of the World English Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/KLV-2.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=f0a30930803df6141a7f14eb471de2d8
diff --git a/app-dicts/sword-klv/Manifest b/app-dicts/sword-klv/Manifest
deleted file mode 100644
index f0c20148ce6a..000000000000
--- a/app-dicts/sword-klv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST KLV-2.2.zip 1519608 BLAKE2B 4026a94af8ecd4196f69690460b34e49ae9b0ae131865ba7841d913fe5a8c76316f9ea2faf0fda8b4a783bddb2ee30494de3e56cbbea54718cd19db00ad72648 SHA512 2c5f3a366363bab66d008e1b774143c9d55d704dcd67db11c46eeaae99d4bb68a2c70e25dd5698bec83d1b82e039e790a525db7d775e5adc8b823c717c422740
-EBUILD sword-klv-2.2.ebuild 355 BLAKE2B f3fe713c7dd84bfee6fde7090c6cf5636ca943c551c4103d3eb3359e3efb08f70d5fe961eb9f3feb7eb91f5cca30ed7ec4609d3ba09f706cb2fbd721ed08976c SHA512 5c7a7cdf151916577284b25843bdaa84f2ae67952e06b4645830658c87774eb2c1fe00a1ee034009afe52b68b02164fa405dca878a2db353522b6887bf43cf2f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klv/metadata.xml b/app-dicts/sword-klv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-klv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-klv/sword-klv-2.2.ebuild b/app-dicts/sword-klv/sword-klv-2.2.ebuild
deleted file mode 100644
index 9a49ac215028..000000000000
--- a/app-dicts/sword-klv/sword-klv-2.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="KLV"
-
-inherit sword-module
-
-DESCRIPTION="Klingon Language Version of the World English Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-klven_iklingon-2.1 b/app-dicts/sword-klven_iklingon-2.1
new file mode 100644
index 000000000000..9f44cc202f9e
--- /dev/null
+++ b/app-dicts/sword-klven_iklingon-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Klingon Language Version English to Klingon mapping lexicon
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLVen_iklingon
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/KLVen_iklingon-2.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1b5edf8cd99584d60500e5f055cb442a
diff --git a/app-dicts/sword-klven_iklingon/Manifest b/app-dicts/sword-klven_iklingon/Manifest
deleted file mode 100644
index 76481894b166..000000000000
--- a/app-dicts/sword-klven_iklingon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST KLVen_iklingon-2.1.zip 10484 BLAKE2B cbce36ac41f695efbdb89fe360ee69a4f8d676af4e9d03ea68be2d8360827d8135db1bf8d2641759a1ca88fb57d74fb5fb2a6c29af827e3bb1504136702f80a2 SHA512 7a6422d96e4524efd8f12acb9ae52ac561283db040ecae4127ab43c124b4e26bce584d243ce76d3eb644c3365422308b3087e36e2c59fef66953d8c392c3f53e
-EBUILD sword-klven_iklingon-2.1.ebuild 385 BLAKE2B f527620ca6f993a72d3211971baf69d36318e10feb99cd8e0997c1e8296bd7611b46f295f3696b91909d36fe00e2e3900bd53aa0140fafe158929a873b3647c0 SHA512 654cded2baf8e45b0aae59fbdeb6bef8aa8d3698c1c93ffaa4fe45f36eadc9723f7f414cc7c475247eba13106212657ea1dcb8fa19c5c44c3d6829f6dbbe015c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klven_iklingon/metadata.xml b/app-dicts/sword-klven_iklingon/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-klven_iklingon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild b/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild
deleted file mode 100644
index f33db831bd5c..000000000000
--- a/app-dicts/sword-klven_iklingon/sword-klven_iklingon-2.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="KLVen_iklingon"
-
-inherit sword-module
-
-DESCRIPTION="Klingon Language Version English to Klingon mapping lexicon"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLVen_iklingon"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-klviklingon_en-2.1 b/app-dicts/sword-klviklingon_en-2.1
new file mode 100644
index 000000000000..89db7042e5ab
--- /dev/null
+++ b/app-dicts/sword-klviklingon_en-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Klingon Language Version Klingon to English mapping lexicon
+EAPI=6
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/KLViklingon_en-2.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=bc6b740d79bcb1ddf63a47bab3d4a9ac
diff --git a/app-dicts/sword-klviklingon_en/Manifest b/app-dicts/sword-klviklingon_en/Manifest
deleted file mode 100644
index 4578ce7a2d21..000000000000
--- a/app-dicts/sword-klviklingon_en/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST KLViklingon_en-2.1.zip 9892 BLAKE2B a38c7eb5cf290761d8ccfca9719af60d7a8dd955817bfa47d8a423f39ae4d9edb22fa3b486ba1cc506ada15031cb998434f2cb754712922eb570a6a681fe9ff8 SHA512 4e45c5f0e3b2c7b7dadf08141e65e1bc8130ce9c75c56752b9d3216d2dbfaf249e774565d617473754acf4ecd20bacbea4d0789366cbbff15e3c688b18b2d795
-EBUILD sword-klviklingon_en-2.1.ebuild 386 BLAKE2B 834b153b5e418c21fa68c322be375a82023ce35048451304217ea8282da54fd532a235b20afa353544f69ca13e5094ed6477281b4553a195907b5684b44cb8fa SHA512 6ae20b1d562238ab7e3711705a8ee8639d54b8e904941641bfe65883fb760a8655787c6ed64be0191ae8f229cd37c3983e62afb92a925eb274cad3c750043041
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-klviklingon_en/metadata.xml b/app-dicts/sword-klviklingon_en/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-klviklingon_en/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild b/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
deleted file mode 100644
index 70cf8f3b2939..000000000000
--- a/app-dicts/sword-klviklingon_en/sword-klviklingon_en-2.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SWORD_MODULE="KLViklingon_en"
-
-inherit sword-module
-
-DESCRIPTION="Klingon Language Version Klingon to English mapping lexicon"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=KLViklingon_en"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-korean-1.1 b/app-dicts/sword-korean-1.1
new file mode 100644
index 000000000000..d3d4d1070540
--- /dev/null
+++ b/app-dicts/sword-korean-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Korean Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Korean
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Korean-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=82b4b4e5e2245b75db7ff817a2ce2672
diff --git a/app-dicts/sword-korean/Manifest b/app-dicts/sword-korean/Manifest
deleted file mode 100644
index 0b291cf676ec..000000000000
--- a/app-dicts/sword-korean/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Korean-1.1.zip 1431342 BLAKE2B beb4eca2d2cbfd95aae113c939003acb835f82689c9a0cbd0732a77ae1e6e3d96cebe540b8ba8f89415d7ee7b6caf64d5e6ae66bec030ce3b566b282f4ac8409 SHA512 5f6eb7459743d37165efdd5c6e042c02fdbb5fa041cb95b748312f5e19045a085ac3439329f4975847e3f93fb3118ca4a49706d9d57166780c3ee19596b73d71
-EBUILD sword-korean-1.1.ebuild 317 BLAKE2B 5544e891336a4c579adde5c5598fa02d91941d73f06c4db4827b1afdb8525d212797e858bfc743422e349f58f95c80c4646b8f4be88ef5c977c15982b9242898 SHA512 cd8c79bd692ede1e274cbbd8101fae946536c26b957c939a288b4a3a77528d3b06b556af3d76df39592f4575bd673eeeb6519a0f24fb71376e6a5595c4de079c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-korean/metadata.xml b/app-dicts/sword-korean/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-korean/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-korean/sword-korean-1.1.ebuild b/app-dicts/sword-korean/sword-korean-1.1.ebuild
deleted file mode 100644
index 2561259de88d..000000000000
--- a/app-dicts/sword-korean/sword-korean-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Korean"
-
-inherit sword-module
-
-DESCRIPTION="Korean Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Korean"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-la_en-1.1 b/app-dicts/sword-la_en-1.1
new file mode 100644
index 000000000000..cba6555855d2
--- /dev/null
+++ b/app-dicts/sword-la_en-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Latin to English Glossary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/la_en-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=25f5c91799f2793efff4ee75b8bf6d9b
diff --git a/app-dicts/sword-la_en/Manifest b/app-dicts/sword-la_en/Manifest
deleted file mode 100644
index 64346533fd71..000000000000
--- a/app-dicts/sword-la_en/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST la_en-1.1.zip 104195 BLAKE2B c279d01378d08dbac2f9b588a8bdd7b066eb29090ade3080f79ae4563f97f28166cd7c5f6ad5b735771d1e350b4447c2ce5f747cfc5faf9a7bcb3d490dc588ed SHA512 ebb6345983a533264890b908b22d54b72d1d490f0b37329d1bb202231e3542a848177c78a0c4a1cf06a523a6cdb5cc08fee386901187726419ea7a127c468830
-EBUILD sword-la_en-1.1.ebuild 333 BLAKE2B b8b561e024e8a7656b42bd35fd1dba72bbdcbb9c298187a10cf38f641671089bcec746718a7fac6a440f8dcadf2839af1a0ad20b6a344a1c6a008a8f63c40010 SHA512 65e5b8c8e189301bbce949fc24e1825149dd98f36c817e387cd87c020c9979328b4755bc7e2ad5aa53be184ae7a81545f18b1cf3c0bd408128ad07d368884270
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-la_en/metadata.xml b/app-dicts/sword-la_en/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-la_en/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
deleted file mode 100644
index cbaf8ce8c12e..000000000000
--- a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="la_en"
-
-inherit sword-module
-
-DESCRIPTION="Latin to English Glossary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-latvian-1.1 b/app-dicts/sword-latvian-1.1
new file mode 100644
index 000000000000..6ecdfaa26c62
--- /dev/null
+++ b/app-dicts/sword-latvian-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Latvian New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Latvian-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=eb61cea36b9d6c3b5db9c948c3f803f4
diff --git a/app-dicts/sword-latvian/Manifest b/app-dicts/sword-latvian/Manifest
deleted file mode 100644
index 9a54f6f35532..000000000000
--- a/app-dicts/sword-latvian/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Latvian-1.1.zip 348255 BLAKE2B 6ef050e9b1ba9e6079b1ffb1397063557f62f5921454b38c2a8eb774c86212ae215e0e32db26ccf282b47901fd0eb2d4abd455a11f642d59a8dcfee9710d8989 SHA512 bf2246661bd30c378bfece88127bc83328ad549a3e3f183574f19a408a11d0a3b115b47f3f274057d88d207eea4e76c8c8101014715b891b88a4304bd573121f
-EBUILD sword-latvian-1.1.ebuild 328 BLAKE2B 698685f36d7b6d177c2270337fd7d7acb6986553e4ba9702b477a96fd8bb6a83494c3d92c101c67663be42f9c719cc321890de57ef2252b103673a824ad1c4e7 SHA512 b5f287ce378ccff070ffa70ea779004565e911651381e47dd4dd00f7fe8df1960854732f5094aa1581cc2854faadf990ea4c6fdfdb41107100f07cf7cdce5c08
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-latvian/metadata.xml b/app-dicts/sword-latvian/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-latvian/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-latvian/sword-latvian-1.1.ebuild b/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
deleted file mode 100644
index 1a25f2cd8e28..000000000000
--- a/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Latvian"
-
-inherit sword-module
-
-DESCRIPTION="Latvian New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-lightfoot-1.0 b/app-dicts/sword-lightfoot-1.0
new file mode 100644
index 000000000000..4a97cb07b362
--- /dev/null
+++ b/app-dicts/sword-lightfoot-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=John Lightfoot Commentary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Lightfoot
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Lightfoot-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=87e47528a016e068ecedaa156d49f5fc
diff --git a/app-dicts/sword-lightfoot/Manifest b/app-dicts/sword-lightfoot/Manifest
deleted file mode 100644
index 889bcf22a42e..000000000000
--- a/app-dicts/sword-lightfoot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Lightfoot-1.0.zip 644888 BLAKE2B 78ee5fa9de454fe525a75813a6e035bdca26b3df119fff68a169bc42b90c4211ad7b5f273d01f8b56c08c4c422e87ac0f734c43772a1d4e076210b797ffbe161 SHA512 87446451899e6a24198ddbf716a8d4114ccc76d0f68a62dd131c546386cd8deba916f9a47c3fdd6820d2b0669423fdb7eb666878031b91cc36f068305b7c63cb
-EBUILD sword-lightfoot-1.0.ebuild 341 BLAKE2B 0d087781817232afd7b66cf17c85ec0f6cc8ccb5394b2d29ffc6bf627d2eaf5cb96d2d2f74b9f7ca7ebf433a0b6efd4799b6480f78891712117e7ab67da19e6a SHA512 ac12a2fd002e10fc4efe1e8c7df06c8f05e2f21e5335eda55fd761d30ea1c9d8591aa6d41f36b26d92a1452dbcca5202c6d03d6c743d5f1844a38fa6c41dd263
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-lightfoot/metadata.xml b/app-dicts/sword-lightfoot/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-lightfoot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild b/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild
deleted file mode 100644
index 15c519752cb8..000000000000
--- a/app-dicts/sword-lightfoot/sword-lightfoot-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Lightfoot"
-
-inherit sword-module
-
-DESCRIPTION="John Lightfoot Commentary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Lightfoot"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-litv-1.3 b/app-dicts/sword-litv-1.3
new file mode 100644
index 000000000000..584d89ea3632
--- /dev/null
+++ b/app-dicts/sword-litv-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Green's Literal Translation
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/LITV-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2991d2ce2f93758a891165ee629e7fbb
diff --git a/app-dicts/sword-litv/Manifest b/app-dicts/sword-litv/Manifest
deleted file mode 100644
index e2a4cd04a73e..000000000000
--- a/app-dicts/sword-litv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST LITV-1.3.zip 1435344 BLAKE2B c60241f414a5cc9b747029d65dd79fae0634cf616f5a0af5d0213b9ba171b5677870bf52b4a529b3d59c1193783551f465efd72ff22cee35005e0f59d92fb943 SHA512 9aea030c96277bc591dac7bb45230c2ea006dbd241b2ada7be086a350ab0c5de8face5153c99d46ed35ecb00956f327cb1c7db0ed6f6d4c8ae0334085e6974b2
-EBUILD sword-litv-1.3.ebuild 328 BLAKE2B 2d22f1b5d2d945232d496e0e5b341f38aac3e31155068fa862432563626c9d96f780115ac8fc4136a303d1893c49107502e19985efd2dca2de8fd6b0ec05ee00 SHA512 65cd8199faac63586d4451fba42e7dee87851fe5e87d79fef6bb47f19a0ea72e055f18b88181d17e625f3f97bc6949b0bd7e7a21460582475bd3bcfd1e1709c9
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-litv/metadata.xml b/app-dicts/sword-litv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-litv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-litv/sword-litv-1.3.ebuild b/app-dicts/sword-litv/sword-litv-1.3.ebuild
deleted file mode 100644
index aa990cef7331..000000000000
--- a/app-dicts/sword-litv/sword-litv-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="LITV"
-
-inherit sword-module
-
-DESCRIPTION="Green's Literal Translation"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-luther-1.1 b/app-dicts/sword-luther-1.1
new file mode 100644
index 000000000000..e9cda4ba6acd
--- /dev/null
+++ b/app-dicts/sword-luther-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Luther's Commentary on Galatians
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Luther
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Luther-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3e8c9b5aea78462f1e2b8c9eee435183
diff --git a/app-dicts/sword-luther/Manifest b/app-dicts/sword-luther/Manifest
deleted file mode 100644
index 839699831940..000000000000
--- a/app-dicts/sword-luther/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Luther-1.1.zip 3041937 BLAKE2B f2764b8e4c1447a9b7dc5ccbd717990bca9442cebdda71b408786fc141148a77c5a62055ca9a7df493d9e8f55b1e98bd57222c5883fc0c1a5df6a46c1b0c2867 SHA512 8054679c205f2d498cc3677d7cb71e461a6640f414863077d4680de1474a55b85ca4f1b74aadff4f91b671c4709d7a84ea348d57a57c87ee8b39b1bf75df7c4f
-EBUILD sword-luther-1.1.ebuild 342 BLAKE2B 392047a61b28c3603c52bd07b4dc75d12692080e441ccc35093d30f8fb1374c41f542bb25770a47d4a08766e7553b5dd647f2970e614929a9d84d53c79180ac6 SHA512 010c39639bf0bc9d3405b8b4c748ec1448add80141ca84acf1b78e1bd0d1ef3390ee4cb12664e14d371cbc16f5d4f971dcc011365e258237b20178a00f4bb089
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-luther/metadata.xml b/app-dicts/sword-luther/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-luther/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-luther/sword-luther-1.1.ebuild b/app-dicts/sword-luther/sword-luther-1.1.ebuild
deleted file mode 100644
index bb244c39b0d8..000000000000
--- a/app-dicts/sword-luther/sword-luther-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Luther"
-
-inherit sword-module
-
-DESCRIPTION="Luther's Commentary on Galatians"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Luther"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-mak-1.0 b/app-dicts/sword-mak-1.0
new file mode 100644
index 000000000000..10b6b96119df
--- /dev/null
+++ b/app-dicts/sword-mak-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Matthias Ansorgs Kommentar
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=MAK
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/MAK-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=6fd4f0ea9c8767129c2b6a981d073f9e
diff --git a/app-dicts/sword-mak/Manifest b/app-dicts/sword-mak/Manifest
deleted file mode 100644
index 6984f257eb04..000000000000
--- a/app-dicts/sword-mak/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MAK-1.0.zip 365363 BLAKE2B 06609b47fdf89b4c1f22df60b8b73ecc7f9935af0a5b45476a8e805256e8dbf11b7e335410d392ef226c19a97fab249648d65496923d743b5c9ebbc5dc318529 SHA512 42bbcefda76fde6638c0951cee412b68ad2d1e3b39519f2c749f77fe8a65a6ddd4a0cd7f41e951c8091ae7120cd86f261ae39602cebc13153ce72fdc1f4b5fd2
-EBUILD sword-mak-1.0.ebuild 330 BLAKE2B d86cb0cf1c6b31a2a84f9c659ff61020c6a66f66409ae23629b253e5ef8605ee4d25525a57728a00737a6bb29bde20aa427896857693699194febb9285a7b6bb SHA512 54b7df5e777a99995cad19776303b8a8a6c72003b0418c42a59b020364d2040b9cfce69dd775f93ea372415f5478e2ec4a006ac446391edd0b1c989d068b210d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mak/metadata.xml b/app-dicts/sword-mak/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-mak/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-mak/sword-mak-1.0.ebuild b/app-dicts/sword-mak/sword-mak-1.0.ebuild
deleted file mode 100644
index 93583742f6d4..000000000000
--- a/app-dicts/sword-mak/sword-mak-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="MAK"
-
-inherit sword-module
-
-DESCRIPTION="Matthias Ansorgs Kommentar"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MAK"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-manxgaelic-1.1 b/app-dicts/sword-manxgaelic-1.1
new file mode 100644
index 000000000000..9c652fe5b756
--- /dev/null
+++ b/app-dicts/sword-manxgaelic-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Manx Gaelic Scripture Portions
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ManxGaelic-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=51a55a263c24bf98b56bdb34b8326a50
diff --git a/app-dicts/sword-manxgaelic/Manifest b/app-dicts/sword-manxgaelic/Manifest
deleted file mode 100644
index aabddd3b1605..000000000000
--- a/app-dicts/sword-manxgaelic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ManxGaelic-1.1.zip 152306 BLAKE2B d38d790aa31e6d7f936c409d232bf0009bdb45c6e2a4dcc8dc0f15365e00adc56dfb3aab047b28bcfe1f2b9f525ebcc45c7c9229ed917e17b359e30ee9fcb80a SHA512 1d164c71bb04c57ec9347552904f46863d1596f56819217fbe20aa1a359d386224d02ddf4867fb412b932ab6ec2841f77b623f4bd6fd74f8a4b95ea0e108413b
-EBUILD sword-manxgaelic-1.1.ebuild 343 BLAKE2B 99c788c8f048b5b39cb1b0308f223fec7df25e9824c65e18f91400625687355feac8ef02109ff442655fe159ae54607081a2d43dc87e0ae717651b27983d9f38 SHA512 00900ee6b0c2293242c7aaf715f05f5645a7d7fcedac73c6c1328fec2cab7b30e5fb17d8032ce07dc3590ed86e24ae38ed90fd21e8430e3e27bcc292ecf5cbfa
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-manxgaelic/metadata.xml b/app-dicts/sword-manxgaelic/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-manxgaelic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild b/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
deleted file mode 100644
index ba60b92ce138..000000000000
--- a/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ManxGaelic"
-
-inherit sword-module
-
-DESCRIPTION="Manx Gaelic Scripture Portions"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-maori-1.1 b/app-dicts/sword-maori-1.1
new file mode 100644
index 000000000000..22f6d1e1087b
--- /dev/null
+++ b/app-dicts/sword-maori-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Maori Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Maori-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=497a32d7871bec05f2d0ccdb3230a0ef
diff --git a/app-dicts/sword-maori/Manifest b/app-dicts/sword-maori/Manifest
deleted file mode 100644
index a1fb5fce4217..000000000000
--- a/app-dicts/sword-maori/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Maori-1.1.zip 1397366 BLAKE2B da8e3f0cdbb27d2e83558cad74b73c352bf518e4f01ff10dd6c1a58ca2efc2697d5ae2898ff0161dd38bb1f0a9e1bcde0ee411f81a5de3a53fbf205a7400e38d SHA512 366d56a8742262111abcce59b20862428c67269ad0af8acd38d0a847271a220cabb177949dd1df60942c2b606d0011f0340f12aa6489a3d6d12b641d71db1bc5
-EBUILD sword-maori-1.1.ebuild 314 BLAKE2B 192fca565e5c618c156441f3c1a9dc5246d2db85ba455ebec08cd2befa78a10fc021b18f3a762812e8101fde7cf8d4812a3c31142af9c1788fabe17e74489179 SHA512 1d9d6016f6033b4a58d5b4f6cd56245d669c76b172d22534dd668f0296a0a43d2d5199b587fbc98c8df272aa89ed86c1a05b2ccdf95cccda81eab167a16a5188
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-maori/metadata.xml b/app-dicts/sword-maori/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-maori/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-maori/sword-maori-1.1.ebuild b/app-dicts/sword-maori/sword-maori-1.1.ebuild
deleted file mode 100644
index 7ce01ee78747..000000000000
--- a/app-dicts/sword-maori/sword-maori-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Maori"
-
-inherit sword-module
-
-DESCRIPTION="Maori Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-mhc-1.6 b/app-dicts/sword-mhc-1.6
new file mode 100644
index 000000000000..455a501253a4
--- /dev/null
+++ b/app-dicts/sword-mhc-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Matthew Henry's Complete Commentary on the Whole Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=MHC
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/MHC-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=1b2951ab3d49631cf8320893e8c8760e
diff --git a/app-dicts/sword-mhc/Manifest b/app-dicts/sword-mhc/Manifest
deleted file mode 100644
index d18a345e01bb..000000000000
--- a/app-dicts/sword-mhc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MHC-1.6.zip 15828741 BLAKE2B 96560c963e870ee3de18263328a1df3a50697aedf858250f321414d18bed37efdebc2547ca7fd7702ae9c2427174ee132795a13af33cba1ddff778814680d9e0 SHA512 f14f59588f76a0d4b463190bdd3ff8b3e2e16b2252999c83a2e3f0d3442019c4e52730234a5a748b19fdd5e888cb509b0555b1f95ade0562199b081c6977646a
-EBUILD sword-mhc-1.6.ebuild 358 BLAKE2B a2ebd0bc8bd1b46960a81284740b06ea9661fe695ba65d0cf87fd4700fe4d1450f42a039b09efc9a7638f5e2885828f16a8608f18ec91a1322a14a9fa50d14fa SHA512 be79dc6fba5da3092f7afd2b9b937547a18b3cd1f648240d30ba0f60e412434aafd1035498a77833063ebbf298ecd46d0c1c364f8c6ba8d78866986e22638732
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mhc/metadata.xml b/app-dicts/sword-mhc/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-mhc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-mhc/sword-mhc-1.6.ebuild b/app-dicts/sword-mhc/sword-mhc-1.6.ebuild
deleted file mode 100644
index 6b2bee15c6a0..000000000000
--- a/app-dicts/sword-mhc/sword-mhc-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="MHC"
-
-inherit sword-module
-
-DESCRIPTION="Matthew Henry's Complete Commentary on the Whole Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MHC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-mhcc-1.1 b/app-dicts/sword-mhcc-1.1
new file mode 100644
index 000000000000..3a5a380102e8
--- /dev/null
+++ b/app-dicts/sword-mhcc-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Matthew Henry's Concise Commentary on the Whole Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=MHCC
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/MHCC-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3dba39dd74d9586ceb6e20321489bce0
diff --git a/app-dicts/sword-mhcc/Manifest b/app-dicts/sword-mhcc/Manifest
deleted file mode 100644
index 99b1f9667603..000000000000
--- a/app-dicts/sword-mhcc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MHCC-1.1.zip 1457031 BLAKE2B 8c796089ddda8c442bc853b024853405fe062fca44c26fac77a77f394c64436e3ac7b806dd0223785255ebca3c9c3ade4c564cfeee6d8943ea36260935ff908a SHA512 de427b7fc70d66f47105cbd84286ac7ce6b0270fbb06ab1fdc829ad99c06de380ee198a52cbdfa56b4c50e7ccd8d57f41228accf42ffcfd2d3d614997b807109
-EBUILD sword-mhcc-1.1.ebuild 359 BLAKE2B 53f8eac9d73568c1c198da9ad57289dd15c1653dac98e5ab33631f790b16575cb16030b2e866e095e08ff2a0f97512e6e596fdfe23c458cc62b504d3bea84ef7 SHA512 dc546929ad3c21e61af2a803415707f587e290a9855ca98147733050c81828b289977d606fb100ac94c40edd9609b54849f6e2926dd8b678744ebd8529ac09f1
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mhcc/metadata.xml b/app-dicts/sword-mhcc/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-mhcc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild b/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild
deleted file mode 100644
index 5a80aae6eff9..000000000000
--- a/app-dicts/sword-mhcc/sword-mhcc-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="MHCC"
-
-inherit sword-module
-
-DESCRIPTION="Matthew Henry's Concise Commentary on the Whole Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MHCC"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-mkjv-1.3 b/app-dicts/sword-mkjv-1.3
new file mode 100644
index 000000000000..fb7b7a240e38
--- /dev/null
+++ b/app-dicts/sword-mkjv-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Green's Modern King James Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/MKJV-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=5932392bac14f2404eed60b8c08f43a8
diff --git a/app-dicts/sword-mkjv/Manifest b/app-dicts/sword-mkjv/Manifest
deleted file mode 100644
index 592324d27cf8..000000000000
--- a/app-dicts/sword-mkjv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MKJV-1.3.zip 1429038 BLAKE2B 50b781f6d6cf9a792eb353c8022a454a3da3cfe0e14facc4fda53f6e4b619f0f07e341258bcd258f9b3291ea7e67542f23c82ff1b9b08950272b80bf41f2b5d5 SHA512 2a6efa4f270cb783e122a73f1c66795237edd73da030b00654ae2e4ad43dc11ed4b9c59fbc0f64a9c3528bbc5f87ecdab207b24406a77714c7fd642e9e0613b4
-EBUILD sword-mkjv-1.3.ebuild 334 BLAKE2B 3ee137e24275394a13f44f8a244487afd9fb0f5db254260a1c39d3a9f3104a1be07f9ae3cc19a27b12bac7db84c27b7f5072d13aec1f1280b73da4171eb4ce43 SHA512 3896f105fc572e3ad818f12f1592f1dde8acaf21c46daa3f4e1600a1aafbcef8caf8472c22038afb97251d620671e293c05ecad22e1aa519e06011db03594013
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mkjv/metadata.xml b/app-dicts/sword-mkjv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-mkjv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild b/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
deleted file mode 100644
index 706b9190385c..000000000000
--- a/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="MKJV"
-
-inherit sword-module
-
-DESCRIPTION="Green's Modern King James Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-montgomery-1.3 b/app-dicts/sword-montgomery-1.3
new file mode 100644
index 000000000000..c98ab34a0d7b
--- /dev/null
+++ b/app-dicts/sword-montgomery-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Montgomery New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Montgomery-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=10610b5ad1bf25dbe039997c08ad4197
diff --git a/app-dicts/sword-montgomery/Manifest b/app-dicts/sword-montgomery/Manifest
deleted file mode 100644
index c0c560d84bf9..000000000000
--- a/app-dicts/sword-montgomery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Montgomery-1.3.zip 385461 BLAKE2B 945090c8a527c97aee35b05c2c640ab85f1a44f3f77bbba75e6fd091c256185e77c02fbeb27c502ccb07ce3124d3210c2acf6b1dc9eab64ec21e39bdb17c281d SHA512 29b434a1904c37d80b4d7f9da23f0fdc680b77341753bb35a3ad3e0c687683f1ee6cb2516b56761cec61366a606847784aa6336df6cff2e930b36726427f1b43
-EBUILD sword-montgomery-1.3.ebuild 337 BLAKE2B bd01ee847db0a087c1d00f4274fb94ced3db209e2ff1492ca8e9de1e32e6cc9c0594e2514c5d12f43e21ea481b3afa9e68845d333d5a58bd03d31c154d2b343b SHA512 55559dbbc8840f5f345cc776d25a793823d7026ce3ca0e36b826bb04fd260ad65da53749107d58b34e5df499a905ad38105d369df34986ec0643be8ed5e96800
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-montgomery/metadata.xml b/app-dicts/sword-montgomery/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-montgomery/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild b/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
deleted file mode 100644
index 41687518a816..000000000000
--- a/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Montgomery"
-
-inherit sword-module
-
-DESCRIPTION="Montgomery New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-murdock-1.2 b/app-dicts/sword-murdock-1.2
new file mode 100644
index 000000000000..3e9709a39e70
--- /dev/null
+++ b/app-dicts/sword-murdock-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=James Murdock's Translation of the Syriac Peshitta
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Murdock-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=bc4e638d3f8bb0f3cd31e1117ec6f028
diff --git a/app-dicts/sword-murdock/Manifest b/app-dicts/sword-murdock/Manifest
deleted file mode 100644
index 79a4a91a4c76..000000000000
--- a/app-dicts/sword-murdock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Murdock-1.2.zip 396395 BLAKE2B 9b14f7879a1754f1addb1e85024a873a084d560a2179e21124d59cd8ae5eb16fdb972241fd3c2eb786c3c17e81a9a64d6605459c96c631f5092c1d23ca3fb21c SHA512 a6d06a5157c6ebcb0b3d7689e76b5d04765a602f334b937d65260a4ed89cd92b316f0d792071a574364a501b55a449f9bb1af123abd05a49f2af7d87dddc5d02
-EBUILD sword-murdock-1.2.ebuild 357 BLAKE2B 770819d21b6b24bc559e00dec3ab96105307a822689ec53310e38404ffb0342b715a356c20b8ce9d5f0401b49875bba4722337c329920aae35977f91f91960fa SHA512 f8581c079a4d568c3b082f24b7eb9ef805d36eebca451c8f6acb0d6300a887aa306392c08636d7edcdbdd1111eba80abbc4bb3e4910d4da3e788cb8d7639a918
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-murdock/metadata.xml b/app-dicts/sword-murdock/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-murdock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-murdock/sword-murdock-1.2.ebuild b/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
deleted file mode 100644
index b4932f56ebda..000000000000
--- a/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Murdock"
-
-inherit sword-module
-
-DESCRIPTION="James Murdock's Translation of the Syriac Peshitta"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-nave-1.1 b/app-dicts/sword-nave-1.1
new file mode 100644
index 000000000000..2e5cede881d8
--- /dev/null
+++ b/app-dicts/sword-nave-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Nave's Topical Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Nave
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Nave-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=9950ac3451d0def85249a7fde4937212
diff --git a/app-dicts/sword-nave/Manifest b/app-dicts/sword-nave/Manifest
deleted file mode 100644
index 3b5534f3c848..000000000000
--- a/app-dicts/sword-nave/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Nave-1.1.zip 662427 BLAKE2B 6ef9c8b76812cf216bb1fc62b69419c3d181baad08fb95a57a012dd3e73aa605ea4c9e7651eeb561cb4be0b1fc81151ebbbe943a60cca43eede73f88ff67d7a2 SHA512 ed8aa568ff19ebf51d1e62697c8d74f5fc808fe27f2027d7772edfc7893722fa8ab63af6b0a0d2e20679fe856277d776a33ed72410f62bfa880ea322f3ed037e
-EBUILD sword-nave-1.1.ebuild 326 BLAKE2B 6b82bbad7e97222365079ba024977d7759d1a9279ffa1e06aa1e39c9752b60b8d62242f77fa5222f6511661732ca04e0fd9c138b09da6fa86ee910f843a59938 SHA512 0529511df9066e58154d1702a9dd82bec3df8aa079b332fe2fa8fcc720253808b3886eba974405030cefa79a47a9a20bd97bb500cda741937ad137d848f39547
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-nave/metadata.xml b/app-dicts/sword-nave/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-nave/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-nave/sword-nave-1.1.ebuild b/app-dicts/sword-nave/sword-nave-1.1.ebuild
deleted file mode 100644
index 701e4296095e..000000000000
--- a/app-dicts/sword-nave/sword-nave-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Nave"
-
-inherit sword-module
-
-DESCRIPTION="Nave's Topical Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Nave"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-norsk-1.5 b/app-dicts/sword-norsk-1.5
new file mode 100644
index 000000000000..157869f61b4f
--- /dev/null
+++ b/app-dicts/sword-norsk-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Den Norske Bibelen
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Norsk
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Norsk-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=b857a07cdd3806385169b34239db0626
diff --git a/app-dicts/sword-norsk/Manifest b/app-dicts/sword-norsk/Manifest
deleted file mode 100644
index 77b06de876c1..000000000000
--- a/app-dicts/sword-norsk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Norsk-1.5.zip 1418861 BLAKE2B e915b99acbc957b07a1a562c4eb6fee50e9ac3f5a81564676b18693ab43ef494c355e9a150955d0ec3d83df9618dda41e94e4691b80200d0d159d89ead79fe77 SHA512 8244cffd408f286d6b7cac59b1f40d208aabc50b1728c993bc95dab0808b0d866f30710b13b63dd70cc1e8f36cb6fd4a8ba787688b4eb632784139cf25542c43
-EBUILD sword-norsk-1.5.ebuild 326 BLAKE2B 52b865757b0c314bfde3268710858f3d61973b38bbbc20f2c16c9055d6281749c71024100c30489915b3aa532642ba4756881d67f75f6dcd1eb72dba1f0b191b SHA512 2b0aec2216400c2b674beb3043d415455479c6f4f33d9e5f2cb9bf6e61b6d176f45e59f0c79a14ab50d3fc539517edc29d583060b8824cfc4fc381aa27e909f8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-norsk/metadata.xml b/app-dicts/sword-norsk/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-norsk/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-norsk/sword-norsk-1.5.ebuild b/app-dicts/sword-norsk/sword-norsk-1.5.ebuild
deleted file mode 100644
index e4a1b9d6beb4..000000000000
--- a/app-dicts/sword-norsk/sword-norsk-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Norsk"
-
-inherit sword-module
-
-DESCRIPTION="Den Norske Bibelen"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Norsk"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-orthodoxy-1.0 b/app-dicts/sword-orthodoxy-1.0
new file mode 100644
index 000000000000..397ab8ed9bb9
--- /dev/null
+++ b/app-dicts/sword-orthodoxy-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Orthodoxy by Gilbert K. Chesterton (1874-1936)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Orthodoxy
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Orthodoxy-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2b5da080762e64121435c076fb001aa4
diff --git a/app-dicts/sword-orthodoxy/Manifest b/app-dicts/sword-orthodoxy/Manifest
deleted file mode 100644
index b15b8d2468fc..000000000000
--- a/app-dicts/sword-orthodoxy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Orthodoxy-1.0.zip 130248 BLAKE2B 1da096a0c35c12e83bbd33daf0ee6ad0a4410b316a53e8aeda32f95fe36a7a385b85784a1b127bec0aa1eea8b0a409802aff62dbb32b4ee461a0e24b5501e620 SHA512 64f411ec2bfc44ddedc47281a52e9ede255c6cf67ad90b8f98d1047bd9db295f7974f196f25da728179926b147cac3f2303f55760daab97dc5f7aee56cb33116
-EBUILD sword-orthodoxy-1.0.ebuild 362 BLAKE2B 8c7cfcf88ff0e26e21174d1895aec52452d36fcaad195e3ce412ea761d38c448053f5ff2882cf260abbcdefc318fb08d719b6a85fd394487a844d23918e7e427 SHA512 f1e07b54d21001af86e5ec9041f83efc9c352d62fc3f220f3a8d67a8f39a9b93db128a3386e8ec55a4d96736882ae0ad879aa014184655a2cad7190e800247c5
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-orthodoxy/metadata.xml b/app-dicts/sword-orthodoxy/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-orthodoxy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild b/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild
deleted file mode 100644
index 2ac782bd2c46..000000000000
--- a/app-dicts/sword-orthodoxy/sword-orthodoxy-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Orthodoxy"
-
-inherit sword-module
-
-DESCRIPTION="Orthodoxy by Gilbert K. Chesterton (1874-1936)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Orthodoxy"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-packard-1.2 b/app-dicts/sword-packard-1.2
new file mode 100644
index 000000000000..14c629305e53
--- /dev/null
+++ b/app-dicts/sword-packard-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Packard's Morphological Analysis Codes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Packard
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Packard-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=525e7877e832305da63e019bff5d62d3
diff --git a/app-dicts/sword-packard/Manifest b/app-dicts/sword-packard/Manifest
deleted file mode 100644
index d83b44271159..000000000000
--- a/app-dicts/sword-packard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Packard-1.2.zip 27893 BLAKE2B 7722b24e15080e932da5852fdc73ffaa77db6bb2a5435ca1b1a185eb83c67332e7bc44b6d00c975b78f114f16b990f0d30c8705ef0b20e85e65357283bbf61fc SHA512 b1e93cbcc385856cfc0bb98d223fbc2e47c800e9ab1b50ac64d9ccdc792ca8d61ba4000811fa5de64970766a44996a69b87c9825d79aa539af34857da0ee82c4
-EBUILD sword-packard-1.2.ebuild 350 BLAKE2B 4b078336f4ec4822116a898ce7619b7d2e5ed211701ce9a2bb987aecd6f9e0de553beaa8458a75858e0aa75706e348dbcbda435d1266b9a2775c66c22635f1e8 SHA512 414607ba4315117aecac9bc4694ea00b5e3099e5cff7c26b13a867e26d851da85d00efd757ed1426cf4bd29991d8610daed52d91ca9d0ec6b346acc34e52cccf
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-packard/metadata.xml b/app-dicts/sword-packard/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-packard/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-packard/sword-packard-1.2.ebuild b/app-dicts/sword-packard/sword-packard-1.2.ebuild
deleted file mode 100644
index 37c6bc431644..000000000000
--- a/app-dicts/sword-packard/sword-packard-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Packard"
-
-inherit sword-module
-
-DESCRIPTION="Packard's Morphological Analysis Codes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Packard"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-personal-1.0 b/app-dicts/sword-personal-1.0
new file mode 100644
index 000000000000..80835b6b9146
--- /dev/null
+++ b/app-dicts/sword-personal-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Personal Commentary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Personal-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=ee46f3de261ed7b5277af91f62c27981
diff --git a/app-dicts/sword-personal/Manifest b/app-dicts/sword-personal/Manifest
deleted file mode 100644
index 4cd7ad37e55c..000000000000
--- a/app-dicts/sword-personal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Personal-1.0.zip 41316 BLAKE2B 1ef0fef2e3fffad81a6638105f6a0e487d03c1c288fb7753b1d03aa7b67a110e119d821ab70e3243d79fe3f6750c66675c95ce40f6ff37296ece8800242b80fc SHA512 514c61c70493015698752f1c4adcd1030bd87e7457843e50d8ba5583a6cbbabc87a54cb97285de03aa36112dfc689769e867f1ef40d61ef43255a429653b2acd
-EBUILD sword-personal-1.0.ebuild 333 BLAKE2B eefc3f6c600ab56b2d9b5c7d05a783ccf09937d2d06fed198b668f97787e4da9c97920a3b78c0c7d76ceaa219519f0b5233138f319393a69c71678356c7e110f SHA512 a97d70899fd33e95805fd5f5eee0277e5e9f3e872b4a2ec463739c57eafbfa6df6eaeb12a23a68c4cd2abac16b62159595799a96c934d61635a2d2e6ec714e49
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-personal/metadata.xml b/app-dicts/sword-personal/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-personal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-personal/sword-personal-1.0.ebuild b/app-dicts/sword-personal/sword-personal-1.0.ebuild
deleted file mode 100644
index 7c0b704c859f..000000000000
--- a/app-dicts/sword-personal/sword-personal-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Personal"
-
-inherit sword-module
-
-DESCRIPTION="Personal Commentary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Personal"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-peshitta-1.1 b/app-dicts/sword-peshitta-1.1
new file mode 100644
index 000000000000..9ff8076c3d74
--- /dev/null
+++ b/app-dicts/sword-peshitta-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Syriac Peshitta
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Peshitta
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Peshitta-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=0290be213d1f922cf4848ecf996ae9b8
diff --git a/app-dicts/sword-peshitta/Manifest b/app-dicts/sword-peshitta/Manifest
deleted file mode 100644
index 0ab1ae050fe5..000000000000
--- a/app-dicts/sword-peshitta/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Peshitta-1.1.zip 308669 BLAKE2B 7a66088615c3180f45300d2ed7ede4dd1b26d0e6c542981b002e8f18982afdbb74463bb37df88cc7b483ca95dd3584364d0953aea44e25cdd3964018ea5a3a8e SHA512 0d25a25c65421f5538be69991d56c0cad3ac749dc3e85dd4004b029827a3d6796c5e713975c2af88820f97d672925443ebe05ca61c0f2f379f6dc3dd4271b5b0
-EBUILD sword-peshitta-1.1.ebuild 329 BLAKE2B 66233c4d7a27bf79c0609937efa27d4888ec89c5c31f98e8ad311a5e3588238b5d68515a32aabaae9443fff15cf30ae451eff171fb73c0834c674b6410abfd48 SHA512 3bcae62f7f2929c16327f6aff5d31558d9648e549a7151bb526fa277959e3caabcc382b7810e6d67f9a61b2fdda2acafd1fb0c08e5f5f80dbcf8248620aadca8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-peshitta/metadata.xml b/app-dicts/sword-peshitta/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-peshitta/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild b/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild
deleted file mode 100644
index c374aef3e4a5..000000000000
--- a/app-dicts/sword-peshitta/sword-peshitta-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Peshitta"
-
-inherit sword-module
-
-DESCRIPTION="Syriac Peshitta"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Peshitta"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-pilgrim-1.0 b/app-dicts/sword-pilgrim-1.0
new file mode 100644
index 000000000000..84e3380ed929
--- /dev/null
+++ b/app-dicts/sword-pilgrim-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Pilgrim's Progress by John Bunyan (1628-1688)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Pilgrim
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Pilgrim-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=9005b6dc8807a415cc8b08f86a609352
diff --git a/app-dicts/sword-pilgrim/Manifest b/app-dicts/sword-pilgrim/Manifest
deleted file mode 100644
index 206b27f7ec63..000000000000
--- a/app-dicts/sword-pilgrim/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Pilgrim-1.0.zip 217617 BLAKE2B 26fe745917c62836105d3368a2289523d6be07a85dbce5173ced89afced018fcb41062aeced697d5e0586ceb6a5b450385a007f735d171f5bded2f5f9b80667c SHA512 15d31dbd20ee66ac661f16bf04c41a4fa2f7110c310914d38a80e0e879d8a86a2731056be3e465d416bd6ea5e07c19742f3079eb1245bec08a744527e3e48b56
-EBUILD sword-pilgrim-1.0.ebuild 361 BLAKE2B 7c061d22841dcfd97bd96198cd8b326e353fb946d45b8120e1688c1a3aa63fa2100c040d86f5eaf895ab14c523b721ae1b948c20a59bf1aa186afdd6c98513a0 SHA512 69dff8bbc8ac088815c7dd93a81eaad2ab6b7af78d0371a6d8c94e23ca7fce79010ac941f2cd9aafb5dc239dd1625927b6ef02671f6f434164051efd8708b359
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-pilgrim/metadata.xml b/app-dicts/sword-pilgrim/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-pilgrim/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild b/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild
deleted file mode 100644
index 897efb929268..000000000000
--- a/app-dicts/sword-pilgrim/sword-pilgrim-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Pilgrim"
-
-inherit sword-module
-
-DESCRIPTION="The Pilgrim's Progress by John Bunyan (1628-1688)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Pilgrim"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-pnt-1.1 b/app-dicts/sword-pnt-1.1
new file mode 100644
index 000000000000..fbb781f39a81
--- /dev/null
+++ b/app-dicts/sword-pnt-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The People's New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=PNT
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/PNT-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=489a4ae52646b6dba54021238709f6b1
diff --git a/app-dicts/sword-pnt/Manifest b/app-dicts/sword-pnt/Manifest
deleted file mode 100644
index b31f08356919..000000000000
--- a/app-dicts/sword-pnt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PNT-1.1.zip 871337 BLAKE2B c5e71dacaf6560c27966d9889ba4a24c95e1fc83dcb85707faa395fea1204cba2c971db9afa9baa2b2ef958e89b76c8ec4068aac02dd736696e41dbd4b4ed5ba SHA512 22bf6934d126f83b2ddbf3a585373adf55dc6d582ed223ded3d52b2c957fec644874273c8c1d2d6ffb09c671485df8bc2e8b9d388ef49a70c772ffc2c2ff5ca3
-EBUILD sword-pnt-1.1.ebuild 330 BLAKE2B 19ef822cc44327b7e98f2759be05bf79455e53cc4a3f0b72304aecc93f00aef121bf884bc933edde272b8c09137751417a28c589e1167a2922df124897b60edc SHA512 238510f70a98dae8a999d95886be61e5ffd021a7174bb15bb963799a1dec6e1f05ad8b7c759e934ca66c7fd71470cc9ded8411f825ba1a1a954955f770899371
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-pnt/metadata.xml b/app-dicts/sword-pnt/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-pnt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-pnt/sword-pnt-1.1.ebuild b/app-dicts/sword-pnt/sword-pnt-1.1.ebuild
deleted file mode 100644
index 10181e4deee3..000000000000
--- a/app-dicts/sword-pnt/sword-pnt-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="PNT"
-
-inherit sword-module
-
-DESCRIPTION="The People's New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=PNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-practice-1.0 b/app-dicts/sword-practice-1.0
new file mode 100644
index 000000000000..6e2650cfae50
--- /dev/null
+++ b/app-dicts/sword-practice-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Practice of the Presence of God: The Best Rule of Holy Life
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Practice
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Practice-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e5dc095f5cf6ae4c52d18f2a929a140a
diff --git a/app-dicts/sword-practice/Manifest b/app-dicts/sword-practice/Manifest
deleted file mode 100644
index 8d65e756d942..000000000000
--- a/app-dicts/sword-practice/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Practice-1.0.zip 24766 BLAKE2B 841ee1130900e89f7324c51782fa89d2d1039b7509fa5690d2ce0dcaca370c33cd6ff921095d00d0650627cc952a96491968353a8da2df237a2cc184c58436ce SHA512 fa41824d0534df638920657cf2608d8fb5997036090bd662e6b2cc79085d9d9efd351aa842f86609c90f78f15651c450819564fa01117e98049bd1fe81c4a9e6
-EBUILD sword-practice-1.0.ebuild 377 BLAKE2B 5b64645d9767d4cbebfc10dab2570980c9a3ae93b577203c8bba13d3e59e841e1b40bf478b59cd908ee1aa8cf41c37015283014ea05a8993a54e54503eea3ca1 SHA512 d3eac37b2f78f024c8811c84137c22d4435805d0b851f349e5a933893e4a35f69f2c66c93c3eed25adb02270f34159f7e163ca185f8926a55664d2b9c513f4e0
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-practice/metadata.xml b/app-dicts/sword-practice/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-practice/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-practice/sword-practice-1.0.ebuild b/app-dicts/sword-practice/sword-practice-1.0.ebuild
deleted file mode 100644
index e638e41bf038..000000000000
--- a/app-dicts/sword-practice/sword-practice-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Practice"
-
-inherit sword-module
-
-DESCRIPTION="The Practice of the Presence of God: The Best Rule of Holy Life"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Practice"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rkjnt-1.0 b/app-dicts/sword-rkjnt-1.0
new file mode 100644
index 000000000000..0a9c267eadc7
--- /dev/null
+++ b/app-dicts/sword-rkjnt-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Revised King James New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RKJNT
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RKJNT-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=227f5dba79c5d378c63748ec875d8833
diff --git a/app-dicts/sword-rkjnt/Manifest b/app-dicts/sword-rkjnt/Manifest
deleted file mode 100644
index 44339cafeefd..000000000000
--- a/app-dicts/sword-rkjnt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RKJNT-1.0.zip 354676 BLAKE2B 7243eccb792f63312db64cbc36d22da0ee10e2bb952ad6029f0cfebba868a733931ac93cdc87d4ec0ea0685b41814ba5cb7b6c8b82e7af6b39436b03229026e2 SHA512 b33cc6c420740d7dba7d6638bad5275c636f06f561c19bd67bb7b3d004059528e06383cebd63baccced3dbea9ee1879671c432249187dccd5fc1ae987b227218
-EBUILD sword-rkjnt-1.0.ebuild 340 BLAKE2B 2cbb5de0ae6f85da68ea1ed530ca47de7fa247e11f6ad0184e938ffc589253e580db61f580547ca87523680eedf1bcc85461a061084eaff170aef48aa2c6ab62 SHA512 40a71d7063d00da44097f20d3708bf20e76d95c143f35b43d43575b33807e9ed5e06e823eb2b396488b7601cdb065d871c1bc101372f222a9e51f46bbcd8fc74
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rkjnt/metadata.xml b/app-dicts/sword-rkjnt/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rkjnt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild b/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild
deleted file mode 100644
index b0df94c0845f..000000000000
--- a/app-dicts/sword-rkjnt/sword-rkjnt-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RKJNT"
-
-inherit sword-module
-
-DESCRIPTION="Revised King James New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RKJNT"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rnkjv-1.5 b/app-dicts/sword-rnkjv-1.5
new file mode 100644
index 000000000000..9bea7328ae8d
--- /dev/null
+++ b/app-dicts/sword-rnkjv-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Restored Name King James Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RNKJV-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7779d99c61ddff97c24fe967197763c6
diff --git a/app-dicts/sword-rnkjv/Manifest b/app-dicts/sword-rnkjv/Manifest
deleted file mode 100644
index 72c4b1d6f185..000000000000
--- a/app-dicts/sword-rnkjv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RNKJV-1.5.zip 1471699 BLAKE2B 24490b0e82393cbe7daef77cf23f3327ee5dac9372f2126324a18df9373357e09dc827f63bc763dfad0dabacbe9dd70976b84b00c7acd7ee5f5e52afa9209c4e SHA512 7d160f0cef81770083ebfc573f2c41ba54fb3b07b944336a7e69bbef848e84678c115f0790ddb3a91a216906a371d6b7069d1470fe30039e9b94ef6c59dad6d7
-EBUILD sword-rnkjv-1.5.ebuild 335 BLAKE2B eb1de04ad601c2bffc8f84872ecaa34c026937a923b3c7959966b55833c2bb384746711604dd6678ffe70322237d2d019f9f442c474a7d0ec2cc2a4580721194 SHA512 e5297ce9892cb124794af0a8a94cef432bf45324702a53faa1ac3efa279c50cd6e91221e55afe33a738b3bc8299e4d04d8f31aac5a90a090bb825cf98147293a
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rnkjv/metadata.xml b/app-dicts/sword-rnkjv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rnkjv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild b/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
deleted file mode 100644
index 8766dbd8353b..000000000000
--- a/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RNKJV"
-
-inherit sword-module
-
-DESCRIPTION="Restored Name King James Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-robinson-2.0 b/app-dicts/sword-robinson-2.0
new file mode 100644
index 000000000000..b61a468b49a0
--- /dev/null
+++ b/app-dicts/sword-robinson-2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Robinson's Morphological Analysis Codes
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Robinson-2.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=f7a8c17555ad8ab169d8d13d1b9ac7a9
diff --git a/app-dicts/sword-robinson/Manifest b/app-dicts/sword-robinson/Manifest
deleted file mode 100644
index 9dd4cd3699db..000000000000
--- a/app-dicts/sword-robinson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Robinson-2.0.zip 31613 BLAKE2B 422a0d2a38628130e09441c18ea0b1f33cf0249a19d8073dc17dbce70e449cdc664d2808057ce5da6448ce2a62b23a720ba32c9ce423e191367e0b19adfe71d7 SHA512 c9921b605b5c429a7ded38141620874bae5a222f8aa7b0afd5c1b4000b66d0a5010c18a87c2a8d450dfc8f0e27360f47a8670e78633f8aa7fdbe698c4e5a991d
-EBUILD sword-robinson-2.0.ebuild 353 BLAKE2B 63f10a62bc22169942f1ca08c1b0428ca2663d419d495502bbed874a972bb34f037be7bbcf99a09d81c799da173c8626c4eb1a2ddda27a3e4be184d01ef503ba SHA512 02c3a851d301d83ebdd6fdc8fba0b95cbd6a1155fe47ef2b82f935612e9eec843d7aef3acb589c1ac3c7a7c29de1e1c5254b9296a1f7a209405fc57327775f0c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-robinson/metadata.xml b/app-dicts/sword-robinson/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-robinson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-robinson/sword-robinson-2.0.ebuild b/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
deleted file mode 100644
index 9d2e5ab9c6d0..000000000000
--- a/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Robinson"
-
-inherit sword-module
-
-DESCRIPTION="Robinson's Morphological Analysis Codes"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-romcor-1.2 b/app-dicts/sword-romcor-1.2
new file mode 100644
index 000000000000..6f0577c27e10
--- /dev/null
+++ b/app-dicts/sword-romcor-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Romanian Cornilescu Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RomCor-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=acf8546a5fc21ec9db42a74af1788ba0
diff --git a/app-dicts/sword-romcor/Manifest b/app-dicts/sword-romcor/Manifest
deleted file mode 100644
index da613b6a311f..000000000000
--- a/app-dicts/sword-romcor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RomCor-1.2.zip 1515933 BLAKE2B f4f7f375b2f597c050cad704de22d875b8979e4047d2225ef3dcf186a907d628a5256c3dafb53042c783f938ce8acd69a7b5f19b36ad1f17592e35d2ed303136 SHA512 fec3b7b3d5c2be28544a3a599a826417ad549ca7ee21fce5870566cc20c00b0445f9d4f9024ca1c0886de382cc63066cb3f53f9d9e388ed6e1f1013070f2a4a5
-EBUILD sword-romcor-1.2.ebuild 332 BLAKE2B c00a6047ead648c22f7922175fbd8c458623830cf2130417885d4c103f9df9f91c2b5f4de60827b0103c3566f2f7b9e317c77d3c903a08ff1629393a1f166f98 SHA512 2009a7c06aeb65f61584c200a87f8ccb4d22779630311beed38f8cd190e226f4e23e5f6ada04ec6ad475db05b30c0db9e419003f35aa9cc4a62e161212d8c993
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-romcor/metadata.xml b/app-dicts/sword-romcor/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-romcor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-romcor/sword-romcor-1.2.ebuild b/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
deleted file mode 100644
index e661c0372922..000000000000
--- a/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RomCor"
-
-inherit sword-module
-
-DESCRIPTION="Romanian Cornilescu Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rotherham-1.6 b/app-dicts/sword-rotherham-1.6
new file mode 100644
index 000000000000..dd7fc2d2737e
--- /dev/null
+++ b/app-dicts/sword-rotherham-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Emphasized Bible by J. B. Rotherham
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Rotherham
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Rotherham-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=30c3550db593f1c78cc720826aab6a95
diff --git a/app-dicts/sword-rotherham/Manifest b/app-dicts/sword-rotherham/Manifest
deleted file mode 100644
index 9699b901c605..000000000000
--- a/app-dicts/sword-rotherham/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Rotherham-1.6.zip 1579317 BLAKE2B d1d1bb11fd28a55c39dd211c5f15387d9512ef33bf95eec226e634d1a2bc59aff6fa024993c1e93409d1dc8b3ef07cb233527a88da5a5aa699cfb1d4d019151d SHA512 6a5122884fade9bfa8ce4430a35da5cf0593cafd1d6ed380b9c6455ea6033345d06a99e770cf1d823b3f88dc294550b52063ebc660bad10f1c8211675ac424e6
-EBUILD sword-rotherham-1.6.ebuild 355 BLAKE2B 6d81ec295249a3478d1d71fcc8afb33f478e5dc25d6b38f5927a80039b06d618449e322f4a5ed4249af76e145829b736ce73dfdb4b976542240f44ec3bf69adb SHA512 1c7f4b6f02464283cddc538976f6dff948ad2db3a61a5a62504e246a34cd6647b7771c94368a7fe3210ea242d2f01a5a32ef424e991177ef200b1ebe9c890eb8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rotherham/metadata.xml b/app-dicts/sword-rotherham/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rotherham/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild b/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild
deleted file mode 100644
index ef0e1cde8414..000000000000
--- a/app-dicts/sword-rotherham/sword-rotherham-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Rotherham"
-
-inherit sword-module
-
-DESCRIPTION="The Emphasized Bible by J. B. Rotherham"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Rotherham"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rst-1.6 b/app-dicts/sword-rst-1.6
new file mode 100644
index 000000000000..d2a9c2fe1611
--- /dev/null
+++ b/app-dicts/sword-rst-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Russian Synodal Translation
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RST
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RST-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=57e2fab5fdbb54eb0029412a8e912035
diff --git a/app-dicts/sword-rst/Manifest b/app-dicts/sword-rst/Manifest
deleted file mode 100644
index 414f3ee9b909..000000000000
--- a/app-dicts/sword-rst/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RST-1.6.zip 5813471 BLAKE2B 498c36b5551829e359dc25c6ef2b2e1296bf23f2375bd8f602750d8a5e063b7fb883b206de70624d0614794882afcbc702404d9ae779c89f322346f06bd2601e SHA512 0d66eee67f2a4fe3db06ded456a6e97812de349546b33821708f93a1072a85ed19b3e2792a5daba3dd38d2bb17246abb8b9ac1b0154e68afbd52fb049bf80385
-EBUILD sword-rst-1.6.ebuild 326 BLAKE2B add9b15f08e62b5dcdc49f17309c282cbd668dc49e02c3ecf122b2dcbebcd7cf2152f18fe53414ade97800c09604c9a253b8b316f113d0dd7fef89d2e2b94482 SHA512 f5de2665732a7bc2858cb21a8131a4de4fb35a00888438769eec10d34cc5de1cfe47c46a6e0ffa21207fbbdf366582acfbda3fb30dde5148ca9ac133f13c553e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rst/metadata.xml b/app-dicts/sword-rst/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rst/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rst/sword-rst-1.6.ebuild b/app-dicts/sword-rst/sword-rst-1.6.ebuild
deleted file mode 100644
index 7f2909dbf44e..000000000000
--- a/app-dicts/sword-rst/sword-rst-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RST"
-
-inherit sword-module
-
-DESCRIPTION="Russian Synodal Translation"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RST"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rusmakarij-1.1 b/app-dicts/sword-rusmakarij-1.1
new file mode 100644
index 000000000000..82869cabdfe5
--- /dev/null
+++ b/app-dicts/sword-rusmakarij-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Pentateuch of Moses in Russian
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RusMakarij-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=b38ea9e5b1d31c8fb56f900f38e07e78
diff --git a/app-dicts/sword-rusmakarij/Manifest b/app-dicts/sword-rusmakarij/Manifest
deleted file mode 100644
index 2cae2694a088..000000000000
--- a/app-dicts/sword-rusmakarij/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RusMakarij-1.1.zip 308240 BLAKE2B e3b4a6aebec982e27d7da3af7d378cfbe3657e8796eedcc6c4551e425fef647acf284d86b227c1c3cda7df8728025d188793d9432101b60a434fde3195419c3c SHA512 88446e27cf2a8a4533a55692a0bdf4b8560be8124190a85f39a460b09927f8150ff773ea81c3429528f8012f6369ab8e4de4f1cabc2a9836f2a3376d9288e000
-EBUILD sword-rusmakarij-1.1.ebuild 347 BLAKE2B 44d57fdfb0dfb7473a51aee78d0600d23b56641a80de61399067f628942bbb6733ac84bd12f0a43d13fd43040e9b75e253eb02c6bfa2ada7e17729af043644e0 SHA512 30e62aaf50c5bf1c439f41c6092c6297f03b8c2e85cbe12361e257956f8a342c7d91f3ad4ec3b74e8f426580677935d2538a114586c98979198589bf0c50bd0f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rusmakarij/metadata.xml b/app-dicts/sword-rusmakarij/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rusmakarij/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild b/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
deleted file mode 100644
index 99f3d8afaaba..000000000000
--- a/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RusMakarij"
-
-inherit sword-module
-
-DESCRIPTION="The Pentateuch of Moses in Russian"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rwebster-1.3 b/app-dicts/sword-rwebster-1.3
new file mode 100644
index 000000000000..a08c34618c43
--- /dev/null
+++ b/app-dicts/sword-rwebster-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Revised Webster Version (1833)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RWebster-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=69f6839854dc54851a3fcc629b70c011
diff --git a/app-dicts/sword-rwebster/Manifest b/app-dicts/sword-rwebster/Manifest
deleted file mode 100644
index 2cc07770d8b0..000000000000
--- a/app-dicts/sword-rwebster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RWebster-1.3.zip 2317707 BLAKE2B 904a6cc65e283c5f29c1e078050748a78cd06cf1c4f5617413aa2f9ea72cefb2b67359d187969855c70853fa9ae81bc7ca434a7784cb73f1855e4f8df655d879 SHA512 21686879638c7bb577c561eb14be30d3decf794996b5ffe2925cf1b0c66d7a6cb775dd08e307f6815b54ff8147e49c8f3fee32b18bb446486c6cc3d636025495
-EBUILD sword-rwebster-1.3.ebuild 339 BLAKE2B 5cda714aad81282544c832eb902e6a0dbfa7651b7a3c56afdeb133e650f0b4e5c1ff4b9ceda4779d2e154646c9508698cd3357b76340289b23a9d7be3e8f9ed8 SHA512 167a4218d9f5efac1aa0e8e70a46433ebb4287427b9645e1d0c72bb306c579258a3b807d2573e990888cd6a3ab9c023d924ec9c423df53166fba8956200d91f2
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rwebster/metadata.xml b/app-dicts/sword-rwebster/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rwebster/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild b/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
deleted file mode 100644
index dac403af0aa5..000000000000
--- a/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RWebster"
-
-inherit sword-module
-
-DESCRIPTION="Revised Webster Version (1833)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-rwp-1.9 b/app-dicts/sword-rwp-1.9
new file mode 100644
index 000000000000..3eff1198409e
--- /dev/null
+++ b/app-dicts/sword-rwp-1.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Robertson's Word Pictures
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/RWP-1.9.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=9c9c06071ee9f8e87d032cf544dad625
diff --git a/app-dicts/sword-rwp/Manifest b/app-dicts/sword-rwp/Manifest
deleted file mode 100644
index eb1fed850e88..000000000000
--- a/app-dicts/sword-rwp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RWP-1.9.zip 2728649 BLAKE2B fb56c04304799784f55a71a11ee3dde448eaaa7c6294c13d4c3043ca156ba34326913f90b329801de70ebc715cccc01b74d064db0d6cc34d19f70f6ba9864bf3 SHA512 b3e8cbc5fb01e98776bac4c0ee7744eede1c7a1a9a41dfc72f53b55c3169b729f065e317107fb7e8ef4a2bc2b79c0fabeff1adb1b89150fd12f7d5ae22d7cc7b
-EBUILD sword-rwp-1.9.ebuild 342 BLAKE2B 0350ff6464bf2961691608713ad8f46e9f6067838df8e81b08060c04234c3f6b3f718c6895c2e27eaa33c0fec453b69af90e6fc2417614629a9e8eca114c84d3 SHA512 17756bba9d0392980643efdb6a16d95d3286b8c1cc03a7a16858bb057479106a1cda913d7bbfe969a463d197f8cfac7c496d4eda77e9b17de952dcb7cc60bba7
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rwp/metadata.xml b/app-dicts/sword-rwp/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-rwp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-rwp/sword-rwp-1.9.ebuild b/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
deleted file mode 100644
index 74792e5a4ef6..000000000000
--- a/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="RWP"
-
-inherit sword-module
-
-DESCRIPTION="Robertson's Word Pictures"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP"
-LICENSE="public-domain free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-saoa-1.0 b/app-dicts/sword-saoa-1.0
new file mode 100644
index 000000000000..a60b860061e4
--- /dev/null
+++ b/app-dicts/sword-saoa-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Scripture Alphabet Of Animals
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=SAOA
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/SAOA-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e78414c38bc022003c7ec29a019eaec2
diff --git a/app-dicts/sword-saoa/Manifest b/app-dicts/sword-saoa/Manifest
deleted file mode 100644
index 357f2d9a9e10..000000000000
--- a/app-dicts/sword-saoa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SAOA-1.0.zip 37734 BLAKE2B ce13584b014e7e169720b74feae3e9a8964f5e27c55607465bdc81e300d3ba0d3a726a1dcad01b79d5cb79f601c521047bc77059c7e0487c31f2fc9d73019151 SHA512 dea46677df4e2bd782afe533f55fcd48bfe758a243daead261c4becb74f43f1b3a03285d1602a60f02975b4d6ebf2f078ef13ee6b75cbe5362cb6f2a212ac5a1
-EBUILD sword-saoa-1.0.ebuild 335 BLAKE2B 558fdd31fb767d50a434de1bf128199fde66fa5b112e87e5b102b69664b69e086672ba5b5a958c4cc6854daf96dd97c5344f926007ea42ce4d490a14a23c6525 SHA512 62d75a1f0a0c5ea7c1bb3b63aa4f0fb2ce2ff123f449f761b55568b8297791c583a8b7a508af150b4c3ea059709606c6e9fc4c00896c7bec59e955302adb1a9e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-saoa/metadata.xml b/app-dicts/sword-saoa/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-saoa/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-saoa/sword-saoa-1.0.ebuild b/app-dicts/sword-saoa/sword-saoa-1.0.ebuild
deleted file mode 100644
index c7bb917408ec..000000000000
--- a/app-dicts/sword-saoa/sword-saoa-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="SAOA"
-
-inherit sword-module
-
-DESCRIPTION="Scripture Alphabet Of Animals"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SAOA"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-scofield-1.0 b/app-dicts/sword-scofield-1.0
new file mode 100644
index 000000000000..fa7d46de87cc
--- /dev/null
+++ b/app-dicts/sword-scofield-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Scofield Reference Notes, 1917 Edition
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Scofield-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7a8afc1490738e7743e6ef7b63fbf851
diff --git a/app-dicts/sword-scofield/Manifest b/app-dicts/sword-scofield/Manifest
deleted file mode 100644
index e2ec50425f90..000000000000
--- a/app-dicts/sword-scofield/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Scofield-1.0.zip 404670 BLAKE2B 00e9633956f7ff4b96bf4333c374bd587ed90895249334cae2a7ae2326b7ed8bf03247f7b7667e1fe9741bc8777a105bd17f05f64ddf02536c597eb978ed2988 SHA512 ef2c233354d04abd354711c6dd0ed4c1f59a18c68c23c3d09cd3bf24fd0f78f5525dc8d0c569168159d60fb8fb2d0bd370f4f3411f671f99943e5350fc8d0078
-EBUILD sword-scofield-1.0.ebuild 352 BLAKE2B 3f3b239ed6847be1fea4b303f66d89c3c589fc49b5246a2781107274a351273fcb721198d0ba907fb6261bdb9214a0c7266da6a986b15bc0de70c70e99182480 SHA512 d300d92652d4b601a036de9a423077d137d0bea2998c30ed8dcdb840e828f0a156bc4d6d46c08ad79f0a327a706d627a1a0eef519f07765aed5737929b838c76
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-scofield/metadata.xml b/app-dicts/sword-scofield/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-scofield/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-scofield/sword-scofield-1.0.ebuild b/app-dicts/sword-scofield/sword-scofield-1.0.ebuild
deleted file mode 100644
index 2db7885ee985..000000000000
--- a/app-dicts/sword-scofield/sword-scofield-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Scofield"
-
-inherit sword-module
-
-DESCRIPTION="Scofield Reference Notes, 1917 Edition"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Scofield"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-scotsgaelic-1.2 b/app-dicts/sword-scotsgaelic-1.2
new file mode 100644
index 000000000000..734e663354bf
--- /dev/null
+++ b/app-dicts/sword-scotsgaelic-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Scots Gaelic Gospel of Mark
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/ScotsGaelic-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=b036f79007128bbbbd556effd60d3d49
diff --git a/app-dicts/sword-scotsgaelic/Manifest b/app-dicts/sword-scotsgaelic/Manifest
deleted file mode 100644
index 5a3768a9f4e7..000000000000
--- a/app-dicts/sword-scotsgaelic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ScotsGaelic-1.2.zip 34708 BLAKE2B 654e551cc009a703418ec0c7668d3ecd7d94ed2b1100338b0da8475a6a32e177f91c122e7e14d6048121868cb411febb68cfccccd9cbf4538e1cd7b1bb29cf6f SHA512 2b0114b9e98352f11ac0672e334bde5dbfe5441cfcf62f07b806674043270084ca72d582b4e2ad95b4f287d16c71a1fb0603e1e313ef8e37f2237e5fd10c4295
-EBUILD sword-scotsgaelic-1.2.ebuild 342 BLAKE2B 548d41ce478c66dff2fae33bc6230703a6d50395fc2182b945de0514151b4303b13f14b16685950f2619e0f69246234090ea21e2c8151ce076120c4ac19bff85 SHA512 4d66859ec95d11a57ab6a90633063b841c4b78cc89896846594e68737e8763c8843fa83b5955b6c207528fe1a80f21caad5a8a7d49227696345473879bc8e96e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-scotsgaelic/metadata.xml b/app-dicts/sword-scotsgaelic/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-scotsgaelic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild b/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
deleted file mode 100644
index 0151d6552e58..000000000000
--- a/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="ScotsGaelic"
-
-inherit sword-module
-
-DESCRIPTION="Scots Gaelic Gospel of Mark"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-sme-1.7 b/app-dicts/sword-sme-1.7
new file mode 100644
index 000000000000..c59d92a71dec
--- /dev/null
+++ b/app-dicts/sword-sme-1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=C. H. Spurgeon's Morning and Evening: Daily Readins
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=SME
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/SME-1.7.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=23b3f64247fb765fdf6a0d7ff3a1b521
diff --git a/app-dicts/sword-sme/Manifest b/app-dicts/sword-sme/Manifest
deleted file mode 100644
index 5c56d5e08123..000000000000
--- a/app-dicts/sword-sme/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SME-1.7.zip 588738 BLAKE2B 67bd2bdc21498265e911ef0cc6f6806a8a7ebb1dbc2ab8ff543881e584b9eecc801fc603f28e33e7990b599774ed6e5e5fb5bba836924a9b6f88d606765e95f5 SHA512 f40f7b04275b90ec74e3bbd91e1b3a139960e3a589c4ccd4a2b427474128410df08dff68284ee7fa0c74ad4f02b01e0b00da16533337063667dbcfbfd7a94368
-EBUILD sword-sme-1.7.ebuild 355 BLAKE2B 416cc123f439cb0d421325108031b47c03943dc24cba0e58cb33fac3884f96abb973928ae012d58ca8f929df31b87ffcdc6724c82b34a6abed64f1489a8a5c4e SHA512 da779e8f9c7d39c8638fd5f2e879f6003355517c1eb6948d23b4b87e42b592dc223112514f65641c32adfed9acfd0239d402aeb4e661aa084fc96453477aebe7
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sme/metadata.xml b/app-dicts/sword-sme/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-sme/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-sme/sword-sme-1.7.ebuild b/app-dicts/sword-sme/sword-sme-1.7.ebuild
deleted file mode 100644
index 17459f21a8ad..000000000000
--- a/app-dicts/sword-sme/sword-sme-1.7.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="SME"
-
-inherit sword-module
-
-DESCRIPTION="C. H. Spurgeon's Morning and Evening: Daily Readins"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SME"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-smith-1.3 b/app-dicts/sword-smith-1.3
new file mode 100644
index 000000000000..e44b91e407f3
--- /dev/null
+++ b/app-dicts/sword-smith-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Smith's Bible Dictionary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Smith
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Smith-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=16331a7232f33e1624395907431033f2
diff --git a/app-dicts/sword-smith/Manifest b/app-dicts/sword-smith/Manifest
deleted file mode 100644
index 1cbf45db7335..000000000000
--- a/app-dicts/sword-smith/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Smith-1.3.zip 1209276 BLAKE2B da3a00002eba8ec23dd81812206d65f502f3bc437d167ab12b0b8e7b6f520eba67e1b4e26f824dd0866c93d9d363ffb9ddee2d064ddd59bb7c2d00de2cabff33 SHA512 a6bc89fcb3ca1e5561e03c38d84d46433fb4d3e5766ec0bc8651c4898e057a6437c6c5816bd472a21a5f1a8f1f2d06eb4d442183903dec584ba15fbfe62d600d
-EBUILD sword-smith-1.3.ebuild 332 BLAKE2B bccccf58f5e6a20291ad0f7f9ce2a71eed3c5175f8724f214eb76e3397fc22514bc30271e20518d9fb6cc8196bb93f1ecdf64a5e54411fd4d93b339e5072a88c SHA512 1293caa7882f24026bc60da099f1b6f0729b5dd2fe8289e95898cdd6e68298c981b89a33134c9c5cad8893a7d1ea57bd9c797957d854cb794f897915365b3a38
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-smith/metadata.xml b/app-dicts/sword-smith/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-smith/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-smith/sword-smith-1.3.ebuild b/app-dicts/sword-smith/sword-smith-1.3.ebuild
deleted file mode 100644
index d63d2e6c3911..000000000000
--- a/app-dicts/sword-smith/sword-smith-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Smith"
-
-inherit sword-module
-
-DESCRIPTION="Smith's Bible Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Smith"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-sparv-1.5 b/app-dicts/sword-sparv-1.5
new file mode 100644
index 000000000000..79f0b8b103c2
--- /dev/null
+++ b/app-dicts/sword-sparv-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish Reina-Valera
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/SpaRV-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=90f20b6bb0374d6ac39574057c282211
diff --git a/app-dicts/sword-sparv/Manifest b/app-dicts/sword-sparv/Manifest
deleted file mode 100644
index 364286c4c8e9..000000000000
--- a/app-dicts/sword-sparv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SpaRV-1.5.zip 1469089 BLAKE2B baec9ee474723ff6ff8c9ae7c8c31c6dcd7d6e055f149a93d9cb73bd0d469e2ac31c7c2290a3fccea317679d6263a900d5a4a487f1a06d32e5da84cbf0451f2c SHA512 99fbd0021e1e3a335068f786631bd173d7bc8f21430f7f04bba08e27f9734e0cbbedbcc7c6971368d0e009f1e2fd82536201fce686f9e4bb77d1e44fb3caad1c
-EBUILD sword-sparv-1.5.ebuild 323 BLAKE2B a93bf8435a474406622e42a8748c9e4f13f6d92b3a35ef3d265226b45171ed432ca74dfacea3a760d4d5d75a426ac4a787a549153ee3d7494463fde49f7799cb SHA512 689d1c240e4767c9cb43cf690b3dbe8f5251dff555d5b7320340f3d2d4620322237d79ec8fe0804d85cb7f5b08dcc8a874637c69753224cf9d1e81c1a6c88b25
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sparv/metadata.xml b/app-dicts/sword-sparv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-sparv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-sparv/sword-sparv-1.5.ebuild b/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
deleted file mode 100644
index 493c5f604af2..000000000000
--- a/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="SpaRV"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Reina-Valera"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-sparvg2004-1.0 b/app-dicts/sword-sparvg2004-1.0
new file mode 100644
index 000000000000..8ce7a65a83d1
--- /dev/null
+++ b/app-dicts/sword-sparvg2004-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish Reina Valera Gomez 2004
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRVG2004
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=sword-sparvg2004
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/SpaRVG2004-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=4f21e918e06ed444c40dfaafea4b4838
diff --git a/app-dicts/sword-sparvg2004/Manifest b/app-dicts/sword-sparvg2004/Manifest
deleted file mode 100644
index f879638b7e78..000000000000
--- a/app-dicts/sword-sparvg2004/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SpaRVG2004-1.0.zip 1467411 BLAKE2B 8012a8b9e81d9b20a63eae2174aed7cea9575e797db3099ca6ad4fcb0951742cc2960e372d703c94ad4b816f97299b2a0fcaa2f38eb84c65b7fd3c8015a68b2b SHA512 b799409fb5fe137db5f5f40869c26a1d51353209bae442ff48b2958e51b4d989db03ffef60a37da6c68875b8693d788df60928ec0632e9513652d99b899e420b
-EBUILD sword-sparvg2004-1.0.ebuild 352 BLAKE2B 76761f21afacb98d6ac63d8917052a6798784a5d338d9eb8feab37c5b57dad7b75901f893c8f08c5debb0b3c0adb068bfd9fa8f859e9f729f7a064c693d3e034 SHA512 419a7dfe1340b6a9029cea42382c679f7b32542b2d36a5f83b1b98a740d77cc4041956ff063c09f6b8aaa44c0467d16cf0e056b97c20b1335941e1c79c8f8b84
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sparvg2004/metadata.xml b/app-dicts/sword-sparvg2004/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-sparvg2004/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild b/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild
deleted file mode 100644
index 1878a0578350..000000000000
--- a/app-dicts/sword-sparvg2004/sword-sparvg2004-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="SpaRVG2004"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Reina Valera Gomez 2004"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRVG2004"
-LICENSE="sword-sparvg2004"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-spasev-1.1 b/app-dicts/sword-spasev-1.1
new file mode 100644
index 000000000000..de90b15f4f95
--- /dev/null
+++ b/app-dicts/sword-spasev-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish Sagradas Escrituras Version Antigua (1569)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaSEV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/SpaSEV-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a052a0bff34ce2795f8364b87d6a4aea
diff --git a/app-dicts/sword-spasev/Manifest b/app-dicts/sword-spasev/Manifest
deleted file mode 100644
index d100a183b1ac..000000000000
--- a/app-dicts/sword-spasev/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SpaSEV-1.1.zip 1449569 BLAKE2B 2be47bbdd3f95ea4b18f26dc06a9234ca55e17655c3424ae81345301f3a15d074ac322c87e33e5eac62a96e80aba3b0e018979979d92e15f3f5916cbe865a857 SHA512 e2669082909ce00550928dee3be01655efb5830c42741cf9d4611096d0c4a575ccca6a4beac6b474fba7ed5b3676aaf0d166ceaad3af1e0633aa0183008a6d92
-EBUILD sword-spasev-1.1.ebuild 355 BLAKE2B 26a470875fd39bbd1f0364847c8b2dbac054b578f2a5b11ea475783f77a268972c7bcac9d0d5d082dcd7ae4247d0456c54a6da36be56ef6a7681e25f1bf74cf9 SHA512 1ac15079145fc90624fe9d042c7eb040c96e6cf4912084b7309798160a27eaa757f0710f22047839d3aaed3c506562c79a9e656e409bd81e24c8f65ae30e61d2
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spasev/metadata.xml b/app-dicts/sword-spasev/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-spasev/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-spasev/sword-spasev-1.1.ebuild b/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
deleted file mode 100644
index a50c944f924c..000000000000
--- a/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="SpaSEV"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Sagradas Escrituras Version Antigua (1569)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaSEV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-spavnt-1.2 b/app-dicts/sword-spavnt-1.2
new file mode 100644
index 000000000000..1430337e3061
--- /dev/null
+++ b/app-dicts/sword-spavnt-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Spanish Valera New Testament (1858)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/SpaVNT-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2f6a110708bb63c72da48ff9038f21b4
diff --git a/app-dicts/sword-spavnt/Manifest b/app-dicts/sword-spavnt/Manifest
deleted file mode 100644
index ee47d29c33a5..000000000000
--- a/app-dicts/sword-spavnt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SpaVNT-1.2.zip 367883 BLAKE2B 1efcfee3c84064b0c73e428650051c973cc45dd0663f185305a05151e41b14f8b3483a91521ce77919aeb7b71c17a6490045b8e31447ff4032a10f228805df4f SHA512 5dc5449963060216dac25bcd947ee50b3141e512e608868f427ef09001e82b5bd55a457e494a29e38cf73580ab2e188cf674fe4a4a26b4308be092c7faf2cd24
-EBUILD sword-spavnt-1.2.ebuild 340 BLAKE2B 65a573b6e9c344a192410f36ce9e04c6d0102ee14fad9b4f7a4d69af787d2181e3b04270652084343dfef95e9e05a97daee9de40790b0fdad6f90f86b7f83b14 SHA512 493372ae7a0a85de8c9c6c454abffd83fd29a9f2a191d58f704c3789e2d32633012e8a3dc1b5adabee3d40e0905bc87c2d265a4fa5261e10ad0392dc1fa040c8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spavnt/metadata.xml b/app-dicts/sword-spavnt/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-spavnt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild b/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
deleted file mode 100644
index 0f81c0c121b6..000000000000
--- a/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="SpaVNT"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Valera New Testament (1858)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-spurious-1.0 b/app-dicts/sword-spurious-1.0
new file mode 100644
index 000000000000..4f585b7283c8
--- /dev/null
+++ b/app-dicts/sword-spurious-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Tischendorf's Spurious Passages of the GNT
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Spurious
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Spurious-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=7efb2816ffd54536be7e4a576f11b6ce
diff --git a/app-dicts/sword-spurious/Manifest b/app-dicts/sword-spurious/Manifest
deleted file mode 100644
index 52b68b68446b..000000000000
--- a/app-dicts/sword-spurious/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Spurious-1.0.zip 4825 BLAKE2B c17b5a54b94a45936bbc8a7f56206f3b08aed046095f1e6e4888072e5bd4e649c9476afc97b84b6acb0a276fb04fb1d8140a6bf46debc280baedffcbaf2f8503 SHA512 08c33a3a5d6a7d0fd04bf22ac2666426cbff347289cbb707644ca77fbe279c8029a37e798315b50db632dce7aa4abd5dc7335bc2a483ea3452473e198fe59260
-EBUILD sword-spurious-1.0.ebuild 356 BLAKE2B b580e4eb7c5f20f62d167398de28c5ce1a6164e67b93cd94f4cc11e93d7f52dbdc0a9658aa04ee3a854fa275672f8bae6c01b56b6b29669a3d0841922c69057e SHA512 3dda118c3880d137ccc1c77d5d50c63fe247b2b866422ddd8d4e9d788cf8f9180d9109c269a9dc78d265ce8b8b934d74cf72f63567d6aa5767309503a0a3643d
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spurious/metadata.xml b/app-dicts/sword-spurious/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-spurious/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-spurious/sword-spurious-1.0.ebuild b/app-dicts/sword-spurious/sword-spurious-1.0.ebuild
deleted file mode 100644
index 1517622f6b20..000000000000
--- a/app-dicts/sword-spurious/sword-spurious-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Spurious"
-
-inherit sword-module
-
-DESCRIPTION="Tischendorf's Spurious Passages of the GNT"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Spurious"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-strongsgreek-1.2 b/app-dicts/sword-strongsgreek-1.2
new file mode 100644
index 000000000000..fa4a780f60e7
--- /dev/null
+++ b/app-dicts/sword-strongsgreek-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Strong's Greek Bible Dictionary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/StrongsGreek-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=fa3076120b795ef501133918fbd49a9a
diff --git a/app-dicts/sword-strongsgreek/Manifest b/app-dicts/sword-strongsgreek/Manifest
deleted file mode 100644
index eb016781d8dd..000000000000
--- a/app-dicts/sword-strongsgreek/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST StrongsGreek-1.2.zip 356388 BLAKE2B ff7947f2aaebc9bb925c9a2ac07950db39d34399fec5fded4ca8f726492b20d30d68e767fe70fa0e89662d76377f289c9a956203b984ce5c6b90b9b7710335d1 SHA512 0a8451f70d9cfed8fcec8ada100274d07080de448c9d7593fbacf3c3f12c471865213555a8678918730d32ca7d93ec5bcd86923c68e384bf1bdd43a88c87e545
-EBUILD sword-strongsgreek-1.2.ebuild 348 BLAKE2B f0b1b0cd4fd534a92781143f3dd586451d618476716d5dd7e130db43256500c86b5c0eee802edc70f65bda0a3f8d60d1874ff44955df2d3fabe2cf20d2923197 SHA512 141462612b8d01e924ad504844dc10dc187c089a8fb3c2ac3396514835db2af068bd75533ba082bebdbd713bca9071569dc991370b0e99a09fe4aed00d147ff2
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-strongsgreek/metadata.xml b/app-dicts/sword-strongsgreek/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-strongsgreek/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild b/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
deleted file mode 100644
index 77884767f8bc..000000000000
--- a/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="StrongsGreek"
-
-inherit sword-module
-
-DESCRIPTION="Strong's Greek Bible Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-strongshebrew-1.2 b/app-dicts/sword-strongshebrew-1.2
new file mode 100644
index 000000000000..b8b82d077f68
--- /dev/null
+++ b/app-dicts/sword-strongshebrew-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Strong's Hebrew Bible Dictionary
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsHebrew
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/StrongsHebrew-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=98f618d5f85774d26c987b82612078ff
diff --git a/app-dicts/sword-strongshebrew/Manifest b/app-dicts/sword-strongshebrew/Manifest
deleted file mode 100644
index 8d6ee1aadbdc..000000000000
--- a/app-dicts/sword-strongshebrew/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST StrongsHebrew-1.2.zip 532334 BLAKE2B 835ea32b57fa78071676161137e95afe5d6a480cab72cc47e83820370189b08e936e12673022bbf129e391074689945615d1fdafb8a582c4f914066f2ec1bbaa SHA512 c32917ddc876403fb696aed492963b0325e64cb234cfd3f657f1436ca0cb1fa9b8aab09f8ac20da13d7e46135048a6d08ff2fda097a159fa5f5cfe65d96a434f
-EBUILD sword-strongshebrew-1.2.ebuild 356 BLAKE2B f49b9f54baeb4c30ffee3b3f582d251079b5b9761ad60082b9c7779b6fe3ee93c3b82f35ff8e6fd43eb23bdddd76eb5434af0f40aabc6c6762e3ef70394bf2cb SHA512 3cc683d3a651ce2a18bfbf187fd652ad64c186df79731849ab75b9f3fb24d508ce5d8ae8ee155a32cd227d9545164a3173a6f615dca7ad1ca2d8637ee0757804
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-strongshebrew/metadata.xml b/app-dicts/sword-strongshebrew/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-strongshebrew/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild b/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild
deleted file mode 100644
index 1cde414397ee..000000000000
--- a/app-dicts/sword-strongshebrew/sword-strongshebrew-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="StrongsHebrew"
-
-inherit sword-module
-
-DESCRIPTION="Strong's Hebrew Bible Dictionary"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsHebrew"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-swahili-1.1 b/app-dicts/sword-swahili-1.1
new file mode 100644
index 000000000000..fd197c50abc8
--- /dev/null
+++ b/app-dicts/sword-swahili-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Swahili New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Swahili
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Swahili-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2cc45ac7d5aa2413c68bf2c278f27f28
diff --git a/app-dicts/sword-swahili/Manifest b/app-dicts/sword-swahili/Manifest
deleted file mode 100644
index 27db65153876..000000000000
--- a/app-dicts/sword-swahili/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Swahili-1.1.zip 365719 BLAKE2B dcb4ea202a0a622464f7c3ff2ea49822deb10f9976f65817f6eeae1bb2a6b8abb112cc54afc0aacdebb56329a0866d417dd78109947150e86b26f407c3aa35f8 SHA512 0508324f47224bbe28a6214d98916ca6f3e0213287e119934d80c71c3891c95e8a99bcabf6f3395d28992262c6ae09ff6ae7440dde3c48c4b896958f31417380
-EBUILD sword-swahili-1.1.ebuild 333 BLAKE2B 970e14fd1edf867cc18078cbcbd2c9e2a9a3081ad7cb3d2b8cfbda72b790231a76b300b118192f457871dc18ae1ff0e1648eb940463c652b91e261b976f99159 SHA512 967cbe238458c4ddadf7f19b0e51dd76b079a6e19a90edcdf76f0f1318a0b1aafc84b9348068c421ae4e1769bb76d16d933d63c5f59b34a3188e98d204f612b8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-swahili/metadata.xml b/app-dicts/sword-swahili/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-swahili/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-swahili/sword-swahili-1.1.ebuild b/app-dicts/sword-swahili/sword-swahili-1.1.ebuild
deleted file mode 100644
index 45289722830a..000000000000
--- a/app-dicts/sword-swahili/sword-swahili-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Swahili"
-
-inherit sword-module
-
-DESCRIPTION="Swahili New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Swahili"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tagalog-1.1 b/app-dicts/sword-tagalog-1.1
new file mode 100644
index 000000000000..63b751f2d447
--- /dev/null
+++ b/app-dicts/sword-tagalog-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Tagalog (John & James)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tagalog
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Tagalog-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=361502e877b5b1184eeffb19f56639b2
diff --git a/app-dicts/sword-tagalog/Manifest b/app-dicts/sword-tagalog/Manifest
deleted file mode 100644
index c84f152cb4e7..000000000000
--- a/app-dicts/sword-tagalog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Tagalog-1.1.zip 43336 BLAKE2B 187fc284faa69f525ed82327d02d1797b7d82465b911e79dbaadf70238871afeb335868f5572b70191049e51c2a4c2def2b9710bcb057f17565c6f0825a4107f SHA512 9208073f7547ecb7dcda2d6a9016a8ff75a2fcc5827b4992c1d2a9b918a6a62e697a1bbd783d0a559e71a7b544eb2f73ef66261b6b6d288420dc9a97d932f9b9
-EBUILD sword-tagalog-1.1.ebuild 334 BLAKE2B cd1d880c88541e74b4a9dec360fcb26149952325a42b268314a39b1d0765adcb67013308fddef28895266a30d60de9de18558fd9fe32f8c2434850803ab455f8 SHA512 315d3c08dada5ba1212696ca03cc0e598d2badb4ae27578c6e4624c43e8990dca70c9b29eba492f6e9530f2c76e4441c855be031c20090994b9c8cd2e20505ac
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tagalog/metadata.xml b/app-dicts/sword-tagalog/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tagalog/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild b/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild
deleted file mode 100644
index 29903217e0a6..000000000000
--- a/app-dicts/sword-tagalog/sword-tagalog-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Tagalog"
-
-inherit sword-module
-
-DESCRIPTION="Tagalog (John & James)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tagalog"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tcr-1.1 b/app-dicts/sword-tcr-1.1
new file mode 100644
index 000000000000..77e4fd714a15
--- /dev/null
+++ b/app-dicts/sword-tcr-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Thompson Chain Topics
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=TCR
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/TCR-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=665ac6c1686807e2f894fdf82eae8e5f
diff --git a/app-dicts/sword-tcr/Manifest b/app-dicts/sword-tcr/Manifest
deleted file mode 100644
index 733d7c1b3ebd..000000000000
--- a/app-dicts/sword-tcr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TCR-1.1.zip 270366 BLAKE2B 3419c5f47b93bf6c28ba94f1a80fd0b0262e512be3e651b3b605ddaa96eca0a0990c6cfb644d0fe827d48acf4aea0ec92353f529a1dae56339e2915188b10bd9 SHA512 c95faa93654751ab5c133e906ba7f8ebda3125c30dfa381551c04ba521bda898d3b2cdf43c969bba436ffef60c9922d6fd1486032bddc9a5f39409ce35b1b5d0
-EBUILD sword-tcr-1.1.ebuild 325 BLAKE2B 01e598af3ebe6cce976afe518af492cff61c18ed17d3914e9ddd8abcf7e7ce84c6fd009f23b2828c3e22d183fd6aceb34b4e9a8efd2e3b6ceeb7940110cc2e00 SHA512 e61a7ec555fa8a99bbb610ac81720889cdda9ff13c19314d7961f8ff92e96f88a0d23d35fb43dae5171cf16fa980d00dae1cd535fc608df9e0fa5ff75b08134c
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tcr/metadata.xml b/app-dicts/sword-tcr/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tcr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tcr/sword-tcr-1.1.ebuild b/app-dicts/sword-tcr/sword-tcr-1.1.ebuild
deleted file mode 100644
index a2bb52020ba4..000000000000
--- a/app-dicts/sword-tcr/sword-tcr-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="TCR"
-
-inherit sword-module
-
-DESCRIPTION="Thompson Chain Topics"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TCR"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tdavid-1.1 b/app-dicts/sword-tdavid-1.1
new file mode 100644
index 000000000000..6327f4e5dc5c
--- /dev/null
+++ b/app-dicts/sword-tdavid-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=C. H. Spurgeon's Treasury of David
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=TDavid
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/TDavid-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=fe7a9a26ff014da84e710417d7fe8cb1
diff --git a/app-dicts/sword-tdavid/Manifest b/app-dicts/sword-tdavid/Manifest
deleted file mode 100644
index 04837de33a2c..000000000000
--- a/app-dicts/sword-tdavid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TDavid-1.1.zip 4845476 BLAKE2B 82dbe176461852fd360ef526de4628f60a63a5f4160f884d917e216b7e9e9d4f409e03214dd4826581d54871b0da98023902b99ee513db20e213c52fa3e6a8f8 SHA512 d4aa18e30062a8af57bc70ffcbcd382ef0a83d09bff612b737faec371e831b418f6a2c15a78665a2a1cf76f7c0848c047d2a09543adf981f06b2d36daff1293b
-EBUILD sword-tdavid-1.1.ebuild 344 BLAKE2B b3071619fc1a4a8a3a439b9a330bd5349fa966ddfc5c51fafd9b50e5567679542858a2f8b68aafb08746d061409c61f9ea9e1cb8f3149024332617fe911d206a SHA512 999c00e3d06fff35d8bf24be65a15564a5e4535ff909e4802e0ea1b2c0fe1a44eae0429f0e596b33a4bae8d29196a1fc54b508fcaf76478c81a2e0b4c4f0f13e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tdavid/metadata.xml b/app-dicts/sword-tdavid/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tdavid/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild b/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild
deleted file mode 100644
index a00d0d843b05..000000000000
--- a/app-dicts/sword-tdavid/sword-tdavid-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="TDavid"
-
-inherit sword-module
-
-DESCRIPTION="C. H. Spurgeon's Treasury of David"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TDavid"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tfg-1.5 b/app-dicts/sword-tfg-1.5
new file mode 100644
index 000000000000..23e1bfb0cb86
--- /dev/null
+++ b/app-dicts/sword-tfg-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The Fourfold Gospel and Commentary on Acts of Apostles
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=TFG
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/TFG-1.5.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=6791ee156421d35167492a9fc2478ee3
diff --git a/app-dicts/sword-tfg/Manifest b/app-dicts/sword-tfg/Manifest
deleted file mode 100644
index 28d4e1eee1b6..000000000000
--- a/app-dicts/sword-tfg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TFG-1.5.zip 1031265 BLAKE2B 313a55b5e0f4aebfd58354ff9ceb0e78428f62d966d45eba4a045f5c857c6a3d008a60fe1423c9baf26d97264c086a6a081c9a9146606811f0d23b3a3088f76d SHA512 9377a6467192e23f97f12b7e7139a731c3a08bebd723e8f38f22099f9d4ee4b21de77ae72a1477d21ddb7cdf4238f94c1303bd10589b7142d69eed829ac4d299
-EBUILD sword-tfg-1.5.ebuild 358 BLAKE2B d11ca2109b8bfce2338aa4a59082f25ff39f1a9388aaf56282b7a4629177d130458b0eed593559d3ee8c623a84add601ffe6c93141623762d115bb6245f43ba2 SHA512 2318e09d6a0db30ba167a013bf389b39767152007b6eda484c8d6fa330887a9d73968e1e4e50b6b8b27bef0396df68211e7f83eb56a461c124fe2ffb78b4736f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tfg/metadata.xml b/app-dicts/sword-tfg/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tfg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tfg/sword-tfg-1.5.ebuild b/app-dicts/sword-tfg/sword-tfg-1.5.ebuild
deleted file mode 100644
index 80fcc82a6dda..000000000000
--- a/app-dicts/sword-tfg/sword-tfg-1.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="TFG"
-
-inherit sword-module
-
-DESCRIPTION="The Fourfold Gospel and Commentary on Acts of Apostles"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TFG"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tisch-1.3 b/app-dicts/sword-tisch-1.3
new file mode 100644
index 000000000000..91bd7a882aff
--- /dev/null
+++ b/app-dicts/sword-tisch-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Tischendorf's Eighth Edition GNT
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tisch
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Tisch-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=31642e60e4f70e44adc8f7e2dce4a4f8
diff --git a/app-dicts/sword-tisch/Manifest b/app-dicts/sword-tisch/Manifest
deleted file mode 100644
index b0b55b2a528d..000000000000
--- a/app-dicts/sword-tisch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Tisch-1.3.zip 394774 BLAKE2B 6339167ed661c75120dcbd8608c2aa77535ca8f2c8f582754cc28a5f50016789efc6903791630a3160313899418c6bc00084fc7660bcae7529964a4955e4b7e7 SHA512 0c6e83f9c392fb32c23660012e23229d15be079808679c3bd2d8985bba06af22ecd8297e796e095c0590f8b4894c9900f3daabb4061562ab62d4516878eb556a
-EBUILD sword-tisch-1.3.ebuild 340 BLAKE2B 78cd61c89e90619ab084abaa6a32397e4073d71ae8f38ecfa4f4057e46a38c8e05540316afab8dca64656fa48cde523d28d11eb6ea8b4103a57e0987201e3566 SHA512 3e840b24f6b6fa434b033d74d5fb79ad8d8b4bd4660e0bd9932cdc8fab0450842df40f383d8a4e2df67b4c80ef46db60d02c3796eafeafca35f31daa3c366163
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tisch/metadata.xml b/app-dicts/sword-tisch/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tisch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tisch/sword-tisch-1.3.ebuild b/app-dicts/sword-tisch/sword-tisch-1.3.ebuild
deleted file mode 100644
index 6220a663cc2d..000000000000
--- a/app-dicts/sword-tisch/sword-tisch-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Tisch"
-
-inherit sword-module
-
-DESCRIPTION="Tischendorf's Eighth Edition GNT"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tisch"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-torrey-1.3 b/app-dicts/sword-torrey-1.3
new file mode 100644
index 000000000000..c882f4b74d63
--- /dev/null
+++ b/app-dicts/sword-torrey-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=R. A. Torrey's New Topical Textbook
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Torrey
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Torrey-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e0444119108cd31a172b53256c4e11eb
diff --git a/app-dicts/sword-torrey/Manifest b/app-dicts/sword-torrey/Manifest
deleted file mode 100644
index ea670d4b1ed2..000000000000
--- a/app-dicts/sword-torrey/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Torrey-1.3.zip 422449 BLAKE2B aff495007ac023915cc177d982604a92ad062346b23ebe0b3f58228e648a635a2ad840c70d0866742dd77cb0cfc39ce7ebcb7e0f204766ed737ba428c58386e2 SHA512 581327653b08bc712104ea2645c8a2f80abb551c9455390623e8afa4aae48061dde7b1897c6e0322da5561ec354798d5923c25a26bc9c6f81191d13c9bf4dc33
-EBUILD sword-torrey-1.3.ebuild 345 BLAKE2B b6863f96746fe356a3b4d19a033314c355a058cf3b990bf95040d7ebb2daa1e3f3bd88faa39d05c4ead668f07be5f0805deef372682d0cc601058444e27a2295 SHA512 57e3d78dc406e277e99a5cb0728371333a761ef39d97354b4eb8172675910dce47c9f03320515e6407f97b878376374d0572674e3093cbb1c8d607de2f7917fe
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-torrey/metadata.xml b/app-dicts/sword-torrey/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-torrey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-torrey/sword-torrey-1.3.ebuild b/app-dicts/sword-torrey/sword-torrey-1.3.ebuild
deleted file mode 100644
index 336cccbee82d..000000000000
--- a/app-dicts/sword-torrey/sword-torrey-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Torrey"
-
-inherit sword-module
-
-DESCRIPTION="R. A. Torrey's New Topical Textbook"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Torrey"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tr-1.2 b/app-dicts/sword-tr-1.2
new file mode 100644
index 000000000000..3ff404c2a53a
--- /dev/null
+++ b/app-dicts/sword-tr-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Textus Receptus (1550/1894)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=TR
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/TR-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=de111bd977693ba0203942814eecd608
diff --git a/app-dicts/sword-tr/Manifest b/app-dicts/sword-tr/Manifest
deleted file mode 100644
index e65c46053497..000000000000
--- a/app-dicts/sword-tr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TR-1.2.zip 1273411 BLAKE2B 6e1705522b53d76ef35f45e7e6159342138f34e9c855da64bc4add705a67aac7431035f93f7717d437214b4c9418b4516c2d9fbf347eafd9f0e03e3a5f12f0f8 SHA512 0bae1092a1afadd2a3d7d65cd1d981be4bcca4e6e4e3f6323a9abd337e006d65893a9735e013a906c63a94473ca4028eeecfe26b16942d4fb1a128c8540684f1
-EBUILD sword-tr-1.2.ebuild 324 BLAKE2B 971d217a8fdcf9d3bc3b70fb0a29aa580c7f948a571e5987c327f82ba7e0b29de096bca1a905cbf447ecf34c67ec9a91f9cf41956b5117b7930dd60de7432b7e SHA512 5af460f70c90a04359a47735316d8bf91fc0af4c0fb812fdbf8daac0ea64e4d5ca505c21d23f091579c8f3830cac466a3aacd682141c0f61326130ba12a77194
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tr/metadata.xml b/app-dicts/sword-tr/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tr/sword-tr-1.2.ebuild b/app-dicts/sword-tr/sword-tr-1.2.ebuild
deleted file mode 100644
index ddaefdb01c23..000000000000
--- a/app-dicts/sword-tr/sword-tr-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="TR"
-
-inherit sword-module
-
-DESCRIPTION="Textus Receptus (1550/1894)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TR"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tsk-1.4 b/app-dicts/sword-tsk-1.4
new file mode 100644
index 000000000000..d6ccc9d1d07d
--- /dev/null
+++ b/app-dicts/sword-tsk-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Treasury of Scripture Knowledge
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=TSK
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/TSK-1.4.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=80a1a81887d44ce1e5a7b06a46606beb
diff --git a/app-dicts/sword-tsk/Manifest b/app-dicts/sword-tsk/Manifest
deleted file mode 100644
index c0c4b3cbf40d..000000000000
--- a/app-dicts/sword-tsk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TSK-1.4.zip 2643723 BLAKE2B bf4dc47a09c615d2a2d92505ac3fa454a3282487386babd92a98b154461fd72f3b17dfd6b6b80d3497a5a8a698cdeab2e932165a181cbce2d2dba87524810ced SHA512 ed70671352204e9bbb32ba7f277546303152d543c931be07a628faad8f49a178c7c320a11f10dfc36786d6f93aaeb0d2b077a68315648563253886075f01872b
-EBUILD sword-tsk-1.4.ebuild 335 BLAKE2B e027b428d2e49552376057c7405ab51a5942fdb9cf96a3f49de4bb3421e7d1d6ce9af0efa03002a11039ad10cf23c7eacbf6ae917e0d1eabd0f3b3adafb63274 SHA512 3c49ac77ff70c87b7e05e7c864c40e526a6cfef752618785aeb179d6a545798dc77d8e6fda3f89a2bde48bdc746d32b5a05708d770693108aea1127e4cdc545f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tsk/metadata.xml b/app-dicts/sword-tsk/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tsk/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tsk/sword-tsk-1.4.ebuild b/app-dicts/sword-tsk/sword-tsk-1.4.ebuild
deleted file mode 100644
index 972ca001c6b0..000000000000
--- a/app-dicts/sword-tsk/sword-tsk-1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="TSK"
-
-inherit sword-module
-
-DESCRIPTION="Treasury of Scripture Knowledge"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TSK"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-twenty-1.1 b/app-dicts/sword-twenty-1.1
new file mode 100644
index 000000000000..82d632184ed7
--- /dev/null
+++ b/app-dicts/sword-twenty-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Twentieth Century New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Twenty-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=72584b732b1e0742fbea765c2eafb3f4
diff --git a/app-dicts/sword-twenty/Manifest b/app-dicts/sword-twenty/Manifest
deleted file mode 100644
index eacd9132b8c8..000000000000
--- a/app-dicts/sword-twenty/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Twenty-1.1.zip 395147 BLAKE2B 7b5b798b4d9daf398530b7b791e1b04303d0e75be41ef19477567c02836151b1f76afb7cd12a701c85d0123f4ae854443b6599635fa0a37d44ba600d9de38779 SHA512 5a2449facec4426a60ea6ecfd87328930306e87e6221b0363128ede632e820629fc8aaa28c56e6f82c74a86ef23c47126709fc68ce9ccc1ea6f12e160ebe81bc
-EBUILD sword-twenty-1.1.ebuild 336 BLAKE2B 2a3cc36d474fe65836695510c32605e28db36ea9b845283a535fc56a55b03c9ff88d8b3de978d7f45462031fd0dbb199131158007ae5090bf02a5bb62e1eaeca SHA512 1287cf03677978addeacb6f4f6e47a085d9aaf7c6d242eb06e456adaf70fe58a9348b877498356be37d74f811dabce004ed9a84993dc141a7f8c15543b0b552e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-twenty/metadata.xml b/app-dicts/sword-twenty/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-twenty/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-twenty/sword-twenty-1.1.ebuild b/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
deleted file mode 100644
index a87a19327afe..000000000000
--- a/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Twenty"
-
-inherit sword-module
-
-DESCRIPTION="Twentieth Century New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-tyndale-1.0 b/app-dicts/sword-tyndale-1.0
new file mode 100644
index 000000000000..dab5bf499570
--- /dev/null
+++ b/app-dicts/sword-tyndale-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=William Tyndale Bible (1525/1530)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Tyndale-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=07a5eafeebf6534c0493cb81af21d903
diff --git a/app-dicts/sword-tyndale/Manifest b/app-dicts/sword-tyndale/Manifest
deleted file mode 100644
index 72585d3998de..000000000000
--- a/app-dicts/sword-tyndale/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Tyndale-1.0.zip 351631 BLAKE2B e0565795f757ee9b963c545ec206806ff1596da95a2b1ba08974745aa456acebf21c50af924c06f7e177f459d6f1b07124f9943a132a4193a76a0da2e0779e99 SHA512 9318a0997e3199f1b74f26521209e591ea945af1ac3c0652df18688186b990fddc55812807275b2ee55f42a867f9b7593032191fbdbbfce8b663bd75de1a08e4
-EBUILD sword-tyndale-1.0.ebuild 340 BLAKE2B 19d920ecb7054a6c5c2152d1cea98a2cb0405520585560dac98a8273003fbb8c709129be6489aa83d054eb954ffc1b669deb7574ce0df0f59e5c7e890a64fb7b SHA512 59788d59e02ac18c37d69c54384386d4c8cb94cb255e9963ed8cfb8af0c2b5e81e37b8398b3a01d0e3ae40c70b2ad59c06833bff6837ece1978b07ac8c065f7f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tyndale/metadata.xml b/app-dicts/sword-tyndale/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-tyndale/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild b/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
deleted file mode 100644
index 5ce95956483c..000000000000
--- a/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Tyndale"
-
-inherit sword-module
-
-DESCRIPTION="William Tyndale Bible (1525/1530)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-ukjv-1.1 b/app-dicts/sword-ukjv-1.1
new file mode 100644
index 000000000000..3f1ad452ccbf
--- /dev/null
+++ b/app-dicts/sword-ukjv-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Updated King James Version
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/UKJV-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=8028b54d45a4c9eb16dc127ff7871ea4
diff --git a/app-dicts/sword-ukjv/Manifest b/app-dicts/sword-ukjv/Manifest
deleted file mode 100644
index 6b1ff09c24d5..000000000000
--- a/app-dicts/sword-ukjv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST UKJV-1.1.zip 1584221 BLAKE2B cd9dd0cef2416ca4a871807d71de5096f9fecb42cfdfd228f09ec1fd05f7c193cd972e67f6c5d3bc8b981d082c88aaa3d535ccf3c82045127c574896a2a2fc14 SHA512 1869a1b165d187bf0f1a11dd1ee032553576dcb7cd0f13707e6aa1956e0b9122b404751cded28be5d4a23c62420bdafeeb0c4af7426f5142a74246f28337614e
-EBUILD sword-ukjv-1.1.ebuild 327 BLAKE2B 4f8b377e6918de63609c968e08bcf935244c9848b9d69fd2f9e94f75a80b88dcc817b970cc2d531a6e797d8d3a70ee7c787ff159cd3af61b12b0451eb6e48454 SHA512 1b3cc8bc1e82abbd53bbef1881593fad32b0ad3bbb7a82e0cf1bceec09e2dddb3d6bc017cab151ae369edfcb2788b84218b7daf30593a870597dcca5fd4ed472
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ukjv/metadata.xml b/app-dicts/sword-ukjv/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-ukjv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild b/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
deleted file mode 100644
index 60463c811c52..000000000000
--- a/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="UKJV"
-
-inherit sword-module
-
-DESCRIPTION="Updated King James Version"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-ukrainian-1.3 b/app-dicts/sword-ukrainian-1.3
new file mode 100644
index 000000000000..a8a1c7f6b585
--- /dev/null
+++ b/app-dicts/sword-ukrainian-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Ukrainian Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Ukrainian
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Ukrainian-1.3.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=4ba976f31a1f76e29077d7dda872a474
diff --git a/app-dicts/sword-ukrainian/Manifest b/app-dicts/sword-ukrainian/Manifest
deleted file mode 100644
index 0708b75ed57e..000000000000
--- a/app-dicts/sword-ukrainian/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Ukrainian-1.3.zip 1719068 BLAKE2B 28370fb5295cd686810a42a5dde13060bec4ab9ec7e4d44016115db2b2ef1650d1a092d0d34a69a44783de3890311aa5d46e85497ddfb300dc0f000caa0b8cc5 SHA512 de2f5ce9096a6d7f33a38a88976db064a318960000c0e1540c3857c872ca5d902e8cca354014ec83167e9d7b1c89c468dff5359635b1e72b70366ab1b5e61c15
-EBUILD sword-ukrainian-1.3.ebuild 331 BLAKE2B 8e6d928159842e8a2564a27a88c173dc08da75327abda7a66c965869925b07703365669fcd9423052232a4461b774d6c7e55152c116e9746ce98b00e6ed3c986 SHA512 b1a590c262f7027e8aa5048b61d380c3a29c6f37c83bff05b7f90246d9e4aa2cb599eed95b8e94cd0e5b4c460508a59e0d7522700bf6555092dea17f0624f610
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ukrainian/metadata.xml b/app-dicts/sword-ukrainian/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-ukrainian/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild b/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild
deleted file mode 100644
index 154cda3b8605..000000000000
--- a/app-dicts/sword-ukrainian/sword-ukrainian-1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Ukrainian"
-
-inherit sword-module
-
-DESCRIPTION="Ukrainian Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Ukrainian"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-uma-1.2 b/app-dicts/sword-uma-1.2
new file mode 100644
index 000000000000..dd054f95f42b
--- /dev/null
+++ b/app-dicts/sword-uma-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Uma New Testament
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Uma
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=free-noncomm
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Uma-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=3818efd272090673e799aacf6ac2020e
diff --git a/app-dicts/sword-uma/Manifest b/app-dicts/sword-uma/Manifest
deleted file mode 100644
index 56f2182e97ec..000000000000
--- a/app-dicts/sword-uma/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Uma-1.2.zip 431726 BLAKE2B 23b8531a7b42699b8a48c04209557c75401d5256ba13528d5034796e0b20d57fadcdb8ad80c777b94f132eaeac7291dd5f8658942922efa6d7a0764ff72be3ea SHA512 b9ff117f0064e8d2a4175c9e53039048db8d07ac9d512f07c746231c705b461c7859bdf4f5d0162d7ca6bc314ff8590ab5eca498826d524c5be3d9b76e1ac3bd
-EBUILD sword-uma-1.2.ebuild 320 BLAKE2B d34beb519cdf1b6b59d0f6728c8dae526c6df1fa734146fc320450c80dec7e749fcfe0006725fb8425ddace2fa82f43b2d3a0e85b110a1d9ca39c1689fa37626 SHA512 f6e485bc648361a68ca2116bf240ce475783afc8a829751a8f052105bb985f7e1b62f7b6cc30ca0b7a3f656d5a509acc2f10dbc27acc8b10655d66c0e3672b75
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-uma/metadata.xml b/app-dicts/sword-uma/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-uma/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-uma/sword-uma-1.2.ebuild b/app-dicts/sword-uma/sword-uma-1.2.ebuild
deleted file mode 100644
index 4b1ccda9d03d..000000000000
--- a/app-dicts/sword-uma/sword-uma-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Uma"
-
-inherit sword-module
-
-DESCRIPTION="Uma New Testament"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Uma"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-umgreek-1.6 b/app-dicts/sword-umgreek-1.6
new file mode 100644
index 000000000000..8c38b9a1decd
--- /dev/null
+++ b/app-dicts/sword-umgreek-1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Unaccented Modern Greek Text
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=UMGreek
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/UMGreek-1.6.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=2c32b10806283a138c39d160891936f9
diff --git a/app-dicts/sword-umgreek/Manifest b/app-dicts/sword-umgreek/Manifest
deleted file mode 100644
index 7ca7ed6f12ca..000000000000
--- a/app-dicts/sword-umgreek/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST UMGreek-1.6.zip 1783059 BLAKE2B 1ee00187b3fffe640638106759bc99d648f9001d7938e872a30a2c7d90a12e87b1e9fff13b631e4a153821c7f32fd412d54de147978ac54f10be80908b5d63fa SHA512 29b400bb59fa17710c7fd302568c31692e46b099276f0aa53b0636daa0819cc4a8e50db99c5cbbb09290cea8ffde2f7a95d0ccf12c6c7646f898260e4c8f2047
-EBUILD sword-umgreek-1.6.ebuild 335 BLAKE2B 65a8975920e40ff9a1f4cd3112922aa9cfd19d9197e43ff3fa95a5893b1a3d944c4e5f43f96c399eeb2c6017746b7abb274a6c97acd6d1ef0954d6dde30179f8 SHA512 52822f5bea087f2a6695ef4f147dfcc2e8f16876475fbbe05b58bf5b132a9770f821a38eeb7dcc878d0ebdf2f4a3dd006ccb83fb94d1c3b6bc57e52c9c878912
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-umgreek/metadata.xml b/app-dicts/sword-umgreek/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-umgreek/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild b/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
deleted file mode 100644
index ffe3bae29310..000000000000
--- a/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="UMGreek"
-
-inherit sword-module
-
-DESCRIPTION="Unaccented Modern Greek Text"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=UMGreek"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-vulgate-1.1 b/app-dicts/sword-vulgate-1.1
new file mode 100644
index 000000000000..fb6479ce7ba0
--- /dev/null
+++ b/app-dicts/sword-vulgate-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Latin Vulgate
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Vulgate-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=067d2500b53400df494025ac05569b49
diff --git a/app-dicts/sword-vulgate/Manifest b/app-dicts/sword-vulgate/Manifest
deleted file mode 100644
index a5af58b295bd..000000000000
--- a/app-dicts/sword-vulgate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Vulgate-1.1.zip 1316533 BLAKE2B 9290df97a3a324bf05201e447765ca798c89928b9eabe6082fece09992090fd0d1ba18725228c2143326d87c80063aa8e761677ef1d6bb7dd9ad3da93ec14a7e SHA512 d4c51461ac09c4902c395c7f37fd45532dc071b7df787a0e1a7142d7d783abe50b25423ae867f4ad2665d15397e74bfb56b5d395be3f28f9dd5647f4eac6df09
-EBUILD sword-vulgate-1.1.ebuild 320 BLAKE2B 4ffd2a80ff50d6b9002362ea9e518d2b96111f8fc589cc8817e4ee18b69da4500e4b852bf61d319313c1304056e168cb64360e151672f07aad5049b9acdf4779 SHA512 ae885704a92e42c689dd2f65c538db55b2073e9990a23b6f2fdf038c30e8113e2545765b97c9f466703ec1eddc8550369cd3d94c279bf4f47baa579affbe71bd
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-vulgate/metadata.xml b/app-dicts/sword-vulgate/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-vulgate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild b/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
deleted file mode 100644
index f611a9d77986..000000000000
--- a/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Vulgate"
-
-inherit sword-module
-
-DESCRIPTION="Latin Vulgate"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-vulgate_hebps-1.1 b/app-dicts/sword-vulgate_hebps-1.1
new file mode 100644
index 000000000000..e4b0549f03e6
--- /dev/null
+++ b/app-dicts/sword-vulgate_hebps-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Latin Vulgate Psalms from Hebrew
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Vulgate_HebPs-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=097c7d42fcd11406eb2ee78f5889ecf1
diff --git a/app-dicts/sword-vulgate_hebps/Manifest b/app-dicts/sword-vulgate_hebps/Manifest
deleted file mode 100644
index 788b230baede..000000000000
--- a/app-dicts/sword-vulgate_hebps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Vulgate_HebPs-1.1.zip 79573 BLAKE2B ae7b4f8a83fa632b3054024b2e10b0b167837f312389e98738f6193525f09d64445cfabc280e0c21a1f8c65d9bc331ba05954193e9426e61d73ece2319d3a523 SHA512 3b07164f867d26baac1aac311371206abfeaac17f8e680456eec6be0cf458c1172e1d31a7b2a17dceb4c44bfdad183fd2a9b46aec61488cf28f78ce0f97073de
-EBUILD sword-vulgate_hebps-1.1.ebuild 351 BLAKE2B 723fa6b0511f143b0282f987c5d02e7416e8133e41206bbb32c31f8c1c3e5e4f2f4be8b5727e983fe21fc7e0609b6e88c97637d6296f47d1cdeda32f8813eb8b SHA512 52653394a0aa192c0f33785623b69b0d32f9949532284c51f09bcbe68afd9fef13059cb640f0951c99727342693684c42726ebfce160506441436f1ba76a6ef6
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-vulgate_hebps/metadata.xml b/app-dicts/sword-vulgate_hebps/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-vulgate_hebps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild b/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
deleted file mode 100644
index b5616129a136..000000000000
--- a/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Vulgate_HebPs"
-
-inherit sword-module
-
-DESCRIPTION="Latin Vulgate Psalms from Hebrew"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-web-1.8 b/app-dicts/sword-web-1.8
new file mode 100644
index 000000000000..ed0dd8268667
--- /dev/null
+++ b/app-dicts/sword-web-1.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=World English Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=WEB
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/WEB-1.8.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=a3002202707928e849fae6b2f13a16a6
diff --git a/app-dicts/sword-web/Manifest b/app-dicts/sword-web/Manifest
deleted file mode 100644
index 2a5716c5bc2b..000000000000
--- a/app-dicts/sword-web/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WEB-1.8.zip 1520597 BLAKE2B 193888d73c8ce68cdec8ad6a5c2becb754d44fe212b29528bb6450e4dcb6c15061fc2c79fa33bfe048f21ab12789306b279a694f3255b7f9495240b9c1b0ea12 SHA512 1abccad5f98c49152195cf3a31ae80a19d88d49dd7bec292afc7c22a1e04e1f8bdca9dbcd2f5572354a05fe5cf951718cdb9173af1ee5e822a09ba8512759e20
-EBUILD sword-web-1.8.ebuild 323 BLAKE2B d295bce11a9215a75bfed5fc6afd96c59b9469ee1a7cf600a70aedea58585ab05632ec006f6ef9e5f81f07931956c3714960e58a968caf8ee2fcbf9132c058c2 SHA512 8a0d7256ed3b2b1ec7cd643a3511ce9dc976b77066846222a629354258a7f67fd7707dfe33370198d289e8515a95d3a955f2686f3547f26e9f5b120b986b0bcb
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-web/metadata.xml b/app-dicts/sword-web/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-web/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-web/sword-web-1.8.ebuild b/app-dicts/sword-web/sword-web-1.8.ebuild
deleted file mode 100644
index 86a91958e42d..000000000000
--- a/app-dicts/sword-web/sword-web-1.8.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="WEB"
-
-inherit sword-module
-
-DESCRIPTION="World English Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WEB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-webster-1.2 b/app-dicts/sword-webster-1.2
new file mode 100644
index 000000000000..117cb24e0ea2
--- /dev/null
+++ b/app-dicts/sword-webster-1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Webster Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Webster-1.2.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=8feeb3863c3d181e68188e49cefa74e6
diff --git a/app-dicts/sword-webster/Manifest b/app-dicts/sword-webster/Manifest
deleted file mode 100644
index 2c16645ee717..000000000000
--- a/app-dicts/sword-webster/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Webster-1.2.zip 1481353 BLAKE2B d88881b42fa878f70a807541f2942917a1054baa0342512ccbf7e460bcf39e37e792d0f007646c2853971a660fe1c0ce0ee3420f27ee6da12f8300ea868cb89a SHA512 a02b6e192b7c82f5ab6015a3c77743b40a930af6e4dddec634a8f6b8099c8b5c6d9915ebb035adf5540bd7834e70b1168468a8259edc688e50d13d5fca9267ee
-EBUILD sword-webster-1.2.ebuild 325 BLAKE2B 8f8626555d433e38ad888b831d6ba7356028f5b44ebc22dd8f6d4c3fd44a92d380e9fadebaf05b9032d12477a4aa461bd08e7f6e6ba1a166e0b0ab7813606461 SHA512 a63269e412a485bfcbebff919e22e5d7bc7fa8fe32f38e7b59a1d68f66579ed24dd30752723128bdff31c91a0b7863b6c6c694ddc3f530e1308f604a3f10fd7a
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-webster/metadata.xml b/app-dicts/sword-webster/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-webster/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-webster/sword-webster-1.2.ebuild b/app-dicts/sword-webster/sword-webster-1.2.ebuild
deleted file mode 100644
index 167c5fac538a..000000000000
--- a/app-dicts/sword-webster/sword-webster-1.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Webster"
-
-inherit sword-module
-
-DESCRIPTION="Webster Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Webster"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-webstersdict-1.1 b/app-dicts/sword-webstersdict-1.1
new file mode 100644
index 000000000000..e8c77a2f0873
--- /dev/null
+++ b/app-dicts/sword-webstersdict-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Webster's Revised Unabridged Dictionary of the English Language 1913
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=WebstersDict
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/WebstersDict-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=c7b778f2eac04230d6113502c505668b
diff --git a/app-dicts/sword-webstersdict/Manifest b/app-dicts/sword-webstersdict/Manifest
deleted file mode 100644
index a3abeec48244..000000000000
--- a/app-dicts/sword-webstersdict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WebstersDict-1.1.zip 14486502 BLAKE2B 00c443e688693dc8656ffba6d323ff79573ae8a6d234b571b294f63d42bd95815048aac36a5b826dc07d14ceae49f3239608f8de527b98920c5202f75adc7586 SHA512 a9d5635c1440ff2c284f74d0710babcf78a2d6bcb8bf4d40cc5100d053af0bda461b53ce9e76db4141f7a8d04fd5b321ac5897730054b0526cd20f10416ce9be
-EBUILD sword-webstersdict-1.1.ebuild 390 BLAKE2B e6ea43bd3939b9aa52b6b3d7e6ba436d469fc566f9f7f08cf7b11925dc1bc5c524441d48ed8bbde7f871a5cda2c153f2067b6f634430a84404b832e90bab0011 SHA512 fa7a693e3f7c32228a7b43ea55efed8ee221e6165137041cf7ccf16d85f38253fd63ec4357766a387d3b26bbc68be81b457cf47611210cbdd22f9efa6dc1c2a8
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-webstersdict/metadata.xml b/app-dicts/sword-webstersdict/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-webstersdict/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild b/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild
deleted file mode 100644
index 7764ed59866b..000000000000
--- a/app-dicts/sword-webstersdict/sword-webstersdict-1.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="WebstersDict"
-
-inherit sword-module
-
-DESCRIPTION="Webster's Revised Unabridged Dictionary of the English Language
-1913"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WebstersDict"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-wesley-1.1 b/app-dicts/sword-wesley-1.1
new file mode 100644
index 000000000000..e510bba57f96
--- /dev/null
+++ b/app-dicts/sword-wesley-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=John Wesley's Notes on the Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wesley
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Wesley-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=f0b6dac83b185eff621057b2ca238b82
diff --git a/app-dicts/sword-wesley/Manifest b/app-dicts/sword-wesley/Manifest
deleted file mode 100644
index d1645214ad67..000000000000
--- a/app-dicts/sword-wesley/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Wesley-1.1.zip 1895926 BLAKE2B 8d2d0c3bd41186941717dd8b8e71c092b4bd3d7f6eff1b53d663445cb065d3ead4c0bd5b74a171815062059a72b1565f6a332e20d85430df42b9204adeecf5a2 SHA512 0ed6138ab9c21c400beea6b44ef60cfb10960963760e6fa2a90c95ecd03621ce6548c8f846eb4454c5a9bf30e63684ea1e10ec36538935df8c05db69ec26b9cc
-EBUILD sword-wesley-1.1.ebuild 342 BLAKE2B 6dd13172c90c8c271907f9faab6c8998d024c98263f17c6609dabfcb39733f6c9e2e64028d14bd79c676fe69bec3c263c1d6a378a82ea2b33300d86482305154 SHA512 86669fe2a3a8fe285146fe04a04e0c246b80ee81125e9ef142c3891561dda3fd4972e028385b4eadb21b11d8aaf5c983bba6ab02520fc95b1c019820d4b0ba94
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wesley/metadata.xml b/app-dicts/sword-wesley/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-wesley/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-wesley/sword-wesley-1.1.ebuild b/app-dicts/sword-wesley/sword-wesley-1.1.ebuild
deleted file mode 100644
index c4963bba8d60..000000000000
--- a/app-dicts/sword-wesley/sword-wesley-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Wesley"
-
-inherit sword-module
-
-DESCRIPTION="John Wesley's Notes on the Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wesley"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-weymouth-1.1 b/app-dicts/sword-weymouth-1.1
new file mode 100644
index 000000000000..1886d867ddd1
--- /dev/null
+++ b/app-dicts/sword-weymouth-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Weymouth NT (1912)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Weymouth
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Weymouth-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=e7d9fa4e92bd3c43e6a48212af56bdc0
diff --git a/app-dicts/sword-weymouth/Manifest b/app-dicts/sword-weymouth/Manifest
deleted file mode 100644
index 108c68b6c1a5..000000000000
--- a/app-dicts/sword-weymouth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Weymouth-1.1.zip 419204 BLAKE2B 7061d31a81c0e3c760592145366508290f26f14ba12a2ab4b3673603c0e321f77cbf5c051db2a20d4b5552fb47836eaa6c0ca1a35cdd293660b7c0d734d39e1f SHA512 893174d721386169c26734bce4fe4454323f8b0a64405483b79f0ca0488bbf7f93781a56e829c6211cdda75537e65ab0e449ea04d9ece5f413c13c9918463014
-EBUILD sword-weymouth-1.1.ebuild 332 BLAKE2B 2c83795fed941a3d13217cda7d5cf4af18e8086cf87f1f4a7e4c956147a950b9c99053448264d357ad8a0a3ba739de040bb8dbcd33ceae45cc9b849f83b8d770 SHA512 a57069b0f8ab58bc1edbf6ff613d33b6567f473cc7cb7208357be1b2a0bfd516690a0acb8bd6844d519e3e62691cb953065f93ba5a60b940d4dea2a98fc68e3f
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-weymouth/metadata.xml b/app-dicts/sword-weymouth/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-weymouth/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild b/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild
deleted file mode 100644
index 284cef336870..000000000000
--- a/app-dicts/sword-weymouth/sword-weymouth-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Weymouth"
-
-inherit sword-module
-
-DESCRIPTION="Weymouth NT (1912)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Weymouth"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-whnu-1.10 b/app-dicts/sword-whnu-1.10
new file mode 100644
index 000000000000..5b13ec8d9584
--- /dev/null
+++ b/app-dicts/sword-whnu-1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Westcott-Hort with NA27/UBS4 variants (1881)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/WHNU-1.10.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=76f25c7868b4097aa1c374ffcd451671
diff --git a/app-dicts/sword-whnu/Manifest b/app-dicts/sword-whnu/Manifest
deleted file mode 100644
index f114a2349805..000000000000
--- a/app-dicts/sword-whnu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WHNU-1.10.zip 1281295 BLAKE2B 46e097d1c5de75565f1af3291bf47c8deb915da8338a56ef302dfa53c62780886e595210309b349da1e849301065836d7f737c23570794b8c67898b49b9e9ffc SHA512 c241ef99837c0e09e9b5192b134b2d61bc2fa6bbe8dd06661ec56fc7a9bc236adffe4fdad894db966884296f254858d92dc7b0bfcede19d902becf54dc1a6949
-EBUILD sword-whnu-1.10.ebuild 345 BLAKE2B 725adfcb1278e77dd9e6947f889afafaafffe2e174311472ce63a46b2ba5d9c780f1f622e3f48d1fe031f229419df779228a531efe029d9ff47e2c168d89eb90 SHA512 ecedbd3d55677f84b4264cabc436adb36ae159590481d770a07900e9e06844c494abe22dce0b6916ec57bc9cfd2c9b93b322d5794b0dd44a328ebabbd1695b0e
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-whnu/metadata.xml b/app-dicts/sword-whnu/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-whnu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-whnu/sword-whnu-1.10.ebuild b/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
deleted file mode 100644
index 1ca976c4dd36..000000000000
--- a/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="WHNU"
-
-inherit sword-module
-
-DESCRIPTION="Westcott-Hort with NA27/UBS4 variants (1881)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-wlc-1.4 b/app-dicts/sword-wlc-1.4
new file mode 100644
index 000000000000..092e36f036ff
--- /dev/null
+++ b/app-dicts/sword-wlc-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Westminster Leningrad Codex
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/WLC-1.4.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=ddb8ff114a92f01d453ffa95bf50a0d9
diff --git a/app-dicts/sword-wlc/Manifest b/app-dicts/sword-wlc/Manifest
deleted file mode 100644
index f69c2392a8c9..000000000000
--- a/app-dicts/sword-wlc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WLC-1.4.zip 2017282 BLAKE2B faccf4c8cacdbe60fe8bbfbef254ff2b5e5469c78b0390d6a6f1d2b1b45ec171d1dfc6055aae200c811d384c8683abc2f33d663cc40bb42510ae31d23c3df75e SHA512 71c45b2d5d30fb50ceda827464fe5d50350827b37b23b439341f61895f759de86edd1d77ffa26fc6e3acf0cf7759e7ae28645c360a2b14deeb9442e51aa9184a
-EBUILD sword-wlc-1.4.ebuild 326 BLAKE2B 382d538da54a35e8f182e2aee77e6dde9410dcf0f605636ef396992760b27017172913f0ed1068aeed55da7290d0ada02594868ea35b74a54239ed120e0a7c53 SHA512 eb0c6ff8b87747d89ff1947aa42f280f2fa6cc2f940099cf4106e44b7ec610b8c5ae7c2e25d541a8e631a3c9e835bb47d42cfba863041638ece1b66c2bf9c484
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wlc/metadata.xml b/app-dicts/sword-wlc/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-wlc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-wlc/sword-wlc-1.4.ebuild b/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
deleted file mode 100644
index 10d01d2ec290..000000000000
--- a/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="WLC"
-
-inherit sword-module
-
-DESCRIPTION="Westminster Leningrad Codex"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-wulfila-1.0 b/app-dicts/sword-wulfila-1.0
new file mode 100644
index 000000000000..6a53ee29e7e4
--- /dev/null
+++ b/app-dicts/sword-wulfila-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Bishop Wulfila Gothic Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Wulfila-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=72efdd6ecacdbddd26e005fd7328a835
diff --git a/app-dicts/sword-wulfila/Manifest b/app-dicts/sword-wulfila/Manifest
deleted file mode 100644
index 5761546cf8c4..000000000000
--- a/app-dicts/sword-wulfila/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Wulfila-1.0.zip 238923 BLAKE2B 3c496bc16881ecd1164678bc6cf4bcbc8bc2185af1cea961138e01fead350d31e076047d846d0b1ef23971ae934cc2f292c69bf454e0254fe41321817f5d553f SHA512 fcec30f54bdd95c77d2737f270909354fc1500196dd05d6a8aa02bf4b1b6ba61eef946ebbe523b90b1d5fb2c77ddd6f9b1e101949b7050bc4068cd9e2a9f8067
-EBUILD sword-wulfila-1.0.ebuild 334 BLAKE2B d38d8e7a4143861e2169a583fc0a148ca5bfa653871762f1a7c999570de76533a4fe1c763b842f48f7b9bd6818a195c0e86bdd514f4165ea7a7f17693de4f3af SHA512 e4177cd99929a639f96839ff77cfd41b2f29c2ad1afd3220fcfbb38f987a3e6b336d97ed32409d6f8832260a048444330c8376153b44155a3d6892cde3926e11
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wulfila/metadata.xml b/app-dicts/sword-wulfila/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-wulfila/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild b/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
deleted file mode 100644
index 810bd306e5bb..000000000000
--- a/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Wulfila"
-
-inherit sword-module
-
-DESCRIPTION="Bishop Wulfila Gothic Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-wycliffe-1.0 b/app-dicts/sword-wycliffe-1.0
new file mode 100644
index 000000000000..24d560790b57
--- /dev/null
+++ b/app-dicts/sword-wycliffe-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=John Wycliffe Bible (1395)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Wycliffe-1.0.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=da36ac7688b69260a0bf252881aca6e9
diff --git a/app-dicts/sword-wycliffe/Manifest b/app-dicts/sword-wycliffe/Manifest
deleted file mode 100644
index ee2627e20eb7..000000000000
--- a/app-dicts/sword-wycliffe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Wycliffe-1.0.zip 421695 BLAKE2B d73da0fdef44c07265361d595a9c5d1464a3e3cc63d8857347f4aebd93b8d8ef73b9472af3b56ff9aa45ff250342556cfac82501085d31955880dad655faf70a SHA512 b67518357da85f64822f0ebd9a70a1f8a59363701d26ac808e3c745ec40eb3fb092848acad41ef2757d3de27ad06815ebd2a865ae991e563f07283e41e7fc9c4
-EBUILD sword-wycliffe-1.0.ebuild 335 BLAKE2B 401309fca768ba6381a55aa86fce4dfea051b64ab7c81165ba99e9bf86624ecec2b3c25c9f491eca5e4fe5d2e56795292629c62d7338e2d6bd352ab1b72eb41c SHA512 6f956e65cafd08be4960c088cd1607ca2fcea4e849332e7a17816740f10ec1765225071144cb6a119a275032c2358bba9e5abab6faf3eb59d56148e5970a34dc
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wycliffe/metadata.xml b/app-dicts/sword-wycliffe/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-wycliffe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild b/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
deleted file mode 100644
index cf7c6e170c0e..000000000000
--- a/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Wycliffe"
-
-inherit sword-module
-
-DESCRIPTION="John Wycliffe Bible (1395)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-xhosa-1.1 b/app-dicts/sword-xhosa-1.1
new file mode 100644
index 000000000000..fd76e5932e88
--- /dev/null
+++ b/app-dicts/sword-xhosa-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Xhosa Bible
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=Xhosa
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/Xhosa-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=17a75d128bc72179a7253f4244d39327
diff --git a/app-dicts/sword-xhosa/Manifest b/app-dicts/sword-xhosa/Manifest
deleted file mode 100644
index 00d55e948018..000000000000
--- a/app-dicts/sword-xhosa/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Xhosa-1.1.zip 1428206 BLAKE2B 33820e755e4696bdba0972254ec6d2cea0c86bc7b9b52f0c5cfa180d217f328f07e42cc7e0c0be815c4bb5589108995574af9b0d3ea8dcfcf4a1493e5defb183 SHA512 3e3e0264417009e08751cee3e5d48292365b74e1af4c0a611d54b7e20a15d4d2fbf2d31ae56d49b135c5684d67fabf7d5e6e2948315df97fa07dae70c621a785
-EBUILD sword-xhosa-1.1.ebuild 319 BLAKE2B 77a7d3bfb104e6c50e7a2004e084415ecad397a0b75b1473c1c12f59d2e062f9ae408959a0ae5751bcabc625b66d9f18e9b3ce66fe5f01754ed4ceb7dec7f638 SHA512 fa5038e43e2210436c9f9813f4037c902494007d1592fc28e9ca254898d5daa0b050ea47bd0f64e9702d6ad207e7a05b3afae0e8eab76d71374546db00dafc63
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-xhosa/metadata.xml b/app-dicts/sword-xhosa/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-xhosa/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild b/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
deleted file mode 100644
index 0207f4e97648..000000000000
--- a/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="Xhosa"
-
-inherit sword-module
-
-DESCRIPTION="Xhosa Bible"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Xhosa"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/sword-ylt-1.1 b/app-dicts/sword-ylt-1.1
new file mode 100644
index 000000000000..bcf298974241
--- /dev/null
+++ b/app-dicts/sword-ylt-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Young's Literal Translation (1898)
+EAPI=5
+HOMEPAGE=http://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=freedist
+RDEPEND=app-text/sword
+SLOT=0
+SRC_URI=mirror://gentoo/YLT-1.1.zip
+_eclasses_=sword-module f93b38348e60d75f292f55df132bbac4
+_md5_=d4f3eae8618c5cc1bf1d967aa155228d
diff --git a/app-dicts/sword-ylt/Manifest b/app-dicts/sword-ylt/Manifest
deleted file mode 100644
index a5a9b7940e1b..000000000000
--- a/app-dicts/sword-ylt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST YLT-1.1.zip 1430863 BLAKE2B e2d6c04c8e83f84f2f0f89599237a958abb09b9a117852b0e92c9d685de26ff61d3416f81ed857e104712cee81d5b20676bad124778d5a8a7f0cc8f63b62032a SHA512 6ff2b321082eb9112df8978e80b68baafc63209d2d6b13432f0b221fedfac5d8c50b6f15261e41b0e3f04634cc286574efec81cae1a5ae0c116f30b8fba9b47e
-EBUILD sword-ylt-1.1.ebuild 333 BLAKE2B 14a868a6a61a5a071aa26031425e79e132521f0140012110ad4825a3f53de92e3a70eebdc54a3d81a58d12fff2e87bd267df4787ae7da25c7df0d5caca904bfa SHA512 35481744eb43df991f9427f6fcfb9447bdae802f96d026df96ec064235973e108b051e9a1ec7ed2135dc56b29fd90bbcb63454c20f892a09b08bf796d45bc8a1
-MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ylt/metadata.xml b/app-dicts/sword-ylt/metadata.xml
deleted file mode 100644
index ed083a312ffa..000000000000
--- a/app-dicts/sword-ylt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/sword-ylt/sword-ylt-1.1.ebuild b/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
deleted file mode 100644
index a68e2f54eab2..000000000000
--- a/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SWORD_MODULE="YLT"
-
-inherit sword-module
-
-DESCRIPTION="Young's Literal Translation (1898)"
-HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT"
-LICENSE="freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
diff --git a/app-dicts/verbiste-0.1.38-r1 b/app-dicts/verbiste-0.1.38-r1
new file mode 100644
index 000000000000..d64117bef1d6
--- /dev/null
+++ b/app-dicts/verbiste-0.1.38-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 ) sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=French conjugation system
+EAPI=5
+HOMEPAGE=http://sarrazip.com/dev/verbiste.html
+IUSE=gtk
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
+SLOT=0
+SRC_URI=http://sarrazip.com/dev/verbiste-0.1.38.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29bbf48181bcbdc26e50c06b13bb6b44
diff --git a/app-dicts/verbiste-0.1.41 b/app-dicts/verbiste-0.1.41
new file mode 100644
index 000000000000..551e137acbfd
--- /dev/null
+++ b/app-dicts/verbiste-0.1.41
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 ) sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=French conjugation system
+EAPI=5
+HOMEPAGE=http://sarrazip.com/dev/verbiste.html
+IUSE=gtk
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
+SLOT=0
+SRC_URI=http://sarrazip.com/dev/verbiste-0.1.41.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7391eeb3e6b289c5df2c150d1b40ad94
diff --git a/app-dicts/verbiste-0.1.44 b/app-dicts/verbiste-0.1.44
new file mode 100644
index 000000000000..0ef8deae3a5f
--- /dev/null
+++ b/app-dicts/verbiste-0.1.44
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 ) sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=French conjugation system
+EAPI=5
+HOMEPAGE=http://sarrazip.com/dev/verbiste.html
+IUSE=gtk
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
+SLOT=0
+SRC_URI=http://sarrazip.com/dev/verbiste-0.1.44.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=da27f2d1f9bef6a67dcf7b02809a8e10
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
deleted file mode 100644
index d415379af9b0..000000000000
--- a/app-dicts/verbiste/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST verbiste-0.1.38.tar.gz 706222 BLAKE2B 2ec6f5da9ae410faf422afc7717db5c77d288c6994ec4076c9ace1f3589ee98cbe624a82601415e2c736e127a96225da5afda8ada6a26b2b926a501316b723df SHA512 b5d99d08a9d1a7c91c1dbb86e0d4465a46403db881cd28d2abaf8d376adef6b4d4f5ac93e528d45beb639b77aff7e1730dbb436624674ff21c1f5781173db787
-DIST verbiste-0.1.41.tar.gz 751059 BLAKE2B 503411520a2b76463d20cae09af33f28255db5450a6721da248a87f4df102b64084e224261416bff9fba62cf6e1605363c4aae1090e91da06b65892c37ee9e5b SHA512 f89bb1074cd8c65f8516004c89aae50c65b5bd426d78a01b5e6b7418d86b5c348d2c554ab202c9f34cc9c5586a54518160fc225afa237cdb140ff99f78563702
-DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c4593428d36efb4cd4bfc51eea912297154e4b0610b94b66d1354317ac7cf24d6dca083d521c648338a0974f6d0899 SHA512 36c8a2af31f948dc3970bef260d5cd7f9d230f4966f846bcc823f006cd98ab98229544b7470466529344ac5735d1189c859c539f526cd58410d9a521510db5e5
-EBUILD verbiste-0.1.38-r1.ebuild 1236 BLAKE2B 786f801fdfe99f02d750c6843d914a1fdc9b649258c970b3fc98e4b9c092f25ab5d00d3ef01743d0f9f8598f84623f9e888e65357493b3d1861129746d7718c7 SHA512 ec300d6918f9753962332bad1967ac819427ed07abbc3fc20b6ef40aca603421a7db31f33019c5f3785ac73f49d463bf16feea05742b9b294dab6919d130c12e
-EBUILD verbiste-0.1.41.ebuild 1166 BLAKE2B 6f0ec7e24f6f79b1bf05a33e7617fda43681f97d00069563933c6f90b6259bffe007f356778f1f130a6b601f10ac30b049ec5f147eaaca8344dae1fd6b0dd369 SHA512 26d02d225c7ecea2937117cae60435f00fe9ed32feb1e78dc7f6bbebf83875e88457618e33f9f4e6451d12108488f96d5e77636cc468d24f553f7b0d17e3f16e
-EBUILD verbiste-0.1.44.ebuild 1166 BLAKE2B 4de1b8de1003e32631066aa835471becea41e1bace5e5103dbd9cb3370a65eca47b5c68e0329d6e0b57bf2674b587dcee4e0ac1c88b6b4f5c6038bb6ade906d8 SHA512 59be64e2feea4968f4b3d2176b21aaed40b09955ae5d1600138330951b460eaa1db5e3332d9077e4db3b76428de373edc10c1d0cdb6199630956685f68ca2c6b
-MISC metadata.xml 312 BLAKE2B 796d1961515a145787510162d67e5b0325d97d78e1c517c7a7848c2e5b6d22a07c4a0915f4bb1b65528790ece95c916db71a28b986333af99433a155e64fdf42 SHA512 22e3dc352c25e63a278f8ad9dafce6869b4342b4264da89be1798fee69f233ec4518f93d1d6bf9d5b13373c2616f7d56a92b833f863b1f50ca19aa16651b5c1a
diff --git a/app-dicts/verbiste/metadata.xml b/app-dicts/verbiste/metadata.xml
deleted file mode 100644
index 29ae55b6960a..000000000000
--- a/app-dicts/verbiste/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>eva@gentoo.org</email>
- </maintainer>
- <longdescription>French conjugation system including an option gnome front-end</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild b/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild
deleted file mode 100644
index 22c20e246d34..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils fdo-mime
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="gtk"
-
-RDEPEND="
- >=dev-libs/libxml2-2.4.0:2
- gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- econf \
- --with-console-app \
- --without-gnome-app \
- --without-gnome-applet \
- $(use_with gtk gtk-app)
-}
-
-src_install() {
- default
- prune_libtool_files
- dodoc HACKING LISEZMOI
- # file is only installed with USE=gnome
- if use gtk; then
- sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
- -i src/gnome/verbiste.desktop || die
- insinto usr/share/applications
- doins src/gnome/verbiste.desktop
- fi
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-dicts/verbiste/verbiste-0.1.41.ebuild b/app-dicts/verbiste/verbiste-0.1.41.ebuild
deleted file mode 100644
index bc9afe0a502c..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.41.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils xdg-utils
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="gtk"
-
-RDEPEND="
- >=dev-libs/libxml2-2.4.0:2
- gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- econf \
- --with-console-app \
- --without-gnome-app \
- --without-gnome-applet \
- $(use_with gtk gtk-app)
-}
-
-src_install() {
- default
- prune_libtool_files
- dodoc HACKING LISEZMOI
- # file is only installed with USE=gnome
- if use gtk; then
- sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
- -i src/gnome/verbiste.desktop || die
- insinto usr/share/applications
- doins src/gnome/verbiste.desktop
- fi
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-dicts/verbiste/verbiste-0.1.44.ebuild b/app-dicts/verbiste/verbiste-0.1.44.ebuild
deleted file mode 100644
index c9a1c7a067d7..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.44.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils xdg-utils
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="gtk"
-
-RDEPEND="
- >=dev-libs/libxml2-2.4.0:2
- gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- econf \
- --with-console-app \
- --without-gnome-app \
- --without-gnome-applet \
- $(use_with gtk gtk-app)
-}
-
-src_install() {
- default
- prune_libtool_files
- dodoc HACKING LISEZMOI
- # file is only installed with USE=gnome
- if use gtk; then
- sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
- -i src/gnome/verbiste.desktop || die
- insinto usr/share/applications
- doins src/gnome/verbiste.desktop
- fi
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-dicts/wnn-ldic-1.04 b/app-dicts/wnn-ldic-1.04
new file mode 100644
index 000000000000..af19eef621cd
--- /dev/null
+++ b/app-dicts/wnn-ldic-1.04
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=app-i18n/freewnn
+DESCRIPTION=Wnn dictionary for librarian
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND
+SLOT=0
+SRC_URI=mirror://gentoo/ldic-1.04-wnn.txt
+_md5_=9137555a948f55afd532d8b751f4ab00
diff --git a/app-dicts/wnn-ldic/Manifest b/app-dicts/wnn-ldic/Manifest
deleted file mode 100644
index ac1c0f44e335..000000000000
--- a/app-dicts/wnn-ldic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ldic-1.04-wnn.txt 333702 BLAKE2B 88340da9f4456b338f291c52b110d2507f0ce40a25fbed2793bbcc7cb9f0b5d1e780584c2b24238fbd13f76d0a0b205668ae44aedbff255d97576b4a41a7c0c6 SHA512 26e44e5163b72f99f7aae9fdfd8f57ba8c117764bdeeebd78ca092352532197a99e7e9ca57efc59dc37114713314bc1bc0fa5fa179b708542af381d6e09cfc89
-EBUILD wnn-ldic-1.04.ebuild 843 BLAKE2B 111b102747e9712efa52d8d8e3c32e89f38e081415025e71f861128eb568cd3aa111fd021e4a97aca5eb53e301fed71534e7ac847ecf95a154b9d30532d48ebc SHA512 6ae9ae70d927f1496e7a5d023cbf6e3f15ff07859c5e0b1e64aeba68d07c42756ad2b077072682a57034d5953f3985890d43bbaf513fabf7391eeff6f8a66e3d
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-dicts/wnn-ldic/metadata.xml b/app-dicts/wnn-ldic/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-dicts/wnn-ldic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild b/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
deleted file mode 100644
index 9c3817297866..000000000000
--- a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Wnn dictionary for librarian"
-#HOMEPAGE="http://www.tulips.tsukuba.ac.jp/misc/export/cat/ldic"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/ldic-${PV}-wnn.txt"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-i18n/freewnn"
-S="${WORKDIR}"
-
-src_unpack() {
- :
-}
-
-src_compile() {
- local atod=atod
- if has_version "<app-i18n/freewnn-1.1.1_alpha23"; then
- atod="${EPREFIX}"/usr/bin/Wnn4/atod
- fi
- "${atod}" lib.dic < "${DISTDIR}"/${A} || die
-}
-
-src_install() {
- insinto /usr/lib/wnn/ja_JP/dic/misc
- doins lib.dic
-}
-
-pkg_postinst() {
- elog "lib.dic is installed in ${EPREFIX}/usr/lib/wnn/ja_JP/dic/misc."
- elog "You have to edit your wnnenvrc or eggrc to use it."
-}
diff --git a/app-dicts/wordnet-3.0-r4 b/app-dicts/wordnet-3.0-r4
new file mode 100644
index 000000000000..1402eacbc46a
--- /dev/null
+++ b/app-dicts/wordnet-3.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A lexical database for the English language
+EAPI=5
+HOMEPAGE=https://wordnet.princeton.edu/
+IUSE=doc
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=Princeton
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
+SLOT=0
+SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e2c3fb536032d6fc2c0ff3558d0936cc
diff --git a/app-dicts/wordnet-3.0-r5 b/app-dicts/wordnet-3.0-r5
new file mode 100644
index 000000000000..d24f91b9189c
--- /dev/null
+++ b/app-dicts/wordnet-3.0-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A lexical database for the English language
+EAPI=6
+HOMEPAGE=https://wordnet.princeton.edu/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=Princeton
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
+SLOT=0
+SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0f31437df3c4f97738eb7c7a8c98b3ed
diff --git a/app-dicts/wordnet-3.1 b/app-dicts/wordnet-3.1
new file mode 100644
index 000000000000..d077f0d7302b
--- /dev/null
+++ b/app-dicts/wordnet-3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A lexical database for the English language
+EAPI=6
+HOMEPAGE=https://wordnet.princeton.edu/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=Princeton
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
+SLOT=0
+SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2 http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=eb8a181f1e775d633cbec7b88a9fc3a0
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
deleted file mode 100644
index ac318ccd7259..000000000000
--- a/app-dicts/wordnet/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX wordnet-3.0-fix-indexing-bug-314799.patch 732 BLAKE2B bb6d4453f9119a134c0b108984cc67a056a8f9a9cc4ed9c357e8eb7e68761e70680950475118198d6f9487ab7f14e5776798dff32d86e65e4db591e461595dbf SHA512 697a6279223270dad6a8f3834020560b6cde07edea62e3f4238c0b288b2cb875d294bf0101cf9c79f0e1d086116d90309ca851a926318a48f5cd02058062f149
-AUX wordnet-3.0-format-security.patch 1443 BLAKE2B 21e79d7341cd119598730d317c664406915cdb2aaf572e482061be913fcb85a372214eae71b93a2a31022c6b5638cf3bc8a2b2b719b975d15143c9487f443332 SHA512 5567b1d5e041ed39a38e40e253dc94e22a3a7c6b690bc452716b26c2932b94eeb065e00354e2c8f1dc77d53713fd2e69e44a498a8664e867de2df07f2f36c170
-AUX wordnet-3.0-src_stubs_c.patch 438 BLAKE2B de2bbb812e01d6c63912ae414a02e8f4c0caa697cf4ade90d605e10dce7afd8907ff65b3af0585ca100650264615ad9bbc2008098fec51969c406b563f1c783d SHA512 82bf6705b26bd0455a2a556abd9cd01cde7c7f738f3f4f5cbf49eefe5c301c7022e908208cce2617e0b95f78464beeab21c7af4131c3472fe4e2ba4650533359
-AUX wordnet-3.0-tcl8.6.patch 4974 BLAKE2B f26cdf66b00bbf2a5185642fbe140ee6294e6910e78d7230a7f4f4c7324a207537df8a5a32ba33c1166e332d4afcce621704f9186ac1adb362883d716ac8da22 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c
-DIST WordNet-3.0.tar.gz 11537227 BLAKE2B 358bdc3178f35f4f269ad9d0a5245396811f8678a020ab1ddf9978eef733bb91450f331d03734f585121b1532bb67ca97e765b13cb3f37018cd29df558201c5d SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a
-DIST wn3.1.dict.tar.gz 16358468 BLAKE2B f3df09f39ea29fce3378122f1a93d713acb8be39e6798695b8cc412a3ae6e644cfcf906426d4091d9849be60620367d3de541ec6dd0d8016b8f0cf39a7bad346 SHA512 16dca17a87026d8a0b7b4758219cd21a869c3ef3da23ce7875924546f2eacac4c2f376cb271b798b2c458fe8c078fb43d681356e3d9beef40f4bd88d3579394f
-DIST wordnet-3.0-patchset-1.tar.bz2 8076 BLAKE2B 20684bd96814db6e0bf2d9aeb455def682fc38566d6abd3832bf0f7eae3b65b63e8b16aa21656bb81c1696bec0d179028ea8bb4687e5566a6d679bc55e300b9c SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb
-EBUILD wordnet-3.0-r4.ebuild 2102 BLAKE2B ffbad9b621e22d6eac0222ee0e9f9eb71b775ea6916c38b1b44e6257d4c08ec396692304e62ee5a40ec02de0a7b086e5faffeab1a33cbf25627de1017a740f25 SHA512 23a1bffeb3294743b1fca001fe68f07f0be2af4303d9bc9a60202401940c0d7c61691050a574045bba9543b67df0a4810d835b8b0b73206cf1fe2b9647fe6d0f
-EBUILD wordnet-3.0-r5.ebuild 2152 BLAKE2B 46f2d2f22ef3b05c044cb16cf9a391ced71836b5b60f4bded033a73d548974c91d00a2561c6040406a5f3289069878505d4b24b53971e6ce968a871b3c9a7271 SHA512 b4d7e2004c58b6c1bc8a8a45b2f3680fe7dd6af9d5786ea9c999f1b44909ab13b2893fdcd80a22bef908685fd6a6bcdc43b4f6e22f2e41069dcec97850416388
-EBUILD wordnet-3.1.ebuild 2796 BLAKE2B b4c8b7399d72c7aafe5e25a569e6a8d252a3c72bf3ebc808729fb993f2529bc174e8a782f38105c6925edfb088c0d0cd8fd774541a46452bdc056b75699a220f SHA512 fe498aba70d39e045713d08eb3db416e9cbaebafeffaae8d56fa82ac5519305a659f672eb9529ba0c446cdf63a36d3ab69631216d3c225c70faaf7a89ac9101d
-MISC metadata.xml 358 BLAKE2B 11b80740d0327acc1dc7c94c2492cf25fa6941014d2c352af5e744036f30f386b9549c5773036708738b774830a22ed5a972e3d88de99dab4777cc46727945ce SHA512 1f57e2d03f71e806f11f7a8e5e667fb2d7255b2af6fd17bf6b095e4f6502cc9f0ff16ef1fb7febd93c98ac52f7a3b6857c0fe1772bb5dd269b455d6db2fa125b
diff --git a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch b/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
deleted file mode 100644
index fafaa2c331d7..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -p -u -r WordNet-3.0/lib/morph.c WordNet-3.0-mine/lib/morph.c
---- a/lib/morph.c 2010-04-12 13:53:04.000000000 +0200
-+++ b/lib/morph.c 2010-04-12 13:54:53.000000000 +0200
-@@ -375,14 +375,14 @@ static char *exc_lookup(char *word, int
- static char line[WORDBUF], *beglp, *endlp;
- char *excline;
-
-- if (exc_fps[pos] == NULL)
-+ if (exc_fps[pos-1] == NULL)
- return(NULL);
-
- /* first time through load line from exception file */
- if(word != NULL){
- if (strlen(word) > WORDBUF - 1)
- return(NULL);
-- if ((excline = bin_search(word, exc_fps[pos])) != NULL) {
-+ if ((excline = bin_search(word, exc_fps[pos-1])) != NULL) {
- strcpy(line, excline);
- endlp = strchr(line,' ');
- } else
diff --git a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch b/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
deleted file mode 100644
index b5d86dbbdd89..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- lib/binsrch.c | 4 ++--
- src/wn.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/binsrch.c b/lib/binsrch.c
-index 8b71216..9ac51a7 100644
---- a/lib/binsrch.c
-+++ b/lib/binsrch.c
-@@ -193,7 +193,7 @@ char *replace_line(char *new_line, char *searchkey, FILE *fp)
- copyfile(fp, tfp);
- if (fseek(fp, offset, 0) == -1)
- return(NULL); /* could not seek to offset */
-- fprintf(fp, new_line); /* write line */
-+ fprintf(fp, "%s", new_line); /* write line */
- rewind(tfp);
- copyfile(tfp, fp);
-
-@@ -220,7 +220,7 @@ char *insert_line(char *new_line, char *searchkey, FILE *fp)
- copyfile(fp, tfp);
- if (fseek(fp, offset, 0) == -1)
- return(NULL); /* could not seek to offset */
-- fprintf(fp, new_line); /* write line */
-+ fprintf(fp, "%s", new_line); /* write line */
- rewind(tfp);
- copyfile(tfp, fp);
-
-diff --git a/src/wn.c b/src/wn.c
-index 004e1e6..398632f 100644
---- a/src/wn.c
-+++ b/src/wn.c
-@@ -284,7 +284,7 @@ static void printsearches(char *word, int dbase, unsigned long search)
- printf("\t");
- printf(searchstr[j].template,
- partchars[dbase], partchars[dbase]);
-- printf(searchstr[j].helpstr);
-+ printf("%s", searchstr[j].helpstr);
- printf("\n");
- }
- }
-@@ -345,7 +345,7 @@ static int getoptidx(char *searchtype)
-
- static int error_message(char *msg)
- {
-- fprintf(stderr, msg);
-+ fprintf(stderr, "%s", msg);
- return(0);
- }
-
diff --git a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch b/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
deleted file mode 100644
index 29c42dea9c35..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad wordnet-3.0/src/stubs.c.orig wordnet-3.0/src/stubs.c
---- wordnet-3.0/src/stubs.c.orig 2007-01-04 18:47:55.000000000 +0100
-+++ wordnet-3.0/src/stubs.c 2007-01-20 19:01:19.000000000 +0100
-@@ -14,7 +14,7 @@
- #include <tk.h>
- #include <wn.h>
-
--static char *Id = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
-+static const char Id[] = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
-
- static char resultbuf[SEARCHBUF];
-
diff --git a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch b/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
deleted file mode 100644
index 110ffc2110b8..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
+++ /dev/null
@@ -1,133 +0,0 @@
- src/stubs.c | 33 +++++++++++++++++----------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/stubs.c b/src/stubs.c
-index 794485c..cec2c04 100644
---- a/src/stubs.c
-+++ b/src/stubs.c
-@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
- char *morph;
- int pos;
- if (argc != 3) {
-- interp -> result =
-- "usage: findvalidsearches searchword partofspeechnum";
-+ Tcl_SetResult(interp,
-+ "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC);
- return TCL_ERROR;
- }
- pos = atoi (argv[2]);
-@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
- } while ((morph = morphstr (NULL, pos)) != NULL);
- }
- sprintf (bitfieldstr, "%u", bitfield);
-- interp -> result = bitfieldstr;
-+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp,
- static char bitfieldstr[32];
- int whichbit;
- if (argc != 2) {
-- interp -> result = "usage: bit bitnum";
-+ Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC);
- return TCL_ERROR;
- }
- whichbit = atoi (argv[1]);
- bitfield = bit (whichbit);
- sprintf (bitfieldstr, "%u", bitfield);
-- interp -> result = bitfieldstr;
-+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- int pos, searchtype, sense;
- char *morph;
- if (argc != 5) {
-- interp -> result =
-- "usage: search searchword partofspeechnum searchtypenum sensenum";
-+ Tcl_SetResult(interp,
-+ "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC);
- return TCL_ERROR;
- }
- pos = atoi (argv[2]);
-@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense));
- } while ((morph = morphstr (NULL, pos)) != NULL);
- }
-- interp -> result = resultbuf;
-+ Tcl_SetResult(interp, resultbuf, TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- int wn_glosses (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: glosses [1 | 0]";
-+ Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- dflag = atoi (argv[1]);
-@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
- int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: fileinfo [1 | 0]";
-+ Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- fileinfoflag = atoi (argv[1]);
-@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
- int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: byteoffset [1 | 0]";
-+ Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- offsetflag = atoi (argv[1]);
-@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
- int wn_senseflag (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 2) {
-- interp -> result = "usage: senseflag [1 | 0]";
-+ Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC);
- return TCL_ERROR;
- }
- wnsnsflag = atoi (argv[1]);
-@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- int pos, searchtype;
- if (argc != 3) {
-- interp -> result = "usage: contextualhelp partofspeechnum searchtypenum";
-+ Tcl_SetResult(interp,
-+ "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC);
- return TCL_ERROR;
- }
- pos = atoi (argv[1]);
- searchtype = atoi (argv[2]);
-- interp -> result = helptext[pos][searchtype];
-+ Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC);
- return TCL_OK;
- }
-
-@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
- int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 1) {
-- interp -> result = "usage: reopendb";
-+ Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC);
- return TCL_ERROR;
- }
- re_wninit ();
-@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
- int wn_abortsearch (ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- if (argc != 1) {
-- interp -> result = "usage: abortsearch";
-+ Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC);
- return TCL_ERROR;
- }
- abortsearch = 1;
diff --git a/app-dicts/wordnet/metadata.xml b/app-dicts/wordnet/metadata.xml
deleted file mode 100644
index c40afbd5319c..000000000000
--- a/app-dicts/wordnet/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>chocopuff298@gmail.com</email>
- <name>Ethan Kiang</name>
-</maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
deleted file mode 100644
index bd72aae233cc..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
- ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
- mirror://gentoo/${P}-patchset-1.tar.bz2"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
-# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
-DEPEND="
- dev-lang/tcl:0=
- dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-PATCHES=(
- # Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
- "${WORKDIR}/${P}-dict-location.patch"
- # Fixes bug 130024, make an additional shared lib
- "${WORKDIR}/${P}-shared-lib.patch"
- # Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
- "${WORKDIR}/${P}-docs-path.patch"
- "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
- "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
-
- "${FILESDIR}"/${P}-tcl8.6.patch
- "${FILESDIR}"/${P}-format-security.patch
- "${FILESDIR}"/${P}-src_stubs_c.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- # Don't install all the extra docs (html, pdf, ps) without doc USE flag.
- if ! use doc; then
- sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
- fi
-
- # Drop installation of OLD tk.h headers #255590
- sed '/^SUBDIRS/d' -i include/Makefile.am || die
- sed 's: include/tk/Makefile::' -i configure.ac || die
- rm -rf include/tk/ || die
-
- rm -f configure || die
- eautoreconf
- MAKEOPTS+=" -e"
-}
-
-src_configure() {
- append-cppflags -DUNIX -I"${T}"/usr/include
-
- PLATFORM=linux WN_ROOT="${T}/usr" \
- WN_DICTDIR="${T}/usr/share/wordnet/dict" \
- WN_MANDIR="${T}/usr/share/man" \
- WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
- WNHOME="${EPREFIX}/usr/share/wordnet" \
- econf \
- --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
- --with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-dicts/wordnet/wordnet-3.0-r5.ebuild b/app-dicts/wordnet/wordnet-3.0-r5.ebuild
deleted file mode 100644
index 68cdec705c13..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
- http://wordnetcode.princeton.edu/${PV}/WordNet-${PV}.tar.gz
- mirror://gentoo/${P}-patchset-1.tar.bz2"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT
-# optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
-# still the same here.)
-DEPEND="
- dev-lang/tcl:0=
- dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-PATCHES=(
- # Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
- "${WORKDIR}/${P}-dict-location.patch"
- # Fixes bug 130024, make an additional shared lib
- "${WORKDIR}/${P}-shared-lib.patch"
- # Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
- "${WORKDIR}/${P}-docs-path.patch"
- "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
- "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
-
- "${FILESDIR}"/${P}-tcl8.6.patch
- "${FILESDIR}"/${P}-format-security.patch
- "${FILESDIR}"/${P}-src_stubs_c.patch
- "${FILESDIR}"/${P}-fix-indexing-bug-314799.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- eapply_user
-
- # Don't install all the extra docs (html, pdf, ps) without doc USE flag.
- if ! use doc; then
- sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
- fi
-
- # Drop installation of OLD tk.h headers #255590
- sed '/^SUBDIRS/d' -i include/Makefile.am || die
- sed 's: include/tk/Makefile::' -i configure.ac || die
- rm -rf include/tk/ || die
-
- rm -f configure || die
- eautoreconf
- MAKEOPTS+=" -e"
-}
-
-src_configure() {
- append-cppflags -DUNIX -I"${T}"/usr/include
-
- PLATFORM=linux WN_ROOT="${T}/usr" \
- WN_DICTDIR="${T}/usr/share/wordnet/dict" \
- WN_MANDIR="${T}/usr/share/man" \
- WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
- WNHOME="${EPREFIX}/usr/share/wordnet" \
- econf \
- --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
- --with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild
deleted file mode 100644
index b0f8adbbf560..000000000000
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
- http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz
- mirror://gentoo/${PN}-3.0-patchset-1.tar.bz2
- http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-# In contrast to what the configure script seems to imply, Tcl/Tk is NOT
-# optional. cf. bug 163478 for details. (Yes, it's about 2.1 but it's
-# still the same here.)
-DEPEND="
- dev-lang/tcl:0=
- dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-3.0"
-
-PATCHES1=(
- # Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
- "${WORKDIR}/"${PN}-3.0"-dict-location.patch"
- # Fixes bug 130024, make an additional shared lib
- "${WORKDIR}/"${PN}-3.0"-shared-lib.patch"
- # Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
- "${WORKDIR}/"${PN}-3.0"-docs-path.patch"
- "${WORKDIR}"/"${PN}-3.0"-CVE-2008-3908.patch #211491
-
- "${FILESDIR}"/"${PN}-3.0"-tcl8.6.patch
- "${FILESDIR}"/"${PN}-3.0"-format-security.patch
- "${FILESDIR}"/"${PN}-3.0"-src_stubs_c.patch
- "${FILESDIR}"/"${PN}-3.0"-fix-indexing-bug-314799.patch
-)
-
-PATCHES0=(
- "${WORKDIR}"/"${PN}-3.0"-CVE-2008-2149.patch #211491
-)
-
-src_prepare() {
- eapply -p1 "${PATCHES1[@]}"
- eapply -p0 "${PATCHES0[@]}"
- eapply_user
-
- # Don't install all the extra docs (html, pdf, ps) without doc USE flag.
- if ! use doc; then
- sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
- fi
-
- # Drop installation of OLD tk.h headers #255590
- sed '/^SUBDIRS/d' -i include/Makefile.am || die
- sed 's: include/tk/Makefile::' -i configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -DUNIX -I"${T}"/usr/include
-
- PLATFORM=linux WN_ROOT="${T}/usr" \
- WN_DICTDIR="${T}/usr/share/wordnet/dict" \
- WN_MANDIR="${T}/usr/share/man" \
- WN_DOCDIR="${T}/usr/share/doc/wordnet-3.0" \
- WNHOME="${EPREFIX}/usr/share/wordnet" \
- econf \
- --with-tcl="${EPREFIX}"/usr/$(get_libdir) \
- --with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile(){
- emake -e || die "emake failed"
-}
-
-src_install(){
- # For clarification, WN is still on version 3.0. Only the database files
- # have been updated to 3.1 as a package for 3.1 does not currently exist.
- emake -e DESTDIR="${D}" install
- einstalldocs
- rm -r "${D}/usr/share/wordnet/dict" || die
- mv "${WORKDIR}/dict" "${D}/usr/share/wordnet" || die
-}
-
-pkg_postinst(){
- elog "The WordNet 3.1 ebuild has installed WordNet v3.0 with v3.1 database files instead."
- elog "See https://wordnet.princeton.edu/download/current-version/ for more."
-}
diff --git a/app-dicts/ydpdict-1.0.2 b/app-dicts/ydpdict-1.0.2
new file mode 100644
index 000000000000..4c8df2024f86
--- /dev/null
+++ b/app-dicts/ydpdict-1.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=>=app-dicts/libydpdict-1.0.2 sys-libs/ncurses[unicode] ao? ( media-libs/libao ) virtual/pkgconfig
+DESCRIPTION=Interface for the Collins Dictionary
+EAPI=5
+HOMEPAGE=http://toxygen.net/ydpdict/
+IUSE=ao
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-dicts/libydpdict-1.0.2 sys-libs/ncurses[unicode] ao? ( media-libs/libao )
+SLOT=0
+SRC_URI=http://toxygen.net/ydpdict/ydpdict-1.0.2.tar.gz
+_md5_=527b850711fd6a751c2da3a0d88eb8de
diff --git a/app-dicts/ydpdict/Manifest b/app-dicts/ydpdict/Manifest
deleted file mode 100644
index 6fcf0f033594..000000000000
--- a/app-dicts/ydpdict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ydpdict-1.0.2.tar.gz 363774 BLAKE2B 0ca86e0180af559f9440f8a598672e5e321d84f37725f0233ba0d666119f20308c0229fd1dd0197a8c86733af17f1cce53b990c63b260673871ab6658d88a5c5 SHA512 b2395d88e289171daae3aa47d9c70a2ca1c7b3a3998c1a9751c56e1dc8d17138bc38a172581edcad02c35d5252041c6942a3c416a632def6121072650bcb7e61
-EBUILD ydpdict-1.0.2.ebuild 974 BLAKE2B 6c6097f4e3da1a3e6f0328d4a94c4d666593b977d2200b30e8c04e672016ab5120763501e1c24464be0d780dd4553e7ac1e20a8cd31301d2a3b67bdac53d386d SHA512 fb9adb4c5859e16b8ca6164f96007a4151ba26682530afe76cd31215d361d9b32b380134d77bc94c32a9d3a66080c388a713d17e6d3b8dd9c244aec2c82dbee5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/ydpdict/metadata.xml b/app-dicts/ydpdict/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-dicts/ydpdict/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-dicts/ydpdict/ydpdict-1.0.2.ebuild b/app-dicts/ydpdict/ydpdict-1.0.2.ebuild
deleted file mode 100644
index cec7d34b79aa..000000000000
--- a/app-dicts/ydpdict/ydpdict-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Interface for the Collins Dictionary"
-HOMEPAGE="http://toxygen.net/ydpdict/"
-SRC_URI="http://toxygen.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ao"
-
-RDEPEND=">=app-dicts/libydpdict-${PV}
- sys-libs/ncurses[unicode]
- ao? ( media-libs/libao )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- $(use_with ao libao)
-}
-
-src_install() {
- dodir "/etc"
- emake DESTDIR="${D}" install
- dodoc README
-}
-
-pkg_postinst() {
- echo
- elog "Note that to use this program you'll need the original Collins Dictionary"
- elog "datafiles (dict100.*, dict101.*). These can be found in the Dabasase/"
- elog "directory of the Windows version of the Collins dictionary. Once you obtain"
- elog "the files, put them into /usr/share/ydpdict"
- elog
- elog "Some configuration options can be set in /etc/ydpdict.conf"
- echo
-}