summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild25
-rw-r--r--app-text/App-XML-DocBook-Builder/Manifest1
-rw-r--r--app-text/App-XML-DocBook-Builder/metadata.xml13
-rw-r--r--app-text/NaturalDocs/Manifest1
-rw-r--r--app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild51
-rw-r--r--app-text/NaturalDocs/metadata.xml19
-rw-r--r--app-text/XML-Schema-learner/Manifest1
-rw-r--r--app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild37
-rw-r--r--app-text/XML-Schema-learner/metadata.xml24
-rw-r--r--app-text/a2ps/Manifest4
-rw-r--r--app-text/a2ps/a2ps-4.14-r6.ebuild142
-rw-r--r--app-text/a2ps/a2ps-4.15.5-r1.ebuild96
-rw-r--r--app-text/a2ps/a2ps-4.15.6.ebuild92
-rw-r--r--app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch12
-rw-r--r--app-text/a2ps/files/a2ps-4.13-stdout.diff13
-rw-r--r--app-text/a2ps/files/a2ps-4.13c-emacs.patch10
-rw-r--r--app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch43
-rw-r--r--app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff25
-rw-r--r--app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch82
-rw-r--r--app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch32
-rw-r--r--app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch12
-rw-r--r--app-text/a2ps/files/a2ps-4.14-cleanup.patch106
-rw-r--r--app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch17
-rw-r--r--app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch122
-rw-r--r--app-text/a2ps/files/a2ps-4.14-psset.patch21
-rw-r--r--app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch14
-rw-r--r--app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch147
-rw-r--r--app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch23
-rw-r--r--app-text/a2ps/files/a2ps-4.15-stdout.patch16
-rw-r--r--app-text/a2ps/metadata.xml21
-rw-r--r--app-text/agrep/Manifest1
-rw-r--r--app-text/agrep/agrep-2.04-r2.ebuild35
-rw-r--r--app-text/agrep/metadata.xml8
-rw-r--r--app-text/aha/Manifest1
-rw-r--r--app-text/aha/aha-0.5.1.ebuild20
-rw-r--r--app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch105
-rw-r--r--app-text/aha/metadata.xml20
-rw-r--r--app-text/aiksaurus/Manifest1
-rw-r--r--app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild41
-rw-r--r--app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild48
-rw-r--r--app-text/aiksaurus/aiksaurus-1.2.1.ebuild32
-rw-r--r--app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch13
-rw-r--r--app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch29
-rw-r--r--app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch30
-rw-r--r--app-text/aiksaurus/metadata.xml4
-rw-r--r--app-text/an/Manifest1
-rw-r--r--app-text/an/an-1.2-r1.ebuild39
-rw-r--r--app-text/an/an-1.2.ebuild40
-rw-r--r--app-text/an/an-1.2_p6.ebuild48
-rw-r--r--app-text/an/metadata.xml7
-rw-r--r--app-text/ansifilter/Manifest4
-rw-r--r--app-text/ansifilter/ansifilter-2.14.ebuild57
-rw-r--r--app-text/ansifilter/ansifilter-2.20.ebuild102
-rw-r--r--app-text/ansifilter/metadata.xml8
-rw-r--r--app-text/antiword/antiword-0.37-r1.ebuild50
-rw-r--r--app-text/antiword/antiword-0.37-r2.ebuild55
-rw-r--r--app-text/antiword/metadata.xml3
-rw-r--r--app-text/antixls/antixls-0.3b.ebuild9
-rw-r--r--app-text/antixls/metadata.xml2
-rw-r--r--app-text/apvlv/Manifest2
-rw-r--r--app-text/apvlv/apvlv-0.1.5-r2.ebuild53
-rw-r--r--app-text/apvlv/apvlv-0.4.0-r1.ebuild57
-rw-r--r--app-text/apvlv/apvlv-0.4.0-r2.ebuild60
-rw-r--r--app-text/apvlv/files/apvlv-0.1.5-cflags.patch20
-rw-r--r--app-text/apvlv/files/apvlv-0.1.5-gcc6.patch12
-rw-r--r--app-text/apvlv/files/apvlv-0.1.5-gcc7.patch22
-rw-r--r--app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch10
-rw-r--r--app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch11
-rw-r--r--app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch10
-rw-r--r--app-text/apvlv/files/apvlv-0.4.0-icon.patch10
-rw-r--r--app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch45
-rw-r--r--app-text/apvlv/metadata.xml11
-rw-r--r--app-text/asa/asa-1.1-r1.ebuild18
-rw-r--r--app-text/asa/files/asa-1.1-implicit-int.patch15
-rw-r--r--app-text/asa/metadata.xml4
-rw-r--r--app-text/asciidoc/Manifest5
-rw-r--r--app-text/asciidoc/asciidoc-10.2.0.ebuild47
-rw-r--r--app-text/asciidoc/asciidoc-8.6.10.ebuild88
-rw-r--r--app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild92
-rw-r--r--app-text/asciidoc/asciidoc-8.6.9-r2.ebuild77
-rw-r--r--app-text/asciidoc/asciidoc-8.6.9-r6.ebuild86
-rw-r--r--app-text/asciidoc/asciidoc-9.1.0.ebuild84
-rw-r--r--app-text/asciidoc/metadata.xml23
-rw-r--r--app-text/aspell/Manifest4
-rw-r--r--app-text/aspell/aspell-0.60.7.ebuild103
-rw-r--r--app-text/aspell/aspell-0.60.7_rc1.ebuild100
-rw-r--r--app-text/aspell/aspell-0.60.7_rc2.ebuild103
-rw-r--r--app-text/aspell/aspell-0.60.8.1.ebuild112
-rw-r--r--app-text/aspell/metadata.xml10
-rw-r--r--app-text/atril/Manifest5
-rw-r--r--app-text/atril/atril-1.22.1.ebuild90
-rw-r--r--app-text/atril/atril-1.26.0-r5.ebuild119
-rw-r--r--app-text/atril/atril-1.26.1-r1.ebuild121
-rw-r--r--app-text/atril/atril-1.26.2.ebuild117
-rw-r--r--app-text/atril/atril-1.28.0.ebuild114
-rw-r--r--app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch15
-rw-r--r--app-text/atril/metadata.xml18
-rw-r--r--app-text/bact/bact-0.13-r1.ebuild34
-rw-r--r--app-text/bact/bact-0.13-r2.ebuild30
-rw-r--r--app-text/bact/files/bact-0.13-cpp14.patch48
-rw-r--r--app-text/bact/files/bact-0.13-makefile.patch38
-rw-r--r--app-text/bact/metadata.xml2
-rw-r--r--app-text/barcode/Manifest3
-rw-r--r--app-text/barcode/barcode-0.98-r1.ebuild36
-rw-r--r--app-text/barcode/barcode-0.99-r1.ebuild39
-rw-r--r--app-text/barcode/barcode-0.99.ebuild32
-rw-r--r--app-text/barcode/files/0.98-info.patch14
-rw-r--r--app-text/barcode/files/barcode-0.99-fno-common.patch25
-rw-r--r--app-text/barcode/files/barcode-0.99-install-static-lib.patch13
-rw-r--r--app-text/barcode/files/barcode-0.99-not-a-literal-string.patch19
-rw-r--r--app-text/barcode/metadata.xml13
-rw-r--r--app-text/bdf2psf/Manifest1
-rw-r--r--app-text/bdf2psf/bdf2psf-1.104.ebuild32
-rw-r--r--app-text/bdf2psf/bdf2psf-1.155-r1.ebuild29
-rw-r--r--app-text/bdf2psf/bdf2psf-1.155.ebuild32
-rw-r--r--app-text/bdf2psf/metadata.xml7
-rw-r--r--app-text/bibclean/Manifest2
-rw-r--r--app-text/bibclean/bibclean-2.17.ebuild26
-rw-r--r--app-text/bibclean/bibclean-3.06.ebuild21
-rw-r--r--app-text/bibclean/metadata.xml2
-rw-r--r--app-text/bibletime/Manifest3
-rw-r--r--app-text/bibletime/bibletime-2.11.0.ebuild47
-rw-r--r--app-text/bibletime/bibletime-2.11.2.ebuild47
-rw-r--r--app-text/bibletime/bibletime-3.0.3-r4.ebuild70
-rw-r--r--app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch20
-rw-r--r--app-text/bibletime/metadata.xml16
-rw-r--r--app-text/bibus/Manifest2
-rw-r--r--app-text/bibus/bibus-1.5.2-r3.ebuild86
-rw-r--r--app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch31
-rw-r--r--app-text/bibus/files/bibus-1.5.2-install.patch110
-rw-r--r--app-text/bibus/files/bibus-1.5.2-wx30.patch158
-rw-r--r--app-text/bibus/metadata.xml11
-rw-r--r--app-text/bibutils/Manifest2
-rw-r--r--app-text/bibutils/bibutils-6.7.ebuild47
-rw-r--r--app-text/bibutils/bibutils-7.1.ebuild43
-rw-r--r--app-text/bibutils/metadata.xml13
-rw-r--r--app-text/binfind/binfind-0.0.3.ebuild31
-rw-r--r--app-text/binfind/files/binfind-0.0.3-clang16.patch9
-rw-r--r--app-text/binfind/metadata.xml2
-rw-r--r--app-text/blahtexml/Manifest1
-rw-r--r--app-text/blahtexml/blahtexml-0.9.ebuild24
-rw-r--r--app-text/blahtexml/blahtexml-1.0.ebuild48
-rw-r--r--app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch8
-rw-r--r--app-text/blahtexml/metadata.xml7
-rw-r--r--app-text/blogc/Manifest2
-rw-r--r--app-text/blogc/blogc-0.17.0.ebuild59
-rw-r--r--app-text/blogc/blogc-0.20.1.ebuild57
-rw-r--r--app-text/blogc/blogc-9999.ebuild36
-rw-r--r--app-text/blogc/metadata.xml11
-rw-r--r--app-text/bogosort/bogosort-0.4.2-r1.ebuild35
-rw-r--r--app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch10
-rw-r--r--app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch38
-rw-r--r--app-text/bogosort/files/xmalloc.patch4
-rw-r--r--app-text/bogosort/metadata.xml2
-rw-r--r--app-text/build-docbook-catalog/Manifest3
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild34
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild38
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild38
-rw-r--r--app-text/build-docbook-catalog/metadata.xml8
-rw-r--r--app-text/c2ps/c2ps-4.0.ebuild13
-rw-r--r--app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch4
-rw-r--r--app-text/c2ps/metadata.xml2
-rw-r--r--app-text/calibre/Manifest13
-rw-r--r--app-text/calibre/calibre-3.26.1-r1.ebuild291
-rw-r--r--app-text/calibre/calibre-3.44.0.ebuild268
-rw-r--r--app-text/calibre/calibre-3.46.0-r1.ebuild268
-rw-r--r--app-text/calibre/calibre-5.44.0-r3.ebuild269
-rw-r--r--app-text/calibre/calibre-7.6.0.ebuild242
-rw-r--r--app-text/calibre/calibre-7.7.0-r1.ebuild243
-rw-r--r--app-text/calibre/calibre-7.7.0.ebuild242
-rw-r--r--app-text/calibre/calibre-7.8.0-r1.ebuild243
-rw-r--r--app-text/calibre/calibre-7.8.0.ebuild242
-rw-r--r--app-text/calibre/calibre-7.9.0.ebuild243
-rw-r--r--app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch55
-rw-r--r--app-text/calibre/files/calibre-5.35.0-jxr-test.patch24
-rw-r--r--app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch26
-rw-r--r--app-text/calibre/files/calibre-7.0.0-jxr-test.patch27
-rw-r--r--app-text/calibre/files/calibre-disable_plugins.patch17
-rw-r--r--app-text/calibre/metadata.xml17
-rw-r--r--app-text/capyt/capyt-1.1.1-r1.ebuild25
-rw-r--r--app-text/capyt/capyt-1.1.1.ebuild27
-rw-r--r--app-text/capyt/metadata.xml7
-rw-r--r--app-text/catdoc/catdoc-0.95-r1.ebuild52
-rw-r--r--app-text/catdoc/catdoc-0.95.ebuild50
-rw-r--r--app-text/catdoc/metadata.xml2
-rw-r--r--app-text/cb2bib/Manifest2
-rw-r--r--app-text/cb2bib/cb2bib-1.9.8.ebuild61
-rw-r--r--app-text/cb2bib/cb2bib-1.9.9.ebuild61
-rw-r--r--app-text/cb2bib/cb2bib-2.0.0-r1.ebuild69
-rw-r--r--app-text/cb2bib/cb2bib-2.0.0.ebuild69
-rw-r--r--app-text/cb2bib/metadata.xml5
-rw-r--r--app-text/cedilla/Manifest1
-rw-r--r--app-text/cedilla/cedilla-0.6.ebuild33
-rw-r--r--app-text/cedilla/cedilla-0.7-r1.ebuild31
-rw-r--r--app-text/cedilla/cedilla-0.7.ebuild4
-rw-r--r--app-text/cedilla/metadata.xml5
-rw-r--r--app-text/chasen/Manifest2
-rw-r--r--app-text/chasen/chasen-2.4.4-r3.ebuild60
-rw-r--r--app-text/chasen/chasen-2.4.5.ebuild59
-rw-r--r--app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch21
-rw-r--r--app-text/chasen/files/chasen-uar.patch44
-rw-r--r--app-text/chasen/metadata.xml4
-rw-r--r--app-text/cherrytree/Manifest5
-rw-r--r--app-text/cherrytree/cherrytree-0.37.0.ebuild55
-rw-r--r--app-text/cherrytree/cherrytree-1.0.0.ebuild74
-rw-r--r--app-text/cherrytree/cherrytree-1.0.1.ebuild74
-rw-r--r--app-text/cherrytree/cherrytree-1.0.2.ebuild74
-rw-r--r--app-text/cherrytree/cherrytree-1.0.4.ebuild74
-rw-r--r--app-text/cherrytree/metadata.xml13
-rw-r--r--app-text/cmark/Manifest3
-rw-r--r--app-text/cmark/cmark-0.29.0.ebuild33
-rw-r--r--app-text/cmark/cmark-0.30.3.ebuild34
-rw-r--r--app-text/cmark/cmark-0.31.0.ebuild37
-rw-r--r--app-text/cmark/files/cmark-0.31.0_fix_api_test.patch17
-rw-r--r--app-text/cmark/metadata.xml9
-rw-r--r--app-text/cmigemo/Manifest1
-rw-r--r--app-text/cmigemo/cmigemo-1.3c-r3.ebuild80
-rw-r--r--app-text/cmigemo/cmigemo-1.3c-r4.ebuild81
-rw-r--r--app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild78
-rw-r--r--app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch51
-rw-r--r--app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch13
-rw-r--r--app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch73
-rw-r--r--app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch113
-rw-r--r--app-text/cmigemo/files/cmigemo-gentoo.patch74
-rw-r--r--app-text/cmigemo/files/cmigemo-ldflags.patch11
-rw-r--r--app-text/cmigemo/metadata.xml8
-rw-r--r--app-text/code2html/code2html-0.9.1-r2.ebuild29
-rw-r--r--app-text/code2html/files/code2html-0.9.1-prefix.patch4
-rw-r--r--app-text/code2html/files/code2html-0.9.1-scalar.patch4
-rw-r--r--app-text/code2html/metadata.xml14
-rw-r--r--app-text/convertlit/convertlit-1.8-r3.ebuild44
-rw-r--r--app-text/convertlit/convertlit-1.8-r4.ebuild41
-rw-r--r--app-text/convertlit/files/convertlit-1.8-clang16.patch49
-rw-r--r--app-text/convertlit/metadata.xml2
-rw-r--r--app-text/convmv/Manifest1
-rw-r--r--app-text/convmv/convmv-2.04.ebuild33
-rw-r--r--app-text/convmv/convmv-2.05-r1.ebuild38
-rw-r--r--app-text/convmv/convmv-2.05.ebuild33
-rw-r--r--app-text/convmv/files/convmv-2.05-manpage_nocompress.patch16
-rw-r--r--app-text/convmv/metadata.xml6
-rw-r--r--app-text/cook/Manifest1
-rw-r--r--app-text/cook/cook-1.0.2-r1.ebuild41
-rw-r--r--app-text/cook/metadata.xml8
-rw-r--r--app-text/coolreader/Manifest1
-rw-r--r--app-text/coolreader/coolreader-3.2.2.1-r2.ebuild97
-rw-r--r--app-text/coolreader/metadata.xml17
-rw-r--r--app-text/cpdf/Manifest3
-rw-r--r--app-text/cpdf/cpdf-2.1.1-r1.ebuild41
-rw-r--r--app-text/cpdf/cpdf-2.2.1.ebuild39
-rw-r--r--app-text/cpdf/cpdf-2.3.1.ebuild39
-rw-r--r--app-text/cpdf/metadata.xml7
-rw-r--r--app-text/crengine-ng/Manifest2
-rw-r--r--app-text/crengine-ng/crengine-ng-0.9.11.ebuild78
-rw-r--r--app-text/crengine-ng/metadata.xml27
-rw-r--r--app-text/crf++/crf++-0.58-r1.ebuild44
-rw-r--r--app-text/crf++/crf++-0.58.ebuild61
-rw-r--r--app-text/crf++/files/crf++-0.58-autotools.patch23
-rw-r--r--app-text/crf++/files/crf++-automake-1.13.patch10
-rw-r--r--app-text/crf++/metadata.xml2
-rw-r--r--app-text/crm114/crm114-20100106-r1.ebuild27
-rw-r--r--app-text/crm114/metadata.xml28
-rw-r--r--app-text/crqt-ng/Manifest1
-rw-r--r--app-text/crqt-ng/crqt-ng-1.0.13.ebuild41
-rw-r--r--app-text/crqt-ng/metadata.xml27
-rw-r--r--app-text/crwx-ng/Manifest1
-rw-r--r--app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild25
-rw-r--r--app-text/crwx-ng/metadata.xml27
-rw-r--r--app-text/cssmin/Manifest1
-rw-r--r--app-text/cssmin/cssmin-0.2.0-r1.ebuild19
-rw-r--r--app-text/cssmin/metadata.xml13
-rw-r--r--app-text/csvfix/Manifest2
-rw-r--r--app-text/csvfix/csvfix-1.6.ebuild50
-rw-r--r--app-text/csvfix/files/csvfix-1.10a-tests.patch51
-rw-r--r--app-text/csvfix/files/csvfix-1.6-makefile.patch69
-rw-r--r--app-text/csvfix/files/csvfix-1.6-shuffle-test.patch20
-rw-r--r--app-text/csvfix/metadata.xml11
-rw-r--r--app-text/cuneiform/cuneiform-1.1.0-r3.ebuild48
-rw-r--r--app-text/cuneiform/files/c-assert.diff83
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-c-assert.patch79
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch3
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch9
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch30
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch1
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch25
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-graphicsmagick.patch40
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-libm.patch22
-rw-r--r--app-text/cuneiform/files/cuneiform-1.1.0-typos.patch1
-rw-r--r--app-text/cuneiform/files/graphicsmagick.diff43
-rw-r--r--app-text/cuneiform/files/libm.diff25
-rw-r--r--app-text/cuneiform/metadata.xml5
-rw-r--r--app-text/cutemarked/Manifest1
-rw-r--r--app-text/cutemarked/cutemarked-0.11.3-r1.ebuild40
-rw-r--r--app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch24
-rw-r--r--app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch12
-rw-r--r--app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch11
-rw-r--r--app-text/cutemarked/metadata.xml11
-rw-r--r--app-text/cwtext/cwtext-0.96-r1.ebuild37
-rw-r--r--app-text/cwtext/cwtext-0.96.ebuild33
-rw-r--r--app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch11
-rw-r--r--app-text/cwtext/files/cwtext-0.96-pcm.patch11
-rw-r--r--app-text/cwtext/metadata.xml2
-rw-r--r--app-text/dbacl/Manifest2
-rw-r--r--app-text/dbacl/dbacl-1.14.1.ebuild28
-rw-r--r--app-text/dbacl/dbacl-1.14.ebuild27
-rw-r--r--app-text/dbacl/metadata.xml12
-rw-r--r--app-text/dblatex/Manifest4
-rw-r--r--app-text/dblatex/dblatex-0.3.10-r1.ebuild53
-rw-r--r--app-text/dblatex/dblatex-0.3.11-r1.ebuild62
-rw-r--r--app-text/dblatex/dblatex-0.3.12-r1.ebuild69
-rw-r--r--app-text/dblatex/dblatex-0.3.12-r2.ebuild69
-rw-r--r--app-text/dblatex/dblatex-0.3.7.ebuild44
-rw-r--r--app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch12
-rw-r--r--app-text/dblatex/files/dblatex-0.3.11-encode.patch19
-rw-r--r--app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch107
-rw-r--r--app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch14
-rw-r--r--app-text/dblatex/files/dblatex-0.3.11-path-logging.patch15
-rw-r--r--app-text/dblatex/files/dblatex-0.3.11-setup.patch47
-rw-r--r--app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch12
-rw-r--r--app-text/dblatex/files/dblatex-path-logging.patch15
-rw-r--r--app-text/dblatex/files/dblatex-setup.patch28
-rw-r--r--app-text/dblatex/metadata.xml8
-rw-r--r--app-text/ddir/Manifest1
-rw-r--r--app-text/ddir/ddir-0_p20100323.ebuild24
-rw-r--r--app-text/ddir/metadata.xml8
-rw-r--r--app-text/delta/delta-20060803-r1.ebuild36
-rw-r--r--app-text/delta/delta-20060803.ebuild34
-rw-r--r--app-text/delta/metadata.xml2
-rw-r--r--app-text/dictd/Manifest3
-rw-r--r--app-text/dictd/dictd-1.12.1-r2.ebuild106
-rw-r--r--app-text/dictd/dictd-1.13.0-r7.ebuild129
-rw-r--r--app-text/dictd/dictd-1.13.0-r8.ebuild132
-rw-r--r--app-text/dictd/dictd-1.13.1.ebuild130
-rw-r--r--app-text/dictd/files/1.10.11/dictd.confd2
-rw-r--r--app-text/dictd/files/1.10.11/dictd.initd2
-rw-r--r--app-text/dictd/files/1.10.11/site.info2
-rw-r--r--app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch5
-rw-r--r--app-text/dictd/files/dictd-1.13.0-lex.patch28
-rw-r--r--app-text/dictd/files/dictd-1.13.0-libtool.patch59
-rw-r--r--app-text/dictd/files/dictd-1.13.0-stack-smashing.patch18
-rw-r--r--app-text/dictd/files/dictd-1.13.0-version.patch65
-rw-r--r--app-text/dictd/files/dictd-1.13.1-version.patch65
-rw-r--r--app-text/dictd/metadata.xml3
-rw-r--r--app-text/diction/Manifest1
-rw-r--r--app-text/diction/diction-1.13.ebuild24
-rw-r--r--app-text/diction/diction-1.14.ebuild4
-rw-r--r--app-text/diction/metadata.xml15
-rw-r--r--app-text/diff-pdf/Manifest2
-rw-r--r--app-text/diff-pdf/diff-pdf-0.3.ebuild39
-rw-r--r--app-text/diff-pdf/diff-pdf-0.5.1.ebuild38
-rw-r--r--app-text/diff-pdf/metadata.xml6
-rw-r--r--app-text/diffpdf/diffpdf-2.1.3-r2.ebuild9
-rw-r--r--app-text/diffpdf/metadata.xml2
-rw-r--r--app-text/ding/Manifest2
-rw-r--r--app-text/ding/ding-1.8.1.ebuild28
-rw-r--r--app-text/ding/ding-1.9.ebuild28
-rw-r--r--app-text/ding/metadata.xml7
-rw-r--r--app-text/discount/Manifest4
-rw-r--r--app-text/discount/discount-2.2.4.ebuild70
-rw-r--r--app-text/discount/discount-2.2.7c.ebuild67
-rw-r--r--app-text/discount/discount-3.0.0a.ebuild67
-rw-r--r--app-text/discount/discount-3.0.0d.ebuild67
-rw-r--r--app-text/discount/metadata.xml10
-rw-r--r--app-text/djview/djview-4.10.6-r1.ebuild85
-rw-r--r--app-text/djview/djview-4.10.6-r2.ebuild86
-rw-r--r--app-text/djview/metadata.xml2
-rw-r--r--app-text/djvu/Manifest3
-rw-r--r--app-text/djvu/djvu-3.5.25.3.ebuild72
-rw-r--r--app-text/djvu/djvu-3.5.27.ebuild63
-rw-r--r--app-text/djvu/djvu-3.5.28-r3.ebuild67
-rw-r--r--app-text/djvu/djvu-3.5.28-r4.ebuild71
-rw-r--r--app-text/djvu/files/djvu-3.5.24-gcc46.patch40
-rw-r--r--app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch21
-rw-r--r--app-text/djvu/metadata.xml20
-rw-r--r--app-text/djvusmooth/Manifest1
-rw-r--r--app-text/djvusmooth/djvusmooth-0.2.18.ebuild22
-rw-r--r--app-text/djvusmooth/metadata.xml8
-rw-r--r--app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild65
-rw-r--r--app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild95
-rw-r--r--app-text/docbook-dsssl-stylesheets/metadata.xml7
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild46
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild37
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff4
-rw-r--r--app-text/docbook-sgml-dtd/metadata.xml7
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild69
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild76
-rw-r--r--app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch90
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch4
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch5
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch20
-rw-r--r--app-text/docbook-sgml-utils/metadata.xml18
-rw-r--r--app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild19
-rw-r--r--app-text/docbook-sgml/metadata.xml5
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild55
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild68
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild55
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild68
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild55
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild68
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild60
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild69
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild62
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild69
-rw-r--r--app-text/docbook-xml-dtd/metadata.xml7
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild43
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild55
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild46
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild58
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild40
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild55
-rw-r--r--app-text/docbook-xml-simple-dtd/metadata.xml7
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/Manifest2
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild80
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild82
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/metadata.xml4
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild102
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild97
-rw-r--r--app-text/docbook-xsl-stylesheets/metadata.xml3
-rw-r--r--app-text/docbook2X/docbook2X-0.8.8-r4.ebuild23
-rw-r--r--app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch4
-rw-r--r--app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch5
-rw-r--r--app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch10
-rw-r--r--app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch10
-rw-r--r--app-text/docbook2X/metadata.xml2
-rw-r--r--app-text/doconce/Manifest2
-rw-r--r--app-text/doconce/doconce-1.3.ebuild16
-rw-r--r--app-text/doconce/doconce-1.4.4.ebuild26
-rw-r--r--app-text/doconce/metadata.xml20
-rw-r--r--app-text/docx2txt/Manifest2
-rw-r--r--app-text/docx2txt/docx2txt-1.2.ebuild29
-rw-r--r--app-text/docx2txt/docx2txt-1.3.ebuild28
-rw-r--r--app-text/docx2txt/docx2txt-1.4.ebuild12
-rw-r--r--app-text/docx2txt/metadata.xml7
-rw-r--r--app-text/dos2unix/Manifest4
-rw-r--r--app-text/dos2unix/dos2unix-7.3.5.ebuild82
-rw-r--r--app-text/dos2unix/dos2unix-7.4.0.ebuild82
-rw-r--r--app-text/dos2unix/dos2unix-7.5.0.ebuild90
-rw-r--r--app-text/dos2unix/dos2unix-7.5.1.ebuild90
-rw-r--r--app-text/dos2unix/metadata.xml2
-rw-r--r--app-text/doxygen/Manifest2
-rw-r--r--app-text/doxygen/doxygen-1.10.0-r1.ebuild160
-rw-r--r--app-text/doxygen/doxygen-1.9.8.ebuild155
-rw-r--r--app-text/doxygen/doxygen-9999.ebuild153
-rw-r--r--app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch24
-rw-r--r--app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch26
-rw-r--r--app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch51
-rw-r--r--app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch16
-rw-r--r--app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch119
-rw-r--r--app-text/doxygen/metadata.xml24
-rw-r--r--app-text/duali/Manifest1
-rw-r--r--app-text/duali/duali-0.2.0-r1.ebuild40
-rw-r--r--app-text/duali/metadata.xml8
-rw-r--r--app-text/dvipng/Manifest2
-rw-r--r--app-text/dvipng/dvipng-1.15-r1.ebuild50
-rw-r--r--app-text/dvipng/dvipng-1.17.ebuild42
-rw-r--r--app-text/dvipng/files/dvipng-1.15-freetype-config.patch12
-rw-r--r--app-text/dvipng/metadata.xml2
-rw-r--r--app-text/dvipsk/Manifest18
-rw-r--r--app-text/dvipsk/dvipsk-2021.1_p20210325-r2.ebuild59
-rw-r--r--app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild56
-rw-r--r--app-text/dvipsk/dvipsk-5.995_p20150521.ebuild71
-rw-r--r--app-text/dvipsk/dvipsk-5.996_p20160523.ebuild71
-rw-r--r--app-text/dvipsk/dvipsk-5.997_p20170524.ebuild71
-rw-r--r--app-text/dvipsk/dvipsk-5.999_p20190410.ebuild59
-rw-r--r--app-text/dvipsk/metadata.xml4
-rw-r--r--app-text/dvisvgm/Manifest8
-rw-r--r--app-text/dvisvgm/dvisvgm-2.1.3.ebuild38
-rw-r--r--app-text/dvisvgm/dvisvgm-2.14-r1.ebuild70
-rw-r--r--app-text/dvisvgm/dvisvgm-2.6.1.ebuild45
-rw-r--r--app-text/dvisvgm/dvisvgm-2.7.ebuild45
-rw-r--r--app-text/dvisvgm/dvisvgm-3.0.4.ebuild54
-rw-r--r--app-text/dvisvgm/dvisvgm-3.1.2.ebuild50
-rw-r--r--app-text/dvisvgm/dvisvgm-3.1.ebuild50
-rw-r--r--app-text/dvisvgm/dvisvgm-3.2.ebuild50
-rw-r--r--app-text/dvisvgm/files/dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch118
-rw-r--r--app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch383
-rw-r--r--app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch22
-rw-r--r--app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch226
-rw-r--r--app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch29
-rw-r--r--app-text/dvisvgm/metadata.xml4
-rw-r--r--app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild29
-rw-r--r--app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild34
-rw-r--r--app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch50
-rw-r--r--app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch22
-rw-r--r--app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch83
-rw-r--r--app-text/ebook-tools/metadata.xml2
-rw-r--r--app-text/ebook2cw/Manifest1
-rw-r--r--app-text/ebook2cw/ebook2cw-0.8.5.ebuild32
-rw-r--r--app-text/ebook2cw/metadata.xml8
-rw-r--r--app-text/editorconfig-core-c/Manifest3
-rw-r--r--app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild37
-rw-r--r--app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild37
-rw-r--r--app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild51
-rw-r--r--app-text/editorconfig-core-c/metadata.xml2
-rw-r--r--app-text/enchant/Manifest5
-rw-r--r--app-text/enchant/enchant-1.6.1-r1.ebuild59
-rw-r--r--app-text/enchant/enchant-1.6.1-r2.ebuild60
-rw-r--r--app-text/enchant/enchant-1.6.1.ebuild57
-rw-r--r--app-text/enchant/enchant-2.1.0.ebuild51
-rw-r--r--app-text/enchant/enchant-2.1.1.ebuild45
-rw-r--r--app-text/enchant/enchant-2.1.2.ebuild45
-rw-r--r--app-text/enchant/enchant-2.2.3.ebuild45
-rw-r--r--app-text/enchant/enchant-2.6.1.ebuild68
-rw-r--r--app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch25
-rw-r--r--app-text/enchant/metadata.xml23
-rw-r--r--app-text/enscript/enscript-1.6.6-r1.ebuild60
-rw-r--r--app-text/enscript/enscript-1.6.6.ebuild52
-rw-r--r--app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch20
-rw-r--r--app-text/enscript/files/enscript-1.6.2-ruby.patch4
-rw-r--r--app-text/enscript/files/enscript-1.6.4-ebuild.st.patch4
-rw-r--r--app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch37
-rw-r--r--app-text/enscript/files/enscript-1.6.5.2-php.st.patch5
-rw-r--r--app-text/enscript/metadata.xml13
-rw-r--r--app-text/epspdf/Manifest2
-rw-r--r--app-text/epspdf/epspdf-0.6.0.ebuild48
-rw-r--r--app-text/epspdf/epspdf-0.6.3-r1.ebuild53
-rw-r--r--app-text/epspdf/epspdf-0.6.3.ebuild53
-rw-r--r--app-text/epspdf/epspdf-0.6.5.ebuild56
-rw-r--r--app-text/epspdf/metadata.xml2
-rw-r--r--app-text/epstool/Manifest2
-rw-r--r--app-text/epstool/epstool-3.08-r1.ebuild43
-rw-r--r--app-text/epstool/epstool-3.09.ebuild42
-rw-r--r--app-text/epstool/files/epstool-3.09-no-gcc-linker.patch27
-rw-r--r--app-text/epstool/files/epstool-3.09-no-use-gnu.patch31
-rw-r--r--app-text/epstool/files/gcc43.patch20
-rw-r--r--app-text/epstool/metadata.xml2
-rw-r--r--app-text/evince/Manifest3
-rw-r--r--app-text/evince/evince-3.30.2.ebuild107
-rw-r--r--app-text/evince/evince-3.32.0.ebuild107
-rw-r--r--app-text/evince/evince-45.0.ebuild124
-rw-r--r--app-text/evince/files/3.30.2-internal-synctex.patch28
-rw-r--r--app-text/evince/metadata.xml29
-rw-r--r--app-text/expander/expander-2.0.5-r2.ebuild51
-rw-r--r--app-text/expander/expander-2.05-r3.ebuild43
-rw-r--r--app-text/expander/files/expander-2.05-clang15.patch60
-rw-r--r--app-text/expander/files/expander-2.05-gentoo.patch (renamed from app-text/expander/files/expander-2.0.5-gentoo.patch)0
-rw-r--r--app-text/expander/metadata.xml2
-rw-r--r--app-text/extract_url/extract_url-1.6.2.ebuild6
-rw-r--r--app-text/extract_url/metadata.xml9
-rw-r--r--app-text/fbless/Manifest1
-rw-r--r--app-text/fbless/fbless-0.2.3.ebuild16
-rw-r--r--app-text/fbless/metadata.xml11
-rw-r--r--app-text/fblog/Manifest41
-rw-r--r--app-text/fblog/fblog-1.3.1.ebuild64
-rw-r--r--app-text/fblog/fblog-1.4.1.ebuild55
-rw-r--r--app-text/fblog/metadata.xml10
-rw-r--r--app-text/fbpdf/Manifest2
-rw-r--r--app-text/fbpdf/fbpdf-0_p20190202.ebuild46
-rw-r--r--app-text/fbpdf/fbpdf-0_p20200614.ebuild42
-rw-r--r--app-text/fbpdf/metadata.xml10
-rw-r--r--app-text/fbreader/Manifest1
-rw-r--r--app-text/fbreader/fbreader-0.99.4-r5.ebuild84
-rw-r--r--app-text/fbreader/fbreader-0.99.4-r6.ebuild87
-rw-r--r--app-text/fbreader/files/fbreader-0.99.4-combined.patch535
-rw-r--r--app-text/fbreader/metadata.xml8
-rw-r--r--app-text/fdftk/Manifest1
-rw-r--r--app-text/fdftk/fdftk-6.0-r1.ebuild60
-rw-r--r--app-text/fdftk/metadata.xml11
-rw-r--r--app-text/feathernotes/Manifest1
-rw-r--r--app-text/feathernotes/feathernotes-1.2.0.ebuild35
-rw-r--r--app-text/feathernotes/feathernotes-9999.ebuild33
-rw-r--r--app-text/feathernotes/metadata.xml17
-rw-r--r--app-text/fictionup/Manifest2
-rw-r--r--app-text/fictionup/fictionup-0.1.ebuild20
-rw-r--r--app-text/fictionup/fictionup-0.2.1.ebuild17
-rw-r--r--app-text/fictionup/metadata.xml4
-rw-r--r--app-text/flpsed/Manifest2
-rw-r--r--app-text/flpsed/flpsed-0.7.0.ebuild21
-rw-r--r--app-text/flpsed/flpsed-0.7.2.ebuild34
-rw-r--r--app-text/flpsed/flpsed-0.7.3.ebuild20
-rw-r--r--app-text/flpsed/metadata.xml2
-rw-r--r--app-text/foliate/Manifest1
-rw-r--r--app-text/foliate/foliate-3.1.0.ebuild44
-rw-r--r--app-text/foliate/metadata.xml15
-rw-r--r--app-text/freepwing/Manifest1
-rw-r--r--app-text/freepwing/freepwing-1.4.3.ebuild24
-rw-r--r--app-text/freepwing/metadata.xml5
-rw-r--r--app-text/fzy/Manifest1
-rw-r--r--app-text/fzy/files/1.0-cflags.patch34
-rw-r--r--app-text/fzy/fzy-1.0-r1.ebuild45
-rw-r--r--app-text/fzy/fzy-9999.ebuild44
-rw-r--r--app-text/fzy/metadata.xml19
-rw-r--r--app-text/gentoo-dtd/Manifest1
-rw-r--r--app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild49
-rw-r--r--app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild49
-rw-r--r--app-text/gentoo-dtd/metadata.xml11
-rw-r--r--app-text/getxbook/Manifest2
-rw-r--r--app-text/getxbook/files/getxbook-1.0.patch42
-rw-r--r--app-text/getxbook/files/getxbook-1.2.patch35
-rw-r--r--app-text/getxbook/getxbook-1.0-r1.ebuild45
-rw-r--r--app-text/getxbook/getxbook-1.2.ebuild46
-rw-r--r--app-text/getxbook/metadata.xml18
-rw-r--r--app-text/ghostscript-gpl/Manifest5
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch53
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch22
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch25
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild199
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild198
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild198
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild196
-rw-r--r--app-text/ghostscript-gpl/metadata.xml15
-rw-r--r--app-text/glosung/Manifest2
-rw-r--r--app-text/glosung/files/glosung-3.6.2-glib-includes.patch11
-rw-r--r--app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch63
-rw-r--r--app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch64
-rw-r--r--app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch61
-rw-r--r--app-text/glosung/files/glosung.desktop12
-rw-r--r--app-text/glosung/glosung-3.6.2-r1.ebuild50
-rw-r--r--app-text/glosung/glosung-3.6.4.ebuild43
-rw-r--r--app-text/glosung/metadata.xml10
-rw-r--r--app-text/gnome-doc-utils/Manifest1
-rw-r--r--app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch6
-rw-r--r--app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild67
-rw-r--r--app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild75
-rw-r--r--app-text/gnome-doc-utils/metadata.xml5
-rw-r--r--app-text/gnopaster/Manifest1
-rw-r--r--app-text/gnopaster/gnopaster-0.0.9.ebuild22
-rw-r--r--app-text/gnopaster/metadata.xml8
-rw-r--r--app-text/gocr/Manifest2
-rw-r--r--app-text/gocr/gocr-0.49.ebuild45
-rw-r--r--app-text/gocr/gocr-0.50.ebuild45
-rw-r--r--app-text/gocr/metadata.xml11
-rw-r--r--app-text/goldendict/Manifest1
-rw-r--r--app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch167
-rw-r--r--app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch56
-rw-r--r--app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch18
-rw-r--r--app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild94
-rw-r--r--app-text/goldendict/metadata.xml12
-rw-r--r--app-text/grip/Manifest2
-rw-r--r--app-text/grip/grip-4.2.0.ebuild26
-rw-r--r--app-text/grip/grip-4.6.2.ebuild26
-rw-r--r--app-text/grip/metadata.xml9
-rw-r--r--app-text/groonga-normalizer-mysql/Manifest3
-rw-r--r--app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild37
-rw-r--r--app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild37
-rw-r--r--app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild37
-rw-r--r--app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild38
-rw-r--r--app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild38
-rw-r--r--app-text/groonga-normalizer-mysql/metadata.xml6
-rw-r--r--app-text/groonga/Manifest4
-rw-r--r--app-text/groonga/groonga-13.0.1.ebuild105
-rw-r--r--app-text/groonga/groonga-5.0.3.ebuild91
-rw-r--r--app-text/groonga/groonga-5.0.9.ebuild91
-rw-r--r--app-text/groonga/groonga-6.1.2.ebuild91
-rw-r--r--app-text/groonga/groonga-8.0.2-r2.ebuild108
-rw-r--r--app-text/groonga/groonga-8.0.2.ebuild100
-rw-r--r--app-text/groonga/metadata.xml39
-rw-r--r--app-text/grutatxt/Manifest2
-rw-r--r--app-text/grutatxt/grutatxt-2.0.16-r1.ebuild23
-rw-r--r--app-text/grutatxt/grutatxt-2.200.0.ebuild18
-rw-r--r--app-text/grutatxt/metadata.xml2
-rw-r--r--app-text/gspell/Manifest3
-rw-r--r--app-text/gspell/gspell-1.12.2.ebuild61
-rw-r--r--app-text/gspell/gspell-1.6.1.ebuild48
-rw-r--r--app-text/gspell/gspell-1.8.1.ebuild48
-rw-r--r--app-text/gspell/metadata.xml13
-rw-r--r--app-text/gtkspell/Manifest1
-rw-r--r--app-text/gtkspell/gtkspell-2.0.16-r2.ebuild38
-rw-r--r--app-text/gtkspell/gtkspell-2.0.16.ebuild39
-rw-r--r--app-text/gtkspell/gtkspell-3.0.10-r1.ebuild41
-rw-r--r--app-text/gtkspell/gtkspell-3.0.10.ebuild46
-rw-r--r--app-text/gtkspell/gtkspell-3.0.9.ebuild46
-rw-r--r--app-text/gtkspell/metadata.xml2
-rw-r--r--app-text/gtranslator/Manifest2
-rw-r--r--app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch28
-rw-r--r--app-text/gtranslator/gtranslator-3.32.0.ebuild51
-rw-r--r--app-text/gtranslator/gtranslator-45.3.ebuild61
-rw-r--r--app-text/gtranslator/metadata.xml34
-rw-r--r--app-text/gv/Manifest2
-rw-r--r--app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch15
-rw-r--r--app-text/gv/files/gv-3.7.4-bounding-box.patch15
-rw-r--r--app-text/gv/files/gv-3.7.4-bug1071238.patch22
-rw-r--r--app-text/gv/files/gv-3.7.4-bz1536211.patch28
-rw-r--r--app-text/gv/files/gv-3.7.4-dat.patch15
-rw-r--r--app-text/gv/files/gv-3.7.4-overflow.patch27
-rw-r--r--app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch18
-rw-r--r--app-text/gv/files/gv-3.7.4-resource.patch33
-rw-r--r--app-text/gv/gv-3.7.3-r1.ebuild48
-rw-r--r--app-text/gv/gv-3.7.3.90-r1.ebuild44
-rw-r--r--app-text/gv/gv-3.7.3.90.ebuild42
-rw-r--r--app-text/gv/gv-3.7.4.ebuild62
-rw-r--r--app-text/gv/metadata.xml2
-rw-r--r--app-text/halibut/Manifest1
-rw-r--r--app-text/halibut/halibut-1.3.ebuild14
-rw-r--r--app-text/halibut/metadata.xml5
-rw-r--r--app-text/hd2u/hd2u-1.0.3.ebuild13
-rw-r--r--app-text/hd2u/metadata.xml2
-rw-r--r--app-text/highlight/Manifest8
-rw-r--r--app-text/highlight/files/highlight-3.42-qmake-fix.patch32
-rw-r--r--app-text/highlight/files/highlight-3.57-qt_libs_lua.patch13
-rw-r--r--app-text/highlight/highlight-3.42-r1.ebuild91
-rw-r--r--app-text/highlight/highlight-4.1.ebuild103
-rw-r--r--app-text/highlight/highlight-4.6.ebuild107
-rw-r--r--app-text/highlight/highlight-4.8.ebuild111
-rw-r--r--app-text/highlight/highlight-4.9.ebuild122
-rw-r--r--app-text/highlight/metadata.xml5
-rw-r--r--app-text/hnb/files/hnb-1.9.18-fno-common.patch27
-rw-r--r--app-text/hnb/hnb-1.9.18-r1.ebuild27
-rw-r--r--app-text/hnb/metadata.xml2
-rw-r--r--app-text/htag/htag-0.0.24-r1.ebuild9
-rw-r--r--app-text/htag/metadata.xml2
-rw-r--r--app-text/html-xml-utils/Manifest8
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.1.ebuild36
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.4.ebuild36
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.5.ebuild36
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.6.ebuild36
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.7.ebuild36
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild28
-rw-r--r--app-text/html-xml-utils/html-xml-utils-8.5.ebuild28
-rw-r--r--app-text/html-xml-utils/html-xml-utils-8.6.ebuild29
-rw-r--r--app-text/html-xml-utils/metadata.xml6
-rw-r--r--app-text/html2text/Manifest5
-rw-r--r--app-text/html2text/files/html2text-1.3.2a-compiler.patch13
-rw-r--r--app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch11
-rw-r--r--app-text/html2text/html2text-1.3.2a-r2.ebuild40
-rw-r--r--app-text/html2text/html2text-2.1.1.ebuild38
-rw-r--r--app-text/html2text/html2text-2.2.3.ebuild27
-rw-r--r--app-text/html2text/metadata.xml13
-rw-r--r--app-text/html401/files/html401-decl.diff4
-rw-r--r--app-text/html401/html401-19991224-r3.ebuild32
-rw-r--r--app-text/html401/html401-19991224-r4.ebuild45
-rw-r--r--app-text/html401/metadata.xml7
-rw-r--r--app-text/htmlc/Manifest2
-rw-r--r--app-text/htmlc/files/werror.patch18
-rw-r--r--app-text/htmlc/htmlc-2.40.0.ebuild47
-rw-r--r--app-text/htmlc/htmlc-2.60.0.ebuild53
-rw-r--r--app-text/htmlc/metadata.xml8
-rw-r--r--app-text/htmldoc/Manifest2
-rw-r--r--app-text/htmldoc/htmldoc-1.8.30.ebuild43
-rw-r--r--app-text/htmldoc/htmldoc-1.9.16.ebuild52
-rw-r--r--app-text/htmldoc/metadata.xml7
-rw-r--r--app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild6
-rw-r--r--app-text/htmlinc/metadata.xml2
-rw-r--r--app-text/htmlmin/Manifest3
-rw-r--r--app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild28
-rw-r--r--app-text/htmlmin/htmlmin-0.1.12-r1.ebuild29
-rw-r--r--app-text/htmlmin/htmlmin-0.1.12.ebuild25
-rw-r--r--app-text/htmlmin/metadata.xml4
-rw-r--r--app-text/htmlrecode/metadata.xml2
-rw-r--r--app-text/htmltidy/Manifest3
-rw-r--r--app-text/htmltidy/files/11CVE-2015-5522.patch34
-rw-r--r--app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch31
-rw-r--r--app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch12
-rw-r--r--app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch37
-rw-r--r--app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch29
-rw-r--r--app-text/htmltidy/htmltidy-20090325-r2.ebuild79
-rw-r--r--app-text/htmltidy/htmltidy-5.8.0-r2.ebuild74
-rw-r--r--app-text/htmltidy/metadata.xml13
-rw-r--r--app-text/htp/Manifest1
-rw-r--r--app-text/htp/files/htp-1.19-fix-perl-5.26.patch12
-rw-r--r--app-text/htp/files/htp-1.19-no-prestrip.patch11
-rw-r--r--app-text/htp/files/htp-1.19-parallel-make.patch27
-rw-r--r--app-text/htp/files/strip.patch15
-rw-r--r--app-text/htp/htp-1.16-r1.ebuild49
-rw-r--r--app-text/htp/htp-1.19-r1.ebuild36
-rw-r--r--app-text/htp/htp-1.19.ebuild33
-rw-r--r--app-text/htp/metadata.xml2
-rw-r--r--app-text/hunspell/Manifest3
-rw-r--r--app-text/hunspell/files/hunspell-1.6.2-renameexes.patch127
-rw-r--r--app-text/hunspell/files/hunspell-1.7.0-renameexes.patch166
-rw-r--r--app-text/hunspell/files/hunspell-1.7.0-tinfo.patch61
-rw-r--r--app-text/hunspell/files/hunspell-1.7.2-renameexes.patch149
-rw-r--r--app-text/hunspell/hunspell-1.6.2-r1.ebuild86
-rw-r--r--app-text/hunspell/hunspell-1.7.0.ebuild86
-rw-r--r--app-text/hunspell/hunspell-1.7.2-r1.ebuild81
-rw-r--r--app-text/hunspell/hunspell-1.7.2.ebuild82
-rw-r--r--app-text/hunspell/metadata.xml14
-rw-r--r--app-text/hyperestraier/files/hyperestraier-configure.patch30
-rw-r--r--app-text/hyperestraier/files/hyperestraier-java-11.patch78
-rw-r--r--app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild201
-rw-r--r--app-text/hyperestraier/hyperestraier-1.4.13.ebuild200
-rw-r--r--app-text/hyperestraier/metadata.xml23
-rw-r--r--app-text/idnits/Manifest1
-rw-r--r--app-text/idnits/idnits-2.17.1.ebuild24
-rw-r--r--app-text/idnits/metadata.xml11
-rw-r--r--app-text/info2html/Manifest1
-rw-r--r--app-text/info2html/files/info2html-2.0-xss.patch61
-rw-r--r--app-text/info2html/info2html-2.0.ebuild73
-rw-r--r--app-text/info2html/metadata.xml11
-rw-r--r--app-text/iso-codes/Manifest2
-rw-r--r--app-text/iso-codes/iso-codes-3.76.ebuild78
-rw-r--r--app-text/iso-codes/iso-codes-4.16.0.ebuild79
-rw-r--r--app-text/iso-codes/metadata.xml3
-rw-r--r--app-text/itex2mml/Manifest2
-rw-r--r--app-text/itex2mml/itex2mml-1.5.6.ebuild26
-rw-r--r--app-text/itex2mml/itex2mml-1.6.1.ebuild29
-rw-r--r--app-text/itex2mml/metadata.xml2
-rw-r--r--app-text/jabref-bin/Manifest5
-rw-r--r--app-text/jabref-bin/jabref-bin-3.7.ebuild40
-rw-r--r--app-text/jabref-bin/jabref-bin-3.8.1.ebuild38
-rw-r--r--app-text/jabref-bin/jabref-bin-3.8.2-r1.ebuild36
-rw-r--r--app-text/jabref-bin/jabref-bin-3.8.2.ebuild38
-rw-r--r--app-text/jabref-bin/jabref-bin-3.8.ebuild41
-rw-r--r--app-text/jabref-bin/jabref-bin-4.0.ebuild48
-rw-r--r--app-text/jabref-bin/jabref-bin-4.1.ebuild48
-rw-r--r--app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild43
-rw-r--r--app-text/jabref-bin/jabref-bin-4.3.1.ebuild48
-rw-r--r--app-text/jabref-bin/jabref-bin-4.9999.ebuild42
-rw-r--r--app-text/jabref-bin/metadata.xml8
-rw-r--r--app-text/jabref/Manifest1
-rw-r--r--app-text/jabref/jabref-2.10-r2.ebuild76
-rw-r--r--app-text/jabref/jabref-2.10-r4.ebuild77
-rw-r--r--app-text/jabref/metadata.xml19
-rw-r--r--app-text/jadetex/Manifest1
-rw-r--r--app-text/jadetex/files/80jadetex.cnf37
-rw-r--r--app-text/jadetex/files/format.jadetex.cnf3
-rw-r--r--app-text/jadetex/jadetex-3.13-r7.ebuild64
-rw-r--r--app-text/jadetex/metadata.xml11
-rw-r--r--app-text/jo/Manifest3
-rw-r--r--app-text/jo/files/jo-1.1-version.patch9
-rw-r--r--app-text/jo/jo-1.1.ebuild22
-rw-r--r--app-text/jo/jo-1.4.ebuild23
-rw-r--r--app-text/jo/jo-1.6.ebuild36
-rw-r--r--app-text/jo/jo-9999.ebuild36
-rw-r--r--app-text/jo/metadata.xml14
-rw-r--r--app-text/jpdftweak/Manifest1
-rw-r--r--app-text/jpdftweak/jpdftweak-0.9-r1.ebuild41
-rw-r--r--app-text/jpdftweak/metadata.xml21
-rw-r--r--app-text/katarakt/Manifest1
-rw-r--r--app-text/katarakt/files/katarakt-0.2-install.patch26
-rw-r--r--app-text/katarakt/files/katarakt-0.2-poppler.patch29
-rw-r--r--app-text/katarakt/katarakt-0.2.ebuild47
-rw-r--r--app-text/katarakt/metadata.xml25
-rw-r--r--app-text/kbibtex/Manifest2
-rw-r--r--app-text/kbibtex/kbibtex-0.10.0.ebuild77
-rw-r--r--app-text/kbibtex/kbibtex-0.9.ebuild79
-rw-r--r--app-text/kbibtex/metadata.xml7
-rw-r--r--app-text/kchmviewer/Manifest2
-rw-r--r--app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch26
-rw-r--r--app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch11
-rw-r--r--app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch59
-rw-r--r--app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch28
-rw-r--r--app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch30
-rw-r--r--app-text/kchmviewer/kchmviewer-7.7-r1.ebuild45
-rw-r--r--app-text/kchmviewer/kchmviewer-8.0.ebuild47
-rw-r--r--app-text/kchmviewer/metadata.xml12
-rw-r--r--app-text/keepnote/Manifest1
-rw-r--r--app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch30
-rw-r--r--app-text/keepnote/keepnote-0.7.9-r2.ebuild46
-rw-r--r--app-text/keepnote/metadata.xml20
-rw-r--r--app-text/kjots/Manifest2
-rw-r--r--app-text/kjots/kjots-5.0.2.ebuild42
-rw-r--r--app-text/kjots/kjots-5.1.1.ebuild57
-rw-r--r--app-text/kjots/metadata.xml6
-rw-r--r--app-text/kramdown-rfc/Manifest2
-rw-r--r--app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch31
-rw-r--r--app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch27
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild41
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild41
-rw-r--r--app-text/kramdown-rfc/metadata.xml11
-rw-r--r--app-text/krop/Manifest2
-rw-r--r--app-text/krop/files/krop-0.6.0-links.patch64
-rw-r--r--app-text/krop/files/krop-0.6.0-pikepdf.patch150
-rw-r--r--app-text/krop/krop-0.5.1.ebuild35
-rw-r--r--app-text/krop/krop-0.6.0-r2.ebuild47
-rw-r--r--app-text/krop/krop-0.6.0-r3.ebuild38
-rw-r--r--app-text/krop/krop-9999.ebuild41
-rw-r--r--app-text/krop/metadata.xml5
-rw-r--r--app-text/landslide/Manifest1
-rw-r--r--app-text/landslide/landslide-1.1.3.ebuild31
-rw-r--r--app-text/landslide/metadata.xml10
-rw-r--r--app-text/languagetool/Manifest3
-rw-r--r--app-text/languagetool/files/languagetool.initd19
-rw-r--r--app-text/languagetool/languagetool-4.5.ebuild66
-rw-r--r--app-text/languagetool/languagetool-4.6.ebuild77
-rw-r--r--app-text/languagetool/languagetool-5.4-r2.ebuild77
-rw-r--r--app-text/languagetool/metadata.xml2
-rw-r--r--app-text/lcdf-typetools/Manifest4
-rw-r--r--app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild28
-rw-r--r--app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild28
-rw-r--r--app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild35
-rw-r--r--app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild34
-rw-r--r--app-text/lcdf-typetools/metadata.xml5
-rw-r--r--app-text/lesspipe/Manifest4
-rw-r--r--app-text/lesspipe/files/all-completions.patch51
-rw-r--r--app-text/lesspipe/lesspipe-1.83-r1.ebuild40
-rw-r--r--app-text/lesspipe/lesspipe-1.83.ebuild40
-rw-r--r--app-text/lesspipe/lesspipe-1.84.ebuild40
-rw-r--r--app-text/lesspipe/lesspipe-2.11-r1.ebuild68
-rw-r--r--app-text/lesspipe/lesspipe-2.12.ebuild63
-rw-r--r--app-text/lesspipe/metadata.xml4
-rw-r--r--app-text/letterize/Manifest1
-rw-r--r--app-text/letterize/files/letterize-1.4-clang16.patch8
-rw-r--r--app-text/letterize/letterize-1.3.ebuild25
-rw-r--r--app-text/letterize/letterize-1.4.ebuild12
-rw-r--r--app-text/letterize/metadata.xml2
-rw-r--r--app-text/libabw/Manifest2
-rw-r--r--app-text/libabw/libabw-0.1.2.ebuild47
-rw-r--r--app-text/libabw/libabw-0.1.3.ebuild45
-rw-r--r--app-text/libabw/metadata.xml2
-rw-r--r--app-text/libebook/Manifest3
-rw-r--r--app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch10
-rw-r--r--app-text/libebook/files/libebook-0.1.2-tests.patch27
-rw-r--r--app-text/libebook/files/libebook-0.1.3-icu-68.patch27
-rw-r--r--app-text/libebook/libebook-0.1.2-r1.ebuild62
-rw-r--r--app-text/libebook/libebook-0.1.3-r3.ebuild58
-rw-r--r--app-text/libebook/libebook-0.1.3.ebuild58
-rw-r--r--app-text/libebook/metadata.xml2
-rw-r--r--app-text/libepubgen/libepubgen-0.1.1-r1.ebuild42
-rw-r--r--app-text/libepubgen/libepubgen-0.1.1.ebuild39
-rw-r--r--app-text/libepubgen/metadata.xml2
-rw-r--r--app-text/libetonyek/Manifest2
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10-r2.ebuild65
-rw-r--r--app-text/libetonyek/libetonyek-0.1.9.ebuild61
-rw-r--r--app-text/libetonyek/libetonyek-9999.ebuild33
-rw-r--r--app-text/libetonyek/metadata.xml2
-rw-r--r--app-text/libexttextcat/Manifest2
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.5.ebuild27
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.7.ebuild22
-rw-r--r--app-text/libexttextcat/metadata.xml2
-rw-r--r--app-text/libgepub/Manifest2
-rw-r--r--app-text/libgepub/libgepub-0.6.0.ebuild32
-rw-r--r--app-text/libgepub/libgepub-0.7.1.ebuild40
-rw-r--r--app-text/libgepub/metadata.xml8
-rw-r--r--app-text/libgxps/Manifest3
-rw-r--r--app-text/libgxps/libgxps-0.3.0.ebuild50
-rw-r--r--app-text/libgxps/libgxps-0.3.1.ebuild50
-rw-r--r--app-text/libgxps/libgxps-0.3.2-r3.ebuild51
-rw-r--r--app-text/libgxps/metadata.xml13
-rw-r--r--app-text/liblangtag/Manifest2
-rw-r--r--app-text/liblangtag/liblangtag-0.6.2.ebuild51
-rw-r--r--app-text/liblangtag/liblangtag-0.6.7.ebuild55
-rw-r--r--app-text/liblangtag/metadata.xml2
-rw-r--r--app-text/libmspub/files/libmspub-0.1.4-gcc10.patch27
-rw-r--r--app-text/libmspub/libmspub-0.1.4.ebuild46
-rw-r--r--app-text/libmspub/libmspub-9999.ebuild44
-rw-r--r--app-text/libmspub/metadata.xml2
-rw-r--r--app-text/libmwaw/Manifest2
-rw-r--r--app-text/libmwaw/libmwaw-0.3.15.ebuild52
-rw-r--r--app-text/libmwaw/libmwaw-0.3.22.ebuild55
-rw-r--r--app-text/libmwaw/libmwaw-9999.ebuild31
-rw-r--r--app-text/libmwaw/metadata.xml2
-rw-r--r--app-text/libnumbertext/Manifest2
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.11.ebuild23
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.5.ebuild23
-rw-r--r--app-text/libnumbertext/metadata.xml2
-rw-r--r--app-text/libodfgen/Manifest2
-rw-r--r--app-text/libodfgen/libodfgen-0.1.7.ebuild42
-rw-r--r--app-text/libodfgen/libodfgen-0.1.8.ebuild58
-rw-r--r--app-text/libodfgen/libodfgen-9999.ebuild31
-rw-r--r--app-text/libodfgen/metadata.xml2
-rw-r--r--app-text/libpaper/Manifest5
-rw-r--r--app-text/libpaper/libpaper-1.1.24-r2.ebuild45
-rw-r--r--app-text/libpaper/libpaper-1.1.24_p5.ebuild47
-rw-r--r--app-text/libpaper/libpaper-1.1.28.ebuild43
-rw-r--r--app-text/libpaper/libpaper-2.1.2.ebuild30
-rw-r--r--app-text/libpaper/libpaper-2.1.3.ebuild30
-rw-r--r--app-text/libpaper/metadata.xml13
-rw-r--r--app-text/libqxp/libqxp-0.0.2.ebuild14
-rw-r--r--app-text/libqxp/metadata.xml2
-rw-r--r--app-text/libspectre/Manifest4
-rw-r--r--app-text/libspectre/files/libspectre-0.2.0-interix.patch29
-rw-r--r--app-text/libspectre/files/libspectre-0.2.7-gs918.patch42
-rw-r--r--app-text/libspectre/libspectre-0.2.11.ebuild45
-rw-r--r--app-text/libspectre/libspectre-0.2.12.ebuild45
-rw-r--r--app-text/libspectre/libspectre-0.2.7.ebuild52
-rw-r--r--app-text/libspectre/libspectre-0.2.8.ebuild50
-rw-r--r--app-text/libspectre/metadata.xml5
-rw-r--r--app-text/libstaroffice/Manifest2
-rw-r--r--app-text/libstaroffice/libstaroffice-0.0.6.ebuild45
-rw-r--r--app-text/libstaroffice/libstaroffice-0.0.7.ebuild48
-rw-r--r--app-text/libstaroffice/libstaroffice-9999.ebuild41
-rw-r--r--app-text/libstaroffice/metadata.xml2
-rw-r--r--app-text/libwpd/libwpd-0.10.3.ebuild6
-rw-r--r--app-text/libwpd/metadata.xml2
-rw-r--r--app-text/libwpg/Manifest2
-rw-r--r--app-text/libwpg/libwpg-0.3.3.ebuild37
-rw-r--r--app-text/libwpg/libwpg-0.3.4.ebuild39
-rw-r--r--app-text/libwpg/metadata.xml2
-rw-r--r--app-text/libwps/Manifest2
-rw-r--r--app-text/libwps/libwps-0.4.10.ebuild35
-rw-r--r--app-text/libwps/libwps-0.4.14.ebuild34
-rw-r--r--app-text/libwps/metadata.xml2
-rw-r--r--app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild28
-rw-r--r--app-text/libxmlpatch/metadata.xml2
-rw-r--r--app-text/linuxdoc-tools/Manifest2
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch245
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild80
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild88
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild74
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild95
-rw-r--r--app-text/linuxdoc-tools/metadata.xml11
-rw-r--r--app-text/llpp/Manifest2
-rw-r--r--app-text/llpp/files/Makefile4
-rw-r--r--app-text/llpp/files/llpp-30-keysym.patch55
-rw-r--r--app-text/llpp/files/llpp-33-makefile91
-rw-r--r--app-text/llpp/files/llpp.desktop2
-rw-r--r--app-text/llpp/llpp-30.ebuild70
-rw-r--r--app-text/llpp/llpp-33.ebuild61
-rw-r--r--app-text/llpp/metadata.xml7
-rw-r--r--app-text/logmerge/logmerge-0.5.2b-r1.ebuild19
-rw-r--r--app-text/logmerge/logmerge-0.5.2b.ebuild19
-rw-r--r--app-text/logmerge/metadata.xml5
-rw-r--r--app-text/lout/Manifest1
-rw-r--r--app-text/lout/files/lout-3.38-makefile.patch33
-rw-r--r--app-text/lout/lout-3.40.ebuild85
-rw-r--r--app-text/lout/metadata.xml8
-rw-r--r--app-text/lowdown/Manifest1
-rw-r--r--app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch11
-rw-r--r--app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch45
-rw-r--r--app-text/lowdown/lowdown-1.1.0.ebuild67
-rw-r--r--app-text/lowdown/metadata.xml11
-rw-r--r--app-text/lv/lv-4.51-r4.ebuild49
-rw-r--r--app-text/lv/lv-4.51-r5.ebuild48
-rw-r--r--app-text/lv/metadata.xml6
-rw-r--r--app-text/mandoc/Manifest3
-rw-r--r--app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch19
-rw-r--r--app-text/mandoc/files/mandoc.cron-r06
-rw-r--r--app-text/mandoc/mandoc-1.14.4.ebuild60
-rw-r--r--app-text/mandoc/mandoc-1.14.5.ebuild60
-rw-r--r--app-text/mandoc/mandoc-1.14.6.ebuild131
-rw-r--r--app-text/mandoc/metadata.xml12
-rw-r--r--app-text/manpager/manpager-1.ebuild12
-rw-r--r--app-text/manpager/metadata.xml2
-rw-r--r--app-text/master-pdf-editor/Manifest8
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild50
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.3.02.ebuild50
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild50
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild50
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild50
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.9.35.ebuild44
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild44
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild45
-rw-r--r--app-text/master-pdf-editor/metadata.xml6
-rw-r--r--app-text/mathtex/Manifest2
-rw-r--r--app-text/mathtex/mathtex-1.04.ebuild46
-rw-r--r--app-text/mathtex/mathtex-1.05.ebuild45
-rw-r--r--app-text/mathtex/metadata.xml2
-rw-r--r--app-text/mdbook/Manifest238
-rw-r--r--app-text/mdbook/mdbook-0.4.37.ebuild282
-rw-r--r--app-text/mdbook/metadata.xml11
-rw-r--r--app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch33
-rw-r--r--app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch16
-rw-r--r--app-text/mecab/files/mecab-0.996-clang-16-register.patch89
-rw-r--r--app-text/mecab/mecab-0.996-r1.ebuild39
-rw-r--r--app-text/mecab/mecab-0.996-r2.ebuild62
-rw-r--r--app-text/mecab/metadata.xml2
-rw-r--r--app-text/metadata.xml3
-rw-r--r--app-text/mftrace/Manifest2
-rw-r--r--app-text/mftrace/metadata.xml12
-rw-r--r--app-text/mftrace/mftrace-1.2.18-r3.ebuild42
-rw-r--r--app-text/mftrace/mftrace-1.2.19-r1.ebuild42
-rw-r--r--app-text/mht-rip/Manifest1
-rw-r--r--app-text/mht-rip/metadata.xml5
-rw-r--r--app-text/mht-rip/mht-rip-0.8.ebuild27
-rw-r--r--app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch43
-rw-r--r--app-text/mpage/metadata.xml2
-rw-r--r--app-text/mpage/mpage-2.5.6-r1.ebuild49
-rw-r--r--app-text/msort/files/msort-8.53-configure-clang16.patch18
-rw-r--r--app-text/msort/files/msort-8.53-find-utf8proc-headers.patch33
-rw-r--r--app-text/msort/metadata.xml8
-rw-r--r--app-text/msort/msort-8.53-r2.ebuild47
-rw-r--r--app-text/msort/msort-8.53.ebuild47
-rw-r--r--app-text/multitail/Manifest3
-rw-r--r--app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch34
-rw-r--r--app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch29
-rw-r--r--app-text/multitail/files/multitail-7.0.0-gentoo.patch32
-rw-r--r--app-text/multitail/metadata.xml14
-rw-r--r--app-text/multitail/multitail-6.4.1.ebuild66
-rw-r--r--app-text/multitail/multitail-6.4.2-r1.ebuild65
-rw-r--r--app-text/multitail/multitail-6.4.2.ebuild66
-rw-r--r--app-text/multitail/multitail-7.0.0.ebuild63
-rw-r--r--app-text/multitail/multitail-7.1.2.ebuild62
-rw-r--r--app-text/mupdf/Manifest5
-rw-r--r--app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch533
-rw-r--r--app-text/mupdf/files/mupdf-1.14-CFLAGS.patch13
-rw-r--r--app-text/mupdf/files/mupdf-1.14-Makefile.patch46
-rw-r--r--app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch125
-rw-r--r--app-text/mupdf/files/mupdf-1.14-libressl.patch45
-rw-r--r--app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch52
-rw-r--r--app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch35
-rw-r--r--app-text/mupdf/files/mupdf-1.15-Makefile.patch42
-rw-r--r--app-text/mupdf/files/mupdf-1.15-openssl-x11.patch2
-rw-r--r--app-text/mupdf/files/mupdf-1.19.0-Makefile.patch37
-rw-r--r--app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch130
-rw-r--r--app-text/mupdf/files/mupdf-1.19.0-darwin.patch39
-rw-r--r--app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch33
-rw-r--r--app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch63
-rw-r--r--app-text/mupdf/files/mupdf-1.21.1-no-drm.patch18
-rw-r--r--app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch120
-rw-r--r--app-text/mupdf/files/mupdf-1.23.3-darwin.patch45
-rw-r--r--app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch19
-rw-r--r--app-text/mupdf/files/mupdf-1.3-zoom-2.patch10
-rw-r--r--app-text/mupdf/metadata.xml14
-rw-r--r--app-text/mupdf/mupdf-1.14.0-r2.ebuild126
-rw-r--r--app-text/mupdf/mupdf-1.14.0-r3.ebuild129
-rw-r--r--app-text/mupdf/mupdf-1.15.0.ebuild130
-rw-r--r--app-text/mupdf/mupdf-1.22.0-r1.ebuild164
-rw-r--r--app-text/mupdf/mupdf-1.23.3-r1.ebuild164
-rw-r--r--app-text/mupdf/mupdf-1.23.7-r1.ebuild165
-rw-r--r--app-text/mythes/Manifest2
-rw-r--r--app-text/mythes/metadata.xml2
-rw-r--r--app-text/mythes/mythes-1.2.4.ebuild27
-rw-r--r--app-text/mythes/mythes-1.2.5.ebuild28
-rw-r--r--app-text/namazu/Manifest2
-rw-r--r--app-text/namazu/files/namazu-emacs-27.patch14
-rw-r--r--app-text/namazu/metadata.xml2
-rw-r--r--app-text/namazu/namazu-2.0.21.ebuild21
-rw-r--r--app-text/namazu/namazu-2.0.22_pre7.ebuild97
-rw-r--r--app-text/namazu/namazu-2.0.22_pre8.ebuild97
-rw-r--r--app-text/nfoview/Manifest4
-rw-r--r--app-text/nfoview/metadata.xml6
-rw-r--r--app-text/nfoview/nfoview-1.23.ebuild37
-rw-r--r--app-text/nfoview/nfoview-1.24.ebuild37
-rw-r--r--app-text/nfoview/nfoview-1.26.ebuild37
-rw-r--r--app-text/nfoview/nfoview-1.28.1-r1.ebuild41
-rw-r--r--app-text/nfoview/nfoview-9999.ebuild37
-rw-r--r--app-text/nuspell/Manifest2
-rw-r--r--app-text/nuspell/metadata.xml17
-rw-r--r--app-text/nuspell/nuspell-5.1.3.ebuild50
-rw-r--r--app-text/nuspell/nuspell-5.1.4.ebuild50
-rw-r--r--app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch36
-rw-r--r--app-text/o3read/metadata.xml2
-rw-r--r--app-text/o3read/o3read-0.0.4.ebuild18
-rw-r--r--app-text/ocrad/Manifest6
-rw-r--r--app-text/ocrad/metadata.xml12
-rw-r--r--app-text/ocrad/ocrad-0.22.ebuild35
-rw-r--r--app-text/ocrad/ocrad-0.23.ebuild35
-rw-r--r--app-text/ocrad/ocrad-0.24.ebuild35
-rw-r--r--app-text/ocrad/ocrad-0.25.ebuild35
-rw-r--r--app-text/ocrad/ocrad-0.26.ebuild35
-rw-r--r--app-text/ocrad/ocrad-0.27.ebuild39
-rw-r--r--app-text/odt2txt/Manifest1
-rw-r--r--app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch14
-rw-r--r--app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch14
-rw-r--r--app-text/odt2txt/files/odt2txt-0.5-makefile.patch116
-rw-r--r--app-text/odt2txt/metadata.xml8
-rw-r--r--app-text/odt2txt/odt2txt-0.4-r1.ebuild37
-rw-r--r--app-text/odt2txt/odt2txt-0.5-r1.ebuild32
-rw-r--r--app-text/odt2txt/odt2txt-0.5.ebuild34
-rw-r--r--app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch30
-rw-r--r--app-text/openjade/metadata.xml7
-rw-r--r--app-text/openjade/openjade-1.3.2-r8.ebuild124
-rw-r--r--app-text/openjade/openjade-1.3.2-r9.ebuild156
-rw-r--r--app-text/openlp/Manifest1
-rw-r--r--app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch22
-rw-r--r--app-text/openlp/metadata.xml10
-rw-r--r--app-text/openlp/openlp-2.4.6.ebuild43
-rw-r--r--app-text/openpaperwork-core/Manifest2
-rw-r--r--app-text/openpaperwork-core/metadata.xml12
-rw-r--r--app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild21
-rw-r--r--app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild33
-rw-r--r--app-text/openpaperwork-gtk/Manifest2
-rw-r--r--app-text/openpaperwork-gtk/metadata.xml12
-rw-r--r--app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild26
-rw-r--r--app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild38
-rw-r--r--app-text/opensp/files/opensp-1.5-gcc34.patch10
-rw-r--r--app-text/opensp/files/opensp-1.5.2-configure-clang16.patch198
-rw-r--r--app-text/opensp/metadata.xml3
-rw-r--r--app-text/opensp/opensp-1.5.2-r10.ebuild86
-rw-r--r--app-text/opensp/opensp-1.5.2-r3.ebuild78
-rw-r--r--app-text/opensp/opensp-1.5.2-r6.ebuild80
-rw-r--r--app-text/opensp/opensp-1.5.2-r9.ebuild85
-rw-r--r--app-text/ots/Manifest1
-rw-r--r--app-text/ots/files/ots-0.5.0-automake-1.13.patch12
-rw-r--r--app-text/ots/files/ots-0.5.0-fix-installation.patch11
-rw-r--r--app-text/ots/files/ots-0.5.0-fix-underlinking.patch22
-rw-r--r--app-text/ots/files/ots-0.5.0-math.patch11
-rw-r--r--app-text/ots/metadata.xml8
-rw-r--r--app-text/ots/ots-0.5.0-r1.ebuild54
-rw-r--r--app-text/pandoc-bin/Manifest8
-rw-r--r--app-text/pandoc-bin/metadata.xml26
-rw-r--r--app-text/pandoc-bin/pandoc-bin-3.1.12.1.ebuild62
-rw-r--r--app-text/pandoc-bin/pandoc-bin-3.1.12.2.ebuild62
-rw-r--r--app-text/pandoc-bin/pandoc-bin-3.1.12.3.ebuild62
-rw-r--r--app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild62
-rw-r--r--app-text/pandoc-cli/Manifest1
-rw-r--r--app-text/pandoc-cli/metadata.xml18
-rw-r--r--app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild40
-rw-r--r--app-text/pandoc/Manifest7
-rw-r--r--app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch12
-rw-r--r--app-text/pandoc/files/pandoc-2.18-tests.patch79
-rw-r--r--app-text/pandoc/metadata.xml19
-rw-r--r--app-text/pandoc/pandoc-1.12.4.2-r1.ebuild82
-rw-r--r--app-text/pandoc/pandoc-1.13.2.1.ebuild100
-rw-r--r--app-text/pandoc/pandoc-1.14.0.4.ebuild97
-rw-r--r--app-text/pandoc/pandoc-1.15.0.6.ebuild96
-rw-r--r--app-text/pandoc/pandoc-1.18.ebuild93
-rw-r--r--app-text/pandoc/pandoc-1.19.2.1-r1.ebuild93
-rw-r--r--app-text/pandoc/pandoc-1.19.2.1.ebuild85
-rw-r--r--app-text/pandoc/pandoc-2.18-r2.ebuild107
-rw-r--r--app-text/pandoc/pandoc-3.ebuild20
-rw-r--r--app-text/paper-clip/Manifest1
-rw-r--r--app-text/paper-clip/metadata.xml13
-rw-r--r--app-text/paper-clip/paper-clip-5.0.ebuild72
-rw-r--r--app-text/paper-clip/paper-clip-9999.ebuild72
-rw-r--r--app-text/paperwork-backend/Manifest5
-rw-r--r--app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch52
-rw-r--r--app-text/paperwork-backend/metadata.xml4
-rw-r--r--app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild29
-rw-r--r--app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild30
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild51
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild63
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild62
-rw-r--r--app-text/paperwork/Manifest5
-rw-r--r--app-text/paperwork/metadata.xml12
-rw-r--r--app-text/paperwork/paperwork-1.2.4-r2.ebuild31
-rw-r--r--app-text/paperwork/paperwork-1.3.0.ebuild31
-rw-r--r--app-text/paperwork/paperwork-2.1.2.ebuild52
-rw-r--r--app-text/paperwork/paperwork-2.2.1.ebuild66
-rw-r--r--app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch8
-rw-r--r--app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch4
-rw-r--r--app-text/paps/files/paps-0.6.8-fix-empty-file.patch4
-rw-r--r--app-text/paps/files/paps-0.6.8-fix-freetype-include.patch4
-rw-r--r--app-text/paps/metadata.xml2
-rw-r--r--app-text/paps/paps-0.6.8-r2.ebuild24
-rw-r--r--app-text/par/Manifest2
-rw-r--r--app-text/par/metadata.xml2
-rw-r--r--app-text/par/par-1.52-r1.ebuild32
-rw-r--r--app-text/par/par-1.53.0.ebuild36
-rw-r--r--app-text/passivetex/Manifest1
-rw-r--r--app-text/passivetex/metadata.xml8
-rw-r--r--app-text/passivetex/passivetex-1.25.ebuild34
-rw-r--r--app-text/pastebinit/Manifest2
-rw-r--r--app-text/pastebinit/files/pastebinit-1.5.1-distro.patch13
-rw-r--r--app-text/pastebinit/metadata.xml6
-rw-r--r--app-text/pastebinit/pastebinit-1.5.1-r1.ebuild74
-rw-r--r--app-text/pastebinit/pastebinit-1.5.ebuild57
-rw-r--r--app-text/pdf2djvu/Manifest3
-rw-r--r--app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch35
-rw-r--r--app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch69
-rw-r--r--app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch38
-rw-r--r--app-text/pdf2djvu/metadata.xml11
-rw-r--r--app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild60
-rw-r--r--app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild64
-rw-r--r--app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild60
-rw-r--r--app-text/pdf2html/files/pdf2html-1.4-gentoo.patch4
-rw-r--r--app-text/pdf2html/files/pdf2html-1.4-libpng15.patch4
-rw-r--r--app-text/pdf2html/metadata.xml2
-rw-r--r--app-text/pdf2html/pdf2html-1.4.ebuild26
-rw-r--r--app-text/pdf2oo/Manifest1
-rw-r--r--app-text/pdf2oo/metadata.xml8
-rw-r--r--app-text/pdf2oo/pdf2oo-20090715-r1.ebuild24
-rw-r--r--app-text/pdfarranger/Manifest2
-rw-r--r--app-text/pdfarranger/metadata.xml16
-rw-r--r--app-text/pdfarranger/pdfarranger-1.10.0.ebuild43
-rw-r--r--app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild40
-rw-r--r--app-text/pdfgrep/Manifest2
-rw-r--r--app-text/pdfgrep/metadata.xml16
-rw-r--r--app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild30
-rw-r--r--app-text/pdfgrep/pdfgrep-2.0.1.ebuild32
-rw-r--r--app-text/pdfgrep/pdfgrep-2.1.2.ebuild5
-rw-r--r--app-text/pdfjam/metadata.xml2
-rw-r--r--app-text/pdfjam/pdfjam-2.08-r1.ebuild24
-rw-r--r--app-text/pdfjam/pdfjam-2.08.ebuild24
-rw-r--r--app-text/pdfminer/Manifest3
-rw-r--r--app-text/pdfminer/metadata.xml5
-rw-r--r--app-text/pdfminer/pdfminer-20140328-r1.ebuild30
-rw-r--r--app-text/pdfminer/pdfminer-20140328.ebuild26
-rw-r--r--app-text/pdfminer/pdfminer-20220506.ebuild42
-rw-r--r--app-text/pdfminer/pdfminer-20221105.ebuild36
-rw-r--r--app-text/pdfpc/Manifest1
-rw-r--r--app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch59
-rw-r--r--app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch31
-rw-r--r--app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch22
-rw-r--r--app-text/pdfpc/metadata.xml21
-rw-r--r--app-text/pdfpc/pdfpc-4.6.0-r2.ebuild92
-rw-r--r--app-text/pdfsandwich/Manifest2
-rw-r--r--app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch43
-rw-r--r--app-text/pdfsandwich/metadata.xml30
-rw-r--r--app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild37
-rw-r--r--app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild51
-rw-r--r--app-text/pdfshuffler/Manifest1
-rw-r--r--app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch18
-rw-r--r--app-text/pdfshuffler/metadata.xml8
-rw-r--r--app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild24
-rw-r--r--app-text/pdftk/Manifest2
-rw-r--r--app-text/pdftk/metadata.xml5
-rw-r--r--app-text/pdftk/pdftk-3.0.0.ebuild43
-rw-r--r--app-text/pdftk/pdftk-3.3.3-r2.ebuild81
-rw-r--r--app-text/pdftk/pdftk-9999.ebuild82
-rw-r--r--app-text/peg-markdown/Manifest1
-rw-r--r--app-text/peg-markdown/metadata.xml11
-rw-r--r--app-text/peg-markdown/peg-markdown-0.4.14.ebuild40
-rw-r--r--app-text/pelican/Manifest6
-rw-r--r--app-text/pelican/files/pelican-4.8.0-sphinx-6.patch20
-rw-r--r--app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch22
-rw-r--r--app-text/pelican/metadata.xml8
-rw-r--r--app-text/pelican/pelican-3.7.1.ebuild53
-rw-r--r--app-text/pelican/pelican-4.0.0.ebuild54
-rw-r--r--app-text/pelican/pelican-4.0.1.ebuild54
-rw-r--r--app-text/pelican/pelican-4.8.0.ebuild79
-rw-r--r--app-text/pelican/pelican-4.9.0.ebuild77
-rw-r--r--app-text/pelican/pelican-4.9.1.ebuild84
-rw-r--r--app-text/pelican/pelican-9999.ebuild56
-rw-r--r--app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch18
-rw-r--r--app-text/pep/metadata.xml2
-rw-r--r--app-text/pep/pep-2.8-r2.ebuild15
-rw-r--r--app-text/pinfo/Manifest1
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch10
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-dir-file.patch11
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch42
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch110
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch28
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch33
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch14
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-tinfo.patch40
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-version.patch11
-rw-r--r--app-text/pinfo/files/pinfo-0.6.13-fno-common.patch11
-rw-r--r--app-text/pinfo/files/pinfo-0.6.9-as-needed.patch22
-rw-r--r--app-text/pinfo/metadata.xml8
-rw-r--r--app-text/pinfo/pinfo-0.6.10-r5.ebuild55
-rw-r--r--app-text/pinfo/pinfo-0.6.10-r7.ebuild60
-rw-r--r--app-text/pinfo/pinfo-0.6.13.ebuild14
-rw-r--r--app-text/pinfo/pinfo-99999.ebuild49
-rw-r--r--app-text/po4a/Manifest6
-rw-r--r--app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch26
-rw-r--r--app-text/po4a/files/po4a-0.69-man.patch18
-rw-r--r--app-text/po4a/files/po4a-man.patch20
-rw-r--r--app-text/po4a/metadata.xml2
-rw-r--r--app-text/po4a/po4a-0.47-r1.ebuild61
-rw-r--r--app-text/po4a/po4a-0.54.ebuild52
-rw-r--r--app-text/po4a/po4a-0.55.ebuild52
-rw-r--r--app-text/po4a/po4a-0.69.ebuild54
-rw-r--r--app-text/po4a/po4a-0.70.ebuild54
-rw-r--r--app-text/po4a/po4a-0.71.ebuild54
-rw-r--r--app-text/podofo/Manifest8
-rw-r--r--app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch37
-rw-r--r--app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch15
-rw-r--r--app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch26
-rw-r--r--app-text/podofo/metadata.xml4
-rw-r--r--app-text/podofo/podofo-0.10.1-r1.ebuild78
-rw-r--r--app-text/podofo/podofo-0.10.3.ebuild71
-rw-r--r--app-text/podofo/podofo-0.9.6_p20180715.ebuild145
-rw-r--r--app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild144
-rw-r--r--app-text/podofo/podofo-0.9.6_pre20171027.ebuild147
-rw-r--r--app-text/podofo/podofo-0.9.8-r1.ebuild118
-rw-r--r--app-text/poppler-data/Manifest3
-rw-r--r--app-text/poppler-data/metadata.xml2
-rw-r--r--app-text/poppler-data/poppler-data-0.4.12.ebuild27
-rw-r--r--app-text/poppler-data/poppler-data-0.4.9.ebuild22
-rw-r--r--app-text/poppler/Manifest10
-rw-r--r--app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch23
-rw-r--r--app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch29
-rw-r--r--app-text/poppler/files/poppler-0.61.0-respect-cflags.patch55
-rw-r--r--app-text/poppler/files/poppler-0.71.0-respect-cflags.patch31
-rw-r--r--app-text/poppler/files/poppler-0.78.0-respect-cflags.patch31
-rw-r--r--app-text/poppler/files/poppler-21.09.0-respect-cflags.patch116
-rw-r--r--app-text/poppler/files/poppler-23.10.0-qt-deps.patch61
-rw-r--r--app-text/poppler/metadata.xml10
-rw-r--r--app-text/poppler/poppler-0.77.0.ebuild127
-rw-r--r--app-text/poppler/poppler-0.79.0-r1.ebuild127
-rw-r--r--app-text/poppler/poppler-0.80.0.ebuild127
-rw-r--r--app-text/poppler/poppler-24.02.0.ebuild157
-rw-r--r--app-text/poppler/poppler-24.03.0.ebuild157
-rw-r--r--app-text/poppler/poppler-24.04.0.ebuild157
-rw-r--r--app-text/poppler/poppler-9999.ebuild118
-rw-r--r--app-text/ps2eps/metadata.xml6
-rw-r--r--app-text/ps2eps/ps2eps-1.68.ebuild39
-rw-r--r--app-text/ps2pkm/Manifest6
-rw-r--r--app-text/ps2pkm/metadata.xml4
-rw-r--r--app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild28
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild28
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild28
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild25
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild23
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild24
-rw-r--r--app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch92
-rw-r--r--app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch21
-rw-r--r--app-text/psiconv/metadata.xml2
-rw-r--r--app-text/psiconv/psiconv-0.8.3-r1.ebuild21
-rw-r--r--app-text/psmark/Manifest1
-rw-r--r--app-text/psmark/files/psmark-2.1-Makefile-QA.patch19
-rw-r--r--app-text/psmark/files/psmark-2.1-string.patch15
-rw-r--r--app-text/psmark/metadata.xml10
-rw-r--r--app-text/psmark/psmark-2.1.ebuild33
-rw-r--r--app-text/pspdftool/metadata.xml6
-rw-r--r--app-text/pspdftool/pspdftool-0.03.ebuild32
-rw-r--r--app-text/pspdftool/pspdftool-9999.ebuild37
-rw-r--r--app-text/pspresent/files/pspresent-1.3-makefile.patch39
-rw-r--r--app-text/pspresent/metadata.xml2
-rw-r--r--app-text/pspresent/pspresent-1.3-r1.ebuild41
-rw-r--r--app-text/pspresent/pspresent-1.3-r2.ebuild35
-rw-r--r--app-text/pstotext/metadata.xml2
-rw-r--r--app-text/pstotext/pstotext-1.9-r4.ebuild33
-rw-r--r--app-text/pstotext/pstotext-1.9-r5.ebuild30
-rw-r--r--app-text/psutils/Manifest1
-rw-r--r--app-text/psutils/files/psutils-1.17-clang-implicit-int.patch16
-rw-r--r--app-text/psutils/files/psutils-1.17-ldflags.patch44
-rw-r--r--app-text/psutils/files/psutils-1.17-makefile.patch210
-rw-r--r--app-text/psutils/metadata.xml13
-rw-r--r--app-text/psutils/psutils-1.17-r3.ebuild40
-rw-r--r--app-text/psutils/psutils-1.17-r5.ebuild33
-rw-r--r--app-text/psutils/psutils-2.09.ebuild20
-rw-r--r--app-text/pybookreader/Manifest1
-rw-r--r--app-text/pybookreader/metadata.xml12
-rw-r--r--app-text/pybookreader/pybookreader-0.5.0-r1.ebuild24
-rw-r--r--app-text/pylize/Manifest1
-rw-r--r--app-text/pylize/files/pylize-pillow.patch13
-rw-r--r--app-text/pylize/metadata.xml13
-rw-r--r--app-text/pylize/pylize-1.3b-r1.ebuild46
-rw-r--r--app-text/pytextile/Manifest2
-rw-r--r--app-text/pytextile/metadata.xml14
-rw-r--r--app-text/pytextile/pytextile-2.3.3.ebuild40
-rw-r--r--app-text/pytextile/pytextile-3.0.3.ebuild44
-rw-r--r--app-text/q-text-as-data/Manifest1
-rw-r--r--app-text/q-text-as-data/metadata.xml10
-rw-r--r--app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild41
-rw-r--r--app-text/qpdf/Manifest15
-rw-r--r--app-text/qpdf/metadata.xml7
-rw-r--r--app-text/qpdf/qpdf-11.7.0.ebuild99
-rw-r--r--app-text/qpdf/qpdf-11.8.0.ebuild99
-rw-r--r--app-text/qpdf/qpdf-11.9.0.ebuild99
-rw-r--r--app-text/qpdf/qpdf-7.0.0.ebuild55
-rw-r--r--app-text/qpdf/qpdf-7.1.1.ebuild55
-rw-r--r--app-text/qpdf/qpdf-8.2.1.ebuild57
-rw-r--r--app-text/qpdf/qpdf-8.4.0.ebuild57
-rw-r--r--app-text/qpdf/qpdf-8.4.1.ebuild57
-rw-r--r--app-text/qpdf/qpdf-8.4.2.ebuild57
-rw-r--r--app-text/qpdfview/Manifest4
-rw-r--r--app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch9
-rw-r--r--app-text/qpdfview/metadata.xml6
-rw-r--r--app-text/qpdfview/qpdfview-0.4.16.ebuild86
-rw-r--r--app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild96
-rw-r--r--app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild96
-rw-r--r--app-text/qpdfview/qpdfview-0.5.ebuild89
-rw-r--r--app-text/qtikz/Manifest1
-rw-r--r--app-text/qtikz/metadata.xml13
-rw-r--r--app-text/qtikz/qtikz-0.13.2.ebuild55
-rw-r--r--app-text/queequeg/Manifest1
-rw-r--r--app-text/queequeg/metadata.xml14
-rw-r--r--app-text/queequeg/queequeg-0.91-r2.ebuild51
-rw-r--r--app-text/rarian/Manifest3
-rw-r--r--app-text/rarian/metadata.xml5
-rw-r--r--app-text/rarian/rarian-0.8.1-r3.ebuild65
-rw-r--r--app-text/rarian/rarian-0.8.4.ebuild40
-rw-r--r--app-text/recode/Manifest6
-rw-r--r--app-text/recode/files/recode-3.6-as-if.patch19
-rw-r--r--app-text/recode/files/recode-3.6-gettextfix.diff23
-rw-r--r--app-text/recode/files/recode-3.7.13-no-help2man.patch50
-rw-r--r--app-text/recode/metadata.xml8
-rw-r--r--app-text/recode/recode-3.6_p20-r1.ebuild64
-rw-r--r--app-text/recode/recode-3.7.12-r1.ebuild69
-rw-r--r--app-text/recode/recode-3.7.13.ebuild73
-rw-r--r--app-text/recode/recode-3.7.14.ebuild67
-rw-r--r--app-text/recode/recode-3.7_pre20140303.ebuild41
-rw-r--r--app-text/reed/Manifest1
-rw-r--r--app-text/reed/metadata.xml5
-rw-r--r--app-text/reed/reed-5.4.ebuild33
-rw-r--r--app-text/refbase/metadata.xml2
-rw-r--r--app-text/refbase/refbase-0.9.6_p20180223.ebuild9
-rw-r--r--app-text/referencer/Manifest1
-rw-r--r--app-text/referencer/files/referencer-1.2.2-lib_path.patch21
-rw-r--r--app-text/referencer/metadata.xml15
-rw-r--r--app-text/referencer/referencer-1.2.2-r1.ebuild52
-rw-r--r--app-text/restview/Manifest3
-rw-r--r--app-text/restview/metadata.xml14
-rw-r--r--app-text/restview/restview-2.8.1.ebuild32
-rw-r--r--app-text/restview/restview-2.9.2.ebuild33
-rw-r--r--app-text/restview/restview-3.0.0.ebuild29
-rw-r--r--app-text/rman/files/rman-3.2-format-security.patch5
-rw-r--r--app-text/rman/files/rman-3.2-gentoo.diff19
-rw-r--r--app-text/rman/files/rman-3.2-gentoo.patch18
-rw-r--r--app-text/rman/files/rman-3.2-incompatible-pointer-types.patch24
-rw-r--r--app-text/rman/files/rman-3.2-ldflags.patch6
-rw-r--r--app-text/rman/metadata.xml2
-rw-r--r--app-text/rman/rman-3.2-r1.ebuild20
-rw-r--r--app-text/rman/rman-3.2-r2.ebuild32
-rw-r--r--app-text/rnc2rng/Manifest2
-rw-r--r--app-text/rnc2rng/metadata.xml12
-rw-r--r--app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild24
-rw-r--r--app-text/rnc2rng/rnc2rng-2.7.0.ebuild24
-rw-r--r--app-text/rnv/metadata.xml7
-rw-r--r--app-text/rnv/rnv-1.7.11-r1.ebuild8
-rw-r--r--app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch13
-rw-r--r--app-text/robodoc/metadata.xml8
-rw-r--r--app-text/robodoc/robodoc-4.99.43-r1.ebuild32
-rw-r--r--app-text/robodoc/robodoc-4.99.43.ebuild8
-rw-r--r--app-text/ronn-ng/Manifest2
-rw-r--r--app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch40
-rw-r--r--app-text/ronn-ng/metadata.xml11
-rw-r--r--app-text/ronn-ng/ronn-ng-0.10.1.ebuild52
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild62
-rw-r--r--app-text/ronn/Manifest1
-rw-r--r--app-text/ronn/metadata.xml11
-rw-r--r--app-text/ronn/ronn-0.7.3-r3.ebuild49
-rw-r--r--app-text/rpl/Manifest4
-rw-r--r--app-text/rpl/metadata.xml4
-rw-r--r--app-text/rpl/rpl-1.15.2.ebuild26
-rw-r--r--app-text/rpl/rpl-1.15.5.ebuild37
-rw-r--r--app-text/rpl/rpl-1.5.5-r1.ebuild28
-rw-r--r--app-text/rpl/rpl-1.9.1.ebuild27
-rw-r--r--app-text/rtf2html/metadata.xml2
-rw-r--r--app-text/rtf2html/rtf2html-0.2.0-r1.ebuild23
-rw-r--r--app-text/sablotron/files/1.0.3-libsablot-expat.patch10
-rw-r--r--app-text/sablotron/files/sablotron-1.0.3-cxx11.patch11
-rw-r--r--app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch14
-rw-r--r--app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch8
-rw-r--r--app-text/sablotron/metadata.xml7
-rw-r--r--app-text/sablotron/sablotron-1.0.3-r1.ebuild44
-rw-r--r--app-text/sablotron/sablotron-1.0.3-r2.ebuild56
-rw-r--r--app-text/sablotron/sablotron-1.0.3-r3.ebuild51
-rw-r--r--app-text/sary/Manifest1
-rw-r--r--app-text/sary/metadata.xml16
-rw-r--r--app-text/sary/sary-1.2.0-r1.ebuild41
-rw-r--r--app-text/scdoc/Manifest5
-rw-r--r--app-text/scdoc/metadata.xml14
-rw-r--r--app-text/scdoc/scdoc-1.11.3.ebuild45
-rw-r--r--app-text/scdoc/scdoc-1.3.1.ebuild38
-rw-r--r--app-text/scdoc/scdoc-1.5.2.ebuild43
-rw-r--r--app-text/scdoc/scdoc-1.8.1.ebuild43
-rw-r--r--app-text/scdoc/scdoc-1.9.3-r1.ebuild44
-rw-r--r--app-text/scdoc/scdoc-1.9.3.ebuild43
-rw-r--r--app-text/scdoc/scdoc-9999.ebuild11
-rw-r--r--app-text/scrollkeeper-dtd/metadata.xml3
-rw-r--r--app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild57
-rw-r--r--app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild54
-rw-r--r--app-text/scrollkeeper/metadata.xml8
-rw-r--r--app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild16
-rw-r--r--app-text/sdcv/Manifest2
-rw-r--r--app-text/sdcv/files/sdcv-0.5.3-t_list.patch19
-rw-r--r--app-text/sdcv/files/sdcv-t_list.patch17
-rw-r--r--app-text/sdcv/metadata.xml8
-rw-r--r--app-text/sdcv/sdcv-0.5.2.ebuild73
-rw-r--r--app-text/sdcv/sdcv-0.5.4.ebuild73
-rw-r--r--app-text/sgml-common/metadata.xml7
-rw-r--r--app-text/sgml-common/sgml-common-0.6.3-r6.ebuild79
-rw-r--r--app-text/sgml-common/sgml-common-0.6.3-r7.ebuild93
-rw-r--r--app-text/sgmltools-lite/Manifest2
-rw-r--r--app-text/sgmltools-lite/metadata.xml14
-rw-r--r--app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild92
-rw-r--r--app-text/sgrep/files/sgrep-1.94a-clang16.patch11
-rw-r--r--app-text/sgrep/metadata.xml2
-rw-r--r--app-text/sgrep/sgrep-1.94a-r2.ebuild40
-rw-r--r--app-text/sgrep/sgrep-1.94a.ebuild30
-rw-r--r--app-text/sigil/Manifest6
-rw-r--r--app-text/sigil/metadata.xml11
-rw-r--r--app-text/sigil/sigil-0.9.13.ebuild97
-rw-r--r--app-text/sigil/sigil-0.9.16.ebuild107
-rw-r--r--app-text/sigil/sigil-0.9.17.ebuild107
-rw-r--r--app-text/sigil/sigil-2.0.2-r1.ebuild103
-rw-r--r--app-text/sigil/sigil-2.1.0-r1.ebuild105
-rw-r--r--app-text/silvercity/Manifest1
-rw-r--r--app-text/silvercity/metadata.xml11
-rw-r--r--app-text/silvercity/silvercity-0.9.7-r1.ebuild39
-rw-r--r--app-text/simple-fb2-reader/Manifest2
-rw-r--r--app-text/simple-fb2-reader/metadata.xml2
-rw-r--r--app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild31
-rw-r--r--app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild24
-rw-r--r--app-text/sloccount/files/sloccount-2.26-gentoo.patch66
-rw-r--r--app-text/sloccount/metadata.xml2
-rw-r--r--app-text/sloccount/sloccount-2.26-r3.ebuild56
-rw-r--r--app-text/spellutils/files/spellutils-0.7-nls.patch4
-rw-r--r--app-text/spellutils/metadata.xml2
-rw-r--r--app-text/spellutils/spellutils-0.7.ebuild24
-rw-r--r--app-text/stardict/Manifest4
-rw-r--r--app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch38
-rw-r--r--app-text/stardict/metadata.xml39
-rw-r--r--app-text/stardict/stardict-3.0.6-r3.ebuild204
-rw-r--r--app-text/stardict/stardict-4.0.0_pre20170304.ebuild221
-rw-r--r--app-text/sword-modules/metadata.xml11
-rw-r--r--app-text/sword-modules/sword-modules-1.ebuild163
-rw-r--r--app-text/sword/Manifest3
-rw-r--r--app-text/sword/files/sword-1.7.4-configure.patch23
-rw-r--r--app-text/sword/files/sword-1.7.4-gcc6.patch22
-rw-r--r--app-text/sword/files/sword-1.8.1-icu61.diff138
-rw-r--r--app-text/sword/metadata.xml19
-rw-r--r--app-text/sword/sword-1.7.4-r1.ebuild85
-rw-r--r--app-text/sword/sword-1.8.1-r1.ebuild76
-rw-r--r--app-text/sword/sword-1.9.0-r1.ebuild42
-rw-r--r--app-text/t1utils/Manifest3
-rw-r--r--app-text/t1utils/files/t1utils-1.41-memmem.patch27
-rw-r--r--app-text/t1utils/metadata.xml4
-rw-r--r--app-text/t1utils/t1utils-1.39.ebuild22
-rw-r--r--app-text/t1utils/t1utils-1.41-r1.ebuild18
-rw-r--r--app-text/t1utils/t1utils-1.41-r2.ebuild28
-rw-r--r--app-text/t1utils/t1utils-1.42.ebuild18
-rw-r--r--app-text/tabler/files/tabler-2-fno-common.patch22
-rw-r--r--app-text/tabler/metadata.xml2
-rw-r--r--app-text/tabler/tabler-2-r1.ebuild16
-rw-r--r--app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch5
-rw-r--r--app-text/talkfilters/metadata.xml2
-rw-r--r--app-text/talkfilters/talkfilters-2.3.8-r1.ebuild20
-rw-r--r--app-text/teckit/Manifest2
-rw-r--r--app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch16
-rw-r--r--app-text/teckit/metadata.xml4
-rw-r--r--app-text/teckit/teckit-2.5.10.ebuild44
-rw-r--r--app-text/teckit/teckit-2.5.6.ebuild42
-rw-r--r--app-text/teseq/metadata.xml9
-rw-r--r--app-text/teseq/teseq-1.1.1.ebuild4
-rw-r--r--app-text/tessdata_best/Manifest124
-rw-r--r--app-text/tessdata_best/metadata.xml3
-rw-r--r--app-text/tessdata_best/tessdata_best-4.1.0.ebuild50
-rw-r--r--app-text/tessdata_fast/Manifest124
-rw-r--r--app-text/tessdata_fast/metadata.xml3
-rw-r--r--app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild4
-rw-r--r--app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild50
-rw-r--r--app-text/tessdata_legacy/Manifest126
-rw-r--r--app-text/tessdata_legacy/metadata.xml3
-rw-r--r--app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild55
-rw-r--r--app-text/tesseract/Manifest145
-rw-r--r--app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch74
-rw-r--r--app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch27
-rw-r--r--app-text/tesseract/files/tesseract-4.0.0-manpages.patch49
-rw-r--r--app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch25
-rw-r--r--app-text/tesseract/metadata.xml6
-rw-r--r--app-text/tesseract/tesseract-3.05.01.ebuild148
-rw-r--r--app-text/tesseract/tesseract-3.05.02.ebuild148
-rw-r--r--app-text/tesseract/tesseract-4.0.0.ebuild129
-rw-r--r--app-text/tesseract/tesseract-4.1.0.ebuild83
-rw-r--r--app-text/tesseract/tesseract-5.3.0.ebuild96
-rw-r--r--app-text/tesseract/tesseract-5.3.2.ebuild92
-rw-r--r--app-text/tesseract/tesseract-5.3.3.ebuild92
-rw-r--r--app-text/tesseract/tesseract-5.3.4.ebuild92
-rw-r--r--app-text/tesseract/tesseract-9999.ebuild113
-rw-r--r--app-text/texi2html/metadata.xml13
-rw-r--r--app-text/texi2html/texi2html-5.0-r1.ebuild32
-rw-r--r--app-text/texlive-core/Manifest565
-rw-r--r--app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch34
-rw-r--r--app-text/texlive-core/files/texlive-core-2021-clang-16.patch221
-rw-r--r--app-text/texlive-core/files/texlive-core-2021-slibtool.patch98
-rw-r--r--app-text/texlive-core/metadata.xml9
-rw-r--r--app-text/texlive-core/texlive-core-2017-r4.ebuild372
-rw-r--r--app-text/texlive-core/texlive-core-2019-r4.ebuild353
-rw-r--r--app-text/texlive-core/texlive-core-2021-r6.ebuild388
-rw-r--r--app-text/texlive-core/texlive-core-2021-r7.ebuild397
-rw-r--r--app-text/texlive-core/texlive-core-2023-r1.ebuild487
-rw-r--r--app-text/texlive-core/texlive-core-2023-r6.ebuild485
-rw-r--r--app-text/texlive/metadata.xml7
-rw-r--r--app-text/texlive/texlive-2017.ebuild163
-rw-r--r--app-text/texlive/texlive-2019.ebuild163
-rw-r--r--app-text/texlive/texlive-2021-r1.ebuild137
-rw-r--r--app-text/texlive/texlive-2023.ebuild133
-rw-r--r--app-text/tidy-html5/Manifest1
-rw-r--r--app-text/tidy-html5/metadata.xml11
-rw-r--r--app-text/tidy-html5/tidy-html5-5.6.0.ebuild25
-rw-r--r--app-text/tkinfo/metadata.xml2
-rw-r--r--app-text/tkinfo/tkinfo-2.8-r1.ebuild30
-rw-r--r--app-text/tkinfo/tkinfo-2.8-r2.ebuild25
-rw-r--r--app-text/tkman/metadata.xml2
-rw-r--r--app-text/tkman/tkman-2.2-r1.ebuild40
-rw-r--r--app-text/tkman/tkman-2.2-r3.ebuild38
-rw-r--r--app-text/tofrodos/Manifest1
-rw-r--r--app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch17
-rw-r--r--app-text/tofrodos/metadata.xml2
-rw-r--r--app-text/tofrodos/tofrodos-1.7.12a.ebuild35
-rw-r--r--app-text/tokyodystopia/files/fix_ldconfig.patch2
-rw-r--r--app-text/tokyodystopia/files/fix_rpath.patch15
-rw-r--r--app-text/tokyodystopia/files/remove_docinst.patch2
-rw-r--r--app-text/tokyodystopia/metadata.xml2
-rw-r--r--app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild22
-rw-r--r--app-text/trang/Manifest2
-rw-r--r--app-text/trang/files/trang-20181222-build-fixes.patch31
-rw-r--r--app-text/trang/files/trang-20181222-unicode-data-path.patch15
-rw-r--r--app-text/trang/metadata.xml2
-rw-r--r--app-text/trang/trang-20151127.ebuild79
-rw-r--r--app-text/trang/trang-20181222.ebuild85
-rw-r--r--app-text/tree/Manifest4
-rw-r--r--app-text/tree/metadata.xml6
-rw-r--r--app-text/tree/tree-1.7.0-r1.ebuild42
-rw-r--r--app-text/tree/tree-1.7.0.ebuild41
-rw-r--r--app-text/tree/tree-1.8.0.ebuild42
-rw-r--r--app-text/tree/tree-2.1.0.ebuild31
-rw-r--r--app-text/tree/tree-2.1.1.ebuild31
-rw-r--r--app-text/ttf2pk2/Manifest6
-rw-r--r--app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch23
-rw-r--r--app-text/ttf2pk2/metadata.xml2
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild43
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild40
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild51
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild40
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild35
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild31
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild33
-rw-r--r--app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff15
-rw-r--r--app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch2
-rw-r--r--app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch5
-rw-r--r--app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch61
-rw-r--r--app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch5
-rw-r--r--app-text/ttf2pt1/metadata.xml2
-rw-r--r--app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild39
-rw-r--r--app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild52
-rw-r--r--app-text/txt2man/Manifest3
-rw-r--r--app-text/txt2man/metadata.xml14
-rw-r--r--app-text/txt2man/txt2man-1.5.6.ebuild24
-rw-r--r--app-text/txt2man/txt2man-1.6.0.ebuild26
-rw-r--r--app-text/txt2man/txt2man-1.7.1.ebuild25
-rw-r--r--app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch10
-rw-r--r--app-text/txt2pdbdoc/metadata.xml2
-rw-r--r--app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild15
-rw-r--r--app-text/txt2tags/Manifest2
-rw-r--r--app-text/txt2tags/files/51txt2tags-gentoo.el6
-rw-r--r--app-text/txt2tags/metadata.xml9
-rw-r--r--app-text/txt2tags/txt2tags-2.6-r1.ebuild80
-rw-r--r--app-text/txt2tags/txt2tags-3.9.ebuild21
-rw-r--r--app-text/u2ps/Manifest2
-rw-r--r--app-text/u2ps/files/u2ps-1.1-nostrip.patch14
-rw-r--r--app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch13
-rw-r--r--app-text/u2ps/metadata.xml3
-rw-r--r--app-text/u2ps/u2ps-0.8.4.ebuild43
-rw-r--r--app-text/u2ps/u2ps-1.2.ebuild34
-rw-r--r--app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch10
-rw-r--r--app-text/unac/metadata.xml2
-rw-r--r--app-text/unac/unac-1.8.0.ebuild34
-rw-r--r--app-text/unpaper/Manifest2
-rw-r--r--app-text/unpaper/metadata.xml12
-rw-r--r--app-text/unpaper/unpaper-6.1-r1.ebuild36
-rw-r--r--app-text/unpaper/unpaper-7.0.0.ebuild31
-rw-r--r--app-text/unpaper/unpaper-9999.ebuild35
-rw-r--r--app-text/unrtf/Manifest1
-rw-r--r--app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch6
-rw-r--r--app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch10
-rw-r--r--app-text/unrtf/metadata.xml11
-rw-r--r--app-text/unrtf/unrtf-0.21.10.ebuild4
-rw-r--r--app-text/unrtf/unrtf-0.21.9.ebuild25
-rw-r--r--app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch36
-rw-r--r--app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch134
-rw-r--r--app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff12
-rw-r--r--app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch11
-rw-r--r--app-text/uudeview/files/uudeview-0.5.20-makefile.patch4
-rw-r--r--app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch24
-rw-r--r--app-text/uudeview/metadata.xml6
-rw-r--r--app-text/uudeview/uudeview-0.5.20-r2.ebuild36
-rw-r--r--app-text/uudeview/uudeview-0.5.20-r3.ebuild43
-rw-r--r--app-text/uudeview/uudeview-0.5.20-r4.ebuild44
-rw-r--r--app-text/vgrep/Manifest2
-rw-r--r--app-text/vgrep/metadata.xml9
-rw-r--r--app-text/vgrep/vgrep-2.6.0.ebuild30
-rw-r--r--app-text/vgrep/vgrep-2.7.0.ebuild35
-rw-r--r--app-text/vilistextum/Manifest2
-rw-r--r--app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch113
-rw-r--r--app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch23
-rw-r--r--app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff22
-rw-r--r--app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch27
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch27
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch12
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch120
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch43
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch12
-rw-r--r--app-text/vilistextum/metadata.xml2
-rw-r--r--app-text/vilistextum/vilistextum-2.6.9-r1.ebuild76
-rw-r--r--app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild85
-rw-r--r--app-text/vlna/Manifest1
-rw-r--r--app-text/vlna/metadata.xml8
-rw-r--r--app-text/vlna/vlna-1.5.ebuild24
-rw-r--r--app-text/wdiff/metadata.xml5
-rw-r--r--app-text/wdiff/wdiff-1.2.2-r1.ebuild34
-rw-r--r--app-text/wdiff/wdiff-1.2.2-r2.ebuild38
-rw-r--r--app-text/wdiff/wdiff-1.2.2.ebuild33
-rw-r--r--app-text/webgen/Manifest3
-rw-r--r--app-text/webgen/metadata.xml5
-rw-r--r--app-text/webgen/webgen-1.5.2.ebuild48
-rw-r--r--app-text/webgen/webgen-1.7.2.ebuild58
-rw-r--r--app-text/webgen/webgen-1.7.3.ebuild59
-rw-r--r--app-text/wgetpaste/Manifest4
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch39
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch69
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch61
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch95
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch31
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch171
-rw-r--r--app-text/wgetpaste/files/wgetpaste-2.33-tests.patch83
-rw-r--r--app-text/wgetpaste/files/wgetpaste-remove-dead.patch35
-rw-r--r--app-text/wgetpaste/metadata.xml19
-rw-r--r--app-text/wgetpaste/wgetpaste-2.28-r2.ebuild29
-rw-r--r--app-text/wgetpaste/wgetpaste-2.29.ebuild27
-rw-r--r--app-text/wgetpaste/wgetpaste-2.33-r3.ebuild62
-rw-r--r--app-text/wgetpaste/wgetpaste-2.33-r5.ebuild66
-rw-r--r--app-text/wgetpaste/wgetpaste-2.34.ebuild56
-rw-r--r--app-text/wiki2beamer/Manifest1
-rw-r--r--app-text/wiki2beamer/metadata.xml3
-rw-r--r--app-text/wiki2beamer/wiki2beamer-0.10.0-r2.ebuild44
-rw-r--r--app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild45
-rw-r--r--app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild45
-rw-r--r--app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild39
-rw-r--r--app-text/winefish/Manifest1
-rw-r--r--app-text/winefish/files/winefish-1.3.3-desktop.patch11
-rw-r--r--app-text/winefish/files/winefish-1.3.3-doc.patch13
-rw-r--r--app-text/winefish/files/winefish-1.3.3-memset.patch11
-rw-r--r--app-text/winefish/files/winefish-1.3.3-nostrip.patch11
-rw-r--r--app-text/winefish/files/winefish-1.3.3-version.patch11
-rw-r--r--app-text/winefish/metadata.xml11
-rw-r--r--app-text/winefish/winefish-1.3.3-r2.ebuild53
-rw-r--r--app-text/wklej/Manifest1
-rw-r--r--app-text/wklej/metadata.xml12
-rw-r--r--app-text/wklej/wklej-0.2.1-r1.ebuild36
-rw-r--r--app-text/writerperfect/metadata.xml2
-rw-r--r--app-text/writerperfect/writerperfect-0.9.6.ebuild4
-rw-r--r--app-text/wscr/metadata.xml14
-rw-r--r--app-text/wscr/wscr-1.2-r1.ebuild29
-rw-r--r--app-text/wscr/wscr-1.2-r2.ebuild29
-rw-r--r--app-text/wv/files/wv-1.2.9-C99-decls.patch101
-rw-r--r--app-text/wv/metadata.xml2
-rw-r--r--app-text/wv/wv-1.2.9-r2.ebuild62
-rw-r--r--app-text/wv/wv-1.2.9-r3.ebuild67
-rw-r--r--app-text/wv2/metadata.xml2
-rw-r--r--app-text/wv2/wv2-0.4.2-r2.ebuild39
-rw-r--r--app-text/wv2/wv2-0.4.2-r3.ebuild39
-rw-r--r--app-text/xapers/Manifest3
-rw-r--r--app-text/xapers/metadata.xml14
-rw-r--r--app-text/xapers/xapers-0.8.2.ebuild27
-rw-r--r--app-text/xapers/xapers-0.9.0.ebuild33
-rw-r--r--app-text/xapers/xapers-0.9.2.ebuild36
-rw-r--r--app-text/xapian-omega/Manifest12
-rw-r--r--app-text/xapian-omega/metadata.xml7
-rw-r--r--app-text/xapian-omega/xapian-omega-1.2.25.ebuild45
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.10.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.11.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.12.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.22.ebuild43
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.23.ebuild43
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.24.ebuild43
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.25.ebuild43
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.5.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.7.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.8.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.9.ebuild42
-rw-r--r--app-text/xchm/Manifest4
-rw-r--r--app-text/xchm/files/xchm-1.23-wx3.0-compat.patch32
-rw-r--r--app-text/xchm/metadata.xml10
-rw-r--r--app-text/xchm/xchm-1.23-r1.ebuild50
-rw-r--r--app-text/xchm/xchm-1.29.ebuild59
-rw-r--r--app-text/xchm/xchm-1.30.ebuild56
-rw-r--r--app-text/xchm/xchm-1.36.ebuild48
-rw-r--r--app-text/xchm/xchm-9999.ebuild57
-rw-r--r--app-text/xdvik/Manifest3
-rw-r--r--app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch23
-rw-r--r--app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch40
-rw-r--r--app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch51
-rw-r--r--app-text/xdvik/metadata.xml2
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r1.ebuild109
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r2.ebuild116
-rw-r--r--app-text/xdvik/xdvik-22.87.06-r1.ebuild121
-rw-r--r--app-text/xhtml1/metadata.xml7
-rw-r--r--app-text/xhtml1/xhtml1-20020801-r5.ebuild80
-rw-r--r--app-text/xhtml1/xhtml1-20020801-r6.ebuild80
-rw-r--r--app-text/xhtml11/Manifest1
-rw-r--r--app-text/xhtml11/metadata.xml8
-rw-r--r--app-text/xhtml11/xhtml11-20101123.ebuild62
-rw-r--r--app-text/xindy/Manifest1
-rw-r--r--app-text/xindy/files/xindy-2.4-configure.patch21
-rw-r--r--app-text/xindy/files/xindy-2.4-locale.patch22
-rw-r--r--app-text/xindy/files/xindy-2.4-nogrep.patch13
-rw-r--r--app-text/xindy/files/xindy-2.4-perl5.26.patch11
-rw-r--r--app-text/xindy/metadata.xml25
-rw-r--r--app-text/xindy/xindy-2.4-r1.ebuild45
-rw-r--r--app-text/xiphos/Manifest4
-rw-r--r--app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch11
-rw-r--r--app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch10
-rw-r--r--app-text/xiphos/files/xiphos-4.2.1-webkit41.patch20
-rw-r--r--app-text/xiphos/metadata.xml9
-rw-r--r--app-text/xiphos/xiphos-4.0.6a-r1.ebuild91
-rw-r--r--app-text/xiphos/xiphos-4.1.0-r1.ebuild89
-rw-r--r--app-text/xiphos/xiphos-4.2.1-r2.ebuild73
-rw-r--r--app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch10
-rw-r--r--app-text/xlhtml/metadata.xml2
-rw-r--r--app-text/xlhtml/xlhtml-0.5.1_p6.ebuild18
-rw-r--r--app-text/xlsx2csv/Manifest3
-rw-r--r--app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch13
-rw-r--r--app-text/xlsx2csv/metadata.xml23
-rw-r--r--app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild27
-rw-r--r--app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild27
-rw-r--r--app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild34
-rw-r--r--app-text/xml2/metadata.xml2
-rw-r--r--app-text/xml2/xml2-0.5.ebuild9
-rw-r--r--app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch18
-rw-r--r--app-text/xml2doc/files/xml2doc-20030510-makefile.patch100
-rw-r--r--app-text/xml2doc/metadata.xml2
-rw-r--r--app-text/xml2doc/xml2doc-20030510-r1.ebuild59
-rw-r--r--app-text/xml2doc/xml2doc-20030510-r2.ebuild56
-rw-r--r--app-text/xml2rfc/Manifest2
-rw-r--r--app-text/xml2rfc/metadata.xml12
-rw-r--r--app-text/xml2rfc/xml2rfc-3.17.4.ebuild51
-rw-r--r--app-text/xml2rfc/xml2rfc-3.18.0.ebuild51
-rw-r--r--app-text/xmldiff/Manifest4
-rw-r--r--app-text/xmldiff/metadata.xml10
-rw-r--r--app-text/xmldiff/xmldiff-0.6.10-r2.ebuild19
-rw-r--r--app-text/xmldiff/xmldiff-1.1.1.ebuild23
-rw-r--r--app-text/xmldiff/xmldiff-2.4.ebuild24
-rw-r--r--app-text/xmldiff/xmldiff-2.6.3.ebuild27
-rw-r--r--app-text/xmlformat/metadata.xml2
-rw-r--r--app-text/xmlformat/xmlformat-1.04.ebuild48
-rw-r--r--app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch32
-rw-r--r--app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch59
-rw-r--r--app-text/xmlstarlet/metadata.xml2
-rw-r--r--app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild59
-rw-r--r--app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild60
-rw-r--r--app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild44
-rw-r--r--app-text/xmlto/files/xmlto-0.0.28-allow-links.patch15
-rw-r--r--app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch37
-rw-r--r--app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch116
-rw-r--r--app-text/xmlto/metadata.xml13
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r1.ebuild45
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r11.ebuild60
-rw-r--r--app-text/xmltoman/Manifest2
-rw-r--r--app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch55
-rw-r--r--app-text/xmltoman/metadata.xml9
-rw-r--r--app-text/xmltoman/xmltoman-0.4-r2.ebuild29
-rw-r--r--app-text/xmltoman/xmltoman-0.6.ebuild33
-rw-r--r--app-text/xournal/Manifest1
-rw-r--r--app-text/xournal/files/xournal-0.4.8-c99-fix.patch89
-rw-r--r--app-text/xournal/metadata.xml2
-rw-r--r--app-text/xournal/xournal-0.4.8-r1.ebuild61
-rw-r--r--app-text/xournal/xournal-0.4.8.2016-r1.ebuild62
-rw-r--r--app-text/xournal/xournal-0.4.8.2016.ebuild59
-rw-r--r--app-text/xournal/xournal-0.4.8.ebuild54
-rw-r--r--app-text/xournal/xournal-9999.ebuild29
-rw-r--r--app-text/xournalpp/Manifest2
-rw-r--r--app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch53
-rw-r--r--app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch31
-rw-r--r--app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch12
-rw-r--r--app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch14
-rw-r--r--app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch13
-rw-r--r--app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch36
-rw-r--r--app-text/xournalpp/metadata.xml10
-rw-r--r--app-text/xournalpp/xournalpp-1.1.3-r2.ebuild57
-rw-r--r--app-text/xournalpp/xournalpp-1.2.3.ebuild56
-rw-r--r--app-text/xournalpp/xournalpp-9999.ebuild56
-rw-r--r--app-text/xpdf/Manifest11
-rw-r--r--app-text/xpdf/files/xpdf-4.04-font-paths.patch48
-rw-r--r--app-text/xpdf/files/xpdf-4.04-libpaper-2.patch14
-rw-r--r--app-text/xpdf/files/xpdf.desktop104
-rw-r--r--app-text/xpdf/metadata.xml8
-rw-r--r--app-text/xpdf/xpdf-4.01.01.ebuild113
-rw-r--r--app-text/xpdf/xpdf-4.04-r1.ebuild162
-rw-r--r--app-text/xpdf/xpdf-4.04-r2.ebuild163
-rw-r--r--app-text/yelp-tools/Manifest3
-rw-r--r--app-text/yelp-tools/metadata.xml13
-rw-r--r--app-text/yelp-tools/yelp-tools-3.18.0.ebuild26
-rw-r--r--app-text/yelp-tools/yelp-tools-3.28.0.ebuild25
-rw-r--r--app-text/yelp-tools/yelp-tools-42.1.ebuild34
-rw-r--r--app-text/yodl/Manifest4
-rw-r--r--app-text/yodl/metadata.xml7
-rw-r--r--app-text/yodl/yodl-4.01.00.ebuild47
-rw-r--r--app-text/yodl/yodl-4.02.00.ebuild48
-rw-r--r--app-text/yodl/yodl-4.02.01.ebuild48
-rw-r--r--app-text/yodl/yodl-4.03.00.ebuild62
-rw-r--r--app-text/zathura-cb/Manifest3
-rw-r--r--app-text/zathura-cb/metadata.xml11
-rw-r--r--app-text/zathura-cb/zathura-cb-0.1.10.ebuild34
-rw-r--r--app-text/zathura-cb/zathura-cb-0.1.8.ebuild30
-rw-r--r--app-text/zathura-cb/zathura-cb-0.1.9.ebuild43
-rw-r--r--app-text/zathura-cb/zathura-cb-9999.ebuild20
-rw-r--r--app-text/zathura-djvu/Manifest2
-rw-r--r--app-text/zathura-djvu/metadata.xml27
-rw-r--r--app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild40
-rw-r--r--app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild30
-rw-r--r--app-text/zathura-djvu/zathura-djvu-9999.ebuild18
-rw-r--r--app-text/zathura-meta/metadata.xml2
-rw-r--r--app-text/zathura-pdf-mupdf/Manifest3
-rw-r--r--app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch39
-rw-r--r--app-text/zathura-pdf-mupdf/metadata.xml17
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild39
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild46
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild46
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild35
-rw-r--r--app-text/zathura-pdf-poppler/Manifest3
-rw-r--r--app-text/zathura-pdf-poppler/metadata.xml26
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild38
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild38
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild38
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild12
-rw-r--r--app-text/zathura-ps/Manifest2
-rw-r--r--app-text/zathura-ps/metadata.xml7
-rw-r--r--app-text/zathura-ps/zathura-ps-0.2.6.ebuild31
-rw-r--r--app-text/zathura-ps/zathura-ps-0.2.7.ebuild39
-rw-r--r--app-text/zathura-ps/zathura-ps-9999.ebuild18
-rw-r--r--app-text/zathura/Manifest5
-rw-r--r--app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch22
-rw-r--r--app-text/zathura/files/zathura-disable-seccomp-tests.patch22
-rw-r--r--app-text/zathura/metadata.xml18
-rw-r--r--app-text/zathura/zathura-0.4.3.ebuild57
-rw-r--r--app-text/zathura/zathura-0.5.2-r4.ebuild68
-rw-r--r--app-text/zathura/zathura-0.5.2-r5.ebuild72
-rw-r--r--app-text/zathura/zathura-0.5.4.ebuild74
-rw-r--r--app-text/zathura/zathura-9999.ebuild72
-rw-r--r--app-text/zeal/Manifest1
-rw-r--r--app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch26
-rw-r--r--app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch25
-rw-r--r--app-text/zeal/metadata.xml8
-rw-r--r--app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild53
-rw-r--r--app-text/zotero-bin/Manifest6
-rw-r--r--app-text/zotero-bin/metadata.xml12
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.27.ebuild87
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.30.ebuild87
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.35.ebuild87
1996 files changed, 41104 insertions, 35894 deletions
diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
new file mode 100644
index 000000000000..3b98813d5a1e
--- /dev/null
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR="SHLOMIF"
+DIST_VERSION="0.1003"
+inherit perl-module
+
+DESCRIPTION="A Perl-based tool to Render DocBook/XML"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
+
+RDEPEND="dev-perl/Class-XSAccessor
+ virtual/perl-Getopt-Long
+ virtual/perl-File-Path
+ dev-perl/Path-Tiny
+ dev-perl/Test-Trap"
+BDEPEND="dev-perl/Module-Build
+ test? (
+ virtual/perl-File-Spec
+ )"
diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest
new file mode 100644
index 000000000000..849539845897
--- /dev/null
+++ b/app-text/App-XML-DocBook-Builder/Manifest
@@ -0,0 +1 @@
+DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb
diff --git a/app-text/App-XML-DocBook-Builder/metadata.xml b/app-text/App-XML-DocBook-Builder/metadata.xml
new file mode 100644
index 000000000000..0fb423f06844
--- /dev/null
+++ b/app-text/App-XML-DocBook-Builder/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">shlomif/docmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/NaturalDocs/Manifest b/app-text/NaturalDocs/Manifest
new file mode 100644
index 000000000000..15d3dd0bf7d3
--- /dev/null
+++ b/app-text/NaturalDocs/Manifest
@@ -0,0 +1 @@
+DIST NaturalDocs-1.52.zip 460793 BLAKE2B d4ecd8bb8dd3fa92a8d9366077c65ddd70e9c4944519cb453e0752e2df0ed22d7fe23aa1edb1e63ffea16b0d0f56794d50a6a0520b2b91f0193a83326ac34c5b SHA512 45d79dd2bf55a8cb7356eb5321a8c99cbab9d69a4d9a97033737090df2bfd86ee7a058a03016646c7fd6f20daf6523b2d77cd2248a7503a6c5c22684f08431c1
diff --git a/app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild b/app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild
new file mode 100644
index 000000000000..3c51d42cd125
--- /dev/null
+++ b/app-text/NaturalDocs/NaturalDocs-1.52-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Extensible, multi-language source code documentation generator"
+HOMEPAGE="http://www.naturaldocs.org/"
+SRC_URI="mirror://sourceforge/naturaldocs/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+
+BDEPEND="app-arch/unzip"
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r Styles Info JavaScript
+
+ insinto /etc/${PN}
+ doins -r Config/.
+ dosym ../../../etc/${PN} /usr/share/${PN}/Config
+
+ perl_set_version
+ insinto ${VENDOR_LIB}
+ doins -r Modules/NaturalDocs
+ dodir /usr/share/${PN}/Modules
+ dosym ../../../..${VENDOR_LIB}/NaturalDocs /usr/share/${PN}/Modules/NaturalDocs
+
+ exeinto /usr/share/${PN}
+ doexe ${PN}
+
+ # Symlink the Perl script into /usr/bin
+ dodir /usr/bin
+ dosym ../share/${PN}/${PN} /usr/bin/${PN}
+
+ # Documentation
+ dodoc -r Help/.
+ dosym ../doc/${PF}/html /usr/share/${PN}/Help
+}
+
+pkg_preinst() {
+ if [[ -e /usr/share/${PN}/Config && ! -L /usr/share/${PN}/Config ]] ; then
+ mkdir -p /etc/${PN}
+ mv /usr/share/${PN}/Config/* /etc/${PN}/
+ rm -rf /usr/share/${PN}/Config
+ fi
+}
diff --git a/app-text/NaturalDocs/metadata.xml b/app-text/NaturalDocs/metadata.xml
new file mode 100644
index 000000000000..54582d69c8da
--- /dev/null
+++ b/app-text/NaturalDocs/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <longdescription>
+ Natural Docs is an open-source, extensible, multi-language
+ documentation generator. It extracts specially formatted comments
+ from source code and builds HTML documentation from it. The syntax
+ is transparent so that the comments in the source code read just as
+ easily as the generated documentation. It also focuses on automation
+ and high-quality generated output.
+ </longdescription>
+ <maintainer type="person">
+ <email>titanofold@gentoo.org</email>
+ <name>Aaron W. Swenson</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">naturaldocs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
deleted file mode 100644
index 509e1b8e5563..000000000000
--- a/app-text/XML-Schema-learner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
deleted file mode 100644
index b4d56e1a79ba..000000000000
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
-HOMEPAGE="https://github.com/kore/${PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# PHP dependency can be inferred from .travis.yml in the repository.
-# The necessary USE flags on the other hand were found the hard way.
-#
-# The dependencies here aren't as expressive as they should be. What we
-# really want is for php[...] to apply to everything in PHP_TARGETS, and
-# for those interpreters (the ones in PHP_TARGETS) to be used to run the
-# test suite.
-#
-# See bug #497606.
-#
-RDEPEND="dev-lang/php:*[cli,xml,xmlreader]"
-DEPEND="test? ( ${RDEPEND}
- dev-php/phpunit )"
-
-src_compile() {
- # Don't run make, the default target is 'check'.
- :
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
- dodoc README.rst
-}
diff --git a/app-text/XML-Schema-learner/metadata.xml b/app-text/XML-Schema-learner/metadata.xml
deleted file mode 100644
index a1b8a8d91692..000000000000
--- a/app-text/XML-Schema-learner/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>mjo@gentoo.org</email>
- </maintainer>
- <longdescription>
- This software implements various state-of-the-art algorithms for
- algorithmic learning of XML Schema definitions and Document Type
- Definitions.
-
- Given a set or a single XML instance it can algorithmically infer
- a schema which describes the XML instances. The resulting schemas
- are of high-quality and human readable.
-
- The theory behind the project is described in Kore Nordmann's
- thesis, "Algorithmic learning of XML Schema definitions from XML
- data," available at
- http://kore-nordmann.de/talks/11_03_learning_xml_schema_definitions_from_xml_data.pdf.
- </longdescription>
- <upstream>
- <remote-id type="github">kore/XML-Schema-learner</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index a77cfa5fe179..1038254cb39a 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,2 +1,2 @@
-DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
-DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
+DIST a2ps-4.15.5.tar.gz 3571724 BLAKE2B 7c352b72c537f8519cafb7993595d902e1dfeae49207936c365b0ea3813ffff973c5f5e2bb63a4cffa3c665990d95c8a8e339c87d9eac25fa24e364b8b705bae SHA512 e9953659139a46aed46e190d5485382a9e396ae8bbbe59edb78ab3110e7839a764e3cb6ff94f5f36e6e91fcaf85f6352376e0b4a0e0141f24e098fa334b5015e
+DIST a2ps-4.15.6.tar.gz 3605392 BLAKE2B 64f79e26ef116836508c94f0e846f2d242fbb551e9324f339dcc2f8c8cedfad0a708bf10a74cb8e45dad14e1390f4adfb8763618b24794b9cdf77202ebfee33f SHA512 23d054a2e58c28460c5e23a1cf3f0f9c27faffc9a99781c42c11cc0693eea5bb8cfe090a97b9bae3d80cfae6b4d5b9a30dfd997a2d70be2d25988c714ad14b44
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
deleted file mode 100644
index 8d73b88d0665..000000000000
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools elisp-common flag-o-matic
-
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="https://www.gnu.org/software/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
- cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
-
-RESTRICT=test
-
-RDEPEND="app-text/ghostscript-gpl
- app-text/libpaper
- >=app-text/psutils-1.17
- app-text/wdiff
- emacs? ( virtual/emacs )
- latex? ( virtual/latex-base )
- nls? ( virtual/libintl )
- userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
- userland_BSD? ( sys-freebsd/freebsd-ubin )"
-DEPEND="${RDEPEND}
- >=dev-util/gperf-2.7.2
- virtual/yacc
- nls? ( sys-devel/gettext )"
-
-SITEFILE=50${PN}-gentoo.el
-
-S=${WORKDIR}/${PN}-${PV:0:4}
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
- use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
- if use cjk; then
- eapply "${WORKDIR}"/${P}-ja_nls.patch
- # bug #335803
- eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
- else
- eapply "${FILESDIR}"/${P}-cleanup.patch
- fi
-
- # fix fnmatch replacement, bug #134546
- eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
-
- # bug #122026
- eapply "${FILESDIR}"/${P}-psset.patch
-
- # fix emacs printing, bug #114627
- eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
-
- # fix chmod error, #167670
- eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
-
- # add configure check for mempcpy, bug 216588
- eapply "${FILESDIR}"/${P}-check-mempcpy.patch
-
- # fix compilation error due to invalid stpcpy() prototype, bug 216588
- eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
-
- # fix compilation error due to obstack.h issue, bug 269638
- eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
-
- # fix compilation error due to texinfo 5.x, bug 482748
- eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
-
- # fix CVE-2014-0466, bug 506352
- eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch
-
- # fix CVE-2001-1593, bug 507024
- eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
-
- # fix building with sys-devel/automake >= 1.12, bug 420503
- rm -f {.,ogonkify}/aclocal.m4 || die
- sed -i \
- -e '/^AM_C_PROTOTYPES/d' \
- -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
- configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -DPROTOTYPES #420503
-
- local myconf="COM_netscape=no COM_acroread=no"
-
- use emacs || myconf="${myconf} EMACS=no"
- use latex || myconf="${myconf} COM_latex=no"
-
- export LANG=C LC_ALL=C
-
- econf \
- --enable-shared \
- $(use_enable static-libs static) \
- --sysconfdir="${EPREFIX}"/etc/a2ps \
- $(use_enable nls) \
- ${myconf}
-}
-
-src_compile() {
- # parallel make b0rked
- emake -j1
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- lispdir="${EPREFIX}${SITELISP}"/${PN} \
- install
-
- newdoc "${ED}"/usr/share/a2ps/README README.a2ps
- newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
- newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
-
- rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
-
- prune_libtool_files
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/app-text/a2ps/a2ps-4.15.5-r1.ebuild b/app-text/a2ps/a2ps-4.15.5-r1.ebuild
new file mode 100644
index 000000000000..4284c506a705
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.15.5-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="https://www.gnu.org/software/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cjk emacs latex nls static-libs vanilla"
+
+# a2ps-lpr-wrapper needs bash
+RDEPEND="
+ app-text/ghostscript-gpl
+ app-text/libpaper:=
+ >=app-text/psutils-1.17
+ app-text/wdiff
+ app-shells/bash:*
+ dev-libs/boehm-gc
+ >=sys-apps/coreutils-6.10-r1
+ emacs? ( >=app-editors/emacs-23.1:* )
+ latex? ( virtual/latex-base )
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ >=dev-util/gperf-2.7.2
+ nls? ( sys-devel/gettext )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.15-lpr-wrapper.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # gnulib FPs
+ MIN alignof static_assert
+)
+
+src_prepare() {
+ default
+
+ use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ export LANG=C LC_ALL=C
+
+ econf \
+ --cache-file="${S}"/config.cache \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --sysconfdir="${EPREFIX}"/etc/a2ps \
+ $(use_enable nls) \
+ COM_netscape=no \
+ COM_acroread=no \
+ $(usev !latex COM_latex=no) \
+ $(usev !emacs EMACS=no)
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ lispdir="${EPREFIX}${SITELISP}"/${PN} \
+ install
+
+ newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+ newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+ newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+ rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+ find "${ED}" -name '*.la' -delete || die
+
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/a2ps-4.15.6.ebuild b/app-text/a2ps/a2ps-4.15.6.ebuild
new file mode 100644
index 000000000000..f9ae315b9f23
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.15.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="https://www.gnu.org/software/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cjk emacs latex nls static-libs vanilla"
+
+# a2ps-lpr-wrapper needs bash
+RDEPEND="
+ app-text/ghostscript-gpl
+ app-text/libpaper:=
+ >=app-text/psutils-1.17
+ app-text/wdiff
+ app-shells/bash:*
+ dev-libs/boehm-gc
+ >=sys-apps/coreutils-6.10-r1
+ emacs? ( >=app-editors/emacs-23.1:* )
+ latex? ( virtual/latex-base )
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/yacc
+ >=dev-util/gperf-2.7.2
+ nls? ( sys-devel/gettext )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # gnulib FPs
+ MIN alignof static_assert
+)
+
+src_prepare() {
+ default
+
+ use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ export LANG=C LC_ALL=C
+
+ econf \
+ --cache-file="${S}"/config.cache \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ --sysconfdir="${EPREFIX}"/etc/a2ps \
+ $(use_enable nls) \
+ COM_netscape=no \
+ COM_acroread=no \
+ $(usev !latex COM_latex=no) \
+ $(usev !emacs EMACS=no)
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ lispdir="${EPREFIX}${SITELISP}"/${PN} \
+ install
+
+ einstalldocs
+
+ newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+ newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+ newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+ rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+ find "${ED}" -name '*.la' -delete || die
+
+ use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
deleted file mode 100644
index e0c61124e9df..000000000000
--- a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
---- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200
-+++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200
-@@ -20,7 +20,7 @@
- --include=$(basename $@).x \
- --include=common.x \
- $(executable) > $@-t || exit 1; \
-- chmod -w $@-t || exit 1; \
-+ chmod a-w $@-t || exit 1; \
- rm -f $@ || exit 1; \
- mv $@-t $@ || exit 1; \
- else \
diff --git a/app-text/a2ps/files/a2ps-4.13-stdout.diff b/app-text/a2ps/files/a2ps-4.13-stdout.diff
deleted file mode 100644
index 1e40e618fcbd..000000000000
--- a/app-text/a2ps/files/a2ps-4.13-stdout.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/printers.c.orig Tue Oct 12 00:01:59 1999
-+++ lib/printers.c Wed May 2 11:23:25 2001
-@@ -315,8 +315,8 @@
- res->ppd = NULL; /* Printer's ppd are not read yet */
-
- /* Output */
-- /* Default is to send to default printer */
-- res->flag_output_is_printer = true;
-+ /* Default is to send to stdout */
-+ res->flag_output_is_printer = false;
- res->flag_output_name = NULL;
- res->output_is_file = true;
- res->output_name = NULL;
diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
deleted file mode 100644
index f1cd5d9ebdfc..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-emacs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100
-+++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100
-@@ -93,6 +93,7 @@
- (concat "--center-title=" name)
- (concat "--footer=" (concat name " Emacs buffer"))
- (concat "--pretty-print=" filetype)
-+ (concat "-d")
- ;Uncommenting the following gives a print preview (only):
- ; (concat "--output=/tmp/foo.ps")
- )
diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
deleted file mode 100644
index c49ab78c93c0..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
---- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600
-+++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500
-@@ -27,18 +27,6 @@
- #include <fnmatch.h>
- #include <ctype.h>
-
--
--/* Comment out all this code if we are using the GNU C Library, and are not
-- actually compiling the library itself. This code is part of the GNU C
-- Library, but also included in many other GNU distributions. Compiling
-- and linking in this code is a waste when using the GNU C library
-- (especially if it is a shared library). Rather than having every GNU
-- program understand `configure --with-gnu-libc' and omit the object files,
-- it is simpler to just do this in the source for each such file. */
--
--#if defined _LIBC || !defined __GNU_LIBRARY__
--
--
- # if defined STDC_HEADERS || !defined isascii
- # define ISASCII(c) 1
- # else
-@@ -52,10 +40,13 @@
- extern int errno;
- # endif
-
-+/* fnmatch replacement taken from the GNU C Library for systems that
-+ provide a broken implementation. */
-+
- /* Match STRING against the filename pattern PATTERN, returning zero if
- it matches, nonzero if not. */
- int
--fnmatch (const char *pattern, const char *string, int flags)
-+rpl_fnmatch (const char *pattern, const char *string, int flags)
- {
- register const char *p = pattern, *n = string;
- register char c;
-@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
-
- # undef FOLD
- }
--
--#endif /* _LIBC or not __GNU_LIBRARY__. */
diff --git a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
deleted file mode 100644
index 0b59956ebc05..000000000000
--- a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN a2ps-4.13.ORIG/config.h.in a2ps-4.13/config.h.in
---- a2ps-4.13.ORIG/config.h.in 2003-09-27 19:33:38.000000000 +0900
-+++ a2ps-4.13/config.h.in 2003-09-27 21:25:46.000000000 +0900
-@@ -181,6 +181,9 @@
- /* Define to 1 if you have the `rename' function. */
- #undef HAVE_RENAME
-
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
- /* Define to 1 if you have the `setlocale' function. */
- #undef HAVE_SETLOCALE
-
-diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in
---- a2ps-4.13.ORIG/configure.in 2003-09-27 19:33:38.000000000 +0900
-+++ a2ps-4.13/configure.in 2003-09-27 21:26:05.000000000 +0900
-@@ -71,7 +71,7 @@
- AC_HEADER_DIRENT
- AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h sys/ioctl.h \
- math.h string.h strings.h stdlib.h unistd.h stdarg.h pwd.h malloc.h \
-- memory.h errno.h fcntl.h stdbool.h fnmatch.h)
-+ memory.h errno.h fcntl.h stdbool.h fnmatch.h locale.h)
-
- ## --------------------- ##
- ## Checks for typedefs. ##
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch
deleted file mode 100644
index 06153f4858c4..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-CVE-2001-1593: Fix insecure use of /tmp
-
-
-Author(s):
-
- * Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
-
-followed the next month by a fix to that patch:
-
- * Mon Feb 12 2001 Tim Waugh <twaugh@redhat.com>
-
-(see https://bugzilla.redhat.com/show_bug.cgi?id=1060630#c5)
-
-Origin:
-
-http://pkgs.fedoraproject.org/cgit/a2ps.git/plain/a2ps-4.13-security.patch
-
---- a/lib/routines.c
-+++ b/lib/routines.c
-@@ -242,3 +242,50 @@
- /* Don't complain if you can't unlink. Who cares of a tmp file? */
- unlink (filename);
- }
-+
-+/*
-+ * Securely generate a temp file, and make sure it gets
-+ * deleted upon exit.
-+ */
-+static char ** tempfiles;
-+static unsigned ntempfiles;
-+
-+static void
-+cleanup_tempfiles()
-+{
-+ while (ntempfiles--)
-+ unlink(tempfiles[ntempfiles]);
-+}
-+
-+char *
-+safe_tempnam(const char *pfx)
-+{
-+ char *dirname, *filename;
-+ int fd;
-+
-+ if (!(dirname = getenv("TMPDIR")))
-+ dirname = "/tmp";
-+
-+ tempfiles = (char **) realloc(tempfiles,
-+ (ntempfiles+1) * sizeof(char *));
-+ if (tempfiles == NULL)
-+ return NULL;
-+
-+ filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
-+ if (!filename)
-+ return NULL;
-+
-+ sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
-+
-+ if ((fd = mkstemp(filename)) < 0) {
-+ free(filename);
-+ return NULL;
-+ }
-+ close(fd);
-+
-+ if (ntempfiles == 0)
-+ atexit(cleanup_tempfiles);
-+ tempfiles[ntempfiles++] = filename;
-+
-+ return filename;
-+}
---- a/lib/routines.h
-+++ b/lib/routines.h
-@@ -255,7 +255,8 @@
- /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
- #define tempname_ensure(Str) \
- do { \
-- (Str) = (Str) ? (Str) : tempnam (NULL, "a2_"); \
-+ (Str) = (Str) ? (Str) : safe_tempnam("a2_"); \
- } while (0)
-+char * safe_tempnam(const char *);
-
- #endif
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
deleted file mode 100644
index 56f0b2f527a2..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-CVE-2014-0466: fixps does not invoke gs with -dSAFER
-
-A malicious PostScript file could delete files with the privileges of
-the invoking user.
-
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Origin: https://bugs.debian.org/742902
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.in a2ps/contrib/fixps.in
---- a2ps~/contrib/fixps.in 2014-03-30 12:24:50.000000000 +0200
-+++ a2ps/contrib/fixps.in 2014-03-30 12:40:36.763249218 +0200
-@@ -389,7 +389,7 @@
- eval "$command" ;;
- gs)
- $verbose "$program: making a full rewrite of the file ($gs)." >&2
-- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
-+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
- esac
- )
- fi
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.m4 a2ps/contrib/fixps.m4
---- a2ps~/contrib/fixps.m4 2014-03-30 12:24:50.000000000 +0200
-+++ a2ps/contrib/fixps.m4 2014-03-30 12:40:36.767249254 +0200
-@@ -307,7 +307,7 @@
- eval "$command" ;;
- gs)
- $verbose "$program: making a full rewrite of the file ($gs)." >&2
-- $gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
-+ $gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
- esac
- )
- fi
diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
deleted file mode 100644
index 7b820cead05f..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200
-+++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200
-@@ -137,7 +137,8 @@
- ad_REPLACE_FUNC_STRCASECMP
- ad_REPLACE_FUNC_STRNCASECMP
- ad_REPLACE_FUNC_RENAME
--AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
-+AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
-+ tempnam strsignal psignal setlocale mempcpy)
- ad_FUNC_SYSTEMPAPERNAME
- ad_FUNC_ATEXIT
- ad_FUNC_STRFTIME
diff --git a/app-text/a2ps/files/a2ps-4.14-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-cleanup.patch
deleted file mode 100644
index 25187f315384..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-cleanup.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-fix missing prototype and printf warnings
-
---- a/lib/argmatch.c
-+++ b/lib/argmatch.c
-@@ -21,6 +21,7 @@
- #include "argmatch.h"
-
- #include <stdio.h>
-+#include <stdlib.h>
- #ifdef STDC_HEADERS
- # include <string.h>
- #endif
---- a/lib/encoding.c
-+++ b/lib/encoding.c
-@@ -790,7 +790,7 @@ dump_encoding_setup (FILE * stream,
- /* Create the dictionary and fill it */
- fprintf (stream, "%% Dictionary for %s support\n",
- encoding->name);
-- fprintf (stream, "/%sdict %d dict begin\n", encoding->key, nb);
-+ fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, nb);
- for (i = 0 ; i < nb ; i++)
- fprintf (stream, " /f%s %sEncoding /%s reencode_font\n",
- font_names [i],
---- a/lib/output.c
-+++ b/lib/output.c
-@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
- static void
- derivation_self_print (struct derivation * derivation, FILE * stream)
- {
-- fprintf (stream, "At %x: ", (int) derivation);
-+ fprintf (stream, "At %p: ", derivation);
- switch (derivation->type)
- {
- case nothing:
-@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
- expand_user_string (job, FIRST_FILE (job),
- (const uchar *) "Expand: requirement",
- (const uchar *) token));
-- output (dest, expansion);
-+ output (dest, "%s", expansion);
- continue;
- }
-
---- a/lib/parseppd.y
-+++ b/lib/parseppd.y
-@@ -154,7 +154,7 @@ font_clause :
- void
- yyerror (const char *msg)
- {
-- error_at_line (1, 0, ppdfilename, ppdlineno, msg);
-+ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
- }
-
- /*
---- a/lib/psgen.c
-+++ b/lib/psgen.c
-@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
- default:
- *buf = '\0';
- ps_escape_char (job, cp[i], buf);
-- output (jdiv, (char *) buf);
-+ output (jdiv, "%s", buf);
- break;
- }
- }
---- a/lib/quotearg.c
-+++ b/lib/quotearg.c
-@@ -60,6 +60,7 @@
-
- #if HAVE_MBRTOWC && HAVE_WCHAR_H
- # include <wchar.h>
-+# include <wctype.h>
- #else
- # define iswprint(wc) 1
- # define mbrtowc(pwc, s, n, ps) 1
---- a/lib/title.c
-+++ b/lib/title.c
-@@ -28,6 +28,7 @@
- #endif
-
- #include <stdio.h>
-+#include <string.h>
-
- #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
- # if __STDC__
---- a/src/long-options.c
-+++ b/src/long-options.c
-@@ -22,6 +22,7 @@
- #endif
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include "closeout.h"
- #include "long-options.h"
---- a/src/parsessh.y
-+++ b/src/parsessh.y
-@@ -740,7 +740,7 @@ exception_def_opt:
- void
- yyerror (const char *msg)
- {
-- error_at_line (1, 0, sshfilename, sshlineno, msg);
-+ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
- }
-
- /*
diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
deleted file mode 100644
index 7c3c69076ae9..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'lib/xstrrpl.c'
---- lib/xstrrpl.c 2008-04-14 18:04:50 +0000
-+++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000
-@@ -20,12 +20,10 @@
-
- #include "system.h"
- #include <assert.h>
- #include "xstrrpl.h"
-
--extern char * stpcpy();
--
- /* Perform subsitutions in string. Result is malloc'd
- E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
- where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
- */
- char *
-
diff --git a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
deleted file mode 100644
index 16271b3ec674..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git lib/argmatch.c lib/argmatch.c
-index f983e9d..eadc7ea 100644
---- lib/argmatch.c
-+++ lib/argmatch.c
-@@ -21,6 +21,7 @@
- #include "argmatch.h"
-
- #include <stdio.h>
-+#include <stdlib.h>
- #ifdef STDC_HEADERS
- # include <string.h>
- #endif
-diff --git lib/encoding.c lib/encoding.c
-index 9bd9f2a..f554a6d 100644
---- lib/encoding.c
-+++ lib/encoding.c
-@@ -989,7 +989,7 @@ dump_encoding_setup (FILE * stream,
- /* Create the dictionary and fill it */
- fprintf (stream, "%% Dictionary for %s support\n",
- encoding->name);
-- fprintf (stream, "/%sdict %d dict begin\n", encoding->key,
-+ fprintf (stream, "/%sdict %zu dict begin\n", encoding->key,
- (encoding->composite_flag == true)? nb+nb+ns:nb+ns);
- for (i = 0 ; i < nb ; i++)
- fprintf (stream, " /f%s %sEncoding /%s reencode_font\n",
-diff --git lib/output.c lib/output.c
-index b5fc37d..5f67676 100644
---- lib/output.c
-+++ lib/output.c
-@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
- static void
- derivation_self_print (struct derivation * derivation, FILE * stream)
- {
-- fprintf (stream, "At %x: ", (int) derivation);
-+ fprintf (stream, "At %p: ", derivation);
- switch (derivation->type)
- {
- case nothing:
-@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
- expand_user_string (job, FIRST_FILE (job),
- (const uchar *) "Expand: requirement",
- (const uchar *) token));
-- output (dest, expansion);
-+ output (dest, "%s", expansion);
- continue;
- }
-
-diff --git lib/parseppd.y lib/parseppd.y
-index a7558ba..c89d188 100644
---- lib/parseppd.y
-+++ lib/parseppd.y
-@@ -154,7 +154,7 @@ font_clause :
- void
- yyerror (const char *msg)
- {
-- error_at_line (1, 0, ppdfilename, ppdlineno, msg);
-+ error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
- }
-
- /*
-diff --git lib/psgen.c lib/psgen.c
-index 9eeef74..9d7a27d 100644
---- lib/psgen.c
-+++ lib/psgen.c
-@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
- default:
- *buf = '\0';
- ps_escape_char (job, cp[i], buf);
-- output (jdiv, (char *) buf);
-+ output (jdiv, "%s", buf);
- break;
- }
- }
-diff --git lib/quotearg.c lib/quotearg.c
-index 16d0b91..89db991 100644
---- lib/quotearg.c
-+++ lib/quotearg.c
-@@ -60,6 +60,7 @@
-
- #if HAVE_MBRTOWC && HAVE_WCHAR_H
- # include <wchar.h>
-+# include <wctype.h>
- #else
- # define iswprint(wc) 1
- # define mbrtowc(pwc, s, n, ps) 1
-diff --git lib/title.c lib/title.c
-index cf4a34b..7a3e87b 100644
---- lib/title.c
-+++ lib/title.c
-@@ -28,6 +28,7 @@
- #endif
-
- #include <stdio.h>
-+#include <string.h>
-
- #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
- # if __STDC__
-diff --git src/long-options.c src/long-options.c
-index fb40cd9..7bd77b0 100644
---- src/long-options.c
-+++ src/long-options.c
-@@ -22,6 +22,7 @@
- #endif
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include "closeout.h"
- #include "long-options.h"
-diff --git src/parsessh.y src/parsessh.y
-index 21e9559..569fdb6 100644
---- src/parsessh.y
-+++ src/parsessh.y
-@@ -740,7 +740,7 @@ exception_def_opt:
- void
- yyerror (const char *msg)
- {
-- error_at_line (1, 0, sshfilename, sshlineno, msg);
-+ error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
- }
-
- /*
diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch
deleted file mode 100644
index 291c3aac4fa4..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-psset.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur a2ps-4.14.orig/contrib/psset.in a2ps-4.14/contrib/psset.in
---- a2ps-4.14.orig/contrib/psset.in 2007-12-29 12:29:01.000000000 +0900
-+++ a2ps-4.14/contrib/psset.in 2009-04-12 12:17:43.000000000 +0900
-@@ -219,7 +219,7 @@
- done
-
- pspagedevice="% Pagedevice definitions:
--countdictstack
-+ countdictstack
- % Push our own mark, since there can be several PS marks pushed depending
- % where the failure really occured.
- /psset_mark
-@@ -227,7 +227,7 @@
- } stopped
- % My cleartomark
- { /psset_mark eq { exit } if } loop
--countdictstack exch sub dup 0 gt
-+ countdictstack exch sub dup 0 gt
- {
- { end } repeat
- }{
diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
deleted file mode 100644
index 00d955a819a9..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr a2ps-4.14/lib/obstack.h a2ps-4.14.test/lib/obstack.h
---- a2ps-4.14/lib/obstack.h 2007-12-29 09:37:59.000000000 +0800
-+++ a2ps-4.14.test/lib/obstack.h 2009-06-10 18:49:45.000000000 +0900
-@@ -138,9 +138,9 @@
- #define __need_ptrdiff_t
- #endif
- #endif
-+#endif
-
- #include <stddef.h>
--#endif
-
- #if defined (__STDC__) && __STDC__
- #define PTR_INT_TYPE ptrdiff_t
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
deleted file mode 100644
index 44cd4bfd099d..000000000000
--- a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
+++ /dev/null
@@ -1,147 +0,0 @@
---- a2ps-4.14/doc/a2ps.texi.bero 2013-03-26 10:31:31.230137555 +0100
-+++ a2ps-4.14/doc/a2ps.texi 2013-03-26 11:01:01.504006086 +0100
-@@ -44,10 +44,6 @@
- @end ifnottex
-
- @c TeX variants
--@macro LaTeX
--La@TeX{}
--@end macro
--
- @macro PreTeX
- Pre@TeX{}
- @end macro
-@@ -417,9 +413,9 @@ Genesis
- @c Now, that's what I call humor :)
- @cindex First Page
- This document describes GNU @pack{} version @value{VERSION}. The latest
--versions may be found on the @href{@value{WWWHOME},@pack{} home page}.
--We plan to update the @href{http://www.gnu.org/software/a2ps/, GNU
--@pack{} home page} in the near future, in which case the latter will be
-+versions may be found on the @uref{@value{WWWHOME}, home page}.
-+We plan to update the @uref{@value{WWWHOME}, GNU home page}
-+in the near future, in which case the latter will be
- a better source of information.
-
- We tried to make this document informative and pleasant. It tries to be
-@@ -431,8 +427,8 @@ difficult to use. @xref{Glossary}, for
- information.
-
- Please, send us emailcards @code{:)}. Whatever the comment is, or if you
--just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel
--Santana} and @email{akim@@freefriends.org, Akim Demaille}. But
-+just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel Santana}
-+and @email{akim@@freefriends.org, Akim Demaille}. But
- @emph{never} write to either of us for asking questions, or to report
- bugs. Chances are very high never to receive an answer, as we receive
- too many messages. @xref{a2ps Mailing Lists}, for information on the
-@@ -517,8 +513,8 @@ everybody so that mistakes get fixed as
-
- So, if you have a problem (configuration error, compilation error,
- runtime error, documentation error or unclear), first check in the FAQ
--(@pxref{FAQ}), then on the page @href{@value{WWWHOME}/bugs.html,Known
--@pack{} Bugs} if the issue has not been addressed yet. If it is not the
-+(@pxref{FAQ}), then on the page @uref{@value{WWWHOME}/bugs.html,Known Bugs}
-+if the issue has not been addressed yet. If it is not the
- case, but it appears that the version of @pack{} you have is old,
- consider upgrading.
-
-@@ -2802,8 +2798,7 @@ Thou shalt start your PostScript DSC con
-
- The bad news is that some printers will reject this header. Then you
- may change this header without any worry since the PostScript produced
--by @pack{} is also 100% PostScript level 1@footnote{That is to say, there
--are no PostScript printers that don't understand these files.}.
-+by @pack{} is also 100% PostScript level 1@footnote{That is to say, there are no PostScript printers that don't understand these files.}.
-
- @defvr {Configuration Setting} OutputFirstLine: @var{magic-number}
- @cindex @samp{OutputFirstLine:}
-@@ -3971,13 +3966,13 @@ Quote @var{text} so that no special sequ
- @itemx \end@{enumerate@}
- @itemx \begin@{description@}
- @itemx \end@{description@}
--These commands are legal in @LaTeX but have no sense in @PreTeX{}.
-+These commands are legal in @LaTeX{} but have no sense in @PreTeX{}.
- Hence there are simply ignored and not printed (if immediately followed
- by an end-of-line).
- @end table
-
- @node Differences with LaTeX
--@subsubsection Differences with @LaTeX
-+@subsubsection Differences with @LaTeX{}
- The following symbols, inherited from the style sheet @code{Symbol}, are
- not supported by @LaTeX{}:
-
-@@ -4124,9 +4119,9 @@ beautiful, with any character you might
- prefix part of the file name, and is alpha-numerical, lower case, and
- less than 8 characters long.
-
--Anywhere @pack{} needs to recognize a style sheet by a name, @strong{it
--uses the key} (in the @file{sheets.map} file, with the option @samp{-E},
--etc.).
-+Anywhere @pack{} needs to recognize a style sheet by a name,
-+@strong{it uses the key} (in the @file{sheets.map} file, with the
-+option @samp{-E}, etc.).
-
- As an example, C++ is implemented in a file called @file{cxx.ssh}, in
- which the name is declared to be @samp{C++}.
-@@ -5672,7 +5667,7 @@ supporting a @samp{--help}-like option.
- @subsection Invoking @code{card}
-
- @example
--card [@var{options}] @var{applications} [-- @var{@pack{}-options}]
-+card [@var{options}] @var{applications} [-- @var{-options}]
- @end example
-
- @noindent
-@@ -5680,7 +5675,7 @@ card [@var{options}] @var{applications}
- @var{applications}' help message (typically by the options @samp{--help}
- or @samp{-h}), and pretty prints it thanks to @pack{} (or the content of
- the environment variable @samp{A2PS} if it is set).
--@var{@pack{}-options} are passed to @pack{}.
-+@var{-options} are passed to @pack{}.
-
- Supported options are:
-
-@@ -5874,12 +5869,12 @@ difference finder,wdiff,GNU wdiff}) to e
- @subsection Invoking @code{pdiff}
-
- @example
--pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{@pack{}-options}]
-+pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{-options}]
- @end example
-
- @noindent
- make a pretty comparison between @var{file-1} and @var{file-2}.
--@var{@pack{}-options} are passed to @pack{}.
-+@var{-options} are passed to @pack{}.
-
- Supported options are:
-
-@@ -6222,7 +6217,7 @@ Error related questions.
- @subsection Why Does it Print Nothing?
-
- @quotation
--@i{@pack{} works OK, but the printer prints nothing.}
-+@i{works OK, but the printer prints nothing.}
- @end quotation
-
- There are two ways that printing can fail: silently, or with a
-@@ -6351,7 +6346,7 @@ If it is incorrect, ask for help around
- @subsection Why Does it Say my File is Binary?
-
- @quotation
--@i{@pack{} complains that my file is binary though it is not.}
-+@i{complains that my file is binary though it is not.}
- @end quotation
-
- There are several reasons that can cause @pack{} to consider a file is
-@@ -6591,7 +6586,7 @@ format you want for the date: @xref{Esca
- @subsection Why Have the Options Changed?
-
- @quotation
--@i{The options of this @pack{} are not the same as in the previous versions.}
-+@i{The options of this are not the same as in the previous versions.}
- @end quotation
-
- True. But the old scheme (up to version 4.6.1) prevented us from
diff --git a/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch b/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch
new file mode 100644
index 000000000000..d7b231c0b929
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.15-lpr-wrapper.patch
@@ -0,0 +1,23 @@
+# a2ps-lpr-wrapper exits on bogus parameter-count test
+# https://bugs.gentoo.org/913751
+# https://savannah.gnu.org/bugs/?64047
+--- a/src/a2ps-lpr-wrapper
++++ b/src/a2ps-lpr-wrapper
+@@ -5,7 +5,7 @@
+ set -e
+
+ usage() {
+- echo "Usage: $(basename "$0") [-d printer] FILE..." >&2
++ echo "Usage: $(basename "$0") [-d printer] [FILE...]" >&2
+ exit 1
+ }
+
+@@ -17,7 +17,6 @@ while getopts d: flag; do
+ esac
+ done
+ shift $((OPTIND - 1))
+-if [ $# -eq 0 ]; then usage; fi
+
+ # If lp (from CUPS) exists, just use it.
+ if command -pv lp > /dev/null; then
+
diff --git a/app-text/a2ps/files/a2ps-4.15-stdout.patch b/app-text/a2ps/files/a2ps-4.15-stdout.patch
new file mode 100644
index 000000000000..00002ffb9524
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.15-stdout.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/47691
+https://bugs.gentoo.org/47764
+https://lists.gnu.org/archive/html/bug-a2ps/2001-05/msg00000.html
+--- a/liba2ps/printers.c
++++ b/liba2ps/printers.c
+@@ -287,8 +287,8 @@ a2ps_printers_new (struct a2ps_common_s * common)
+ res->ppd = NULL; /* Printer's ppd are not read yet */
+
+ /* Output */
+- /* Default is to send to default printer */
+- res->flag_output_is_printer = true;
++ /* Default is to send to stdout */
++ res->flag_output_is_printer = false;
+ res->flag_output_name = NULL;
+ res->output_is_file = true;
+ res->output_name = NULL;
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index 98cea90097ed..d22cb76bd2a2 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>printing@gentoo.org</email>
- <name>Gentoo Printing Project</name>
-</maintainer>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
+ <maintainer type="project">
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">a2ps</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest
deleted file mode 100644
index a20420053169..000000000000
--- a/app-text/agrep/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST agrep-2.04.tar.Z 62351 BLAKE2B 7856c172aff84d188cc38e83fc8eece63f66cb30a8a1753ec5f54d98fbc47a33d9caad69520c531c66f2958c762f26312032ee7a9e4e4040709f4d366fdbf4a9 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee
diff --git a/app-text/agrep/agrep-2.04-r2.ebuild b/app-text/agrep/agrep-2.04-r2.ebuild
deleted file mode 100644
index d2ff1e0dd621..000000000000
--- a/app-text/agrep/agrep-2.04-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for the fast searching of text allowing for errors in the search pattern"
-HOMEPAGE="ftp://ftp.cs.arizona.edu/agrep/README"
-SRC_URI="ftp://ftp.cs.arizona.edu/${PN}/${P}.tar.Z"
-
-LICENSE="AGREP"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
-
-RDEPEND="
- !dev-libs/tre
- !dev-ruby/amatch
- !app-misc/glimpse"
-
-DOCS=( README agrep.algorithms agrep.chronicle COPYRIGHT contribution.list )
-
-src_compile() {
- sed -i \
- -e 's/^CFLAGS.*//' \
- -e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile || die
- tc-export CC
- emake
-}
-
-src_install() {
- dobin "${PN}"
- doman "${PN}.1"
- einstalldocs
-}
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
deleted file mode 100644
index 3cf14bf74636..000000000000
--- a/app-text/agrep/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>shell-tools@gentoo.org</email>
- <name>Gentoo Shell Tools Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-text/aha/Manifest b/app-text/aha/Manifest
new file mode 100644
index 000000000000..35f1276e19ca
--- /dev/null
+++ b/app-text/aha/Manifest
@@ -0,0 +1 @@
+DIST aha-0.5.1.tar.gz 394410 BLAKE2B 7276219068a8e496b41a953f4cdfc130b85778b44d194fedb63b0f0d921db0efcf0f62fae52ec580ac1462e3b03edd6ad97dab7d7ff2c138ef300824efbad111 SHA512 0eb88e681208c0956e344d6574f9d7ba155d38bfb386d0a9f17022c5e925fb16d0efb6aa04804191b4cac1697a87a0f16ba51bcd97b6135cc7606046eaf89288
diff --git a/app-text/aha/aha-0.5.1.ebuild b/app-text/aha/aha-0.5.1.ebuild
new file mode 100644
index 000000000000..eb4dbc60933e
--- /dev/null
+++ b/app-text/aha/aha-0.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converts ANSI escape sequences of a unix terminal to HTML code"
+HOMEPAGE="https://github.com/theZiz/aha"
+SRC_URI="https://github.com/theZiz/aha/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-null-ptr-dereference-fix.patch"
+)
+
+src_install() {
+ emake PREFIX="${D}/usr" install
+}
diff --git a/app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch b/app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch
new file mode 100644
index 000000000000..6ec2ca9cae1d
--- /dev/null
+++ b/app-text/aha/files/aha-0.5.1-null-ptr-dereference-fix.patch
@@ -0,0 +1,105 @@
+diff --git a/aha.c b/aha.c
+index 46e43c0..2bfebb7 100644
+--- a/aha.c
++++ b/aha.c
+@@ -138,6 +138,15 @@ pelem parseInsert(char* s)
+ return firstelem;
+ }
+
++int parseDepthAtLeast(pelem elem, unsigned int wanted) {
++ while (elem != NULL) {
++ if (wanted == 0) return 1;
++ elem = elem->next;
++ --wanted;
++ }
++ return 0;
++}
++
+ void deleteParse(pelem elem)
+ {
+ while (elem!=NULL)
+@@ -831,27 +840,20 @@ int main(int argc,char* args[])
+ }
+ else
+ if (momelem->value == 38 &&
+- momelem->next &&
+- momelem->next->value == 2 &&
+- momelem->next->next)// 38;2;<n> -> 24 Bit
++ parseDepthAtLeast(momelem, 4) &&
++ momelem->next->value == 2)// 38;2;<r>;<g>;<b> -> 24 Bit
+ {
+- momelem = momelem->next->next;
+- pelem r,g,b;
+- r = momelem;
+- momelem = momelem->next;
+- g = momelem;
+- if ( momelem )
+- momelem = momelem->next;
+- b = momelem;
+- if ( r && g && b )
+- {
+- state.highlighted = 0;
+- state.fc_colormode = MODE_24BIT;
+- *dest =
+- (r->value & 255) * 65536 +
+- (g->value & 255) * 256 +
+- (b->value & 255);
+- }
++ pelem r = momelem->next->next;
++ pelem g = r->next;
++ pelem b = g->next;
++ momelem = b;
++
++ state.highlighted = 0;
++ state.fc_colormode = MODE_24BIT;
++ *dest =
++ (r->value & 255) * 65536 +
++ (g->value & 255) * 256 +
++ (b->value & 255);
+ }
+ else
+ {
+@@ -899,27 +901,20 @@ int main(int argc,char* args[])
+ }
+ else
+ if (momelem->value == 48 &&
+- momelem->next &&
+- momelem->next->value == 2 &&
+- momelem->next->next)// 48;2;<n> -> 24 Bit
++ parseDepthAtLeast(momelem, 4) &&
++ momelem->next->value == 2)// 48;2;<r>;<g>;<b> -> 24 Bit
+ {
+- momelem = momelem->next->next;
+- pelem r,g,b;
+- r = momelem;
+- momelem = momelem->next;
+- g = momelem;
+- if ( momelem )
+- momelem = momelem->next;
+- b = momelem;
+- if ( r && g && b )
+- {
+- state.bc_colormode = MODE_24BIT;
+- state.highlighted = 0;
+- *dest =
+- (r->value & 255) * 65536 +
+- (g->value & 255) * 256 +
+- (b->value & 255);
+- }
++ pelem r = momelem->next->next;
++ pelem g = r->next;
++ pelem b = g->next;
++ momelem = b;
++
++ state.bc_colormode = MODE_24BIT;
++ state.highlighted = 0;
++ *dest =
++ (r->value & 255) * 65536 +
++ (g->value & 255) * 256 +
++ (b->value & 255);
+ }
+ else
+ {
+--
+2.35.1
+
diff --git a/app-text/aha/metadata.xml b/app-text/aha/metadata.xml
new file mode 100644
index 000000000000..16118a3d4fa8
--- /dev/null
+++ b/app-text/aha/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>zoltan@sinustrom.info</email>
+ <name>Zoltan Puskas</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ aha (ANSI HTML Adapter) converts ANSI colors to HTML, e.g. if you want
+ to publish the output of ls --color=yes, git diff, ccal or htop as
+ static HTML somewhere.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">theZiz/aha</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index e32cf7397c74..2620c5f6235d 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1 +1,2 @@
+DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
deleted file mode 100644
index b78d34eacee5..000000000000
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic libtool
-
-DESCRIPTION="A thesaurus lib, tool and database"
-HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- gtk? ( virtual/pkgconfig )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-gcc43.patch"
- "${FILESDIR}/${P}-format-security.patch"
-)
-
-src_prepare() {
- default
- # Needed to make relink work on FreeBSD, without it won't install.
- # Also needed for a sane .so versionning there.
- elibtoolize
-}
-
-src_configure() {
- filter-flags -fno-exceptions
- econf $(use_with gtk)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
new file mode 100644
index 000000000000..968ec591c6f3
--- /dev/null
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A thesaurus lib, tool, and database"
+HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="gtk"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${WORKDIR}"/patches/${P}-gcc43.patch
+ "${WORKDIR}"/patches/${P}-format-security.patch
+ "${WORKDIR}"/patches/${P}-c++17.patch
+ "${FILESDIR}"/aiksaurus-1.2.1-autoconf.patch
+)
+
+src_prepare() {
+ default
+
+ # Needed to make relink work on FreeBSD, without it won't install.
+ # Also needed for a sane .so versionning there.
+ #elibtoolize
+ # Clang 16
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fno-exceptions
+ econf $(use_with gtk)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
deleted file mode 100644
index e86e0fca8539..000000000000
--- a/app-text/aiksaurus/aiksaurus-1.2.1.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
-inherit flag-o-matic libtool
-
-DESCRIPTION="A thesaurus lib, tool and database"
-HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- gtk? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
-
-src_prepare() {
- default
- # Needed to make relink work on FreeBSD, without it won't install.
- # Also needed for a sane .so versionning there.
- elibtoolize
-}
-
-src_configure() {
- filter-flags -fno-exceptions
- econf $(use_with gtk)
-}
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch
new file mode 100644
index 000000000000..2821709e7784
--- /dev/null
+++ b/app-text/aiksaurus/files/aiksaurus-1.2.1-autoconf.patch
@@ -0,0 +1,13 @@
+https://sources.debian.org/patches/aiksaurus/1.2.1%2Bdev-0.12-7/01-changes-from-pristine-tarball.patch/
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,6 +50,9 @@ AC_SUBST(LT_RELEASE)
+ LT_CURRENT=`expr $AIK_MICRO_VERSION - $AIK_INTERFACE_AGE`
+ LT_REVISION=$AIK_INTERFACE_AGE
+ LT_AGE=`expr $AIK_BINARY_AGE - $AIK_INTERFACE_AGE`
++m4_pattern_allow([LT_CURRENT])
++m4_pattern_allow([LT_REVISION])
++m4_pattern_allow([LT_AGE])
+
+ LT_AIK_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch
deleted file mode 100644
index ba90a4519502..000000000000
--- a/app-text/aiksaurus/files/aiksaurus-1.2.1-format-security.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- aiksaurus-1.2.1/base/caiksaurus.cpp.orig 2014-06-07 21:14:03.869649696 +0100
-+++ aiksaurus-1.2.1/base/caiksaurus.cpp 2014-06-07 21:33:06.241471066 +0100
-@@ -254,7 +254,7 @@
- /* see if we got --version. */
- if ( !strcmp(arg, "--version") || !strcmp(arg, "-v") )
- {
-- printf(version);
-+ printf("%s", version);
- exit(0);
- }
-
-@@ -262,7 +262,7 @@
- else if ( !strcmp(arg, "--help") || !strcmp(arg, "-h") )
- {
- printf("Usage: %s [word]\n\n", argv[0]);
-- printf(help);
-+ printf("%s", help);
- exit(0);
- }
- }
-@@ -271,7 +271,7 @@
- if (argc != 2)
- {
- printf("Usage: %s [word]\n", argv[0]);
-- printf(help);
-+ printf("%s", help);
- exit(1);
- }
- }
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch
deleted file mode 100644
index a6d570af569d..000000000000
--- a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- aiksaurus-1.2.1/base/aiksaurus.t.cpp
-+++ aiksaurus-1.2.1/base/aiksaurus.t.cpp
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- using namespace std;
- using AiksaurusImpl::AsciiCompare;
-
---- aiksaurus-1.2.1/gtk/src/Display.cpp
-+++ aiksaurus-1.2.1/gtk/src/Display.cpp
-@@ -22,6 +22,7 @@
- #include "Meaning.h"
- #include "DialogMediator.h"
- #include "Exception.h"
-+#include <cstring>
- using namespace std;
-
- namespace AiksaurusGTK_impl
---- aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
-+++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
-@@ -23,6 +23,7 @@
- #include <gtk/gtk.h>
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- using namespace std;
-
- int main(int argc, char** argv)
diff --git a/app-text/aiksaurus/metadata.xml b/app-text/aiksaurus/metadata.xml
index fbf374360c7a..167e1d83d852 100644
--- a/app-text/aiksaurus/metadata.xml
+++ b/app-text/aiksaurus/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">aiksaurus</remote-id>
</upstream>
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 33eb47696d08..5f54ec324855 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -1 +1,2 @@
+DIST an_1.2-6.debian.tar.xz 4432 BLAKE2B efec93daf46b30369aa5d6a6bc57b9e79db7aabea5d8cb7ec9305775bf05c693c3b2ea428c09b99b2350f8a168e2b7e810538d78c321b11a64e6ca804f56feb8 SHA512 33cd93ddf1dea5f1a8d94695dbf6fcfbdf58830c11be1d6c83e516f6dc6d11adbe0cb196c98ec094887021575adc68aaa667222d3b10ed40e87e55a5422deaf2
DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a65fb310b678bd21d46c39761747fb6f60a7eba99a1c2e756a8c9467543d26e97bbf7f9c93d17f66a4d7698c SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d
diff --git a/app-text/an/an-1.2-r1.ebuild b/app-text/an/an-1.2-r1.ebuild
deleted file mode 100644
index d9c01423a53c..000000000000
--- a/app-text/an/an-1.2-r1.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
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very fast anagram generator with dictionary lookup"
-HOMEPAGE="http://packages.debian.org/unstable/games/an"
-
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DEPEND="
- dev-libs/icu:=
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/miscfiles[-minimal]
-"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CC/s|:=|?=|' \
- -e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
- -e '/^CPPFLAGS/s|-D_BSD_SOURCE=1 -D_GNU_SOURCE=1|-D_DEFAULT_SOURCE=1|g' \
- Makefile || die
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
- newman ${PN}.6 ${PN}.1
- dodoc ALGORITHM
-}
diff --git a/app-text/an/an-1.2.ebuild b/app-text/an/an-1.2.ebuild
deleted file mode 100644
index ee3b460ecd60..000000000000
--- a/app-text/an/an-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very fast anagram generator with dictionary lookup"
-HOMEPAGE="http://packages.debian.org/unstable/games/an"
-
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE=""
-
-CDEPEND="
- dev-libs/icu:=
-"
-DEPEND="
- app-arch/xz-utils
-"
-RDEPEND="
- ${CDEPEND}
- sys-apps/miscfiles[-minimal]
-"
-
-src_prepare() {
- sed -i \
- -e '/^CC/s|:=|?=|' \
- -e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
- Makefile || die
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
- newman ${PN}.6 ${PN}.1
- dodoc ALGORITHM
-}
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
new file mode 100644
index 000000000000..ec08966bef24
--- /dev/null
+++ b/app-text/an/an-1.2_p6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Very fast anagram generator with dictionary lookup"
+HOMEPAGE="https://packages.debian.org/unstable/games/an"
+SRC_URI="
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.xz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+
+RDEPEND="
+ dev-libs/icu:=
+ sys-apps/miscfiles[-minimal]
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+ default
+
+ eapply $(
+ for patch in $(cat "${WORKDIR}"/debian/patches/series)
+ do
+ echo "${WORKDIR}"/debian/patches/$patch
+ done
+ )
+
+ sed -i \
+ -e '/^CC/s|:=|?=|' \
+ Makefile || die
+ tc-export CC
+}
+
+src_install() {
+ dobin ${PN}
+ newman ${PN}.6 ${PN}.1
+ dodoc ALGORITHM
+}
diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
index f5037f14a3cb..85e4ed814fa2 100644
--- a/app-text/an/metadata.xml
+++ b/app-text/an/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>jer@gentoo.org</email>
- <name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 7ce54604f3cd..9187309fb066 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1 +1,3 @@
-DIST ansifilter-2.14.tar.bz2 441884 BLAKE2B 90b3b0330866da11c00b105aa79164178aebecf39131f5c8d8e373091f53d2d8bbced54472c975a61857d594a9fa92ce08d018523f471fde445d4548d48b949b SHA512 a0b7f12ea5b9ef9b5845a03484a2e238a9f60e0e49f8eddca8bf24b47faba48aa0b55f922678b3bf1b3f08857bbe9a8285b3f318f2adec84673bc502e21b6802
+DIST ansifilter-2.20.tar.bz2 439551 BLAKE2B 71a24e904d7d3769bd0fed4ce93d960fbe434b117dc9f0e0d6b43ced40ce78d315ad58a5b83925ea0d16595e79e0ae415fc1e52323a0c367c63edc1ede57c039 SHA512 f05942eee53513cc81054bfb853fa9a946ffc0c488564975b06e3d1feb15d8ee7be05c561905cdc5944f4d083f04196af0f7c90665b8048ca7e400537517498c
+DIST ansifilter-2.20.tar.bz2.asc 488 BLAKE2B 2f2bb56e3cd81e79cd3b5b34e0f5224a79e26977f94708c64ea4278b186acc72e28ce9509fa3c0f31619b3d3ea8e35ee83656d7560152c05bafcffcb12204456 SHA512 5002436eb38399bb7cf96914fd1778ed53a9a0d8fd029b37ae50c6db8b411248f602efcd7bcb9a69871f2b3526fccf4875e3f958afccaeea94e286ddb0f071db
+DIST ansifilter2_logo_256.png 54539 BLAKE2B f8b98e22b08c62769bc679f17b3f9d2faeee806d95af3b4a4876e4938813694a4924ed4684163e962d94d3f1efdd31facdae4c3eb75c98322da228bdf0a130be SHA512 ff6f76a91a4809289f90db2bcefc01e772e043a478d7f84b33b4313ed163692e7d2f87880e5fdb64f0e419f6c1ef6ec85240f5a9984223e9059f0803be313de5
diff --git a/app-text/ansifilter/ansifilter-2.14.ebuild b/app-text/ansifilter/ansifilter-2.14.ebuild
deleted file mode 100644
index 89eb5868d897..000000000000
--- a/app-text/ansifilter/ansifilter-2.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="qt5"
-
-RDEPEND="
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- # bug 431452
- rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
- if use qt5 ; then
- pushd src/qt-gui > /dev/null || die
- eqmake5
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
- if use qt5 ; then
- pushd src/qt-gui > /dev/null || die
- emake
- popd > /dev/null || die
- fi
-}
-
-src_install() {
- dobin src/${PN}
- use qt5 && dobin src/qt-gui/${PN}-gui
-
- gunzip man/${PN}.1.gz
- doman man/${PN}.1
- einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.20.ebuild b/app-text/ansifilter/ansifilter-2.20.ebuild
new file mode 100644
index 000000000000..7baf14e67aa9
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.20.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+inherit desktop toolchain-funcs qmake-utils verify-sig xdg-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="
+ http://andre-simon.de/doku/ansifilter/en/ansifilter.php
+ https://gitlab.com/saalen/ansifilter/
+"
+SRC_URI="
+ http://www.andre-simon.de/zip/${P}.tar.bz2
+ gui? ( https://gitlab.com/uploads/-/system/project/avatar/6678914/ansifilter2_logo_256.png )
+ verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+IUSE="gui"
+
+RDEPEND="
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-andresimon )"
+
+DOCS=( ChangeLog.adoc README.adoc )
+
+src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ default
+
+ # bug 431452
+ rm src/qt-gui/moc_mydialog.cpp || die
+
+ sed \
+ -e "/GZIP/d" \
+ -e "/COPYING/d" \
+ -i makefile || die
+
+ sed \
+ -e "s/-O2//" \
+ -i src/makefile || die
+}
+
+src_configure() {
+ if use gui ; then
+ pushd src/qt-gui > /dev/null || die
+ eqmake5
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile CXX="$(tc-getCXX)"
+
+ if use gui ; then
+ emake -C src/qt-gui
+ fi
+}
+
+src_install() {
+ emake -f makefile \
+ DESTDIR="${ED}" \
+ doc_dir="/usr/share/doc/${PF}" \
+ -j1 \
+ install $(usev gui install-gui)
+
+ einstalldocs
+ if use gui; then
+ newicon -s 256 "${DISTDIR}"/ansifilter2_logo_256.png "${PN}".png
+ fi
+}
+
+pkg_postrm() {
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
+
+pkg_postinst() {
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 69570e849328..ba284898934f 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>kensington@gentoo.org</email>
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">saalen/ansifilter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
deleted file mode 100644
index 7aafe949cf22..000000000000
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-IUSE="kde"
-PATCHVER="r2"
-DESCRIPTION="free MS Word reader"
-HOMEPAGE="http://www.winfield.demon.nl"
-SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
- https://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-src_prepare() {
- # Makefile is a symlink to Makefile.Linux, avoid that we patch it by
- # accident using patch <2.7, see bug #435492
- rm Makefile || die
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}"
-
- # Re-add convenience symlink, see above
- ln -s Makefile.Linux Makefile
-
- epatch "${FILESDIR}"/${P}-CVE-2014-8123.patch
-}
-
-src_configure() { :; }
-
-src_compile() {
- emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
- LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
- emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die
-
- use kde || rm -f "${ED}"/usr/bin/kantiword
-
- insinto /usr/share/${PN}/examples
- doins Docs/testdoc.doc Docs/antiword.php || die
-
- cd Docs
- doman antiword.1 || die
- dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die
-}
diff --git a/app-text/antiword/antiword-0.37-r2.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild
new file mode 100644
index 000000000000..2fb72837676f
--- /dev/null
+++ b/app-text/antiword/antiword-0.37-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+PATCHVER="r2"
+DESCRIPTION="free MS Word reader"
+HOMEPAGE="http://www.winfield.demon.nl"
+SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
+ https://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER}
+ "${FILESDIR}"/${P}-CVE-2014-8123.patch
+)
+
+DOCS=( Docs/{ChangeLog,Exmh,Emacs,FAQ,History,Netscape,QandA,ReadMe,Mozilla,Mutt} )
+
+src_prepare() {
+ # Makefile is a symlink to Makefile.Linux, avoid that we patch it by
+ # accident using patch <2.7, see bug #435492
+ rm Makefile || die
+
+ default
+
+ # Re-add convenience symlink, see above
+ ln -s Makefile.Linux Makefile
+}
+
+src_configure() {
+ true
+}
+
+src_compile() {
+ emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install
+
+ einstalldocs
+
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto examples
+ dodoc Docs/testdoc.doc Docs/antiword.php
+
+ doman Docs/antiword.1
+}
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index 8ee341cec0e5..48758def3c67 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
@@ -9,4 +9,3 @@
<remote-id type="cpe">cpe:/a:antiword_project:antiword</remote-id>
</upstream>
</pkgmetadata>
-
diff --git a/app-text/antixls/antixls-0.3b.ebuild b/app-text/antixls/antixls-0.3b.ebuild
index 53e29234db59..392f97f84af0 100644
--- a/app-text/antixls/antixls-0.3b.ebuild
+++ b/app-text/antixls/antixls-0.3b.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Print out an XLS file with minimal formatting, or extract the data into CSV"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.perl"
+
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~amd64 ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
DEPEND="dev-perl/Spreadsheet-ParseExcel"
RDEPEND="${DEPEND}"
diff --git a/app-text/antixls/metadata.xml b/app-text/antixls/metadata.xml
index a53ffbea77d3..3d1a383e5d9d 100644
--- a/app-text/antixls/metadata.xml
+++ b/app-text/antixls/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index e2e8e977e53f..cefafd26f774 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1 +1 @@
-DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
+DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
deleted file mode 100644
index e952e34db067..000000000000
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake-utils desktop
-
-DESCRIPTION="Alf's PDF Viewer Like Vim"
-HOMEPAGE="https://naihe2010.github.com/apvlv/"
-SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- >=app-text/poppler-0.18[cairo,xpdf-headers(+)]
- dev-libs/glib:2
- x11-libs/gtk+:3
- djvu? ( app-text/djvu:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- # preserve cflags
- "${FILESDIR}/${P}-cflags.patch"
- "${FILESDIR}/${P}-gcc6.patch"
- "${FILESDIR}/${P}-gcc7.patch"
- "${FILESDIR}/${P}-poppler-0.73.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DSYSCONFDIR=/etc/${PN}
- -DDOCDIR=/usr/share/${PN}
- -DMANDIR=/usr/share/man
- -DAPVLV_WITH_HTML=OFF
- -DAPVLV_WITH_UMD=OFF
- -DAPVLV_WITH_TXT=ON
- -DAPVLV_WITH_DJVU=$(usex djvu)
- -DAPVLV_ENABLE_DEBUG=$(usex debug)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- newicon -s 32 icons/pdf.png ${PN}.png
-}
diff --git a/app-text/apvlv/apvlv-0.4.0-r1.ebuild b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..24ab3cda2530
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake desktop
+
+DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
+HOMEPAGE="https://github.com/naihe2010/apvlv/"
+SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug djvu"
+
+RDEPEND="
+ app-text/ebook-tools
+ >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
+ dev-libs/glib:2
+ dev-libs/libxml2
+ net-libs/webkit-gtk:4=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ djvu? ( app-text/djvu )
+"
+
+DEPEND="${RDEPEND}
+ app-text/ghostscript-gpl
+ media-libs/freetype
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake-cxxflags.patch
+ "${FILESDIR}"/${P}-icon.patch
+)
+src_prepare() {
+ cmake_src_prepare
+}
+src_configure() {
+ local mycmakeargs=(
+ -DAPVLV_WITH_DJVU=$(usex djvu)
+ -DAPVLV_ENABLE_DEBUG=$(usex debug)
+ -DAPVLV_WITH_TXT=ON
+ -DDOCDIR="/usr/share/doc/${PF}"
+ )
+ cmake_src_configure
+}
+src_install() {
+ cmake_src_install
+ newicon -s 32 icons/pdf.png ${PN}.png
+}
diff --git a/app-text/apvlv/apvlv-0.4.0-r2.ebuild b/app-text/apvlv/apvlv-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..afd75022a0c5
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.4.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake desktop
+
+DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
+HOMEPAGE="https://github.com/naihe2010/apvlv/"
+SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug djvu"
+
+RDEPEND="
+ app-text/ebook-tools
+ >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
+ dev-libs/glib:2
+ dev-libs/libxml2
+ net-libs/webkit-gtk:4.1=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ djvu? ( app-text/djvu )
+"
+
+DEPEND="${RDEPEND}
+ app-text/ghostscript-gpl
+ media-libs/freetype
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake-cxxflags.patch
+ "${FILESDIR}"/${P}-icon-r1.patch
+ # https://github.com/naihe2010/apvlv/commit/39f783103e99b954991183cea2b5ccbd9add2a1a
+ "${FILESDIR}"/${P}-webkitgtk4.1.patch
+)
+src_prepare() {
+ cmake_src_prepare
+}
+src_configure() {
+ local mycmakeargs=(
+ -DAPVLV_WITH_DJVU=$(usex djvu)
+ -DAPVLV_ENABLE_DEBUG=$(usex debug)
+ -DAPVLV_WITH_TXT=ON
+ -DDOCDIR="/usr/share/doc/${PF}"
+ )
+ cmake_src_configure
+}
+src_install() {
+ cmake_src_install
+ # https://github.com/naihe2010/apvlv/issues/84
+ newicon -s 32 icons/pdf.png x-office-document.png
+}
diff --git a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
deleted file mode 100644
index d1859fa25701..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ae9ae09..5831e7a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,13 +1,11 @@
- IF (WIN32)
- ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
- ELSE (WIN32)
-- SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
-+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
-
- OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
- IF (APVLV_ENABLE_DEBUG)
-- SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
-- ELSE (APVLV_ENABLE_DEBUG)
-- SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
-+ SET (CMAKE_CXX_FLAGS "-D_DEBUG ${CMAKE_CXX_FLAGS}")
- ENDIF (APVLV_ENABLE_DEBUG)
- ENDIF (WIN32)
-
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
deleted file mode 100644
index 0ffe3659d6d7..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
---- apvlv-0.1.5.orig/src/ApvlvParams.cc 2015-01-10 15:04:24.000000000 +0100
-+++ apvlv-0.1.5/src/ApvlvParams.cc 2017-02-09 20:03:08.655402750 +0100
-@@ -90,7 +90,7 @@
- return false;
- }
-
-- while ((getline (os, str)) != NULL)
-+ while (getline (os, str))
- {
- string argu, data, crap;
- stringstream is (str);
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
deleted file mode 100644
index e55f2771395a..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc
-+++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc
-@@ -200,7 +200,7 @@ namespace apvlv
-
- if (len >= 4
- && *s == '<'
-- && (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
-+ && (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
- {
- e++;
- StringKeyMap::iterator it;
---- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc
-+++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc
-@@ -90,7 +90,7 @@ namespace apvlv
- {
- mInuse = use;
-
-- if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
-+ if (mInuse == false && !gView->hasloaded (filename (), type ()))
- {
- debug ("core :%p is not needed, delete it\n", this);
- delete this;
diff --git a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
deleted file mode 100644
index c3001d4b6196..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ApvlvPdf.cc 2015-01-10 15:04:24.000000000 +0100
-+++ b/src/ApvlvPdf.cc 2019-01-17 01:29:54.479256848 +0100
-@@ -29,7 +29,6 @@
- #include "ApvlvPdf.h"
-
- #ifndef POPPLER_WITH_GDK
--#include <goo/gtypes.h>
-
- static void
- copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
diff --git a/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch
new file mode 100644
index 000000000000..101877bbff63
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ IF (WIN32)
+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+ ELSE (WIN32)
+- SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+
+ OPTION(APVLV_ENABLE_DEBUG "If build binary with debug information." OFF)
+ IF (APVLV_ENABLE_DEBUG)
diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch b/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch
new file mode 100644
index 000000000000..e5cb3526f318
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-icon-r1.patch
@@ -0,0 +1,10 @@
+--- a/apvlv.desktop
++++ b/apvlv.desktop
+@@ -2,6 +2,7 @@
+ Version=1.0
+ Type=Application
+ Name=apvlv
++Icon=x-office-document
+ Comment=A minimalistic document viewer
+ Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+ Comment[fr]=Un visionneur de document minimaliste
diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon.patch b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
new file mode 100644
index 000000000000..f5e8ad370877
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
@@ -0,0 +1,10 @@
+--- a/apvlv.desktop
++++ b/apvlv.desktop
+@@ -2,6 +2,7 @@
+ Version=1.0
+ Type=Application
+ Name=apvlv
++Icon=apvlv
+ Comment=A minimalistic document viewer
+ Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+ Comment[fr]=Un visionneur de document minimaliste
diff --git a/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch b/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch
new file mode 100644
index 000000000000..4501184d365c
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-webkitgtk4.1.patch
@@ -0,0 +1,45 @@
+From 39f783103e99b954991183cea2b5ccbd9add2a1a Mon Sep 17 00:00:00 2001
+From: Alberto Garcia <berto@igalia.com>
+Date: Wed, 16 Nov 2022 10:05:42 +0100
+Subject: [PATCH] Use the WebKitGTK 4.1 API builds when available
+
+These use soup3 instead of soup2 internally but the API is the same.
+---
+ src/CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 457f576..cd12d9b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -18,14 +18,20 @@ FIND_PACKAGE(PkgConfig)
+ PKG_CHECK_MODULES(FREETYPE2 freetype2 REQUIRED)
+ PKG_CHECK_MODULES(GTK gtk+-3.0)
+ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
+-PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED)
++PKG_CHECK_MODULES(LIBXML libxml-2.0 REQUIRED)
++PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.1)
++if (NOT WEBKIT_FOUND)
++ PKG_CHECK_MODULES(WEBKIT webkit2gtk-4.0 REQUIRED)
++endif()
+ INCLUDE_DIRECTORIES(${FREETYPE2_INCLUDE_DIRS}
+ ${GTK_INCLUDE_DIRS}
+ ${GLIB2_INCLUDE_DIRS}
++ ${LIBXML_INCLUDE_DIRS}
+ ${WEBKIT_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${FREETYPE2_LIBRARY_DIRS}
+ ${GTK_LIBRARY_DIRS}
+ ${GLIB2_LIBRARY_DIRS}
++ ${LIBXML_LIBRARY_DIRS}
+ ${WEBKIT_LIBRARY_DIRS})
+
+ IF (WIN32)
+@@ -116,7 +122,7 @@ TARGET_LINK_LIBRARIES(apvlv
+ ${GTHREAD2_LIBRARIES}
+ ${WEBKIT_LIBRARIES}
+ "-lepub"
+- "-lxml2"
++ ${LIBXML_LIBRARIES}
+ ${APVLV_REQ_LIBRARIES})
+
+ IF (WIN32)
diff --git a/app-text/apvlv/metadata.xml b/app-text/apvlv/metadata.xml
index 2985af6e7c96..6a3c3096b614 100644
--- a/app-text/apvlv/metadata.xml
+++ b/app-text/apvlv/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>c@cgps.ch</email>
+ <name>Chaquen Beliakov Amaya</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">apvlv</remote-id>
<remote-id type="github">naihe2010/apvlv</remote-id>
diff --git a/app-text/asa/asa-1.1-r1.ebuild b/app-text/asa/asa-1.1-r1.ebuild
index 83a488a04c1c..bb675306d00c 100644
--- a/app-text/asa/asa-1.1-r1.ebuild
+++ b/app-text/asa/asa-1.1-r1.ebuild
@@ -1,24 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs
DESCRIPTION="ASA Carriage control conversion for ouput by Fortran programs"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/${P}.tar.gz"
+HOMEPAGE="https://www.ibiblio.org/pub/Linux/devel/lang/fortran/"
+SRC_URI="https://www.ibiblio.org/pub/Linux/devel/lang/fortran/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64"
-IUSE=""
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/asa-1.1-implicit-int.patch"
+ )
+
+ default
+
sed \
- -e "s:-o:${LDFLAGS} -o:g" \
+ -e "s;-o;${LDFLAGS} -o;g" \
-e "/^CFLAGS/d" \
-i Makefile || die
+
tc-export CC
}
diff --git a/app-text/asa/files/asa-1.1-implicit-int.patch b/app-text/asa/files/asa-1.1-implicit-int.patch
new file mode 100644
index 000000000000..2f130912abaa
--- /dev/null
+++ b/app-text/asa/files/asa-1.1-implicit-int.patch
@@ -0,0 +1,15 @@
+Fix build with -Werror=implicit-int
+
+https://bugs.gentoo.org/880999
+
+--- a/asa.c
++++ b/asa.c
+@@ -201,7 +201,7 @@
+ copy_file(FILE *fp)
+ {
+ str line;
+- static first_line = 1;
++ static int first_line = 1;
+
+ while ((line.len=readline(fp, &(line.chr))))
+ {
diff --git a/app-text/asa/metadata.xml b/app-text/asa/metadata.xml
index c1744fe7fc5b..115e9d64a669 100644
--- a/app-text/asa/metadata.xml
+++ b/app-text/asa/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 31865ddc7063..ba6c37529be0 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,2 @@
-DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
-DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
+DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
+DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
diff --git a/app-text/asciidoc/asciidoc-10.2.0.ebuild b/app-text/asciidoc/asciidoc-10.2.0.ebuild
new file mode 100644
index 000000000000..e9bcfe8888cd
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+inherit distutils-r1 optfeature readme.gentoo-r1 pypi
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+ app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75
+ dev-libs/libxslt
+ dev-libs/libxml2:2
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_install() {
+ distutils-r1_src_install
+
+ # TODO: Consider using Debian patch to allow /usr/share?
+ insinto /usr/share/asciidoc
+ doins -r asciidoc/resources/.
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
+ optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
+ optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+ optfeature "graphviz filter support" "media-gfx/graphviz"
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
deleted file mode 100644
index dfcb6964d773..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit autotools python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- ${PYTHON_DEPS}
- graphviz? ( media-gfx/graphviz )
- highlight? (
- || (
- dev-util/source-highlight
- dev-python/pygments[${PYTHON_USEDEP}]
- app-text/highlight
- )
- )"
-DEPEND="
- test? (
- app-text/dvipng
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- ${PYTHON_DEPS}
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- "${S}/asciidoc.py" || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
- local -x ASCIIDOC_PY=asciidoc.py
- "${EPYTHON}" tests/test${PN}.py update || die
- "${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
- default
- python_fix_shebang "${ED%/}"/usr/bin/*.py
-
- readme.gentoo_create_doc
- dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
- dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
- # Below results in some files being installed twice in different locations, but they are
- # in the right place, uncompressed, and there won't be any broken links. See bug #483336
- if use examples; then
- # examples/website is full of relative symlinks,
- # deref them for copying, which dodoc doesn't do
- cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
deleted file mode 100644
index 5474f073229d..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
-
-inherit autotools python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- dev-libs/libxml2
- ${PYTHON_DEPS}
- graphviz? ( media-gfx/graphviz )
- highlight? (
- || (
- dev-util/source-highlight
- dev-python/pygments[${PYTHON_USEDEP}]
- app-text/highlight
- )
- )"
-DEPEND="
- test? (
- app-text/dvipng
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- ${PYTHON_DEPS}
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- "${S}/asciidoc.py" || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
- local -x ASCIIDOC_PY=asciidoc.py
- "${EPYTHON}" tests/test${PN}.py update || die
- "${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
- default
- python_fix_shebang "${ED}"/usr/bin/*.py
-
- readme.gentoo_create_doc
- dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
- dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
- # Below results in some files being installed twice in different locations, but they are
- # in the right place, uncompressed, and there won't be any broken links. See bug #483336
- if use examples; then
- # examples/website is full of relative symlinks,
- # deref them for copying, which dodoc doesn't do
- cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
deleted file mode 100644
index 1a8c91dd30a4..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit readme.gentoo python-single-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-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 ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- graphviz? ( media-gfx/graphviz )
- app-text/docbook-xml-dtd:4.5
- highlight? ( || ( dev-util/source-highlight \
- dev-python/pygments[${PYTHON_USEDEP}] \
- app-text/highlight )
- )
- ${PYTHON_DEPS}
-"
-DEPEND="test? ( dev-util/source-highlight
- media-sound/lilypond
- media-gfx/imagemagick
- dev-texlive/texlive-latex
- app-text/dvipng
- media-gfx/graphviz
- ${PYTHON_DEPS} )
-"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_prepare() {
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- "${S}/asciidoc.py" || die
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- python_fix_shebang "${ED}"/usr/bin/*.py
-
- readme.gentoo_create_doc
- dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
- dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
- # Below results in some files being installed twice in different locations, but they are in the right place,
- # uncompressed, and there won't be any broken links. See bug #483336.
- if use examples; then
- cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-src_test() {
- cd tests || die
- local -x ASCIIDOC_PY=../asciidoc.py
- "${PYTHON}" test${PN}.py update || die
- "${PYTHON}" test${PN}.py run || die
-}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
deleted file mode 100644
index 06458cb42e0e..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- ${PYTHON_DEPS}
- graphviz? ( media-gfx/graphviz )
- highlight? (
- || (
- dev-util/source-highlight
- dev-python/pygments[${PYTHON_USEDEP}]
- app-text/highlight
- )
- )"
-DEPEND="
- test? (
- app-text/dvipng
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- ${PYTHON_DEPS}
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- "${S}/asciidoc.py" || die
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
- local -x ASCIIDOC_PY=asciidoc.py
- "${EPYTHON}" tests/test${PN}.py update || die
- "${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
- default
- python_fix_shebang "${ED%/}"/usr/bin/*.py
-
- readme.gentoo_create_doc
- dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
- dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
- # Below results in some files being installed twice in different locations, but they are
- # in the right place, uncompressed, and there won't be any broken links. See bug #483336
- if use examples; then
- # examples/website is full of relative symlinks,
- # deref them for copying, which dodoc doesn't do
- cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
new file mode 100644
index 000000000000..075821590784
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9.1.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..10} pypy3 )
+
+inherit autotools optfeature python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
+SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+ app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75
+ dev-libs/libxslt
+ dev-libs/libxml2:2
+ "
+DEPEND="
+ test? (
+ ${PYTHON_DEPS}
+ app-text/dvipng
+ app-text/dvisvgm
+ dev-texlive/texlive-latex
+ dev-util/source-highlight
+ media-gfx/graphviz
+ media-gfx/imagemagick[png]
+ media-sound/lilypond
+ )"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
+ docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
+ filters/code/code-filter-readme.txt )
+
+src_prepare() {
+ default
+ # Only needed for prefix - harmless (does nothing) otherwise
+ sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+ asciidoc.py || die
+
+ # enforce usage of the configured version of Python
+ sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ emake DESTDIR="${D}" docs
+ fi
+
+ python_fix_shebang "${ED}"/usr/bin/*.py
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
+ optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
+ optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+ optfeature "\"graphviz\" filter support" media-gfx/graphviz
+}
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 33454ff9d090..5e3bb3ff9c88 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,18 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>marcec@gmx.de</email>
- <name>Marc Joliet</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="highlight">Enable source code highlighting</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">asciidoc</remote-id>
- </upstream>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">asciidoc</remote-id>
+ <remote-id type="github">asciidoc-py/asciidoc-py</remote-id>
+ <remote-id type="pypi">asciidoc</remote-id>
+ <bugs-to>https://github.com/asciidoc-py/asciidoc-py/issues</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 3e96b1b2c72a..73345d5c60c1 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -1,3 +1 @@
-DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-DIST aspell-0.60.7-rc2.tar.gz 2064871 BLAKE2B 74760cc10804d964bd7d7ee0097198ab26026e0bca2987223b7b58e67491e2d0914c7e24d63cb5540764017dc15358c023e1a3cf6240d5feec8d1dd25ddf6450 SHA512 f9f81efaaeaac4d2bc5b3018fe2cef9ed2406f2c648298465d983a012cf8ba3e25a46593c9833ac5d8b4c8cfca2ac3b76b476a4893ba880e4753770d134bead3
-DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b557761ffff71ccb5bc6995a57de69a9adb07db66 SHA512 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
+DIST aspell-0.60.8.1.tar.gz 3567205 BLAKE2B b7e2045658d9553beef9a7fb69264fdd5be22b5b8abce93baf08111ca5bb3e0bfedb9f351d0e4cde9d41e20960b584d8f02c0df02268cf282c925edc8ffbab8d SHA512 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7
diff --git a/app-text/aspell/aspell-0.60.7.ebuild b/app-text/aspell/aspell-0.60.7.ebuild
deleted file mode 100644
index 676475350502..000000000000
--- a/app-text/aspell/aspell-0.60.7.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
- SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-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="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de-alt" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
- sys-libs/ncurses:0=[unicode?]
- nls? ( virtual/libintl )
- !=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.5-nls.patch"
- "${FILESDIR}/${PN}-0.60.5-solaris.patch"
- "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
- "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
- # includes fix for bug #467602
- "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
- default
-
- rm m4/lt* m4/libtool.m4 || die
- eautoreconf
- elibtoolize --reverse-deps
-
- # Parallel install of libtool libraries doesn't always work.
- # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
- # This has to be after automake has run so that we don't clobber
- # the default target that automake creates for us.
- echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
- # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
- # any more. Fix this.
- [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
- append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable nls)
- $(use_enable unicode)
- --disable-static
- --sysconfdir="${EPREFIX}"/etc/aspell
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- docinto examples
- dodoc "${S}"/examples/*.c
-
- # install ispell/aspell compatibility scripts
- newbin scripts/ispell ispell-aspell
- newbin scripts/spell spell-aspell
-
- # we explicitly pass '--disable-static' to econf,
- # hence we can delete .la files unconditionally
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
deleted file mode 100644
index 5f2773604f59..000000000000
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
- SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-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="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de-alt" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
- sys-libs/ncurses:0=[unicode?]
- nls? ( virtual/libintl )
- !=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.5-nls.patch"
- "${FILESDIR}/${PN}-0.60.5-solaris.patch"
- "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
- "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
- # includes fix for bug #467602
- "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
- default
-
- rm m4/lt* m4/libtool.m4 || die
- eautoreconf
- elibtoolize --reverse-deps
-
- # Parallel install of libtool libraries doesn't always work.
- # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
- # This has to be after automake has run so that we don't clobber
- # the default target that automake creates for us.
- echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
- # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
- # any more. Fix this.
- [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
- append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable unicode) \
- --disable-static \
- --sysconfdir="${EPREFIX}"/etc/aspell
-}
-
-src_install() {
- default
-
- docinto examples
- dodoc "${S}"/examples/*.c
-
- # install ispell/aspell compatibility scripts
- newbin scripts/ispell ispell-aspell
- newbin scripts/spell spell-aspell
-
- # we explicitly pass '--disable-static' to econf,
- # hence we can delete .la files unconditionally
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.7_rc2.ebuild b/app-text/aspell/aspell-0.60.7_rc2.ebuild
deleted file mode 100644
index 676475350502..000000000000
--- a/app-text/aspell/aspell-0.60.7_rc2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
- SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
- SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-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="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de-alt" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
- sys-libs/ncurses:0=[unicode?]
- nls? ( virtual/libintl )
- !=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.5-nls.patch"
- "${FILESDIR}/${PN}-0.60.5-solaris.patch"
- "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
- "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
- # includes fix for bug #467602
- "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
- default
-
- rm m4/lt* m4/libtool.m4 || die
- eautoreconf
- elibtoolize --reverse-deps
-
- # Parallel install of libtool libraries doesn't always work.
- # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
- # This has to be after automake has run so that we don't clobber
- # the default target that automake creates for us.
- echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
- # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
- # any more. Fix this.
- [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
- append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable nls)
- $(use_enable unicode)
- --disable-static
- --sysconfdir="${EPREFIX}"/etc/aspell
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- docinto examples
- dodoc "${S}"/examples/*.c
-
- # install ispell/aspell compatibility scripts
- newbin scripts/ispell ispell-aspell
- newbin scripts/spell spell-aspell
-
- # we explicitly pass '--disable-static' to econf,
- # hence we can delete .la files unconditionally
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.8.1.ebuild b/app-text/aspell/aspell-0.60.8.1.ebuild
new file mode 100644
index 000000000000..c9600f0ed693
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls unicode"
+
+# All available language app-dicts/aspell-* packages.
+LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
+ fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
+ ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
+ qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
+)
+
+for LANG in ${LANGUAGES[@]}; do
+ IUSE+=" l10n_${LANG}"
+
+ case ${LANG} in
+ de-1901)
+ DICT="de-alt"
+ ;;
+ pt-BR)
+ DICT="pt-br"
+ ;;
+ pt-PT)
+ DICT="pt"
+ ;;
+ *)
+ DICT="${LANG}"
+ ;;
+ esac
+
+ PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
+done
+unset DICT LANG LANGUAGES
+
+RDEPEND="
+ sys-libs/ncurses:=[unicode(+)?]
+ nls? ( virtual/libintl )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.60.5-nls.patch"
+ "${FILESDIR}/${PN}-0.60.5-solaris.patch"
+ "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+ "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+ "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+)
+
+src_prepare() {
+ default
+
+ rm m4/lt* m4/libtool.m4 || die
+ eautoreconf
+ elibtoolize --reverse-deps
+
+ # Parallel install of libtool libraries doesn't always work.
+ # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+ # This has to be after automake has run so that we don't clobber
+ # the default target that automake creates for us.
+ echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+ # The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
+ [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ $(use_enable nls)
+ $(use_enable unicode)
+ --sysconfdir="${EPREFIX}"/etc/aspell
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ docinto examples
+ dodoc "${S}"/examples/*.c
+
+ # Install Aspell/Ispell compatibility scripts.
+ newbin scripts/ispell ispell-aspell
+ newbin scripts/spell spell-aspell
+
+ # As static build has been disabled,
+ # all .la files can be deleted unconditionally.
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index c1744fe7fc5b..7a5d43ec3623 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">aspell</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 93b1e107ebfb..a0d739668c61 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1 +1,4 @@
-DIST atril-1.22.1.tar.xz 1766980 BLAKE2B 0b7b1a7dfff13c5d803fed4140596940b20a322fce54c9f0faecd8e80bdc1e5e498603851a10a88763b20444377bcf4e7b124ac08953ab6aa4b3b2cce021a46c SHA512 838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d
+DIST atril-1.26.0.tar.xz 1986160 BLAKE2B 40de33749113144c49341cf8249bd20de37c3d64f3daa865dfe2bcad117e1c2b5aae2aef3b4e0199fd2656b17af236e2a863ef97933decc5072e3419219154e4 SHA512 9c4e8b1c45959136c8fc4c5db47117e45e8afca8be2294418e6c1a0f8098c162ccaa4a60e5baea34db91d45d345a3953afe95281782986e7046b87a34c8f7dbd
+DIST atril-1.26.1.tar.xz 2087068 BLAKE2B d655bffb4a8245bb3cc25fc91d08ba64ade22fb6da24f5fcb9c418c020c99df66c85a0b59f1d0c31a2f450650d9807adc248a7baeb74cb696bf3687270572f47 SHA512 276e80a81234f3228065f3a804fbd8a306ac948978f3dfd233f678dc4fb6f833ebd1123950996ae08869fac112ebb0d2785ab60fde6bfddd2d2c407a2c991ea3
+DIST atril-1.26.2.tar.xz 2095464 BLAKE2B 9e0d0829c7ae692f695e3cc5a45927b503c87e57d6e6a5808626f71de01394201047fe4bdca804369d1184802eff38364ae43e36536e1258d6798e473e5e08ac SHA512 d0b3fe14443907e43a58083282d555b74189d63d94e9ec0c2053976ad529d236738c3af4a668e813307d1ba44551b0a8ad1bc78cd8f53ab61cb811eca136eec9
+DIST atril-1.28.0.tar.xz 2093588 BLAKE2B 6e5b2f63ce1a0bd1f419b0e9ccb29887086c180ccdeb473770bc20a6408ba37b3334eca0d808c304f20c26818138eeb5116a55d02e8e84b60eeedda03254896f SHA512 dd5f77b3ba2033a3591e0f58742d75eefdd0bfdcdec80a6aa6148a1cf37e4508776733013f946103bdf0412f35dee0b283cc254fa0033fc14966df323bb371a8
diff --git a/app-text/atril/atril-1.22.1.ebuild b/app-text/atril/atril-1.22.1.ebuild
deleted file mode 100644
index fbfbdd9bd521..000000000000
--- a/app-text/atril/atril-1.22.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )"
-
-RDEPEND="
- >=app-text/poppler-0.22[cairo]
- dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=dev-libs/libxml2-2.5:2
- sys-libs/zlib
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3[introspection?]
- x11-libs/libICE
- >=x11-libs/libSM-1:0
- x11-libs/libX11
- >=x11-libs/cairo-1.9.10
- x11-libs/pango
- caja? ( >=mate-base/caja-1.17.1[introspection?] )
- djvu? ( >=app-text/djvu-3.5.17:0 )
- dvi? (
- virtual/tex-base
- t1lib? ( >=media-libs/t1lib-5:5 )
- )
- epub? (
- dev-libs/mathjax
- >=net-libs/webkit-gtk-2.4.3:4
- )
- gnome-keyring? ( >=app-crypt/libsecret-0.5 )
- introspection? ( >=dev-libs/gobject-introspection-0.6:= )
- postscript? ( >=app-text/libspectre-0.2 )
- tiff? ( >=media-libs/tiff-3.6:0 )
- xps? ( >=app-text/libgxps-0.2.1 )
- !!app-text/mate-document-viewer"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/rarian
- app-text/yelp-tools
- >=app-text/scrollkeeper-dtd-1:1.0
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1
- sys-devel/gettext
- virtual/pkgconfig"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-src_configure() {
- # Passing --disable-help would drop offline help, that would be inconsistent
- # with helps of the most of GNOME apps that doesn't require network for that.
- mate_src_configure \
- --disable-tests \
- --enable-comics \
- --enable-pdf \
- --enable-pixbuf \
- --enable-previewer \
- --enable-thumbnailer \
- $(use_with gnome-keyring keyring) \
- $(use_enable caja) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable djvu) \
- $(use_enable dvi) \
- $(use_enable epub) \
- $(use_enable introspection) \
- $(use_enable postscript ps) \
- $(use_enable t1lib) \
- $(use_enable tiff) \
- $(use_enable xps)
-}
diff --git a/app-text/atril/atril-1.26.0-r5.ebuild b/app-text/atril/atril-1.26.0-r5.ebuild
new file mode 100644
index 000000000000..e0cd2ec4ae2d
--- /dev/null
+++ b/app-text/atril/atril-1.26.0-r5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit mate python-any-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
+ >=app-text/poppler-0.22[cairo]
+ >=dev-libs/glib-2.62:2
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libICE
+ >=x11-libs/libSM-1:0
+ x11-libs/libX11
+ >=x11-libs/cairo-1.14
+ x11-libs/pango
+ caja? ( >=mate-base/caja-1.17.1[introspection?] )
+ djvu? ( >=app-text/djvu-3.5.17:0 )
+ dvi? (
+ virtual/tex-base
+ t1lib? ( >=media-libs/t1lib-5:5 )
+ )
+ epub? (
+ <dev-libs/mathjax-3
+ >=net-libs/webkit-gtk-2.6.0:4
+ )
+ keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+ postscript? ( >=app-text/libspectre-0.2 )
+ synctex? ( virtual/tex-base )
+ tiff? ( >=media-libs/tiff-3.6:= )
+ xps? ( >=app-text/libgxps-0.2.1 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+ !!app-text/mate-document-viewer
+"
+
+BDEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gtk-doc
+ dev-build/gtk-doc-am
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
+RESTRICT="test"
+
+python_check_deps() {
+ use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Passing --disable-help would drop offline help, that would be inconsistent
+ # with helps of the most of GNOME apps that doesn't require network for that.
+ mate_src_configure \
+ --enable-comics \
+ --enable-pdf \
+ --enable-pixbuf \
+ --enable-previewer \
+ --enable-thumbnailer \
+ $(use_with keyring) \
+ $(use_enable caja) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable djvu) \
+ $(use_enable dvi) \
+ $(use_enable epub) \
+ $(use_enable introspection) \
+ $(use_enable nls) \
+ $(use_enable postscript ps) \
+ $(use_enable synctex) \
+ $(use_enable t1lib) \
+ $(use_enable test tests) \
+ $(use_enable tiff) \
+ $(use_enable xps)
+}
+
+src_test() {
+ export GSETTINGS_BACKEND=keyfile
+ gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+ gsettings set org.mate.interface accessibility true || die
+ virtx emake check
+}
diff --git a/app-text/atril/atril-1.26.1-r1.ebuild b/app-text/atril/atril-1.26.1-r1.ebuild
new file mode 100644
index 000000000000..0876237d55d5
--- /dev/null
+++ b/app-text/atril/atril-1.26.1-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit mate python-any-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ >=app-text/poppler-0.22[cairo]
+ >=dev-libs/glib-2.62:2
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libICE
+ >=x11-libs/libSM-1:0
+ x11-libs/libX11
+ >=x11-libs/cairo-1.14
+ x11-libs/pango
+ caja? ( >=mate-base/caja-1.17.1[introspection?] )
+ djvu? ( >=app-text/djvu-3.5.17:0 )
+ dvi? (
+ virtual/tex-base
+ t1lib? ( >=media-libs/t1lib-5:5 )
+ )
+ epub? (
+ <dev-libs/mathjax-3
+ >=net-libs/webkit-gtk-2.6.0:4.1
+ )
+ keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+ postscript? ( >=app-text/libspectre-0.2 )
+ synctex? ( virtual/tex-base )
+ tiff? ( >=media-libs/tiff-3.6:= )
+ xps? ( >=app-text/libgxps-0.2.1 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+ !!app-text/mate-document-viewer
+"
+
+BDEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gtk-doc
+ dev-build/gtk-doc-am
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
+RESTRICT="test"
+
+PATCHES=(
+ # https://github.com/mate-desktop/atril/issues/582
+ "${FILESDIR}/${PN}-1.26.1-webkitgtk4.1.patch"
+)
+
+python_check_deps() {
+ use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Passing --disable-help would drop offline help, that would be inconsistent
+ # with helps of the most of GNOME apps that doesn't require network for that.
+ mate_src_configure \
+ --enable-comics \
+ --enable-pdf \
+ --enable-pixbuf \
+ --enable-previewer \
+ --enable-thumbnailer \
+ $(use_with keyring) \
+ $(use_enable caja) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable djvu) \
+ $(use_enable dvi) \
+ $(use_enable epub) \
+ $(use_enable introspection) \
+ $(use_enable nls) \
+ $(use_enable postscript ps) \
+ $(use_enable synctex) \
+ $(use_enable t1lib) \
+ $(use_enable test tests) \
+ $(use_enable tiff) \
+ $(use_enable xps)
+}
+
+src_test() {
+ export GSETTINGS_BACKEND=keyfile
+ gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+ gsettings set org.mate.interface accessibility true || die
+ virtx emake check
+}
diff --git a/app-text/atril/atril-1.26.2.ebuild b/app-text/atril/atril-1.26.2.ebuild
new file mode 100644
index 000000000000..2bbb97a2dea2
--- /dev/null
+++ b/app-text/atril/atril-1.26.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit mate python-any-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ app-arch/libarchive:=
+ >=app-text/poppler-0.22[cairo]
+ >=dev-libs/glib-2.62:2
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libICE
+ >=x11-libs/libSM-1:0
+ x11-libs/libX11
+ >=x11-libs/cairo-1.14
+ x11-libs/pango
+ caja? ( >=mate-base/caja-1.17.1[introspection?] )
+ djvu? ( >=app-text/djvu-3.5.17:0 )
+ dvi? (
+ virtual/tex-base
+ t1lib? ( >=media-libs/t1lib-5:5 )
+ )
+ epub? (
+ <dev-libs/mathjax-3
+ >=net-libs/webkit-gtk-2.6.0:4.1
+ )
+ keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+ postscript? ( >=app-text/libspectre-0.2 )
+ synctex? ( virtual/tex-base )
+ tiff? ( >=media-libs/tiff-3.6:= )
+ xps? ( >=app-text/libgxps-0.2.1 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+ !!app-text/mate-document-viewer
+"
+
+BDEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gtk-doc
+ dev-build/gtk-doc-am
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
+RESTRICT="test"
+
+python_check_deps() {
+ use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Passing --disable-help would drop offline help, that would be inconsistent
+ # with helps of the most of GNOME apps that doesn't require network for that.
+ mate_src_configure \
+ --enable-comics \
+ --enable-pdf \
+ --enable-pixbuf \
+ --enable-previewer \
+ --enable-thumbnailer \
+ $(use_with keyring) \
+ $(use_enable caja) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable djvu) \
+ $(use_enable dvi) \
+ $(use_enable epub) \
+ $(use_enable introspection) \
+ $(use_enable nls) \
+ $(use_enable postscript ps) \
+ $(use_enable synctex) \
+ $(use_enable t1lib) \
+ $(use_enable test tests) \
+ $(use_enable tiff) \
+ $(use_enable xps)
+}
+
+src_test() {
+ export GSETTINGS_BACKEND=keyfile
+ gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+ gsettings set org.mate.interface accessibility true || die
+ virtx emake check
+}
diff --git a/app-text/atril/atril-1.28.0.ebuild b/app-text/atril/atril-1.28.0.ebuild
new file mode 100644
index 000000000000..189aa88ef920
--- /dev/null
+++ b/app-text/atril/atril-1.28.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit mate python-any-r1 virtualx
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection keyring nls +postscript synctex t1lib test tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+ app-accessibility/at-spi2-core:2
+ app-text/poppler[cairo]
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ >=mate-base/mate-desktop-1.27.1
+ sys-libs/zlib
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3[introspection?]
+ x11-libs/libICE
+ x11-libs/libSM:0
+ x11-libs/libX11
+ x11-libs/cairo
+ x11-libs/pango
+ caja? ( mate-base/caja[introspection?] )
+ djvu? ( app-text/djvu:0 )
+ dvi? (
+ virtual/tex-base
+ t1lib? ( media-libs/t1lib:5 )
+ )
+ epub? (
+ <dev-libs/mathjax-3
+ net-libs/webkit-gtk:4.1
+ )
+ keyring? ( app-crypt/libsecret )
+ introspection? ( dev-libs/gobject-introspection:= )
+ postscript? ( app-text/libspectre )
+ synctex? ( virtual/tex-base )
+ tiff? ( media-libs/tiff:= )
+ xps? ( app-text/libgxps )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gtk-doc
+ dev-build/gtk-doc-am
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
+RESTRICT="test"
+
+python_check_deps() {
+ use test && python_has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Passing --disable-help would drop offline help, that would be inconsistent
+ # with helps of the most of GNOME apps that doesn't require network for that.
+ mate_src_configure \
+ --enable-comics \
+ --enable-pdf \
+ --enable-pixbuf \
+ --enable-previewer \
+ --enable-thumbnailer \
+ $(use_with keyring) \
+ $(use_enable caja) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable djvu) \
+ $(use_enable dvi) \
+ $(use_enable epub) \
+ $(use_enable introspection) \
+ $(use_enable nls) \
+ $(use_enable postscript ps) \
+ $(use_enable synctex) \
+ $(use_enable t1lib) \
+ $(use_enable test tests) \
+ $(use_enable tiff) \
+ $(use_enable xps)
+}
+
+src_test() {
+ export GSETTINGS_BACKEND=keyfile
+ gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+ gsettings set org.mate.interface accessibility true || die
+ virtx emake check
+}
diff --git a/app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch b/app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch
new file mode 100644
index 000000000000..3dd766bb5d5e
--- /dev/null
+++ b/app-text/atril/files/atril-1.26.1-webkitgtk4.1.patch
@@ -0,0 +1,15 @@
+Description: Search for webkit2gtk-4.1.
+Author: Unit 193 <unit193@debian.org>
+Forwarded: no
+
+--- atril-1.26.0.orig/configure.ac
++++ atril-1.26.0/configure.ac
+@@ -622,7 +622,7 @@ AC_ARG_ENABLE(epub,
+
+ have_webkit="no"
+ if test "x$enable_epub" = "xyes"; then
+- PKG_CHECK_MODULES(EPUB, webkit2gtk-4.0 >= $WEBKIT_REQUIRED \
++ PKG_CHECK_MODULES(EPUB, webkit2gtk-4.1 >= $WEBKIT_REQUIRED \
+ libxml-2.0 >= $LIBXML_REQUIRED zlib,have_webkit=yes,have_webkit=no)
+
+ if test "x$have_webkit" = "xyes"; then
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 0b999715ba8c..6a86e9c210cb 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>mate@gentoo.org</email>
- <name>Gentoo MATE Desktop</name>
+ <maintainer type="person" proxied="yes">
+ <email>oz.tiram@gmail.com</email>
+ <name>Oz Tiram</name>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>immoloism@gmail.com</email>
+ <name>Ian Jordan/name></name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="caja">Enable property page extension in
@@ -11,6 +19,8 @@
<flag name="dvi">Enable build-in DVI viewer</flag>
<flag name="epub">Enable build-in DVI viewer using
<pkg>net-libs/webkit-gtk</pkg></flag>
+ <flag name="synctex">Enable search highlighting through synctex
+ (<pkg>virtual/tex-base</pkg>)</flag>
<flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
(<pkg>media-libs/t1lib</pkg>)</flag>
<flag name="xps">Enable XPS viewer using
diff --git a/app-text/bact/bact-0.13-r1.ebuild b/app-text/bact/bact-0.13-r1.ebuild
deleted file mode 100644
index aaf872d9bd2b..000000000000
--- a/app-text/bact/bact-0.13-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Boosting Algorithm for Classification of Trees"
-HOMEPAGE="http://chasen.org/~taku/software/bact/"
-SRC_URI="http://chasen.org/~taku/software/bact/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( index.html bact.css )
-PATCHES=( "${FILESDIR}/${P}-cpp14.patch" )
-
-src_compile() {
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- dobin bact_learn bact_mkmodel bact_classify
- einstalldocs
-}
diff --git a/app-text/bact/bact-0.13-r2.ebuild b/app-text/bact/bact-0.13-r2.ebuild
new file mode 100644
index 000000000000..8c6381a627b2
--- /dev/null
+++ b/app-text/bact/bact-0.13-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Boosting Algorithm for Classification of Trees"
+HOMEPAGE="http://chasen.org/~taku/software/bact/"
+SRC_URI="http://chasen.org/~taku/software/bact/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-cpp14.patch
+)
+
+src_configure() {
+ tc-export CXX
+}
+
+src_install() {
+ dobin bact_learn bact_mkmodel bact_classify
+
+ HTML_DOCS=( index.html bact.css )
+ einstalldocs
+}
diff --git a/app-text/bact/files/bact-0.13-cpp14.patch b/app-text/bact/files/bact-0.13-cpp14.patch
index fa083c223b12..a0f6edda1eed 100644
--- a/app-text/bact/files/bact-0.13-cpp14.patch
+++ b/app-text/bact/files/bact-0.13-cpp14.patch
@@ -1,6 +1,7 @@
Fix C++14 compilation errors -- since C++11 make_pair<T1,T2> is resolved to
make_pair(T1&&, T2&&). Types should be deduced.
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312
+
+Bug: https://bugs.gentoo.org/594312
--- a/bact_classify.cpp
+++ b/bact_classify.cpp
@@ -42,3 +43,48 @@ Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312
ary.push_back ((Darts::DoubleArray::key_type *)it->first.c_str());
alpha.push_back (a);
}
+--- a/darts.h
++++ b/darts.h
+@@ -394,10 +394,10 @@
+ {
+ if (! len) len = LengthFunc() (key);
+
+- register ArrayType b = array[pos].base;
+- register ArrayUType p;
++ ArrayType b = array[pos].base;
++ ArrayUType p;
+
+- for (register size_t i = 0; i < len; ++i) {
++ for (size_t i = 0; i < len; ++i) {
+ p = b + (NodeUType)(key[i]) + 1;
+ if ((ArrayUType)b == array[p].check) b = array[p].base;
+ else return -2;
+@@ -414,8 +414,8 @@
+ {
+ if (! len) len = LengthFunc() (key);
+
+- register ArrayType b = array[pos].base;
+- register ArrayUType p;
++ ArrayType b = array[pos].base;
++ ArrayUType p;
+
+ for (; pos2 < len; ++pos2) {
+ p = b + (NodeUType)(key[pos2]) + 1;
+@@ -437,12 +437,12 @@
+ {
+ if (! len) len = LengthFunc() (key);
+
+- register ArrayType b = array[pos].base;
+- register size_t num = 0;
+- register ArrayType n;
+- register ArrayUType p;
++ ArrayType b = array[pos].base;
++ size_t num = 0;
++ ArrayType n;
++ ArrayUType p;
+
+- for (register size_t i = 0; i < len; ++i) {
++ for (size_t i = 0; i < len; ++i) {
+ p = b; // + 0;
+ n = array[p].base;
+ if ((ArrayUType) b == array[p].check && n < 0) result[num++] = -n-1;
diff --git a/app-text/bact/files/bact-0.13-makefile.patch b/app-text/bact/files/bact-0.13-makefile.patch
new file mode 100644
index 000000000000..d27879559d1d
--- /dev/null
+++ b/app-text/bact/files/bact-0.13-makefile.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,6 @@
+-CXX = c++
+ VERSION = 0.13
+-CXXFLAGS = -O3 -Wall -Wno-deprecated
++CXXFLAGS += -Wall -Wno-deprecated
+ EXECPREFIX =
+-LDFLAGS =
+ TARGETS1 = bact_learn${EXEC_PREFIX}
+ TARGETS2 = bact_classify${EXEC_PREFIX}
+ TARGETS3 = bact_mkmodel${EXEC_PREFIX}
+@@ -10,14 +8,11 @@
+
+ all: bact_learn bact_mkmodel bact_classify
+
+-bact_learn: bact_learn.o ${OBJ}
+- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS1} ${OBJ} bact_learn.o ${LDFLAGS}
++bact_learn: ${OBJ}
+
+-bact_classify: bact_classify.o ${OBJ}
+- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS2} ${OBJ} bact_classify.o ${LDFLAGS}
++bact_classify: ${OBJ}
+
+-bact_mkmodel: bact_mkmodel.o ${OBJ}
+- ${CXX} ${CFLAGS} ${LDFLAGS} -o ${TARGETS3} ${OBJ} bact_mkmodel.o ${LDFLAGS}
++bact_mkmodel: ${OBJ}
+
+ clean:
+ rm -f *.o ${TARGETS1} ${TARGETS2} ${TARGETS3} core *~ *.tar.gz *.exe core* med.model* jp.model*
+@@ -33,7 +28,6 @@
+ scp bact-${VERSION}.tar.gz index.html bact.css chasen.org:public_html/software/bact/
+
+ check:
+-test:
+ ./bact_learn -T1000 med.train med.model
+ ./bact_mkmodel -i med.model -o med.model.bin -O med.model.O
+ ./bact_classify med.test med.model.bin
diff --git a/app-text/bact/metadata.xml b/app-text/bact/metadata.xml
index 38a3b6a3c089..514b83d226ee 100644
--- a/app-text/bact/metadata.xml
+++ b/app-text/bact/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 5cd4f25b9d3a..dae2ad2935b3 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,2 +1 @@
-DIST barcode-0.98.tar.gz 335658 BLAKE2B 93694332200fce9311d4282c15b2e87e89a54af1a04cd251c9feb9b5ec056e62e97cca9f33e498df1d31d1d98d52e4f0b257f0669e9f7981addcc8e12a61f0cc SHA512 b2ff43d0c752a9fe7c17d65ef136ff2432ceddd27879c91cb18e46e9b0fc8ed6c174aa4154c0fa6d6e70c478ac86448b8eafa1857bb759159b2eaecc8d6f7ca1
-DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
+DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e
diff --git a/app-text/barcode/barcode-0.98-r1.ebuild b/app-text/barcode/barcode-0.98-r1.ebuild
deleted file mode 100644
index ef3174b628d4..000000000000
--- a/app-text/barcode/barcode-0.98-r1.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
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="barcode generator"
-HOMEPAGE="https://www.gnu.org/software/barcode/"
-SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RDEPEND="app-text/libpaper"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-info.patch
- sed -i -e '/^LDFLAGS =/s:=:+=:' \
- -e "/^aLIBDIR/s:lib:$(get_libdir):" \
- -e '/^INFODIR/s:info:share/info:' \
- -e '/^MAN/s:man:share/man:' \
- Makefile.in || die
-}
-
-src_configure() {
- tc-export CC
- econf
-}
-
-src_install() {
- emake install prefix="${ED}/usr"
- dodoc ChangeLog README TODO doc/barcode.{pdf,ps}
-}
diff --git a/app-text/barcode/barcode-0.99-r1.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild
new file mode 100644
index 000000000000..477a4dff5786
--- /dev/null
+++ b/app-text/barcode/barcode-0.99-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="barcode generator"
+HOMEPAGE="https://www.gnu.org/software/barcode/"
+SRC_URI="mirror://gnu/barcode/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="app-text/libpaper"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-install-static-lib.patch
+ "${FILESDIR}"/${P}-not-a-literal-string.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e '/^LDFLAGS =/s:=:+=:' \
+ -e "/^aLIBDIR/s:lib:$(get_libdir):" \
+ -e '/^INFODIR/s:info:share/info:' \
+ -e '/^MAN/s:man:share/man:' \
+ Makefile.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --disable-shared
+}
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99.ebuild
deleted file mode 100644
index 5b04b0aef75b..000000000000
--- a/app-text/barcode/barcode-0.99.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib
-
-DESCRIPTION="barcode generator"
-HOMEPAGE="https://www.gnu.org/software/barcode/"
-SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-RDEPEND="app-text/libpaper"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- sed -i -e '/^LDFLAGS =/s:=:+=:' \
- -e "/^aLIBDIR/s:lib:$(get_libdir):" \
- -e '/^INFODIR/s:info:share/info:' \
- -e '/^MAN/s:man:share/man:' \
- Makefile.in || die
-
- default
-}
-
-src_install() {
- default
- dodoc ChangeLog README TODO
-}
diff --git a/app-text/barcode/files/0.98-info.patch b/app-text/barcode/files/0.98-info.patch
deleted file mode 100644
index 740458f88ed4..000000000000
--- a/app-text/barcode/files/0.98-info.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/barcode.info.old 2003-10-26 19:08:39.000000000 -0800
-+++ doc/barcode.info 2003-10-26 19:58:42.179447512 -0800
-@@ -1,6 +1,11 @@
- This is barcode.info, produced by makeinfo version 4.0 from
- barcode.texinfo.
-
-+INFO-DIR-SECTION Miscellaneous
-+START-INFO-DIR-ENTRY
-+* Barcode: (barcode). Barcode generation library.
-+END-INFO-DIR-ENTRY
-+
- This file is the User's Manual for the barcode library (version
- 0.98).
-
diff --git a/app-text/barcode/files/barcode-0.99-fno-common.patch b/app-text/barcode/files/barcode-0.99-fno-common.patch
new file mode 100644
index 000000000000..5abb8a26824f
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-fno-common.patch
@@ -0,0 +1,25 @@
+Taken from: https://sources.debian.org/patches/barcode/0.99-4/0006-Fix-FTBFS-with-gcc-10.patch/
+Author: https://sources.debian.org/patches/barcode/0.99-4/0006-Fix-FTBFS-with-gcc-10.patch/
+--- a/barcode.h
++++ b/barcode.h
+@@ -123,6 +123,6 @@ extern int Barcode_Version(char *versionname);
+ }
+ #endif
+
+-int streaming;
++extern int streaming;
+
+ #endif /* _BARCODE_H_ */
+diff --git a/library.c b/library.c
+index 30946ff..5390a2b 100644
+--- a/library.c
++++ b/library.c
+@@ -30,6 +30,8 @@
+ #endif
+ #include <errno.h>
+
++int streaming;
++
+ /*
+ * This function allocates a barcode structure and strdup()s the
+ * text string. It returns NULL in case of error
diff --git a/app-text/barcode/files/barcode-0.99-install-static-lib.patch b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
new file mode 100644
index 000000000000..44d32d059ce9
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
@@ -0,0 +1,13 @@
+--- barcode-0.99_orig/Makefile.am 2020-12-06 15:39:43.270943391 +0100
++++ barcode-0.99/Makefile.am 2020-12-06 15:40:26.723942515 +0100
+@@ -25,7 +25,9 @@
+
+ bin_PROGRAMS = barcode sample
+
+-noinst_LTLIBRARIES = libbarcode.la
++lib_LTLIBRARIES = libbarcode.la
++
++include_HEADERS = barcode.h lib/gettext.h
+
+ ACLOCAL_AMFLAGS = -I m4
+
diff --git a/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch b/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch
new file mode 100644
index 000000000000..63b49d25c058
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-not-a-literal-string.patch
@@ -0,0 +1,19 @@
+Taken from: https://lists.gnu.org/archive/html/bug-barcode/2021-09/msg00000.html
+Author: https://lists.gnu.org/archive/html/bug-barcode/2021-09/msg00000.html
+---
+ plessey.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plessey.c b/plessey.c
+index 2f59e39..3089a3c 100644
+--- a/plessey.c
++++ b/plessey.c
+@@ -149,7 +149,7 @@ int Barcode_pls_encode(struct Barcode_Item *bc)
+ checkptr[i+j] ^= check[j];
+ }
+ for (i = 0; i < 8; i++) {
+- sprintf(ptr, patterns[checkptr[strlen(text) * 4 + i]]);
++ sprintf(ptr, "%s", patterns[checkptr[strlen(text) * 4 + i]]);
+ ptr += 2;
+ }
+ fprintf(stderr, _("CRC: "));
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
index 7b2aa138b855..b4e14c04b700 100644
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>tamiko@gentoo.org</email>
- <name>Matthias Maier</name>
-</maintainer>
+ <maintainer type="person">
+ <email>tamiko@gentoo.org</email>
+ <name>Matthias Maier</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">barcode</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 05976aafbfaa..60739ab8ad05 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,2 +1 @@
-DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
deleted file mode 100644
index c9f47dc27058..000000000000
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converter to generate console fonts from BDF source fonts"
-HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
-SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/console-setup-${PV}"
-
-src_compile() {
- :
-}
-
-src_install() {
- dobin Fonts/bdf2psf
-
- insinto usr/share/bdf2psf
- doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
-
- doman man/bdf2psf.1
- dodoc debian/README.fontsets
-}
diff --git a/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild b/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild
new file mode 100644
index 000000000000..2f726453904e
--- /dev/null
+++ b/app-text/bdf2psf/bdf2psf-1.155-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converter to generate console fonts from BDF source fonts"
+HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
+SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
+S="${WORKDIR}/console-setup-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="dev-lang/perl"
+
+src_compile() {
+ :
+}
+
+src_install() {
+ dobin Fonts/bdf2psf
+
+ insinto /usr/share/bdf2psf
+ doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
+
+ doman man/bdf2psf.1
+ dodoc debian/README.fontsets
+}
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
deleted file mode 100644
index 29eca139506f..000000000000
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Converter to generate console fonts from BDF source fonts"
-HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
-SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/console-setup-${PV}"
-
-src_compile() {
- :
-}
-
-src_install() {
- dobin Fonts/bdf2psf
-
- insinto usr/share/bdf2psf
- doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
-
- doman man/bdf2psf.1
- dodoc debian/README.fontsets
-}
diff --git a/app-text/bdf2psf/metadata.xml b/app-text/bdf2psf/metadata.xml
index de09ffd8b089..115e9d64a669 100644
--- a/app-text/bdf2psf/metadata.xml
+++ b/app-text/bdf2psf/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index c2646ad9b744..02c7c5dc9e01 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1 +1 @@
-DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f
+DIST bibclean-3.06.tar.xz 1697732 BLAKE2B c1d9623588e892360eb98e753b44cb54e0eb65d3e3d46a04463c0c3183beacb58fd07542ba06d00eb754061b45ed195a82b90b2843b6ba456c7ba09856090474 SHA512 b167243415f010d7597ffdf52c5bb71de3585f70443c3a04f762a633b2bc276c7aef50e16159c32d8765924be2781b1e60a111305a17c2f42b68ed5216b2e31b
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild
deleted file mode 100644
index fc8d456dd364..000000000000
--- a/app-text/bibclean/bibclean-2.17.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 toolchain-funcs
-
-DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
-SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
-HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
-
-# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SLOT="0"
-
-src_compile() {
- emake -j1 LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin bibclean
- newman bibclean.man bibclean.1
-}
diff --git a/app-text/bibclean/bibclean-3.06.ebuild b/app-text/bibclean/bibclean-3.06.ebuild
new file mode 100644
index 000000000000..25ac2ac350fc
--- /dev/null
+++ b/app-text/bibclean/bibclean-3.06.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
+HOMEPAGE="https://ftp.math.utah.edu/pub/bibclean/"
+SRC_URI="https://ftp.math.utah.edu/pub/bibclean/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin bibclean
+ newman bibclean.man bibclean.1
+}
diff --git a/app-text/bibclean/metadata.xml b/app-text/bibclean/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/bibclean/metadata.xml
+++ b/app-text/bibclean/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 08f40b4010d6..0f53ac88566b 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,2 +1 @@
-DIST bibletime-2.11.0.tar.xz 2403136 BLAKE2B fecf854a40ad0e188fde8ad3d047acf6274bfdf20f6a6211a6ff9d41e3de38f4d311db92e2b2fdf735e293163637cf4b553e722a05174d8c84201e94cf6e7b7c SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6
-DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
+DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090
diff --git a/app-text/bibletime/bibletime-2.11.0.ebuild b/app-text/bibletime/bibletime-2.11.0.ebuild
deleted file mode 100644
index 8c7cd16f9aa8..000000000000
--- a/app-text/bibletime/bibletime-2.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt Bible study application using the SWORD library"
-HOMEPAGE="http://www.bibletime.info/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-# bug 313657
-RESTRICT="test"
-
-RDEPEND="
- >=app-text/sword-1.7.0
- dev-cpp/clucene
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- dev-libs/icu:=
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
- net-misc/curl
- sys-libs/zlib
-"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
- -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild
deleted file mode 100644
index ebbcd684ed65..000000000000
--- a/app-text/bibletime/bibletime-2.11.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Qt Bible study application using the SWORD library"
-HOMEPAGE="http://www.bibletime.info/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# bug 313657
-RESTRICT="test"
-
-RDEPEND="
- >=app-text/sword-1.7.0
- dev-cpp/clucene
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- dev-libs/icu:=
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
- net-misc/curl
- sys-libs/zlib
-"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
- -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
diff --git a/app-text/bibletime/bibletime-3.0.3-r4.ebuild b/app-text/bibletime/bibletime-3.0.3-r4.ebuild
new file mode 100644
index 000000000000..70071451bccf
--- /dev/null
+++ b/app-text/bibletime/bibletime-3.0.3-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="https://bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=app-text/sword-1.8.1[curl,icu]
+ dev-cpp/clucene
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ dev-qt/qttest:5"
+BDEPEND="dev-qt/linguist-tools:5
+ doc? (
+ app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ app-text/po4a
+ dev-libs/libxslt
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.3-no_indirect_deps.patch
+)
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+ -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+# TODO: FOO_HTML_LANGUAGES. Current lists for "all languages":
+# handbook: ar br cs de en es fi fr hu it ko lt nl pt_BR ru th uk
+# howto: ar bg br cs da de en es fi fr hu it ja ko lt nl pt_BR ru th uk
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HANDBOOK_HTML=$(usex doc)
+ -DBUILD_HANDBOOK_PDF=no
+ -DBUILD_HOWTO_HTML=$(usex doc)
+ -DBUILD_HOWTO_PDF=no
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch b/app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch
new file mode 100644
index 000000000000..87a129c9d80b
--- /dev/null
+++ b/app-text/bibletime/files/bibletime-3.0.3-no_indirect_deps.patch
@@ -0,0 +1,20 @@
+According to documentation upstream build scripts only look for these
+packages to try and guess whether support for them has been enabled
+in app-text/sword.
+
+--- a/platforms/common/core/core.pro
++++ b/platforms/common/core/core.pro
+@@ -173,13 +173,5 @@
+ # Clucene
+ include(../../common/clucene/clucene.pro)
+
+-# CURL
+-# optional
+-curl:include(../../common/curl/curl.pro)
+-
+-# ICU
+-# optional
+-icu:include(../../common/icu/icu.pro)
+-
+ # Sword
+ include(../../common/sword/sword.pro)
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index f1ef81c14f45..524103f23513 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>theology@gentoo.org</email>
- <name>Theology</name>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
<longdescription>
-BibleTime is a Bible study application for Linux. It is based on the
-K Desktop Environment and uses the SWORD programming library to work
-with Bible texts, commentaries, dictionaries and books provided by
+BibleTime is a Bible study application for Linux. It is based on the
+K Desktop Environment and uses the SWORD programming library to work
+with Bible texts, commentaries, dictionaries and books provided by
the Crosswire Bible Society.
</longdescription>
<upstream>
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
deleted file mode 100644
index 02ee377e791e..000000000000
--- a/app-text/bibus/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bibus-1.5.2-lo-4.patch.xz 13196 BLAKE2B 1dfef94699eee77537fea3d3b93aeb1613fc93b68df1deb43c4af6fae0bf5aeb2282bb823f4824272acdef53a5edcd9b30a52415e82da00952971fa65ec0d9dc SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1
-DIST bibus_1.5.2.orig.tar.gz 5411889 BLAKE2B db95ea4b1e0ba22fd85cb36d945864741a2f40890499018698c679c9f7d4b77b2299d2aa941664b2e4011c41ea62a31463b39c392eb3678633de17482f928474 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild
deleted file mode 100644
index f046112d4e06..000000000000
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-r1 versionator xdg-utils
-
-DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word"
-HOMEPAGE="http://bibus-biblio.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
- https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
- "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="mysql"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Most of this mess is designed to give the choice of sqlite or mysql
-# but prefer sqlite. We also need to default to sqlite if neither is requested.
-# Cannot depend on virtual/ooo
-# bibus fails to start with app-office/openoffice-bin (bug #288232).
-RDEPEND="
- ${PYTHON_DEPS}
- app-office/libreoffice
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
- dev-db/sqliteodbc
- dev-db/unixODBC
- mysql? (
- dev-python/mysql-python[${PYTHON_USEDEP}]
- dev-db/myodbc
- )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-install.patch
- "${FILESDIR}"/${P}-bibus.cfg.patch
- "${WORKDIR}"/${P}-lo-4.patch
- "${FILESDIR}"/${P}-wx30.patch
-)
-
-pkg_setup() {
- if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
- OFFICESUITE="/usr/$(get_libdir)/openoffice"
- else
- OFFICESUITE="/usr/$(get_libdir)/libreoffice"
- fi
-}
-
-src_compile() { :; }
-
-src_install() {
- einfo "Installing for ${OFFICESUITE}"
- installation() {
- emake \
- DESTDIR="${D}" \
- prefix="${EPREFIX}/usr" \
- oopath="${OFFICESUITE}/program" \
- ooure="${OFFICESUITE}/ure-link/lib" \
- oobasis="${OFFICESUITE}/program" \
- sysconfdir="${EPREFIX}/etc" \
- pythondir="$(python_get_sitedir)" \
- python=${PYTHON} \
- install install-doc-en
- }
- python_foreach_impl installation
- python_foreach_impl python_optimize
-
- python_foreach_impl python_newscript bibusStart.py ${PN}
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
deleted file mode 100644
index bfba0c0ac43b..000000000000
--- a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- bibusStart.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/bibusStart.py b/bibusStart.py
-index edfc19f..99c5381 100644
---- a/bibusStart.py
-+++ b/bibusStart.py
-@@ -17,12 +17,14 @@
- # along with Bibus; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- #
--import ConfigParser,os,sys,urllib,urlparse
-+import ConfigParser,os,sys,urllib,urlparse,site
- cp=ConfigParser.ConfigParser()
- fileName = sys.argv[0]
- while os.path.islink(fileName): fileName = os.readlink(fileName)
- sourcedir = os.path.abspath( os.path.dirname(fileName) )
--cp.read( os.path.join(sourcedir,'bibus.cfg') )
-+bibus_sitedir = os.path.join(site.getsitepackages()[0], 'bibus')
-+bibus_cfg = os.path.join(bibus_sitedir, 'bibus.cfg')
-+cp.read(bibus_cfg)
- # We read first, then if it is not null we convert to absolute path
- # otherwise, empty path will be converted to the current directory path
- python = cp.get('PATH','python')
-@@ -69,5 +71,5 @@ else:
- except KeyError:
- os.environ[LIBPATH] = oopath
- # starting Bibus
--os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(sourcedir,'bibus.py') +QUOTE )
-+os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(bibus_sitedir,'bibus.py') +QUOTE )
-
diff --git a/app-text/bibus/files/bibus-1.5.2-install.patch b/app-text/bibus/files/bibus-1.5.2-install.patch
deleted file mode 100644
index 5225fcd6c3d8..000000000000
--- a/app-text/bibus/files/bibus-1.5.2-install.patch
+++ /dev/null
@@ -1,110 +0,0 @@
- Makefile | 62 ++++++++++++++++++++++++--------------------------------------
- 1 files changed, 24 insertions(+), 38 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d41b12d..b07cdff 100755
---- a/Makefile
-+++ b/Makefile
-@@ -14,62 +14,60 @@ mandir = $(prefix)/share/man
- man1dir = $(mandir)/man1
-
- define install-files
-- install -d $(datadir)/bibus
-- install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
-+ install -d $(DESTDIR)$(pythondir)/bibus
-+ install -m644 *.py MySQL_Bibus.ini $(DESTDIR)/$(pythondir)/bibus/
- #
- for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
-- find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
-+ find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(DESTDIR)/$(pythondir)/bibus/'{}' ';' ; \
- done
-- install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
-+ install -m644 Setup/UnoConnectionListener.odg -D $(DESTDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg
- # locale files. We look for all the directory in locale/
- for dir in $(wildcard locale/*); do \
- if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \
-- install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
-+ install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(DESTDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
- fi; \
- done
- # bibus.config in /etc
-- install -m644 bibus.config -D $(sysconfdir)/bibus.config
-+ install -m644 bibus.config -D $(DESTDIR)/$(sysconfdir)/bibus.config
- # man page
-- install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
-+ install -m644 Setup/bibus.1 -D $(DESTDIR)/$(man1dir)/bibus.1
-
- # freedesktop icon and shortcut
-- install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
-- install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
-+ install -m644 Pixmaps/bibus.png -D $(DESTDIR)$(datadir)/pixmaps/bibus.png
-+ install -m644 Setup/bibus.desktop -D $(DESTDIR)/$(datadir)/applications/bibus.desktop
- # The following lines are presumably not needed since icons/desktop are in standard locations
- #echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
- #echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
-
- # bibus command
-- install -d $(bindir)
-- ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
-- chmod 755 $(datadir)/bibus/bibusStart.py
-+ install -d $(DESTDIR)/$(bindir)
-+ ln -sf $(pythondir)/bibus/bibusStart.py $(DESTDIR)/$(bindir)/bibus
-+ chmod 755 $(DESTDIR)$(pythondir)/bibus/bibusStart.py
-
- # basic doc files
-- install -m755 -d $(datadir)/doc/bibus
-- install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
-+ install -m755 -d $(DESTDIR)/$(datadir)/doc/${PF}
-+ install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(DESTDIR)/$(datadir)/doc/${PF}
-
- # generating bibus.cfg file
-- echo '[PATH]' > $(datadir)/bibus/bibus.cfg
-- echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
-- echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
-- echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
-- echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
-- echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
-- echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
-- echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
-- echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
-+ echo '[PATH]' > $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'python = $(python)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'oopath = $(oopath)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'ooure = $(ooure)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'oobasis = $(oobasis)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'docdir = $(datadir)/doc/${PF}/html' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'localedir = $(datadir)/locale' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
-+ echo 'systemconf = $(sysconfdir)/bibus.config' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
- endef
-
- define install-doc-en
- # copying docs in from Docs/html/en/ for bibus-doc-en
- cd Docs;\
-- find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
-+ find html/en/* -type f -exec install -m644 '{}' -D $(DESTDIR)/$(datadir)/doc/${PF}/'{}' ';'
- endef
-
- define compile
- # compile recursively all the python files located in $(datadir)/bibus
-- $(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
-- $(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
-+ echo "No compilation"
- endef
-
- install-files:
-@@ -83,15 +81,3 @@ install:
- $(install-doc-en)
- $(compile)
-
-- # write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
-- echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
-- echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
-- chmod 744 $(datadir)/bibus/Setup/uninstall.sh
-- # end uninstaller
diff --git a/app-text/bibus/files/bibus-1.5.2-wx30.patch b/app-text/bibus/files/bibus-1.5.2-wx30.patch
deleted file mode 100644
index b53486741817..000000000000
--- a/app-text/bibus/files/bibus-1.5.2-wx30.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Author: Jan Beyer <jan@beathovn.de>
-Copyright: Copyright 2014 Jan Beyer
-License: The same as the Bibus packaging.
-Description: Patch to migrate bibus from wxpython2.8 to wxpython 3.0
- Thanks to Olly Betts for the script that did the main work:
- http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
-
---- a/ShortcutEd.py
-+++ b/ShortcutEd.py
-@@ -27,7 +27,7 @@
- self.category = category # edited category
- self.short = short # current shortcuts list
- # begin wxGlade: Capture.__init__
-- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
-+ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
- wx.Dialog.__init__(self, *args, **kwds)
- self.label_1 = wx.StaticText(self, -1, _("Capture from field"))
- self.choice_field = wx.Choice(self, -1, choices=[])
-@@ -110,7 +110,7 @@
- self.parentshort = short # we keep a copy for updating it latter
- self.db = db # connection to the database
- # begin wxGlade: ShortcutEd.__init__
-- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
-+ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
- wx.Dialog.__init__(self, *args, **kwds)
- self.list_shortcuts = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.LC_EDIT_LABELS|wx.LC_NO_HEADER|wx.LC_SINGLE_SEL|wx.SUNKEN_BORDER)
- self.button_new = wx.Button(self, -1, _("New"))
---- a/bibus.py
-+++ b/bibus.py
-@@ -120,7 +120,7 @@
- #
- class Bibus(wx.App):
- def OnInit(self):
-- wx.InitAllImageHandlers()
-+ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
- self.SetAppName(APPNAME)
- # reading and eventually converting the config file
- if os.path.isfile( wx.StandardPaths.Get().GetUserDataDir() ): # old config file in $HOME/.bibus
---- a/Pref_Shortcuts.py
-+++ b/Pref_Shortcuts.py
-@@ -26,7 +26,7 @@
- def __init__(self, categories, *args, **kwds):
- self.categories = categories # current categories in parent. may be different from BIB.SHORTCUTS
- # begin wxGlade: NewCategory.__init__
-- kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
-+ kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
- wx.Dialog.__init__(self, *args, **kwds)
- self.label_1 = wx.StaticText(self, -1, _("Name"))
- self.text_ctrl_name = wx.TextCtrl(self, -1, "")
-@@ -80,7 +80,7 @@
- def onFile(self,evt):
- tmpfilen = self.text_ctrl_name.GetValue()
- if not tmpfilen: tmpfilen = 'shortcut'
-- filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.SAVE )
-+ filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.FD_SAVE )
- if filen:
- self.text_ctrl_filen.SetValue(filen)
-
---- a/moveFile.py
-+++ b/moveFile.py
-@@ -96,7 +96,7 @@
-
- if __name__ == "__main__":
- app = wx.PySimpleApp(0)
-- wx.InitAllImageHandlers()
-+ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
- dialog_1 = MoveFile(None, -1, "")
- app.SetTopWindow(dialog_1)
- dialog_1.Show()
---- a/OOo.py
-+++ b/OOo.py
-@@ -103,7 +103,7 @@
- self.saveDoc()
- self.finalize()
- except bibOOo_IOError:
-- url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"), _("All files")),flags=wx.SAVE|wx.OVERWRITE_PROMPT)
-+ url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"), _("All files")),flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
- if url == '':
- return
- else:
---- a/BibFrame.py
-+++ b/BibFrame.py
-@@ -971,7 +971,7 @@
-
- def __getFile(self,question=_("Please choose the file encoding"),mode='r',enc='ascii'):
- """Get file and encoding. Return open file or None"""
-- dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.OPEN | wx.CHANGE_DIR)
-+ dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
- try:
- answer = dlg.ShowModal()
- filename = dlg.GetPath()
-@@ -1048,7 +1048,7 @@
- # --------------------------------- File Export --------------------------------------------
- def __saveFile(self,question=_("Please choose the file encoding"),mode='r',enc='latin_1'):
- """Get file and encoding. Return open file or None"""
-- dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
-+ dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
- try:
- answer = dlg.ShowModal()
- filename = dlg.GetPath()
-@@ -1124,7 +1124,7 @@
-
- def __saveFileHTML(self,question=_("Choose the destination file"),mode='w'):
- """Get file. Return open file or None"""
-- dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
-+ dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
- try:
- answer = dlg.ShowModal()
- finally:
-@@ -1176,7 +1176,7 @@
- ret = wx.GetSingleChoiceIndex(_('What do you want to export?'),_('Export'),[_('Selection'),_('Current key'),_('All')])
- if ret == -1: return
- # get the file destination
-- answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR )
-+ answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR )
- if answer == '': return
- # we create the database
- try:
-@@ -1746,7 +1746,7 @@
-
- arcstarttime=time.time()
- archivename=time.strftime('bibusbackup_%y%m%d_%H%M%S.tar', time.localtime(arcstarttime))
-- dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
-+ dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
- dlg.SetDirectory(userDocsDir)
- dlg.SetFilename(archivename)
- dlg.SetWildcard("TAR archive (*.tar)|*.tar")
---- a/FirstStart/MySQL_Setup.py
-+++ b/FirstStart/MySQL_Setup.py
-@@ -533,7 +533,7 @@
-
- if __name__ == "__main__":
- app = wx.PySimpleApp(0)
-- wx.InitAllImageHandlers()
-+ # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
- MySQL_Setup = MySQL_Setup_Main(None, -1, "")
- app.SetTopWindow(MySQL_Setup)
- MySQL_Setup.Show()
---- a/StyleEditor/FormatEditor.py
-+++ b/StyleEditor/FormatEditor.py
-@@ -33,7 +33,7 @@
-
- class FormatEditor(wx.Dialog):
- def __init__(self, *args, **kwds):
-- #kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.THICK_FRAME
-+ #kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER
- kwds["style"] = wx.DEFAULT_FRAME_STYLE
- self.filename = kwds['filename']
- del kwds['filename']
-@@ -130,7 +130,7 @@
- wx.MessageBox(_("The style name is not correct, please avoid: '/' under linux; '\\' and ':' under Windows"),_("Style name"),style=wx.OK|wx.ICON_ERROR)
-
- # def SaveAs(self,evt):
--# self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.SAVE | wx.OVERWRITE_PROMPT)
-+# self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- # #print "%r"%self.filename
- # if self.filename:
- # self.Save(evt)
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
deleted file mode 100644
index 114579753777..000000000000
--- a/app-text/bibus/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>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">bibus-biblio</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index ebad9e12db70..0bde49383a5d 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1 +1 @@
-DIST bibutils_6.7_src.tgz 580792 BLAKE2B 29c5863bc414ef7b2f362d95352c0e042c1bcc3275017df82b0206d96520b3f5c3fe1e12563577b84a8bd94b0677bf1ad04ecbd80dcbcc194a71037bbd6facba SHA512 08db07408eee26bce42dbd00b7e821ef41dc12c7ce847425e81145927bcfc6ea7180ff719056e089917811aa9675a09dd52e1e02b8187b8618f67647efcb1236
+DIST bibutils_7.1_src.tgz 620141 BLAKE2B f020ea7c8164a870ef4c72defae1adc11558661a7ae9f3b037115cfc4a9e71b4f37c64f3b74641182300c3e921b8a0c309257a468b6b32f4fc2915e4a36f04d1 SHA512 2a155ca60c97d37941c860635d8e6920bd78de84452e1fee93a2f7331392f6a43f2c10055e84349bcac89314025d1524fd5cc73c47ad1613baa7baf2667c3f33
diff --git a/app-text/bibutils/bibutils-6.7.ebuild b/app-text/bibutils/bibutils-6.7.ebuild
deleted file mode 100644
index 0b626bb59e52..000000000000
--- a/app-text/bibutils/bibutils-6.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
-HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- # The custom configure script still sucks several releases later, so we'll
- # just do its job ourselves
- rm -f Makefile configure || die "Failed to purge old Makefile"
- sed \
- -e "s:REPLACE_CC:$(tc-getCC):g" \
- -e "s:REPLACE_EXEEXT::g" \
- -e "s:REPLACE_LIBTARGET:libbibutils.so:g" \
- -e "s:REPLACE_LIBEXT:.so:g" \
- -e "s:REPLACE_CFLAGS:${CFLAGS}:g" \
- -e "s:REPLACE_CLIBFLAGS:${CFLAGS} -fPIC:g" \
- -e "s:REPLACE_RANLIB:$(tc-getRANLIB):g" \
- -e 's:REPLACE_POSTFIX::g' \
- -e "s:REPLACE_INSTALLDIR:\"${D}/usr/bin\":g" \
- -e "s:REPLACE_LIBINSTALLDIR:\"${D}/usr/$(get_libdir)\":g" \
- -e 's:make:$(MAKE):g' \
- Makefile_start > Makefile \
- || die "Failed to set up Makefile"
-
- cp lib/Makefile.dynamic lib/Makefile || die
- cp bin/Makefile.dynamic bin/Makefile || die
- cp test/Makefile.dynamic test/Makefile || die
-}
-
-src_install() {
- dodir /usr/bin
- emake install
- dodoc ChangeLog
-}
diff --git a/app-text/bibutils/bibutils-7.1.ebuild b/app-text/bibutils/bibutils-7.1.ebuild
new file mode 100644
index 000000000000..ff15d9bad3bb
--- /dev/null
+++ b/app-text/bibutils/bibutils-7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
+HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+
+src_prepare() {
+ default
+ sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
+ sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
+}
+
+src_configure() {
+ ./configure \
+ --install-dir /usr/bin \
+ --install-lib /usr/$(get_libdir) \
+ --dynamic || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ DISTRO_CFLAGS="${CFLAGS}" \
+ LDFLAGSIN="${LDFLAGS}"
+}
+
+src_test() {
+ emake \
+ CC="$(tc-getCC)" \
+ DISTRO_CFLAGS="${CFLAGS}" \
+ LDFLAGSIN="${LDFLAGS}" test
+}
diff --git a/app-text/bibutils/metadata.xml b/app-text/bibutils/metadata.xml
index 0c6991d7902b..d24e2cfca4c4 100644
--- a/app-text/bibutils/metadata.xml
+++ b/app-text/bibutils/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">bibutils</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index d5da3dc5dad5..fce82cc6b67d 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -1,19 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=8
-DESCRIPTION="binfind searches files for a byte sequence specified on the command line"
-HOMEPAGE="http://www.lith.at/binfind"
-SRC_URI="http://www.lith.at/binfind/${P}.tar.gz"
-LICENSE="GPL-2"
+inherit autotools
+
+DESCRIPTION="Search files for a byte sequence specified on the command line"
+HOMEPAGE="https://www.lith.at/binfind/"
+SRC_URI="https://www.lith.at/binfind/${P}.tar.gz"
+
+LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
+KEYWORDS="~amd64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS NEWS README ChangeLog
+ eautoreconf #870832
}
diff --git a/app-text/binfind/files/binfind-0.0.3-clang16.patch b/app-text/binfind/files/binfind-0.0.3-clang16.patch
new file mode 100644
index 000000000000..12a7174ec0e9
--- /dev/null
+++ b/app-text/binfind/files/binfind-0.0.3-clang16.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/870832
+--- a/configure.in
++++ b/configure.in
+@@ -26,4 +26,5 @@
+ [#include <stdio.h>
+ #include <stdlib.h>
++ #include <string.h>
+
+ int main(void)
diff --git a/app-text/binfind/metadata.xml b/app-text/binfind/metadata.xml
index 79d462e85571..aaab041e8885 100644
--- a/app-text/binfind/metadata.xml
+++ b/app-text/binfind/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest
index 93987c7798a2..dc20ec31bba8 100644
--- a/app-text/blahtexml/Manifest
+++ b/app-text/blahtexml/Manifest
@@ -1 +1,2 @@
DIST blahtexml-0.9-src.tar.gz 168564 BLAKE2B 941f241adf6e423cd0eff4a13b11313d6cad143badb6d862be01bd603f84aa04f224ae2d84abfef05341c66e410ba18bf39d99f636a8a33512e1da9739770a19 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042
+DIST blahtexml-1.0.tar.gz 191236 BLAKE2B 1daf42be183cb28eaf14bbca92055f715a9d0da829bb6515d132315c5f3f4866484398d8dfcf87eaf7997b03e21b86aa331fb532ecfd2bdc6e10751ccaba8699 SHA512 919c7cbeeacec25af166678bc74da2be480d082edbc8fc534f416a1cbb3495c5e9788591666a94527a07dcddfb8b27d321a0fa442c84bbcbd444bb46a559da84
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index ee195e68bed9..e8daaacf166e 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="TeX-to-MathML converter"
HOMEPAGE="http://gva.noekeon.org/blahtexml"
@@ -11,20 +11,28 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
LICENSE="BSD CC-BY-3.0 ZLIB"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
IUSE="doc"
RDEPEND="dev-libs/xerces-c"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
doc? (
app-text/texlive-core
dev-libs/libxslt
- dev-tex/latex2html )"
+ dev-tex/latex2html
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-{Makefile,gcc-4.7}.patch
+)
src_prepare() {
- tc-export CC CXX
- epatch "${FILESDIR}"/${P}-{Makefile,gcc-4.7}.patch
+ default
+
+ tc-export CC CXX PKG_CONFIG
}
src_compile() {
diff --git a/app-text/blahtexml/blahtexml-1.0.ebuild b/app-text/blahtexml/blahtexml-1.0.ebuild
new file mode 100644
index 000000000000..00d990c80f2a
--- /dev/null
+++ b/app-text/blahtexml/blahtexml-1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="TeX-to-MathML converter"
+HOMEPAGE="http://gva.noekeon.org/blahtexml"
+SRC_URI="https://github.com/gvanas/blahtexml/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD CC-BY-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/xerces-c"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-text/texlive-core
+ dev-texlive/texlive-latexextra
+ dev-libs/libxslt
+ dev-tex/latex2html
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9-Makefile.patch
+)
+
+src_prepare() {
+ default
+
+ tc-export CC CXX PKG_CONFIG
+}
+
+src_compile() {
+ emake blahtex{,ml}-linux
+ use doc && emake doc
+}
+
+src_install() {
+ dobin blahtex ${PN}
+ doman "${FILESDIR}"/${PN}.1
+ use doc && dodoc Documentation/manual.pdf
+}
diff --git a/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch b/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
index c570e1de679b..9b3e53047fb3 100644
--- a/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
+++ b/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
@@ -2,8 +2,8 @@ Description: Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes.
Author: Cyril Brulebois <kibi@debian.org>
Bug-Debian: http://bugs.debian.org/667116
---- blahtexml-0.9.orig/Source/main.cpp
-+++ blahtexml-0.9/Source/main.cpp
+--- a/Source/main.cpp
++++ b/Source/main.cpp
@@ -24,6 +24,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG
#include <stdlib.h>
#include <sstream>
@@ -12,8 +12,8 @@ Bug-Debian: http://bugs.debian.org/667116
using namespace std;
using namespace blahtex;
---- blahtexml-0.9.orig/Source/mainPng.cpp
-+++ blahtexml-0.9/Source/mainPng.cpp
+--- a/Source/mainPng.cpp
++++ b/Source/mainPng.cpp
@@ -27,6 +27,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG
#include <stdio.h>
#include <stdlib.h>
diff --git a/app-text/blahtexml/metadata.xml b/app-text/blahtexml/metadata.xml
index 1b2becffa26c..b48795512fe9 100644
--- a/app-text/blahtexml/metadata.xml
+++ b/app-text/blahtexml/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">gvanas/blahtexml</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index fc5fc403c011..c6b4c49b9277 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.17.0.tar.xz 338212 BLAKE2B 19c5119b5d877a70ccfd6b4c8fca0c31141efd4c47c1d457d53d3bfefc1573553c69288e628dbcfffb23420461b8f0f08955b40f949d5b7390c5160faae94db1 SHA512 10522ecb218a7f09fd57e4d67e1c6ac2a17dfaf04f322c56ef77c939fcff22f6ae619e6a7e659ef14d069955d87b790701758e48ebc373d2175883b8908ef857
+DIST blogc-0.20.1.tar.xz 346280 BLAKE2B b2cf2c0ac0eaa857d91c75f7bcdf9e6b6ce0132e5a999719f9da3d32c7c336b8557f0e76b13ca02e6a20d67aef5cccedf01b3abe7b77dce6be612501d208eb8e SHA512 0e64e3da70ce52cec148210c140000b34cdafb848ae1fbd6160979de47738257a08af236e53e908f256d610ae6680bb554376c049246c32867b64985a637746c
diff --git a/app-text/blogc/blogc-0.17.0.ebuild b/app-text/blogc/blogc-0.17.0.ebuild
deleted file mode 100644
index d5c7c49e8ea5..000000000000
--- a/app-text/blogc/blogc-0.17.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/blogc/blogc.git"
- inherit git-r3 autotools
-fi
-
-DESCRIPTION="A blog compiler"
-HOMEPAGE="https://blogc.rgm.io/"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- KEYWORDS=""
- DEPEND="app-text/ronn"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="git httpd make test"
-
-RDEPEND="
- git? (
- dev-vcs/git )
- !dev-vcs/blogc-git-receiver
- !www-servers/blogc-runserver"
-
-DEPEND="${DEPEND}
- virtual/pkgconfig
- test? (
- git? ( dev-vcs/git )
- dev-util/cmocka )"
-
-src_prepare() {
- [[ ${PV} = *9999* ]] && eautoreconf
- eapply_user
- default
-}
-
-src_configure() {
- local myconf=""
- if [[ ${PV} = *9999* ]]; then
- myconf+="--enable-ronn"
- else
- myconf+="--disable-ronn"
- fi
- econf \
- $(use_enable test tests) \
- $(use_enable git git-receiver) \
- $(use_enable make make) \
- $(use_enable httpd runserver) \
- --disable-make-embedded \
- --disable-valgrind \
- ${myconf}
-}
diff --git a/app-text/blogc/blogc-0.20.1.ebuild b/app-text/blogc/blogc-0.20.1.ebuild
new file mode 100644
index 000000000000..d67ef789f4f1
--- /dev/null
+++ b/app-text/blogc/blogc-0.20.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A blog compiler"
+HOMEPAGE="https://blogc.rgm.io/"
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/blogc/blogc.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+fi
+
+if [[ ${PV} = *9999* ]]; then
+ BDEPEND="app-text/ronn-ng"
+else
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="git httpd make test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="git? ( dev-vcs/git )"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+ test? (
+ git? ( dev-vcs/git )
+ )"
+
+src_prepare() {
+ [[ ${PV} = *9999* ]] && eautoreconf
+ eapply_user
+ default
+}
+
+src_configure() {
+ local myconf=""
+
+ if [[ ${PV} = *9999* ]]; then
+ myconf+="--enable-ronn"
+ else
+ myconf+="--disable-ronn"
+ fi
+
+ econf \
+ $(use_enable test tests) \
+ $(use_enable git git-receiver) \
+ $(use_enable make make) \
+ $(use_enable httpd runserver) \
+ --disable-make-embedded \
+ --disable-valgrind \
+ ${myconf}
+}
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index eab99becb995..d67ef789f4f1 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -1,39 +1,35 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+DESCRIPTION="A blog compiler"
+HOMEPAGE="https://blogc.rgm.io/"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/blogc/blogc.git"
inherit git-r3 autotools
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
fi
-DESCRIPTION="A blog compiler"
-HOMEPAGE="https://blogc.rgm.io/"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- KEYWORDS=""
- DEPEND="app-text/ronn"
+ BDEPEND="app-text/ronn-ng"
+else
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="BSD"
SLOT="0"
IUSE="git httpd make test"
+RESTRICT="!test? ( test )"
-RDEPEND="
- git? (
- dev-vcs/git )
- !dev-vcs/blogc-git-receiver
- !www-servers/blogc-runserver"
-
-DEPEND="${DEPEND}
- virtual/pkgconfig
+RDEPEND="git? ( dev-vcs/git )"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
test? (
git? ( dev-vcs/git )
- dev-util/cmocka )"
+ )"
src_prepare() {
[[ ${PV} = *9999* ]] && eautoreconf
@@ -43,11 +39,13 @@ src_prepare() {
src_configure() {
local myconf=""
+
if [[ ${PV} = *9999* ]]; then
myconf+="--enable-ronn"
else
myconf+="--disable-ronn"
fi
+
econf \
$(use_enable test tests) \
$(use_enable git git-receiver) \
diff --git a/app-text/blogc/metadata.xml b/app-text/blogc/metadata.xml
index 6a921452e508..8c11c2e02d0a 100644
--- a/app-text/blogc/metadata.xml
+++ b/app-text/blogc/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
- </maintainer>
- <longdescription lang="en">
- blogc(1) is a blog compiler. It converts source files and templates
- into blog/website resources.
- </longdescription>
+ <!-- maintainer-needed -->
<upstream>
<maintainer status="active">
<email>rafael@rafaelmartins.eng.br</email>
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
index 5eff84f8ed58..36d1547efe1d 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit eutils toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="A file sorting program which uses the bogosort algorithm"
HOMEPAGE="http://www.lysator.liu.se/~qha/bogosort/"
@@ -11,24 +11,33 @@ SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos"
-IUSE=""
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos"
-DEPEND=""
-RDEPEND=""
+PATCHES=(
+ "${FILESDIR}"/xmalloc.patch
+ "${FILESDIR}"/${P}-glibc-2.10.patch
+ "${FILESDIR}"/${PN}-0.4.2-implicit-decl.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/xmalloc.patch \
- "${FILESDIR}"/${P}-glibc-2.10.patch
+ default
+
+ mv configure.{in,ac} || die
+
+ sed -i \
+ -e 's:-O0::' \
+ -e '/maintainer-targets/d' \
+ Makefile.am || die
+ eautoreconf
}
src_configure() {
tc-export CC
- econf || die
+ econf
}
src_install() {
- make DESTDIR="${D}" install || die
- dodoc README NEWS ChangeLog AUTHORS || die
+ default
+
+ dodoc README NEWS ChangeLog AUTHORS
}
diff --git a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
index ac54c8b61b05..98a9eceb1377 100644
--- a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
+++ b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
---- bogosort-0.4.2.orig/getlines.c 2002-05-04 23:22:22.000000000 +0300
-+++ bogosort-0.4.2/getlines.c 2009-08-06 14:32:22.000000000 +0300
+--- a/getlines.c
++++ b/getlines.c
@@ -49,7 +49,7 @@
char **ss = NULL;
@@ -28,9 +27,8 @@ diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
{
int c, numchars = 0, allocated = 0;
char *s = NULL;
-diff -ur bogosort-0.4.2.orig/getlines.h bogosort-0.4.2/getlines.h
---- bogosort-0.4.2.orig/getlines.h 2002-03-16 00:04:38.000000000 +0200
-+++ bogosort-0.4.2/getlines.h 2009-08-06 14:32:48.000000000 +0300
+--- a/getlines.h
++++ b/getlines.h
@@ -39,6 +39,6 @@
* getline: return a pointer to a newly allocated string containing the next
* line in stream
diff --git a/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch b/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch
new file mode 100644
index 000000000000..2eefc4099fa4
--- /dev/null
+++ b/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch
@@ -0,0 +1,38 @@
+diff --git a/xmalloc.c b/xmalloc.c
+index a2c7689..dd00346 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -29,6 +29,7 @@
+
+ #if STDC_HEADERS
+ # include <stdlib.h>
++# include <string.h>
+ #else
+ VOID *calloc ();
+ VOID *malloc ();
+diff --git a/system.h b/system.h
+index 993dd36..b9fee80 100644
+--- a/system.h
++++ b/system.h
+@@ -159,20 +159,7 @@ struct utimbuf
+
+ /* Don't use bcopy! Use memmove if source and destination may overlap,
+ memcpy otherwise. */
+-
+-#ifdef HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-# include <memory.h>
+-# endif
+-# include <string.h>
+-#else
+-# ifndef HAVE_STRCHR
+-# define strchr index
+-# define strrchr rindex
+-# endif /* HAVE_STRCHR */
+-char *strchr(), *strrchr();
+-char *memchr ();
+-#endif
++#include <string.h>
+
+ #include <errno.h>
+ #ifndef errno
diff --git a/app-text/bogosort/files/xmalloc.patch b/app-text/bogosort/files/xmalloc.patch
index 41545ca34ba8..ed137e83727c 100644
--- a/app-text/bogosort/files/xmalloc.patch
+++ b/app-text/bogosort/files/xmalloc.patch
@@ -1,5 +1,5 @@
---- xmalloc.c.orig 2004-12-15 23:44:16.880786468 +0100
-+++ xmalloc.c 2004-12-15 23:44:21.846546805 +0100
+--- a/xmalloc.c
++++ b/xmalloc.c
@@ -68,12 +68,6 @@
The caller may set it to some other value. */
int xmalloc_exit_failure = EXIT_FAILURE;
diff --git a/app-text/bogosort/metadata.xml b/app-text/bogosort/metadata.xml
index 46dbedede5f6..e138ba20e25d 100644
--- a/app-text/bogosort/metadata.xml
+++ b/app-text/bogosort/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 66484e06090d..7be41d51f5d6 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1 +1,2 @@
-DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
+DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
+DIST build-docbook-catalog-2.4.tar.bz2 4693 BLAKE2B 496356008ef31f87169f9f060ba5593e6054447789a8a1c0dbc43fb4f81ebf087d09adec8fe82d2641e3550616bb874c6a1253b7988553948956f1bbb2e241c7 SHA512 5d42a641c8b336e49749b28101f87d4d856d3e5491adca4053212a473b42dcda88ab00fa64f54813a3e1b4ef1e45756e7de3a652808ad7ee113aa3afe7bf99b5
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
deleted file mode 100644
index 3d841463a2a6..000000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~haubi/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
- !<app-text/docbook-xsl-stylesheets-1.73.1
- dev-libs/libxml2"
-DEPEND=""
-
-pkg_setup() {
- # export for bug #490754
- export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-}
-
-src_prepare() {
- sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
- has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
-}
-
-pkg_postinst() {
- # New version -> regen files
- build-docbook-catalog
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
new file mode 100644
index 000000000000..38a0dee4c042
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+ dev-libs/libxml2
+ || ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e "1s@#!@#!${EPREFIX}@" build-docbook-catalog || die
+ sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+ has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+ # export for bug #490754
+ export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+ default
+}
+
+pkg_postinst() {
+ # New version -> regen files
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog."
+}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
new file mode 100644
index 000000000000..38a0dee4c042
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+ dev-libs/libxml2
+ || ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e "1s@#!@#!${EPREFIX}@" build-docbook-catalog || die
+ sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+ has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+ # export for bug #490754
+ export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+ default
+}
+
+pkg_postinst() {
+ # New version -> regen files
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog."
+}
diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
index 6f49eba8f496..26bb3d595e67 100644
--- a/app-text/build-docbook-catalog/metadata.xml
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
index 667ebb401a85..b0b847069c74 100644
--- a/app-text/c2ps/c2ps-4.0.ebuild
+++ b/app-text/c2ps/c2ps-4.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit base toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="Generates a beautified ps document from a source file (c/c++)"
-HOMEPAGE="http://www.cs.technion.ac.il/users/c2ps"
-SRC_URI="http://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
+HOMEPAGE="https://www.cs.technion.ac.il/users/c2ps"
+SRC_URI="https://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
diff --git a/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
index d68002180091..04c12af2bad5 100644
--- a/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
+++ b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
@@ -1,5 +1,5 @@
---- a/c2ps-4.0/Makefile 1997-05-15 11:50:56.000000000 -0400
-+++ b/c2ps-4.0/Makefile 2010-09-24 19:42:33.000000000 -0400
+--- a/Makefile
++++ b/Makefile
@@ -45,7 +45,7 @@
install -m 644 c2ps.1 $(MAN)
diff --git a/app-text/c2ps/metadata.xml b/app-text/c2ps/metadata.xml
index c439b06d8c84..e2fedda90ee1 100644
--- a/app-text/c2ps/metadata.xml
+++ b/app-text/c2ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 69d1cfcba06f..e9a9b08d7298 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,10 @@
-DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
-DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
+DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230
+DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059
+DIST calibre-7.6.0.tar.xz 43929700 BLAKE2B a529bf32511f8927683d6b89962a2e0e1ca6fb6bf798d9906ae6cf56c4611be21d89c49812c3b3cef02e333b20b4fd00a0b19c5e867c735022a45bafd9991203 SHA512 7bc43fff44d9ec7c5955f2176f0923af08cd7ba9930a49b76ba64808c18a468b005c231bc21c0a9e3758977c1ff9a1a6f7724333b87ae81e32461807976f5488
+DIST calibre-7.6.0.tar.xz.sig 566 BLAKE2B c7fac255eb3ea49aead5780cc8089be253e551d729bb80c3f59bdb269e05e603557dbe8967175a6bb49e88d30673c89b2217c18757b718dba8e5b7d3eb21330c SHA512 a9af6200b27263333e2d3c54e4aea7f7664b6c4d3ba8cdd5958c9eeaf0c7ee4ba7465df57fd526064c44a9d093b246a64ab94819c6235030162f30f7f570b403
+DIST calibre-7.7.0.tar.xz 44006620 BLAKE2B f29dcf4c6550c7649dfddcaa4f5390ebf23ae7ef8d8103c9d001c9fcb8ca4a120c7cc8d5c2c36acced6672d78e45b6a93c6c505482f78e21ecc170c56c2641b3 SHA512 8444811e63be007e075b716c70c7df989408b8a323068fb763a07b27a2c52557e5625f311ac7672d5367df9dd3d071354cf3dd1102a0aa057e5cbbdc09ed24df
+DIST calibre-7.7.0.tar.xz.sig 566 BLAKE2B 6e21d5e8517abd2cf9e278cf40308709422b97cf2c953e1f1b8487aeb6561c57902d233fb397abfe50b8a42ce28071426477171a9d5b0b055af5cf41fdb78ef4 SHA512 17d91e46aa0dc3e12f1d65c5956f3c0f6b9fb07705042efd73508cc0040d0df2bae939544fd4bc123064393174057b5107cb38167b2db2f9477988ce369e10ac
+DIST calibre-7.8.0.tar.xz 44167208 BLAKE2B 676f5519b2809ca91c972ce0b4227aeac977945248063be58f8ed387c2dc1285f01e0d59c52ba9dea3a25842be1f97cdaece7f1eac5c208503240ff9ac3f0093 SHA512 c90d247af3a8ba3b2a94ca3a03bf9ee4d1c8f07d6feaa1ec045d639f448c476c4be9568e66845e7067e32b746e0ab034be65084a60f2b64f961f6678a30910e7
+DIST calibre-7.8.0.tar.xz.sig 566 BLAKE2B 03f283bee606d3071a2602ad2b1cc962b3d0cf6737ca294955524da6de7f22ddbe740d9b455332961b847331ad15f47efa884cc65bfe1a42eb46bef9f7a4a1dd SHA512 527a931f6d8701580b7b405124f53b54bb6ca65056aa41d677806a00c2ece3cb138c1c37e0d29394ee4e83487dec9dc7e82b6db63a4154e19f8463c19956e040
+DIST calibre-7.9.0.tar.xz 44164396 BLAKE2B 523b3aad25b73f4de4e2e5ce323dc63759fa1d2b65b646d3597dea42723f6a047782b019547df69d824f64cea8ca4c5964a17f37c3ea6beca95c5016bb839791 SHA512 388f47e13e0a682ae61a32ec2d7840e1514dd5cc79cc9ba271cee7619ad67f270c5059849e9412545bd4b9fa0904d105f5e88736956aba37abf9ef3ac8e1e09f
+DIST calibre-7.9.0.tar.xz.sig 566 BLAKE2B 7a5c9b835edf649d790c5da143f982deb3ce908fed40a557761b7f80bed372502010ab77c57f2a3f3f4de96bbc1a7f8bae6285c510b7bc1d053fc6571e77491d SHA512 c7ac1ea50f09122b023427ea902ecccdd1ffd7b9e21d70dbd853f45686db912aa88d3830cd587ed6dfe9052cd240ab3771990639a8db20c2801fc244965ac71b
diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild b/app-text/calibre/calibre-3.26.1-r1.ebuild
deleted file mode 100644
index c92715c1e5f5..000000000000
--- a/app-text/calibre/calibre-3.26.1-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="amd64 ~arm x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/podofo-0.8.2:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
- dev-python/chardet[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- dev-python/html5-parser[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
- dev-python/msgpack[${PYTHON_USEDEP}]
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- sys-libs/zlib:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- >=virtual/podofo-build-0.9.4
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-
- # use system beautifulsoup, instead of bundled
- rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
- || die "could not remove bundled beautifulsoup"
- find "${S}" -type f -name \*.py -exec \
- sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
- || die "could not sed bundled beautifulsoup out of the source tree"
-
- # avoid failure of xdg tools to recognize vendor prefix
- sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
- -e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
- -e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
- -i "${S}"/src/calibre/linux.py || die 'sed failed'
-
- # don't create/install uninstaller
- sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANGUAGE
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- # Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
- local x
- for x in /dev/dri/card[0-9] ; do
- [[ -e ${x} ]] && addpredict ${x}
- done
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}usr" \
- --staging-libdir="${ED}usr/${libdir}" || die
-
- # The menu entries end up here due to '--mode user' being added to
- # xdg-* options in src_prepare.
- dodir /usr/share/mime/packages
- chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
- mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
- die "failed to register mime types"
- dodir /usr/share/icons
- mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
- die "failed to install icon files"
-
- domenu "${HOME}"/.local/share/applications/*.desktop ||
- die "failed to install .desktop menu files"
-
- find "${ED}"usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.44.0.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.44.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-
- # use system beautifulsoup, instead of bundled
- rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
- || die "could not remove bundled beautifulsoup"
- find "${S}" -type f -name \*.py -exec \
- sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
- || die "could not sed bundled beautifulsoup out of the source tree"
-}
-
-src_install() {
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C #684484
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- rm "${ED}/usr/share/applications/defaults.list" || die
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild b/app-text/calibre/calibre-3.46.0-r1.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.46.0-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-
- # use system beautifulsoup, instead of bundled
- rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
- || die "could not remove bundled beautifulsoup"
- find "${S}" -type f -name \*.py -exec \
- sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
- || die "could not sed bundled beautifulsoup out of the source tree"
-}
-
-src_install() {
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C #684484
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- rm "${ED}/usr/share/applications/defaults.list" || die
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.44.0-r3.ebuild b/app-text/calibre/calibre-5.44.0-r3.ebuild
new file mode 100644
index 000000000000..fefe407084e6
--- /dev/null
+++ b/app-text/calibre/calibre-5.44.0-r3.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/kovidgoyal.gpg"
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="amd64"
+SLOT="0"
+IUSE="ios speech test +udisks"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.9.6_pre20171027:=
+ <app-text/podofo-0.10:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/cchardet[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/zeroconf[${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,${PYTHON_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtimageformats:5
+ dev-qt/qtcore:5=
+ dev-qt/qtdbus:5=
+ dev-qt/qtgui:5=[jpeg,png]
+ dev-qt/qtwidgets:5
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ >=virtual/podofo-build-0.9.6_pre20171027
+ <virtual/podofo-build-0.10
+ virtual/pkgconfig
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Don't prompt the user for updates - they've installed via
+ # an ebuild.
+ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
+
+ # fix compatibility with recent versions of zeroconf
+ "${FILESDIR}"/${PN}-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
+
+ # Security backport for CVE-2023-46303
+ "${FILESDIR}"/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+ sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+ -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+ -i setup/build.py || die "sed failed to patch build.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt5_get_bindir)/qmake"
+
+ ${EPYTHON} setup.py build || die
+ ${EPYTHON} setup.py gui || die
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts || die
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: unrardll
+ test_unrar
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}" || die
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins" || die
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ einfo "Converting python shebangs"
+ python_fix_shebang "${ED}/usr/bin"
+
+ einfo "Compiling python modules"
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-7.6.0.ebuild b/app-text/calibre/calibre-7.6.0.ebuild
new file mode 100644
index 000000000000..d0df8273c381
--- /dev/null
+++ b/app-text/calibre/calibre-7.6.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="amd64 ~arm64"
+SLOT="0"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-i18n/uchardet
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.10.0:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtbase:6=[gui,widgets]
+ dev-qt/qtimageformats:6
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ system-mathjax? ( >=dev-libs/mathjax-3:= )
+ udisks? ( virtual/libudev )
+ unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ system-mathjax? ( dev-lang/rapydscript-ng )
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt6_get_bindir)/qmake"
+
+ edo ${EPYTHON} setup.py build
+ edo ${EPYTHON} setup.py gui
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ edo ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts
+ if use system-mathjax; then
+ edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+ edo ${EPYTHON} setup.py rapydscript
+ fi
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: pyzstd
+ test_zstd
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+ $(usev !unrar test_unrar)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 # bug #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ edo "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ python_fix_shebang "${ED}/usr/bin"
+
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.7.0-r1.ebuild b/app-text/calibre/calibre-7.7.0-r1.ebuild
new file mode 100644
index 000000000000..331a32a8a077
--- /dev/null
+++ b/app-text/calibre/calibre-7.7.0-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="amd64"
+SLOT="0"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-i18n/uchardet
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.10.0:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtbase:6=[gui,widgets]
+ dev-qt/qtimageformats:6
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ system-mathjax? ( >=dev-libs/mathjax-3:= )
+ udisks? ( virtual/libudev )
+ unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ system-mathjax? ( dev-lang/rapydscript-ng )
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt6_get_bindir)/qmake"
+
+ edo ${EPYTHON} setup.py build
+ edo ${EPYTHON} setup.py gui
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ edo ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts
+ if use system-mathjax; then
+ edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+ edo ${EPYTHON} setup.py rapydscript
+ fi
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: pyzstd
+ test_zstd
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+ $(usev !unrar test_unrar)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 # bug #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ edo "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ python_fix_shebang "${ED}/usr/bin"
+
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.7.0.ebuild b/app-text/calibre/calibre-7.7.0.ebuild
new file mode 100644
index 000000000000..fc786f35d76c
--- /dev/null
+++ b/app-text/calibre/calibre-7.7.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64 ~arm64"
+SLOT="0"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-i18n/uchardet
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.10.0:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtbase:6=[gui,widgets]
+ dev-qt/qtimageformats:6
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ system-mathjax? ( >=dev-libs/mathjax-3:= )
+ udisks? ( virtual/libudev )
+ unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ system-mathjax? ( dev-lang/rapydscript-ng )
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt6_get_bindir)/qmake"
+
+ edo ${EPYTHON} setup.py build
+ edo ${EPYTHON} setup.py gui
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ edo ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts
+ if use system-mathjax; then
+ edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+ edo ${EPYTHON} setup.py rapydscript
+ fi
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: pyzstd
+ test_zstd
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+ $(usev !unrar test_unrar)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 # bug #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ edo "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ python_fix_shebang "${ED}/usr/bin"
+
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.8.0-r1.ebuild b/app-text/calibre/calibre-7.8.0-r1.ebuild
new file mode 100644
index 000000000000..6f780c4441b5
--- /dev/null
+++ b/app-text/calibre/calibre-7.8.0-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-i18n/uchardet
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.10.0:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtbase:6=[gui,widgets]
+ dev-qt/qtimageformats:6
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ system-mathjax? ( >=dev-libs/mathjax-3:= )
+ udisks? ( virtual/libudev )
+ unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ system-mathjax? ( dev-lang/rapydscript-ng )
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt6_get_bindir)/qmake"
+
+ edo ${EPYTHON} setup.py build
+ edo ${EPYTHON} setup.py gui
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ edo ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts
+ if use system-mathjax; then
+ edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+ edo ${EPYTHON} setup.py rapydscript
+ fi
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: pyzstd
+ test_zstd
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+ $(usev !unrar test_unrar)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 # bug #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ edo "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ python_fix_shebang "${ED}/usr/bin"
+
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.8.0.ebuild b/app-text/calibre/calibre-7.8.0.ebuild
new file mode 100644
index 000000000000..fc786f35d76c
--- /dev/null
+++ b/app-text/calibre/calibre-7.8.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64 ~arm64"
+SLOT="0"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-i18n/uchardet
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.10.0:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtbase:6=[gui,widgets]
+ dev-qt/qtimageformats:6
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ system-mathjax? ( >=dev-libs/mathjax-3:= )
+ udisks? ( virtual/libudev )
+ unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ system-mathjax? ( dev-lang/rapydscript-ng )
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt6_get_bindir)/qmake"
+
+ edo ${EPYTHON} setup.py build
+ edo ${EPYTHON} setup.py gui
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ edo ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts
+ if use system-mathjax; then
+ edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+ edo ${EPYTHON} setup.py rapydscript
+ fi
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: pyzstd
+ test_zstd
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+ $(usev !unrar test_unrar)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 # bug #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ edo "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ python_fix_shebang "${ED}/usr/bin"
+
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.9.0.ebuild b/app-text/calibre/calibre-7.9.0.ebuild
new file mode 100644
index 000000000000..fd272cad1f93
--- /dev/null
+++ b/app-text/calibre/calibre-7.9.0.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+ https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+ verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64 ~arm64"
+SLOT="0"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-i18n/uchardet
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.10.0:=
+ app-text/poppler[utils]
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/openssl:=
+ dev-libs/snowball-stemmer:=
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+ dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/xxhash[${PYTHON_USEDEP}]
+ >=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+ ')
+ dev-qt/qtbase:6=[gui,widgets]
+ dev-qt/qtimageformats:6
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-gfx/optipng-0.7.6
+ virtual/libusb:1=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+ system-mathjax? ( >=dev-libs/mathjax-3:= )
+ udisks? ( virtual/libudev )
+ unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+ >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+ >=dev-python/sip-5[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ system-mathjax? ( dev-lang/rapydscript-ng )
+ verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+ # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+ # We don't (yet?) package libjxr and it seems to be dead upstream
+ # (last commit in 2017)
+ "${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+ default
+
+ # Warning:
+ #
+ # While it might be rather tempting to add yet another sed here,
+ # please don't. There have been several bugs in Gentoo's packaging
+ # of calibre from seds-which-become-stale. Please consider
+ # creating a patch instead, but in any case, run the test suite
+ # and ensure it passes.
+ #
+ # If in doubt about a problem, checking Fedora's packaging is recommended.
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ # This is only ever used at build time. It contains a small embedded copy
+ # of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+ # have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+ # is to build some resources that come bundled in dist tarballs already...
+ # and which we may also need to regenerate e.g. to use system-mathjax.
+ #
+ # However, running qtwebengine violates the portage sandbox (among other
+ # things, it tries to create directories in /usr! amazing) so this is a
+ # wash anyway. The only real solution here is to package rapydscript-ng.
+ #
+ # We do not need it at build time, and *no one* needs it at install time.
+ # Delete the cruft.
+ rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+ # TODO: get qmake called by setup.py to respect CC and CXX too
+ tc-export CC CXX
+
+ # bug 821871
+ local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+ export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+ export QMAKE="$(qt6_get_bindir)/qmake"
+
+ edo ${EPYTHON} setup.py build
+ edo ${EPYTHON} setup.py gui
+
+ # A few different resources are bundled in the distfile by default, because
+ # not all systems necessarily have them. We un-vendor them, using the
+ # upstream integrated approach if possible. See setup/revendor.py and
+ # consider migrating other resources to this if they do not use it, in
+ # *preference* over manual rm'ing.
+ edo ${EPYTHON} setup.py liberation_fonts \
+ --path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+ --system-liberation_fonts
+ if use system-mathjax; then
+ edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+ edo ${EPYTHON} setup.py rapydscript
+ fi
+}
+
+src_test() {
+ # Skipped tests:
+ local _test_excludes=(
+ # unpackaged Python dependency: py7zr
+ 7z
+ # unpackaged Python dependency: pyzstd
+ test_zstd
+ # tests if a completely unused module is bundled
+ pycryptodome
+
+ $(usev !speech speech_dispatcher)
+ $(usev !unrar test_unrar)
+
+ # undocumented reasons
+ test_mem_leaks
+ test_searching
+ )
+
+ edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 # bug #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+ mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ addpredict /dev/dri #665310
+
+ # If this directory doesn't exist, zsh completion won't install
+ dodir /usr/share/zsh/site-functions
+
+ edo "${PYTHON}" setup.py install \
+ --staging-root="${ED}/usr" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --staging-libdir="${ED}/usr/$(get_libdir)" \
+ --system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+ cp -r man-pages/ "${ED}"/usr/share/man || die
+
+ find "${ED}"/usr/share -type d -empty -delete || die
+
+ python_fix_shebang "${ED}/usr/bin"
+
+ python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch b/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
new file mode 100644
index 000000000000..f33fd3345e27
--- /dev/null
+++ b/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
@@ -0,0 +1,55 @@
+From 57190699030dc6746320e49695a67ce83c62d549 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Sun, 28 May 2023 14:03:15 +0530
+Subject: [PATCH] HTML Input: Dont add resources that exist outside the folder
+ hierarchy rooted at the parent folder of the input HTML file by default
+
+(cherry picked from commit bbbddd2bf4ef4ddb467b0aeb0abe8765ed7f8a6b)
+---
+ .../ebooks/conversion/plugins/html_input.py | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/calibre/ebooks/conversion/plugins/html_input.py b/src/calibre/ebooks/conversion/plugins/html_input.py
+index 6f9c2084ea..742f3e0279 100644
+--- a/src/calibre/ebooks/conversion/plugins/html_input.py
++++ b/src/calibre/ebooks/conversion/plugins/html_input.py
+@@ -64,6 +64,16 @@ class HTMLInput(InputFormatPlugin):
+ )
+ ),
+
++ OptionRecommendation(name='allow_local_files_outside_root',
++ recommended_value=False, level=OptionRecommendation.LOW,
++ help=_('Normally, resources linked to by the HTML file or its children will only be allowed'
++ ' if they are in a sub-folder of the original HTML file. This option allows including'
++ ' local files from any location on your computer. This can be a security risk if you'
++ ' are converting untrusted HTML and expecting to distribute the result of the conversion.'
++ )
++ ),
++
++
+ }
+
+ def convert(self, stream, opts, file_ext, log,
+@@ -76,6 +86,7 @@ def convert(self, stream, opts, file_ext, log,
+ if hasattr(stream, 'name'):
+ basedir = os.path.dirname(stream.name)
+ fname = os.path.basename(stream.name)
++ self.root_dir_of_input = os.path.abspath(basedir) + os.sep
+
+ if file_ext != 'opf':
+ if opts.dont_package:
+@@ -250,6 +261,11 @@ def link_to_local_path(self, link_, base=None):
+ frag = l.fragment
+ if not link:
+ return None, None
++ link = os.path.abspath(os.path.realpath(link))
++ if not link.startswith(self.root_dir_of_input):
++ if not self.opts.allow_local_files_outside_root:
++ self.log.warn('Not adding {} as it is outside the document root: {}'.format(link, self.root_dir_of_input))
++ return None, None
+ return link, frag
+
+ def resource_adder(self, link_, base=None):
+--
+2.41.0
+
diff --git a/app-text/calibre/files/calibre-5.35.0-jxr-test.patch b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
new file mode 100644
index 000000000000..bec72c15cb8b
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
@@ -0,0 +1,24 @@
+Avoid calling libjxr's JxrDecApp as we currently don't package it.
+--- a/src/calibre/utils/img.py
++++ b/src/calibre/utils/img.py
+@@ -118,8 +118,6 @@
+ i = QImage()
+ if not i.loadFromData(data):
+ q = what(None, data)
+- if q == 'jxr':
+- return load_jxr_data(data)
+ raise NotImage(f'Not a valid image (detected type: {q})')
+ return i
+
+@@ -645,11 +643,6 @@
+ despeckle_image(img)
+ remove_borders_from_image(img)
+ image_to_data(img, fmt='GIF')
+- raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
+- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
+- stdout=subprocess.PIPE).stdout.read()
+- if b'JPEG XR Decoder Utility' not in raw:
+- raise SystemExit('Failed to run JxrDecApp')
+ # }}}
+
+
diff --git a/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
new file mode 100644
index 000000000000..79af5d94bb59
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
@@ -0,0 +1,26 @@
+From 5d8d85c649b181747d182f676cfd76f843bd61f0 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Sun, 1 Oct 2023 15:08:59 +0530
+Subject: [PATCH] Fix compatibility with zeroconf >= 0.73
+
+Fixes #2038 (fix compatibility with newer zeroconf)
+---
+ src/calibre/devices/smart_device_app/driver.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
+index 87608f305b..b41c3a0063 100644
+--- a/src/calibre/devices/smart_device_app/driver.py
++++ b/src/calibre/devices/smart_device_app/driver.py
+@@ -2175,6 +2175,8 @@ def monkeypatch_zeroconf():
+ # "monkeypatch" zeroconf with a function without the check
+ try:
+ from zeroconf._utils.name import service_type_name
++ # zeroconf 0.73 uses an lru cache so we need __wrapped__
++ service_type_name = getattr(service_type_name, '__wrapped__', service_type_name)
+ service_type_name.__kwdefaults__['strict'] = False
+ except ImportError:
+ import zeroconf
+--
+2.41.0
+
diff --git a/app-text/calibre/files/calibre-7.0.0-jxr-test.patch b/app-text/calibre/files/calibre-7.0.0-jxr-test.patch
new file mode 100644
index 000000000000..c37d0cdfe028
--- /dev/null
+++ b/app-text/calibre/files/calibre-7.0.0-jxr-test.patch
@@ -0,0 +1,27 @@
+diff --git a/src/calibre/utils/img.py b/src/calibre/utils/img.py
+index b61627b63e..ff51c76e75 100644
+--- a/src/calibre/utils/img.py
++++ b/src/calibre/utils/img.py
+@@ -129,8 +129,6 @@ def image_from_data(data):
+ i = QImage()
+ if not i.loadFromData(data):
+ q = what(None, data)
+- if q == 'jxr':
+- return load_jxr_data(data)
+ raise NotImage(f'Not a valid image (detected type: {q})')
+ return i
+
+@@ -693,13 +691,6 @@ def test(): # {{{
+ despeckle_image(img)
+ remove_borders_from_image(img)
+ image_to_data(img, fmt='GIF')
+- p = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
+- creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
+- stdout=subprocess.PIPE)
+- raw, _ = p.communicate()
+- p.wait()
+- if b'JPEG XR Decoder Utility' not in raw:
+- raise SystemExit('Failed to run JxrDecApp')
+ # }}}
+
+
diff --git a/app-text/calibre/files/calibre-disable_plugins.patch b/app-text/calibre/files/calibre-disable_plugins.patch
deleted file mode 100644
index 9ef1dd04251d..000000000000
--- a/app-text/calibre/files/calibre-disable_plugins.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
-Author: Martin Pitt <mpitt@debian.org>
-Bug-Debian: http://bugs.debian.org/640026
-
-Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
-===================================================================
---- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100
-+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100
-@@ -28,8 +28,6 @@
- pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
- cm('welcome wizard', _('Run welcome wizard'),
- icon='wizard.png', triggered=self.gui.run_wizard)
-- cm('plugin updater', _('Get plugins to enhance calibre'),
-- icon='plugins/plugin_updater.png', triggered=self.get_plugins)
- if not DEBUG:
- pm.addSeparator()
- cm('restart', _('Restart in debug mode'), icon='debug.png',
diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index 2196cbeb104f..7d12d7b1b414 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>axs@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
<email>zmedico@gentoo.org</email>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>eschwartz93@gmail.com</email>
+ <name>Eli Schwartz</name>
+ </maintainer>
<upstream>
- <remote-id type="sourceforge">calibre</remote-id>
+ <remote-id type="github">kovidgoyal/calibre</remote-id>
+ <changelog>https://calibre-ebook.com/whats-new</changelog>
</upstream>
+ <use>
+ <flag name="font-subsetting">Enable font subsetting support</flag>
+ <flag name="system-mathjax">Use a system copy of mathjax</flag>
+ <flag name="unrar">Enable support for comic books compressed with the non-free Rar format</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/capyt/capyt-1.1.1-r1.ebuild b/app-text/capyt/capyt-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..6961b484ccf4
--- /dev/null
+++ b/app-text/capyt/capyt-1.1.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service"
+HOMEPAGE="https://github.com/lbatalha/capyt
+ https://pypi.org/project/capyt/"
+SRC_URI="https://github.com/lbatalha/capyt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1.ebuild
deleted file mode 100644
index 5292845b844f..000000000000
--- a/app-text/capyt/capyt-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5..7} )
-
-inherit distutils-r1
-
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service"
-HOMEPAGE="https://github.com/lbatalha/capyt
- https://pypi.org/project/capyt/"
-SRC_URI="https://github.com/lbatalha/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- ${DEPEND}
- dev-python/requests[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/capyt/metadata.xml b/app-text/capyt/metadata.xml
index 6b0a0fb3a729..43a7697782e3 100644
--- a/app-text/capyt/metadata.xml
+++ b/app-text/capyt/metadata.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>juippis@gentoo.org</email>
<name>Joonas Niilola</name>
</maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="pypi">capyt</remote-id>
+ <remote-id type="github">lbatalha/capyt</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
new file mode 100644
index 000000000000..651d5468b9b0
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x64-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD NEWS README TODO"
+# CREDITS missing by accident in catdoc-0.95
+
+PATCHES=(
+ "${FILESDIR}/${P}-parallel-make.patch"
+ )
+
+src_prepare() {
+ default
+
+ # Fix for case-insensitive filesystems
+ echo ".PHONY: all install clean distclean dist" >> Makefile.in || die
+
+ mv configure.{in,ac} || die
+}
+
+src_configure() {
+ econf \
+ $(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
+ $(use_enable tk wordview)
+}
+
+src_compile() {
+ emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
+}
+
+src_install() {
+ emake install installroot="${ED}"
+
+ # dev-libs/libxls and app-text/catdoc both provide xls2cvs
+ if [[ -e ${ED}/usr/bin/xls2csv ]]; then
+ einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
+ mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
+ mv -vf "${ED}"/usr/share/man/man1/xls2csv.1 "${ED}"/usr/share/man/man1/xls2csv-${PN}.1 || die
+ fi
+}
diff --git a/app-text/catdoc/catdoc-0.95.ebuild b/app-text/catdoc/catdoc-0.95.ebuild
deleted file mode 100644
index 24c2ed8e4036..000000000000
--- a/app-text/catdoc/catdoc-0.95.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
-HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="tk"
-
-DEPEND="tk? ( >=dev-lang/tk-8.1 )"
-
-DOCS="CODING.STD NEWS README TODO"
-# CREDITS missing by accident in catdoc-0.95
-
-PATCHES=(
- "${FILESDIR}/${P}-parallel-make.patch"
- )
-
-src_prepare() {
- default
-
- # Fix for case-insensitive filesystems
- echo ".PHONY: all install clean distclean dist" >> Makefile.in || die
-
- mv configure.{in,ac} || die
-}
-
-src_configure() {
- econf --with-install-root="${D}" \
- $(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
- $(use_enable tk wordview)
-}
-
-src_compile() {
- emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
-}
-
-src_install() {
- default
-
- if [[ -e ${ED}/usr/bin/xls2csv ]]; then
- einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
- mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
- fi
-}
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 026a00951269..94794685346a 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,3 +1 @@
-DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
-DIST cb2bib-1.9.9.tar.gz 1292720 BLAKE2B 7263d09ab077d1029129b81abbf7a745405d476776ab91d4b73dc9799b3d945e46283fe565fee32b08df7a8734c027cbeacf0e7a44c4e15efaa6c992c69f9b7a SHA512 66e81ea8d86cdf374c9e1109d26e02c0b3101608e751ab6bbded76cca42eb8c2c1d43f6a993b9003b6013d815683f644bff7513ce63dc750ffa8d608cccb49b3
DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
diff --git a/app-text/cb2bib/cb2bib-1.9.8.ebuild b/app-text/cb2bib/cb2bib-1.9.8.ebuild
deleted file mode 100644
index e91077411de8..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- lzo? ( dev-libs/lzo:2 )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
- webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
- default
-
- sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
- use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
- use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
- eqmake5 \
- $(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- elog "For best functionality, emerge the following packages:"
- elog " app-text/poppler[utils] - for data import from PDF files"
- elog " app-text/dvipdfm - for data import from DVI files"
- elog " app-text/bibutils - for data import from ISI, endnote format"
- elog " media-fonts/jsmath - for displaying mathematical notation"
- elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
- elog " text strings"
- elog " virtual/latex-base - to check for BibTeX file correctness and to get"
- elog " nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-1.9.9.ebuild b/app-text/cb2bib/cb2bib-1.9.9.ebuild
deleted file mode 100644
index 1a3068c56e88..000000000000
--- a/app-text/cb2bib/cb2bib-1.9.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- lzo? ( dev-libs/lzo:2 )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
- webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
- default
-
- sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
- use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
- use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
- eqmake5 \
- $(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- elog "For best functionality, emerge the following packages:"
- elog " app-text/poppler[utils] - for data import from PDF files"
- elog " app-text/dvipdfm - for data import from DVI files"
- elog " app-text/bibutils - for data import from ISI, endnote format"
- elog " media-fonts/jsmath - for displaying mathematical notation"
- elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
- elog " text strings"
- elog " virtual/latex-base - to check for BibTeX file correctness and to get"
- elog " nice printing through the shell script bib2pdf"
-}
diff --git a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..3d9e11dc7cea
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="https://www.molspaces.com/cb2bib/"
+SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+lzo"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ lzo? ( dev-libs/lzo:2 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS CHANGELOG COPYRIGHT )
+
+src_prepare() {
+ default
+
+ sed -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" \
+ -i src/src.pro || die
+
+ sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
+}
+
+src_configure() {
+ eqmake5 \
+ $(use !lzo && echo -config disable_lzo)
+}
+
+src_compile() {
+ # bug #709940
+ emake -j1
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ elog "For best functionality, emerge the following packages:"
+ elog " app-text/poppler[utils] - for data import from PDF files"
+ elog " app-text/dvipdfm - for data import from DVI files"
+ elog " app-text/bibutils - for data import from ISI, endnote format"
+ elog " media-fonts/jsmath - for displaying mathematical notation"
+ elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
+ elog " text strings"
+ elog " virtual/latex-base - to check for BibTeX file correctness and to get"
+ elog " nice printing through the shell script bib2pdf"
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0.ebuild
deleted file mode 100644
index 966c0a15b77c..000000000000
--- a/app-text/cb2bib/cb2bib-2.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Tool for extracting unformatted bibliographic references"
-HOMEPAGE="https://www.molspaces.com/cb2bib/"
-SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- lzo? ( dev-libs/lzo:2 )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
- webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGELOG COPYRIGHT )
-
-src_prepare() {
- default
-
- sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
-
- use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
- use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
-}
-
-src_configure() {
- eqmake5 \
- $(use !lzo && echo -config disable_lzo)
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- elog "For best functionality, emerge the following packages:"
- elog " app-text/poppler[utils] - for data import from PDF files"
- elog " app-text/dvipdfm - for data import from DVI files"
- elog " app-text/bibutils - for data import from ISI, endnote format"
- elog " media-fonts/jsmath - for displaying mathematical notation"
- elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
- elog " text strings"
- elog " virtual/latex-base - to check for BibTeX file correctness and to get"
- elog " nice printing through the shell script bib2pdf"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml
index dca6445c8920..faf815a1d979 100644
--- a/app-text/cb2bib/metadata.xml
+++ b/app-text/cb2bib/metadata.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
- <use>
- <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag>
- </use>
<upstream>
<bugs-to>mailto:webmaster@molspaces.com</bugs-to>
</upstream>
diff --git a/app-text/cedilla/Manifest b/app-text/cedilla/Manifest
index 6a88f48a4dcf..7f40abcbd310 100644
--- a/app-text/cedilla/Manifest
+++ b/app-text/cedilla/Manifest
@@ -1,2 +1 @@
-DIST cedilla-0.6.tar.gz 130676 BLAKE2B e316dff5ab9bb89dd350e9842847ed700846cfd57370be17198aa3c54f0562a4c26d23a49acccf8c7dc0b55f1765668dbfa24dbf57f50e568ac3039f7b5d662c SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38
DIST cedilla-0.7.tar.gz 114899 BLAKE2B 100c22be30ffed585a1eb44c96109dadab9cbf90c5c3432efd4ed8daa135fa0d9fb82374eda9f9f13126cc5d453ecb5933d8733a58e374ab3192ea7d5bd6d273 SHA512 a137bceee2c70e911922b17e823093dc37b19cce8dece99596003ae7b4bc8c02afbae164d7dfa4e4873b4f549f7d948faf1da9dc1d3ef89cde6d1f36ba91be77
diff --git a/app-text/cedilla/cedilla-0.6.ebuild b/app-text/cedilla/cedilla-0.6.ebuild
deleted file mode 100644
index 720592e2a72d..000000000000
--- a/app-text/cedilla/cedilla-0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="UTF-8 to postscript converter"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
-SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="dev-lisp/clisp"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/cedilla-gentoo-r1.patch
-}
-
-src_compile() {
- ./compile-cedilla || die "Compile failed."
-}
-
-src_install() {
- sed -i "s#${ED%/}##g" cedilla || die "sed failed"
- newman cedilla.man cedilla.1
- ./install-cedilla || die "Install failed."
- dodoc NEWS README
-}
diff --git a/app-text/cedilla/cedilla-0.7-r1.ebuild b/app-text/cedilla/cedilla-0.7-r1.ebuild
new file mode 100644
index 000000000000..ba9a1e203dc8
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="UTF-8 to postscript converter"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/
+ https://github.com/jech/cedilla"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lisp/clisp"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/cedilla-gentoo-r1.patch )
+
+src_compile() {
+ ./compile-cedilla || die "Compile failed."
+}
+
+src_install() {
+ sed "s#${ED}##g" -i cedilla || die "sed failed"
+ dodir /usr/share/man/man1/
+
+ ./install-cedilla || die "Install failed."
+
+ einstalldocs
+}
diff --git a/app-text/cedilla/cedilla-0.7.ebuild b/app-text/cedilla/cedilla-0.7.ebuild
index d6e687479ec5..62a85f40d12f 100644
--- a/app-text/cedilla/cedilla-0.7.ebuild
+++ b/app-text/cedilla/cedilla-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="UTF-8 to postscript converter"
HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
LICENSE="GPL-2"
diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml
index b3c1d365eaad..432003501472 100644
--- a/app-text/cedilla/metadata.xml
+++ b/app-text/cedilla/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">jech/cedilla</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
index de495ce1cb55..0a4c5e4b144c 100644
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@@ -1 +1 @@
-DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
+DIST chasen-2.4.5.tar.xz 671064 BLAKE2B 3b9867f794a54c4b0552807c54694e9f52082d9712c9e64aa55840b70f3a3800a514d1cd36260ee7397d1e98f28909e9b3e1f5c14d64f28f666b876e130aeb3e SHA512 7a17fe9d534cdc07c147fd7d9350aba381390943f4cfd899393076efe8e6a80aae029a8d4833e91ffa945b3e52d6598c16db257c9cc8d7792b7a1f90b7a1948e
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
deleted file mode 100644
index 918861f19523..000000000000
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils perl-module
-
-DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
-HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/chasen-legacy/32224/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~sparc-solaris"
-IUSE="perl static-libs"
-
-DEPEND=">=dev-libs/darts-0.32"
-RDEPEND="${DEPEND}
- perl? ( !dev-perl/Text-ChaSen )"
-PDEPEND=">=app-dicts/ipadic-2.7.0"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-cve-2011-4000.patch
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
- if use perl ; then
- cd "${S}"/perl
- perl-module_src_configure
- fi
-}
-
-src_compile() {
- default
- if use perl ; then
- cd "${S}"/perl || die
- perl-module_src_compile
- fi
-}
-
-src_test() {
- default
- if use perl ; then
- cd "${S}"/perl || die
- perl-module_src_test
- fi
-}
-
-src_install () {
- default
-
- if use perl ; then
- cd "${S}"/perl || die
- perl-module_src_install
- newdoc README README.perl
- fi
-
- prune_libtool_files
-}
diff --git a/app-text/chasen/chasen-2.4.5.ebuild b/app-text/chasen/chasen-2.4.5.ebuild
new file mode 100644
index 000000000000..f6067a33f971
--- /dev/null
+++ b/app-text/chasen/chasen-2.4.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit perl-module
+
+DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
+HOMEPAGE="https://chasen-legacy.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}-legacy/56305/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86"
+IUSE="perl static-libs"
+
+RDEPEND="virtual/libiconv"
+DEPEND=">=dev-libs/darts-0.32"
+PDEPEND=">=app-dicts/ipadic-2.7.0"
+
+PATCHES=( "${FILESDIR}"/${PN}-uar.patch )
+
+src_configure() {
+ econf $(use_enable static-libs static)
+
+ if use perl; then
+ cd "${S}"/perl || die
+ perl-module_src_configure
+ fi
+}
+
+src_compile() {
+ default
+
+ if use perl; then
+ cd "${S}"/perl || die
+ perl-module_src_compile
+ fi
+}
+
+src_test() {
+ default
+
+ if use perl; then
+ cd "${S}"/perl || die
+ perl-module_src_test
+ fi
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ if use perl; then
+ cd "${S}"/perl || die
+ perl-module_src_install
+ newdoc README README.perl
+ fi
+}
diff --git a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
deleted file mode 100644
index 61480622e40a..000000000000
--- a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/lib/chalib.c b/lib/chalib.c
-index 5d79e13..cddf51b 100644
---- a/lib/chalib.c
-+++ b/lib/chalib.c
-@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output)
- */
- while (*input) {
- int c = 0, len, cursor;
-- if ((crlf = strpbrk(input, "\r\n")) == NULL)
-+ if ((crlf = strpbrk(input, "\r\n")) == NULL) {
- len = strlen(input);
-- else {
-+ if (len >= CHA_INPUT_SIZE) {
-+ len = CHA_INPUT_SIZE - 1;
-+ crlf = input + CHA_INPUT_SIZE - 2;
-+ c = 0;
-+ }
-+ } else {
- len = crlf - input;
- c = *crlf;
- *crlf = '\0';
diff --git a/app-text/chasen/files/chasen-uar.patch b/app-text/chasen/files/chasen-uar.patch
new file mode 100644
index 000000000000..631e0890f751
--- /dev/null
+++ b/app-text/chasen/files/chasen-uar.patch
@@ -0,0 +1,44 @@
+--- a/lib/print.c
++++ b/lib/print.c
+@@ -997,20 +997,20 @@
+ static int
+ get_compound(mrph_data_t *data, char *headword, darts_t *da, long index)
+ {
+- mrph_t mrph;
++ mrph_t *mrph = data->mrph;
+ int has_next, hw_len;
+ char *base = da_get_lex_base(da) + index;
+
+ hw_len = ((short *)base)[0];
+ has_next = ((short *)base)[1];
+ base += sizeof(short) * 2;
+- memcpy(&mrph, base, sizeof(da_lex_t));
+- mrph.headword = headword;
+- mrph.headword_len = hw_len;
+- mrph.is_undef = 0;
+- mrph.darts = da;
++ memcpy(mrph, base, sizeof(da_lex_t));
++ mrph->headword = headword;
++ mrph->headword_len = hw_len;
++ mrph->is_undef = 0;
++ mrph->darts = da;
+
+- get_mrph_data(&mrph, data);
++ get_mrph_data(mrph, data);
+
+ return has_next;
+ }
+@@ -1028,10 +1028,13 @@
+ cha_printf_mrph(lat, path_num, mdata, format);
+ } else {
+ mrph_data_t data;
++ mrph_t m;
+ long index = mdata->compound;
+ int has_next = 1;
+ char *headword = mrph->headword;
+
++ data.mrph = &m;
++
+ while (has_next) {
+ has_next = get_compound(&data, headword, mrph->darts, index);
+ if (!has_next) {
diff --git a/app-text/chasen/metadata.xml b/app-text/chasen/metadata.xml
index edc470c136a2..dfee0f2f129f 100644
--- a/app-text/chasen/metadata.xml
+++ b/app-text/chasen/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://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">chasen-legacy</remote-id>
+ <remote-id type="osdn">chasen-legacy</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 56eb10b44076..761642d944ca 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1 +1,4 @@
-DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
+DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c SHA512 aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
+DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5 SHA512 07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1
+DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b SHA512 917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc
+DIST cherrytree_1.0.4.tar.xz 3436940 BLAKE2B 67fec738e05f1823b9206d9a58f85be94df9c54d94e15a7408ade4801065523707e973bb0643d4b1c0ddb6c94a2a9eb00530b5c8cbd291696daa98f2d18f6767 SHA512 615c551523ef3cc7edaeeeeb632c3e0d4fa4ca1feca719a15e5b3e47f38113c1033ed13ef4a2821b14a3b4ef3a4079bce7f8f2c5643d11a4ecd6cbdc49b408e5
diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild b/app-text/cherrytree/cherrytree-0.37.0.ebuild
deleted file mode 100644
index 70d1db48a137..000000000000
--- a/app-text/cherrytree/cherrytree-0.37.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit xdg distutils-r1
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-LICENSE="GPL-3"
-
-SLOT="0"
-SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
- x11-libs/libX11
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
- dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-PLOCALES="cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN"
-inherit l10n
-
-python_prepare_all() {
- xdg_src_prepare
-
- if use nls ; then
- l10n_find_plocales_changes 'locale' '' '.po'
-
- rm_loc() {
- rm -v -f "locale/${1}.po" || return 1
- }
- l10n_for_each_disabled_locale_do rm_loc
- fi
-
- sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- use nls || mydistutilsargs+=( --without-gettext )
-}
diff --git a/app-text/cherrytree/cherrytree-1.0.0.ebuild b/app-text/cherrytree/cherrytree-1.0.0.ebuild
new file mode 100644
index 000000000000..a757d8026dc5
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+ app-text/gspell:=
+ >=dev-cpp/glibmm-2.64.2:2
+ dev-cpp/gtkmm:3.0
+ dev-cpp/gtksourceviewmm:3.0
+ dev-cpp/libxmlpp:2.6
+ dev-cpp/pangomm:1.4
+ dev-db/sqlite:3
+ dev-libs/fribidi
+ dev-libs/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ dev-libs/spdlog:=
+ >=x11-libs/vte-0.70.2:2.91
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-util/cpputest )"
+
+src_prepare() {
+ # disable compress man pages
+ sed -i -e \
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+ CMakeLists.txt || die
+
+ # python_fix_shebang .
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXEC="${PYTHON}"
+ -DUSE_NLS=$(usex nls)
+ -DBUILD_TESTING=$(usex test)
+ -DUSE_SHARED_FMT_SPDLOG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/cherrytree/cherrytree-1.0.1.ebuild b/app-text/cherrytree/cherrytree-1.0.1.ebuild
new file mode 100644
index 000000000000..837ea599e0fc
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+ app-text/gspell:=
+ >=dev-cpp/glibmm-2.64.2:2
+ dev-cpp/gtkmm:3.0
+ dev-cpp/gtksourceviewmm:3.0
+ dev-cpp/libxmlpp:2.6
+ dev-cpp/pangomm:1.4
+ dev-db/sqlite:3
+ dev-libs/fribidi
+ dev-libs/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ dev-libs/spdlog:=
+ >=x11-libs/vte-0.70.2:2.91
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-util/cpputest )"
+
+src_prepare() {
+ # disable compress man pages
+ sed -i -e \
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+ CMakeLists.txt || die
+
+ # python_fix_shebang .
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXEC="${PYTHON}"
+ -DUSE_NLS=$(usex nls)
+ -DBUILD_TESTING=$(usex test)
+ -DUSE_SHARED_FMT_SPDLOG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/cherrytree/cherrytree-1.0.2.ebuild b/app-text/cherrytree/cherrytree-1.0.2.ebuild
new file mode 100644
index 000000000000..dd062ad78a2f
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
+
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+ app-text/gspell:=
+ >=dev-cpp/glibmm-2.64.2:2
+ dev-cpp/gtkmm:3.0
+ dev-cpp/gtksourceviewmm:3.0
+ dev-cpp/libxmlpp:2.6
+ dev-cpp/pangomm:1.4
+ dev-db/sqlite:3
+ dev-libs/fribidi
+ dev-libs/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ dev-libs/spdlog:=
+ >=x11-libs/vte-0.70.2:2.91
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-util/cpputest )"
+
+src_prepare() {
+ # disable compress man pages
+ sed -i -e \
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+ CMakeLists.txt || die
+
+ # python_fix_shebang .
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXEC="${PYTHON}"
+ -DUSE_NLS=$(usex nls)
+ -DBUILD_TESTING=$(usex test)
+ -DUSE_SHARED_FMT_SPDLOG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/cherrytree/cherrytree-1.0.4.ebuild b/app-text/cherrytree/cherrytree-1.0.4.ebuild
new file mode 100644
index 000000000000..dd062ad78a2f
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
+
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+ app-text/gspell:=
+ >=dev-cpp/glibmm-2.64.2:2
+ dev-cpp/gtkmm:3.0
+ dev-cpp/gtksourceviewmm:3.0
+ dev-cpp/libxmlpp:2.6
+ dev-cpp/pangomm:1.4
+ dev-db/sqlite:3
+ dev-libs/fribidi
+ dev-libs/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ dev-libs/spdlog:=
+ >=x11-libs/vte-0.70.2:2.91
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-util/cpputest )"
+
+src_prepare() {
+ # disable compress man pages
+ sed -i -e \
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+ CMakeLists.txt || die
+
+ # python_fix_shebang .
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXEC="${PYTHON}"
+ -DUSE_NLS=$(usex nls)
+ -DBUILD_TESTING=$(usex test)
+ -DUSE_SHARED_FMT_SPDLOG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index e69a8d811bcb..99968430f90d 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,7 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>gjoandet@gmail.com</email>
+ <name>Guillermo Joandet</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">giuspen/cherrytree</remote-id>
</upstream>
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index e7779b22878f..9405f0d6d887 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1 +1,2 @@
-DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
+DIST cmark-0.30.3.tar.gz 246916 BLAKE2B b63027e1a7d6db21c3b1bfc89deaebb202972cf65b3ddc51f20d6cb2dacfb6724dffd226f3cace1b25dda2cd87bdb201b82779bd7a6068c5f9751513bda226ae SHA512 27383bfef95ae1390c26aff0dd2cbca33704e7d20116bf29da4695d2c9a4146b86daba0da1e91bdb9eab95671702f885e832b3d31d51601731f1dc630df5237b
+DIST cmark-0.31.0.tar.gz 251922 BLAKE2B 9532255066cd21e99de430787f261b3014c4d270e8243aa258bb9c90cf2ccfd7138dcff2e15f576cc28ee6b6b7901c0f321f5ead6a9202e06b4223288f326897 SHA512 768d456147cb8f5cf36e8122213ad053098201e118109a316518a6a5e721ac94f62af29abe1e69120c84bdc227a5c320803ea2cf320c6d9a719d62909b6533bd
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
deleted file mode 100644
index 19581fce18ac..000000000000
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/commonmark/cmark"
-SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0.29.0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMARK_LIB_FUZZER=OFF
- -DCMARK_SHARED=ON
- -DCMARK_STATIC=OFF
- -DCMARK_TESTS="$(usex test)"
- )
- cmake-utils_src_configure
-}
diff --git a/app-text/cmark/cmark-0.30.3.ebuild b/app-text/cmark/cmark-0.30.3.ebuild
new file mode 100644
index 000000000000..57ce9dc2992a
--- /dev/null
+++ b/app-text/cmark/cmark-0.30.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMARK_LIB_FUZZER=OFF
+ -DCMARK_SHARED=ON
+ -DCMARK_STATIC=OFF
+ -DCMARK_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+}
diff --git a/app-text/cmark/cmark-0.31.0.ebuild b/app-text/cmark/cmark-0.31.0.ebuild
new file mode 100644
index 000000000000..9d990ce41277
--- /dev/null
+++ b/app-text/cmark/cmark-0.31.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+ "${FILESDIR}/cmark-0.31.0_fix_api_test.patch"
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMARK_LIB_FUZZER=OFF
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTING="$(usex test)"
+ )
+ cmake_src_configure
+}
diff --git a/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch b/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch
new file mode 100644
index 000000000000..defecc445c4e
--- /dev/null
+++ b/app-text/cmark/files/cmark-0.31.0_fix_api_test.patch
@@ -0,0 +1,17 @@
+https://github.com/commonmark/cmark/commit/a739d4911b5fa5586679b8e55999719cc910d26b
+From: John MacFarlane <jgm@berkeley.edu>
+Date: Wed, 13 Mar 2024 14:31:28 -0700
+Subject: [PATCH] Flag root node as open...
+
+in `cmark_parser_new_with_mem_into_root`. Closes #532.
+--- a/src/blocks.c
++++ b/src/blocks.c
+@@ -98,6 +98,8 @@ cmark_parser *cmark_parser_new_with_mem_into_root(int options, cmark_mem *mem, c
+ cmark_strbuf_init(mem, &parser->linebuf, 0);
+ cmark_strbuf_init(mem, &parser->content, 0);
+
++ root->flags = CMARK_NODE__OPEN;
++
+ parser->refmap = cmark_reference_map_new(mem);
+ parser->root = root;
+ parser->current = root;
diff --git a/app-text/cmark/metadata.xml b/app-text/cmark/metadata.xml
index da44e88f8f6e..931b2156ee99 100644
--- a/app-text/cmark/metadata.xml
+++ b/app-text/cmark/metadata.xml
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>azamat.hackimov@gmail.com</email>
<name>Azamat H. Hackimov</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <longdescription>
- CommonMark parsing and rendering library and program in C.
- </longdescription>
<upstream>
<remote-id type="github">commonmark/cmark</remote-id>
</upstream>
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index e1db9f4d2646..7807f30ceabf 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -1 +1,2 @@
DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
+DIST cmigemo-1.3e_p20220623.tar.gz 70154 BLAKE2B 633719399afaa48e870d6995557be01460c624d992525b9192d87ccab6f90ab29e9b3b5b11f4274b204eaae0b144246cc713bcce18a51172d8e16ed5333b59fb SHA512 7e95f8a95380991eea33067a2c95b820d520a1a24919ee5be22ebcbccd53ee870ca54dbdcaa08b7d01c9b4abf7f24d09eb2c09a7f9768ed4fd08fc73667d2496
diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
deleted file mode 100644
index b39dc8bc473a..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-MY_P="${P}-MIT"
-DESCRIPTION="Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="unicode vim-syntax"
-
-DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
- dev-lang/perl
- || (
- net-misc/curl
- net-misc/wget
- www-client/fetch
- )
- app-i18n/nkf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # Bug #246953
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
- default
-
- touch dict/SKK-JISYO.L || die
- if use unicode ; then
- sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
- fi
-
- # Bug #255813
- sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
-}
-
-src_compile() {
- append-flags -fPIC
- # parallel make b0rked
- emake -j1 \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- gcc-all
-}
-
-src_install() {
- # parallel make b0rked
- emake -j1 \
- prefix="${D}/usr" \
- libdir="${D}/usr/$(get_libdir)" \
- gcc-install
-
- local encoding
- if use unicode ; then
- encoding="utf-8"
- else
- encoding="euc-jp"
- fi
-
- mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/" || die
- rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8} || die
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/plugin
- doins tools/migemo.vim
- fi
-
- dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r4.ebuild b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
new file mode 100644
index 000000000000..f39e35d60f0f
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P}-MIT"
+
+DESCRIPTION="Migemo library implementation in C"
+HOMEPAGE="https://www.kaoriya.net/software/cmigemo/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc x86"
+IUSE="unicode vim"
+
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
+DEPEND="${RDEPEND}"
+BDEPEND="app-i18n/nkf
+ dev-lang/perl
+ || (
+ net-misc/curl
+ net-misc/wget
+ www-client/fetch
+ )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-ldflags.patch
+ # bug #246953
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-parallel-build.patch
+ "${FILESDIR}"/${P}-parallel-install.patch
+)
+DOCS=( doc/{README_j,TODO_j,vimigemo}.txt )
+
+src_prepare() {
+ default
+
+ touch dict/SKK-JISYO.L || die
+ if use unicode; then
+ sed -i "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+ fi
+
+ # bug #255813
+ sed -i "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
+}
+
+src_compile() {
+ append-flags -fPIC
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ gcc-all
+}
+
+src_install() {
+ emake \
+ prefix="${ED}/usr" \
+ libdir="${ED}/usr/$(get_libdir)" \
+ gcc-install
+ einstalldocs
+
+ local encoding
+ if use unicode; then
+ encoding="utf-8"
+ else
+ encoding="euc-jp"
+ fi
+
+ mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die
+ rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8}
+
+ if use vim; then
+ insinto /usr/share/vim/vimfiles/plugin
+ doins tools/migemo.vim
+ fi
+}
diff --git a/app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild b/app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild
new file mode 100644
index 000000000000..84f5050840cc
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3e_p20220623.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic toolchain-funcs vcs-snapshot
+
+EGIT_COMMIT="e0f6145f61e0b7058c3006f344e58571d9fdd83a"
+
+DESCRIPTION="Migemo library implementation in C"
+HOMEPAGE="https://www.kaoriya.net/software/cmigemo/"
+SRC_URI="https://github.com/koron/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="unicode vim"
+
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
+DEPEND="${RDEPEND}"
+BDEPEND="app-i18n/nkf
+ dev-lang/perl
+ || (
+ net-misc/curl
+ net-misc/wget
+ www-client/fetch
+ )"
+
+PATCHES=(
+ # bug #246953
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-ldflags.patch
+)
+DOCS=( doc/{README_j,TODO_j,vimigemo}.txt )
+
+src_prepare() {
+ default
+
+ touch dict/SKK-JISYO.L || die
+ if use unicode; then
+ sed -i "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+ fi
+
+ # bug #255813
+ sed -i "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
+}
+
+src_compile() {
+ append-flags -fPIC
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ gcc-all
+}
+
+src_install() {
+ emake \
+ prefix="${ED}/usr" \
+ libdir="${ED}/usr/$(get_libdir)" \
+ gcc-install
+ einstalldocs
+
+ local encoding
+ if use unicode; then
+ encoding="utf-8"
+ else
+ encoding="euc-jp"
+ fi
+
+ mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die
+ rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8}
+
+ if use vim; then
+ insinto /usr/share/vim/vimfiles/plugin
+ doins tools/migemo.vim
+ fi
+}
diff --git a/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch b/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch
index 2f903bb9bb62..daf9c18e9157 100644
--- a/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch
+++ b/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak cmigemo-1.3c-MIT/compile/Make_gcc.mak
---- cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak 2003-10-19 16:00:59.000000000 +0900
-+++ cmigemo-1.3c-MIT/compile/Make_gcc.mak 2009-11-08 16:45:32.485952233 +0900
+--- a/compile/Make_gcc.mak
++++ b/compile/Make_gcc.mak
@@ -14,7 +14,7 @@
libmigemo = libmigemo.so
EXEEXT =
@@ -10,9 +9,18 @@ diff -Naur cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak cmigemo-1.3c-MIT/compile/M
include config.mk
include compile/unix.mak
-diff -Naur cmigemo-1.3c-MIT.orig/configure cmigemo-1.3c-MIT/configure
---- cmigemo-1.3c-MIT.orig/configure 2004-06-19 12:50:27.000000000 +0900
-+++ cmigemo-1.3c-MIT/configure 2009-11-08 16:40:42.688962262 +0900
+--- a/compile/unix.mak
++++ b/compile/unix.mak
+@@ -22,6 +22,7 @@
+ $(MKDIR) $$i; \
+ fi \
+ done
++ touch $@
+
+ $(outdir)cmigemo$(EXEEXT): $(objdir)main.$(O) $(libmigemo_LIB)
+ $(CC) -o $@ $(objdir)main.$(O) -L. -L$(outdir) -lmigemo $(LDFLAGS)
+--- a/configure
++++ b/configure
@@ -31,12 +31,12 @@
fi
@@ -30,9 +38,8 @@ diff -Naur cmigemo-1.3c-MIT.orig/configure cmigemo-1.3c-MIT/configure
exit 1
fi
-diff -Naur cmigemo-1.3c-MIT.orig/tools/migemo.vim cmigemo-1.3c-MIT/tools/migemo.vim
---- cmigemo-1.3c-MIT.orig/tools/migemo.vim 2004-02-23 16:32:53.000000000 +0900
-+++ cmigemo-1.3c-MIT/tools/migemo.vim 2009-11-08 16:42:19.572951008 +0900
+--- a/tools/migemo.vim
++++ b/tools/migemo.vim
@@ -20,7 +20,7 @@
let dict = globpath(path, "migemo-dict")
endif
@@ -47,9 +54,33 @@ diff -Naur cmigemo-1.3c-MIT.orig/tools/migemo.vim cmigemo-1.3c-MIT/tools/migemo.
else
" non-builtin version
- let g:migemodict = s:SearchDict()
-+ if !exists('g:migemodict')
++ if !get(g:, 'migemodict')
+ let g:migemodict = s:SearchDict()
+ endif
command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
+@@ -53,11 +55,6 @@
+ if retval == ''
+ return
+ endif
+- if has('iconv') && $HOMEDRIVE != ''
+- let retval = iconv(retval, 'cp932', 'euc-jp')
+- elseif &encoding != 'euc-jp'
+- let retval = iconv(retval, &encoding, 'euc-jp')
+- endif
+ "let retval = system('cmigemo -v -w "'.retval.'" -d "'.g:migemodict.'"')
+ let retval = system('cmigemo -v -w '.retval.' -d "'.g:migemodict.'"')
+ if retval == ''
+@@ -88,11 +85,6 @@
+ echohl None
+ return
+ endif
+- if has('iconv') && $HOMEDRIVE != ''
+- let retval = iconv(retval, 'euc-jp', 'cp932')
+- elseif &encoding != 'euc-jp'
+- let retval = iconv(retval, 'euc-jp', &encoding)
+- endif
+
+ let @/ = retval
+ let v:errmsg = ''
diff --git a/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch b/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch
deleted file mode 100644
index 2f4f8c922431..000000000000
--- a/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/compile/Make_gcc.mak b/compile/Make_gcc.mak
-index f042ac6..f91fe92 100644
---- a/compile/Make_gcc.mak
-+++ b/compile/Make_gcc.mak
-@@ -28,7 +28,7 @@ include compile/clean_unix.mak
- #
- $(libmigemo_LIB): $(libmigemo_DSO)
- $(libmigemo_DSO): $(libmigemo_OBJ)
-- $(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ)
-+ $(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ) $(LDFLAGS)
- $(RM) $@ $(libmigemo)
- ln -s $(libmigemo_LIB) $@
- ln -s $(libmigemo_LIB) $(libmigemo)
diff --git a/app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch b/app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch
new file mode 100644
index 000000000000..b311754e1538
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-1.3c-parallel-build.patch
@@ -0,0 +1,73 @@
+https://github.com/koron/cmigemo/pull/28
+
+From fd4bad807a9a52130d58269a4b1507a8720c5ae6 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Fri, 12 Nov 2021 15:16:54 +0000
+Subject: [PATCH] Add directory dependencies to fix parallel builds
+
+When building in parallel (make -j) sometimes make would try to create
+a dictionary file before the directory containing it had been
+created. To fix this, I've made the directory a dependency of each
+file in it, rather than having them be sibling dependencies of the
+-files targets.
+---
+ dict/dict.mak | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/dict/dict.mak b/dict/dict.mak
+index 8ea8a66..44bd543 100644
+--- a/dict/dict.mak
++++ b/dict/dict.mak
+@@ -33,40 +33,40 @@ cp932: $(DICT)
+ # Dictionary in euc-jp
+ #
+ euc-jp: cp932 euc-jp-files
+-euc-jp-files: $(EUCJP_DIR) $(EUCJP_DIR)/migemo-dict \
++euc-jp-files: $(EUCJP_DIR)/migemo-dict \
+ $(EUCJP_DIR)/zen2han.dat $(EUCJP_DIR)/han2zen.dat \
+ $(EUCJP_DIR)/hira2kata.dat $(EUCJP_DIR)/roma2hira.dat
+ $(EUCJP_DIR):
+ $(MKDIR) $(EUCJP_DIR)
+-$(EUCJP_DIR)/migemo-dict: migemo-dict
++$(EUCJP_DIR)/migemo-dict: $(EUCJP_DIR) migemo-dict
+ $(FILTER_EUCJP) < migemo-dict > $@
+-$(EUCJP_DIR)/zen2han.dat: zen2han.dat
++$(EUCJP_DIR)/zen2han.dat: $(EUCJP_DIR) zen2han.dat
+ $(FILTER_EUCJP) < zen2han.dat > $@
+-$(EUCJP_DIR)/han2zen.dat: han2zen.dat
++$(EUCJP_DIR)/han2zen.dat: $(EUCJP_DIR) han2zen.dat
+ $(FILTER_EUCJP) < han2zen.dat > $@
+-$(EUCJP_DIR)/hira2kata.dat: hira2kata.dat
++$(EUCJP_DIR)/hira2kata.dat: $(EUCJP_DIR) hira2kata.dat
+ $(FILTER_EUCJP) < hira2kata.dat > $@
+-$(EUCJP_DIR)/roma2hira.dat: roma2hira.dat
++$(EUCJP_DIR)/roma2hira.dat: $(EUCJP_DIR) roma2hira.dat
+ $(FILTER_EUCJP) < roma2hira.dat > $@
+
+ ##############################################################################
+ # Dictionary in utf-8
+ #
+ utf-8: cp932 utf-8-files
+-utf-8-files: $(UTF8_DIR) $(UTF8_DIR)/migemo-dict \
++utf-8-files: $(UTF8_DIR)/migemo-dict \
+ $(UTF8_DIR)/zen2han.dat $(UTF8_DIR)/han2zen.dat \
+ $(UTF8_DIR)/hira2kata.dat $(UTF8_DIR)/roma2hira.dat
+ $(UTF8_DIR):
+ $(MKDIR) $(UTF8_DIR)
+-$(UTF8_DIR)/migemo-dict: migemo-dict
++$(UTF8_DIR)/migemo-dict: $(UTF8_DIR) migemo-dict
+ $(FILTER_UTF8) < migemo-dict > $@
+-$(UTF8_DIR)/zen2han.dat: zen2han.dat
++$(UTF8_DIR)/zen2han.dat: $(UTF8_DIR) zen2han.dat
+ $(FILTER_UTF8) < zen2han.dat > $@
+-$(UTF8_DIR)/han2zen.dat: han2zen.dat
++$(UTF8_DIR)/han2zen.dat: $(UTF8_DIR) han2zen.dat
+ $(FILTER_UTF8) < han2zen.dat > $@
+-$(UTF8_DIR)/hira2kata.dat: hira2kata.dat
++$(UTF8_DIR)/hira2kata.dat: $(UTF8_DIR) hira2kata.dat
+ $(FILTER_UTF8) < hira2kata.dat > $@
+-$(UTF8_DIR)/roma2hira.dat: roma2hira.dat
++$(UTF8_DIR)/roma2hira.dat: $(UTF8_DIR) roma2hira.dat
+ $(FILTER_UTF8) < roma2hira.dat > $@
+
+ ##############################################################################
diff --git a/app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch b/app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch
new file mode 100644
index 000000000000..9ac30d65a3c0
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-1.3c-parallel-install.patch
@@ -0,0 +1,113 @@
+https://github.com/koron/cmigemo/pull/29
+
+From 4c7476b614208836c3f4036fca87c8c718043c8b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Wed, 22 Jun 2022 22:07:18 +0100
+Subject: [PATCH 1/3] compile/unix.mak: add .o file dependency on $(objdir)
+ directory
+
+Without this change parallel build fails occasionally when object
+files are built before directory is being created:
+
+ make[1]: Entering directory '/build/cmigemo'
+ gcc -O2 -Wall -fPIC -o build/object/charset.o -c src/charset.c
+ Assembler messages:
+ Fatal error: can't create build/object/charset.o: No such file or directory
+ make[1]: *** [compile/unix.mak:33: build/object/charset.o] Error 1 shuffle=1655929862
+---
+ compile/unix.mak | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/compile/unix.mak b/compile/unix.mak
+index 8ef6413..8cf525a 100644
+--- a/compile/unix.mak
++++ b/compile/unix.mak
+@@ -14,7 +14,7 @@ CFLAGS = -O2 -Wall $(DEFINES) $(CFLAGS_MIGEMO)
+ LDFLAGS = $(LDFLAGS_MIGEMO)
+ LIBS =
+
+-default: dirs $(outdir)cmigemo$(EXEEXT)
++default: $(outdir)cmigemo$(EXEEXT)
+
+ dirs:
+ @for i in $(objdir) $(outdir); do \
+@@ -26,10 +26,10 @@ dirs:
+ $(outdir)cmigemo$(EXEEXT): $(objdir)main.$(O) $(libmigemo_LIB)
+ $(CC) -o $@ $(objdir)main.$(O) -L. -L$(outdir) -lmigemo $(LDFLAGS)
+
+-$(objdir)main.o: $(srcdir)main.c
++$(objdir)main.o: $(srcdir)main.c dirs
+ $(CC) $(CFLAGS) -o $@ -c $<
+
+-$(objdir)%.o: $(srcdir)%.c
++$(objdir)%.o: $(srcdir)%.c dirs
+ $(CC) $(CFLAGS) -o $@ -c $<
+
+ ##############################################################################
+
+From 88a1ed71a637faa6ec4eeb7e2b2f0a9f597a4812 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Wed, 22 Jun 2022 22:10:42 +0100
+Subject: [PATCH 2/3] compile/unix.mak: add install dependency on $(dictdir)
+ directory
+
+Without this change parallel install fails occasionally when
+$(dictdir) is not yet present:
+
+ gcc -o build/cmigemo ./build/object/main.o -L. -L./build/ -lmigemo -Wl,-rpath,.,-rpath,/usr/local/lib,-rpath,/usr/lib
+ install -m 644 dict/migemo-dict ...-cmigemo-1.3e/share/migemo/cp932
+ install: cannot create regular file '...-cmigemo-1.3e/share/migemo/cp932': No such file or directory
+ make[1]: *** [compile/unix.mak:49: install-dict] Error 1 shuffle=1655931959
+---
+ compile/unix.mak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compile/unix.mak b/compile/unix.mak
+index 8cf525a..cb6bd8f 100644
+--- a/compile/unix.mak
++++ b/compile/unix.mak
+@@ -45,7 +45,7 @@ install-mkdir:
+ $(MKDIR) $(dictdir)/euc-jp
+ $(MKDIR) $(dictdir)/utf-8
+
+-install-dict:
++install-dict: install-mkdir
+ $(INSTALL_DATA) dict/migemo-dict $(dictdir)/cp932
+ $(INSTALL_DATA) dict/han2zen.dat $(dictdir)/cp932
+ $(INSTALL_DATA) dict/hira2kata.dat $(dictdir)/cp932
+
+From 3b39db8a748081e60bcceb7a8ae93616a5939f41 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Wed, 22 Jun 2022 22:16:12 +0100
+Subject: [PATCH 3/3] compile/unix.mak: add install-lib dependency on $(libdir)
+ directory
+
+Without this change parallel install fails occasionally when
+$(libdir) is not yet present:
+
+ rm -f libmigemo.so.1 libmigemo.so
+ ln -s libmigemo.so.1.1.0 libmigemo.so.1
+ ln -s libmigemo.so.1.1.0 libmigemo.so
+ install -m 755 libmigemo.so.1.1.0 ...-cmigemo-1.3e/lib
+ rm -f ...-cmigemo-1.3e/lib/libmigemo.so.1 ...-cmigemo-1.3e/lib/libmigemo.so
+ ln -s libmigemo.so.1.1.0 ...-cmigemo-1.3e/lib/libmigemo.so.1
+ ln: failed to create symbolic link '...-cmigemo-1.3e/lib/libmigemo.so.1': Not a directory
+ make[1]: *** [compile/Make_gcc.mak:38: install-lib] Error 1 shuffle=1655932664
+---
+ compile/unix.mak | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/compile/unix.mak b/compile/unix.mak
+index cb6bd8f..6651fcd 100644
+--- a/compile/unix.mak
++++ b/compile/unix.mak
+@@ -66,6 +66,9 @@ install-dict: install-mkdir
+ $(INSTALL_DATA) dict/utf-8.d/zen2han.dat $(dictdir)/utf-8; \
+ fi
+
++# depends on $(libdir) to be already present
++install-lib: install-mkdir
++
+ install: $(outdir)cmigemo$(EXEEXT) $(libmigemo_DSO) install-mkdir install-dict install-lib
+ $(INSTALL_DATA) $(srcdir)migemo.h $(incdir)
+ $(INSTALL_DATA) doc/README_j.txt $(docdir)
diff --git a/app-text/cmigemo/files/cmigemo-gentoo.patch b/app-text/cmigemo/files/cmigemo-gentoo.patch
new file mode 100644
index 000000000000..37215d224ed8
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-gentoo.patch
@@ -0,0 +1,74 @@
+--- a/compile/Make_gcc.mak
++++ b/compile/Make_gcc.mak
+@@ -14,7 +14,7 @@
+ libmigemo = libmigemo.so
+ EXEEXT =
+ CFLAGS_MIGEMO = -fPIC
+-LDFLAGS_MIGEMO = -Wl,-rpath,.,-rpath,/usr/local/lib,-rpath,/usr/lib
++LDFLAGS_MIGEMO =
+
+ include config.mk
+ include compile/unix.mak
+--- a/compile/unix.mak
++++ b/compile/unix.mak
+@@ -22,6 +22,7 @@
+ $(MKDIR) $$i; \
+ fi \
+ done
++ touch $@
+
+ $(outdir)cmigemo$(EXEEXT): $(objdir)main.$(O) $(libmigemo_LIB)
+ $(CC) -o $@ $(objdir)main.$(O) -L. -L$(outdir) -lmigemo $(LDFLAGS)
+--- a/configure
++++ b/configure
+@@ -31,12 +31,12 @@
+ fi
+
+ # Check encoding filter
+-if CHECK_COMMAND qkc ; then
+- PROGRAM_ENCODEFILTER="qkc -q -u"
+-elif CHECK_COMMAND nkf ; then
++if CHECK_COMMAND nkf ; then
+ PROGRAM_ENCODEFILTER="nkf -x"
++elif CHECK_COMMAND qkc ; then
++ PROGRAM_ENCODEFILTER="qkc -q -u"
+ else
+- echo "ERROR: Require qkc or nkf installed for encode filter."
++ echo "ERROR: Require nkf or qkc installed for encode filter."
+ exit 1
+ fi
+
+--- a/tools/migemo.vim
++++ b/tools/migemo.vim
+@@ -24,10 +24,7 @@
+ endif
+ if dict == ''
+ for path in [
+- \ '/usr/local/share/migemo/',
+- \ '/usr/local/share/cmigemo/',
+ \ '/usr/local/share/',
+- \ '/usr/share/cmigemo/',
+ \ '/usr/share/',
+ \ ]
+ let path = path . a:name
+@@ -50,6 +47,9 @@
+ let dict = s:SearchDict2(&encoding.'/migemo-dict')
+ endif
+ if dict == ''
++ let dict = s:SearchDict2('migemo/migemo-dict')
++ endif
++ if dict == ''
+ let dict = s:SearchDict2('migemo-dict')
+ endif
+ return dict
+@@ -70,7 +70,9 @@
+ nnoremap <Leader>f :call <SID>SearchChar(0)<CR>
+ else
+ " non-builtin version
+- let g:migemodict = s:SearchDict()
++ if !get(g:, 'migemodict')
++ let g:migemodict = s:SearchDict()
++ endif
+ command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
+ nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
+
diff --git a/app-text/cmigemo/files/cmigemo-ldflags.patch b/app-text/cmigemo/files/cmigemo-ldflags.patch
new file mode 100644
index 000000000000..ca1db125c5a2
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/compile/Make_gcc.mak
++++ b/compile/Make_gcc.mak
+@@ -28,7 +28,7 @@
+ #
+ $(libmigemo_LIB): $(libmigemo_DSO)
+ $(libmigemo_DSO): $(libmigemo_OBJ)
+- $(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ)
++ $(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ) $(LDFLAGS)
+ $(RM) $@ $(libmigemo)
+ ln -s $(libmigemo_LIB) $@
+ ln -s $(libmigemo_LIB) $(libmigemo)
diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
index 6f2ca22da233..0d0a18d865c0 100644
--- a/app-text/cmigemo/metadata.xml
+++ b/app-text/cmigemo/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">koron/cmigemo</remote-id>
+ </upstream>
+ <use>
+ <flag name="vim">Install Vim plugin for C/Migemo</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/code2html/code2html-0.9.1-r2.ebuild b/app-text/code2html/code2html-0.9.1-r2.ebuild
index fbcb1710f60b..37f32dd7a3c8 100644
--- a/app-text/code2html/code2html-0.9.1-r2.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils prefix
+inherit prefix
DESCRIPTION="Converts source files to colored HTML output"
HOMEPAGE="http://www.palfrader.org/code2html/"
@@ -12,28 +12,31 @@ SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-DEPEND=""
RDEPEND=">=dev-lang/perl-5"
-src_prepare() {
+PATCHES=(
# Be consistent in color codes (bug #119406)
- epatch "${WORKDIR}"/${P}-lowercase_color_codes.patch
+ "${WORKDIR}"/${P}-lowercase_color_codes.patch
# Improved C++ support (bug #133159)
- epatch "${WORKDIR}"/${P}-cpp_keywords.patch
+ "${WORKDIR}"/${P}-cpp_keywords.patch
# Improved Ada support (bug #133176)
- epatch "${WORKDIR}"/${P}-ada_identifiers.patch
+ "${WORKDIR}"/${P}-ada_identifiers.patch
# For prefix paths
- epatch "${FILESDIR}"/${P}-prefix.patch
- eprefixify code2html
+ "${FILESDIR}"/${P}-prefix.patch
# For newer Perl, bug 523610
- epatch "${FILESDIR}"/${P}-scalar.patch
+ "${FILESDIR}"/${P}-scalar.patch
+)
+
+src_prepare() {
+ default
+
+ eprefixify code2html
}
src_install() {
diff --git a/app-text/code2html/files/code2html-0.9.1-prefix.patch b/app-text/code2html/files/code2html-0.9.1-prefix.patch
index cc27296fb71c..fbfc9d6b5356 100644
--- a/app-text/code2html/files/code2html-0.9.1-prefix.patch
+++ b/app-text/code2html/files/code2html-0.9.1-prefix.patch
@@ -1,5 +1,5 @@
---- code2html
-+++ code2html
+--- a/code2html
++++ b/code2html
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
diff --git a/app-text/code2html/files/code2html-0.9.1-scalar.patch b/app-text/code2html/files/code2html-0.9.1-scalar.patch
index eddc89a6a8f7..b8f56f1a7d1a 100644
--- a/app-text/code2html/files/code2html-0.9.1-scalar.patch
+++ b/app-text/code2html/files/code2html-0.9.1-scalar.patch
@@ -1,5 +1,5 @@
---- code2html.orig 2002-01-12 22:17:02.000000000 +0100
-+++ code2html 2014-09-24 13:52:52.000000000 +0200
+--- a/code2html
++++ b/code2html
@@ -1357,7 +1357,7 @@
my @lines = split ( /\n/, $_[0] );
diff --git a/app-text/code2html/metadata.xml b/app-text/code2html/metadata.xml
index a669204029fc..68e754003b8f 100644
--- a/app-text/code2html/metadata.xml
+++ b/app-text/code2html/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
- Code2HTML converts a program source code to syntax highlighted
- HTML. It may be called as a CGI script. It can also handle include
- commands in HTML files.
-</longdescription>
+ <!-- maintainer-needed -->
+ <longdescription>
+ Code2HTML converts a program source code to syntax highlighted
+ HTML. It may be called as a CGI script. It can also handle include
+ commands in HTML files.
+ </longdescription>
</pkgmetadata>
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
deleted file mode 100644
index d56b60c9caf7..000000000000
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="clit${PV//./}"
-
-DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
-HOMEPAGE="http://www.convertlit.com/"
-SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libtommath-0.36-r1"
-
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S="${WORKDIR}"
-
-PATCHES=(
- "${FILESDIR}/${P}-respectflags-r1.patch"
- "${FILESDIR}/fix-Wformat-security-warnings.patch"
- "${FILESDIR}/support-ar-variable.patch"
-)
-
-src_compile() {
- tc-export CC
-
- cd "${S}/lib" || die "failed to change into ${S}/lib directory"
- emake
- cd "${S}/${MY_P}" || die "failed to change into ${S}/${MY_P} directory"
- emake
-}
-
-src_install() {
- einstalldocs
- dobin "${MY_P}/clit"
-}
diff --git a/app-text/convertlit/convertlit-1.8-r4.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild
new file mode 100644
index 000000000000..43fda1a62dee
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="clit${PV//./}"
+
+DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
+HOMEPAGE="http://www.convertlit.com/"
+SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=dev-libs/libtommath-0.36-r1"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-respectflags-r1.patch
+ "${FILESDIR}"/fix-Wformat-security-warnings.patch
+ "${FILESDIR}"/support-ar-variable.patch
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_compile() {
+ tc-export AR CC
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
+ emake -C lib
+ emake -C ${MY_P}
+}
+
+src_install() {
+ dobin ${MY_P}/clit
+ einstalldocs
+}
diff --git a/app-text/convertlit/files/convertlit-1.8-clang16.patch b/app-text/convertlit/files/convertlit-1.8-clang16.patch
new file mode 100644
index 000000000000..13d5786c13f9
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-clang16.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/870946
+--- a/clit18/display.c
++++ b/clit18/display.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/clit18/drm5.c
++++ b/clit18/drm5.c
+@@ -32,2 +32,3 @@
+ #include <string.h>
++#include <ctype.h>
+ #include <assert.h>
+--- a/clit18/explode.c
++++ b/clit18/explode.c
+@@ -26,2 +26,3 @@
+ #include <string.h>
++#include <sys/stat.h>
+ #include "clit.h"
+--- a/clit18/hexdump.c
++++ b/clit18/hexdump.c
+@@ -18,2 +18,3 @@
+ #include <stdlib.h>
++#include <string.h>
+
+--- a/clit18/manifest.c
++++ b/clit18/manifest.c
+@@ -25,2 +25,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/clit18/transmute.c
++++ b/clit18/transmute.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
+--- a/lib/litsections.c
++++ b/lib/litsections.c
+@@ -33,2 +33,3 @@
+ #include "litinternal.h"
++#include "lzx/lzx.h"
+ #include "lzx.h"
+--- a/lib/newlzx/lzxglue.c
++++ b/lib/newlzx/lzxglue.c
+@@ -30,2 +30,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include "litlib.h"
diff --git a/app-text/convertlit/metadata.xml b/app-text/convertlit/metadata.xml
index d566173e69a9..e5a5ef959c30 100644
--- a/app-text/convertlit/metadata.xml
+++ b/app-text/convertlit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index 2b209844456d..0fa5c9d870bc 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,2 +1 @@
-DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild
deleted file mode 100644
index b63b14e8de57..000000000000
--- a/app-text/convmv/convmv-2.04.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="https://www.j3e.de/linux/convmv/"
-SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
- dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
- unpack ./testsuite.tar
-
- cd "${S}"/suite
- ./dotests.sh || die "Tests failed"
-}
diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild
new file mode 100644
index 000000000000..7537c63db64f
--- /dev/null
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.05-manpage_nocompress.patch" #729544
+)
+
+src_prepare() {
+ default
+ sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+ unpack ./testsuite.tar
+
+ cd "${S}"/suite || die
+ ./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/convmv/convmv-2.05.ebuild b/app-text/convmv/convmv-2.05.ebuild
deleted file mode 100644
index 59f68eebfee8..000000000000
--- a/app-text/convmv/convmv-2.05.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="https://www.j3e.de/linux/convmv/"
-SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
- dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
- unpack ./testsuite.tar
-
- cd "${S}"/suite || die
- ./dotests.sh || die "Tests failed"
-}
diff --git a/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
new file mode 100644
index 000000000000..02f0c41032ee
--- /dev/null
+++ b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
@@ -0,0 +1,16 @@
+--- convmv-2.05/Makefile
++++ convmv-2.05/Makefile
+@@ -10,11 +10,11 @@
+ install: all
+ mkdir -p $(DESTDIR)$(MANDIR)/man1/
+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
+- cp convmv.1.gz $(DESTDIR)$(MANDIR)/man1/
++ cp convmv.1 $(DESTDIR)$(MANDIR)/man1/
+ install -m 755 convmv $(DESTDIR)$(PREFIX)/bin/
+
+ manpage:
+- pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz
++ pod2man --section 1 --center=" " convmv > convmv.1
+
+ clean:
+ rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name
diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml
index c7be278b6458..ec151f29d1be 100644
--- a/app-text/convmv/metadata.xml
+++ b/app-text/convmv/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
</maintainer>
</pkgmetadata>
diff --git a/app-text/cook/Manifest b/app-text/cook/Manifest
deleted file mode 100644
index 0b3bfad195fe..000000000000
--- a/app-text/cook/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cook-1.0.2.tar.gz 139428 BLAKE2B c3f1a3e753a7de14fce4f357af64f99af5e0a515988bb2aef40b79a0cc70dcba4bb585c1fa31e0da1d235fc1c363e9693338756f2bd784898a7dc63944b9ed51 SHA512 6941d3541a6cccc18fcbf14128e0593556148d40f74715b0da943455a223099406d632466137fabef27a2083b582701df92666a1ad6e6a04f5d2d3dc0b62e1a1
diff --git a/app-text/cook/cook-1.0.2-r1.ebuild b/app-text/cook/cook-1.0.2-r1.ebuild
deleted file mode 100644
index 4c1343f0e2c4..000000000000
--- a/app-text/cook/cook-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Embedded language which can be used as a macro preprocessor"
-HOMEPAGE="http://cook.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cook/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- newbin src/cook cookproc
-
- dodoc README doc/cook.txt doc/cook.html
- docinto examples
- dodoc test/pcb.dbdef test/pcb.dg test/pcbprol.ps test/tempsens.pcb
- docompress -x /usr/share/doc/${PF}/examples
-
- local DOC_CONTENTS="
- NOTICE:
- ${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc in Gentoo
- -- Karl Trygve Kalleberg <karltk@gentoo.org>"
- readme.gentoo_create_doc
- dodoc "${T}"/README.gentoo
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-text/cook/metadata.xml b/app-text/cook/metadata.xml
deleted file mode 100644
index 7e1c91980a55..000000000000
--- a/app-text/cook/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">cook</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
deleted file mode 100644
index 91cca4b0203d..000000000000
--- a/app-text/coolreader/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
diff --git a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
deleted file mode 100644
index db5d2760de9a..000000000000
--- a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
-
-CR_PV=$(ver_rs 3 '-')
-
-if [ "${PV}" != 9999 ]
-then
- # git tag cr3.2.2-1
- SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-cr${CR_PV}"
-else
- inherit git-r3
- # github mirror has some new commits to fix page margins settings
- # sourceforge mirror saved as backup
- #EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
- EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
- SRC_URI=""
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://sourceforge.net/projects/crengine/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
- media-libs/libpng:0
- virtual/jpeg:0
- media-libs/freetype
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
- !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-DEPEND="${CDEPEND}
- !wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
- wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-for lang in ${PLOCALES}; do
- IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # locales
- l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
- local lang langs
- langs=""
- for lang in ${PLOCALES}; do
- if use l10n_${lang}; then
- langs="${langs} ${lang}"
- fi
- done
- sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
- -i "${S}"/cr3qt/CMakeLists.txt \
- || die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
- CMAKE_USE_DIR="${S}"
- CMAKE_BUILD_TYPE="Release"
- if use wxwidgets; then
- setup-wxwidgets
- local mycmakeargs=(-D GUI=WX)
- else
- local mycmakeargs=(-D GUI=QT5)
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- if ! use wxwidgets; then
- mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
- rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
- gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
- gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
deleted file mode 100644
index 0bc14087cc2d..000000000000
--- a/app-text/coolreader/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>grozin@gentoo.org</email>
- </maintainer>
- <longdescription lang="en">
- A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices.
- Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI.
- </longdescription>
- <use>
- <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">crengine</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index 610aa4c715ab..90af51fd9036 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1,2 +1 @@
-DIST cpdf-2.1.1.tar.gz 349536 BLAKE2B 4064605890745ebaa24d32c3294a3293312dc8df6ab3989e1a7417989cdb19aca6b70faafb258c7c00d6febeba8b17379396c1f90628e72be0791cdefc579b6f SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517
-DIST cpdf-2.2.1.tar.gz 704730 BLAKE2B 1767d2c9fdc645b4ff97b828b1d7bedb22aa645444f299e36ec4717015ea7b87dbbac4c9ec27bb508a7adb28b2c75c155bf9094a168567abbffa93887712241d SHA512 3dda72513c551cca5d8cb60732b3f2c2e8ad400bd2c9fcf0c3b54a68e94385e3f19ec7713de95efa90eafb7b0077662097565a28616041019e03edf140b6af4f
+DIST cpdf-2.3.1.tar.gz 385720 BLAKE2B fae61c8e62b1c679919512c5fa4c57279e118d7ecc8378b528053a1487731675f47877c6164d92f3770e38db78fd9bcce0635f76f0b2efdf10c775a1e9cf5ed7 SHA512 3f22e76bc6bffe2bcd6b2c27d0aa8dc55b842cf0eee46f23c0f3e23e1a86ac7af4665b48513ae3e2d7d2ae84fc864af3b6c3c92e93d78b7798b801bb9be987a1
diff --git a/app-text/cpdf/cpdf-2.1.1-r1.ebuild b/app-text/cpdf/cpdf-2.1.1-r1.ebuild
deleted file mode 100644
index 74a530638f33..000000000000
--- a/app-text/cpdf/cpdf-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A command line tool for manipulating PDF files"
-HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
-SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# BSD is only for xmlm.ml
-LICENSE="Coherent-Graphics BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ocaml-4:=
- dev-ml/camlpdf:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror bindist"
-
-S=${WORKDIR}/${PN}-source-${PV}
-
-src_compile() {
- # parallel make issues
- emake -j1
-}
-
-src_install() {
- findlib_src_install
-
- dobin cpdf
- dodoc Changes README.md
-
- if use doc ; then
- dodoc cpdfmanual.pdf
- dohtml doc/cpdf/html/*
- fi
-}
diff --git a/app-text/cpdf/cpdf-2.2.1.ebuild b/app-text/cpdf/cpdf-2.2.1.ebuild
deleted file mode 100644
index f65bcfcc2166..000000000000
--- a/app-text/cpdf/cpdf-2.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="A command line tool for manipulating PDF files"
-HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
-SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# BSD is only for xmlm.ml
-LICENSE="Coherent-Graphics BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
- dev-ml/camlpdf:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror bindist"
-
-S=${WORKDIR}/${PN}-source-${PV}
-
-src_compile() {
- # parallel make issues
- emake -j1
-}
-
-src_install() {
- findlib_src_install
-
- dobin cpdf
- dodoc Changes README.md cpdfmanual.pdf
- doman cpdf.1
-
- use doc && dodoc -r doc/cpdf/html
-}
diff --git a/app-text/cpdf/cpdf-2.3.1.ebuild b/app-text/cpdf/cpdf-2.3.1.ebuild
new file mode 100644
index 000000000000..3df1825ad110
--- /dev/null
+++ b/app-text/cpdf/cpdf-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A command line tool for manipulating PDF files"
+HOMEPAGE="https://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# BSD is only for xmlm.ml
+LICENSE="Coherent-Graphics BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
+ ~dev-ml/camlpdf-${PV}:="
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}-source-${PV}
+
+src_compile() {
+ # parallel make issues
+ emake -j1
+}
+
+src_install() {
+ findlib_src_install
+
+ dobin cpdf
+ dodoc Changes README.md cpdfmanual.pdf
+ doman cpdf.1
+
+ use doc && dodoc -r doc/cpdf/html
+}
diff --git a/app-text/cpdf/metadata.xml b/app-text/cpdf/metadata.xml
index 86681fac3204..ab661943a416 100644
--- a/app-text/cpdf/metadata.xml
+++ b/app-text/cpdf/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">johnwhitington/cpdf-source</remote-id>
</upstream>
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
new file mode 100644
index 000000000000..e31b16954f84
--- /dev/null
+++ b/app-text/crengine-ng/Manifest
@@ -0,0 +1,2 @@
+DIST crengine-ng-0.9.11.tar.bz2 4026770 BLAKE2B 27137f3177a9aacc47b4b2ef38ed9baba81d987c46232247686cdbc307b9602fb1d5a915240d4712ca05ac49c7d263e49cf14dbf1b126e8c31862e62d56e742d SHA512 0014060f13e04432bba4c00885bc0c4cbf094d9d69cd8544b995d40bd569d690b5ebd8f02ab8ecba3d7f4bca6154a753a26690aacd96a19870dc2fdacf625f33
+DIST freefont-otf-20120503.tar.gz 4487813 BLAKE2B a280bef885bc71897a8475814602d7537b05d14a70e5857acd1007bc0a074be9db1e08fbd63fcabf3fde7874391bdd319d00b213e29b203d474fb320e91b82a2 SHA512 cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd
diff --git a/app-text/crengine-ng/crengine-ng-0.9.11.ebuild b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild
new file mode 100644
index 000000000000..f8228762d42d
--- /dev/null
+++ b/app-text/crengine-ng/crengine-ng-0.9.11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Cross-platform library designed to implement e-book readers"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2
+ test? ( mirror://gnu/freefont/freefont-otf-20120503.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0/6"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc static-libs test"
+
+RESTRICT="!test? ( test )"
+
+CDEPEND="sys-libs/zlib
+ png? ( media-libs/libpng:0 )
+ jpeg? ( media-libs/libjpeg-turbo )
+ >=media-libs/freetype-2.10.0
+ harfbuzz? ( media-libs/harfbuzz:=[truetype] )
+ libunibreak? ( dev-libs/libunibreak:= )
+ fribidi? ( dev-libs/fribidi )
+ zstd? ( app-arch/zstd:= )
+ libutf8proc? ( dev-libs/libutf8proc:= )
+ fontconfig? ( media-libs/fontconfig )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-cpp/gtest
+ app-arch/zip )
+"
+BDEPEND="virtual/pkgconfig
+ ${CDEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+ if use test; then
+ mkdir -p "${BUILD_DIR}/crengine/tests/fonts/"
+ cp -p "${WORKDIR}/freefont-20120503/"*.otf "${BUILD_DIR}/crengine/tests/fonts/"
+ fi
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE="Release"
+ local mycmakeargs=(
+ -DCRE_BUILD_SHARED=ON
+ -DCRE_BUILD_STATIC=$(usex static-libs)
+ -DUSE_COLOR_BACKBUFFER=ON
+ -DWITH_LIBPNG=$(usex png)
+ -DWITH_LIBJPEG=$(usex jpeg)
+ -DWITH_FREETYPE=ON
+ -DWITH_HARFBUZZ=$(usex harfbuzz)
+ -DWITH_LIBUNIBREAK=$(usex libunibreak)
+ -DWITH_FRIBIDI=$(usex fribidi)
+ -DWITH_ZSTD=$(usex zstd)
+ -DWITH_UTF8PROC=$(usex libutf8proc)
+ -DUSE_GIF=$(usex gif)
+ -DUSE_NANOSVG=$(usex svg)
+ -DUSE_CHM=$(usex chm)
+ -DUSE_ANTIWORD=ON
+ -DUSE_FONTCONFIG=$(usex fontconfig)
+ -DUSE_SHASUM=OFF
+ -DUSE_CMARK_GFM=ON
+ -DBUILD_TOOLS=OFF
+ -DENABLE_UNITTESTING=$(usex test)
+ -DOFFLINE_BUILD_MODE=ON
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/crengine/tests"
+ ./unittests
+}
diff --git a/app-text/crengine-ng/metadata.xml b/app-text/crengine-ng/metadata.xml
new file mode 100644
index 000000000000..8fec2108c8d1
--- /dev/null
+++ b/app-text/crengine-ng/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>valexlin@gmail.com</email>
+ <name>Aleksey Chernov</name>
+ <description>upstream</description>
+ </maintainer>
+ <longdescription lang="en">
+ A fork of coolreader engine. Supported formats are: fb2 (including fb2.zip), fb3,
+ epub (without DRM), rtf, doc, docx, odt, md, html, chm, pdb, mobi (without DRM), txt, trc, prc.
+ </longdescription>
+ <use>
+ <flag name="chm">Support chm format</flag>
+ <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag>
+ <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for hyphenation</flag>
+ <flag name="fribidi">Support bidirectional text by <pkg>dev-libs/fribidi</pkg></flag>
+ <flag name="libutf8proc">Use <pkg>dev-libs/libutf8proc</pkg> for manipulating unicode strings</flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">coolreader-ng/crengine-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/crf++/crf++-0.58-r1.ebuild b/app-text/crf++/crf++-0.58-r1.ebuild
new file mode 100644
index 000000000000..c10b4b472085
--- /dev/null
+++ b/app-text/crf++/crf++-0.58-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
+HOMEPAGE="https://taku910.github.io/crfpp/"
+SRC_URI="mirror://gentoo/${P^^}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="|| ( BSD LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_test() {
+ local d
+ for d in example/*; do
+ pushd "${d}" >/dev/null || die
+ ./exec.sh || die "failed test in ${d}"
+ popd >/dev/null || die
+ done
+}
+
+src_install() {
+ default
+
+ if use examples; then
+ dodoc -r example
+ docompress -x /usr/share/doc/${PF}/example
+ fi
+
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
deleted file mode 100644
index c358043e7e8e..000000000000
--- a/app-text/crf++/crf++-0.58.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-MY_P="${P^^[crf]}"
-
-DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="https://taku910.github.io/crfpp/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- sed -i \
- -e "/CFLAGS/s/-O3/${CFLAGS}/" \
- -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
- configure.in
-
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_test() {
- local d
- for d in example/*; do
- cd "${d}"
- ./exec.sh || die "failed test in ${d}"
- cd - >/dev/null
- done
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/example
- insinto /usr/share/doc/${PF}
- doins -r example
- fi
-
- if ! use static-libs; then
- find "${ED}" -name "*.la" -type f -delete || die
- fi
-}
diff --git a/app-text/crf++/files/crf++-0.58-autotools.patch b/app-text/crf++/files/crf++-0.58-autotools.patch
new file mode 100644
index 000000000000..df3584432bbe
--- /dev/null
+++ b/app-text/crf++/files/crf++-0.58-autotools.patch
@@ -0,0 +1,23 @@
+--- a/configure.in
++++ b/configure.in
+@@ -49,10 +49,8 @@
+ dnl
+ dnl check gcc
+ dnl
+-if test -n "$GCC"; then
+- CFLAGS="-O3 -Wall";
+- CXXFLAGS="-O3 -Wall";
+-fi
++CFLAGS="${CFLAGS} -Wall"
++CXXFLAGS="${CXXFLAGS} -Wall"
+
+ AC_DEFUN(ADD_CC_FLAG, [
+ AC_MSG_CHECKING(whether ${CC-cc} accepts $1)
+@@ -285,6 +283,6 @@
+ AC_MSG_RESULT([yes])
+
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
deleted file mode 100644
index afff7edc0707..000000000000
--- a/app-text/crf++/files/crf++-automake-1.13.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -240,6 +240,6 @@
- AC_MSG_RESULT([yes])
-
- AC_SUBST(datarootdir)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
-
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index edc6c2bf83c2..7b15ca6515d6 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
index 6c22e69d7c12..97d0d5c39cc0 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
MY_P="${P}-BlameMichelson.src"
-
DESCRIPTION="A powerful text processing tool, mainly used for spam filtering"
HOMEPAGE="http://crm114.sourceforge.net/"
SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="examples mew mimencode nls normalizemime static test"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples mew nls normalizemime test"
+RESTRICT="!test? ( test )"
RDEPEND="
- static? ( dev-libs/tre[static-libs] )
- !static? ( dev-libs/tre )
+ dev-libs/tre
mew? ( app-emacs/mew )
- mimencode? ( net-mail/metamail )
normalizemime? ( mail-filter/normalizemime )"
DEPEND="${RDEPEND}
test? ( sys-apps/miscfiles )"
@@ -32,12 +30,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
src_prepare() {
default
- if use mimencode; then
- sed \
- -e 's%#:mime_decoder: /mimencode -u/%:mime_decoder: /mimencode -u/%' \
- -e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
- -i mailfilter.cf || die
- elif use normalizemime; then
+ if use normalizemime; then
sed \
-e 's%#:mime_decoder: /normalizemime/%:mime_decoder: /normalizemime/%' \
-e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
@@ -48,9 +41,7 @@ src_prepare() {
src_compile() {
# Restore GNU89 inline semantics to
# emit external symbols, bug 571062
- append-cflags -std=gnu89
-
- use static && append-ldflags -static -static-libgcc
+ append-cflags -std=gnu89 -fcommon
emake CC="$(tc-getCC)"
}
@@ -76,5 +67,5 @@ src_install() {
}
pkg_postinst() {
- elog "The spam-filter CRM files are installed in ${EROOT%/}/usr/share/${PN}."
+ elog "The spam-filter CRM files are installed in ${EROOT}/usr/share/${PN}."
}
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index e7411c45f7bb..7b416c13cddd 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>shell-tools@gentoo.org</email>
- <name>Gentoo Shell Tools Project</name>
- </maintainer>
- <use>
- <flag name="mew">Add support for using the mewdecode mime decoder
- (<pkg>app-emacs/mew</pkg>)</flag>
- <flag name="mimencode">Add support for using the mimencode mime
- (<pkg>net-mail/metamail</pkg>)</flag>
- <flag name="normalizemime">Add support for using the normalizemime
- (<pkg>mail-filter/normalizemime</pkg>)</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">crm114</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <use>
+ <flag name="mew">Add support for using the mewdecode mime decoder (<pkg>app-emacs/mew</pkg>)</flag>
+ <flag name="normalizemime">Add support for using the normalizemime (<pkg>mail-filter/normalizemime</pkg>)</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">crm114</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
new file mode 100644
index 000000000000..2c58fcc18213
--- /dev/null
+++ b/app-text/crqt-ng/Manifest
@@ -0,0 +1 @@
+DIST crqt-ng-1.0.13.tar.bz2 444509 BLAKE2B 7f69f1ea509cff8610f62539a66c9ce7a805660da6c4188c7e0c966b1f3f63932302ace0b70e0a21c2eaa7dfbfba1ef37ceda7e64b520d248eeb671d3f35ff1d SHA512 7857efedb641635e386ca16cdb8789b77641e593bf78f3a89ed0ac8c3d91d87c14de8cf32722b36290261c55975ea250768ac525caa279b15a35bddbde62609c
diff --git a/app-text/crqt-ng/crqt-ng-1.0.13.ebuild b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild
new file mode 100644
index 000000000000..de0e7855551b
--- /dev/null
+++ b/app-text/crqt-ng/crqt-ng-1.0.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="bg cs hu nl ru uk"
+inherit cmake plocale xdg
+
+DESCRIPTION="Cross-platform e-book reader"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
+
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}
+ dev-qt/linguist-tools:5"
+
+src_prepare() {
+ cmake_src_prepare
+ xdg_environment_reset
+
+ # locales
+ plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts'
+ sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \
+ -i "${S}"/src/CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ CMAKE_BUILD_TYPE="Release"
+ local mycmakeargs=(-DUSE_QT=QT5)
+ cmake_src_configure
+}
diff --git a/app-text/crqt-ng/metadata.xml b/app-text/crqt-ng/metadata.xml
new file mode 100644
index 000000000000..3816f988544b
--- /dev/null
+++ b/app-text/crqt-ng/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>valexlin@gmail.com</email>
+ <name>Aleksey Chernov</name>
+ <description>upstream</description>
+ </maintainer>
+ <longdescription lang="en">
+ A fork of coolreader Qt program. Supported formats are: fb2 (including fb2.zip), fb3,
+ epub (without DRM), rtf, doc, docx, odt, md, html, chm, pdb, mobi (without DRM), txt, trc, prc.
+ </longdescription>
+ <use>
+ <flag name="chm">Support chm format</flag>
+ <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag>
+ <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for hyphenation</flag>
+ <flag name="fribidi">Support bidirectional text by <pkg>dev-libs/fribidi</pkg></flag>
+ <flag name="libutf8proc">Use <pkg>dev-libs/libutf8proc</pkg> for manipulating unicode strings</flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">coolreader-ng/crqt-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest
new file mode 100644
index 000000000000..14942f26777b
--- /dev/null
+++ b/app-text/crwx-ng/Manifest
@@ -0,0 +1 @@
+DIST crwx-ng-0.3.1.tar.bz2 363898 BLAKE2B f44434014ec773c603f2497fd78236897e7988b46dc7697b2aaad7da6eb0a6334723bf6fd73b95960d835b762562fb809bc3aee6aa5ee06557b9fb442ef7aa07 SHA512 7f4c5de17ed32dc18aa7ef58f56090753c6fd4e87d3be6072ecb225f3339f1dacde8b54ec5b79bf031e3082067a00eb66008842248a819fe8c6af9eb6d080662
diff --git a/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild b/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..8d503c432457
--- /dev/null
+++ b/app-text/crwx-ng/crwx-ng-0.3.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WX_GTK_VER="3.2-gtk3"
+inherit cmake wxwidgets xdg
+
+DESCRIPTION="Cross-platform e-book reader"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
+
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+BDEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+ virtual/ttf-fonts"
+
+pkg_prepare() {
+ setup-wxwidgets
+}
diff --git a/app-text/crwx-ng/metadata.xml b/app-text/crwx-ng/metadata.xml
new file mode 100644
index 000000000000..8ff6a0b3b831
--- /dev/null
+++ b/app-text/crwx-ng/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>valexlin@gmail.com</email>
+ <name>Aleksey Chernov</name>
+ <description>upstream</description>
+ </maintainer>
+ <longdescription lang="en">
+ A fork of coolreader wx program. Supported formats are: fb2 (including fb2.zip), fb3,
+ epub (without DRM), rtf, doc, docx, odt, md, html, chm, pdb, mobi (without DRM), txt, trc, prc.
+ </longdescription>
+ <use>
+ <flag name="chm">Support chm format</flag>
+ <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> for kerning and ligatures</flag>
+ <flag name="libunibreak">Use <pkg>dev-libs/libunibreak</pkg> for hyphenation</flag>
+ <flag name="fribidi">Support bidirectional text by <pkg>dev-libs/fribidi</pkg></flag>
+ <flag name="libutf8proc">Use <pkg>dev-libs/libutf8proc</pkg> for manipulating unicode strings</flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">coolreader-ng/crwx-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/cssmin/Manifest b/app-text/cssmin/Manifest
new file mode 100644
index 000000000000..ea1eaab6805d
--- /dev/null
+++ b/app-text/cssmin/Manifest
@@ -0,0 +1 @@
+DIST cssmin-0.2.0.tar.gz 3228 BLAKE2B 2322d7c38e334234b11292c24752549404ce8c70068c6c70a1c6e227a9f63a721a923dbb3006199df2e96fc5c0aba44349a6d8ce33791aff2dc1275e186b8961 SHA512 9422152578bf28cf7c3eb063c1f0dd3604a3d8fa73cd81cde09ae297ab27669126c230ef40a2e8c37083c1e781ab977554f9012e60979fe431ceb83d43452a9d
diff --git a/app-text/cssmin/cssmin-0.2.0-r1.ebuild b/app-text/cssmin/cssmin-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..4ebe24c1333d
--- /dev/null
+++ b/app-text/cssmin/cssmin-0.2.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python port of the YUI CSS compression algorithm"
+HOMEPAGE="
+ https://pypi.org/project/cssmin/
+ https://github.com/zacharyvoase/cssmin/
+"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
diff --git a/app-text/cssmin/metadata.xml b/app-text/cssmin/metadata.xml
new file mode 100644
index 000000000000..48e52c4496a4
--- /dev/null
+++ b/app-text/cssmin/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="pypi">cssmin</remote-id>
+ <remote-id type="github">zacharyvoase/cssmin</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
deleted file mode 100644
index 76e235609d27..000000000000
--- a/app-text/csvfix/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST csvfix-1.6.tar.bz2 322530 BLAKE2B 8bda635a5182b31efe2c5c6613baaea13fe2f5c32f97c2bcbdaf05447103507c46190557f0a07e46aa0f442a6ed6b63b0d46d9759e5ddb2b19f00a31a38ddcce SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035
-DIST csvfix_man_html_160.zip 403468 BLAKE2B 8007ca95891a99926f6c2968a73ddc30211ff07017261583664dc44ac84a508d097cb4acb81529891caa2f98ca4f094565f46cfa9d79e0d99df92ffd5acc908e SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5
diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
deleted file mode 100644
index 8f35d4536767..000000000000
--- a/app-text/csvfix/csvfix-1.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator vcs-snapshot eutils
-
-MY_PV="$(delete_all_version_separators)"
-DESCRIPTION="A stream editor for manipulating CSV files"
-HOMEPAGE="https://neilb.bitbucket.org/csvfix/ https://bitbucket.org/neilb/csvfix/"
-SRC_URI="https://bitbucket.org/neilb/csvfix/get/version-${PV}.tar.bz2 -> ${P}.tar.bz2
- doc? ( https://bitbucket.org/neilb/csvfix/downloads/csvfix_man_html_${MY_PV}0.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
- doc? ( app-arch/unzip )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
- "${FILESDIR}"/${PN}-1.10a-tests.patch
- "${FILESDIR}"/${P}-shuffle-test.patch
-)
-
-src_prepare() {
- default
- edos2unix $(find csvfix/tests -type f)
-}
-
-src_compile() {
- emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin
-}
-
-src_test() {
- cd ${PN}/tests
- chmod +x run1 runtests
- ./runtests || die "tests failed"
-}
-
-src_install() {
- dobin csvfix/bin/csvfix
- if use doc; then
- docinto html
- dodoc -r "${WORKDIR}"/${PN}${MY_PV}/*
- fi
-}
diff --git a/app-text/csvfix/files/csvfix-1.10a-tests.patch b/app-text/csvfix/files/csvfix-1.10a-tests.patch
deleted file mode 100644
index 8e4461d85a31..000000000000
--- a/app-text/csvfix/files/csvfix-1.10a-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- csvfix-build.orig/csvfix/tests/run1
-+++ csvfix-build/csvfix/tests/run1
-@@ -1,4 +1,4 @@
--#!bash
-+#!/bin/bash
- # run1
- # run single test
- # copyright (C) 2008 Neil Butterworth
-@@ -49,7 +49,7 @@
- fi
-
- # exe to be tested - used in tests
--CSVED=../bin/csvfix.exe
-+CSVED=../bin/csvfix
- export CSVED
-
- if [ ! -f "$CSVED" ]
-@@ -64,7 +64,7 @@
- fi
-
- # where to find diff & where to put output
--DIFF=/bin/diff
-+DIFF=/usr/bin/diff
- DIFFOUT=tmp/_diffout
- WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"
- TEST=`basename $TEST`
-@@ -133,5 +133,7 @@
- fi
- else
- echo "Execution problem with $TEST - please correct"
-+ color_red "FAILED $TEST"
-+ exit 1
- fi
-
---- csvfix-build.orig/csvfix/tests/runtests
-+++ csvfix-build/csvfix/tests/runtests
-@@ -1,4 +1,4 @@
--#!bash
-+#!/bin/bash
- # runall.bash
- # run all tests and report
-
-@@ -22,3 +22,8 @@
- echo $FAILS failed, $PASSES passed
- echo ""
-
-+if [[ $FAILS -gt 0 ]]; then
-+ exit 1
-+else
-+ exit 0
-+fi
diff --git a/app-text/csvfix/files/csvfix-1.6-makefile.patch b/app-text/csvfix/files/csvfix-1.6-makefile.patch
deleted file mode 100644
index aaee2aa003f7..000000000000
--- a/app-text/csvfix/files/csvfix-1.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- neilb-csvfix-e804a794d175/alib/Makefile
-+++ neilb-csvfix-e804a794d175/alib/Makefile
-@@ -2,12 +2,12 @@
- # Copyright (C) 2009 Neil Butterworth
-
- OUT = lib/alib.a
-+AR = ar
- CCTYPE = gcc
- IDIR = inc
- ODIR = obj
--XDIR = expat
- SDIR = src
--INC = -Iinc -Iexpat
-+INC = -Iinc
-
- cc.gcc = g++
- cc.clang = clang++ -std=c++11 -stdlib=libc++
-@@ -26,9 +26,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
-
--_EXPAT = xmlparse.o xmlrole.o xmltok.o xmltok_impl.o xmltok_ns.o
--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
--
- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
-@@ -36,10 +33,10 @@
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
- win: $(OBJS) $(EXPAT) $(WINOBJS)
-- ar rvs $(OUT) $^
-+ $(AR) rvs $(OUT) $^
-
- lin: $(OBJS) $(EXPAT)
-- ar rvs $(OUT) $^
-+ $(AR) rvs $(OUT) $^
-
- .PHONY: clean
- clean:
---- neilb-csvfix-e804a794d175/csvfix/Makefile
-+++ neilb-csvfix-e804a794d175/csvfix/Makefile
-@@ -22,7 +22,7 @@
-
- ALIB = ../alib/lib/alib.a
- WINLIBS = ../alib/lib/alib.a -lodbc32
--LINLIBS = ../alib/lib/alib.a
-+LINLIBS = ../alib/lib/alib.a -lexpat
-
- _OBJS = csved_atable.o \
- csved_block.o \
-@@ -99,8 +99,7 @@
- strip $(WINOUT)
-
- $(LINOUT): $(OBJS) $(ALIB)
-- $(CC) -o $@ $^ $(LINLIBS)
-- strip $(LINOUT)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
-
- .PHONY: win
- win:
---- neilb-csvfix-e804a794d175/Makefile
-+++ neilb-csvfix-e804a794d175/Makefile
-@@ -1,3 +1,5 @@
-+CFLAGS += -std=c++11
-+
- ifndef COMSPEC
- CLEAN = (cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean)
- else
diff --git a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch b/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch
deleted file mode 100644
index 3916e92e0592..000000000000
--- a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix the expected data output for the shuffle test.
-
---- a/csvfix/tests/correct/shuffle.test
-+++ b/csvfix/tests/correct/shuffle.test
-@@ -5,10 +5,10 @@
- "Oscar","Wilde","M"
- "Charles","Dickens","M"
- "George","Elliot","F"
--"Charles","Dickens","M"
--"Austen","F","Jane"
-+"Charles","M","Dickens"
-+"Jane","F","Austen"
- "Herman","M","Melville"
- "M","Flann","O'Brien"
--"Elliot","George","F"
--"Virginia","Woolf","F"
--"M","Wilde","Oscar"
-+"George","F","Elliot"
-+"Woolf","F","Virginia"
-+"Wilde","M","Oscar"
diff --git a/app-text/csvfix/metadata.xml b/app-text/csvfix/metadata.xml
deleted file mode 100644
index 8aaa5d2f6787..000000000000
--- a/app-text/csvfix/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>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
- <upstream>
- <remote-id type="bitbucket">neilb/csvfix</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index b3da9fad0540..f1c79faecb48 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit cmake-utils versionator
+inherit cmake flag-o-matic
-PV_MAJ=$(get_version_component_range 1-2)
+PV_MAJ=$(ver_cut 1-2)
MY_P=${PN}-linux-${PV}
-DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies"
+DESCRIPTION="Enterprise quality OCR engine by Cognitive Technologies"
HOMEPAGE="https://launchpad.net/cuneiform-linux"
SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-
IUSE="debug graphicsmagick"
RDEPEND="
@@ -23,23 +23,21 @@ RDEPEND="
graphicsmagick? ( media-gfx/graphicsmagick:= )"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-DOCS=( readme.txt )
PATCHES=(
# From Fedora
- "${FILESDIR}/c-assert.diff"
- "${FILESDIR}/libm.diff"
- "${FILESDIR}/${P}-fix_buffer_overflow.patch"
- "${FILESDIR}/${P}-fix_buffer_overflow_2.patch"
- "${FILESDIR}/${P}-gcc6.patch"
- "${FILESDIR}/${P}-gcc7.patch"
- "${FILESDIR}/${P}-typos.patch"
+ "${FILESDIR}"/${P}-c-assert.patch
+ "${FILESDIR}"/${P}-libm.patch
+ "${FILESDIR}"/${P}-fix_buffer_overflow.patch
+ "${FILESDIR}"/${P}-fix_buffer_overflow_2.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-gcc7.patch
+ "${FILESDIR}"/${P}-typos.patch
+ "${FILESDIR}"/${P}-gcc11.patch
)
-src_prepare(){
- use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" )
- cmake-utils_src_prepare
+src_prepare() {
+ use graphicsmagick && PATCHES+=( "${FILESDIR}"/${P}-graphicsmagick.patch )
+ cmake_src_prepare
# respect LDFLAGS
sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \
@@ -48,12 +46,16 @@ src_prepare(){
# Fix automagic dependencies / linking
if use graphicsmagick; then
sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \
- cuneiform_src/CMakeLists.txt \
- || die "Sed for ImageMagick automagic dependency failed."
+ cuneiform_src/CMakeLists.txt || die
fi
}
+src_configure() {
+ append-flags -fcommon
+ cmake_src_configure
+}
+
src_install() {
- cmake-utils_src_install
- doman "${FILESDIR}/${PN}.1"
+ cmake_src_install
+ doman "${FILESDIR}"/${PN}.1
}
diff --git a/app-text/cuneiform/files/c-assert.diff b/app-text/cuneiform/files/c-assert.diff
deleted file mode 100644
index 0abf1b117343..000000000000
--- a/app-text/cuneiform/files/c-assert.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-Description: Use the standard C assert() macro, rather than custom Cuneiform
- one.
-Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: no
-Last-Update: 2011-04-30
-
---- a/cuneiform_src/Kern/lns32/src/myassert.h
-+++ b/cuneiform_src/Kern/lns32/src/myassert.h
-@@ -60,6 +60,8 @@
- BC++, v3.1 was used as base
- */
-
-+#include <assert.h>
-+
- #ifdef __MYASSERT_H
- # Error: Do not specify MYASSERT.H directly - use SLANG.H. Postnikov.
- #else
-@@ -73,45 +75,3 @@
- #else
- # define WRONG() (assert(0),FALSE)
- #endif
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--#ifndef MY_DEBUG_LEVEL
-- void __assertfail( char *__msg,
-- char *__cond,
-- char *__file,
-- int __line);
--#else
-- void my_assert_fail(const char *cond, const char *__file, int __line);
--#endif
--
--
--#ifdef __cplusplus
--}
--#endif
--
--#undef assert
--
--#ifdef NDEBUG
--# define assert(p) ((void)0)
--#else
--# ifdef _Windows
--# define _ENDL
--# else
--# define _ENDL "\n"
--# endif
-- #ifdef MY_DEBUG_LEVEL
-- # define assert(p) \
-- ((p)) ? \
-- (void)0 : \
-- (void) my_assert_fail( #p, __FILE__, __LINE__)
-- #else
-- # define assert(p) \
-- ((p) ? \
-- (void)0 : \
-- (void) __assertfail( "Assertion failed: %s, file %s, line %d" _ENDL, \
-- #p, __FILE__, __LINE__ ) )
-- #endif
--#endif
---- a/cuneiform_src/Kern/std/CMakeLists.txt
-+++ b/cuneiform_src/Kern/std/CMakeLists.txt
-@@ -3,7 +3,6 @@
- add_library(std32 ${LIBTYPE}
- src/std.cpp
- #src/Std.rc
--src/stdassrt.cpp
- src/stdbits.cpp
- src/stdconsl.cpp
- src/stderror.cpp
---- a/cuneiform_src/Kern/lns32/CMakeLists.txt
-+++ b/cuneiform_src/Kern/lns32/CMakeLists.txt
-@@ -14,7 +14,6 @@
- src/lns.cpp
- src/lnscheck.cpp
- src/lnsini.cpp
--src/myassert.cpp
- src/procline.cpp
- src/puanso.cpp
- src/rbambuk.cpp
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-c-assert.patch b/app-text/cuneiform/files/cuneiform-1.1.0-c-assert.patch
new file mode 100644
index 000000000000..5241960f8405
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-c-assert.patch
@@ -0,0 +1,79 @@
+Description: Use the standard C assert() macro, rather than custom Cuneiform one.
+Author: Jakub Wilk <jwilk@debian.org>
+--- a/cuneiform_src/Kern/lns32/src/myassert.h
++++ b/cuneiform_src/Kern/lns32/src/myassert.h
+@@ -60,6 +60,8 @@
+ BC++, v3.1 was used as base
+ */
+
++#include <assert.h>
++
+ #ifdef __MYASSERT_H
+ # Error: Do not specify MYASSERT.H directly - use SLANG.H. Postnikov.
+ #else
+@@ -73,45 +75,3 @@
+ #else
+ # define WRONG() (assert(0),FALSE)
+ #endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#ifndef MY_DEBUG_LEVEL
+- void __assertfail( char *__msg,
+- char *__cond,
+- char *__file,
+- int __line);
+-#else
+- void my_assert_fail(const char *cond, const char *__file, int __line);
+-#endif
+-
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#undef assert
+-
+-#ifdef NDEBUG
+-# define assert(p) ((void)0)
+-#else
+-# ifdef _Windows
+-# define _ENDL
+-# else
+-# define _ENDL "\n"
+-# endif
+- #ifdef MY_DEBUG_LEVEL
+- # define assert(p) \
+- ((p)) ? \
+- (void)0 : \
+- (void) my_assert_fail( #p, __FILE__, __LINE__)
+- #else
+- # define assert(p) \
+- ((p) ? \
+- (void)0 : \
+- (void) __assertfail( "Assertion failed: %s, file %s, line %d" _ENDL, \
+- #p, __FILE__, __LINE__ ) )
+- #endif
+-#endif
+--- a/cuneiform_src/Kern/std/CMakeLists.txt
++++ b/cuneiform_src/Kern/std/CMakeLists.txt
+@@ -3,7 +3,6 @@
+ add_library(std32 ${LIBTYPE}
+ src/std.cpp
+ #src/Std.rc
+-src/stdassrt.cpp
+ src/stdbits.cpp
+ src/stdconsl.cpp
+ src/stderror.cpp
+--- a/cuneiform_src/Kern/lns32/CMakeLists.txt
++++ b/cuneiform_src/Kern/lns32/CMakeLists.txt
+@@ -14,7 +14,6 @@
+ src/lns.cpp
+ src/lnscheck.cpp
+ src/lnsini.cpp
+-src/myassert.cpp
+ src/procline.cpp
+ src/puanso.cpp
+ src/rbambuk.cpp
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
index 8e9811540cd6..15454e6e6916 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
@@ -1,8 +1,5 @@
Description: Fix buffer overflow during crash when using user supplied image.
Author: SÅ‚awomir Nizio
-Forwarded: no
-Last-Update: 2017-04-05
-
--- a/cuneiform_src/Kern/rstr/src/acc_tabs.c
+++ b/cuneiform_src/Kern/rstr/src/acc_tabs.c
@@ -1233,7 +1233,7 @@ if(is_cen_language(language))
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
index c64b42fc8933..2057aa584dea 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
@@ -1,10 +1,7 @@
-Description: Split original patch by Slawomir and update the same to apply
-neatly.
+Description: Split original patch by Slawomir and update the same to apply neatly.
Author: Bhavani Shankar <bhavi@ubuntu.com>
-
-
---- cuneiform-1.1.0+dfsg.orig/cuneiform_src/Kern/rstr/src/acc_tabs.c
-+++ cuneiform-1.1.0+dfsg/cuneiform_src/Kern/rstr/src/acc_tabs.c
+--- a/cuneiform_src/Kern/rstr/src/acc_tabs.c
++++ b/cuneiform_src/Kern/rstr/src/acc_tabs.c
@@ -2821,8 +2821,8 @@ if( CodePages[language]==CSTR_EASTEUROPE
strcpy(decode_ASCII_to_[(uchar)liga_j ], "_j_");
strcpy(decode_ASCII_to_[(uchar)liga_exm ], "_!_");
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
new file mode 100644
index 000000000000..47677507b261
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
@@ -0,0 +1,30 @@
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h.orig 2021-05-23 10:45:12.714043888 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h 2021-05-23 10:45:47.233178549 +0300
+@@ -84,6 +84,7 @@
+ #endif
+
+ #if !defined(__MATH_H) && !defined(_INC_MATH)
++ #undef _GLIBCXX_USE_STD_SPEC_FUNCS
+ #include <math.h>
+ #endif
+
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig 2021-05-23 10:51:00.757379453 +0300
++++ cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp 2021-05-23 10:51:22.445461911 +0300
+@@ -212,7 +212,7 @@
+ }
+ */
+ // write the text lines
+- for (;sect>0;sect=sect->next)
++ for (;sect;sect=sect->next)
+ {
+ if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
+ // int sectNum=0;
+@@ -897,7 +897,7 @@
+ // if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
+
+ // extract value for comparison
+- if (prevChar>0) {
++ if (prevChar) {
+ // lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
+ PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
+ PrevStyle=prevChar->fontAttribs;
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
index e45768e90f29..5e7b6d80df05 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
@@ -1,6 +1,5 @@
Description: fix FTBFS with GCC 6
Author: Andreas Beckmann <anbe@debian.org>
-
--- a/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
+++ b/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
@@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
index 01530ab4b1d3..25fb846924ed 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
@@ -1,6 +1,5 @@
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h
---- cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h 2017-11-30 11:25:24.409125695 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h 2017-11-30 12:09:26.033501963 +0700
+--- a/cuneiform_src/Kern/hhh/tigerh/h/strings.h
++++ b/cuneiform_src/Kern/hhh/tigerh/h/strings.h
@@ -80,6 +80,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# include "ltconfig.h"
@@ -9,9 +8,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h cuneiform-1.
struct _String;
typedef struct _String STRING;
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-1.1.0-char/cuneiform_src/Kern/include/utf8-tables.h
---- cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h 2017-11-30 11:25:24.410125673 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/include/utf8-tables.h 2017-11-30 11:32:05.974413875 +0700
+--- a/cuneiform_src/Kern/include/utf8-tables.h
++++ b/cuneiform_src/Kern/include/utf8-tables.h
@@ -68,7 +68,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#endif
@@ -57,9 +55,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-1.1
{0, 0, 0, 0},
{1, 0, 0, 0},
{2, 0, 0, 0},
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/codetables.cpp
---- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp 2017-11-30 11:25:24.411125651 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/codetables.cpp 2017-11-30 11:47:51.856189912 +0700
+--- a/cuneiform_src/Kern/rout/src/codetables.cpp
++++ b/cuneiform_src/Kern/rout/src/codetables.cpp
@@ -937,13 +937,13 @@ CP_TO_CP tab[] = {
* codepage.
*/
@@ -76,9 +73,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-1
+ default : return (const unsigned char *) "?";
}
}
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/rout_own.h
---- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h 2017-11-30 11:25:24.411125651 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/rout_own.h 2017-11-30 11:40:01.457220419 +0700
+--- a/cuneiform_src/Kern/rout/src/rout_own.h
++++ b/cuneiform_src/Kern/rout/src/rout_own.h
@@ -458,7 +458,7 @@ Bool SetTableTextSeparators(char* s);
void ResetCodeTables();
Bool UpdateActiveCodeTable();
@@ -88,9 +84,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h cuneiform-1.1.0
//*****************************************************************
// Rout.cpp
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/text.cpp cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/text.cpp
---- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/text.cpp 2017-11-30 11:25:24.411125651 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/text.cpp 2017-11-30 11:40:43.571320319 +0700
+--- a/cuneiform_src/Kern/rout/src/text.cpp
++++ b/cuneiform_src/Kern/rout/src/text.cpp
@@ -310,7 +310,7 @@ Bool OneChar(Handle charHandle)
*gMemCur++ = c2;
}
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-graphicsmagick.patch b/app-text/cuneiform/files/cuneiform-1.1.0-graphicsmagick.patch
new file mode 100644
index 000000000000..ae1d8242b1fa
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-graphicsmagick.patch
@@ -0,0 +1,40 @@
+Description: Use GraphicsMagick instead of ImageMagick.
+Author: Jakub Wilk <jwilk@debian.org>
+--- a/cuneiform_src/cli/cuneiform-cli.cpp
++++ b/cuneiform_src/cli/cuneiform-cli.cpp
+@@ -341,6 +341,10 @@
+ Magick::InitializeMagick("");
+ #endif
+
++#ifdef USE_MAGICK
++ Magick::InitializeMagick("");
++#endif
++
+ dib = read_file(infilename);
+ if(!dib) // Error msg is already printed so just get out.
+ return 1;
+--- a/cuneiform_src/CMakeLists.txt
++++ b/cuneiform_src/CMakeLists.txt
+@@ -34,15 +34,16 @@
+
+ add_definitions(-D_USE_RVERLINE_)
+
+-find_package(ImageMagick COMPONENTS Magick++)
+-if(ImageMagick_Magick++_FOUND)
++include(FindPkgConfig)
++pkg_check_modules(GraphicsMagick QUIET GraphicsMagick++)
++if(GraphicsMagick_FOUND)
+ set(USE_MAGICK TRUE)
+- include_directories(${ImageMagick_Magick++_INCLUDE_DIR})
+- message(STATUS "ImageMagick++ found at ${ImageMagick_Magick++_INCLUDE_DIR}.")
+- set(cli_ext_libs ${ImageMagick_Magick++_LIBRARY})
++ include_directories(${GraphicsMagick_INCLUDE_DIRS})
++ message(STATUS "GraphicsMagick++ found at ${GraphicsMagick_INCLUDE_DIRS}.")
++ set(cli_ext_libs ${GraphicsMagick_LIBRARIES})
+ else()
+ set(USE_MAGICK FALSE)
+- message(STATUS "ImageMagick++ not found. Only uncompressed BMP images supported.")
++ message(STATUS "GraphicsMagick++ not found. Only uncompressed BMP images supported.")
+ endif()
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Kern/include/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Kern/include/config.h)
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-libm.patch b/app-text/cuneiform/files/cuneiform-1.1.0-libm.patch
new file mode 100644
index 000000000000..88347abbb04d
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-libm.patch
@@ -0,0 +1,22 @@
+Description: Link the leo and r35 libraries with libm.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Jakub Wilk <jwilk@debian.org>
+--- a/cuneiform_src/Kern/leo/CMakeLists.txt
++++ b/cuneiform_src/Kern/leo/CMakeLists.txt
+@@ -23,6 +23,7 @@
+ msk32
+ r3532
+ std32
++m
+ )
+
+ library_hook(leo32)
+--- a/cuneiform_src/Kern/r35/CMakeLists.txt
++++ b/cuneiform_src/Kern/r35/CMakeLists.txt
+@@ -3,6 +3,6 @@
+
+ set_property(TARGET r3532 PROPERTY COMPILE_DEFINITIONS __R35__)
+
+-target_link_libraries(r3532 mmx32 std32 cfcompat)
++target_link_libraries(r3532 mmx32 std32 cfcompat m)
+
+ library_hook(r3532)
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch b/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
index 3439760d79d8..3e5fcf21c8d2 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
@@ -1,6 +1,5 @@
Description: fix typos
Author: Andreas Beckmann <anbe@debian.org>
-
--- a/cuneiform_src/Kern/rblock/sources/c/ltmain.c
+++ b/cuneiform_src/Kern/rblock/sources/c/ltmain.c
@@ -344,7 +344,7 @@ i=0; i=i;
diff --git a/app-text/cuneiform/files/graphicsmagick.diff b/app-text/cuneiform/files/graphicsmagick.diff
deleted file mode 100644
index 265190f40c8a..000000000000
--- a/app-text/cuneiform/files/graphicsmagick.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Use GraphicsMagick instead of ImageMagick.
-Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: not-needed
-Last-Update: 2011-01-21
-
---- a/cuneiform_src/cli/cuneiform-cli.cpp
-+++ b/cuneiform_src/cli/cuneiform-cli.cpp
-@@ -341,6 +341,10 @@
- Magick::InitializeMagick("");
- #endif
-
-+#ifdef USE_MAGICK
-+ Magick::InitializeMagick("");
-+#endif
-+
- dib = read_file(infilename);
- if(!dib) // Error msg is already printed so just get out.
- return 1;
---- a/cuneiform_src/CMakeLists.txt
-+++ b/cuneiform_src/CMakeLists.txt
-@@ -34,15 +34,16 @@
-
- add_definitions(-D_USE_RVERLINE_)
-
--find_package(ImageMagick COMPONENTS Magick++)
--if(ImageMagick_Magick++_FOUND)
-+include(FindPkgConfig)
-+pkg_check_modules(GraphicsMagick QUIET GraphicsMagick++)
-+if(GraphicsMagick_FOUND)
- set(USE_MAGICK TRUE)
-- include_directories(${ImageMagick_Magick++_INCLUDE_DIR})
-- message(STATUS "ImageMagick++ found at ${ImageMagick_Magick++_INCLUDE_DIR}.")
-- set(cli_ext_libs ${ImageMagick_Magick++_LIBRARY})
-+ include_directories(${GraphicsMagick_INCLUDE_DIRS})
-+ message(STATUS "GraphicsMagick++ found at ${GraphicsMagick_INCLUDE_DIRS}.")
-+ set(cli_ext_libs ${GraphicsMagick_LIBRARIES})
- else()
- set(USE_MAGICK FALSE)
-- message(STATUS "ImageMagick++ not found. Only uncompressed BMP images supported.")
-+ message(STATUS "GraphicsMagick++ not found. Only uncompressed BMP images supported.")
- endif()
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Kern/include/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Kern/include/config.h)
diff --git a/app-text/cuneiform/files/libm.diff b/app-text/cuneiform/files/libm.diff
deleted file mode 100644
index 0ab16d58274f..000000000000
--- a/app-text/cuneiform/files/libm.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Link the leo and r35 libraries with libm.
-Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Jakub Wilk <jwilk@debian.org>
-Forwarded: no
-Last-Update: 2011-07-04
-
---- a/cuneiform_src/Kern/leo/CMakeLists.txt
-+++ b/cuneiform_src/Kern/leo/CMakeLists.txt
-@@ -23,6 +23,7 @@
- msk32
- r3532
- std32
-+m
- )
-
- library_hook(leo32)
---- a/cuneiform_src/Kern/r35/CMakeLists.txt
-+++ b/cuneiform_src/Kern/r35/CMakeLists.txt
-@@ -3,6 +3,6 @@
-
- set_property(TARGET r3532 PROPERTY COMPILE_DEFINITIONS __R35__)
-
--target_link_libraries(r3532 mmx32 std32 cfcompat)
-+target_link_libraries(r3532 mmx32 std32 cfcompat m)
-
- library_hook(r3532)
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
index 8797b4d858f4..003d130a6b55 100644
--- a/app-text/cuneiform/metadata.xml
+++ b/app-text/cuneiform/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <longdescription lang="en">
- Cuneiform is an multi-language OCR system.
- </longdescription>
<upstream>
<remote-id type="launchpad">cuneiform-linux</remote-id>
</upstream>
diff --git a/app-text/cutemarked/Manifest b/app-text/cutemarked/Manifest
deleted file mode 100644
index e255b8849598..000000000000
--- a/app-text/cutemarked/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cutemarked-0.11.3.tar.gz 772238 BLAKE2B 1acc7291d968f26f87a1b2fc1070ca3a61053b8bba04c57d91917ed3dea6a5893b9cab41004cef044ddb656e3d334d177d6765db7624d33f91f749d5787b23b2 SHA512 3b776f6453812ce4afa37532bf03adce01ad3ec2fb0d848e3a0e5f18ca30be6f1e9f6b3c815917a96c9637c722d53a5bc249d5f58b209000d7d794239626ca30
diff --git a/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild b/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
deleted file mode 100644
index d4f1373747d4..000000000000
--- a/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 markdown editor"
-HOMEPAGE="https://github.com/cloose/CuteMarkEd"
-SRC_URI="https://github.com/cloose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- app-text/discount
- app-text/hunspell
- dev-qt/linguist-tools:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qttest:5
- dev-qt/qtwebkit:5
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/CuteMarkEd-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
- "${FILESDIR}/${PN}"-0.11.3-qaction-include.patch
- "${FILESDIR}/${PN}"-0.11.3-bgcolor.patch
-)
-
-src_configure() {
- eqmake5 ROOT="${D}" CuteMarkEd.pro
-}
diff --git a/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch b/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch
deleted file mode 100644
index 2ce1469538f7..000000000000
--- a/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru CuteMarkEd-0.11.1/app/app.pro CuteMarkEd-0.11.1-sane/app/app.pro
---- CuteMarkEd-0.11.1/app/app.pro 2015-07-06 12:02:22.000000000 +0200
-+++ CuteMarkEd-0.11.1-sane/app/app.pro 2015-07-09 14:53:29.398899757 +0200
-@@ -243,7 +243,7 @@
- ## INSTALLATION
-
- unix {
-- isEmpty(PREFIX): PREFIX = /usr
-+ isEmpty(PREFIX): PREFIX = $${ROOT}/usr
- DATADIR = $${PREFIX}/share
-
- # install desktop file
-diff -ru CuteMarkEd-0.11.1/fontawesomeicon/fontawesomeicon.pro CuteMarkEd-0.11.1-sane/fontawesomeicon/fontawesomeicon.pro
---- CuteMarkEd-0.11.1/fontawesomeicon/fontawesomeicon.pro 2015-07-06 12:02:22.000000000 +0200
-+++ CuteMarkEd-0.11.1-sane/fontawesomeicon/fontawesomeicon.pro 2015-07-09 14:52:45.867901697 +0200
-@@ -39,7 +39,7 @@
-
- unix {
- # install plugin
-- target.path = $$[QT_INSTALL_PLUGINS]/iconengines
-+ target.path = $${ROOT}/$$[QT_INSTALL_PLUGINS]/iconengines
- INSTALLS += target
- message("The project will be installed in $$[QT_INSTALL_PLUGINS]/iconengines")
- }
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch b/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
deleted file mode 100644
index 8cf1fe5f1c30..000000000000
--- a/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/app/styles/markdown.css b/app/styles/markdown.css
-index 7c87385..607f025 100644
---- a/app/styles/markdown.css
-+++ b/app/styles/markdown.css
-@@ -25,6 +25,7 @@ body{
- line-height: 1;
- max-width: 960px;
- padding: 30px;
-+ background-color: #ffffff;
- }
- h1, h2, h3, h4 {
- color: #111111;
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch b/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
deleted file mode 100644
index 5e585945902c..000000000000
--- a/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru a/app/optionsdialog.cpp b/app/optionsdialog.cpp
---- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200
-+++ b/app/optionsdialog.cpp 2018-06-05 07:28:09.086517828 +0200
-@@ -17,6 +17,7 @@
- #include "optionsdialog.h"
- #include "ui_optionsdialog.h"
-
-+#include <QAction>
- #include <QFontComboBox>
- #include <QItemEditorFactory>
- #include <QKeySequence>
diff --git a/app-text/cutemarked/metadata.xml b/app-text/cutemarked/metadata.xml
deleted file mode 100644
index 522f8101737d..000000000000
--- a/app-text/cutemarked/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>zx2c4@gentoo.org</email>
- <name>Jason A. Donenfeld</name>
- </maintainer>
- <upstream>
- <remote-id type="github">cloose/cutemarked</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/cwtext/cwtext-0.96-r1.ebuild b/app-text/cwtext/cwtext-0.96-r1.ebuild
new file mode 100644
index 000000000000..309da04a1ee4
--- /dev/null
+++ b/app-text/cwtext/cwtext-0.96-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Text to Morse Code converter"
+HOMEPAGE="http://cwtext.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.96-pcm.patch
+ "${FILESDIR}"/${PN}-0.94-asneeded.patch
+ "${FILESDIR}"/${PN}-0.96-fix-missing-include.patch
+)
+
+DOCS=( Changes README TODO )
+
+src_prepare() {
+ eapply -p0 "${PATCHES[@]}"
+ # change install directory to ${S}
+ sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \
+ die "sed makefile failed"
+
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ einstalldocs
+ dobin cwtext cwpcm cwmm
+}
diff --git a/app-text/cwtext/cwtext-0.96.ebuild b/app-text/cwtext/cwtext-0.96.ebuild
deleted file mode 100644
index 41d44142ef18..000000000000
--- a/app-text/cwtext/cwtext-0.96.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Text to Morse Code converter"
-HOMEPAGE="http://cwtext.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # change install directory to ${S}
- sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \
- die "sed makefile failed"
-
- epatch "${FILESDIR}"/${PN}-0.94-asneeded.patch
- tc-export CC
-}
-
-src_install() {
- dobin cwtext cwpcm cwmm || die "dobin failed"
-
- dodoc Changes README TODO
-}
diff --git a/app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch b/app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch
new file mode 100644
index 000000000000..bc52d0563376
--- /dev/null
+++ b/app-text/cwtext/files/cwtext-0.96-fix-missing-include.patch
@@ -0,0 +1,11 @@
+index 3995cc3..2fd6ae6 100644
+--- morse.c
++++ morse.c
+@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+ #include <stdio.h>
++#include <ctype.h>
+
+ #include "cw.h"
+ #include "morse.h"
diff --git a/app-text/cwtext/files/cwtext-0.96-pcm.patch b/app-text/cwtext/files/cwtext-0.96-pcm.patch
new file mode 100644
index 000000000000..f14a1d06182b
--- /dev/null
+++ b/app-text/cwtext/files/cwtext-0.96-pcm.patch
@@ -0,0 +1,11 @@
+--- pcm.c.orig
++++ pcm.c
+@@ -60,7 +60,7 @@ int mStoSamples(int hVox, int time) {
+ float samples;
+ float fsr;
+
+- if (!valid(hVox)) return;
++ if (!valid(hVox)) return 0;
+
+ timelen = (float) time;
+ fsr = (float) voxref(hVox).samplerate;
diff --git a/app-text/cwtext/metadata.xml b/app-text/cwtext/metadata.xml
index 303a257b21e3..5729a3ce9672 100644
--- a/app-text/cwtext/metadata.xml
+++ b/app-text/cwtext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
deleted file mode 100644
index 931465f405e3..000000000000
--- a/app-text/dbacl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dbacl-1.14.1.tar.gz 923956 BLAKE2B a98b7e01a0cafaee8178120069beaa6fbfe716eaa02eeb9505aa498f11b1c54ef599ea3a40bbc6ddfe235d571f550381a9c8026e80208c56a4a44a80750f00e1 SHA512 910fe5d8e56a92a643f16eab73fc3376489f303e22c470b3d78428d65340b01073f336ac8febb7d911eae0995f08ba265cac09628efd55a64955814a810b7372
-DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9
diff --git a/app-text/dbacl/dbacl-1.14.1.ebuild b/app-text/dbacl/dbacl-1.14.1.ebuild
deleted file mode 100644
index 07965efdea80..000000000000
--- a/app-text/dbacl/dbacl-1.14.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Digramic Bayesian text classifier"
-HOMEPAGE="http://www.lbreyer.com/gpl.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="interactive"
-
-RDEPEND="interactive? (
- sys-libs/slang:=
- sys-libs/readline:=
- sys-libs/ncurses:= )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # See bug #352636 for reference
- export ac_cv_lib_ncurses_initscr=$(usex interactive)
- export ac_cv_lib_readline_readline=$(usex interactive)
- export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
- default
-}
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
deleted file mode 100644
index 1d92922bbae4..000000000000
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Digramic Bayesian text classifier"
-HOMEPAGE="http://www.lbreyer.com/gpl.html"
-SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 s390 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="interactive"
-
-RDEPEND="interactive? (
- sys-libs/slang:=
- sys-libs/readline:=
- sys-libs/ncurses:= )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # See bug #352636 for reference
- export ac_cv_lib_ncurses_initscr=$(usex interactive)
- export ac_cv_lib_readline_readline=$(usex interactive)
- export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
-}
diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml
deleted file mode 100644
index 505ddc59ff8b..000000000000
--- a/app-text/dbacl/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>aidecoe@gentoo.org</email>
-<name>Amadeusz Żołnowski</name>
-</maintainer>
-<use>
-<flag name="interactive">Enable the interactive mailinspect ability</flag>
-</use>
-<longdescription>dbacl is a fast Bayesian text and email classifier. It builds a variety of language models using maximum entropy (minimum divergence) principles, and these can then be used to categorize input data automatically among multiple categories.</longdescription>
-</pkgmetadata>
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 3810a4d1cfa7..eea683cc2f45 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,2 +1,2 @@
-DIST dblatex-0.3.10.tar.bz2 1668202 BLAKE2B 2cc7e33ddc1b4732ae880d3443e65e40b16fc21fa31dfc52ef2250433f4c99bb5b590961095e044b2972b1ac9b4e38358e356b7bdcfb607d6f863720feea7cf4 SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
-DIST dblatex-0.3.7.tar.bz2 1513975 BLAKE2B de523640eacc058eaffc2e53407d6faed0969b1485110dca7669c6fb2323d4ecb91c8d73d9a8fdf3ae9d0803f5e5a371af011c0a241f97f08ae4d73ee57e7d89 SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c
+DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
+DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
diff --git a/app-text/dblatex/dblatex-0.3.10-r1.ebuild b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
deleted file mode 100644
index a395a25c9b09..000000000000
--- a/app-text/dblatex/dblatex-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Transform DocBook using TeX macros"
-HOMEPAGE="http://dblatex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="inkscape"
-
-RDEPEND="
- app-text/docbook-xml-dtd:4.5
- dev-libs/kpathsea
- dev-libs/libxslt
- dev-libs/libxslt
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-mathscience
- dev-texlive/texlive-pictures
- dev-texlive/texlive-xetex
- gnome-base/librsvg
- media-gfx/imagemagick
- media-gfx/transfig
- inkscape? ( media-gfx/inkscape )
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
- use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
- eapply "${FILESDIR}/${PN}-path-logging.patch"
- eapply "${FILESDIR}/${PN}-setup.patch"
- distutils-r1_python_prepare_all
-}
-
-python_install() {
- distutils-r1_python_install
- python_doscript "${S}"/scripts/dblatex
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- # move package documentation to a folder name containing version number
- mv "${D%/}"/usr/share/doc/${PN} "${D%/}"/usr/share/doc/${PF} || die
-}
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
new file mode 100644
index 000000000000..9524dda5731f
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="inkscape"
+
+RDEPEND="
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/kpathsea
+ dev-libs/libxslt
+ dev-libs/libxslt
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-mathscience
+ dev-texlive/texlive-pictures
+ dev-texlive/texlive-xetex
+ gnome-base/librsvg
+ media-gfx/imagemagick
+ media-gfx/transfig
+ inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}py3"
+
+PATCHES=(
+ "${FILESDIR}/${P}-path-logging.patch"
+ "${FILESDIR}/${P}-setup.patch"
+ "${FILESDIR}/${P}-encode.patch"
+)
+
+python_prepare_all() {
+ # Manual page is precomressed, but we will use our own compression later.
+ gunzip docs/manpage/dblatex.1.gz || die
+ # If we dont have inkscape we need to use an alternative SVG converter
+ use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+ # If we use inscape however we want to make dblatex compatible with v1.0
+ use inkscape && eapply "${FILESDIR}/${P}-inkscape-1.0.patch"
+ # We need to fix version information in the docs and some metadata
+ grep -l -I -R "0.3.11py3" | xargs -n1 sed -i -e "s/${PV}py3/${PV}/" || die
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ # Move package documentation to a folder name containing version number
+ mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+}
diff --git a/app-text/dblatex/dblatex-0.3.12-r1.ebuild b/app-text/dblatex/dblatex-0.3.12-r1.ebuild
new file mode 100644
index 000000000000..8ea4d20f5ee6
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.12-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Breaks installation of /usr/bin/dblatex, bug #906788
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="inkscape test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/kpathsea
+ dev-libs/libxslt
+ dev-libs/libxslt
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-mathscience
+ dev-texlive/texlive-pictures
+ dev-texlive/texlive-xetex
+ gnome-base/librsvg
+ media-gfx/imagemagick
+ media-gfx/transfig
+ inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+ test? ( ~${CATEGORY}/${P} )"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.11-path-logging.patch"
+ "${FILESDIR}/${PN}-0.3.11-setup.patch"
+ "${FILESDIR}/${PN}-0.3.11-encode.patch"
+)
+
+python_prepare_all() {
+ # Manual page is precomressed, but we will use our own compression later.
+ gunzip docs/manpage/dblatex.1.gz || die
+ # If we dont have inkscape we need to use an alternative SVG converter
+ use inkscape || eapply "${FILESDIR}/${PN}-0.3.11-no-inkscape-dependency.patch"
+ # If we use inscape however we want to make dblatex compatible with v1.0
+ use inkscape && eapply "${FILESDIR}/${PN}-0.3.11-inkscape-1.0.patch"
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ # Move package documentation to a folder name containing version number
+ mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+}
+
+python_test_all() {
+ emake -C tests/mathml
+}
diff --git a/app-text/dblatex/dblatex-0.3.12-r2.ebuild b/app-text/dblatex/dblatex-0.3.12-r2.ebuild
new file mode 100644
index 000000000000..cc17b55ab1a5
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.12-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Breaks installation of /usr/bin/dblatex, bug #906788
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="inkscape test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/kpathsea
+ dev-libs/libxslt
+ dev-libs/libxslt
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-mathscience
+ dev-texlive/texlive-pictures
+ dev-texlive/texlive-xetex
+ gnome-base/librsvg
+ media-gfx/imagemagick
+ >=media-gfx/fig2dev-3.2.9-r1
+ inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+ test? ( ~${CATEGORY}/${P} )"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.11-path-logging.patch"
+ "${FILESDIR}/${PN}-0.3.11-setup.patch"
+ "${FILESDIR}/${PN}-0.3.11-encode.patch"
+)
+
+python_prepare_all() {
+ # Manual page is precomressed, but we will use our own compression later.
+ gunzip docs/manpage/dblatex.1.gz || die
+ # If we dont have inkscape we need to use an alternative SVG converter
+ use inkscape || eapply "${FILESDIR}/${PN}-0.3.11-no-inkscape-dependency.patch"
+ # If we use inscape however we want to make dblatex compatible with v1.0
+ use inkscape && eapply "${FILESDIR}/${PN}-0.3.11-inkscape-1.0.patch"
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ # Move package documentation to a folder name containing version number
+ mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+}
+
+python_test_all() {
+ emake -C tests/mathml
+}
diff --git a/app-text/dblatex/dblatex-0.3.7.ebuild b/app-text/dblatex/dblatex-0.3.7.ebuild
deleted file mode 100644
index eecbe631b196..000000000000
--- a/app-text/dblatex/dblatex-0.3.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Transform DocBook using TeX macros"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://dblatex.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="
- app-text/texlive
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-mathscience
- dev-texlive/texlive-pictures
- dev-texlive/texlive-xetex
- dev-libs/libxslt
- app-text/docbook-xml-dtd:4.5
- gnome-base/librsvg
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- epatch "${FILESDIR}/${P}-no-inkscape-dependency.patch"
- epatch "${FILESDIR}/${PN}-path-logging.patch"
- epatch "${FILESDIR}/${PN}-setup.patch"
-}
-
-python_install_all() {
- python_doscript "${S}"/scripts/dblatex
- python_optimize
- distutils-r1_python_install_all
- # move package documentation to a folder name containing version number
- mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die "mv doc"
-}
diff --git a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
deleted file mode 100644
index c501cee63042..000000000000
--- a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.10/lib/dbtexmf/core/imagedata.py
---- dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py 2018-02-16 17:00:42.658484437 +0200
-+++ dblatex-0.3.10/lib/dbtexmf/core/imagedata.py 2018-02-16 16:52:56.339441569 +0200
-@@ -178,7 +178,7 @@
- class SvgConverter(ImageConverter):
- def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
- ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
-- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
-+ self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s",
- "%(input)s"])
-
-
diff --git a/app-text/dblatex/files/dblatex-0.3.11-encode.patch b/app-text/dblatex/files/dblatex-0.3.11-encode.patch
new file mode 100644
index 000000000000..1f32f99074a2
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-encode.patch
@@ -0,0 +1,19 @@
+diff -Naur dblatex-0.3.11py3-orig/lib/dbtexmf/dblatex/rawtex.py dblatex-0.3.11py3/lib/dbtexmf/dblatex/rawtex.py
+--- dblatex-0.3.11py3-orig/lib/dbtexmf/dblatex/rawtex.py 2020-01-29 13:48:34.000000000 -0800
++++ dblatex-0.3.11py3/lib/dbtexmf/dblatex/rawtex.py 2020-07-13 23:49:56.296767535 -0700
+@@ -101,10 +101,14 @@
+
+ # If something done, replace the figure in the tex file
+ if newfig != fig:
++ if isinstance(fig, str):
++ fig = fig.encode("utf-8")
++ if isinstance(newfig, str):
++ newfig = newfig.encode("utf-8")
+ line = re.sub(br"{"+fig+br"}", br"{"+newfig+br"}", line)
+
+ return line
+-
++
+
+ def main():
+ c = RawLatex()
diff --git a/app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch b/app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch
new file mode 100644
index 000000000000..48cd9f249729
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-inkscape-1.0.patch
@@ -0,0 +1,107 @@
+diff -Naur dblatex-0.3.11py3-orig/docs/custom/dblatex.xconf dblatex-0.3.11py3/docs/custom/dblatex.xconf
+--- dblatex-0.3.11py3-orig/docs/custom/dblatex.xconf 2020-01-29 13:48:32.000000000 -0800
++++ dblatex-0.3.11py3/docs/custom/dblatex.xconf 2020-07-14 01:05:42.883435133 -0700
+@@ -18,7 +18,7 @@
+ <imagedata>
+ <converter src="svg" dst="*" docformat="pdf">
+ <command>
+- inkscape -z -D --export-dpi=600 --export-%(dst)s=%(output)s %(input)s
++ inkscape -D --export-dpi=600 --export-filename=%(output)s %(input)s
+ </command>
+ </converter>
+ </imagedata>
+diff -Naur dblatex-0.3.11py3-orig/docs/xhtml/manual/sec-specs.html dblatex-0.3.11py3/docs/xhtml/manual/sec-specs.html
+--- dblatex-0.3.11py3-orig/docs/xhtml/manual/sec-specs.html 2020-01-29 13:49:23.000000000 -0800
++++ dblatex-0.3.11py3/docs/xhtml/manual/sec-specs.html 2020-07-14 01:06:19.012860710 -0700
+@@ -36,7 +36,7 @@
+ &lt;imagedata&gt;
+ &lt;converter src="svg" dst="*" docformat="pdf"&gt;
+ &lt;command&gt;
+- inkscape -z -D --export-dpi=600 --export-%(dst)s=%(output)s %(input)s
++ inkscape -D --export-dpi=600 --export-filename=%(output)s %(input)s
+ &lt;/command&gt;
+ &lt;/converter&gt;
+ &lt;/imagedata&gt;
+diff -Naur dblatex-0.3.11py3-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.11py3-orig/lib/dbtexmf/core/imagedata.py 2020-01-29 13:48:33.000000000 -0800
++++ dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py 2020-07-14 01:02:56.729388831 -0700
+@@ -47,16 +47,16 @@
+
+
+ class PoolManager:
+- def __init__(self):
++ def __init__(self):
+ self._used_pool = None
+ self._pending_pools = []
+-
++
+ def set_pool(self, pool):
+ self._used_pool = pool
+ for p in self._pending_pools:
+ pool.preprend(p)
+ self._pending_pools = []
+-
++
+ def prepend_pool(self, pool):
+ if self._used_pool:
+ self._used_pool.prepend(pool)
+@@ -73,7 +73,7 @@
+ self.format_pool = PoolManager()
+
+ _image_setup = ImageSetup()
+-
++
+ def image_setup():
+ global _image_setup
+ return _image_setup
+@@ -181,7 +181,7 @@
+ class SvgConverter(ImageConverter):
+ def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+ ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
++ self.add_command(["inkscape", "-D", "--export-filename=%(output)s",
+ "%(input)s"])
+
+
+@@ -224,7 +224,7 @@
+ ImageFormatPool.__init__(self)
+ # There can be a mismatch between PDF-1.4 images and PDF-1.3
+ # document produced by XeTeX
+- self.add_rule(FormatRule(docformat="pdf", backend="xetex",
++ self.add_rule(FormatRule(docformat="pdf", backend="xetex",
+ imgdst="png"))
+ self.add_rule(FormatRule(docformat="pdf", imgdst="pdf"))
+ self.add_rule(FormatRule(docformat="dvi", imgdst="eps"))
+@@ -318,7 +318,7 @@
+ Copy the file in the working directory if its path contains characters
+ unsupported by latex, like spaces.
+ """
+- # Encode to expected output format. If encoding is OK and
++ # Encode to expected output format. If encoding is OK and
+ # supported by tex, just return the encoded path
+ newfig = self._path_encode(fig)
+ if newfig and newfig.find(b" ") == -1:
+@@ -350,7 +350,7 @@
+ if (ext):
+ realfig = self.find(fig)
+ return (realfig, ext[1:])
+-
++
+ # Lookup for the best suited available figure
+ if (self.output_format == "pdf"):
+ formats = ("png", "pdf", "jpg", "eps", "gif", "fig", "svg")
+@@ -369,7 +369,7 @@
+ format = ""
+
+ return (realfig, format)
+-
++
+ def find(self, fig):
+ # First, the obvious absolute path case
+ if os.path.isabs(fig):
+@@ -385,4 +385,4 @@
+ return realfig
+
+ return None
+-
++
diff --git a/app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..18695b52a5ee
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch
@@ -0,0 +1,14 @@
+diff -Naur dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py dblatex-0.3.11py3-new/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py 2020-01-29 13:48:33.000000000 -0800
++++ dblatex-0.3.11py3-new/lib/dbtexmf/core/imagedata.py 2020-02-25 00:45:35.627054621 -0800
+@@ -181,8 +181,8 @@
+ class SvgConverter(ImageConverter):
+ def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+ ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
+- "%(input)s"])
++ self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s",
++ "%(input)s"])
+
+
+ class FormatRule:
diff --git a/app-text/dblatex/files/dblatex-0.3.11-path-logging.patch b/app-text/dblatex/files/dblatex-0.3.11-path-logging.patch
new file mode 100644
index 000000000000..3d6162848fec
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-path-logging.patch
@@ -0,0 +1,15 @@
+diff -Naur dblatex-0.3.11py3/scripts/dblatex dblatex-0.3.11py3-new/scripts/dblatex
+--- dblatex-0.3.11py3/scripts/dblatex 2020-01-29 13:48:34.000000000 -0800
++++ dblatex-0.3.11py3-new/scripts/dblatex 2020-02-25 01:04:16.169346434 -0800
+@@ -1,8 +1,10 @@
+ #! /usr/bin/env python
+ import sys
+ import os
++import logging
+
+-package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
++logging.basicConfig()
++package_base = "/usr/share/dblatex"
+ sys.path.insert(0, os.path.realpath(os.path.join(package_base, "lib")))
+
+ from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-0.3.11-setup.patch b/app-text/dblatex/files/dblatex-0.3.11-setup.patch
new file mode 100644
index 000000000000..802030118398
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-setup.patch
@@ -0,0 +1,47 @@
+diff -Naur dblatex-0.3.11py3/setup.py dblatex-0.3.11py3-new/setup.py
+--- dblatex-0.3.11py3/setup.py 2020-01-29 13:48:34.000000000 -0800
++++ dblatex-0.3.11py3-new/setup.py 2020-02-27 20:25:21.669297793 -0800
+@@ -26,7 +26,6 @@
+ from distutils import log
+ from subprocess import Popen, PIPE
+ sys.path.append("lib")
+-from contrib.debian.installer import DebianInstaller
+
+ #
+ # Build the command line script
+@@ -192,7 +191,7 @@
+ log.info("running build_doc")
+ htmldir = os.path.join("docs", "xhtml")
+ pdfdocs = glob.glob(os.path.join("docs", "[mr]*.pdf"))
+- manpage = os.path.join("docs", "manpage", "dblatex.1.gz")
++ manpage = os.path.join("docs", "manpage", "dblatex.1")
+
+ # Lazy check to avoid a rebuild for nothing
+ if (not(self.force) and os.path.exists(htmldir) and len(pdfdocs) >= 2
+@@ -368,15 +367,12 @@
+ status += "no"
+ mis_stys.append(sty)
+ print(status)
+-
++
+ if mis_stys:
+ raise OSError("not found: %s" % ", ".join(mis_stys))
+
+ def run(self):
+- if self.install_layout == "deb":
+- db = DebianInstaller(self)
+- else:
+- db = None
++ db = None
+
+ if not(db) and not(self.nodeps):
+ try:
+@@ -515,7 +511,7 @@
+ data_files=[('share/dblatex', ['xsl', 'latex', 'etc/schema']),
+ ('share/doc/dblatex', pdfdocs),
+ ('share/doc/dblatex', htmldoc),
+- ('share/man/man1', ['docs/manpage/dblatex.1.gz'])],
++ ('share/man/man1', ['docs/manpage/dblatex.1'])],
+ scripts=['scripts/dblatex'],
+ cmdclass={'build': Build,
+ 'build_scripts': BuildScripts,
diff --git a/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
deleted file mode 100644
index 1d032f4ac26c..000000000000
--- a/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.7/lib/dbtexmf/core/imagedata.py
---- dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py 2015-08-07 10:47:53.000000000 +0100
-+++ dblatex-0.3.7/lib/dbtexmf/core/imagedata.py 2015-11-08 22:36:41.771457222 +0000
-@@ -66,7 +66,7 @@
-
- class SvgConverter(ImageConverter):
- def convert(self, input, output, format, doexec=1):
-- cmd = "inkscape -z -D --export-%s=%s \"%s\"" % (format, output, input)
-+ cmd = "rsvg-convert -f %s -o \"%s\" \"%s\"" % (format, output, input)
- return self.system(cmd, doexec)
-
-
diff --git a/app-text/dblatex/files/dblatex-path-logging.patch b/app-text/dblatex/files/dblatex-path-logging.patch
deleted file mode 100644
index 7f0fdb6c52a6..000000000000
--- a/app-text/dblatex/files/dblatex-path-logging.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur dblatex-0.3.7-orig/scripts/dblatex dblatex-0.3.7/scripts/dblatex
---- dblatex-0.3.7-orig/scripts/dblatex 2015-08-07 10:47:53.000000000 +0100
-+++ dblatex-0.3.7/scripts/dblatex 2015-11-08 22:30:50.362571505 +0000
-@@ -1,8 +1,10 @@
- #! /usr/bin/env python
- import sys
- import os
-+import logging
-
--package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
-+logging.basicConfig()
-+package_base = "/usr/share/dblatex"
- sys.path.append(os.path.realpath(os.path.join(package_base, "lib")))
-
- from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-setup.patch b/app-text/dblatex/files/dblatex-setup.patch
deleted file mode 100644
index f6cf4a24283e..000000000000
--- a/app-text/dblatex/files/dblatex-setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- dblatex-0.3.7-orig/setup.py 2015-08-07 10:47:53.000000000 +0100
-+++ dblatex-0.3.7/setup.py 2015-11-08 22:39:03.076213227 +0000
-@@ -23,7 +23,6 @@
- from distutils import log
- from subprocess import Popen, PIPE
- sys.path.append("lib")
--from contrib.debian.installer import DebianInstaller
-
- #
- # Build the command line script
-@@ -363,15 +362,12 @@
- status += "no"
- mis_stys.append(sty)
- print status
--
-+
- if mis_stys:
- raise OSError("not found: %s" % ", ".join(mis_stys))
-
- def run(self):
-- if self.install_layout == "deb":
-- db = DebianInstaller(self)
-- else:
-- db = None
-+ db = None
-
- if not(db) and not(self.nodeps):
- try:
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index 609cf12fd1ec..104575f56ef3 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>zoltan@sinustrom.info</email>
<name>Zoltan Puskas</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="inkscape">Use inkscape to convert SVG. Disable to use gnome-base/librsvg instead.</flag>
+ <flag name="inkscape">Use inkscape to convert SVG. Disable to use <pkg>gnome-base/librsvg</pkg> instead.</flag>
</use>
<longdescription>
dbaltex is an opensource DocBook to LaTeX publishing software
diff --git a/app-text/ddir/Manifest b/app-text/ddir/Manifest
deleted file mode 100644
index bde88a47948e..000000000000
--- a/app-text/ddir/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ddir-0_p20100323.tar.bz2 15875 BLAKE2B 5e4a013d8e0c224c540514968b82c4818f5c737a74b13bcf257e19c7f8726a94d234bd138ad8efe777b45edfe7a471896855b37eec0d8adb4045912687cb25c5 SHA512 e2f367eef02c14a1d937db71fcd798990975581f6352ffad01894b40aea218f48a22d2aa96660cb1f8876b0720a8e76eacf9a5c87f0ecd2f58cafd5434acccad
diff --git a/app-text/ddir/ddir-0_p20100323.ebuild b/app-text/ddir/ddir-0_p20100323.ebuild
deleted file mode 100644
index dd207b08e59c..000000000000
--- a/app-text/ddir/ddir-0_p20100323.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 perl implementation of the tree(1) program"
-HOMEPAGE="http://freshmeat.net/projects/ddir"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-
-src_compile() { :; }
-
-src_install() {
- newbin bin/ddir.pl ddir || die
- doman bin/ddir.1
- dodoc ChangeLog doc/manual/*.txt README
- dohtml doc/manual/*.html
-}
diff --git a/app-text/ddir/metadata.xml b/app-text/ddir/metadata.xml
deleted file mode 100644
index eca282c06938..000000000000
--- a/app-text/ddir/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="freshmeat">ddir</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/delta/delta-20060803-r1.ebuild b/app-text/delta/delta-20060803-r1.ebuild
new file mode 100644
index 000000000000..9334fa0e374c
--- /dev/null
+++ b/app-text/delta/delta-20060803-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
+STUPID_NUM="33566"
+DESCRIPTION="Heuristically minimizes interesting files"
+HOMEPAGE="http://delta.tigris.org/"
+SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_compile() {
+ rm -f Makefile
+ tc-export CC
+ emake topformflat
+}
+
+src_install() {
+ dobin delta multidelta topformflat
+ dodoc Readme
+
+ docinto html
+ dodoc -r www/*
+}
diff --git a/app-text/delta/delta-20060803.ebuild b/app-text/delta/delta-20060803.ebuild
deleted file mode 100644
index 59243222f2a5..000000000000
--- a/app-text/delta/delta-20060803.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-STUPID_NUM="33566"
-DESCRIPTION="Heuristically minimizes interesting files"
-HOMEPAGE="http://delta.tigris.org/"
-SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_compile() {
- rm -f Makefile
- tc-export CC
- emake topformflat
-}
-
-src_install() {
- dobin delta multidelta topformflat
- dodoc Readme
- dohtml www/*
-}
diff --git a/app-text/delta/metadata.xml b/app-text/delta/metadata.xml
index 493b7194651e..5b571a9d257f 100644
--- a/app-text/delta/metadata.xml
+++ b/app-text/delta/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 303b1f6ceb7b..5f213c8909a8 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1 +1,2 @@
-DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
+DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
+DIST dictd-1.13.1.tar.gz 395619 BLAKE2B 83caad8570e752575bf5fe39a41e4a7d564f3a255d4e4cb234661a56ed645dfb155bef8a89d4ecfebfefb2f03d4ab808c00f1c4eacaae883761e28817138526b SHA512 31a2e67feaa672e773b86d16ecb9f41fdcd2d5f907759cc110261af30147b3972a2c7d742b4d61b67eb3b8c84c08e179106b9a30e998a425c9b437ec933b03ea
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild
deleted file mode 100644
index 442e9519dbed..000000000000
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils readme.gentoo systemd user
-
-DESCRIPTION="Dictionary Client/Server for the DICT protocol"
-HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
-SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
-
-SLOT="0"
-# We install rfc so - ISOC-rfc
-LICENSE="GPL-2 ISOC-rfc"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="dbi judy minimal"
-
-# <gawk-3.1.6 makes tests fail.
-RDEPEND="
- sys-libs/zlib
- dev-libs/libmaa
- dbi? ( dev-db/libdbi )
- judy? ( dev-libs/judy )
- >=sys-apps/coreutils-6.10
-"
-DEPEND="${RDEPEND}
- >=sys-apps/gawk-3.1.6
- virtual/yacc
-"
-
-DOC_CONTENTS="
- To start and use ${PN} you need to emerge at least one dictionary from
- the app-dicts category with the package name starting with 'dictd-'.
- To install all available dictionaries, emerge app-dicts/dictd-dicts.
- ${PN} will NOT start without at least one dictionary.\n
- \nIf you are running systemd, you will need to review the instructions
- explained in /etc/dict/dictd.conf comments.
-"
-
-pkg_setup() {
- enewgroup dictd # used in src_test()
- enewuser dictd -1 -1 -1 dictd
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
- epatch "${FILESDIR}"/dictd-1.12.0-build.patch
-
- [[ ${CHOST} == *-darwin* ]] && \
- sed -i -e 's:libtool:glibtool:g' Makefile.in
-}
-
-src_configure() {
- econf \
- $(use_with dbi plugin-dbi) \
- $(use_with judy plugin-judy) \
- --sysconfdir="${EPREFIX}"/etc/dict
-}
-
-src_compile() {
- if use minimal; then
- emake dictfmt dictzip dictzip
- else
- emake
- fi
-}
-
-src_test() {
- use minimal && return 0 # All tests are for dictd which we don't build...
- if [[ ${EUID} -eq 0 ]]; then
- # If dictd is run as root user (-userpriv) it drops its privileges to
- # dictd user and group. Give dictd group write access to test directory.
- chown :dictd "${WORKDIR}" "${S}/test"
- chmod 770 "${WORKDIR}" "${S}/test"
- fi
- emake test
-}
-
-src_install() {
- if use minimal; then
- emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
- else
- emake DESTDIR="${D}" install
-
- dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
- dodoc doc/{security.doc,toc.ms}
- newdoc examples/dictd1.conf dictd.conf.example
-
- # conf files. For dict.conf see below.
- insinto /etc/dict
- for f in dictd.conf site.info colorit.conf; do
- doins "${FILESDIR}/1.10.11/${f}"
- done
-
- # startups for dictd
- newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
- newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
- systemd_dounit "${FILESDIR}"/${PN}.service
- fi
-
- insinto /etc/dict
- doins "${FILESDIR}/1.10.11/dict.conf"
- # Install docs
- dodoc README TODO ChangeLog ANNOUNCE NEWS
-
- readme.gentoo_create_doc
-}
diff --git a/app-text/dictd/dictd-1.13.0-r7.ebuild b/app-text/dictd/dictd-1.13.0-r7.ebuild
new file mode 100644
index 000000000000..419f67bad38d
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r7.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="dbi judy minimal test"
+RESTRICT="!test? ( test )"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+ acct-group/dictd
+ acct-user/dictd
+ >=sys-apps/coreutils-6.10
+ dev-libs/libmaa:=
+ sys-libs/zlib
+ dbi? ( dev-db/libdbi )
+ judy? ( dev-libs/judy )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-apps/gawk-3.1.6
+ app-alternatives/lex
+ app-alternatives/yacc
+ test? ( !~sys-apps/gawk-4.2.1 )
+"
+
+DOC_CONTENTS="
+ To start and use ${PN} you need to emerge at least one dictionary from
+ the app-dicts category with the package name starting with 'dictd-'.
+ To install all available dictionaries, emerge app-dicts/dictd-dicts.
+ ${PN} will NOT start without at least one dictionary.\n
+ \nIf you are running systemd, you will need to review the instructions
+ explained in /etc/dict/dictd.conf comments.
+"
+
+PATCHES=(
+ "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+ "${FILESDIR}"/dictd-1.12.0-build.patch
+ "${FILESDIR}"/dictd-1.13.0-lex.patch
+ "${FILESDIR}"/dictd-1.13.0-libtool.patch # 818535
+ "${FILESDIR}"/dictd-1.13.0-version.patch # 852884
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with dbi plugin-dbi) \
+ $(use_with judy plugin-judy) \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+ # -j1 for bug #743292
+
+ if use minimal; then
+ emake -j1 dictfmt dictzip dictzip
+ else
+ emake -j1
+ fi
+}
+
+src_test() {
+ use minimal && return 0 # All tests are for dictd which we don't build...
+
+ if [[ ${EUID} -eq 0 ]]; then
+ # If dictd is run as root user (-userpriv) it drops its privileges to
+ # dictd user and group. Give dictd group write access to test directory.
+ chown :dictd "${WORKDIR}" "${S}/test" || die
+ chmod 770 "${WORKDIR}" "${S}/test" || die
+ fi
+
+ emake -j1 test
+}
+
+src_install() {
+ if use minimal; then
+ emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
+ else
+ default
+
+ # Don't install rfc2229.txt because it is non-free
+ dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
+ dodoc doc/{security.doc,toc.ms}
+ dodoc -r examples
+
+ # conf files. For dict.conf see below.
+ insinto /etc/dict
+ for f in dictd.conf site.info colorit.conf; do
+ doins "${FILESDIR}/1.10.11/${f}"
+ done
+
+ # startups for dictd
+ newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+ newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ fi
+
+ find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+ insinto /etc/dict
+ doins "${FILESDIR}"/1.10.11/dict.conf
+
+ dodoc ANNOUNCE NEWS README TODO
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if has_version sys-apps/systemd; then
+ ewarn "The default location for dicts has changed! If you've modified your"
+ ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+ ewarn "to point at /usr/share/dict now."
+ fi
+}
diff --git a/app-text/dictd/dictd-1.13.0-r8.ebuild b/app-text/dictd/dictd-1.13.0-r8.ebuild
new file mode 100644
index 000000000000..c40a2ff00042
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r8.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="dbi judy minimal selinux test"
+RESTRICT="!test? ( test )"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+ acct-group/dictd
+ acct-user/dictd
+ >=sys-apps/coreutils-6.10
+ dev-libs/libmaa:=
+ sys-libs/zlib
+ dbi? ( dev-db/libdbi )
+ judy? ( dev-libs/judy )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-apps/gawk-3.1.6
+ app-alternatives/lex
+ app-alternatives/yacc
+ test? ( !~sys-apps/gawk-4.2.1 )
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-dictd )"
+
+DOC_CONTENTS="
+ To start and use ${PN} you need to emerge at least one dictionary from
+ the app-dicts category with the package name starting with 'dictd-'.
+ To install all available dictionaries, emerge app-dicts/dictd-dicts.
+ ${PN} will NOT start without at least one dictionary.\n
+ \nIf you are running systemd, you will need to review the instructions
+ explained in /etc/dict/dictd.conf comments.
+"
+
+PATCHES=(
+ "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+ "${FILESDIR}"/dictd-1.12.0-build.patch
+ "${FILESDIR}"/dictd-1.13.0-lex.patch
+ "${FILESDIR}"/dictd-1.13.0-libtool.patch # 818535
+ "${FILESDIR}"/dictd-1.13.0-version.patch # 852884
+ "${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # 908998
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with dbi plugin-dbi) \
+ $(use_with judy plugin-judy) \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+ # -j1 for bug #743292
+
+ if use minimal; then
+ emake -j1 dictfmt dictzip dictzip
+ else
+ emake -j1
+ fi
+}
+
+src_test() {
+ use minimal && return 0 # All tests are for dictd which we don't build...
+
+ if [[ ${EUID} -eq 0 ]]; then
+ # If dictd is run as root user (-userpriv) it drops its privileges to
+ # dictd user and group. Give dictd group write access to test directory.
+ chown :dictd "${WORKDIR}" "${S}/test" || die
+ chmod 770 "${WORKDIR}" "${S}/test" || die
+ fi
+
+ emake -j1 test
+}
+
+src_install() {
+ if use minimal; then
+ emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
+ else
+ default
+
+ # Don't install rfc2229.txt because it is non-free
+ dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
+ dodoc doc/{security.doc,toc.ms}
+ dodoc -r examples
+
+ # conf files. For dict.conf see below.
+ insinto /etc/dict
+ for f in dictd.conf site.info colorit.conf; do
+ doins "${FILESDIR}/1.10.11/${f}"
+ done
+
+ # startups for dictd
+ newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+ newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ fi
+
+ find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+ insinto /etc/dict
+ doins "${FILESDIR}"/1.10.11/dict.conf
+
+ dodoc ANNOUNCE NEWS README TODO
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if has_version sys-apps/systemd; then
+ ewarn "The default location for dicts has changed! If you've modified your"
+ ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+ ewarn "to point at /usr/share/dict now."
+ fi
+}
diff --git a/app-text/dictd/dictd-1.13.1.ebuild b/app-text/dictd/dictd-1.13.1.ebuild
new file mode 100644
index 000000000000..8cda16a149fa
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="dbi judy minimal selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/dictd
+ acct-user/dictd
+ >=sys-apps/coreutils-6.10
+ dev-libs/libmaa:=
+ sys-libs/zlib
+ dbi? ( dev-db/libdbi )
+ judy? ( dev-libs/judy )
+"
+DEPEND="${RDEPEND}"
+# <gawk-3.1.6 makes tests fail.
+BDEPEND="
+ >=sys-apps/gawk-3.1.6
+ app-alternatives/lex
+ app-alternatives/yacc
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-dictd )"
+
+DOC_CONTENTS="
+ To start and use ${PN} you need to emerge at least one dictionary from
+ the app-dicts category with the package name starting with 'dictd-'.
+ To install all available dictionaries, emerge app-dicts/dictd-dicts.
+ ${PN} will NOT start without at least one dictionary.\n
+ \nIf you are running systemd, you will need to review the instructions
+ explained in /etc/dict/dictd.conf comments.
+"
+
+PATCHES=(
+ "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+ "${FILESDIR}"/dictd-1.12.0-build.patch
+ "${FILESDIR}"/dictd-1.13.0-lex.patch
+ "${FILESDIR}"/dictd-1.13.0-libtool.patch # bug #818535
+ "${FILESDIR}"/dictd-1.13.1-version.patch # bug #852884
+ "${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # bug #908998
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with dbi plugin-dbi) \
+ $(use_with judy plugin-judy) \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+ # -j1 for bug #743292
+ if use minimal; then
+ emake -j1 dictfmt dictzip dictzip
+ else
+ emake -j1
+ fi
+}
+
+src_test() {
+ use minimal && return 0 # All tests are for dictd which we don't build...
+
+ if [[ ${EUID} -eq 0 ]]; then
+ # If dictd is run as root user (-userpriv) it drops its privileges to
+ # dictd user and group. Give dictd group write access to test directory.
+ chown :dictd "${WORKDIR}" "${S}/test" || die
+ chmod 770 "${WORKDIR}" "${S}/test" || die
+ fi
+
+ emake -j1 test
+}
+
+src_install() {
+ if use minimal; then
+ emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
+ else
+ default
+
+ # Don't install rfc2229.txt because it is non-free
+ dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
+ dodoc doc/{security.doc,toc.ms}
+ dodoc -r examples
+
+ # conf files. For dict.conf see below.
+ insinto /etc/dict
+ for f in dictd.conf site.info colorit.conf; do
+ doins "${FILESDIR}/1.10.11/${f}"
+ done
+
+ # startups for dictd
+ newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+ newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ fi
+
+ find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+ insinto /etc/dict
+ doins "${FILESDIR}"/1.10.11/dict.conf
+
+ dodoc ANNOUNCE NEWS README TODO
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if has_version sys-apps/systemd; then
+ ewarn "The default location for dicts has changed! If you've modified your"
+ ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+ ewarn "to point at /usr/share/dict now."
+ fi
+}
diff --git a/app-text/dictd/files/1.10.11/dictd.confd b/app-text/dictd/files/1.10.11/dictd.confd
index 06eb94973bfa..4ceb5f02f30d 100644
--- a/app-text/dictd/files/1.10.11/dictd.confd
+++ b/app-text/dictd/files/1.10.11/dictd.confd
@@ -2,4 +2,4 @@
# --locale switch to DICTD_OPTS, e. g. "--locale=en_US.utf8"
DICTD_OPTS="-s "
DICTDCONF=/etc/dict/dictd.conf
-DLIBDIR=/usr/lib/dict
+DLIBDIR=/usr/share/dict
diff --git a/app-text/dictd/files/1.10.11/dictd.initd b/app-text/dictd/files/1.10.11/dictd.initd
index ca4474043bcf..385461ae08fb 100644
--- a/app-text/dictd/files/1.10.11/dictd.initd
+++ b/app-text/dictd/files/1.10.11/dictd.initd
@@ -12,7 +12,7 @@ prepconfig() {
fi
# if no dictionaries, skip startup.
- # The new way of doing this is to scan /usr/lib/dict and tweek the conf
+ # The new way of doing this is to scan /usr/share/dict and tweek the conf
einfo "Scanning for dictionaries..."
if [ ! -d "${DLIBDIR}" ]; then
eerror "${DLIBDIR} doesn't exist, no dictionaries found."
diff --git a/app-text/dictd/files/1.10.11/site.info b/app-text/dictd/files/1.10.11/site.info
index 23bfdeb61102..c896c1e0e875 100644
--- a/app-text/dictd/files/1.10.11/site.info
+++ b/app-text/dictd/files/1.10.11/site.info
@@ -1,6 +1,6 @@
Welcome to your dictionary server dictd!
This is an example site information file. It should contain information
-about any restricted databases and how users can obtain access. If may
+about any restricted databases and how users can obtain access. It may
also contain other random data as you see fit.
diff --git a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
index 4643a10d2de4..841193b1982b 100644
--- a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
+++ b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
@@ -1,6 +1,5 @@
-=== modified file 'colorit.in'
---- colorit.in 2009-03-02 08:52:14 +0000
-+++ colorit.in 2009-03-02 08:52:48 +0000
+--- a/colorit.in
++++ b/colorit.in
@@ -167,7 +167,7 @@
function process_config (){
diff --git a/app-text/dictd/files/dictd-1.13.0-lex.patch b/app-text/dictd/files/dictd-1.13.0-lex.patch
new file mode 100644
index 000000000000..c69758c4805d
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-lex.patch
@@ -0,0 +1,28 @@
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 09:10:18 -0700
+Subject: [PATCH] build: Fix implicit function declarations
+
+--- a/clientparse.y
++++ b/clientparse.y
+@@ -24,6 +24,9 @@
+ #define YYERROR_VERBOSE
+
+ static dictServer *s;
++
++int yylex();
++void yyerror(const char *s);
+ %}
+
+ %union {
+--- a/servparse.y
++++ b/servparse.y
+@@ -30,6 +30,9 @@
+
+ static dictDatabase *db;
+
++int yylex();
++void yyerror(const char *s);
++
+ static int string2bool (const char *str)
+ {
+ if (
diff --git a/app-text/dictd/files/dictd-1.13.0-libtool.patch b/app-text/dictd/files/dictd-1.13.0-libtool.patch
new file mode 100644
index 000000000000..f687a182f60f
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-libtool.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/818535
+
+From: orbea <orbea@riseup.net>
+Date: Fri, 17 Jun 2022 16:18:40 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -28,6 +28,7 @@ endif
+
+ .SUFFIXES:
+
++top_builddir= @top_builddir@
+ srcdir= @srcdir@
+ VPATH= @srcdir@:.
+ prefix= @prefix@
+--- a/configure.in
++++ b/configure.in
+@@ -35,6 +35,8 @@ AC_INIT([dict],[VERSION],[dict-beta@dict.org])
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+
++LT_INIT
++
+ echo Configuring for dict
+ echo .
+
+@@ -70,13 +72,10 @@ echo Checking for programs
+
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_YACC
+ AC_PROG_LEX
+
+-AC_CHECK_PROG(LIBTOOL,libtool,libtool)
+-
+ AC_CHECK_PROGS(NROFF,gnroff nroff)
+ AC_CHECK_PROGS(TROFF,groff troff)
+ AC_CHECK_PROGS(COL,col cat)
+@@ -188,7 +187,6 @@ AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+-AC_SUBST(LIBTOOL)
+
+ AC_SUBST(PLUGINS)
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,6 +28,7 @@ endif
+
+ .SUFFIXES:
+
++top_builddir= @top_builddir@
+ srcdir= @srcdir@
+ VPATH= @srcdir@
+ prefix= @prefix@
diff --git a/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch b/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch
new file mode 100644
index 000000000000..e5747a6680af
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch
@@ -0,0 +1,18 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611203
+https://bugs.gentoo.org/908998
+--- a/md5.h
++++ b/md5.h
+@@ -1,11 +1,8 @@
+ #ifndef MD5_H
+ #define MD5_H
+
+-#ifdef __alpha
+-typedef unsigned int uint32;
+-#else
+-typedef unsigned long uint32;
+-#endif
++#include <stdint.h>
++typedef uint32_t uint32;
+
+ struct MD5Context {
+ uint32 buf[4];
diff --git a/app-text/dictd/files/dictd-1.13.0-version.patch b/app-text/dictd/files/dictd-1.13.0-version.patch
new file mode 100644
index 000000000000..fee60efe22da
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-version.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/852884
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 10:00:21 -0700
+Subject: [PATCH] configure: Set version directly in AC_INIT
+
+This avoids a command not found error in config.status.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -20,7 +20,7 @@
+
+ # Add a _letter_ if you change the version number and release your own version.
+ # Numbers are for the original author(s) only.
+-DICT_VERSION=@DICT_VERSION@
++DICT_VERSION=@PACKAGE_VERSION@
+
+ ifneq (,)
+ This makefile requires GNU Make.
+--- a/configure.in
++++ b/configure.in
+@@ -23,14 +23,10 @@ dnl CFLAGS and LDFLAGS should be settable on the make commandline
+ dnl for optimization and stripping.
+ dnl LIBOBJS is an automatically-generated list of extra objects we need
+
+-
+-define(VERSION, 1.13.0)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.0],[dict-beta@dict.org])
+
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+@@ -40,8 +36,6 @@ LT_INIT
+ echo Configuring for dict
+ echo .
+
+-DICT_VERSION=VERSION
+-
+ AC_CANONICAL_HOST
+
+ AC_PROG_CC
+@@ -183,7 +177,6 @@ SBINDIR=`eval3 $sbindir`
+ LIBEXECDIR=`eval3 $libexecdir`
+ DATADIR=`eval3 $datadir`
+
+-AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+--- a/dictdplugin-config.in
++++ b/dictdplugin-config.in
+@@ -24,7 +24,7 @@ while test $# -ne 0; do
+ usage
+ exit;;
+ --version)
+- echo @DICT_VERSION@
++ echo @PACKAGE_VERSION@
+ exit;;
+ --libs)
+ echo -L@libdir@
diff --git a/app-text/dictd/files/dictd-1.13.1-version.patch b/app-text/dictd/files/dictd-1.13.1-version.patch
new file mode 100644
index 000000000000..c0ef4f1f594e
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.1-version.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/852884
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 10:00:21 -0700
+Subject: [PATCH] configure: Set version directly in AC_INIT
+
+This avoids a command not found error in config.status.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -20,7 +20,7 @@
+
+ # Add a _letter_ if you change the version number and release your own version.
+ # Numbers are for the original author(s) only.
+-DICT_VERSION=@DICT_VERSION@
++DICT_VERSION=@PACKAGE_VERSION@
+
+ ifneq (,)
+ This makefile requires GNU Make.
+--- a/configure.in
++++ b/configure.in
+@@ -23,14 +23,10 @@ dnl CFLAGS and LDFLAGS should be settable on the make commandline
+ dnl for optimization and stripping.
+ dnl LIBOBJS is an automatically-generated list of extra objects we need
+
+-
+-define(VERSION, 1.13.1)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.1],[dict-beta@dict.org])
+
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+@@ -40,8 +36,6 @@ LT_INIT
+ echo Configuring for dict
+ echo .
+
+-DICT_VERSION=VERSION
+-
+ AC_CANONICAL_HOST
+
+ AC_PROG_CC
+@@ -183,7 +177,6 @@ SBINDIR=`eval3 $sbindir`
+ LIBEXECDIR=`eval3 $libexecdir`
+ DATADIR=`eval3 $datadir`
+
+-AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+--- a/dictdplugin-config.in
++++ b/dictdplugin-config.in
+@@ -24,7 +24,7 @@ while test $# -ne 0; do
+ usage
+ exit;;
+ --version)
+- echo @DICT_VERSION@
++ echo @PACKAGE_VERSION@
+ exit;;
+ --libs)
+ echo -L@libdir@
diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml
index 0ecc963168ae..0209b505f064 100644
--- a/app-text/dictd/metadata.xml
+++ b/app-text/dictd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
@@ -8,5 +8,6 @@
</use>
<upstream>
<remote-id type="sourceforge">dict</remote-id>
+ <remote-id type="github">cheusov/dictd</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index ef2839b71b03..fd11aaca4849 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -1,2 +1 @@
-DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
diff --git a/app-text/diction/diction-1.13.ebuild b/app-text/diction/diction-1.13.ebuild
deleted file mode 100644
index dfe2b194b77d..000000000000
--- a/app-text/diction/diction-1.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Diction and style checkers for english and german texts"
-HOMEPAGE="https://www.gnu.org/software/diction/diction.html"
-SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="
- sys-devel/gettext
- virtual/libintl
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-make.patch
-}
-
-DOCS=( NEWS README )
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 07533e14ded3..9f39fa67f731 100644
--- a/app-text/diction/diction-1.14.ebuild
+++ b/app-text/diction/diction-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
DEPEND="
sys-devel/gettext
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 96ba50990142..802a52540411 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/metadata.xml
@@ -1,18 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jer@gentoo.org</email>
- <name>Jeroen Roovers</name>
- </maintainer>
- <maintainer type="person">
- <email>jnrowe@gmail.com</email>
- <name>James Rowe</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
GNU diction and style are free implementations of old standard unix
commands, that are not available on many modern systems, because they
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index 26aac9e3e9fb..33086153aba7 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1 +1 @@
-DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
+DIST diff-pdf-0.5.1.tar.gz 142541 BLAKE2B db402ee9c0d3013b76b5e20381d661c572206bd834e5ec31824dc9f4aed08e0fcb1d57909b4a7490297c767aaf17efdd522ca4488c63a276ba6fb3f50e74b8b9 SHA512 8f2669da974912023208cdb538256ff979935d64e1f32d547da33d6c8231945ae555f6f85481ef36ec888d3ceda7fdfdddcfbd225f0a891c5f1613be6f249f4f
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
deleted file mode 100644
index 1f289d32bcb5..000000000000
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# No EAPI=7 support in wxwidgets.eclass.
-EAPI=6
-
-inherit wxwidgets
-
-DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/${PN}/ https://github.com/vslavik/${PN}/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-# The COPYING.icons file states that two icons were taken from
-# version 2.16.5 of GTK+, which is licensed LGPL-2+.
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-# The build system checks for "poppler-glib", which is provided only
-# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
-# of poppler is relatively stable, and I can only assume that diff-pdf
-# uses that rather than the low-level libpoppler.so API. Since the
-# subslot on app-text/poppler is ONLY for the low-level API, we
-# therefore don't need a subslot dependency on app-text/poppler.
-#
-# Since diff-pdf.cpp includes glib.h directly, I've included
-# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
-DEPEND="app-text/poppler[cairo]
- dev-libs/glib
- x11-libs/cairo
- x11-libs/wxGTK:3.0[X]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- WX_GTK_VER="3.0"
- setup-wxwidgets
- default
-}
diff --git a/app-text/diff-pdf/diff-pdf-0.5.1.ebuild b/app-text/diff-pdf/diff-pdf-0.5.1.ebuild
new file mode 100644
index 000000000000..1daaf8ab5b42
--- /dev/null
+++ b/app-text/diff-pdf/diff-pdf-0.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit wxwidgets
+
+DESCRIPTION="A simple tool for visually comparing two PDF files"
+HOMEPAGE="https://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+# The COPYING.icons file states that two icons were taken from
+# version 2.16.5 of GTK+, which is licensed LGPL-2+.
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+# The build system checks for "poppler-glib", which is provided only
+# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
+# of poppler is relatively stable, and I can only assume that diff-pdf
+# uses that rather than the low-level libpoppler.so API. Since the
+# subslot on app-text/poppler is ONLY for the low-level API, we
+# therefore don't need a subslot dependency on app-text/poppler.
+#
+# Since diff-pdf.cpp includes glib.h directly, I've included
+# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
+DEPEND="app-text/poppler[cairo]
+ dev-libs/glib
+ x11-libs/cairo
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ setup-wxwidgets
+ default
+}
diff --git a/app-text/diff-pdf/metadata.xml b/app-text/diff-pdf/metadata.xml
index 45125b9b6e99..1f67f7ee14fa 100644
--- a/app-text/diff-pdf/metadata.xml
+++ b/app-text/diff-pdf/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
+
+ <upstream>
+ <remote-id type="github">vslavik/diff-pdf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
index 379468357300..4ac979ae0a43 100644
--- a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
+++ b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit desktop qmake-utils
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
+BDEPEND="dev-qt/linguist-tools:5"
RDEPEND="
app-text/poppler[qt5]
dev-qt/qtcore:5
@@ -21,9 +22,7 @@ RDEPEND="
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
diff --git a/app-text/diffpdf/metadata.xml b/app-text/diffpdf/metadata.xml
index 62f8df43d2e1..853c0d96f91a 100644
--- a/app-text/diffpdf/metadata.xml
+++ b/app-text/diffpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>reavertm@gentoo.org</email>
diff --git a/app-text/ding/Manifest b/app-text/ding/Manifest
index 78ec68d439ee..6081e827bc09 100644
--- a/app-text/ding/Manifest
+++ b/app-text/ding/Manifest
@@ -1 +1 @@
-DIST ding-1.8.1.tar.gz 6543141 BLAKE2B 5393113bc8952553b3b5e5ee8dcd98b4cf6fec2d92069354e83b38808289053b0cc5a2c08968068f9b393b5a5e296541718c129ccbe23076ce591f6254c8293b SHA512 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4
+DIST ding-1.9.tar.gz 7864078 BLAKE2B 9a25a2eb940b96393f556e374167a5b0aae8d26ff81de364e693f01acf79b0a5896704c39e1fe1ab2b48a875785483b2bc71339b01d3999664b78b48ecb041dc SHA512 fa5500d1ced311ba21ef8a16a25f3a3cdcebc24daacff79c05351a46cc2a1d466891caa1dec3a77ae9a4d7e59332d991974917875f967d93ac1358f5532e8a72
diff --git a/app-text/ding/ding-1.8.1.ebuild b/app-text/ding/ding-1.8.1.ebuild
deleted file mode 100644
index c2318824efe3..000000000000
--- a/app-text/ding/ding-1.8.1.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
-
-inherit eutils
-
-DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)"
-HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/"
-SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.3"
-
-src_install() {
- dobin ding
- insinto /usr/share/dict
- doins de-en.txt
- doman ding.1
- dodoc CHANGES README
-
- doicon ding.png
- domenu ding.desktop
-}
diff --git a/app-text/ding/ding-1.9.ebuild b/app-text/ding/ding-1.9.ebuild
new file mode 100644
index 000000000000..7b7ecc39822e
--- /dev/null
+++ b/app-text/ding/ding-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)"
+HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/"
+SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/tk-8.3"
+
+src_install() {
+ dobin ding
+ insinto /usr/share/dict
+ doins de-en.txt
+ doman ding.1
+ dodoc CHANGES README.md
+
+ doicon ding.png
+ domenu ding.desktop
+}
diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml
index 95aa13f6c5ef..115e9d64a669 100644
--- a/app-text/ding/metadata.xml
+++ b/app-text/ding/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 905ec433cc0d..1aa7e0a68741 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1 +1,3 @@
-DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
+DIST discount-2.2.7c.tar.gz 133282 BLAKE2B 3258cfa34d58ef5944ae5282f6df061b8183bccc1ca7f9f3a39b3c001a8b86a4deb86b80d109d937e334b2773e5065a0f6c212ac7a79317ce2ae665778a023e2 SHA512 2a959fb24d7291b3a8c6d659b5c904b8c2f8b6d9b0666e998ca5313533cc25898b9c2114f7922272f3bc6b9bfe4bc486fe08c620b4cb2a2282624e128dc92781
+DIST discount-3.0.0a.tar.gz 140250 BLAKE2B 1e89f9c58c4d90157a9ccd925b89f098538c93191937e86eeefd32810e937feb78b6eeab96aead029fc35e4bf6699a40f67bdceb3c2d70fdc645fcd14091a3e7 SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a
+DIST discount-3.0.0d.tar.gz 141531 BLAKE2B 723f0319d82ec240e7eed8c812278555066f092b3a764c332f8327f09cfc0420c6db18f0ab114f64b26a9fbd6f7374f309a892f53dd0f721c02741e849cd6562 SHA512 ab24722bb8513f64eed59bb2770276b91615033b494a0492a331f36c5fcd2e32b7a9f3bd7ef0bb74c107f1e0e955522c83ddba6c482fca7f18cf275334707c4d
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
deleted file mode 100644
index d4d34cd4f43d..000000000000
--- a/app-text/discount/discount-2.2.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
-IUSE="minimal test"
-
-src_prepare() {
- default
-
- # for QA, we remove the Makefile’s usage of install -s.
- # Drop ldconfig invocation.
- # Force “librarian.sh†to respect LDFLAGS ($FLAGS should have CFLAGS
- # at that point).
- sed -i \
- -e '/INSTALL_PROGRAM/s,\$_strip ,,' \
- -e 's/\(LDCONFIG=\).*/\1:/' \
- -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
- configure.inc || die "sed configure.inc failed"
-
- # Add LDFLAGS and CPPFLAGS hackily.
- sed -i \
- -e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
- -e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
- Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
-}
-
-src_configure() {
- local configure_call=(
- ./configure.sh
- --libdir="${EPREFIX}"usr/"$(get_libdir)"
- --prefix="${EPREFIX}"usr
- --mandir="${EPREFIX}"usr/share/man
- --shared
- --pkg-config
- $(usex minimal '' --enable-all-features)
- # Enable deterministic HTML generation behavior. Otherwise, will
- # actually call rand() as part of its serialization code...
- --debian-glitch
- )
- einfo "Running ${configure_call[@]}"
- CC="$(tc-getCC)" \
- "${configure_call[@]}" || die
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- $(usex minimal install install.everything) \
- SAMPLE_PFX="${PN}-"
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins libmarkdown.pc
-}
-
-pkg_postinst() {
- if ! use minimal; then
- elog 'Sample binaries with overly-generic names have been'
- elog "prefixed with \"${PN}-\"."
- fi
-}
diff --git a/app-text/discount/discount-2.2.7c.ebuild b/app-text/discount/discount-2.2.7c.ebuild
new file mode 100644
index 000000000000..d10ba7694ad3
--- /dev/null
+++ b/app-text/discount/discount-2.2.7c.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.2.7"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+
+ # for QA, we remove the Makefile’s usage of install -s.
+ # Drop ldconfig invocation.
+ # Force “librarian.sh†to respect LDFLAGS ($FLAGS should have CFLAGS
+ # at that point).
+ sed -i \
+ -e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+ -e 's/\(LDCONFIG=\).*/\1:/' \
+ -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+ configure.inc || die "sed configure.inc failed"
+}
+
+src_configure() {
+ local configure_call=(
+ ./configure.sh
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --prefix="${EPREFIX}/usr"
+ --mandir="${EPREFIX}/usr/share/man"
+ --shared
+ --pkg-config
+ $(usex minimal '' --enable-all-features)
+ # Enable deterministic HTML generation behavior. Otherwise, will
+ # actually call rand() as part of its serialization code...
+ --debian-glitch
+ )
+ einfo "Running ${configure_call[@]}"
+ CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ "${configure_call[@]}" || die
+}
+
+src_compile() {
+ emake libmarkdown
+ emake
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ $(usex minimal install install.everything) \
+ SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+ if ! use minimal; then
+ elog 'Sample binaries with overly-generic names have been'
+ elog "prefixed with \"${PN}-\"."
+ fi
+}
diff --git a/app-text/discount/discount-3.0.0a.ebuild b/app-text/discount/discount-3.0.0a.ebuild
new file mode 100644
index 000000000000..4da7a0c94b27
--- /dev/null
+++ b/app-text/discount/discount-3.0.0a.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+
+ # for QA, we remove the Makefile’s usage of install -s.
+ # Drop ldconfig invocation.
+ # Force “librarian.sh†to respect LDFLAGS ($FLAGS should have CFLAGS
+ # at that point).
+ sed -i \
+ -e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+ -e 's/\(LDCONFIG=\).*/\1:/' \
+ -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+ configure.inc || die "sed configure.inc failed"
+}
+
+src_configure() {
+ local configure_call=(
+ ./configure.sh
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --prefix="${EPREFIX}/usr"
+ --mandir="${EPREFIX}/usr/share/man"
+ --shared
+ --pkg-config
+ $(usex minimal '' --enable-all-features)
+ # Enable deterministic HTML generation behavior. Otherwise, will
+ # actually call rand() as part of its serialization code...
+ --debian-glitch
+ )
+ einfo "Running ${configure_call[@]}"
+ CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ "${configure_call[@]}" || die
+}
+
+src_compile() {
+ emake libmarkdown
+ emake
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ $(usex minimal install install.everything) \
+ SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+ if ! use minimal; then
+ elog 'Sample binaries with overly-generic names have been'
+ elog "prefixed with \"${PN}-\"."
+ fi
+}
diff --git a/app-text/discount/discount-3.0.0d.ebuild b/app-text/discount/discount-3.0.0d.ebuild
new file mode 100644
index 000000000000..c33b32489b4f
--- /dev/null
+++ b/app-text/discount/discount-3.0.0d.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+
+ # for QA, we remove the Makefile’s usage of install -s.
+ # Drop ldconfig invocation.
+ # Force “librarian.sh†to respect LDFLAGS ($FLAGS should have CFLAGS
+ # at that point).
+ sed -i \
+ -e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+ -e 's/\(LDCONFIG=\).*/\1:/' \
+ -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+ configure.inc || die "sed configure.inc failed"
+}
+
+src_configure() {
+ local configure_call=(
+ ./configure.sh
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --prefix="${EPREFIX}/usr"
+ --mandir="${EPREFIX}/usr/share/man"
+ --shared
+ --pkg-config
+ $(usex minimal '' --enable-all-features)
+ # Enable deterministic HTML generation behavior. Otherwise, will
+ # actually call rand() as part of its serialization code...
+ --debian-glitch
+ )
+ einfo "Running ${configure_call[@]}"
+ CC="$(tc-getCC)" AR="$(tc-getAR)" \
+ "${configure_call[@]}" || die
+}
+
+src_compile() {
+ emake libmarkdown
+ emake
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ $(usex minimal install install.everything) \
+ SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+ if ! use minimal; then
+ elog 'Sample binaries with overly-generic names have been'
+ elog "prefixed with \"${PN}-\"."
+ fi
+}
diff --git a/app-text/discount/metadata.xml b/app-text/discount/metadata.xml
index 7a38bb900964..b26855d43ade 100644
--- a/app-text/discount/metadata.xml
+++ b/app-text/discount/metadata.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>bkohler@gentoo.org</email>
+ <name>Ben Kohler</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Orc/discount</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild
deleted file mode 100644
index fa5fe0ff6bd9..000000000000
--- a/app-text/djview/djview-4.10.6-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils flag-o-matic nsplugins qmake-utils toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Portable DjVu viewer using Qt"
-HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
-SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="debug nsplugin"
-
-RDEPEND="
- >=app-text/djvu-3.5.22-r1
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.67
- virtual/pkgconfig
- nsplugin? ( dev-libs/glib:2 )"
-
-DOCS=( README NEWS )
-
-PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
-
-src_prepare() {
- default
-
- # Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
- sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
- sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
- rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
- AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
- # See config/acinclude.m4
- use debug || append-cppflags "-DNDEBUG"
-
- QTDIR=$(qt5_get_libdir)/qt5 \
- econf \
- --with-x \
- --disable-desktopfiles \
- $(use_enable nsplugin nsdejavu)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
- install
-
- einstalldocs
-
- cd desktopfiles
- insinto /usr/share/icons/hicolor/32x32/apps
- newins prebuilt-hi32-djview4.png djvulibre-djview4.png
- insinto /usr/share/icons/hicolor/64x64/apps
- newins prebuilt-hi64-djview4.png djvulibre-djview4.png
- insinto /usr/share/icons/hicolor/scalable/apps
- newins djview.svg djvulibre-djview4.svg
- sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
- domenu djvulibre-djview4.desktop
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-text/djview/djview-4.10.6-r2.ebuild b/app-text/djview/djview-4.10.6-r2.ebuild
new file mode 100644
index 000000000000..9cd76dfc20f4
--- /dev/null
+++ b/app-text/djview/djview-4.10.6-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Portable DjVu viewer using Qt"
+HOMEPAGE="https://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="debug"
+
+RDEPEND="
+ >=app-text/djvu-3.5.22-r1
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ >=dev-build/autoconf-2.67
+ virtual/pkgconfig"
+
+DOCS=( README NEWS )
+
+PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
+
+src_prepare() {
+ default
+
+ # Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
+ sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
+ sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
+ rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4} || die
+ AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+ # See config/acinclude.m4
+ use debug || append-cppflags "-DNDEBUG"
+
+ QTDIR=$(qt5_get_libdir)/qt5 \
+ econf \
+ --with-x \
+ --disable-desktopfiles \
+ --disable-nsdejavu
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+ install
+
+ einstalldocs
+
+ insinto /usr/share/icons/hicolor/32x32/apps
+ newins desktopfiles/prebuilt-hi32-djview4.png djvulibre-djview4.png
+ insinto /usr/share/icons/hicolor/64x64/apps
+ newins desktopfiles/prebuilt-hi64-djview4.png djvulibre-djview4.png
+ insinto /usr/share/icons/hicolor/scalable/apps
+ newins desktopfiles/djview.svg djvulibre-djview4.svg
+ sed -e 's/Exec=djview4/Exec=djview/' \
+ -i desktopfiles/djvulibre-djview4.desktop || die
+ domenu desktopfiles/djvulibre-djview4.desktop
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-text/djview/metadata.xml b/app-text/djview/metadata.xml
index 73ad11b1a6a5..5d6d042f8e80 100644
--- a/app-text/djview/metadata.xml
+++ b/app-text/djview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 249e4f7eb321..7853bec4b21a 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,2 +1 @@
-DIST djvulibre-3.5.25.3.tar.gz 2543949 BLAKE2B 8ae6004e74a7db0fa666a3cf15f5a3b335690984838e8d674ccd7fa7dda0728771f6fab5f61747b505646e3bb206effd0bbaf9c6035fb27993d587693ad1fa43 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b
-DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
+DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild
deleted file mode 100644
index 455ebfa772e0..000000000000
--- a/app-text/djvu/djvu-3.5.25.3.ebuild
+++ /dev/null
@@ -1,72 +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 xdg-utils
-
-MY_P="${PN}libre-${PV#*_p}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
- tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
- || ( gnome-base/librsvg media-gfx/inkscape )"
-
-S=${WORKDIR}/${MY_P%%.3}
-
-src_prepare() {
- sed -i \
- -e 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' \
- configure.ac || die #263688
- rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh,config.sub,config.guess,ltoptions.m4,ltversion.m4,lt~obsolete.m4}
-# epatch "${FILESDIR}/${PN}-3.5.24-gcc46.patch"
- AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
- use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
- # We install all desktop files by hand.
- econf \
- $(use_enable xml xmltools) \
- $(use_with jpeg) \
- $(use_with tiff) \
- --disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
- default
- prune_libtool_files
-
- use doc && dodoc -r doc
-
- # Install desktop files.
- cd desktopfiles
- for i in {22,32,48,64}; do
- insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
- newins hi${i}-djvu.png image-vnd.djvu.png
- done
- insinto /usr/share/mime/packages
- doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- has_version app-text/djview || \
- optfeature "For djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
deleted file mode 100644
index 7e1a7c1c755e..000000000000
--- a/app-text/djvu/djvu-3.5.27.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic xdg-utils
-
-MY_P="${PN}libre-${PV#*_p}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
- tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
- || ( gnome-base/librsvg media-gfx/inkscape )"
-
-S=${WORKDIR}/${MY_P%%.3}
-
-src_configure() {
- use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
- # We install all desktop files by hand.
- econf \
- $(use_enable xml xmltools) \
- $(use_with jpeg) \
- $(use_with tiff) \
- --disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
- default
- prune_libtool_files
-
- use doc && dodoc -r doc
-
- # Install desktop files.
- cd desktopfiles
- for i in {22,32,48,64}; do
- insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
- newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
- done
- insinto /usr/share/mime/packages
- doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- has_version app-text/djview || \
- optfeature "For djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.28-r3.ebuild b/app-text/djvu/djvu-3.5.28-r3.ebuild
new file mode 100644
index 000000000000..fb2851ba987e
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.28-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic optfeature xdg
+
+MY_P="${PN}libre-${PV#*_p}"
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="https://djvu.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P%%.3}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( media-libs/libjpeg-turbo:= )
+ tiff? ( media-libs/tiff:= )"
+DEPEND="${RDEPEND}"
+
+# inkscape/rsvg-convert are used to generate icons at build-time only
+BDEPEND="app-arch/unzip
+ || ( gnome-base/librsvg media-gfx/inkscape )"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+ # We install all desktop files by hand.
+ econf \
+ $(use_enable xml xmltools) \
+ $(use_with jpeg) \
+ $(use_with tiff) \
+ --disable-desktopfiles
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ use doc && dodoc -r doc
+
+ # Install desktop files.
+ cd desktopfiles || die
+ for i in {22,32,48,64}; do
+ insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+ newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+ done
+
+ insinto /usr/share/mime/packages
+ doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "djviewer or browser plugin" app-text/djview
+}
diff --git a/app-text/djvu/djvu-3.5.28-r4.ebuild b/app-text/djvu/djvu-3.5.28-r4.ebuild
new file mode 100644
index 000000000000..fefb78cad008
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.28-r4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic optfeature xdg
+
+MY_P="${PN}libre-${PV#*_p}"
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="https://djvu.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P%%.3}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( media-libs/libjpeg-turbo:= )
+ tiff? ( media-libs/tiff:= )"
+DEPEND="${RDEPEND}"
+
+# inkscape/rsvg-convert are used to generate icons at build-time only
+BDEPEND="app-arch/unzip
+ || ( gnome-base/librsvg media-gfx/inkscape )"
+
+DOCS=( NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.28-drop-register-keyword-clang16.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+ # We install all desktop files by hand.
+ econf \
+ $(use_enable xml xmltools) \
+ $(use_with jpeg) \
+ $(use_with tiff) \
+ --disable-desktopfiles
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ use doc && dodoc -r doc
+
+ # Install desktop files.
+ cd desktopfiles || die
+ for i in {22,32,48,64}; do
+ insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+ newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+ done
+
+ insinto /usr/share/mime/packages
+ doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "djviewer or browser plugin" app-text/djview
+}
diff --git a/app-text/djvu/files/djvu-3.5.24-gcc46.patch b/app-text/djvu/files/djvu-3.5.24-gcc46.patch
deleted file mode 100644
index 2d1d099bfbb9..000000000000
--- a/app-text/djvu/files/djvu-3.5.24-gcc46.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/361057 for GSmartPointer.h change
-
-Then include stddef.h in the installed headers to fix building of reverse
-dependencies, such as app-text/zathura-djvu
-
-These are all in upstream GIT
-
---- a/libdjvu/ddjvuapi.h
-+++ b/libdjvu/ddjvuapi.h
-@@ -64,6 +64,7 @@
- }
- #endif
-
-+#include <stddef.h>
- #include <stdlib.h>
- #include <stdio.h>
-
---- a/libdjvu/GSmartPointer.h
-+++ b/libdjvu/GSmartPointer.h
-@@ -62,6 +62,8 @@
- # pragma interface
- #endif
-
-+#include <cstddef>
-+
- /** @name GSmartPointer.h
-
- Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer
---- a/libdjvu/miniexp.h
-+++ b/libdjvu/miniexp.h
-@@ -38,7 +38,8 @@
- #ifndef MINILISPAPI
- # define MINILISPAPI /**/
- #endif
--
-+
-+#include <stddef.h>
-
- /* -------------------------------------------------- */
- /* LISP EXPRESSIONS */
diff --git a/app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch b/app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch
new file mode 100644
index 000000000000..dd86bb8bf130
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.28-drop-register-keyword-clang16.patch
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/894644
+--- a/libdjvu/GBitmap.h
++++ b/libdjvu/GBitmap.h
+@@ -620,7 +620,7 @@ GBitmap::euclidian_ratio(int a, int b, int &q, int &r)
+ inline int
+ GBitmap::read_run(unsigned char *&data)
+ {
+- register int z=*data++;
++ int z=*data++;
+ return (z>=RUNOVERFLOWVALUE)?
+ ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
+ }
+@@ -628,7 +628,7 @@ GBitmap::read_run(unsigned char *&data)
+ inline int
+ GBitmap::read_run(const unsigned char *&data)
+ {
+- register int z=*data++;
++ int z=*data++;
+ return (z>=RUNOVERFLOWVALUE)?
+ ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;
+ }
diff --git a/app-text/djvu/metadata.xml b/app-text/djvu/metadata.xml
index 775c1334667a..822a5c011ab2 100644
--- a/app-text/djvu/metadata.xml
+++ b/app-text/djvu/metadata.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
<longdescription>
-DjVu is a web-centric format and software platform for distributing documents
-and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for
-distributing scanned documents, digital documents, or high-resolution pictures.
-DjVu content downloads faster, displays and renders faster, looks nicer on a
-screen, and consume less client resources than competing formats. DjVu images
-display instantly and can be smoothly zoomed and panned with no lengthy
-re-rendering. DjVu is used by hundreds of academic, commercial, governmental,
-and non-commercial web sites around the world.
-</longdescription>
+ DjVu is a web-centric format and software platform for distributing documents
+ and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for
+ distributing scanned documents, digital documents, or high-resolution pictures.
+ DjVu content downloads faster, displays and renders faster, looks nicer on a
+ screen, and consume less client resources than competing formats. DjVu images
+ display instantly and can be smoothly zoomed and panned with no lengthy
+ re-rendering. DjVu is used by hundreds of academic, commercial, governmental,
+ and non-commercial web sites around the world.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">djvu</remote-id>
</upstream>
diff --git a/app-text/djvusmooth/Manifest b/app-text/djvusmooth/Manifest
deleted file mode 100644
index 14befd3e6e98..000000000000
--- a/app-text/djvusmooth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST djvusmooth-0.2.18.tar.gz 70548 BLAKE2B 1f4a14038ce4df4318ab8c7dbaac9c65c132ff184dec2a03b6c45e555170a50caad0003f0c766e82c0bf9b0200798763922e5f408d6892cb43663712d7142653 SHA512 786d7e9dc49f9a6923ebfaec7d4e68446e4bd72f7ff7cca9cd3a1513f3b1751485d6879dc59b51ce1d58390dbcf23b8992b42f9f2b5e6938d434d6966b7a4a72
diff --git a/app-text/djvusmooth/djvusmooth-0.2.18.ebuild b/app-text/djvusmooth/djvusmooth-0.2.18.ebuild
deleted file mode 100644
index 30d8056a0e72..000000000000
--- a/app-text/djvusmooth/djvusmooth-0.2.18.ebuild
+++ /dev/null
@@ -1,22 +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 distutils-r1
-
-DESCRIPTION="Graphical editor for DjVu documents"
-HOMEPAGE="http://jwilk.net/software/djvusmooth"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/python-djvulibre[${PYTHON_USEDEP}]
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
- x11-themes/hicolor-icon-theme"
-
-DOCS=( doc/changelog doc/credits.txt )
diff --git a/app-text/djvusmooth/metadata.xml b/app-text/djvusmooth/metadata.xml
deleted file mode 100644
index ee4f72507d62..000000000000
--- a/app-text/djvusmooth/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="github">jwilk/djvusmooth</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
deleted file mode 100644
index df8d6e0a7df2..000000000000
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI=6 is blocked by Gentoo bug 497052.
-EAPI=5
-
-MY_P=${P/-stylesheets/}
-
-inherit sgml-catalog
-
-DESCRIPTION="DSSSL Stylesheets for DocBook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-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 ~x64-solaris"
-IUSE=""
-
-RDEPEND="
- app-text/sgml-common
- app-text/docbook-sgml-dtd:3.0
-"
-
-DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- local dsssldir CATALOG_DIR=usr/share/sgml/docbook/dsssl-stylesheets-${PV}
-
- dobin bin/collateindex.pl
-
- insinto ${CATALOG_DIR}
- doins catalog VERSION
-
- insinto ${CATALOG_DIR}/common
- doins common/*.{dsl,ent}
-
- insinto ${CATALOG_DIR}/images
- doins images/*.gif
-
- for dsssldir in html lib olink print; do
- insinto ${CATALOG_DIR}/${dsssldir}
- doins ${dsssldir}/*.dsl
- done
-
- for dsssldir in dbdsssl html imagelib olink; do
- insinto ${CATALOG_DIR}/dtds/${dsssldir}
- doins dtds/${dsssldir}/*.dtd
- done
-
- insinto ${CATALOG_DIR}/dtds/html
- doins dtds/html/*.{dcl,gml}
-
- dodoc "${DOCS[@]}"
-}
-
-sgml-catalog_cat_include \
- "/etc/sgml/dsssl-docbook-stylesheets.cat" \
- "/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
-
-sgml-catalog_cat_include \
- "/etc/sgml/sgml-docbook.cat" \
- "/etc/sgml/dsssl-docbook-stylesheets.cat"
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
new file mode 100644
index 000000000000..c0b21e971bcf
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit sgml-catalog-r1
+
+MY_P=${P/-stylesheets/}
+DESCRIPTION="DSSSL Stylesheets for DocBook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+ app-text/docbook-sgml-dtd:3.0
+"
+
+DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ local d catdir=/usr/share/sgml/docbook/dsssl-stylesheets-${PV}
+
+ dobin bin/collateindex.pl
+
+ insinto "${catdir}"
+ doins catalog VERSION
+
+ insinto "${catdir}"/common
+ doins common/*.{dsl,ent}
+
+ insinto "${catdir}"/images
+ doins images/*.gif
+
+ for d in html lib olink print; do
+ insinto "${catdir}/${d}"
+ doins "${d}"/*.dsl
+ done
+
+ for d in dbdsssl html imagelib olink; do
+ insinto "${catdir}/dtds/${d}"
+ doins "dtds/${d}"/*.dtd
+ done
+
+ insinto "${catdir}/dtds/html"
+ doins dtds/html/*.{dcl,gml}
+
+ insinto /etc/sgml
+ newins - dsssl-docbook-stylesheets.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
+ EOF
+
+ dodoc "${DOCS[@]}"
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/dsssl-docbook-stylesheets.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/dsssl-docbook-stylesheets.cat
+ local real=${EROOT}/etc/sgml/dsssl-docbook-stylesheets.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ # this one's shared with openjade, so we need to do it in postinst
+ if ! grep -q -s dsssl-docbook-stylesheets.cat \
+ "${EROOT}"/etc/sgml/sgml-docbook.cat; then
+ ebegin "Adding dsssl-docbook-stylesheets.cat to /etc/sgml/sgml-docbook.cat"
+ cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/dsssl-docbook-stylesheets.cat"
+ EOF
+ eend ${?}
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ ebegin "Removing dsssl-docbook-stylesheets.cat from /etc/sgml/sgml-docbook.cat"
+ sed -i -e '/dsssl-docbook-stylesheets/d' \
+ "${EROOT}"/etc/sgml/sgml-docbook.cat
+ eend ${?}
+ if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+ rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+ fi
+ fi
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index df1f6e962108..382383a99350 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
<upstream>
<remote-id type="github">docbook/dsssl</remote-id>
<remote-id type="sourceforge">docbook</remote-id>
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
deleted file mode 100644
index ba9da057ae5a..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk30"
-DESCRIPTION="Docbook SGML DTD 3.0"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="3.0"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc *.txt
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
new file mode 100644
index 000000000000..34b492d34bbd
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc *.txt
+}
+
+pkg_preinst() {
+ # work-around -r3 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
deleted file mode 100644
index 88708e01acf1..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk31"
-DESCRIPTION="Docbook SGML DTD 3.1"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="3.1"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc *.txt
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
new file mode 100644
index 000000000000..34b492d34bbd
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc *.txt
+}
+
+pkg_preinst() {
+ # work-around -r3 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
deleted file mode 100644
index feda5792a75b..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk40"
-DESCRIPTION="Docbook SGML DTD 4.0"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.0"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc *.txt
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
new file mode 100644
index 000000000000..34b492d34bbd
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc *.txt
+}
+
+pkg_preinst() {
+ # work-around -r3 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
deleted file mode 100644
index f0777f778ab8..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbk41"
-DESCRIPTION="Docbook SGML DTD 4.1"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.1"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc *.txt
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild
new file mode 100644
index 000000000000..65ff439e368d
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc *.txt
+}
+
+pkg_preinst() {
+ # work-around -r3 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
deleted file mode 100644
index b4cacf0c675c..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbook-4.2"
-DESCRIPTION="Docbook SGML DTD 4.2"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc ChangeLog README
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
new file mode 100644
index 000000000000..741061d98573
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc ChangeLog README
+}
+
+pkg_preinst() {
+ # work-around -r2 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
deleted file mode 100644
index 75e8deae2c4c..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbook-${PV}"
-DESCRIPTION="Docbook SGML DTD 4.3"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc ChangeLog README
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
new file mode 100644
index 000000000000..58e75c67fd66
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc ChangeLog README
+}
+
+pkg_preinst() {
+ # work-around -r2 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
new file mode 100644
index 000000000000..7fe768242249
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc ChangeLog README
+}
+
+pkg_preinst() {
+ # work-around -r0 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
deleted file mode 100644
index d207163ef213..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit sgml-catalog eutils
-
-MY_P="docbook-${PV}"
-DESCRIPTION="Docbook SGML DTD 4.4"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.4"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod
- newins docbook.cat catalog
- dodoc ChangeLog README
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
new file mode 100644
index 000000000000..d1f6ad4d7933
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+BDEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+ insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+ doins *.dcl *.dtd *.mod *.xml
+ newins docbook.cat catalog
+ insinto /etc/sgml
+ newins - sgml-docbook-${PV}.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ EOF
+ dodoc README
+}
+
+pkg_preinst() {
+ # work-around -r0 postrm removing it
+ cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/sgml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/sgml-docbook-${PV}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
deleted file mode 100644
index da54710ad845..000000000000
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils sgml-catalog
-
-MY_P="docbook-${PV}"
-DESCRIPTION="Docbook SGML DTD 4.5"
-HOMEPAGE="https://docbook.org/sgml/"
-SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="4.5"
-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 ~x64-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND="app-text/sgml-common"
-
-S="${WORKDIR}"
-
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/${P}-catalog.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
- doins *.dcl *.dtd *.mod *.xml
- newins docbook.cat catalog
- dodoc README
-}
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
index 224f98ca59c9..b08003c09ca6 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat Tue Dec 10 16:35:22 1996
-+++ catalog Mon Jun 5 11:08:34 2000
+--- a/docbook.cat Tue Dec 10 16:35:22 1996
++++ b/docbook.cat Mon Jun 5 11:08:34 2000
@@ -41,29 +41,6 @@
PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
index 51afa752ad2c..df1507975ac9 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat Tue Feb 2 06:53:32 1999
-+++ catalog Thu May 25 11:45:01 2000
+--- a/docbook.cat Tue Feb 2 06:53:32 1999
++++ b/docbook.cat Thu May 25 11:45:01 2000
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
index dd83fdf12b52..82944d0b871a 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat Mon May 22 22:38:05 2000
-+++ catalog Mon May 22 22:12:36 2000
+--- a/docbook.cat Mon May 22 22:38:05 2000
++++ b/docbook.cat Mon May 22 22:12:36 2000
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
index 656ee333f45f..a68644aa1735 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat Mon May 22 22:38:05 2000
-+++ catalog Mon May 22 22:12:36 2000
+--- a/docbook.cat Mon May 22 22:38:05 2000
++++ b/docbook.cat Mon May 22 22:12:36 2000
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
index d9b232fd8115..d328fdbb3228 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
@@ -1,6 +1,6 @@
diff -uNr 4.2/docbook.cat 4.2-gentoo/docbook.cat
---- 4.2/docbook.cat 2002-07-18 00:14:28.000000000 +0800
-+++ 4.2-gentoo/docbook.cat 2003-01-18 22:25:05.000000000 +0800
+--- a/docbook.cat 2002-07-18 00:14:28.000000000 +0800
++++ b/docbook.cat 2003-01-18 22:25:05.000000000 +0800
@@ -19,6 +19,8 @@
-- ...................................................................... --
-- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
index ce532355e4a7..207460ba6f96 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat 2004-03-31 20:44:16.000000000 +0900
-+++ docbook.cat-gentoo 2004-10-17 20:37:51.000000000 +0900
+--- a/docbook.cat 2004-03-31 20:44:16.000000000 +0900
++++ b/docbook.cat 2004-10-17 20:37:51.000000000 +0900
@@ -19,6 +19,8 @@
-- ...................................................................... --
-- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
index 5c16801a0902..c473d70db4f4 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat 2005-01-27 08:59:49.000000000 -0500
-+++ docbook.cat-gentoo 2005-07-11 21:12:28.000000000 -0500
+--- a/docbook.cat 2005-01-27 08:59:49.000000000 -0500
++++ b/docbook.cat 2005-07-11 21:12:28.000000000 -0500
@@ -19,6 +19,8 @@
-- ...................................................................... --
-- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
index b7405283f88a..cde8f541e988 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
@@ -1,6 +1,6 @@
diff -NurdB docbook-sgml-dtd/docbook.cat docbook-sgml-dtd_patch/docbook.cat
---- docbook-sgml-dtd/docbook.cat 2006-10-03 15:27:50.000000000 +0200
-+++ docbook-sgml-dtd_patch/docbook.cat 2007-08-14 00:43:31.485987458 +0200
+--- a/docbook.cat 2006-10-03 15:27:50.000000000 +0200
++++ b/docbook.cat 2007-08-14 00:43:31.485987458 +0200
@@ -19,6 +19,8 @@
-- ...................................................................... --
-- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/metadata.xml b/app-text/docbook-sgml-dtd/metadata.xml
index 6f49eba8f496..076793e3f54b 100644
--- a/app-text/docbook-sgml-dtd/metadata.xml
+++ b/app-text/docbook-sgml-dtd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
deleted file mode 100644
index 71a101d90125..000000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools prefix
-
-MY_PN=${PN/-sgml/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="jadetex"
-
-DEPEND=">=dev-lang/perl-5
- app-text/docbook-dsssl-stylesheets
- app-text/openjade
- dev-perl/SGMLSpm
- ~app-text/docbook-xml-simple-dtd-4.1.2.4
- ~app-text/docbook-xml-simple-dtd-1.0
- app-text/docbook-xml-dtd
- ~app-text/docbook-sgml-dtd-3.0
- ~app-text/docbook-sgml-dtd-3.1
- ~app-text/docbook-sgml-dtd-4.0
- ~app-text/docbook-sgml-dtd-4.1
- ~app-text/docbook-sgml-dtd-4.2
- ~app-text/docbook-sgml-dtd-4.4
- jadetex? ( app-text/jadetex )
- userland_GNU? ( sys-apps/which )
- || (
- www-client/lynx
- www-client/links
- www-client/elinks
- virtual/w3m )"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0, <obz@gentoo.org>
-
-src_prepare() {
- epatch "${FILESDIR}"/${MY_P}-elinks.patch
- epatch "${FILESDIR}"/${P}-grep-2.7.patch
- if use prefix; then
- epatch "${FILESDIR}"/${MY_P}-prefix.patch
- eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
- eautoreconf
- fi
-}
-
-src_install() {
- make DESTDIR="${D}" \
- htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- install || die "Installation failed"
-
- if ! use jadetex ; then
- for i in dvi pdf ps ; do
- rm "${ED}"/usr/bin/docbook2$i || die
- rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/$i || die
- rm "${ED}"/usr/share/man/man1/docbook2$i.1 || die
- done
- fi
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
new file mode 100644
index 000000000000..34fc413680d8
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix
+
+MY_P=${PN/-sgml/}-${PV}
+DESCRIPTION="Shell scripts to manage DocBook documents"
+HOMEPAGE="https://sourceware.org/docbook-tools/"
+SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="jadetex"
+
+DEPEND=">=dev-lang/perl-5
+ app-text/docbook-dsssl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ app-text/openjade
+ app-text/xhtml1
+ dev-perl/SGMLSpm
+ ~app-text/docbook-sgml-dtd-3.0
+ ~app-text/docbook-sgml-dtd-3.1
+ ~app-text/docbook-sgml-dtd-4.0
+ ~app-text/docbook-sgml-dtd-4.1
+ ~app-text/docbook-sgml-dtd-4.2
+ ~app-text/docbook-sgml-dtd-4.4
+ ~app-text/docbook-xml-simple-dtd-1.0
+ ~app-text/docbook-xml-simple-dtd-4.1.2.4
+ jadetex? ( dev-texlive/texlive-formatsextra )
+ || (
+ www-client/lynx
+ www-client/links
+ www-client/elinks
+ virtual/w3m
+ )"
+RDEPEND="${DEPEND}"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
+
+PATCHES=(
+ "${FILESDIR}"/${MY_P}-elinks.patch
+ "${FILESDIR}"/${P}-grep-2.7.patch
+
+ # drop dependency on sys-apps/which
+ "${FILESDIR}"/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch
+)
+
+src_prepare() {
+ default
+ if use prefix; then
+ eapply "${FILESDIR}"/${MY_P}-prefix.patch
+ eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
+ eautoreconf
+ fi
+}
+
+src_install() {
+ make DESTDIR="${D}" \
+ htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ install
+
+ if ! use jadetex; then
+ local i
+ for i in dvi pdf ps; do
+ rm "${ED}"/usr/bin/docbook2${i} || die
+ rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/${i} || die
+ rm "${ED}"/usr/share/man/man1/docbook2${i}.1 || die
+ done
+ fi
+ einstalldocs
+}
diff --git a/app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch b/app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch
new file mode 100644
index 000000000000..764d06ad4d78
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/0001-Migrate-from-1998-style-which-progname-lookup-to-com.patch
@@ -0,0 +1,90 @@
+From a5956fccad44bed98b5de22a6169e0aa098d169f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 4 Mar 2024 18:16:32 -0500
+Subject: [PATCH] Migrate from 1998 style "which progname" lookup to command -v
+
+The "which" utility is not guaranteed to be installed either, and if it
+is, its behavior is not portable either. This means that when sgml tools
+are installed, the `which` check will report a fatal error because the
+which tool did not exist and the shell returned a nonzero status when
+attempting to fork+exec. If it did exist, it might not be an
+implementation of `which` that returns nonzero when commands do not
+exist.
+
+The general scripting suggestion is to use the "command -v" shell
+builtin that is required to exist in all POSIX 2008 compliant shells,
+and is thus guaranteed to work everywhere.
+
+For some in-depth discussions on the topic, see:
+- https://mywiki.wooledge.org/BashFAQ/081
+- https://unix.stackexchange.com/questions/85249/why-not-use-which-what-to-use-then/85250#85250
+
+Examples of open-source shells likely to be installed as /bin/sh on
+Linux, which implement the 15-year-old standard: ash, bash, busybox,
+dash, ksh, mksh and zsh.
+
+However, in this case there's a pretty good exuse for not using a 2008
+standard. The docbook-utils project is dead since 2004. So we patch it
+(and scratch our heads about where to try sending patches).
+
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ bin/jw.in | 16 ++++++----------
+ 1 file changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/bin/jw.in b/bin/jw.in
+index 4bfb312..82bd497 100644
+--- a/bin/jw.in
++++ b/bin/jw.in
+@@ -58,8 +58,7 @@ SGML_ERRORS_LIST="\n\
+ \040 no-valid \t Do not require the document to be type-valid"
+
+ # Get name of main SGML configuration file
+-which sgmlwhich >/dev/null 2>/dev/null
+-if [ $? -eq 0 ]
++if command -v sgmlwhich >/dev/null
+ then
+ SGML_CONF=`sgmlwhich`
+ else
+@@ -296,10 +295,10 @@ fi
+ # Try to find the SGML normalizer
+ if [ -z "$SGML_NORM" ]
+ then
+- SGML_NORM=`which sgmlnorm 2>/dev/null`
++ SGML_NORM=`command -v sgmlnorm`
+ if [ -z "SGML_NORM" ]
+ then
+- SGML_NORM=`which osgmlnorm 2>/dev/null`
++ SGML_NORM=`command -v osgmlnorm`
+ fi
+ fi
+
+@@ -376,13 +375,11 @@ esac
+ # Choose a parser
+ if [ -z "$SGML_JADE" ]
+ then
+- which jade >/dev/null 2>/dev/null
+- if [ $? -eq 0 ]
++ if command -v jade >/dev/null
+ then
+ SGML_JADE="jade"
+ else
+- which openjade >/dev/null 2>/dev/null
+- if [ $? -eq 0 ]
++ if command -v openjade >/dev/null
+ then
+ SGML_JADE="openjade"
+ else
+@@ -391,8 +388,7 @@ then
+ fi
+ fi
+ else
+- which $SGML_JADE >/dev/null 2>/dev/null
+- if [ $? -ne 0 ]
++ if ! command -v $SGML_JADE >/dev/null
+ then
+ echo "`basename $0`: parser $SGML_JADE is not available" >&2
+ exit 6
+--
+2.43.0
+
diff --git a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
index 490d65a0aa43..89663829e8b9 100644
--- a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
@@ -1,8 +1,8 @@
Fix wrong charakter classes no longer missinterpreted by grep-2.7
Michael Weber <xmw@gentoo.org>
---- docbook-utils-0.6.14/bin/jw.in
-+++ docbook-utils-0.6.14/bin/jw.in
+--- a/bin/jw.in
++++ b/bin/jw.in
@@ -80,9 +80,9 @@
SGML_CATALOGS_DIR="/etc/sgml"
if [ -f "$SGML_CONF" ]
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
index 5256570458af..f437b8163f5d 100644
--- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
@@ -1,6 +1,5 @@
-diff -NurdB docbook-utils-0.6.14/backends/txt docbook-utils-0.6.14-patched/backends/txt
---- docbook-utils-0.6.14/backends/txt 2004-02-11 08:58:03.000000000 -0500
-+++ docbook-utils-0.6.14-patched/backends/txt 2006-06-05 21:57:23.000000000 -0500
+--- a/backends/txt
++++ b/backends/txt
@@ -10,6 +10,10 @@
then
CONVERT=/usr/bin/links
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
index 29906c2046ad..0f795f7371c3 100644
--- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
@@ -1,5 +1,5 @@
---- doc/HTML/Makefile.am~ 2007-10-08 04:13:04 +0200
-+++ doc/HTML/Makefile.am 2007-10-08 04:13:34 +0200
+--- a/doc/HTML/Makefile.am
++++ b/doc/HTML/Makefile.am
@@ -23,7 +23,7 @@
$(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \
$(top_srcdir)/doc/refentry/frontend-spec.sgml \
@@ -9,8 +9,8 @@
SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
-V '%use-id-as-filename%' $<
---- doc/man/Makefile.am~ 2007-10-08 04:14:16 +0200
-+++ doc/man/Makefile.am 2007-10-08 04:14:29 +0200
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
@@ -10,7 +10,7 @@
$(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \
@@ -20,8 +20,8 @@
SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
nsgmls $< | \
sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
---- bin/jw.in~ 2007-10-08 04:27:18 +0200
-+++ bin/jw.in 2007-10-08 04:28:40 +0200
+--- a/bin/jw.in
++++ b/bin/jw.in
@@ -63,7 +63,7 @@
then
SGML_CONF=`sgmlwhich`
@@ -40,8 +40,8 @@
if [ -f "$SGML_CONF" ]
then
RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
---- backends/txt~ 2007-10-08 04:59:59 +0200
-+++ backends/txt 2007-10-08 05:00:52 +0200
+--- a/backends/txt
++++ b/backends/txt
@@ -2,21 +2,21 @@
# Send any comments to Eric Bischoff <eric@caldera.de>
# This program is under GPL license. See LICENSE file for details.
@@ -72,8 +72,8 @@
ARGS="-dump"
else
echo >&2 "No way to convert HTML to text found."
---- configure.in~ 2004-02-11 15:14:15 +0100
-+++ configure.in 2007-10-14 10:40:51 +0200
+--- a/configure.in
++++ b/configure.in
@@ -20,11 +20,11 @@
AC_SUBST(docdir)
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index b44d8c52bbfb..e1e2cfbd9904 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
- (for processing tex files produced by the TeX backend of
- Jade)</flag>
- </use>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <use>
+ <flag name="jadetex">
+ Add support for processing tex files produced by the TeX
+ backend of Jade
+ </flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
deleted file mode 100644
index aadcacdb95fe..000000000000
--- a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A helper package for sgml docbook"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-HOMEPAGE="https://www.docbook.org/sgml/"
-
-RDEPEND="app-text/sgml-common app-text/openjade
- >=app-text/docbook-dsssl-stylesheets-1.64
- >=app-text/docbook-sgml-utils-0.6.6
- ~app-text/docbook-sgml-dtd-3.0
- ~app-text/docbook-sgml-dtd-3.1
- ~app-text/docbook-sgml-dtd-4.0
- ~app-text/docbook-sgml-dtd-4.1"
diff --git a/app-text/docbook-sgml/metadata.xml b/app-text/docbook-sgml/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/docbook-sgml/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-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
deleted file mode 100644
index eed5959a1a9f..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P="docbkx412"
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
- >=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
-
- # Prepend OVERRIDE directive
- sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
- keepdir /etc/xml
-
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}
- doins *.cat *.dtd *.mod || die
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
- doins ent/*.ent || die
-
- dodoc ChangeLog *.txt
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
new file mode 100644
index 000000000000..41625f30b9c0
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbkx${PV//./}"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+ >=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Prepend OVERRIDE directive
+ sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+ default
+}
+
+src_install() {
+ keepdir /etc/xml
+
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+ doins *.cat *.dtd *.mod
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+ doins ent/*.ent
+
+ insinto /etc/sgml
+ newins - "xml-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+ EOF
+
+ dodoc ChangeLog *.txt
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
deleted file mode 100644
index 2283cbf65498..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
- >=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
-
- # Prepend OVERRIDE directive
- sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
- keepdir /etc/xml
-
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}
- doins *.cat *.dtd *.mod || die
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
- doins ent/*.ent || die
-
- dodoc ChangeLog README
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
new file mode 100644
index 000000000000..42302b037952
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+ >=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Prepend OVERRIDE directive
+ sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+ default
+}
+
+src_install() {
+ keepdir /etc/xml
+
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+ doins *.cat *.dtd *.mod
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+ doins ent/*.ent
+
+ insinto /etc/sgml
+ newins - "xml-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+ EOF
+
+ dodoc ChangeLog README
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
deleted file mode 100644
index b5fa2f3e3ceb..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
- >=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
-
- # Prepend OVERRIDE directive
- sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
- keepdir /etc/xml
-
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}
- doins *.cat *.dtd *.mod || die
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
- doins ent/*.ent || die
-
- dodoc ChangeLog README
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
new file mode 100644
index 000000000000..42302b037952
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+ >=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Prepend OVERRIDE directive
+ sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+ default
+}
+
+src_install() {
+ keepdir /etc/xml
+
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+ doins *.cat *.dtd *.mod
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+ doins ent/*.ent
+
+ insinto /etc/sgml
+ newins - "xml-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+ EOF
+
+ dodoc ChangeLog README
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
deleted file mode 100644
index 5073cae4a3c4..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
- >=app-text/build-docbook-catalog-1.2"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
-
- # Prepend OVERRIDE directive
- sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
- keepdir /etc/xml
-
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}
- doins *.cat *.dtd *.mod *.xml || die
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
- doins ent/*.ent || die
-
- # work around unicode parser issues #238785
- dosym ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
- /usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
-
- cp ent/README README.ent
- dodoc ChangeLog README*
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
new file mode 100644
index 000000000000..b2e0f454ced5
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+ >=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Prepend OVERRIDE directive
+ sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+ default
+}
+
+src_install() {
+ keepdir /etc/xml
+
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+ doins *.cat *.dtd *.mod *.xml
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+ doins ent/*.ent
+
+ insinto /etc/sgml
+ newins - "xml-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+ EOF
+
+ cp ent/README README.ent
+ dodoc ChangeLog README*
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
deleted file mode 100644
index 28e745219079..000000000000
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P=${P/-dtd/}
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/"
-SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=app-arch/unzip-5.41
- >=dev-libs/libxml2-2.4
- >=app-text/docbook-xsl-stylesheets-1.65
- >=app-text/build-docbook-catalog-1.2"
-
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/etc/sgml/sgml-docbook.cat"
-sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
-
- # Prepend OVERRIDE directive
- sed -i -e '1i\\OVERRIDE YES' docbook.cat
-}
-
-src_install() {
- keepdir /etc/xml
-
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}
- doins *.cat *.dtd *.mod *.xml || die
- insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
- doins ent/*.ent || die
-
- # work around unicode parser issues #238785
- dosym ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
- /usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
-
- cp ent/README README.ent
- dodoc ChangeLog README*
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
new file mode 100644
index 000000000000..b2e0f454ced5
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+ >=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Prepend OVERRIDE directive
+ sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+ default
+}
+
+src_install() {
+ keepdir /etc/xml
+
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+ doins *.cat *.dtd *.mod *.xml
+ insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+ doins ent/*.ent
+
+ insinto /etc/sgml
+ newins - "xml-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+ EOF
+
+ cp ent/README README.ent
+ dodoc ChangeLog README*
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml
index 6f49eba8f496..076793e3f54b 100644
--- a/app-text/docbook-xml-dtd/metadata.xml
+++ b/app-text/docbook-xml-dtd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
deleted file mode 100644
index 4769cfbe91b4..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_PN="docbook-simple"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
- insinto /usr/share/sgml/docbook/${P#docbook-}
- doins *.dtd *.mod *.css
-
- newins "${FILESDIR}"/${P}.cat catalog
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
new file mode 100644
index 000000000000..71de3e3219bb
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=docbook-simple-${PV}
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/"
+SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/sgml/docbook/${P#docbook-}
+ doins *.dtd *.mod *.css
+ newins "${FILESDIR}"/${P}.cat catalog
+
+ insinto /etc/sgml
+ newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-simple-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
deleted file mode 100644
index d8f17a55a964..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P="sdb4124"
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="mirror://gentoo/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="0"
-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=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/share/sgml/docbook/${P#docbook-}
- doins *.dtd *.mod *.css
-
- newins "${FILESDIR}"/${P}.catalog catalog
-
- insinto /usr/share/sgml/docbook/${P#docbook-}/ent
- doins ent/*.ent
-
- dodoc README ChangeLog LostLog COPYRIGHT
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
new file mode 100644
index 000000000000..2b4d5848456a
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="sdb${PV//.}"
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/sgml/docbook/${P#docbook-}
+ doins *.dtd *.mod *.css
+ newins "${FILESDIR}"/${P}.catalog catalog
+
+ insinto /usr/share/sgml/docbook/${P#docbook-}/ent
+ doins ent/*.ent
+
+ insinto /etc/sgml
+ newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-simple-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
deleted file mode 100644
index 6e2679e689de..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
-SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
-
-LICENSE="docbook"
-SLOT="4.1.2.5"
-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=""
-
-RDEPEND=">=app-text/build-docbook-catalog-1.6"
-DEPEND=">=app-arch/unzip-5.41"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
- "/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
- insinto /usr/share/sgml/docbook/${P#docbook-}
- doins *.dtd *.mod *.css
-
- newins "${FILESDIR}"/${P}.catalog catalog
-}
-
-pkg_postinst() {
- build-docbook-catalog
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- build-docbook-catalog
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
new file mode 100644
index 000000000000..8e741cbb347c
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=simple${PV//./}
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
+SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/sgml/docbook/${P#docbook-}
+ doins *.dtd *.mod *.css
+ newins "${FILESDIR}"/${P}.catalog catalog
+
+ insinto /etc/sgml
+ newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xml-simple-docbook-${PV}.cat
+ local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/metadata.xml b/app-text/docbook-xml-simple-dtd/metadata.xml
index 6f49eba8f496..076793e3f54b 100644
--- a/app-text/docbook-xml-simple-dtd/metadata.xml
+++ b/app-text/docbook-xml-simple-dtd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 732ca89676c6..bb3c6b9bdb5c 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1 +1 @@
-DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
+DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
deleted file mode 100644
index a50b149c8f9c..000000000000
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
-MY_PN="${PN%-stylesheets}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XSL Stylesheets for Docbook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ruby"
-
-RDEPEND=">=app-text/build-docbook-catalog-1.4
- ruby? ( dev-lang/ruby )"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
-# The makefile runs tests, not builds.
-src_compile() { :; }
-
-src_test() {
- emake check
-}
-
-src_install() {
- # The changelog is now zipped, and copied as the RELEASE-NOTES, so we
- # don't need to install it
- dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
-
- insinto ${DOCBOOKDIR}
- doins VERSION VERSION.xsl
-
- local i
- for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
- [[ "$i" == "epub" ]] && ! use ruby && continue
-
- cd "${S}"/${i}
- for doc in ChangeLog README; do
- if [ -e "$doc" ]; then
- mv ${doc} ${doc}.${i}
- dodoc ${doc}.${i}
- rm ${doc}.${i}
- fi
- done
-
- doins -r "${S}"/${i}
- done
-
- if use ruby; then
- local cmd="dbtoepub${MY_PN#docbook-xsl}"
-
- # we can't use a symlink or it'll look for the library in the
- # wrong path.
- dodir /usr/bin
- cat - > "${D}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
-
-load "${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
- fperms 0755 /usr/bin/${cmd}
- fi
-}
-
-pkg_postinst() {
- build-docbook-catalog
-}
-
-pkg_postrm() {
- build-docbook-catalog
-}
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
new file mode 100644
index 000000000000..1db6f61cf189
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.4
+ ruby? ( dev-lang/ruby )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ # The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+ # don't need to install it
+ dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+ insinto ${DOCBOOKDIR}
+ doins VERSION VERSION.xsl
+
+ local i
+ for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
+ [[ "${i}" == "epub" ]] && ! use ruby && continue
+
+ cd "${S}"/${i}
+ for doc in ChangeLog README; do
+ if [[ -e "${doc}" ]] ; then
+ mv ${doc} ${doc}.${i} || die
+ dodoc ${doc}.${i}
+ rm ${doc}.${i} || die
+ fi
+ done
+
+ doins -r "${S}"/${i}
+ done
+
+ if use ruby; then
+ local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+ # we can't use a symlink or it'll look for the library in the
+ # wrong path.
+ dodir /usr/bin
+ cat - > "${ED}"/usr/bin/${cmd} <<EOF
+#!/usr/bin/env ruby
+
+load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+EOF
+ fperms 0755 /usr/bin/${cmd}
+ fi
+}
+
+pkg_postinst() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+}
diff --git a/app-text/docbook-xsl-ns-stylesheets/metadata.xml b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
index 7af5ac28f350..19ad17418de9 100644
--- a/app-text/docbook-xsl-ns-stylesheets/metadata.xml
+++ b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<use>
@@ -8,7 +8,9 @@
compatible with <pkg>app-eselect/eselect-ruby</pkg>.
</flag>
</use>
+ <stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">docbook</remote-id>
+ <remote-id type="github">docbook/wiki</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
deleted file mode 100644
index b877ae3d1bf5..000000000000
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit ruby-single
-
-DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
-MY_PN="${PN%-stylesheets}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XSL Stylesheets for Docbook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ruby"
-
-RDEPEND="
- >=app-text/build-docbook-catalog-1.1
- ruby? ( ${RUBY_DEPS} )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}"/nonrecursive-string-subst.patch
-)
-
-src_prepare() {
- default
-
- # Delete the unnecessary Java-related stuff and other tools as they
- # bloat the stage3 tarballs massively. See bug #575818.
- rm -rv extensions/ tools/ || die
- find \( -name build.xml -o -name build.properties \) \
- -printf "removed %p\n" -delete || die
-
- if ! use ruby; then
- rm -rv epub/ || die
- fi
-}
-
-# The makefile runs tests, not builds.
-src_compile() { :; }
-
-src_test() {
- emake check
-}
-
-src_install() {
- # The changelog is now zipped, and copied as the RELEASE-NOTES, so we
- # don't need to install it
- dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
-
- insinto ${DOCBOOKDIR}
- doins VERSION VERSION.xsl
-
- local i
- for i in */; do
- i=${i%/}
-
- cd "${S}"/${i}
- for doc in ChangeLog README; do
- if [ -e "$doc" ]; then
- mv ${doc} ${doc}.${i}
- dodoc ${doc}.${i}
- rm ${doc}.${i}
- fi
- done
-
- doins -r "${S}"/${i}
- done
-
- if use ruby; then
- local cmd="dbtoepub${MY_PN#docbook-xsl}"
-
- # we can't use a symlink or it'll look for the library in the
- # wrong path.
- dodir /usr/bin
- cat - > "${ED%/}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
-
-load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
- fperms 0755 /usr/bin/${cmd}
- fi
-}
-
-pkg_postinst() {
- build-docbook-catalog
-}
-
-pkg_postrm() {
- build-docbook-catalog
-}
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
new file mode 100644
index 000000000000..cf92278ee655
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31"
+inherit ruby-single
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ruby"
+# Makefile is broken since 1.76.0
+RESTRICT="test"
+
+RDEPEND="
+ >=app-text/build-docbook-catalog-1.1
+ ruby? ( ${RUBY_DEPS} dev-ruby/rexml )
+"
+
+PATCHES=(
+ "${FILESDIR}"/nonrecursive-string-subst.patch
+)
+
+src_prepare() {
+ default
+
+ # Delete the unnecessary Java-related stuff and other tools as they
+ # bloat the stage3 tarballs massively. See bug #575818.
+ rm -rv extensions/ tools/ || die
+ find \( -name build.xml -o -name build.properties \) \
+ -printf "removed %p\n" -delete || die
+
+ if ! use ruby; then
+ rm -rv epub/ || die
+ fi
+}
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ # The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+ # don't need to install it
+ dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+ insinto ${DOCBOOKDIR}
+ doins VERSION VERSION.xsl
+
+ local i
+ for i in */; do
+ i=${i%/}
+
+ for doc in ChangeLog README; do
+ if [[ -e ${i}/${doc} ]]; then
+ newdoc ${i}/${doc} ${doc}.${i}
+ rm ${i}/${doc} || die
+ fi
+ done
+
+ doins -r ${i}
+ done
+
+ if use ruby; then
+ local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+ # we can't use a symlink or it'll look for the library in the wrong path
+ newbin - ${cmd} <<-EOF
+ #!/usr/bin/env ruby
+
+ load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
+ EOF
+ fi
+}
+
+pkg_postinst() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+}
+
+pkg_postrm() {
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+}
diff --git a/app-text/docbook-xsl-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml
index cef0d5fef5cf..0e1b0dec14df 100644
--- a/app-text/docbook-xsl-stylesheets/metadata.xml
+++ b/app-text/docbook-xsl-stylesheets/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
@@ -10,5 +10,6 @@
</use>
<upstream>
<remote-id type="sourceforge">docbook</remote-id>
+ <remote-id type="github">docbook/wiki</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index 6693cd2fa72d..da0eee08990b 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-AUTOTOOLS_AUTORECONF=1 #290284
-inherit autotools-utils
+inherit autotools
DESCRIPTION="Tools to convert docbook to man and info"
SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
HOMEPAGE="http://docbook2x.sourceforge.net/"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos"
IUSE="test"
+RESTRICT="!test? ( test )"
LICENSE="MIT"
# dev-perl/XML-LibXML - although not mentioned upstream is required
@@ -34,23 +34,28 @@ PATCHES=(
# bug #296112
"${FILESDIR}/${P}-drop-htmldir.patch"
)
+
src_prepare() {
+ default
+
sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed'
- autotools-utils_src_prepare
+ # bug #290284
+ eautoreconf
}
src_configure() {
local myeconfargs=(
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
--with-xslt-processor=libxslt
--program-transform-name='/^docbook2/s,$,.pl,'
)
- autotools-utils_src_configure
+
+ econf "${myeconfargs[@]}"
}
src_install() {
- autotools-utils_src_install
+ default
+
dosym docbook2man.pl /usr/bin/docbook2x-man
dosym docbook2texi.pl /usr/bin/docbook2x-texi
}
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
index a7e11b2dfd7e..a36308587e4c 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
@@ -1,8 +1,8 @@
Put HTML documentation in proper directory.
Patch by Chris Mayo, https://bugs.gentoo.org/show_bug.cgi?id=296112
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
@@ -182,8 +182,6 @@
# Install (automake)
#
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
index b8a493be2f36..a9d598874f9c 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
@@ -10,9 +10,8 @@
## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
@DPATCH@
-diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
---- trunk~/xslt/man/docbook.xsl 2006-04-11 21:00:19.000000000 +0200
-+++ trunk/xslt/man/docbook.xsl 2008-02-05 03:31:48.000000000 +0100
+--- a/xslt/man/docbook.xsl
++++ b/xslt/man/docbook.xsl
@@ -111,11 +111,15 @@
<xsl:when test="child::refentry">
<xsl:apply-templates />
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
index 26cdf8e1baea..7d181a1ccb01 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
@@ -13,9 +13,8 @@
## DP: refentrytitle and then replace any spaces left with underlines.
@DPATCH@
-diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl
---- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 +0200
-+++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0200
+--- a/xslt/man/manpage.xsl
++++ b/xslt/man/manpage.xsl
@@ -30,7 +30,7 @@
<xsl:template name="manpage-filename">
@@ -25,9 +24,8 @@ diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpa
</xsl:template>
-diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl
---- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 +0200
-+++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 +0200
+--- a/xslt/man/refentry.xsl
++++ b/xslt/man/refentry.xsl
@@ -38,7 +38,11 @@
<xsl:template name="refentry-filename">
<xsl:param name="title" />
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
index b6ddbfa2a0d3..6c85701d2e91 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
@@ -13,9 +13,8 @@
## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
@DPATCH@
-diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
---- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200
-+++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100
+--- a/perl/db2x_manxml.pl
++++ b/perl/db2x_manxml.pl
@@ -342,6 +342,25 @@
$self->{line_start} = 1;
}
@@ -67,9 +66,8 @@ diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
# Define escapes for switching to and from monospace fonts (groff only)
$self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
-diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl
---- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000 +0200
-+++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100
+--- a/xslt/backend/db2x_manxml.xsl
++++ b/xslt/backend/db2x_manxml.xsl
@@ -528,7 +528,7 @@
<exslt:document method="text"
encoding="{$encoding}"
diff --git a/app-text/docbook2X/metadata.xml b/app-text/docbook2X/metadata.xml
index f5186760fa4a..228501cf1f70 100644
--- a/app-text/docbook2X/metadata.xml
+++ b/app-text/docbook2X/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
deleted file mode 100644
index 832e9d90e37b..000000000000
--- a/app-text/doconce/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST doconce-1.3.tar.bz2 112034753 BLAKE2B 4ac826b09ca2dce93d8725868f6fa00a07b61835336a56b72f4d846cb81282cc6982ca25c7fc27d9e66aed5a22d3ef30badbc137748f7c6c3a2e078554b6715e SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d
-DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
diff --git a/app-text/doconce/doconce-1.3.ebuild b/app-text/doconce/doconce-1.3.ebuild
deleted file mode 100644
index b1f3108e9d7b..000000000000
--- a/app-text/doconce/doconce-1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
-HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/doconce/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND="dev-python/future"
-RDEPEND="${DEPEND}"
diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild
deleted file mode 100644
index 8752b80e9b24..000000000000
--- a/app-text/doconce/doconce-1.4.4.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
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
-HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
- default
- if use doc; then
- sed -e "s|http://hplgit.github.io/doconce/doc|file:///usr/share/doc/${PF}|g" -i doc/web/index.html
- docompress -x /usr/share/doc
- dodoc -r doc/web doc/pub
- fi
-}
diff --git a/app-text/doconce/metadata.xml b/app-text/doconce/metadata.xml
deleted file mode 100644
index b9c4307747b0..000000000000
--- a/app-text/doconce/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>grozin@gentoo.org</email>
- <name>Andrey Grozin</name>
- </maintainer>
- <longdescription lang="en">
- DocOnce is a modestly tagged (Markdown-like) markup language targeting scientific reports,
- software documentation, books, blog posts, and slides involving much math and code in the text.
- From DocOnce source you can generate LaTeX, Sphinx, HTML, IPython notebooks, Markdown,
- MediaWiki, and other formats.
- This means that you from a single source can get the most up-to-date publishing technologies
- for paper, tablets, and phones.
- </longdescription>
- <upstream>
- <remote-id type="pypi">Doconce</remote-id>
- <remote-id type="github">hplgit/doconce</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
index c6cf07af7605..131a2a796b4b 100644
--- a/app-text/docx2txt/Manifest
+++ b/app-text/docx2txt/Manifest
@@ -1,3 +1 @@
-DIST docx2txt-1.2.tgz 28483 BLAKE2B b6b8cdb1ef44821bcc828178037230b89324f404cb3199df4e3262541fed379f24bf3bfb4c707c378656387783f2be8724568e248615e0ee5e9e956c9f0a5a0a SHA512 ba5884c4d85e23aad26f74727b40e2d9d43cdf2e63f270486cbbfed5ef431f44f8f40a2583d3185fa3c16a97d9cd78e84feaf8f1f7be78ae9e1662e04a2013d6
-DIST docx2txt-1.3.tgz 29953 BLAKE2B 6bacf445aace71a0897f9e7541d3ca721b2be2b47bafb416a1627266ecd03e249752135673723c42b35341cc02083504ea6cc97e4b99263b67799243e7a9807d SHA512 9ad74558074cd3e72b0d2e6541dc56d7b74d59d6313fb0cde1b2f02a0e1cdb05d705a650c0dde02e5b3a683f8ee6ab2fb5b865301f4213cd3e8770cd9e4d0d97
DIST docx2txt-1.4.tgz 31302 BLAKE2B 3f57b95e40eb92f5b16f38fab7122cd75b23be0f1489bc83ea68f6feb16c14ad524119468da44ac5bc3989a1d61336c436a862b58bc3d83a565bd61b031c8f4f SHA512 5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3
diff --git a/app-text/docx2txt/docx2txt-1.2.ebuild b/app-text/docx2txt/docx2txt-1.2.ebuild
deleted file mode 100644
index e69c82daabf5..000000000000
--- a/app-text/docx2txt/docx2txt-1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Convert MS Office docx files to plain text"
-HOMEPAGE="http://docx2txt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/unzip
- dev-lang/perl"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
-}
-
-src_compile() { :; }
-
-src_install() {
- newbin docx2txt.pl docx2txt
- dodoc docx2txt.config README ChangeLog ToDo AUTHORS
-}
diff --git a/app-text/docx2txt/docx2txt-1.3.ebuild b/app-text/docx2txt/docx2txt-1.3.ebuild
deleted file mode 100644
index 322943c0bd9e..000000000000
--- a/app-text/docx2txt/docx2txt-1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Convert MS Office docx files to plain text"
-HOMEPAGE="http://docx2txt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-arch/unzip
- dev-lang/perl"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
-}
-
-src_compile() { :; }
-
-src_install() {
- newbin docx2txt.pl docx2txt
- dodoc docx2txt.config README ChangeLog ToDo AUTHORS
-}
diff --git a/app-text/docx2txt/docx2txt-1.4.ebuild b/app-text/docx2txt/docx2txt-1.4.ebuild
index 322943c0bd9e..5b437b5ef590 100644
--- a/app-text/docx2txt/docx2txt-1.4.ebuild
+++ b/app-text/docx2txt/docx2txt-1.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit eutils
+EAPI=7
DESCRIPTION="Convert MS Office docx files to plain text"
HOMEPAGE="http://docx2txt.sourceforge.net/"
@@ -11,14 +9,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
RDEPEND="app-arch/unzip
dev-lang/perl"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch )
src_compile() { :; }
diff --git a/app-text/docx2txt/metadata.xml b/app-text/docx2txt/metadata.xml
index 53a9f8521314..db310c1d76e0 100644
--- a/app-text/docx2txt/metadata.xml
+++ b/app-text/docx2txt/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">docx2txt</remote-id>
</upstream>
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 67741b66764a..c3777c9a88a1 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,2 +1,2 @@
-DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
-DIST dos2unix-7.4.0.tar.gz 710339 BLAKE2B 629c4a410f0cbb0b5b0fdb89c03fbec1965759a747309ad8a4459820bf2151d1861f4040d67ce6934ca27cfc3b6d0495eccd0966045803f065b10520808d9686 SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
+DIST dos2unix-7.5.0.tar.gz 957576 BLAKE2B 5a674d61c9f911a2cb9c20c363fdc0e0affd3b6f26531d37a231aedb5e6a7428116b139d4af12ee32f4107f78ea079fb7a8d008c9630375f4afbc2afa0afb39f SHA512 914cbc3255045b1b87ad702c70844b059f9435ccfe636dc67514f092090b86a9f271789fcde28a9ead4d94a869fb92e334aa115d3cfe24133338260ad2233763
+DIST dos2unix-7.5.1.tar.gz 959228 BLAKE2B 4f4a334a295b702d0540e58a0a86dcf091583d6c2b64f6de9bea883dfe0d70bfa05e8e5b9c8fb867bfd5e66b2eba562da1ca45c60f97bac67bdb275d66de0fe0 SHA512 733d163fff4effdf8acb382abec9bcd23f594fa17502e9dde2f24d3326aeb7653eee353bef812090ab8dc055136d236b40c2f778deea4ac026c2eed471e763b5
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
deleted file mode 100644
index d871ca54b250..000000000000
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
-
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
-SRC_URI="
- http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
- mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
- !app-text/hd2u
- virtual/libintl"
-
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
- test? ( virtual/perl-Test-Simple )
- dev-lang/perl"
-
-handle_locales() {
- # Make sure locale list is kept up-to-date.
- local detected sorted
- detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
- sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "PLOCALES: ${sorted}"
- eerror "po*/*.po: ${detected}"
- die "sync PLOCALES"
- fi
-
- # Deal with selective install of locales.
- rm_loc() { rm po*/$1.po || die; }
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_prepare() {
- default
-
- handle_locales
-
- sed \
- -e '/^LDFLAGS/s|=|+=|' \
- -e '/CFLAGS_OS \+=/d' \
- -e '/LDFLAGS_EXTRA \+=/d' \
- -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
- -i Makefile || die
-
- if use debug ; then
- sed -e "/^DEBUG/s:0:1:" \
- -e "/EXTRA_CFLAGS +=/s:-g::" \
- -i Makefile || die
- fi
-
- tc-export CC
-}
-
-lintl() {
- # same logic as from virtual/libintl
- use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
-}
-
-src_compile() {
- emake prefix="${EPREFIX}/usr" \
- $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
- $(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-7.4.0.ebuild b/app-text/dos2unix/dos2unix-7.4.0.ebuild
deleted file mode 100644
index 7e09f7d15bea..000000000000
--- a/app-text/dos2unix/dos2unix-7.4.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
-
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
-SRC_URI="
- http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
- mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
- !app-text/hd2u
- virtual/libintl"
-
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
- test? ( virtual/perl-Test-Simple )
- dev-lang/perl"
-
-handle_locales() {
- # Make sure locale list is kept up-to-date.
- local detected sorted
- detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
- sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "PLOCALES: ${sorted}"
- eerror "po*/*.po: ${detected}"
- die "sync PLOCALES"
- fi
-
- # Deal with selective install of locales.
- rm_loc() { rm po*/$1.po || die; }
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_prepare() {
- default
-
- handle_locales
-
- sed \
- -e '/^LDFLAGS/s|=|+=|' \
- -e '/CFLAGS_OS \+=/d' \
- -e '/LDFLAGS_EXTRA \+=/d' \
- -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
- -i Makefile || die
-
- if use debug ; then
- sed -e "/^DEBUG/s:0:1:" \
- -e "/EXTRA_CFLAGS +=/s:-g::" \
- -i Makefile || die
- fi
-
- tc-export CC
-}
-
-lintl() {
- # same logic as from virtual/libintl
- use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
-}
-
-src_compile() {
- emake prefix="${EPREFIX}/usr" \
- $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
- $(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-7.5.0.ebuild b/app-text/dos2unix/dos2unix-7.5.0.ebuild
new file mode 100644
index 000000000000..7473d53407e7
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.5.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca da de eo es fr fur hu ja ka ko nb nl pl pt_BR ro ru sr sv uk vi zh_CN zh_TW"
+
+inherit plocale toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+ https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+ mirror://sourceforge/${PN}/${P/_/-}.tar.gz
+"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="BSD-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug nls test"
+
+RDEPEND="
+ !app-text/hd2u
+ virtual/libintl"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( virtual/perl-Test-Simple )
+"
+BDEPEND="
+ dev-lang/perl
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror "po*/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ rm_loc() { rm po*/$1.po || die; }
+ plocale_for_each_disabled_locale rm_loc
+}
+
+src_prepare() {
+ default
+
+ handle_locales
+
+ sed \
+ -e '/^LDFLAGS/s|=|+=|' \
+ -e '/CFLAGS_OS \+=/d' \
+ -e '/LDFLAGS_EXTRA \+=/d' \
+ -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+ -i Makefile || die
+
+ if use debug ; then
+ sed -e "/^DEBUG/s:0:1:" \
+ -e "/EXTRA_CFLAGS +=/s:-g::" \
+ -i Makefile || die
+ fi
+
+ tc-export CC
+}
+
+lintl() {
+ # same logic as from virtual/libintl
+ use !elibc_glibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+ emake prefix="${EPREFIX}/usr" \
+ $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+ $(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/dos2unix/dos2unix-7.5.1.ebuild b/app-text/dos2unix/dos2unix-7.5.1.ebuild
new file mode 100644
index 000000000000..7473d53407e7
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.5.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca da de eo es fr fur hu ja ka ko nb nl pl pt_BR ro ru sr sv uk vi zh_CN zh_TW"
+
+inherit plocale toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+ https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+ mirror://sourceforge/${PN}/${P/_/-}.tar.gz
+"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="BSD-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug nls test"
+
+RDEPEND="
+ !app-text/hd2u
+ virtual/libintl"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( virtual/perl-Test-Simple )
+"
+BDEPEND="
+ dev-lang/perl
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror "po*/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ rm_loc() { rm po*/$1.po || die; }
+ plocale_for_each_disabled_locale rm_loc
+}
+
+src_prepare() {
+ default
+
+ handle_locales
+
+ sed \
+ -e '/^LDFLAGS/s|=|+=|' \
+ -e '/CFLAGS_OS \+=/d' \
+ -e '/LDFLAGS_EXTRA \+=/d' \
+ -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+ -i Makefile || die
+
+ if use debug ; then
+ sed -e "/^DEBUG/s:0:1:" \
+ -e "/EXTRA_CFLAGS +=/s:-g::" \
+ -i Makefile || die
+ fi
+
+ tc-export CC
+}
+
+lintl() {
+ # same logic as from virtual/libintl
+ use !elibc_glibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+ emake prefix="${EPREFIX}/usr" \
+ $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+ $(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/dos2unix/metadata.xml b/app-text/dos2unix/metadata.xml
index 963ee8fb3de7..ef6bd76d6bba 100644
--- a/app-text/dos2unix/metadata.xml
+++ b/app-text/dos2unix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
new file mode 100644
index 000000000000..0a55723b880d
--- /dev/null
+++ b/app-text/doxygen/Manifest
@@ -0,0 +1,2 @@
+DIST doxygen-1.10.0.src.tar.gz 8400410 BLAKE2B dc7882dfb8b023e9250592375105cc79d4744362d96f4518b931ac264259257d27e0f2c5456580f3676bb54cc29fbc2ab3b2ffc37da6441297091c60a38dc13b SHA512 885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416
+DIST doxygen-1.9.8.src.tar.gz 8087770 BLAKE2B 9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944 SHA512 edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb
diff --git a/app-text/doxygen/doxygen-1.10.0-r1.ebuild b/app-text/doxygen/doxygen-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..41e6877c588a
--- /dev/null
+++ b/app-text/doxygen/doxygen-1.10.0-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.doxygen.nl/"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+else
+ SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
+ SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+# GPL-2 also for bundled libmscgen
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch gui test"
+# - We need TeX for tests, bug #765472
+# - We keep the odd construct of noop USE=test because of
+# the special relationship b/t RESTRICT & USE for tests.
+# Also, it's a hint which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="test? ( doc )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-alternatives/yacc
+ app-alternatives/lex
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ app-text/ghostscript-gpl
+ dev-db/sqlite:3
+ dev-lang/perl
+ dev-libs/libfmt:=
+ dev-libs/spdlog:=
+ media-libs/libpng:=
+ virtual/libiconv
+ clang? (
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+ )
+ dot? (
+ media-gfx/graphviz
+ media-libs/freetype
+ )
+ doc? (
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-plaingeneric
+ )
+ doxysearch? ( dev-libs/xapian:= )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
+ "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
+ "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
+
+ # Backports
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+ # fix pdf doc
+ sed -i.orig -e "s:g_kowal:g kowal:" \
+ doc/maintainers.txt || die
+
+ if is-flagq "-O3" ; then
+ # TODO: Investigate this and report a bug accordingly...
+ ewarn "Compiling with -O3 is known to produce incorrectly"
+ ewarn "optimized code which breaks doxygen. Using -O2 instead."
+ replace-flags "-O3" "-O2"
+ fi
+}
+
+src_configure() {
+ # Very slow to compile, bug #920092
+ filter-flags -fipa-pta
+ # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+ filter-lto
+
+ local mycmakeargs=(
+ -Duse_libclang=$(usex clang)
+ # Let the user choose instead, see also bug #822615
+ -Duse_libc++=OFF
+ -Dbuild_doc=$(usex doc)
+ -Dbuild_search=$(usex doxysearch)
+ -Dbuild_wizard=$(usex gui)
+ -Duse_sys_spdlog=ON
+ -Duse_sys_sqlite3=ON
+ -DBUILD_SHARED_LIBS=OFF
+ -DGIT_EXECUTABLE="false"
+ )
+
+ use doc && mycmakeargs+=(
+ -DDOC_INSTALL_DIR="share/doc/${P}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ export VARTEXFONTS="${T}/fonts" # bug #564944
+
+ if ! use dot; then
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
+ {testing/Doxyfile,doc/Doxyfile} \
+ || die "disabling dot failed"
+ fi
+
+ # -j1 for bug #770070
+ cmake_src_compile docs -j1
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ # manpages are only automatically installed when docs are
+ # https://github.com/doxygen/doxygen/pull/10647
+ doman doc/doxygen.1
+ use gui && doman doc/doxywizard.1
+ use doxysearch && {
+ doman doc/doxyindexer.1
+ doman doc/doxysearch.1
+ }
+}
diff --git a/app-text/doxygen/doxygen-1.9.8.ebuild b/app-text/doxygen/doxygen-1.9.8.ebuild
new file mode 100644
index 000000000000..10a904280416
--- /dev/null
+++ b/app-text/doxygen/doxygen-1.9.8.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.doxygen.nl/"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+else
+ SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
+ SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+# GPL-2 also for bundled libmscgen
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch gui test"
+# - We need TeX for tests, bug #765472
+# - We keep the odd construct of noop USE=test because of
+# the special relationship b/t RESTRICT & USE for tests.
+# Also, it's a hint which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="test? ( doc )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-alternatives/yacc
+ app-alternatives/lex
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ app-text/ghostscript-gpl
+ dev-db/sqlite:3
+ dev-lang/perl
+ dev-libs/libfmt:=
+ dev-libs/spdlog:=
+ media-libs/libpng:=
+ virtual/libiconv
+ clang? (
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+ )
+ dot? (
+ media-gfx/graphviz
+ media-libs/freetype
+ )
+ doc? (
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-plaingeneric
+ )
+ doxysearch? ( dev-libs/xapian:= )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
+ "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
+ "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
+
+ # Backports
+ "${FILESDIR}/${P}-spdlog-link.patch"
+ "${FILESDIR}/${P}-unbundle-sqlite.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+ # fix pdf doc
+ sed -i.orig -e "s:g_kowal:g kowal:" \
+ doc/maintainers.txt || die
+
+ if is-flagq "-O3" ; then
+ # TODO: Investigate this and report a bug accordingly...
+ ewarn "Compiling with -O3 is known to produce incorrectly"
+ ewarn "optimized code which breaks doxygen. Using -O2 instead."
+ replace-flags "-O3" "-O2"
+ fi
+}
+
+src_configure() {
+ # Very slow to compile, bug #920092
+ filter-flags -fipa-pta
+ # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+ filter-lto
+
+ local mycmakeargs=(
+ -Duse_libclang=$(usex clang)
+ # Let the user choose instead, see also bug #822615
+ -Duse_libc++=OFF
+ -Dbuild_doc=$(usex doc)
+ -Dbuild_search=$(usex doxysearch)
+ -Dbuild_wizard=$(usex gui)
+ -Duse_sys_spdlog=ON
+ -Duse_sys_sqlite3=ON
+ -DBUILD_SHARED_LIBS=OFF
+ -DGIT_EXECUTABLE="false"
+ )
+
+ use doc && mycmakeargs+=(
+ -DDOC_INSTALL_DIR="share/doc/${P}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ export VARTEXFONTS="${T}/fonts" # bug #564944
+
+ if ! use dot; then
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
+ {testing/Doxyfile,doc/Doxyfile} \
+ || die "disabling dot failed"
+ fi
+
+ # -j1 for bug #770070
+ cmake_src_compile docs -j1
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ doman doc/*.1
+}
diff --git a/app-text/doxygen/doxygen-9999.ebuild b/app-text/doxygen/doxygen-9999.ebuild
new file mode 100644
index 000000000000..1da0762f0e7d
--- /dev/null
+++ b/app-text/doxygen/doxygen-9999.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=17
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.doxygen.nl/"
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+else
+ SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
+ SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+# GPL-2 also for bundled libmscgen
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch gui test"
+# - We need TeX for tests, bug #765472
+# - We keep the odd construct of noop USE=test because of
+# the special relationship b/t RESTRICT & USE for tests.
+# Also, it's a hint which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="test? ( doc )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-alternatives/yacc
+ app-alternatives/lex
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ app-text/ghostscript-gpl
+ dev-db/sqlite:3
+ dev-lang/perl
+ dev-libs/libfmt:=
+ dev-libs/spdlog:=
+ media-libs/libpng:=
+ virtual/libiconv
+ clang? (
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+ )
+ dot? (
+ media-gfx/graphviz
+ media-libs/freetype
+ )
+ doc? (
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-plaingeneric
+ )
+ doxysearch? ( dev-libs/xapian:= )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
+ "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
+ "${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
+
+ # Backports
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+ # fix pdf doc
+ sed -i.orig -e "s:g_kowal:g kowal:" \
+ doc/maintainers.txt || die
+
+ if is-flagq "-O3" ; then
+ # TODO: Investigate this and report a bug accordingly...
+ ewarn "Compiling with -O3 is known to produce incorrectly"
+ ewarn "optimized code which breaks doxygen. Using -O2 instead."
+ replace-flags "-O3" "-O2"
+ fi
+}
+
+src_configure() {
+ # Very slow to compile, bug #920092
+ filter-flags -fipa-pta
+ # -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+ filter-lto
+
+ local mycmakeargs=(
+ -Duse_libclang=$(usex clang)
+ # Let the user choose instead, see also bug #822615
+ -Duse_libc++=OFF
+ -Dbuild_doc=$(usex doc)
+ -Dbuild_search=$(usex doxysearch)
+ -Dbuild_wizard=$(usex gui)
+ -Duse_sys_spdlog=ON
+ -Duse_sys_sqlite3=ON
+ -DBUILD_SHARED_LIBS=OFF
+ -DGIT_EXECUTABLE="false"
+ )
+
+ use doc && mycmakeargs+=(
+ -DDOC_INSTALL_DIR="share/doc/${P}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc; then
+ export VARTEXFONTS="${T}/fonts" # bug #564944
+
+ if ! use dot; then
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
+ {testing/Doxyfile,doc/Doxyfile} \
+ || die "disabling dot failed"
+ fi
+
+ # -j1 for bug #770070
+ cmake_src_compile docs -j1
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ doman doc/*.1
+}
diff --git a/app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch b/app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch
new file mode 100644
index 000000000000..66093eb7deb9
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.9.4-link_with_pthread.patch
@@ -0,0 +1,24 @@
+diff --git a/addon/doxywizard/.CMakeLists.txt.swp b/addon/doxywizard/.CMakeLists.txt.swp
+deleted file mode 100644
+index fc379d2..0000000
+Binary files a/addon/doxywizard/.CMakeLists.txt.swp and /dev/null differ
+diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
+index bb0e0eb..b6135bd 100644
+--- a/addon/doxywizard/CMakeLists.txt
++++ b/addon/doxywizard/CMakeLists.txt
+@@ -132,12 +132,12 @@ apply_editbin(doxywizard windows)
+ endif()
+
+ if(Qt5Core_FOUND)
+- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version)
++ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread)
+ else()
+ if(Qt6Core_FOUND)
+- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version)
++ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version pthread)
+ else()
+- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version)
++ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread)
+ endif()
+ endif()
+
diff --git a/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch b/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
new file mode 100644
index 000000000000..2c71a0af9ae8
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/906920
+https://gitlab.exherbo.org/exherbo/arbor/-/commit/7b517ba0068adc471fe7b2ed8cfbb191a197ca17
+
+From 6d713aa98b36ee8219294515142c0225fbd09dfc Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 25 May 2023 10:52:29 +0200
+Subject: [PATCH] Apply upstream fix for spdlog
+
+Fixes the build with musl >= 1.2.4, see
+https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
+for details.
+--- a/deps/spdlog/include/spdlog/details/os-inl.h
++++ b/deps/spdlog/include/spdlog/details/os-inl.h
+@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
+ # else
+ int fd = ::fileno(f);
+ # endif
+-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+-# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
++# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+ struct stat64 st;
+ if (::fstat64(fd, &st) == 0)
+ {
+--
+2.41.0.rc2
diff --git a/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch b/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch
new file mode 100644
index 000000000000..e73385dec3b2
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.9.8-spdlog-link.patch
@@ -0,0 +1,51 @@
+https://github.com/doxygen/doxygen/issues/10265
+https://github.com/doxygen/doxygen/pull/10284
+
+From 70bb112352ae7f3130647dcc009d8de5d4134e6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
+ =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
+Date: Mon, 4 Sep 2023 18:49:27 +0100
+Subject: [PATCH 1/2] doxyapp: Fix linking to spdlog
+
+---
+ addon/doxyapp/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
+index 4f3c31feacd..6097a3cca69 100644
+--- a/addon/doxyapp/CMakeLists.txt
++++ b/addon/doxyapp/CMakeLists.txt
+@@ -46,7 +46,7 @@ mscgen
+ doxygen_version
+ doxycfg
+ vhdlparser
+-spdlog
++spdlog::spdlog
+ ${ICONV_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${SQLITE3_LIBRARIES}
+
+From 71f2ed171a6d14a67f1905802714add974c31789 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
+ =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
+Date: Mon, 4 Sep 2023 18:50:25 +0100
+Subject: [PATCH 2/2] doxyparse: Fix linking to spdlog
+
+---
+ addon/doxyparse/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
+index 24881e3ef12..0157afb45e2 100644
+--- a/addon/doxyparse/CMakeLists.txt
++++ b/addon/doxyparse/CMakeLists.txt
+@@ -35,7 +35,7 @@ mscgen
+ doxygen_version
+ doxycfg
+ vhdlparser
+-spdlog
++spdlog::spdlog
+ ${ICONV_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${SQLITE3_LIBRARIES}
+
diff --git a/app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch b/app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch
new file mode 100644
index 000000000000..1da9a2da6459
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.9.8-suppress-unused-option-libcxx.patch
@@ -0,0 +1,16 @@
+Always expose the use_libc++ option. It's only useful for Clang but cmake.class
+tries to find when we've used CMake options which are unused/unknown and this
+triggers it for GCC builds if we set -Duse_libc++=OFF.
+
+So, always expose the option so we can turn it off without a warning.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ option(build_xmlparser "Automatically update the XML parser modules when updatin
+ option(build_search "Build external search tools (doxysearch and doxyindexer)" OFF)
+ option(build_doc "Build user manual (HTML and PDF)" OFF)
+ option(build_doc_chm "Build user manual (CHM)" OFF)
+-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
++if (TRUE)
+ option(use_libc++ "Use libc++ as C++ standard library." ON)
+ endif()
+ option(use_libclang "Add support for libclang parsing." OFF)
diff --git a/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch b/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch
new file mode 100644
index 000000000000..04d1d69b7b86
--- /dev/null
+++ b/app-text/doxygen/files/doxygen-1.9.8-unbundle-sqlite.patch
@@ -0,0 +1,119 @@
+https://github.com/doxygen/doxygen/issues/10263
+https://github.com/doxygen/doxygen/commit/28609fecd41d885e54fa170e499a0e5b55def2c2
+
+From 28609fecd41d885e54fa170e499a0e5b55def2c2 Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <doxygen@gmail.com>
+Date: Mon, 28 Aug 2023 20:19:16 +0200
+Subject: [PATCH] issue #10263 please add a use_sys_sqlite3 config option
+
+---
+ CMakeLists.txt | 6 +++++-
+ cmake/FindSQLite3.cmake | 38 ++++++++++++++++++++++++++++++++++++++
+ deps/CMakeLists.txt | 4 +++-
+ src/CMakeLists.txt | 4 +++-
+ 4 files changed, 49 insertions(+), 3 deletions(-)
+ create mode 100644 cmake/FindSQLite3.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4957c34c24d..31e53cc8440 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,8 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ option(use_libc++ "Use libc++ as C++ standard library." ON)
+ endif()
+ option(use_libclang "Add support for libclang parsing." OFF)
+-option(use_sys_spdlog "Use system spdlog instead of bundled." OFF)
++option(use_sys_spdlog "Use system spdlog library instead of the one bundled." OFF)
++option(use_sys_sqlite3 "Use system sqlite3 library instead of the one bundled." OFF)
+ option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF)
+ option(win_static "Link with /MT in stead of /MD on windows" OFF)
+ option(enable_console "Enable that executables on Windows get the CONSOLE bit set for the doxywizard executable [development]" OFF)
+@@ -67,6 +68,9 @@ endif()
+ if (use_sys_spdlog)
+ find_package(spdlog CONFIG REQUIRED)
+ endif()
++if (use_sys_sqlite3)
++ find_package(SQLite3 REQUIRED)
++endif()
+ if (build_wizard)
+ if (force_qt STREQUAL "Qt6")
+ if (CMAKE_SYSTEM MATCHES "Darwin")
+diff --git a/cmake/FindSQLite3.cmake b/cmake/FindSQLite3.cmake
+new file mode 100644
+index 00000000000..7c21de223a7
+--- /dev/null
++++ b/cmake/FindSQLite3.cmake
+@@ -0,0 +1,38 @@
++# Copyright (C) 2007-2009 LuaDist.
++# Created by Peter Kapec <kapecp@gmail.com>
++# Redistribution and use of this file is allowed according to the terms of the MIT license.
++# For details see the COPYRIGHT file distributed with LuaDist.
++# Note:
++# Searching headers and libraries is very simple and is NOT as powerful as scripts
++# distributed with CMake, because LuaDist defines directories to search for.
++# Everyone is encouraged to contact the author with improvements. Maybe this file
++# becomes part of CMake distribution sometimes.
++
++# - Find sqlite3
++# Find the native SQLite3 headers and libraries.
++#
++# SQLite3_INCLUDE_DIRS - where to find sqlite3.h, etc.
++# SQLite3_LIBRARIES - List of libraries when using sqlite.
++# SQLite3_FOUND - True if sqlite found.
++
++# Look for the header file.
++FIND_PATH(SQLite3_INCLUDE_DIR NAMES sqlite3.h)
++
++# Look for the library.
++FIND_LIBRARY(SQLite3_LIBRARY NAMES sqlite3)
++
++# Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE.
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLite3 DEFAULT_MSG SQLite3_LIBRARY SQLite3_INCLUDE_DIR)
++
++# Copy the results to the output variables.
++IF(SQLite3_FOUND)
++ SET(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
++ SET(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
++ELSE(SQLite3_FOUND)
++ SET(SQLite3_LIBRARIES)
++ SET(SQLite3_INCLUDE_DIRS)
++ENDIF(SQLite3_FOUND)
++
++MARK_AS_ADVANCED(SQLite3_INCLUDE_DIRS SQLite3_LIBRARIES)
++
+diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
+index a689b4a7018..eb716417f22 100644
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -4,4 +4,6 @@ add_subdirectory(libmscgen)
+ if (NOT use_sys_spdlog)
+ add_subdirectory(spdlog)
+ endif()
+-add_subdirectory(sqlite3)
++if (NOT use_sys_sqlite3)
++ add_subdirectory(sqlite3)
++endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 78a55c3f2bf..02c52240e5b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -6,7 +6,6 @@ include_directories(
+ ${PROJECT_SOURCE_DIR}/deps/libmd5
+ ${PROJECT_SOURCE_DIR}/deps/liblodepng
+ ${PROJECT_SOURCE_DIR}/deps/libmscgen
+- ${PROJECT_SOURCE_DIR}/deps/sqlite3
+ ${PROJECT_SOURCE_DIR}/libversion
+ ${PROJECT_SOURCE_DIR}/libxml
+ ${PROJECT_SOURCE_DIR}/vhdlparser
+@@ -18,6 +17,9 @@ include_directories(
+ if (NOT use_sys_spdlog)
+ include_directories(${PROJECT_SOURCE_DIR}/deps/spdlog/include)
+ endif()
++if (NOT use_sys_sqlite)
++ include_directories(${PROJECT_SOURCE_DIR}/deps/sqlite3)
++endif()
+
+
+ file(MAKE_DIRECTORY ${GENERATED_SRC})
+
diff --git a/app-text/doxygen/metadata.xml b/app-text/doxygen/metadata.xml
new file mode 100644
index 000000000000..1a7e4e52585a
--- /dev/null
+++ b/app-text/doxygen/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tamiko@gentoo.org</email>
+ <name>Matthias Maier</name>
+ </maintainer>
+ <longdescription>
+ Doxygen is a tool for analyzing, documenting, and reverse-engineering
+ source code of various languages using a variety of output formats
+ (try it and see). Doxygen supports C++, C, Java, Objective-C, Python,
+ IDL (Corba and Microsoft flavors) and to some extent PHP, C#, and D,
+ as well as other languages (using additional helper tools).
+ </longdescription>
+ <upstream>
+ <remote-id type="github">doxygen/doxygen</remote-id>
+ <remote-id type="sourceforge">doxygen</remote-id>
+ </upstream>
+ <use>
+ <flag name="clang">support for <pkg>sys-devel/clang</pkg> assisted parsing</flag>
+ <flag name="dot">allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag>
+ <flag name="doxysearch">build doxyindexer and doxysearch.cgi</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-text/duali/Manifest b/app-text/duali/Manifest
deleted file mode 100644
index a8ef1f0e5e8c..000000000000
--- a/app-text/duali/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST duali-0.2.0.tar.bz2 13334 BLAKE2B 28366eedef3c37d40b88c1458cbc420be6dd44b252bd7b176939f1d794ef29659109d19bb7328388b6ef3e16ba8dc0c500fd962525b3e05c44900092687f5cd2 SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30
diff --git a/app-text/duali/duali-0.2.0-r1.ebuild b/app-text/duali/duali-0.2.0-r1.ebuild
deleted file mode 100644
index 4eb15157f591..000000000000
--- a/app-text/duali/duali-0.2.0-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-# Duali uses "anydbm" which should even support a slow fallback;
-# however, due to implementation details it fails when the databases
-# aren't gdbm.
-PYTHON_REQ_USE="gdbm"
-
-inherit python-single-r1
-
-DESCRIPTION="Arabic dictionary based on the DICT protocol"
-HOMEPAGE="https://www.arabeyes.org/Duali"
-SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-PDEPEND=">=app-dicts/duali-data-0.1b-r1"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
- python_fix_shebang duali dict2db trans2arabic arabic2trans
- python_doexe duali dict2db trans2arabic arabic2trans
-
- insinto /etc
- doins duali.conf
-
- doman doc/man/*.1
- dodoc README ChangeLog
-
- python_domodule pyduali
-}
diff --git a/app-text/duali/metadata.xml b/app-text/duali/metadata.xml
deleted file mode 100644
index c8c6479d60fe..000000000000
--- a/app-text/duali/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-text/dvipng/Manifest b/app-text/dvipng/Manifest
index dc6f8547d2f8..ee6fafc64bf9 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1 +1 @@
-DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
+DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
deleted file mode 100644
index a7c56c1005f1..000000000000
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Translate DVI files into PNG or GIF graphics"
-HOMEPAGE="http://dvipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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="truetype test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/kpathsea-6.2.1:=
- media-libs/gd:2=[jpeg,png]
- media-libs/libpng:0=
- virtual/latex-base
- sys-libs/zlib
- truetype? ( >=media-libs/freetype-2.1.5 )"
-DEPEND="${RDEPEND}
- virtual/texi2dvi
- virtual/pkgconfig
- test? ( dev-texlive/texlive-fontsrecommended )"
-
-DOCS="ChangeLog README RELEASE"
-
-src_prepare() {
- eapply "${FILESDIR}"/${P}-freetype-config.patch
- eapply_user
-
- # save local macros, since we regenerate aclocal.m4 below
- mv aclocal.m4 acinclude.m4 || die
- eautoreconf
-}
-
-src_configure() {
- append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- if ! use truetype; then
- sed -i -e 's/\(--exists.*\)freetype2/\1dIsAbLe/' configure \
- || die "sed failed"
- fi
-
- export VARTEXFONTS="${T}/fonts"
- econf
-}
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
new file mode 100644
index 000000000000..1578564cc1ee
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Translate DVI files into PNG or GIF graphics"
+HOMEPAGE="https://dvipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="truetype test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/kpathsea-6.2.1:=
+ media-libs/gd:2=[jpeg,png]
+ media-libs/libpng:0=
+ virtual/latex-base
+ sys-libs/zlib
+ truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+ virtual/texi2dvi
+ virtual/pkgconfig
+ test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+S="${WORKDIR}"
+
+src_configure() {
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+ if ! use truetype; then
+ sed -i -e 's/\(--exists.*\)freetype2/\1dIsAbLe/' configure \
+ || die "sed failed"
+ fi
+
+ export VARTEXFONTS="${T}/fonts"
+ econf
+}
diff --git a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
deleted file mode 100644
index 20b7ebaf465c..000000000000
--- a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dvipng-1.15-orig/configure.ac
-+++ dvipng-1.15/configure.ac
-@@ -78,7 +78,8 @@
- AC_CHECK_HEADERS([libgen.h])
- PSFONTS_O=""
- AC_SUBST(PSFONTS_O)
--AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
-+PKG_CHECK_MODULES([FT2], [freetype2 >= 6.1.0],
-+ [CFLAGS="$FT2_CFLAGS $CFLAGS"
- LIBS="$FT2_LIBS $LIBS"
- PSFONTS_O="sfd.o ft.o enc.o fontmap.o tfm.o"
- AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
index 08df7bc3b39c..9412c9dcc959 100644
--- a/app-text/dvipng/metadata.xml
+++ b/app-text/dvipng/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 3befd7f60a30..4ddd62ed0ca2 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,12 +1,6 @@
-DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-DIST texlive-module-dvips-2015.tar.xz 159316 BLAKE2B 1a47ae6e5f8ccbcbe98d318d3206eba62b421b0f1d8271c10a85a1e7a1f2d7a7ee3d8fc10c07f5d28a0a9b3da34c921cdebf4cd0818e189909ac95ff0e3d00a4 SHA512 1dc167b54b4e8e5d45867247347e62a6d3613fcb20db6ae145e259e591ad96693f29f2b5ef0eecc2cb625f418c54c082646e3c36a61fdb25ea9d6715f87e6ef4
-DIST texlive-module-dvips-2016.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
-DIST texlive-module-dvips-2017.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
-DIST texlive-module-dvips-2019.tar.xz 34492 BLAKE2B fcc7ae96fd1fc87a4e4164e61c611587ddebf628c156d798df819fc9e2fda2c23e70bf2e7eddd779275fbf9b223ed0e7092d5e0c82144d8dedc70c8a7b7a1136 SHA512 ee10b8c1b67997d1c781fe2c3e5ce7826c111a2b6f4078330b566bf5525ad2a1cb2b89c4efa8d877ae1557fb319941ed09db30b229a62b6d3ff6f6a784e48df5
-DIST texlive-module-dvips.doc-2015.tar.xz 481208 BLAKE2B 973d64db8edf7dd4720d13ef81033d59bab3d771a23c533c1a95770837028cc506b5c05cfcff68b0d15912f1a8245ddb4edc244606ed556ae65a3a706fd5566a SHA512 bbe2ff14b1f2f3cc3b5b2d7866cef64f33b7a8e1a5a71a9e6efd210748ab8fa5b6be94d0efe46d3b757b1c7db7713d9dfe56164c63488142eb790990a1d99f2c
-DIST texlive-module-dvips.doc-2016.tar.xz 513008 BLAKE2B b7a7675d213298aeafe9fabef465011c8c6412c265880fb2042f8652ae0d00299f587d3da65f031a4128cee1cacf2ee911c3975ac165c1c7127900aa695b623f SHA512 ada60c607ca2034663277a15b11c37c2d1b0350193e26934ee3a96adaf15ccd4ae76a35113c44d30d471732062dfe971a4a024f64e7e028518bd7bbc05b914de
-DIST texlive-module-dvips.doc-2017.tar.xz 481464 BLAKE2B 43a82ac2a058cfd10e8cc60459e42d312159fc62ac7d5aeb69ff6aff2494391894dbc0890e4b6781de9e4d6b26eb0b910980704323e353d436fb1ffba1fdfdb6 SHA512 87c2577ee4c0a82430b165fd7864ec266d00b9a621b8964f39f2adecc427dedf63d7354c0849bc1bc9c0f220b35f47b499de5255500208881abb5ea5e2012f18
-DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350d9b5d029dfb6dacfba7a0d0f95195e681bf55e86c18f666d9a0a72ea3a5ca6cf4ad85e91e3faf2febaac3878b3e6b2d8138097d54 SHA512 fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00
+DIST dvips.doc.r66203.tar.xz 531004 BLAKE2B 9b94b423a8d75a2a5f48e8db43fe06df77fd4e34c0bc29e781829f99330d5f423ab651ba551c4e5d27ec939cf9a310185d66b1cdee8baf9291c850898b91cb75 SHA512 ac2518c20c26dcda42df79be79ed24e2c021af2084ede43f51a5589b1023c9c94a307bd0a4742880e2c89d7620b2889f3a675e30a449d699d15db98922b0da71
+DIST dvips.r66203.tar.xz 58076 BLAKE2B 3ed83d92e42cb830edd9220b6db6600b00198a67e158d55ef454499be02e65b4a4996cd2d14f96adfd57696239cec9f6656b101afaa15c80aa65e27c5fa733ff SHA512 fbaf1dd979ceed4f7146d8aebc31ba7d770a8389b4ac214086db5951c485a2a3e3a62b2772394c8053444dfb8de0d22b3501c2ee3ee1e4e7493a1df5a34cc275
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
+DIST tl-dvips-2021.tar.xz 58076 BLAKE2B 23105928a22ecb0fb9d9b3b9bc8e5edb2eb42c7cbcb48e80d9e72ea613a30a82c2d825eb4caae00bd04241260257e6feb400767fa3a12c55522799272dff2996 SHA512 1eec2ddbbc5d211f1d38237289a2bcfe716fe41210d47f6f9111a009dc179ca3dcaefde11e49d28d4cdd26b992dfed7fca3bff3178a6ca273f396afc45118013
+DIST tl-dvips.doc-2021.tar.xz 521496 BLAKE2B 7c366af47a1ea967e871e5740d8debb1751b67b9e41a35aada0327c1aa26c04a90baf1898c1c50965ab766006028f5fb13264f5d7cda87fc630dd99300995b5a SHA512 07b00a4bfe557a04a93b22667f4854e2d55f76f33d2fa767d445b3301835aafafd4b8046b7126d5f516b65a743b1d0fe32a8fa3d0dc9b7b29e47bcfdfc790138
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325-r2.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325-r2.ebuild
new file mode 100644
index 000000000000..5d0cf5d7abfa
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common
+
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="https://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+TL_VERSION=2021
+EXTRA_TL_MODULES="dvips"
+EXTRA_TL_DOC_MODULES="dvips.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+ econf --with-system-kpathsea
+}
+
+src_install() {
+ emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+ dodir /usr/share # just in case
+ cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+ if use source ; then
+ cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+ fi
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+ etexmf-update
+}
+
+pkg_postrm() {
+ etexmf-update
+}
diff --git a/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild b/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild
new file mode 100644
index 000000000000..89f7a18670cb
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-2023.03.11_p66203.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit texlive-common
+
+TL_VERSION="$(ver_cut 1)$(ver_cut 2)$(ver_cut 3)"
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="https://tug.org/texlive/"
+SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${TL_VERSION}-source.tar.xz"
+
+DVIPS_REVISION=$(ver_cut 5)
+EXTRA_TL_MODULES="dvips.r${DVIPS_REVISION}"
+EXTRA_TL_DOC_MODULES="dvips.doc.r${DVIPS_REVISION}"
+
+texlive-common_append_to_src_uri EXTRA_TL_MODULES
+
+SRC_URI+=" doc? ( "
+texlive-common_append_to_src_uri EXTRA_TL_DOC_MODULES
+SRC_URI+=" ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/texlive-${TL_VERSION}-source/texk/${PN}"
+
+src_configure() {
+ econf --with-system-kpathsea
+}
+
+src_install() {
+ emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+ dodir /usr/share # just in case
+ cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+ if use source ; then
+ cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+ fi
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+ etexmf-update
+}
+
+pkg_postrm() {
+ etexmf-update
+}
diff --git a/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild b/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
deleted file mode 100644
index 881a00844932..000000000000
--- a/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-
-inherit texlive-common eutils
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_VERSION=2015
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
- !<app-text/texlive-core-2010
- !<dev-texlive/texlive-basic-2009
- !app-text/ptex
- ${DEPEND}"
-DEPEND="${DEPEND} virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-#src_prepare() {
-# cd "${WORKDIR}/texlive-${PV#*_p}-source/"
-# EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-#}
-
-src_configure() {
- econf --with-system-kpathsea
-}
-
-src_install() {
- emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
- dodir /usr/share # just in case
- cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
- if use source ; then
- cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
- fi
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
- etexmf-update
-}
-
-pkg_postrm() {
- etexmf-update
-}
diff --git a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
deleted file mode 100644
index ca8383296e89..000000000000
--- a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-
-inherit texlive-common eutils
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_VERSION=2016
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
- !<app-text/texlive-core-2010
- !<dev-texlive/texlive-basic-2009
- !app-text/ptex
- ${DEPEND}"
-DEPEND="${DEPEND} virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-#src_prepare() {
-# cd "${WORKDIR}/texlive-${PV#*_p}-source/"
-# EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-#}
-
-src_configure() {
- econf --with-system-kpathsea
-}
-
-src_install() {
- emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
- dodir /usr/share # just in case
- cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
- if use source ; then
- cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
- fi
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
- etexmf-update
-}
-
-pkg_postrm() {
- etexmf-update
-}
diff --git a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild b/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
deleted file mode 100644
index 0e897197cd42..000000000000
--- a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-
-inherit texlive-common eutils
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_VERSION=2017
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
- !<app-text/texlive-core-2010
- !<dev-texlive/texlive-basic-2009
- !app-text/ptex
- ${DEPEND}"
-DEPEND="${DEPEND} virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-#src_prepare() {
-# cd "${WORKDIR}/texlive-${PV#*_p}-source/"
-# EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-#}
-
-src_configure() {
- econf --with-system-kpathsea
-}
-
-src_install() {
- emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
- dodir /usr/share # just in case
- cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
- if use source ; then
- cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
- fi
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
- etexmf-update
-}
-
-pkg_postrm() {
- etexmf-update
-}
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
deleted file mode 100644
index 0caf307b1c72..000000000000
--- a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit texlive-common
-
-DESCRIPTION="DVI-to-PostScript translator"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-TL_VERSION=2019
-EXTRA_TL_MODULES="dvips"
-EXTRA_TL_DOC_MODULES="dvips.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
- econf --with-system-kpathsea
-}
-
-src_install() {
- emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
-
- dodir /usr/share # just in case
- cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
- if use source ; then
- cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
- fi
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
- etexmf-update
-}
-
-pkg_postrm() {
- etexmf-update
-}
diff --git a/app-text/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml
index c4b55593420b..34452b8a1eb9 100644
--- a/app-text/dvipsk/metadata.xml
+++ b/app-text/dvipsk/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 278b3445262c..9c4090ec0f05 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,3 +1,5 @@
-DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
-DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
-DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
+DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6
+DIST dvisvgm-3.0.4.tar.gz 2970986 BLAKE2B 2a8cff58cc728c833c74a44af1139529eab433ec5cd8b82949dbad169a609e66069f38f18c046250da5c085756c1ef6d95247c133df1afefc92b1783d9dd5ecd SHA512 89105ecc14b974f0fc0a1684a3ce4c66444bc819d56dd43c517d6b547f618ab60a15abb18609c38ac120ac5990fcd0fa6599cb7b0af11c4f820b1f955943688e
+DIST dvisvgm-3.1.2.tar.gz 2940106 BLAKE2B 05672e2f6b2248e0a28548dae52aa6f6d5f3c599417a9adf7a46d1f8abfeafe4840b01dcbda4068cd3d522c0c1fe2e2f87fedce7678eb4a5630d6b482025afae SHA512 2d98c9830c0280975c52d3adfa146a4681c2f4e955fe33efc55e25f7e6f2133ad21063bfdbafabca37bf0315efec4eff0bb32dcfe13755a70c1d41898449ab19
+DIST dvisvgm-3.1.tar.gz 2908747 BLAKE2B f7544d291fbabf1bb126c97077b15296369815ae0ae8baa2b23d5831d8a6788673af13e0d44c12028be1cef319f83117b0842693810fcc3e5c14263999b41d9e SHA512 8e019eb54f0ad4a5f0e6241e2a5223582da723c7692598278668c1220d7769f161895eb292be0a95771ea7b3e65e8fb83052b7b1f6a6432276fd013e00fd7e51
+DIST dvisvgm-3.2.tar.gz 2940355 BLAKE2B 51a00b948a7ecaa68cee78d484813622c449eb2876a326051f93bb62304bfd174c443cf2eb192bb7c46e28065fe53001ada283002d30949bf39a69270c387dd4 SHA512 718ce9cd1cc8c826859df74eccd8e05dfb1c42f0defb57cdc99910957d009044e0e8a1854ff7fcde739cb832b2559976d3025dbf4cfda9e4cdea85398558d730
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
deleted file mode 100644
index 3e4152d3cf92..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
- app-text/ghostscript-gpl
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- default
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
new file mode 100644
index 000000000000..be882c95b84c
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+
+# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND="
+ >=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
+ dev-libs/kpathsea:=
+ dev-libs/openssl:=
+ >=dev-libs/xxhash-0.8.1
+ >=media-gfx/potrace-1.10-r1
+ media-libs/freetype:2
+ >=media-libs/woff2-1.0.2
+ sys-libs/zlib
+ virtual/tex-base
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ghostscript.patch
+ "${FILESDIR}"/${P}-Add-missing-cstdint-includes-for-GCC-13.patch
+ "${FILESDIR}"/${PN}-2.14-configure-clang16.patch
+ "${FILESDIR}"/${PN}-2.14-configure-autoreconf.patch
+)
+
+src_prepare() {
+ # Drop once configure patch merged for clang 16
+ local macro
+ for macro in ax_check_compile_flag.m4 ax_code_coverage.m4 ax_cxx_compile_stdcxx.m4 ; do
+ cp "${BROOT}"/usr/share/aclocal/${macro} m4/ || die
+ done
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myargs=(
+ --without-ttfautohint
+ )
+
+ econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
deleted file mode 100644
index 59fb93309c6f..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
- >=app-arch/brotli-1.0.5
- app-text/ghostscript-gpl
- dev-libs/kpathsea:=
- >=dev-libs/xxhash-0.6.5
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- >=media-libs/woff2-1.0.2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-src_configure() {
- local myargs=(
- --without-ttfautohint
- )
- econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
deleted file mode 100644
index ace7733c8139..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
- >=app-arch/brotli-1.0.5
- app-text/ghostscript-gpl
- dev-libs/kpathsea:=
- >=dev-libs/xxhash-0.6.5
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- >=media-libs/woff2-1.0.2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-src_configure() {
- local myargs=(
- --without-ttfautohint
- )
- econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
new file mode 100644
index 000000000000..d583b7ecb4d2
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+# dvisvgm: GPL-3
+# Boost (tiny part, one header): Boost-1.0
+# md5: || ( public-domain BSD-1 )
+# clipper: Boost-1.0
+# variant: Boost-1.0
+LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
+ dev-libs/kpathsea:=
+ >=dev-libs/xxhash-0.8.1
+ >=media-gfx/potrace-1.10-r1
+ media-libs/freetype:2
+ >=media-libs/woff2-1.0.2
+ sys-libs/zlib
+ virtual/tex-base
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc13.patch
+)
+
+src_configure() {
+ local myargs=(
+ --disable-bundled-libs
+ --without-ttfautohint
+ )
+
+ econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-3.1.2.ebuild b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild
new file mode 100644
index 000000000000..66f6668dae75
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-3.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+# dvisvgm: GPL-3
+# Boost (tiny part, one header): Boost-1.0
+# md5: || ( public-domain BSD-1 )
+# clipper: Boost-1.0
+# variant: Boost-1.0
+LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
+ dev-libs/kpathsea:=
+ >=dev-libs/xxhash-0.8.1
+ >=media-gfx/potrace-1.10-r1
+ media-libs/freetype:2
+ >=media-libs/woff2-1.0.2
+ sys-libs/zlib
+ virtual/tex-base
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local myargs=(
+ --disable-bundled-libs
+ --without-ttfautohint
+ )
+
+ econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-3.1.ebuild b/app-text/dvisvgm/dvisvgm-3.1.ebuild
new file mode 100644
index 000000000000..c94c72cd11ca
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+# dvisvgm: GPL-3
+# Boost (tiny part, one header): Boost-1.0
+# md5: || ( public-domain BSD-1 )
+# clipper: Boost-1.0
+# variant: Boost-1.0
+LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
+ dev-libs/kpathsea:=
+ >=dev-libs/xxhash-0.8.1
+ >=media-gfx/potrace-1.10-r1
+ media-libs/freetype:2
+ >=media-libs/woff2-1.0.2
+ sys-libs/zlib
+ virtual/tex-base
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local myargs=(
+ --disable-bundled-libs
+ --without-ttfautohint
+ )
+
+ econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-3.2.ebuild b/app-text/dvisvgm/dvisvgm-3.2.ebuild
new file mode 100644
index 000000000000..426a55d79622
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+# dvisvgm: GPL-3
+# Boost (tiny part, one header): Boost-1.0
+# md5: || ( public-domain BSD-1 )
+# clipper: Boost-1.0
+# variant: Boost-1.0
+LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
+ dev-libs/kpathsea:=
+ >=dev-libs/xxhash-0.8.1
+ >=media-gfx/potrace-1.10-r1
+ media-libs/freetype:2
+ >=media-libs/woff2-1.0.2
+ sys-libs/zlib
+ virtual/tex-base
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local myargs=(
+ --disable-bundled-libs
+ --without-ttfautohint
+ )
+
+ econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch b/app-text/dvisvgm/files/dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch
new file mode 100644
index 000000000000..cad403e34fc1
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch
@@ -0,0 +1,118 @@
+https://github.com/mgieseki/dvisvgm/pull/196
+
+From fe5fe3996056cd385e59692b8f60916aedb7d7b9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 19:43:23 +0100
+Subject: [PATCH] Add missing <cstdint> includes for GCC 13
+
+--- a/src/BasicDVIReader.cpp
++++ b/src/BasicDVIReader.cpp
+@@ -19,6 +19,7 @@
+ *************************************************************************/
+
+ #include <algorithm>
++#include <cstdint>
+ #include "BasicDVIReader.hpp"
+
+ using namespace std;
+--- a/src/BasicDVIReader.hpp
++++ b/src/BasicDVIReader.hpp
+@@ -21,6 +21,8 @@
+ #ifndef BASICDVIREADER_HPP
+ #define BASICDVIREADER_HPP
+
++#include <cstdint>
++
+ #include "Matrix.hpp"
+ #include "MessageException.hpp"
+ #include "StreamReader.hpp"
+--- a/src/Bitmap.hpp
++++ b/src/Bitmap.hpp
+@@ -21,6 +21,7 @@
+ #ifndef BITMAP_HPP
+ #define BITMAP_HPP
+
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+
+--- a/src/CMap.hpp
++++ b/src/CMap.hpp
+@@ -22,6 +22,7 @@
+ #define CMAP_HPP
+
+ #include <algorithm>
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+ #include "FontEncoding.hpp"
+--- a/src/Color.hpp
++++ b/src/Color.hpp
+@@ -21,6 +21,7 @@
+ #ifndef COLOR_HPP
+ #define COLOR_HPP
+
++#include <cstdint>
+ #include <string>
+ #include <valarray>
+ #include <vector>
+--- a/src/DVIReader.hpp
++++ b/src/DVIReader.hpp
+@@ -21,6 +21,7 @@
+ #ifndef DVIREADER_HPP
+ #define DVIREADER_HPP
+
++#include <cstdint>
+ #include <limits>
+ #include <map>
+ #include <stack>
+--- a/src/FileSystem.hpp
++++ b/src/FileSystem.hpp
+@@ -21,6 +21,7 @@
+ #ifndef FILESYSTEM_HPP
+ #define FILESYSTEM_HPP
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/InputBuffer.hpp
++++ b/src/InputBuffer.hpp
+@@ -22,6 +22,7 @@
+ #define INPUTBUFFER_HPP
+
+ #include <algorithm>
++#include <cstdint>
+ #include <cstring>
+ #include <istream>
+ #include <string>
+--- a/src/RangeMap.hpp
++++ b/src/RangeMap.hpp
+@@ -22,6 +22,7 @@
+ #define RANGEMAP_HPP
+
+ #include <algorithm>
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+
+--- a/src/Unicode.cpp
++++ b/src/Unicode.cpp
+@@ -21,6 +21,7 @@
+ #include <algorithm>
+ #include <cctype>
+ #include <cstddef>
++#include <cstdint>
+ #include <iomanip>
+ #include <sstream>
+ #include <xxhash.h>
+--- a/src/Unicode.hpp
++++ b/src/Unicode.hpp
+@@ -21,6 +21,7 @@
+ #ifndef UNICODE_HPP
+ #define UNICODE_HPP
+
++#include <cstdint>
+ #include <string>
+
+ struct Unicode {
diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch
new file mode 100644
index 000000000000..6641d3e2cae5
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch
@@ -0,0 +1,383 @@
+https://github.com/mgieseki/dvisvgm/pull/202
+
+From 2dc8627a0864ea1543027e577ad96676a56bf4c5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 20:04:43 +0000
+Subject: [PATCH 1/4] Cleanup obsolete m4 dist hack
+
+autoconf & automake, at least nowadays, handle including m4/
+correctly in dist tarballs (from `make dist`).
+
+Previously, dist tarballs lacked m4/ax_*.m4 and therefore `autoreconf -fi`
+would break the Makefile with:
+```
+make[3]: Entering directory '/var/tmp/portage/app-text/dvisvgm-2.14-r1/work/dvisvgm-2.14/libs/clipper'
+Makefile:664: *** missing separator. Stop.
+```
+
+On that line is an unexpanded @CODE_COVERAGE_RULES@.
+
+Bug: https://bugs.gentoo.org/879539
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@
+
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = COPYING
+-SUBDIRS = libs m4 src tests doc
++SUBDIRS = libs src tests doc
+ ACLOCAL_AMFLAGS = -I m4
+
+ if USE_BUNDLED_LIBS
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,7 +228,6 @@ AC_CONFIG_FILES([
+ libs/variant/Makefile
+ libs/woff2/Makefile
+ libs/xxHash/Makefile
+- m4/Makefile
+ src/Makefile
+ src/version.hpp
+ src/optimizer/Makefile
+--- a/m4/Makefile.am
++++ /dev/null
+@@ -1,4 +0,0 @@
+-M4_EXTRA_DIST = \
+- ax_check_compile_flag.m4 \
+- ax_code_coverage.m4 \
+- ax_cxx_compile_stdcxx.m4
+
+From 2b03bccde2dd8a1b101f793159663446dd522ac9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 20:27:35 +0000
+Subject: [PATCH 2/4] Update to newer autoconf-archive (AX_*) macros
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,8 @@
+ ##
+ ## Process this file with automake.
+
++include $(top_srcdir)/aminclude_static.am
++
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = COPYING
+ SUBDIRS = libs src tests doc
+--- a/configure.ac
++++ b/configure.ac
+@@ -205,6 +205,7 @@ AS_IF([test "x$enable_manpage" != "xyes"],
+ AM_CONDITIONAL([BUILD_MANPAGE], [test "x$enable_manpage" = "xyes"])
+
+ AX_CODE_COVERAGE
++
+ AS_IF([ test "$enable_code_coverage" = "yes" ], [
+ # disable optimization
+ changequote({,})
+--- a/libs/brotli/Makefile.am
++++ b/libs/brotli/Makefile.am
+@@ -81,7 +81,6 @@ libbrotli_a_SOURCES = \
+
+ AM_CFLAGS = -Wall -I$(srcdir)/include
+
+-@CODE_COVERAGE_RULES@
+ endif
+
+ EXTRA_DIST = LICENSE
+--- a/libs/clipper/Makefile.am
++++ b/libs/clipper/Makefile.am
+@@ -6,6 +6,4 @@ AM_CXXFLAGS = -Wall
+
+ clipper.cpp: clipper.hpp
+
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/ff-woff/Makefile.am
++++ b/libs/ff-woff/Makefile.am
+@@ -85,6 +85,4 @@ EXTRA_DIST = LICENSE
+
+ AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_CFLAGS)
+
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/md5/Makefile.am
++++ b/libs/md5/Makefile.am
+@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall
+
+ md5.c: md5.h
+
+-@CODE_COVERAGE_RULES@
+ endif
+
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/potrace/Makefile.am
++++ b/libs/potrace/Makefile.am
+@@ -17,7 +17,6 @@ libpotrace_a_SOURCES = \
+
+ AM_CFLAGS = -Wall -I$(srcdir)
+
+-@CODE_COVERAGE_RULES@
+ endif
+
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/woff2/Makefile.am
++++ b/libs/woff2/Makefile.am
+@@ -28,7 +28,6 @@ libwoff2_a_SOURCES = \
+
+ AM_CXXFLAGS = -Wall -I$(srcdir)/include -I$(srcdir)/../brotli/include
+
+-@CODE_COVERAGE_RULES@
+ endif
+
+ EXTRA_DIST = LICENSE
+--- a/libs/xxHash/Makefile.am
++++ b/libs/xxHash/Makefile.am
+@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall
+
+ xxhash.c: xxhash.h xxh3.h
+
+-@CODE_COVERAGE_RULES@
+ endif
+
+ CLEANFILES = *.gcda *.gcno
+--- /dev/null
++++ b/m4/ax_ac_append_to_file.m4
+@@ -0,0 +1,32 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_ac_append_to_file.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_AC_APPEND_TO_FILE([FILE],[DATA])
++#
++# DESCRIPTION
++#
++# Appends the specified data to the specified Autoconf is run. If you want
++# to append to a file when configure is run use AX_APPEND_TO_FILE instead.
++#
++# LICENSE
++#
++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 10
++
++AC_DEFUN([AX_AC_APPEND_TO_FILE],[
++AC_REQUIRE([AX_FILE_ESCAPES])
++m4_esyscmd(
++AX_FILE_ESCAPES
++[
++printf "%s" "$2" >> "$1"
++])
++])
+--- /dev/null
++++ b/m4/ax_ac_print_to_file.m4
+@@ -0,0 +1,32 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_ac_print_to_file.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_AC_PRINT_TO_FILE([FILE],[DATA])
++#
++# DESCRIPTION
++#
++# Writes the specified data to the specified file when Autoconf is run. If
++# you want to print to a file when configure is run use AX_PRINT_TO_FILE
++# instead.
++#
++# LICENSE
++#
++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 10
++
++AC_DEFUN([AX_AC_PRINT_TO_FILE],[
++m4_esyscmd(
++AC_REQUIRE([AX_FILE_ESCAPES])
++[
++printf "%s" "$2" > "$1"
++])
++])
+--- /dev/null
++++ b/m4/ax_add_am_macro_static.m4
+@@ -0,0 +1,28 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro_static.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_ADD_AM_MACRO_STATIC([RULE])
++#
++# DESCRIPTION
++#
++# Adds the specified rule to $AMINCLUDE.
++#
++# LICENSE
++#
++# Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net>
++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 8
++
++AC_DEFUN([AX_ADD_AM_MACRO_STATIC],[
++ AC_REQUIRE([AX_AM_MACROS_STATIC])
++ AX_AC_APPEND_TO_FILE(AMINCLUDE_STATIC,[$1])
++])
+--- /dev/null
++++ b/m4/ax_am_macros_static.m4
+@@ -0,0 +1,38 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_am_macros_static.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_AM_MACROS_STATIC
++#
++# DESCRIPTION
++#
++# Adds support for macros that create Automake rules. You must manually
++# add the following line
++#
++# include $(top_srcdir)/aminclude_static.am
++#
++# to your Makefile.am files.
++#
++# LICENSE
++#
++# Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net>
++# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 11
++
++AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am])
++
++AC_DEFUN([AX_AM_MACROS_STATIC],
++[
++AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[
++# ]AMINCLUDE_STATIC[ generated automatically by Autoconf
++# from AX_AM_MACROS_STATIC on ]m4_esyscmd([LC_ALL=C date])[
++])
++])
+--- /dev/null
++++ b/m4/ax_file_escapes.m4
+@@ -0,0 +1,30 @@
++# ===========================================================================
++# https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_FILE_ESCAPES
++#
++# DESCRIPTION
++#
++# Writes the specified data to the specified file.
++#
++# LICENSE
++#
++# Copyright (c) 2008 Tom Howard <tomhoward@users.sf.net>
++#
++# Copying and distribution of this file, with or without modification, are
++# permitted in any medium without royalty provided the copyright notice
++# and this notice are preserved. This file is offered as-is, without any
++# warranty.
++
++#serial 8
++
++AC_DEFUN([AX_FILE_ESCAPES],[
++AX_DOLLAR="\$"
++AX_SRB="\\135"
++AX_SLB="\\133"
++AX_BS="\\\\"
++AX_DQ="\""
++])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -225,6 +225,4 @@ $(srcdir)/psdefs.cpp: psdefs.ps
+
+ psdefs.ps: ;
+
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -421,6 +421,4 @@ XMLStringTest_LDADD = $(TESTLIBS)
+ EXTRA_DIST += check-conv genhashcheck.py normalize.xsl
+ TESTS += check-conv
+
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno hashcheck.cpp
+
+From 8689f1ceb2284038627668e70ec7e15f99220a5c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 22:42:58 +0000
+Subject: [PATCH 4/4] Upgrade to Autoconf 2.69
+
+autoconf 2.69 is still pretty old and this only affects
+folks who want to run autoreconf anyway.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ #
+ # Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ(2.59)
++AC_PREREQ([2.69])
+ AC_INIT([dvisvgm],[2.14],[martin.gieseking@uos.de])
+ DATE="August 2022"
+ AC_CONFIG_SRCDIR(src)
+@@ -18,13 +18,11 @@ AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"])
+
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_CC_C99
+ AC_PROG_CXX
+ AX_CXX_COMPILE_STDCXX([11])
+ AM_PROG_AR
+ LT_INIT
+
+-AC_PROG_RANLIB
+ AC_LANG(C)
+
+ AX_CHECK_COMPILE_FLAG([-Wmismatched-tags -Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"])
+@@ -147,7 +145,7 @@ AC_CHECK_LIB(z, gzopen)
+
+ # Check for header files.
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
++
+ AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])
+
+ # Check for typedefs, structures, and compiler characteristics.
+
diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch
new file mode 100644
index 000000000000..6fe679f551d1
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch
@@ -0,0 +1,22 @@
+https://github.com/mgieseki/dvisvgm/pull/200
+
+From e3cfc0976ec1f5bbcd389c318eabc2a783990de0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 05:07:09 +0000
+Subject: [PATCH] configure.ac: fix -Wimplicit-function-declaration
+
+Clang 16 makes -Wimplicit-function-declaration an error by default. We
+need to include <stdlib.h> for exit().
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ AC_CHECK_LIB([kpathsea], [kpse_find_file],,
+
+ AC_MSG_CHECKING([kpathsea version])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
++ #include <stdlib.h>
+ #include <kpathsea/kpathsea.h>
+ int main() {
+ FILE *f;
+
diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch b/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch
new file mode 100644
index 000000000000..88b3dcfde3f0
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch
@@ -0,0 +1,226 @@
+https://github.com/mgieseki/dvisvgm/commit/629544928877362d0c6d64f20695f7df3073c5eb
+https://github.com/mgieseki/dvisvgm/commit/0213b9252e4aa44034520112dd59a8d5d2ca4e85
+https://github.com/mgieseki/dvisvgm/commit/9bf81fd0b6e7876e5079e917ed7e12163b9e7f7f
+https://bugs.gentoo.org/873961
+
+From 629544928877362d0c6d64f20695f7df3073c5eb Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Thu, 22 Sep 2022 10:41:11 +0200
+Subject: [PATCH] fixed compilation error when DISABLE_GS is set
+
+--- a/src/Ghostscript.hpp
++++ b/src/Ghostscript.hpp
+@@ -47,8 +47,8 @@ struct Ghostscript {
+ Ghostscript (int argc, const char **argv, void *caller=0) {}
+ bool init (int argc, const char **argv, void *caller=0) {return false;}
+ bool available () {return false;}
+- bool revision (gsapi_revision_t *r) {return false;}
+- int revision () {return 0;}
++ bool revision (gsapi_revision_t *r) const {return false;}
++ int revision () const {return 0;}
+ std::string revisionstr () {return "";}
+ int set_stdio (Stdin in, Stdout out, Stderr err) {return 0;}
+ int run_string_begin (int user_errors, int *pexit_code) {return 0;}
+
+From 0213b9252e4aa44034520112dd59a8d5d2ca4e85 Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Fri, 23 Sep 2022 19:59:01 +0200
+Subject: [PATCH] updated ierrors.h
+
+--- a/src/ierrors.h
++++ b/src/ierrors.h
+@@ -1,22 +1,26 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
++/* Copyright (C) 2001-2022 Artifex Software, Inc.
+ All Rights Reserved.
+-
++
+ This software is provided AS-IS with no warranty, either express or
+ implied.
+
+- This software is distributed under license and may not be copied, modified
+- or distributed except as expressly authorized under the terms of that
+- license. Refer to licensing information at http://www.artifex.com/
+- or contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+- San Rafael, CA 94903, U.S.A., +1(415)492-9861, for further information.
++ This software is distributed under license and may not be copied,
++ modified or distributed except as expressly authorized under the terms
++ of the license contained in the file LICENSE in this distribution.
++
++ Refer to licensing information at http://www.artifex.com or contact
++ Artifex Software, Inc., 1305 Grant Avenue - Suite 200, Novato,
++ CA 94945, U.S.A., +1(415)492-9861, for further information.
+ */
+
+-/* $Id: ierrors.h 8022 2007-06-05 22:23:38Z giles $ */
++
+ /* Definition of error codes */
+
+ #ifndef ierrors_INCLUDED
+ # define ierrors_INCLUDED
+
++//#include "gserrors.h"
++
+ /*
+ * DO NOT USE THIS FILE IN THE GRAPHICS LIBRARY.
+ * THIS FILE IS PART OF THE POSTSCRIPT INTERPRETER.
+@@ -33,33 +37,7 @@
+ /* Define the error name table */
+ extern const char *const gs_error_names[];
+
+- /* ------ PostScript Level 1 errors ------ */
+-
+-#define e_unknownerror (-1) /* unknown error */
+-#define e_dictfull (-2)
+-#define e_dictstackoverflow (-3)
+-#define e_dictstackunderflow (-4)
+-#define e_execstackoverflow (-5)
+-#define e_interrupt (-6)
+-#define e_invalidaccess (-7)
+-#define e_invalidexit (-8)
+-#define e_invalidfileaccess (-9)
+-#define e_invalidfont (-10)
+-#define e_invalidrestore (-11)
+-#define e_ioerror (-12)
+-#define e_limitcheck (-13)
+-#define e_nocurrentpoint (-14)
+-#define e_rangecheck (-15)
+-#define e_stackoverflow (-16)
+-#define e_stackunderflow (-17)
+-#define e_syntaxerror (-18)
+-#define e_timeout (-19)
+-#define e_typecheck (-20)
+-#define e_undefined (-21)
+-#define e_undefinedfilename (-22)
+-#define e_undefinedresult (-23)
+-#define e_unmatchedmark (-24)
+-#define e_VMerror (-25) /* must be the last Level 1 error */
++ /* ------ PostScript Level 1 errors ------ */
+
+ #define LEVEL1_ERROR_NAMES\
+ "unknownerror", "dictfull", "dictstackoverflow", "dictstackunderflow",\
+@@ -69,85 +47,26 @@ extern const char *const gs_error_names[];
+ "stackunderflow", "syntaxerror", "timeout", "typecheck", "undefined",\
+ "undefinedfilename", "undefinedresult", "unmatchedmark", "VMerror"
+
+- /* ------ Additional Level 2 errors (also in DPS) ------ */
+-
+-#define e_configurationerror (-26)
+-#define e_undefinedresource (-27)
+-#define e_unregistered (-28)
++ /* ------ Additional Level 2 errors (also in DPS) ------ */
+
+ #define LEVEL2_ERROR_NAMES\
+ "configurationerror", "undefinedresource", "unregistered"
+
+- /* ------ Additional DPS errors ------ */
+-
+-#define e_invalidcontext (-29)
+-/* invalidid is for the NeXT DPS extension. */
+-#define e_invalidid (-30)
++ /* ------ Additional DPS errors ------ */
+
+ #define DPS_ERROR_NAMES\
+ "invalidcontext", "invalidid"
+
+-#define ERROR_NAMES\
+- LEVEL1_ERROR_NAMES, LEVEL2_ERROR_NAMES, DPS_ERROR_NAMES
+-
+- /* ------ Pseudo-errors used internally ------ */
+-
+-/*
+- * Internal code for a fatal error.
+- * gs_interpret also returns this for a .quit with a positive exit code.
+- */
+-#define e_Fatal (-100)
+-
+-/*
+- * Internal code for the .quit operator.
+- * The real quit code is an integer on the operand stack.
+- * gs_interpret returns this only for a .quit with a zero exit code.
+- */
+-#define e_Quit (-101)
+-
+-/*
+- * Internal code for a normal exit from the interpreter.
+- * Do not use outside of interp.c.
+- */
+-#define e_InterpreterExit (-102)
+-
+-/*
+- * Internal code that indicates that a procedure has been stored in the
+- * remap_proc of the graphics state, and should be called before retrying
+- * the current token. This is used for color remapping involving a call
+- * back into the interpreter -- inelegant, but effective.
+- */
+-#define e_RemapColor (-103)
+-
+-/*
+- * Internal code to indicate we have underflowed the top block
+- * of the e-stack.
+- */
+-#define e_ExecStackUnderflow (-104)
+-
+-/*
+- * Internal code for the vmreclaim operator with a positive operand.
+- * We need to handle this as an error because otherwise the interpreter
+- * won't reload enough of its state when the operator returns.
+- */
+-#define e_VMreclaim (-105)
+-
+-/*
+- * Internal code for requesting more input from run_string.
+- */
+-#define e_NeedInput (-106)
++#define PDF_ERROR_NAMES\
++ "pdf_stackoverflow", "pdf_circular_reference"
+
+-/*
+- * Internal code for a normal exit when usage info is displayed.
+- * This allows Window versions of Ghostscript to pause until
+- * the message can be read.
+- */
+-#define e_Info (-110)
++#define ERROR_NAMES\
++ LEVEL1_ERROR_NAMES, LEVEL2_ERROR_NAMES, DPS_ERROR_NAMES, PDF_ERROR_NAMES
+
+ /*
+ * Define which error codes require re-executing the current object.
+ */
+-#define ERROR_IS_INTERRUPT(ecode)\
+- ((ecode) == e_interrupt || (ecode) == e_timeout)
++#define GS_ERROR_IS_INTERRUPT(ecode)\
++ ((ecode) == gs_error_interrupt || (ecode) == gs_error_timeout)
+
+ #endif /* ierrors_INCLUDED */
+
+From 9bf81fd0b6e7876e5079e917ed7e12163b9e7f7f Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Fri, 23 Sep 2022 20:01:46 +0200
+Subject: [PATCH] dropped usage of gs_error_names() because it's no longer
+ accessible as of GS 10.0.0 (closes #195)
+
+--- a/src/Ghostscript.cpp
++++ b/src/Ghostscript.cpp
+@@ -375,19 +375,9 @@ const char* Ghostscript::error_name (int code) {
+ if (code < 0)
+ code = -code;
+ const char *error_names[] = { ERROR_NAMES };
+- if (code == 0 || (size_t)code > sizeof(error_names)/sizeof(error_names[0]))
++ if (code == 0 || size_t(code) > sizeof(error_names)/sizeof(error_names[0]))
+ return nullptr;
+-#if defined(HAVE_LIBGS)
+- // use array defined in libgs to avoid linking the error strings into the binary
+- return gs_error_names[code-1];
+-#elif defined(_WIN32)
+- // gs_error_names is private in the Ghostscript DLL so we can't access it here
+ return error_names[code-1];
+-#else
+- if (auto error_names = loadSymbol<const char**>("gs_error_names"))
+- return error_names[code-1];
+- return nullptr;
+-#endif
+ }
+
+ #endif // !DISABLE_GS
+
diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch b/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch
new file mode 100644
index 000000000000..a6452baf6794
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/906250
+https://github.com/mgieseki/dvisvgm/commit/b16a8d1c452d809118ceade4d2e8c6f9dfce48ac
+
+From b16a8d1c452d809118ceade4d2e8c6f9dfce48ac Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Fri, 5 May 2023 22:22:00 +0200
+Subject: [PATCH] added missing includes
+
+--- a/src/DVIActions.hpp
++++ b/src/DVIActions.hpp
+@@ -21,6 +21,7 @@
+ #ifndef DVIACTIONS_HPP
+ #define DVIACTIONS_HPP
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/src/Pair.hpp
++++ b/src/Pair.hpp
+@@ -22,6 +22,7 @@
+ #define PAIR_HPP
+
+ #include <cmath>
++#include <cstdint>
+ #include <ostream>
+ #include "macros.hpp"
+
+
diff --git a/app-text/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
index b0cac41f1f5b..08f80fcdf5ff 100644
--- a/app-text/dvisvgm/metadata.xml
+++ b/app-text/dvisvgm/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
deleted file mode 100644
index 511f12be65dd..000000000000
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tools for accessing and converting various ebook file formats"
-HOMEPAGE="https://sourceforge.net/projects/ebook-tools/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd"
-IUSE="+lit2epub"
-
-DEPEND="
- dev-libs/libxml2
- dev-libs/libzip:=
-"
-RDEPEND="${DEPEND}
- lit2epub? ( app-text/convertlit )
-"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- use lit2epub || sed -i -e '\|lit2epub|d' -- 'src/tools/CMakeLists.txt' || die
-}
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
new file mode 100644
index 000000000000..cecebdf25781
--- /dev/null
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Tools for accessing and converting various ebook file formats"
+HOMEPAGE="https://sourceforge.net/projects/ebook-tools/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv x86"
+IUSE="+lit2epub"
+
+DEPEND="
+ dev-libs/libxml2
+ >=dev-libs/libzip-1.7.2:=
+"
+RDEPEND="${DEPEND}
+ lit2epub? ( app-text/convertlit )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-crashfix.patch"
+ "${FILESDIR}/${P}-fvisibility-hidden.patch"
+ "${FILESDIR}/${P}-libzip-cmake.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ use lit2epub || sed -e "\|lit2epub|d" -i src/tools/CMakeLists.txt || die
+}
diff --git a/app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch b/app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch
new file mode 100644
index 000000000000..1ca8dd4902f2
--- /dev/null
+++ b/app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch
@@ -0,0 +1,50 @@
+From 93ebf942a90f9c95797838f9adab94bc0378671c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Tue, 30 Apr 2019 16:36:09 +0200
+Subject: [PATCH] Avoid crash on toc.ncx navPoint without navLabel
+
+Althoug at least one navLabel is required per navPoint, there is no
+guarantee it actually exists.
+
+Avoid crashes due to invalid accesses of a null label in case the toc is
+broken, and spew a warning.
+
+Fixes #8 epub_tit_next crashes on navPoint without navLabel.
+---
+ src/libepub/epub.c | 5 +++--
+ src/libepub/opf.c | 4 ++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/libepub/epub.c b/src/libepub/epub.c
+index d085503..a259d9d 100644
+--- a/src/libepub/epub.c
++++ b/src/libepub/epub.c
+@@ -469,8 +469,9 @@ int epub_tit_next(struct titerator *tit) {
+ case TITERATOR_NAVMAP:
+ case TITERATOR_PAGES:
+ ti = GetNodeData(curr);
+- tit->cache.label =
+- (char *)_opf_label_get_by_doc_lang(tit->epub->opf, ti->label);
++ if (ti->label)
++ tit->cache.label =
++ (char *)_opf_label_get_by_doc_lang(tit->epub->opf, ti->label);
+
+ if (! tit->cache.label)
+ tit->cache.label = (char *)ti->id;
+diff --git a/src/libepub/opf.c b/src/libepub/opf.c
+index 6851db2..09bce9e 100644
+--- a/src/libepub/opf.c
++++ b/src/libepub/opf.c
+@@ -398,6 +398,10 @@ void _opf_parse_navmap(struct opf *opf, xmlTextReaderPtr reader) {
+
+ } else if (xmlTextReaderNodeType(reader) == 15) {
+ if (item) {
++ if (! item->label) {
++ _epub_print_debug(opf->epub, DEBUG_WARNING,
++ "- missing navlabel for nav point element");
++ }
+ _epub_print_debug(opf->epub, DEBUG_INFO,
+ "adding nav point item->%s %s (d:%d,p:%d)",
+ item->id, item->src, item->depth, item->playOrder);
+--
+2.21.0
diff --git a/app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch b/app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch
new file mode 100644
index 000000000000..933ecb878810
--- /dev/null
+++ b/app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch
@@ -0,0 +1,22 @@
+--- a/src/libepub/epub_shared.h
++++ b/src/libepub/epub_shared.h
+@@ -8,7 +8,7 @@
+ # define EPUB_EXPORT __declspec(dllimport)
+ # endif
+ #else
+-# define EPUB_EXPORT
++# define EPUB_EXPORT __attribute__ ((visibility ("default")))
+ #endif
+
+ /**
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@ find_package(LibXml2 REQUIRED)
+ find_package(LibZip REQUIRED)
+
+ if(CMAKE_C_COMPILER_ID MATCHES GNU)
+- set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common ${CMAKE_C_FLAGS}")
++ set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common -fvisibility=hidden ${CMAKE_C_FLAGS}")
+ endif(CMAKE_C_COMPILER_ID MATCHES GNU)
+ if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch b/app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch
new file mode 100644
index 000000000000..d1a560f1a5da
--- /dev/null
+++ b/app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch
@@ -0,0 +1,83 @@
+From fa125b4223bc8995ed60befbed757ec23eed72e7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 22 Oct 2020 23:32:33 +0200
+Subject: [PATCH] Use >=dev-libs/libzip-1.7.2 cmake config
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ cmake/FindLibZip.cmake | 36 ------------------------------------
+ src/libepub/CMakeLists.txt | 2 +-
+ 3 files changed, 2 insertions(+), 38 deletions(-)
+ delete mode 100644 cmake/FindLibZip.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc141c2..691cf2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)")
+
+ find_package(LibXml2 REQUIRED)
+-find_package(LibZip REQUIRED)
++find_package(LibZip 1.7.2 CONFIG REQUIRED)
+
+ if(CMAKE_C_COMPILER_ID MATCHES GNU)
+ set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common ${CMAKE_C_FLAGS}")
+diff --git a/cmake/FindLibZip.cmake b/cmake/FindLibZip.cmake
+deleted file mode 100644
+index c873092..0000000
+--- a/cmake/FindLibZip.cmake
++++ /dev/null
+@@ -1,36 +0,0 @@
+-# - Try to find libzip
+-# Once done this will define
+-#
+-# LIBZIP_FOUND - system has the zip library
+-# LIBZIP_INCLUDE_DIR - the zip include directory
+-# LIBZIP_LIBRARY - Link this to use the zip library
+-#
+-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+- # in cache already
+- set(LIBZIP_FOUND TRUE)
+-else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+-
+- find_path(LIBZIP_INCLUDE_DIR zip.h
+- ${GNUWIN32_DIR}/include
+- )
+-
+- find_library(LIBZIP_LIBRARY NAMES zip
+- PATHS
+- ${GNUWIN32_DIR}/lib
+- )
+-
+- include(FindPackageHandleStandardArgs)
+- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
+-
+- # ensure that they are cached
+- set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
+- set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
+-
+-endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+-
+-mark_as_advanced(LIBZIP_INCLUDE_DIR LIBZIP_LIBRARY)
+diff --git a/src/libepub/CMakeLists.txt b/src/libepub/CMakeLists.txt
+index a3208b7..460270c 100644
+--- a/src/libepub/CMakeLists.txt
++++ b/src/libepub/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
+ add_library (epub SHARED epub.c ocf.c opf.c linklist.c list.c)
+-target_link_libraries (epub ${LIBZIP_LIBRARY} ${LIBXML2_LIBRARIES})
++target_link_libraries (epub libzip::zip ${LIBXML2_LIBRARIES})
+
+ set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0)
+
+--
+2.29.0
+
diff --git a/app-text/ebook-tools/metadata.xml b/app-text/ebook-tools/metadata.xml
index b2aa1c1313bd..196bd564704a 100644
--- a/app-text/ebook-tools/metadata.xml
+++ b/app-text/ebook-tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/ebook2cw/Manifest b/app-text/ebook2cw/Manifest
new file mode 100644
index 000000000000..78ad133a72ce
--- /dev/null
+++ b/app-text/ebook2cw/Manifest
@@ -0,0 +1 @@
+DIST ebook2cw-0.8.5.tar.gz 34619 BLAKE2B 898a8bb6307a10c33085aca9d172cc145ec9fd1ccb8e76b2be051fd144097ff78f554c01af7540943e2042002b70b25106f615d7e3e9fcfa4f1dfde9cf7f5244 SHA512 88f1b42f1d9e96d34b923e31d78b597d00e2696cf4361fb7b2ebeda791f5e6df14bb60d152036d179c16ddceb35577f136a4bc959171faebc0fb5e0ea1877e4b
diff --git a/app-text/ebook2cw/ebook2cw-0.8.5.ebuild b/app-text/ebook2cw/ebook2cw-0.8.5.ebuild
new file mode 100644
index 000000000000..9ff5b441d55c
--- /dev/null
+++ b/app-text/ebook2cw/ebook2cw-0.8.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Convert ebooks to Morse MP3s/OGGs"
+HOMEPAGE="https://fkurz.net/ham/ebook2cw.html"
+SRC_URI="https://fkurz.net/ham/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ media-sound/lame
+ media-libs/libvorbis
+ media-libs/libogg
+ "
+
+src_prepare() {
+ # avoid prestripping of 'qrq' binary
+ sed -i -e "s/install -s -m/install -m/" Makefile || die
+ # fix install dir for doc files
+ sed -i -e "s#/doc/ebook2cw/#/doc/${P}/#g" Makefile || die
+ eapply_user
+}
+
+src_install() {
+ emake DESTDIR="${D}/usr" install
+ dodoc ChangeLog
+}
diff --git a/app-text/ebook2cw/metadata.xml b/app-text/ebook2cw/metadata.xml
new file mode 100644
index 000000000000..001997549c54
--- /dev/null
+++ b/app-text/ebook2cw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tomjbe@gentoo.org</email>
+ <name>Thomas Beierlein</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 2433f69490a5..67f854da6f6e 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,2 +1 @@
-DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
-DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
+DIST editorconfig-core-c-0.12.6.tar.gz 76525 BLAKE2B 2ffad6b22d72bd23eca9f0f1704d279323328e01b72a4a18a7181c998f088d7f8c0bb93549d8071e6723b8294b628fe6d1b503de7434be45770a2be9127c1cab SHA512 7cf69ed48c0d28694fc1f54cd8ae89202a3f0a13b5302fd316f50d0f99a606f54af9709874f0da75ad11ab6f4cc36edacb4cd8639717d44842a309140be3a968
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
deleted file mode 100644
index 237604945552..000000000000
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="EditorConfig core library written in C"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="cli doc"
-CDEPEND="dev-libs/libpcre:="
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
- cli? ( !dev-python/editorconfig-core-py[cli] )"
-
-src_prepare() {
- sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
- -i src/lib/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=()
- use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use cli || rm -rf "${ED}usr/bin"
-}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
deleted file mode 100644
index 1bfe84ca069f..000000000000
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.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
-
-inherit cmake-utils
-
-DESCRIPTION="EditorConfig core library written in C"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="cli doc"
-CDEPEND="dev-libs/libpcre:="
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
- cli? ( !dev-python/editorconfig-core-py[cli] )"
-
-src_prepare() {
- sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
- -i src/lib/CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=()
- use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- use cli || rm -rf "${ED}usr/bin"
-}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild
new file mode 100644
index 000000000000..be53eaf511e3
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="cli doc"
+
+BDEPEND="doc? ( app-text/doxygen )"
+DEPEND="dev-libs/libpcre2:="
+RDEPEND="
+ ${DEPEND}
+ cli? ( !dev-python/editorconfig[cli] !<dev-python/editorconfig-editorconfig-0.12.4-r1 )
+"
+# Header-only
+DEPEND+=" dev-libs/uthash"
+
+src_prepare() {
+ # Don't install the static library.
+ sed -e '/install(TARGETS editorconfig_static/,+5d' -i src/lib/CMakeLists.txt || die
+
+ # Unbundle dev-libs/uthash
+ rm src/lib/utarray.h || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF')
+ -DBUILD_STATICALLY_LINKED_EXE=OFF
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake_src_install
+
+ if ! use cli; then
+ rm -r "${ED}/usr/bin" || die
+ fi
+}
diff --git a/app-text/editorconfig-core-c/metadata.xml b/app-text/editorconfig-core-c/metadata.xml
index 639c3f190602..fe78564c2b5e 100644
--- a/app-text/editorconfig-core-c/metadata.xml
+++ b/app-text/editorconfig-core-c/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<upstream>
<remote-id type="github">editorconfig/editorconfig-core-c</remote-id>
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index be0383a051c0..e0cde0b11fd0 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,5 +1,2 @@
DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
-DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
-DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
-DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
+DIST enchant-2.6.1.tar.gz 1014436 BLAKE2B 3df1d72d4fa2e912788d4e12e7bc4ab2676952e358e97457259284e78c32006482be0713059d5feeef56905e83ded975e7d723563c58e4f92c845b0b279a6827 SHA512 e2faabeb6a4edc7237a0a279b210512100fb1662b097cd23f0fc07a3519e48632e5527b0d393793a7623667011eae7e11f15fcddcaa155c4abd26ab6981ddf44
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
deleted file mode 100644
index 79f317dc4b94..000000000000
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-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 ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
- default
- sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
- sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484, shouldn't be an issue in 2.2
-}
-
-src_configure() {
- econf \
- $(use_enable aspell) \
- $(use_enable hunspell myspell) \
- $(use_enable static-libs static) \
- --disable-hspell \
- --disable-ispell \
- --disable-uspell \
- --disable-voikko \
- --disable-zemberek \
- --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..5cbf57768245
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV//./-}"
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="aspell +hunspell test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aspell hunspell )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.6:2
+ aspell? ( app-text/aspell )
+ hunspell? ( >=app-text/hunspell-1.2.1:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<app-text/enchant-2.3.3:2
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-libs/unittest++-2.0.0-r2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
+)
+
+src_prepare() {
+ default
+ sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484
+}
+
+src_configure() {
+ local myconf=(
+ --datadir="${EPREFIX}"/usr/share/enchant-1
+ --disable-static
+ $(use_enable aspell)
+ $(use_enable hunspell myspell)
+ --disable-hspell
+ --disable-ispell
+ --disable-uspell
+ --disable-voikko
+ --disable-zemberek
+ --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
deleted file mode 100644
index 8a0c7ad3ef3f..000000000000
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-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 ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
- default
- sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
-}
-
-src_configure() {
- econf \
- $(use_enable aspell) \
- $(use_enable hunspell myspell) \
- $(use_enable static-libs static) \
- --disable-hspell \
- --disable-ispell \
- --disable-uspell \
- --disable-voikko \
- --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild
deleted file mode 100644
index 03527fb94952..000000000000
--- a/app-text/enchant/enchant-2.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-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 ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-PATCHES=(
- # Fix build with hunspell 1.5
- # https://bugs.gentoo.org/show_bug.cgi?id=600952
- "${FILESDIR}"/${PN}-2.1.0-hunspell150_fix.patch
-)
-
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with aspell) \
- $(use_with hunspell) \
- $(use_enable static-libs static) \
- --without-hspell \
- --without-voikko \
- --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.1.1.ebuild b/app-text/enchant/enchant-2.1.1.ebuild
deleted file mode 100644
index 0780c2cc403d..000000000000
--- a/app-text/enchant/enchant-2.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with aspell) \
- $(use_with hunspell) \
- $(use_enable static-libs static) \
- --without-hspell \
- --without-voikko \
- --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.1.2.ebuild b/app-text/enchant/enchant-2.1.2.ebuild
deleted file mode 100644
index 0780c2cc403d..000000000000
--- a/app-text/enchant/enchant-2.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with aspell) \
- $(use_with hunspell) \
- $(use_enable static-libs static) \
- --without-hspell \
- --without-voikko \
- --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.2.3.ebuild b/app-text/enchant/enchant-2.2.3.ebuild
deleted file mode 100644
index b9445634e884..000000000000
--- a/app-text/enchant/enchant-2.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
- econf \
- $(use_with aspell) \
- $(use_with hunspell) \
- $(use_enable static-libs static) \
- --without-hspell \
- --without-voikko \
- --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.6.1.ebuild b/app-text/enchant/enchant-2.6.1.ebuild
new file mode 100644
index 000000000000..9e29da6bb928
--- /dev/null
+++ b/app-text/enchant/enchant-2.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="aspell +hunspell nuspell test voikko"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aspell hunspell nuspell )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.6:2
+ aspell? ( app-text/aspell )
+ hunspell? ( >=app-text/hunspell-1.2.1:0= )
+ nuspell? ( >=app-text/nuspell-5.1.0:0= )
+ voikko? ( dev-libs/libvoikko:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<app-text/enchant-1.6.1-r2:0
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-libs/unittest++-2.0.0-r2 )
+"
+BDEPEND="
+ sys-apps/groff
+ virtual/pkgconfig
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ alignof
+ static_assert
+ unreachable
+)
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+src_configure() {
+ local myconf=(
+ --disable-static
+ $(use_enable test relocatable)
+ $(use_with aspell)
+ $(use_with hunspell)
+ $(use_with nuspell)
+ $(use_with voikko)
+ --without-hspell
+ --without-applespell
+ --without-zemberek
+ --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
deleted file mode 100644
index 1dac6c11ec5f..000000000000
--- a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87b36fd87d8ecc894850d82eed33f48d6c429cad Mon Sep 17 00:00:00 2001
-From: Pacho Ramos <pacho@gentoo.org>
-Date: Sun, 3 Sep 2017 11:05:42 +0200
-Subject: [PATCH] Fix hunspell 1.5 support
-
----
- providers/enchant_hunspell.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/providers/enchant_hunspell.cpp b/providers/enchant_hunspell.cpp
-index 609f856..0bc360f 100644
---- a/providers/enchant_hunspell.cpp
-+++ b/providers/enchant_hunspell.cpp
-@@ -312,7 +312,7 @@ HunspellChecker::requestDictionary(const char *szLang)
- if(hunspell == NULL){
- return false;
- }
-- char *enc = hunspell->get_dic_encoding();
-+ const char *enc = hunspell->get_dic_encoding();
-
- m_translate_in = g_iconv_open(enc, "UTF-8");
- m_translate_out = g_iconv_open("UTF-8", enc);
---
-2.14.1
-
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 2b8b7cffbc12..4b8be47deda0 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
- <flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
+ <flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
+ <flag name="nuspell">Adds support for <pkg>app-text/nuspell</pkg> spell checker</flag>
+ <flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">AbiWord/enchant</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/enscript/enscript-1.6.6-r1.ebuild b/app-text/enscript/enscript-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..f3503237816d
--- /dev/null
+++ b/app-text/enscript/enscript-1.6.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Powerful text-to-postscript converter"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
+
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="nls ruby"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/lex
+ app-alternatives/yacc
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.4-ebuild.st.patch
+ "${FILESDIR}"/${PN}-1.6.5.2-php.st.patch
+ "${FILESDIR}"/${PN}-1.6.4-fsf-gcc-darwin.patch
+ "${FILESDIR}"/${PN}-1.6.2-implicit-function-decl.patch
+)
+
+src_prepare() {
+ default
+
+ use ruby && eapply "${FILESDIR}"/enscript-1.6.2-ruby.patch
+
+ sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+ insinto /usr/share/enscript/hl
+ doins "${FILESDIR}"/ebuild.st
+
+ if use ruby ; then
+ insinto /usr/share/enscript/hl
+ doins "${FILESDIR}"/ruby.st
+ fi
+}
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild
deleted file mode 100644
index 185ba15dbf84..000000000000
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Powerful text-to-postscript converter"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="nls ruby"
-
-DEPEND="
- sys-devel/flex
- sys-devel/bison
- nls? ( sys-devel/gettext )
-"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
- epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
- use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
- sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
- default
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ebuild.st
-
- if use ruby ; then
- insinto /usr/share/enscript/hl
- doins "${FILESDIR}"/ruby.st
- fi
-}
diff --git a/app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch b/app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch
new file mode 100644
index 000000000000..90868d182023
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch
@@ -0,0 +1,20 @@
+https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch?h=master-next&id=6c251848590867debaaf87bfe12bed572d8f6a8d
+
+From faec0206611f8ea4ca6f70987866077ac8c3c6c1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 2 Sep 2022 21:24:27 -0700
+Subject: [PATCH] getopt: Include string.h for strcmp/stcncmp functions
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/compat/getopt.c
++++ b/compat/getopt.c
+@@ -43,6 +43,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <string.h> /* strcmp */
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
diff --git a/app-text/enscript/files/enscript-1.6.2-ruby.patch b/app-text/enscript/files/enscript-1.6.2-ruby.patch
index b492ca4f44f7..1404daa823d5 100644
--- a/app-text/enscript/files/enscript-1.6.2-ruby.patch
+++ b/app-text/enscript/files/enscript-1.6.2-ruby.patch
@@ -1,5 +1,5 @@
---- states/hl/enscript.st.orig 2006-12-17 02:10:37.000000000 +0100
-+++ states/hl/enscript.st 2006-12-17 02:10:13.000000000 +0100
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
@@ -489,6 +489,7 @@
/\.idl$/ idl;
/\.(hs|lhs|gs|lgs)$/ haskell;
diff --git a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
index 0741576226af..413039729675 100644
--- a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
+++ b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
@@ -1,5 +1,5 @@
---- states/hl/enscript.st 2006/01/31 05:37:23 1.1
-+++ states/hl/enscript.st 2006/01/31 06:48:32
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
@@ -509,6 +509,7 @@ namerules
/\b(rfc.*\.txt|draft-.*\.txt)$/ rfc;
/\.inf$/i inf;
diff --git a/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
new file mode 100644
index 000000000000..23196ca0c3c4
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
@@ -0,0 +1,37 @@
+darwin: __private_extern__ is an Apple-ism, we really don't want
+
+In particular FSF GCC barfs about this, which is much preferred over
+ancient gcc-apple (4.2.1).
+
+--- a/compat/regex.c
++++ b/compat/regex.c
+@@ -5539,9 +5539,6 @@
+ It returns 0 if it succeeds, nonzero if it doesn't. (See regex.h for
+ the return codes and their meanings.) */
+
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ int
+ regcomp (preg, pattern, cflags)
+ regex_t *preg;
+@@ -5620,9 +5617,6 @@
+
+ We return 0 if we find a match and REG_NOMATCH if not. */
+
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ int
+ regexec (preg, string, nmatch, pmatch, eflags)
+ const regex_t *preg;
+@@ -5728,9 +5722,6 @@
+
+ /* Free dynamically allocated space used by PREG. */
+
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ void
+ regfree (preg)
+ regex_t *preg;
diff --git a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
index b146d998ee41..9b3930103ab4 100644
--- a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
+++ b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
@@ -1,6 +1,5 @@
-diff -ruN enscript-1.6.5.2.orig/states/hl/enscript.st enscript-1.6.5.2/states/hl/enscript.st
---- enscript-1.6.5.2.orig/states/hl/enscript.st 2010-06-02 00:17:49.000000000 +0200
-+++ enscript-1.6.5.2/states/hl/enscript.st 2011-06-02 12:43:13.869855504 +0200
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
@@ -510,6 +510,7 @@
/\.tex$/ tex;
/\.wmlscript$/ wmlscript;
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
index c439b06d8c84..167f8f30a26a 100644
--- a/app-text/enscript/metadata.xml
+++ b/app-text/enscript/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>printing@gentoo.org</email>
- <name>Gentoo Printing Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">enscript</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 5ebaae9fa532..bc3fef3d9903 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,2 +1,2 @@
-DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
+DIST epspdf-0.6.5.zip 331312 BLAKE2B 3bd2c9cd432172c38efe33d08068f20fddf169d5d7bc94c9f1720cf379de9ba54aedb1cb6fd438b721c2e98f24dfd1ca4b3dab5c1fe01a71791748f952832ac9 SHA512 28ef12546a957c62fd94b405b53359898d46c825bad8fd2167b5ab23bb2a6ea457ccbcc8263b31574e128ebe56e21b30fae27d406397df3fdc1506a088ab41f4
DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
diff --git a/app-text/epspdf/epspdf-0.6.0.ebuild b/app-text/epspdf/epspdf-0.6.0.ebuild
deleted file mode 100644
index 25b3f41e6c1c..000000000000
--- a/app-text/epspdf/epspdf-0.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit texlive-common eutils
-
-DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
-HOMEPAGE="http://tex.aanhet.net/epspdf/"
-SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc tk"
-
-DEPEND=""
-RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
- >=dev-texlive/texlive-basic-2011
- app-text/ghostscript-gpl
- tk? ( dev-lang/tk )"
-
-S=${WORKDIR}/${PN}
-INSTALLDIR=/usr/share/${PN}
-FILES="epspdf.tlu"
-TKFILES="epspdf.help epspdf.ico epspdftk.tcl"
-
-src_install() {
- dodir ${INSTALLDIR}
- cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
- if use tk ; then
- cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
- fi
- dobin_texmf_scripts "${PN}/epspdf.tlu"
- use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
-
- doinfo doc/epspdf.info
- dodoc doc/Changelog
- if use doc ; then
- dodoc doc/epspdf.pdf
- dohtml -r doc
- fi
-
- # give it a .desktop
- if use tk; then
- make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.ico" "Graphics;ImageProcessing"
- fi
-}
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..46d374f8a716
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop texlive-common
+
+DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
+HOMEPAGE="http://tex.aanhet.net/epspdf/"
+SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc tk"
+
+DEPEND="sys-apps/texinfo"
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+ >=dev-texlive/texlive-basic-2011
+ app-text/ghostscript-gpl
+ tk? ( dev-lang/tk )"
+
+S=${WORKDIR}/${PN}
+INSTALLDIR=/usr/share/${PN}
+FILES="epspdf.tlu"
+TKFILES="epspdf.help doc/images/epspdf.png epspdftk.tcl"
+
+src_compile() {
+ cd doc
+ makeinfo epspdf || die
+}
+
+src_install() {
+ dodir ${INSTALLDIR}
+ cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
+ if use tk ; then
+ cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
+ fi
+ dobin_texmf_scripts "${PN}/epspdf.tlu"
+ use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
+
+ doinfo doc/epspdf.info
+ dodoc doc/Changelog
+ if use doc ; then
+ dodoc doc/epspdf.pdf
+ dodoc -r doc
+ fi
+
+ # give it a .desktop
+ if use tk; then
+ make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.png" "Graphics;ImageProcessing"
+ fi
+}
diff --git a/app-text/epspdf/epspdf-0.6.3.ebuild b/app-text/epspdf/epspdf-0.6.3.ebuild
deleted file mode 100644
index fd24f3b41c02..000000000000
--- a/app-text/epspdf/epspdf-0.6.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit texlive-common eutils
-
-DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
-HOMEPAGE="http://tex.aanhet.net/epspdf/"
-SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc tk"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
- >=dev-texlive/texlive-basic-2011
- app-text/ghostscript-gpl
- tk? ( dev-lang/tk )"
-
-S=${WORKDIR}/${PN}
-INSTALLDIR=/usr/share/${PN}
-FILES="epspdf.tlu"
-TKFILES="epspdf.help doc/images/epspdf.png epspdftk.tcl"
-
-src_compile() {
- cd doc
- makeinfo epspdf || die
-}
-
-src_install() {
- dodir ${INSTALLDIR}
- cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
- if use tk ; then
- cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
- fi
- dobin_texmf_scripts "${PN}/epspdf.tlu"
- use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
-
- doinfo doc/epspdf.info
- dodoc doc/Changelog
- if use doc ; then
- dodoc doc/epspdf.pdf
- dohtml -r doc
- fi
-
- # give it a .desktop
- if use tk; then
- make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.png" "Graphics;ImageProcessing"
- fi
-}
diff --git a/app-text/epspdf/epspdf-0.6.5.ebuild b/app-text/epspdf/epspdf-0.6.5.ebuild
new file mode 100644
index 000000000000..10eb318fdc5f
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop texlive-common
+
+DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
+HOMEPAGE="http://tex.aanhet.net/epspdf/"
+# http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc tk"
+
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+ >=dev-texlive/texlive-basic-2011
+ app-text/ghostscript-gpl
+ tk? ( dev-lang/tk )"
+BDEPEND="app-arch/unzip
+ sys-apps/texinfo"
+
+src_compile() {
+ cd doc || die
+ makeinfo epspdf || die
+}
+
+src_install() {
+ exeinto /usr/share/${PN}
+ doexe epspdf.tlu
+
+ insinto /usr/share/${PN}
+
+ if use tk ; then
+ doins epspdf.help doc/images/epspdf.png
+ doexe epspdftk.tcl
+ fi
+
+ dobin_texmf_scripts ${PN}/epspdf.tlu
+ use tk && dobin_texmf_scripts ${PN}/epspdftk.tcl
+
+ doinfo doc/epspdf.info
+ dodoc doc/Changelog
+ if use doc ; then
+ dodoc doc/epspdf.pdf
+ dodoc -r doc
+ fi
+
+ # Give it a .desktop
+ if use tk; then
+ make_desktop_entry epspdftk epspdftk "${EPREFIX}/usr/share/${PN}/epspdf.png" "Graphics;ImageProcessing"
+ fi
+}
diff --git a/app-text/epspdf/metadata.xml b/app-text/epspdf/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/epspdf/metadata.xml
+++ b/app-text/epspdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index f3131c5f6cb6..c60f32ae288e 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -1 +1 @@
-DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
+DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
deleted file mode 100644
index 04ef4ccd4060..000000000000
--- a/app-text/epstool/epstool-3.08-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
-HOMEPAGE="http://www.cs.wisc.edu/~ghost/gsview/epstool.htm"
-SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/gcc43.patch
-
- sed -i \
- -e '/^CC/s/=/?=/' \
- -e '/^CLINK/s/gcc/$(CC)/' \
- src/unixcom.mak || die
- tc-export CC
-
- epatch_user
-
- # parallel make issue (bug #506978)
- mkdir bin || die
- mkdir epsobj || die
-}
-
-src_compile() {
- emake epstool
-}
-
-src_install() {
- dobin bin/epstool
- doman doc/epstool.1
- dohtml doc/epstool.htm doc/gsview.css
-}
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
new file mode 100644
index 000000000000..96cdb44c516c
--- /dev/null
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
+HOMEPAGE="http://www.ghostgum.com.au/software/epstool.htm"
+SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-use-gnu.patch
+ "${FILESDIR}"/${P}-no-gcc-linker.patch
+)
+
+src_prepare() {
+ default
+ tc-export CC
+
+ # parallel make issue (bug #506978)
+ mkdir bin || die
+ mkdir epsobj || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" epstool
+}
+
+src_install() {
+ dobin bin/epstool
+ doman doc/epstool.1
+ local HTML_DOCS=( doc/epstool.htm doc/gsview.css )
+ einstalldocs
+}
diff --git a/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
new file mode 100644
index 000000000000..cf3e03dfa609
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
@@ -0,0 +1,27 @@
+From cbd73f2bb7dd3a55d0d35b0638e84b8f17e56b52 Mon Sep 17 00:00:00 2001
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] Make epstool cross buildable by not hardcoding gcc as linker
+
+---
+ src/unixcom.mak | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/unixcom.mak b/src/unixcom.mak
+index 1063b65..ca0b031 100755
+--- a/src/unixcom.mak
++++ b/src/unixcom.mak
+@@ -22,8 +22,8 @@ GSCFLAGS= $(CDEFS) -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-pr
+ CCAUX=gcc
+ CC=gcc
+ LFLAGS=$(PLINK) $(LIBPNGLIBS) $(GTKLIBS)
+-CLINK=gcc $(LDFLAGS)
+-LINK=gcc $(LDFLAGS)
++CLINK=$(CC) $(LDFLAGS)
++LINK=$(CC) $(LDFLAGS)
+
+
+ COMP=$(CC) -I$(SRCDIR) -I$(OBJDIR) $(CFLAGS) $(GSCFLAGS)
+--
+2.29.2
+
diff --git a/app-text/epstool/files/epstool-3.09-no-use-gnu.patch b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
new file mode 100644
index 000000000000..cb42381138e2
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
@@ -0,0 +1,31 @@
+From 706546a4921b98834ebf241ea751e0db5d0d192f Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] src/cplat.h: Don't define __USE_GNU
+
+There were two things wrong with it:
+- __USE_GNU is glibc-internal, the external define is _GNU_SOURCE
+- defining such macros after the first include is wrong, in this case
+it caused FTBFS on ia64.
+
+An option would be to pass -D_GNU_SOURCE when building, but as far
+as I can see the define was not (anymore?) needed at all.
+---
+ src/cplat.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cplat.h b/src/cplat.h
+index 8bbd9c5..ad5cee4 100755
+--- a/src/cplat.h
++++ b/src/cplat.h
+@@ -109,7 +109,6 @@ typedef struct POINT_s {
+ typedef struct _GdkRgbCmap GdkRgbCmap;
+ # endif
+ # include <unistd.h>
+-# define __USE_GNU /* we might need recursive mutex */
+ # include <semaphore.h>
+ # include <pthread.h>
+ # define ZLIBNAME "libz.so"
+--
+2.29.2
+
diff --git a/app-text/epstool/files/gcc43.patch b/app-text/epstool/files/gcc43.patch
deleted file mode 100644
index b50250a9af1a..000000000000
--- a/app-text/epstool/files/gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/epstool.c
-+++ b/src/epstool.c
-@@ -2824,7 +2824,7 @@
- code = -1;
- }
- if ((code==0) && stdout_name && (hChildStdoutWr == -1)) {
-- handle = open(stdout_name, O_WRONLY | O_CREAT);
-+ handle = open(stdout_name, O_WRONLY | O_CREAT, 0644);
- hChildStdoutWr = dup2(handle, 1);
- if (handle != -1)
- close(handle);
-@@ -2832,7 +2832,7 @@
- code = -1;
- }
- if ((code==0) && stderr_name && (hChildStderrWr == -1)) {
-- handle = open(stderr_name, O_WRONLY | O_CREAT);
-+ handle = open(stderr_name, O_WRONLY | O_CREAT, 0644);
- hChildStderrWr = dup2(handle, 2);
- if (handle != -1)
- close(handle);
diff --git a/app-text/epstool/metadata.xml b/app-text/epstool/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/epstool/metadata.xml
+++ b/app-text/epstool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index b8b4637d1e4d..4b75dbd25049 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,2 +1 @@
-DIST evince-3.30.2.tar.xz 2288868 BLAKE2B dd0423b7ec51daf897bfbc45afb298f9ee23b28ada3dfe5d5d2808b4515bdc7077a7e0ae46541876bb2fbfd8aa9ec44abc7aabcb3cb10b6e52912f0ac1358eeb SHA512 dfffcf15547d0720bd2379054d7b9bee02f8bea7113562162cbab62d77cf84c04f70dcc87a3e6b1ba62db38783df8f481d801854d8f0767f60e9cfabd9efc646
-DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded5044521da7d2732cb759db8e8ebd2d565c2ad04908e11ec1f726ec70dd2931c58c9b31951a7b3d3165c61042c87f SHA512 565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658
+DIST evince-45.0.tar.xz 2925768 BLAKE2B a926efd836dcf265184d84b8ae3ab246612767ab7f4e600225e21cb7395aa6aa7c6c238aa3958e1924d67a6aa377a2817101a9b04633dc30c381424ee1e0ebaa SHA512 3c2f796fda6c6e4d570748b6f8fcda2fada239df4cb392c164d7f91041cda6337373ea521146e7f7a1d572692a5e894938117d092fa033ddeb81fa72f8591086
diff --git a/app-text/evince/evince-3.30.2.ebuild b/app-text/evince/evince-3.30.2.ebuild
deleted file mode 100644
index 0d61b2bf1503..000000000000
--- a/app-text/evince/evince-3.30.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.36:2[dbus]
- >=dev-libs/libxml2-2.5:2
- sys-libs/zlib:=
- >=x11-libs/gdk-pixbuf-2.36.5:2
- >=x11-libs/gtk+-3.16.0:3[introspection?]
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/cairo-1.10:=
- >=app-text/poppler-0.33[cairo]
- >=app-arch/libarchive-3.2.0
- djvu? ( >=app-text/djvu-3.5.22:= )
- dvi? (
- virtual/tex-base
- dev-libs/kpathsea:=
- t1lib? ( >=media-libs/t1lib-5:= ) )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0 )
- gnome? ( gnome-base/gnome-desktop:3= )
- gnome-keyring? ( >=app-crypt/libsecret-0.5 )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
- nautilus? ( >=gnome-base/nautilus-2.91.4 )
- postscript? ( >=app-text/libspectre-0.2:= )
- spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-3.6:0= )
- xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gvfs
- gnome-base/librsvg
- || (
- >=x11-themes/adwaita-icon-theme-2.17.1
- >=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.35
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
- app-text/yelp-tools
-"
-# eautoreconf needs:
-# app-text/yelp-tools
-
-PATCHES=(
- "${FILESDIR}"/${PV}-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
- gnome2_src_prepare
-
- # Do not depend on adwaita-icon-theme, bug #326855, #391859
- # https://bugs.freedesktop.org/show_bug.cgi?id=29942
- sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
- -i configure || die "sed failed"
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-pdf \
- --enable-comics \
- --enable-thumbnailer \
- --with-platform=gnome \
- --enable-dbus \
- $(use_enable djvu) \
- $(use_enable dvi) \
- $(use_enable gstreamer multimedia) \
- $(use_enable gnome libgnome-desktop) \
- $(use_with gnome-keyring keyring) \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable nsplugin browser-plugin) \
- $(use_enable postscript ps) \
- $(use_with spell gspell) \
- $(use_enable t1lib) \
- $(use_enable tiff) \
- $(use_enable xps) \
- BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.32.0.ebuild b/app-text/evince/evince-3.32.0.ebuild
deleted file mode 100644
index b1965cc88ea6..000000000000
--- a/app-text/evince/evince-3.32.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.36:2[dbus]
- >=dev-libs/libxml2-2.5:2
- sys-libs/zlib:=
- >=x11-libs/gdk-pixbuf-2.36.5:2
- >=x11-libs/gtk+-3.22.0:3[introspection?]
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/cairo-1.10:=
- >=app-text/poppler-0.33[cairo]
- >=app-arch/libarchive-3.2.0
- djvu? ( >=app-text/djvu-3.5.22:= )
- dvi? (
- virtual/tex-base
- dev-libs/kpathsea:=
- t1lib? ( >=media-libs/t1lib-5:= ) )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0 )
- gnome? ( gnome-base/gnome-desktop:3= )
- gnome-keyring? ( >=app-crypt/libsecret-0.5 )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
- nautilus? ( >=gnome-base/nautilus-2.91.4 )
- postscript? ( >=app-text/libspectre-0.2:= )
- spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-3.6:0= )
- xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gvfs
- gnome-base/librsvg
- || (
- >=x11-themes/adwaita-icon-theme-2.17.1
- >=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.35
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
- app-text/yelp-tools
-"
-# eautoreconf needs:
-# app-text/yelp-tools
-
-PATCHES=(
- "${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
- gnome2_src_prepare
-
- # Do not depend on adwaita-icon-theme, bug #326855, #391859
- # https://bugs.freedesktop.org/show_bug.cgi?id=29942
- sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
- -i configure || die "sed failed"
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-pdf \
- --enable-comics \
- --enable-thumbnailer \
- --with-platform=gnome \
- --enable-dbus \
- $(use_enable djvu) \
- $(use_enable dvi) \
- $(use_enable gstreamer multimedia) \
- $(use_enable gnome libgnome-desktop) \
- $(use_with gnome-keyring keyring) \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable nsplugin browser-plugin) \
- $(use_enable postscript ps) \
- $(use_with spell gspell) \
- $(use_enable t1lib) \
- $(use_enable tiff) \
- $(use_enable xps) \
- BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-45.0.ebuild b/app-text/evince/evince-45.0.ebuild
new file mode 100644
index 000000000000..fd78478a7ed5
--- /dev/null
+++ b/app-text/evince/evince-45.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cups djvu dvi gstreamer gnome keyring gtk-doc +introspection nautilus postscript spell tiff xps"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ >=dev-libs/glib-2.44.0:2
+ >=gui-libs/libhandy-1.5.0:1
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib:=
+ >=x11-libs/gdk-pixbuf-2.40:2
+ >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/cairo-1.10
+ >=app-text/poppler-22.05.0:=[cairo]
+ >=app-arch/libarchive-3.6.0:=
+ djvu? ( >=app-text/djvu-3.5.22:= )
+ dvi? (
+ >=app-text/libspectre-0.2:=
+ dev-libs/kpathsea:=
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0 )
+ gnome? ( gnome-base/gnome-desktop:3= )
+ keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1:= )
+ nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 )
+ postscript? ( >=app-text/libspectre-0.2:= )
+ spell? ( >=app-text/gspell-1.6.0:= )
+ tiff? ( >=media-libs/tiff-4.0:= )
+ xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+ gnome-base/gvfs
+ gnome-base/librsvg
+"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gi-docgen-2021.1
+ app-text/docbook-xml-dtd:4.3
+ )
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddevelopment=false
+ -Dplatform=gnome
+
+ -Dviewer=true
+ -Dpreviewer=true
+ -Dthumbnailer=true
+ $(meson_use nautilus)
+
+ -Dcomics=enabled
+ $(meson_feature djvu)
+ $(meson_feature dvi)
+ -Dpdf=enabled
+ $(meson_feature postscript ps)
+ $(meson_feature tiff)
+ $(meson_feature xps)
+
+ $(meson_use gtk-doc gtk_doc)
+ -Duser_doc=true
+ $(meson_use introspection)
+ -Ddbus=true
+ $(meson_feature keyring)
+ $(meson_feature cups gtk_unix_print)
+ $(meson_feature gnome thumbnail_cache)
+ $(meson_feature gstreamer multimedia)
+ $(meson_feature spell gspell)
+
+ -Dinternal_synctex=true
+
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)"
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/{libevdocument,libevview} "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-text/evince/files/3.30.2-internal-synctex.patch b/app-text/evince/files/3.30.2-internal-synctex.patch
deleted file mode 100644
index 16ef50ecd60f..000000000000
--- a/app-text/evince/files/3.30.2-internal-synctex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a4a831f998d513c6d01394d9b106aa42faf60dd3 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 23 Feb 2019 21:05:28 +0200
-Subject: [PATCH] build: always use internal synctex instead of automagically
-
-We don't have a separate synctex package and would have to pull in
-all of texlive-core; so instead of fixing the automagic use of it,
-just remove support for external synctex, as that's easier.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 13bdd600..e5334319 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -539,7 +539,7 @@ GOBJECT_INTROSPECTION_CHECK([1.0])
-
- dnl ================== libsynctex ===========================================
-
--PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=system, has_synctex=internal)
-+has_synctex=internal
-
- dnl not found? use internal code copy.
- if test "x$has_synctex" = "xinternal"; then
---
-2.17.0
-
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index 12e56453922c..afa0e10cc24f 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="dvi">Enable the built-in DVI viewer</flag>
- <flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
- <flag name="postscript" restrict="&gt;=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag>
- <flag name="spell">Enable inline spell check for annotations via <pkg>app-text/gspell</pkg></flag>
- <flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
- (<pkg>media-libs/t1lib</pkg>)</flag>
- <flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="dvi">Enable the built-in DVI viewer</flag>
+ <flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
+ <flag name="postscript" restrict="&gt;=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag>
+ <flag name="spell">Enable inline spell check for annotations via <pkg>app-text/gspell</pkg></flag>
+ <flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/evince</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
deleted file mode 100644
index 1c4a5c12ffbd..000000000000
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Expander is a utility that acts as a filter for text editors"
-HOMEPAGE="http://www.nedit.org"
-SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
- emake -C src CC=$(tc-getCC)
-}
-
-src_install() {
- cd src
- dobin expander boxcomment align_columns align_comments where_is
- dosym boxcomment /usr/bin/unboxcomment
-
- insinto /usr/share/${P}
- doins "${S}"/service
- for x in defs macros misc templates ; do
- insinto /usr/share/${P}/${x}
- doins "${S}"/${x}/*
- done
-
- cd "${S}"/docs
- doman *.1
-
- cd "${S}"
- dodoc ChangeLog INSTALL README USAGE
-}
-
-pkg_postinst() {
- elog
- elog "Instructions for using expander with NEdit are in /usr/share/doc/${PF}/INSTALL"
- elog "Macro, definition and template files can be found in /usr/share/${P}"
- elog
-}
diff --git a/app-text/expander/expander-2.05-r3.ebuild b/app-text/expander/expander-2.05-r3.ebuild
new file mode 100644
index 000000000000..ee8a110a01e6
--- /dev/null
+++ b/app-text/expander/expander-2.05-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Expander is a utility that acts as a filter for text editors"
+HOMEPAGE="http://www.nedit.org"
+SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-clang15.patch
+)
+
+src_compile() {
+ emake -C src CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin src/{expander,boxcomment,align_columns,align_comments,where_is}
+ dosym boxcomment /usr/bin/unboxcomment
+
+ einstalldocs
+ dodoc USAGE
+ doman docs/*.1
+
+ insinto /usr/share/${P}
+ doins -r service defs macros misc templates
+}
+
+pkg_postinst() {
+ elog
+ elog "Instructions for using expander with NEdit are in ${EROOT}/usr/share/doc/${PF}/INSTALL"
+ elog "Macro, definition and template files can be found in ${EROOT}/usr/share/${P}"
+ elog
+}
diff --git a/app-text/expander/files/expander-2.05-clang15.patch b/app-text/expander/files/expander-2.05-clang15.patch
new file mode 100644
index 000000000000..a7ae9bed3ddf
--- /dev/null
+++ b/app-text/expander/files/expander-2.05-clang15.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/870898
+--- a/src/align_columns.c
++++ b/src/align_columns.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <unistd.h>
+
+ /*============================================================================*/
+ /* SYMBOL DEFINITIONS */
+--- a/src/align_comments.c
++++ b/src/align_comments.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <unistd.h>
+
+ /*===========================================================================*/
+ /* SYMBOL DEFINITIONS */
+--- a/src/boxcomment.c
++++ b/src/boxcomment.c
+@@ -59,6 +59,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ /*============================================================================*/
+ /* SYMBOL DEFINITIONS */
+--- a/src/expander.c
++++ b/src/expander.c
+@@ -114,6 +114,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <ctype.h>
++#include <unistd.h>
+
+ /*==========================================================================*/
+ /* MACRO DEFINITIONS */
+@@ -1264,7 +1265,7 @@ bool_t locate_definition(
+ bool_t ignore_definition = FALSE;
+ int i;
+ char line[ MAXBUF ];
+- static level = 0;
++ static int level = 0;
+
+ /*---------------------
+ * Recursion protection.
+--- a/src/where_is.c
++++ b/src/where_is.c
+@@ -54,6 +54,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+
+ typedef int bool_t;
+
diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.05-gentoo.patch
index 460a8164cee5..460a8164cee5 100644
--- a/app-text/expander/files/expander-2.0.5-gentoo.patch
+++ b/app-text/expander/files/expander-2.05-gentoo.patch
diff --git a/app-text/expander/metadata.xml b/app-text/expander/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/expander/metadata.xml
+++ b/app-text/expander/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/extract_url/extract_url-1.6.2.ebuild b/app-text/extract_url/extract_url-1.6.2.ebuild
index 8ccadeb5e0f5..e64257e765c4 100644
--- a/app-text/extract_url/extract_url-1.6.2.ebuild
+++ b/app-text/extract_url/extract_url-1.6.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="extracts URLs from correctly-encoded MIME email messages or plain text"
HOMEPAGE="https://www.memoryhole.net/~kyle/extract_url/ https://github.com/m3m0ryh0l3/extracturl/"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/m3m0ryh0l3/${PN/_/}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="
diff --git a/app-text/extract_url/metadata.xml b/app-text/extract_url/metadata.xml
index 13884f66a233..dbfea27111b7 100644
--- a/app-text/extract_url/metadata.xml
+++ b/app-text/extract_url/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">m3m0ryh0l3/extracturl</remote-id>
</upstream>
diff --git a/app-text/fbless/Manifest b/app-text/fbless/Manifest
deleted file mode 100644
index 766cc34198e4..000000000000
--- a/app-text/fbless/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fbless-0.2.3.tar.gz 115622 BLAKE2B c9ab9f9a4b5d5c4e6d2ec82318865b30d61674882efbf23c241516a8019cd99b9cc4e28e13f39877b85e485beab322aaf14e831268784fb208ec5efed7b36d76 SHA512 b5188b0b4c0654915487a49930987c02a3e9bc3ba47a830f744362b464235a502fb28e20bb8c91cea15a5bdbeea54775697bf57ca581f5ebbadb84134dfdbafd
diff --git a/app-text/fbless/fbless-0.2.3.ebuild b/app-text/fbless/fbless-0.2.3.ebuild
deleted file mode 100644
index 9dcad0fd14eb..000000000000
--- a/app-text/fbless/fbless-0.2.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,xml"
-inherit distutils-r1
-
-DESCRIPTION="Python-based console fb2 reader with less-like interface"
-HOMEPAGE="https://github.com/matimatik/fbless"
-SRC_URI="https://github.com/matimatik/fbless/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-text/fbless/metadata.xml b/app-text/fbless/metadata.xml
deleted file mode 100644
index d6c5780297ba..000000000000
--- a/app-text/fbless/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>pinkbyte@gentoo.org</email>
- <name>Sergey Popov</name>
- </maintainer>
- <upstream>
- <remote-id type="github">matimatik/fbless</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
index c611d5ce051e..f170dd376e03 100644
--- a/app-text/fblog/Manifest
+++ b/app-text/fblog/Manifest
@@ -1,34 +1,29 @@
-DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST fblog-1.3.1.crate 176956 BLAKE2B 71ade0f0327ba9ce97de33c83a1120c578e7dc47ee5fdfbf3ff0d10aac8cf9a0d65cc786c61152813ba4b5a1b19993a7098a5ad1a225fa3fcdc1e1f8e4cacc42 SHA512 1ed97d34d267a1f5b75086ee41687cf3ef66efdc63bb613df76b18271cd597cba4a7087237ce134f21f7a71cb9644a89032b81511d4c365aae60b7a6c07293bd
+DIST fblog-1.4.1.crate 179480 BLAKE2B 0490ff3a368c9943a64221c2a6ff7441e2ad54b7e0ea6b4d195f31c94f69cec6ca366c60dc667823a33d9661b03f959ffd2ea90294144ed6e1b804749c142972 SHA512 a72ebbc8fc1d57b6f3f0c87185cf88d52784fbc68b4e3e92dda8649c8f80dbd06c521f3ab82a2787af74b1af1d47ef448a7ae52cca12e5ddd26cb122fce22e8c
DIST hlua-0.4.1.crate 30771 BLAKE2B b2b5b39f1a686d57fdfc54d97badd4b612913518da85cf901acf3f18cebaa7c8af8a919f659ccfa47f3eebe2827b742069f63167484f6f62274c07638a548f6e SHA512 992fa3236d19906bbb0dfa1054e89e2f78fa47e858f3cf7b2a6aeb3c6c031c49084115e18640e6fe105535a3fd124467b9f61783aedc5b9c2e670d2fe326280d
DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
-DIST libc-0.2.54.crate 401259 BLAKE2B 6fe5f258837fb21af63b445b2679d3d33a498dd10c7676f30df4a95917358f48995461e41b1ac4c944c079ae99edbce77667e68ce963a7447bf1d35a579e3ee0 SHA512 46f0263b227b107aedbd3c4171d8b3fe60ea9c2413ba9fc4cf3f4f8b92090b7aeec630b687ff55ae4507ff44144dad393a3912c6fc81f8864e630c0f15196cb8
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
DIST lua52-sys-0.1.2.crate 156154 BLAKE2B 8a6ad1d9edd6ad51febf8ed44b315f8a9578ccfb57408d8247a3f161b62c3c1403fe105963c60b8c89aa210ba03af6384e00d01b480dc16060a648360921f275 SHA512 5318ddcd1d78c40cada7cc64027684f448566257f3c4b957e9dd00b163dab16a8555782de961e500ace3b093ec1e2c9cc04fc6769d7b1e5350d8758028a3056f
-DIST maplit-1.0.1.crate 8590 BLAKE2B 6f673c6ec08df4e239558ac6df9ee5cfb5b9e9af5cd9ac9452ef9e136400d415b9b41aa4ba4b4e6f1ddadbb9d42c64e7ca7496b25415ae19bb2283fb2d148e06 SHA512 8cb6d865e4a3e73d5af5e41bd48e7f971f1a361a5ac7999f915bbd7156d5a90caa07c4ae82d428217b12a6736c362fc64dcafc757b4e7fb66f645cfddc11b175
-DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
-DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
-DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
-DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
-DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4
-DIST serde-1.0.91.crate 71696 BLAKE2B d281605205a041ee0aae9755bcdb10951fd788b57a8f415628580e520950c98cc0edf0761812ed31a818f0d3858512c88faaaca49d16bb9bd72b187544e85c98 SHA512 8a335e214cddd1e1602d6bf0c01dfc5f19276154d846bde97f5a06914e8558b75bcd7eb8cee3273ed255314bbbee6a05f1f4ccaebd45bc5cc16a18c90e8635f3
-DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST serde-1.0.100.crate 73104 BLAKE2B d3557c4f170b31ca64ebd07bba8ee24eaf8e1ffbf192c97d5681dd2b18940c559c31b6fa9ab2e4d24d7b1ce9ec21c0953d37a1a5ee845b0d75d6bd1e870309a7 SHA512 bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST termion-1.5.2.crate 22076 BLAKE2B c4a49c9f8bc28f98d6b99109a6eb824b28cb58badcf3254506cd85bcc61026d900cc3fd95c29971953ba6c0979daaa5de33294e7745b816badba912c5c889d41 SHA512 573432550daf6b9edf60783a056df7f1b40ac51585194c8a6181a7b21b22a9d95d9389b3dbf90a050dbacc8988e7b1bbb189756fb5444e11cabd06b3d6c0119b
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/app-text/fblog/fblog-1.3.1.ebuild b/app-text/fblog/fblog-1.3.1.ebuild
deleted file mode 100644
index f4b44651c603..000000000000
--- a/app-text/fblog/fblog-1.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.3
-ansi_term-0.11.0
-atty-0.2.11
-bitflags-1.0.4
-cc-1.0.37
-clap-2.33.0
-fblog-1.3.1
-hlua-0.4.1
-itoa-0.4.4
-lazy_static-1.3.0
-libc-0.2.54
-lua52-sys-0.1.2
-maplit-1.0.1
-memchr-2.2.0
-numtoa-0.1.0
-pkg-config-0.3.14
-redox_syscall-0.1.54
-redox_termios-0.1.1
-regex-1.1.6
-regex-syntax-0.6.6
-ryu-0.2.8
-serde-1.0.91
-serde_json-1.0.39
-strsim-0.8.0
-termion-1.5.2
-textwrap-0.11.0
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-width-0.1.5
-utf8-ranges-1.0.2
-vec_map-0.8.1
-winapi-0.3.7
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Small command-line JSON Log viewer"
-HOMEPAGE="https://github.com/brocode/fblog"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=">=virtual/rust-1.34.2"
-
-DOCS=( README.org sample.json.log )
-
-QA_FLAGS_IGNORED="/usr/bin/fblog"
-
-src_install() {
- cargo_src_install --path=.
- einstalldocs
-}
diff --git a/app-text/fblog/fblog-1.4.1.ebuild b/app-text/fblog/fblog-1.4.1.ebuild
new file mode 100644
index 000000000000..ef8686eba41f
--- /dev/null
+++ b/app-text/fblog/fblog-1.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+ansi_term-0.11.0
+ansi_term-0.12.1
+atty-0.2.13
+bitflags-1.1.0
+cc-1.0.45
+clap-2.33.0
+fblog-1.4.1
+hlua-0.4.1
+itoa-0.4.4
+lazy_static-1.4.0
+libc-0.2.62
+lua52-sys-0.1.2
+maplit-1.0.2
+memchr-2.2.1
+pkg-config-0.3.16
+regex-1.3.1
+regex-syntax-0.6.12
+ryu-1.0.0
+serde-1.0.100
+serde_json-1.0.40
+strsim-0.8.0
+textwrap-0.11.0
+thread_local-0.3.6
+unicode-width-0.1.6
+vec_map-0.8.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Small command-line JSON Log viewer"
+HOMEPAGE="https://github.com/brocode/fblog"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 MIT Unlicense WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+DOCS=( README.org sample.json.log )
+
+QA_FLAGS_IGNORED="/usr/bin/fblog"
+
+src_install() {
+ cargo_src_install
+ einstalldocs
+}
diff --git a/app-text/fblog/metadata.xml b/app-text/fblog/metadata.xml
index bf986398f805..96ceda888ca2 100644
--- a/app-text/fblog/metadata.xml
+++ b/app-text/fblog/metadata.xml
@@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
- <longdescription lang="en">
- A small tool to view json log files
- </longdescription>
+ <!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/brocode/fblog/issues</bugs-to>
<remote-id type="github">brocode/fblog</remote-id>
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index cc7b093861d2..ab7e2ce1d18b 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1 +1 @@
-DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
+DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
diff --git a/app-text/fbpdf/fbpdf-0_p20190202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
deleted file mode 100644
index 029af2a8ece1..000000000000
--- a/app-text/fbpdf/fbpdf-0_p20190202.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
-
-DESCRIPTION="framebuffer pdf and djvu viewer"
-HOMEPAGE="https://github.com/aligrudi/fbpdf"
-
-SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
-
-LICENSE="BSD ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=app-text/mupdf-1.10:0=
- app-text/djvu:0=
- dev-lang/mujs:0=
- dev-libs/openssl:0=
- !media-gfx/fbida[fbcon]
- media-libs/freetype:2=
- media-libs/jbig2dec:0=
- media-libs/openjpeg:0=
- virtual/jpeg:0=
-"
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}-${COMMIT}
-
-PATCHES=(
- "${FILESDIR}"/${P}-use-pkg-config.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin fbpdf fbdjvu
- dodoc README
-}
diff --git a/app-text/fbpdf/fbpdf-0_p20200614.ebuild b/app-text/fbpdf/fbpdf-0_p20200614.ebuild
new file mode 100644
index 000000000000..964e63527de6
--- /dev/null
+++ b/app-text/fbpdf/fbpdf-0_p20200614.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT="27c9e28e9199a2491d0ee0a885760bedb1d4547b"
+
+DESCRIPTION="framebuffer pdf and djvu viewer"
+HOMEPAGE="https://github.com/aligrudi/fbpdf"
+
+SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=app-text/mupdf-1.10:0=
+ app-text/djvu:0=
+ !media-gfx/fbida[fbcon(-)]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${P}-${COMMIT}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0_p20190202-use-pkg-config.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin fbpdf fbdjvu
+ dodoc README
+}
diff --git a/app-text/fbpdf/metadata.xml b/app-text/fbpdf/metadata.xml
index c5298995d2d4..61d3aa230a8b 100644
--- a/app-text/fbpdf/metadata.xml
+++ b/app-text/fbpdf/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slyfox@gentoo.org</email>
- <name>Sergei Trofimovich</name>
- </maintainer>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">aligrudi/fbpdf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index ce4f596e3257..a7e551e718ce 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1 +1,2 @@
+DIST fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
deleted file mode 100644
index 7c47fc4ac07a..000000000000
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib flag-o-matic qmake-utils
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/expat
- dev-libs/libunibreak
- dev-libs/fribidi
- dev-db/sqlite
- net-misc/curl
- sys-libs/zlib
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtnetwork:5[ssl]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-# bugs #452636, #515698, #516794, #437262, #592588
-PATCHES=( "${FILESDIR}"/${P}-combined.patch )
-
-src_prepare() {
- default
-
- append-cflags -std=c++11
-
- # Let portage decide about the compiler
- sed -e "/^CC = /d" \
- -i makefiles/arch/desktop.mk || die "removing CC line failed"
-
- # let portage strip the binary
- sed -e '/@strip/d' \
- -i fbreader/desktop/Makefile || die
-
- # Respect *FLAGS
- sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
- -i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
- sed -e "/^ CFLAGS +=/d" \
- -i makefiles/config.mk || die "CFLAGS sed failed"
- sed -e "/^ LDFLAGS += -s$/d" \
- -i makefiles/config.mk || die "LDFLAGS sed failed"
- sed -e "/^LDFLAGS =$/d" \
- -i makefiles/arch/desktop.mk || die "LDFLAGS sed failed"
-
- # Qt5 moc
- sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
- -i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-
- echo "TARGET_ARCH = desktop" > makefiles/target.mk
- echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
- echo "UI_TYPE = qt4" >> makefiles/target.mk
-
- if use debug; then
- echo "TARGET_STATUS = debug" >> makefiles/target.mk
- else
- echo "TARGET_STATUS = release" >> makefiles/target.mk
- fi
-}
-
-src_compile() {
- # bug #484516
- emake -j1
-}
-
-src_install() {
- default
- dosym FBReader /usr/bin/fbreader
-}
diff --git a/app-text/fbreader/fbreader-0.99.4-r6.ebuild b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
new file mode 100644
index 000000000000..7b1a9042d69d
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="https://www.fbreader.org/"
+SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz
+ https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-combined.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="debug"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-db/sqlite
+ dev-libs/expat
+ dev-libs/fribidi
+ dev-libs/libunibreak:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtwidgets:5
+ net-misc/curl
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+# bugs #452636, #515698, #516794, #437262, #592588
+PATCHES=( "${DISTDIR}"/${P}-combined.patch )
+
+src_prepare() {
+ default
+
+ # Let portage decide about the compiler
+ sed -e "/^CC = /d" \
+ -i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+ # let portage strip the binary
+ sed -e '/@strip/d' \
+ -i fbreader/desktop/Makefile || die
+
+ # Respect *FLAGS
+ sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+ -i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+ sed -e "/^ CFLAGS +=/d" \
+ -i makefiles/config.mk || die "CFLAGS sed failed"
+ sed -e "/^ LDFLAGS += -s$/d" \
+ -i makefiles/config.mk || die "LDFLAGS sed failed"
+ sed -e "/^LDFLAGS =$/d" \
+ -i makefiles/arch/desktop.mk || die "LDFLAGS sed failed"
+
+ # Qt5 moc
+ sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
+ -i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+ echo "TARGET_ARCH = desktop" > makefiles/target.mk || die
+ echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk || die
+
+ echo "UI_TYPE = qt4" >> makefiles/target.mk || die
+
+ if use debug; then
+ echo "TARGET_STATUS = debug" >> makefiles/target.mk || die
+ else
+ echo "TARGET_STATUS = release" >> makefiles/target.mk || die
+ fi
+
+ # bug #437262
+ tc-ld-disable-gold
+}
+
+src_compile() {
+ # bug #484516
+ emake -j1
+}
+
+src_install() {
+ default
+ dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/files/fbreader-0.99.4-combined.patch b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
deleted file mode 100644
index f75c0fdf1e2c..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-combined.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
---- fbreader-0.99.4.orig/fbreader/Makefile 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/Makefile 2018-01-11 22:18:18.000208200 +0700
-@@ -23,5 +23,5 @@
- done;
- @echo -n 'Linking $(TARGET) ...'
-- @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
-+ @$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
- @echo ' OK'
-
-diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
---- fbreader-0.99.4.orig/fbreader/desktop/desktop 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/desktop/desktop 2018-01-11 22:13:58.401219117 +0700
-@@ -22,2 +22,3 @@
- Icon=FBReader
- Categories=Office;Viewer;Literature;
-+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
-diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp
---- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp 2018-01-11 22:18:33.000207569 +0700
-@@ -60,5 +60,5 @@
- return false;
- }
-- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
-+ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
- if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
- clear();
-diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk
---- fbreader-0.99.4.orig/makefiles/arch/desktop.mk 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/makefiles/arch/desktop.mk 2018-01-11 22:18:40.119207269 +0700
-@@ -15,27 +15,9 @@
- CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
- LDFLAGS =
--EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
-+EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
-
--ifeq "$(UI_TYPE)" "qt"
-- MOC = moc-qt3
-- QTINCLUDE = -I /usr/include/qt3
--else
-- MOC = $(shell pkg-config QtCore --variable=moc_location)
-- QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
--endif
--
--GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
--
--ifeq "$(UI_TYPE)" "qt"
-- UILIBS = -lqt-mt
--endif
--
--ifeq "$(UI_TYPE)" "qt4"
-- UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
--endif
--
--ifeq "$(UI_TYPE)" "gtk"
-- UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
--endif
-+MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc"
-+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
-+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
-
- RM = rm -rvf
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,7 +18,7 @@
- */
-
--#include <QtGui/QBoxLayout>
--#include <QtGui/QLineEdit>
--#include <QtGui/QToolBar>
-+#include <QtWidgets/QBoxLayout>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QToolBar>
- #include <QtGui/QKeyEvent>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,15 +18,15 @@
- */
-
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QPixmap>
- #include <QtGui/QImage>
- #include <QtGui/QIcon>
--#include <QtGui/QToolBar>
--#include <QtGui/QMenuBar>
--#include <QtGui/QMenu>
--#include <QtGui/QToolButton>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QToolBar>
-+#include <QtWidgets/QMenuBar>
-+#include <QtWidgets/QMenu>
-+#include <QtWidgets/QToolButton>
-+#include <QtWidgets/QLayout>
- #include <QtGui/QWheelEvent>
--#include <QtGui/QDockWidget>
-+#include <QtWidgets/QDockWidget>
- #include <QtCore/QObjectList>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h 2018-01-11 22:18:40.120207269 +0700
-@@ -23,6 +23,6 @@
- #include <map>
-
--#include <QtGui/QMainWindow>
--#include <QtGui/QAction>
-+#include <QtWidgets/QMainWindow>
-+#include <QtWidgets/QAction>
- #include <QtGui/QCursor>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,6 +18,6 @@
- */
-
--#include <QtGui/QApplication>
--#include <QtGui/QPushButton>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QPushButton>
-
- #include <ZLDialogManager.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h 2018-01-11 22:18:40.120207269 +0700
-@@ -21,6 +21,6 @@
- #define __ZLQTDIALOG_H__
-
--#include <QtGui/QDialog>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QLayout>
-
- #include <ZLDialog.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,8 +18,8 @@
- */
-
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLayout>
-
- #include "ZLQtDialogContent.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,9 +18,9 @@
- */
-
--#include <QtGui/QApplication>
--#include <QtGui/QMessageBox>
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QMessageBox>
-+#include <QtWidgets/QFileDialog>
- #include <QtGui/QClipboard>
--#include <QtGui/QDesktopWidget>
-+#include <QtWidgets/QDesktopWidget>
-
- #include "ZLQtDialogManager.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,5 +18,5 @@
- */
-
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QFileDialog>
-
- #include "ZLQtOpenFileDialog.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp 2018-01-11 22:18:40.121207269 +0700
-@@ -20,14 +20,14 @@
- #include <cctype>
-
--#include <QtGui/QCheckBox>
--#include <QtGui/QComboBox>
--#include <QtGui/QLabel>
--#include <QtGui/QGroupBox>
--#include <QtGui/QRadioButton>
--#include <QtGui/QPushButton>
--#include <QtGui/QSpinBox>
--#include <QtGui/QLineEdit>
--#include <QtGui/QSlider>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QCheckBox>
-+#include <QtWidgets/QComboBox>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QGroupBox>
-+#include <QtWidgets/QRadioButton>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QSpinBox>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QSlider>
-+#include <QtWidgets/QLayout>
-
- #include <ZLStringUtil.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp 2018-01-11 22:18:40.121207269 +0700
-@@ -18,9 +18,9 @@
- */
-
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QLayout>
--#include <QtGui/QPushButton>
--#include <QtGui/QButtonGroup>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QButtonGroup>
- #include <QtGui/QResizeEvent>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h 2018-01-11 22:18:40.121207269 +0700
-@@ -21,7 +21,7 @@
- #define __ZLQTOPTIONSDIALOG_H__
-
--#include <QtGui/QWidget>
--#include <QtGui/QTabWidget>
--#include <QtGui/QDialog>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QTabWidget>
-+#include <QtWidgets/QDialog>
-
- #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp 2018-01-11 22:18:40.121207269 +0700
-@@ -20,9 +20,9 @@
- #include <unistd.h>
-
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLabel>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLayout>
- #include <QtCore/QThreadPool>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h 2018-01-11 22:18:40.121207269 +0700
-@@ -23,9 +23,9 @@
- #include <string>
-
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QCursor>
--#include <QtGui/QDialog>
--#include <QtGui/QProgressBar>
--#include <QtGui/QLabel>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QProgressBar>
-+#include <QtWidgets/QLabel>
- #include <QtCore/QRunnable>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -20,10 +20,10 @@
- #include <algorithm>
-
--#include <QtGui/QSplitter>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
- #include <QtGui/QResizeEvent>
- #include <QtCore/QDebug>
-+#include <QtWidgets/QSplitter>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-
- #include <ZLFile.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h 2018-01-11 22:18:40.121207269 +0700
-@@ -25,10 +25,10 @@
- #include <QtCore/QMap>
-
--#include <QtGui/QDialog>
--#include <QtGui/QScrollArea>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
--#include <QtGui/QWidget>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QWidget>
-
- #include <ZLTreeDialog.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2018-01-11 22:13:28.444220377 +0700
-@@ -49,3 +49,4 @@
- path = replacement + path.substr(1);
- }
-+ ZLUnixFSManager::normalizeRealPath(path);
- }
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h 2018-01-11 22:18:40.121207269 +0700
-@@ -21,5 +21,5 @@
- #define __ZLQAPPLICATION_H__
-
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
-
- class ZLQApplication : public QApplication {
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp 2018-01-11 22:18:40.121207269 +0700
-@@ -20,5 +20,5 @@
- #include <QtCore/QTextCodec>
- #include <QtCore/QFile>
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QFileOpenEvent>
-
-@@ -73,5 +73,5 @@
- new ZLQApplication(argc, argv);
-
-- QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
-+ QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
-
- ZLibrary::parseArguments(argc, argv);
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -25,5 +25,7 @@
- #include <QtCore/QList>
- #include <QtCore/QTimer>
-+#include <QtCore/QUrlQuery>
-
-+#include <QtNetwork/QNetworkCookie>
- #include <QtNetwork/QNetworkRequest>
- #include <QtNetwork/QNetworkReply>
-@@ -150,10 +152,10 @@
- if (!scope.request->postParameters().empty()) {
- QByteArray data;
-- QUrl tmp;
-+ QUrlQuery tmp;
- typedef std::pair<std::string, std::string> string_pair;
- foreach (const string_pair &pair, scope.request->postParameters()) {
- tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
- }
-- data = tmp.encodedQuery();
-+ data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
- reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
- } else {
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-01-11 22:13:39.639219906 +0700
-@@ -87,5 +87,5 @@
-
- void QtWaitingSpinner::setRoundness(qreal roundness) {
-- myRoundness = std::max(0.0, std::min(100.0, roundness));
-+ myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
- }
-
-@@ -149,5 +149,5 @@
- qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
- qreal resultAlpha = color.alphaF() - gradation * distance;
-- resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
-+ resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
- color.setAlphaF(resultAlpha);
- return color;
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h 2018-01-11 22:18:40.121207269 +0700
-@@ -4,5 +4,5 @@
- #include <QtCore/QTimer>
-
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QColor>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,12 +18,12 @@
- */
-
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
- #include <QtGui/QPixmap>
- #include <QtGui/QPalette>
- #include <QtGui/QPainter>
- #include <QtGui/QPaintEvent>
--#include <QtGui/QScrollBar>
- #include <QtCore/QTimer>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-
- #include <QtCore/QDebug>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h 2018-01-11 22:18:40.120207269 +0700
-@@ -21,10 +21,10 @@
- #define __ZLQTITEMSLISTWIDGET_H__
-
--#include <QtGui/QWidget>
--#include <QtGui/QFrame>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QScrollArea>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QFrame>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QScrollArea>
-
- #include <ZLTreeTitledNode.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -18,8 +18,8 @@
- */
-
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
--#include <QtGui/QGraphicsDropShadowEffect>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-+#include <QtWidgets/QGraphicsDropShadowEffect>
-
- #include <QtCore/QDebug>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h 2018-01-11 22:18:40.121207269 +0700
-@@ -21,9 +21,9 @@
- #define __ZLQTPREVIEWWIDGET_H__
-
--#include <QtGui/QWidget>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QScrollArea>
--#include <QtGui/QVBoxLayout>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QVBoxLayout>
- #include <QtCore/QSet>
-
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp 2018-01-11 22:18:40.120207269 +0700
-@@ -19,7 +19,7 @@
-
- #include <QtCore/QDebug>
--#include <QtGui/QStyle>
--#include <QtGui/QCompleter>
--#include <QtGui/QStringListModel>
-+#include <QtCore/QStringListModel>
-+#include <QtWidgets/QStyle>
-+#include <QtWidgets/QCompleter>
-
- #include <ZLibrary.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h 2018-01-11 22:18:40.121207269 +0700
-@@ -22,6 +22,6 @@
-
- #include <QtCore/QSet>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
-
- #include "QtWaitingSpinner.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp 2018-01-11 22:18:40.121207269 +0700
-@@ -20,6 +20,6 @@
- #include <algorithm>
-
--#include <QtGui/QLayout>
--#include <QtGui/QScrollBar>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QScrollBar>
- #include <QtGui/QPainter>
- #include <QtGui/QPixmap>
-@@ -186,9 +186,9 @@
- void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
- if (direction == ZLView::VERTICAL) {
-- myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
-- myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
-+ myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
-+ myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
- } else {
-- myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
-- myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
-+ myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
-+ myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
- }
- }
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h 2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h 2018-01-11 22:18:40.121207269 +0700
-@@ -21,5 +21,5 @@
- #define __ZLQTVIEWWIDGET_H__
-
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
-
- #include "../../../../core/src/view/ZLViewWidget.h"
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
index 6eb5f614141b..ffee515991e5 100644
--- a/app-text/fbreader/metadata.xml
+++ b/app-text/fbreader/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
</maintainer>
- <longdescription lang="en">
- FBReader is an e-book reader for various platforms.
- </longdescription>
+ <upstream>
+ <remote-id type="github">geometer/FBReader</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/fdftk/Manifest b/app-text/fdftk/Manifest
deleted file mode 100644
index dacc9066d772..000000000000
--- a/app-text/fdftk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FDFToolkitForUnix.tar.gz 5725906 BLAKE2B 800ff670744bcbb9673db6edbb1d35e0c530fed5374da26520152b257c83abda3588886d6bac787701e767c5ae0651341804468b2a744bb466b525338a7ae899 SHA512 835438c5031464c169543d42a512ad691824dcea6d7f38e746bbe778adc9511eaa15c49ac2d4b3a92e4f831275e16a409e9e1e275983fb70309559ecdf686a66
diff --git a/app-text/fdftk/fdftk-6.0-r1.ebuild b/app-text/fdftk/fdftk-6.0-r1.ebuild
deleted file mode 100644
index d4f4935a36bf..000000000000
--- a/app-text/fdftk/fdftk-6.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="FDFToolkitForUnix"
-At="${MY_P}.tar.gz"
-
-DESCRIPTION="Acrobat FDF Toolkit"
-HOMEPAGE="http://www.adobe.com/devnet/acrobat/fdftoolkit.html"
-SRC_URI="${At}"
-
-SLOT="0"
-LICENSE="Adobe"
-KEYWORDS="-* x86" # binaries for i386 type hardware ONLY
-RESTRICT="fetch strip mirror"
-
-#DEPEND="
-# perl? ( dev-lang/perl )"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_nofetch() {
- einfo "1. Visit ${HOMEPAGE}"
- einfo "2. Review EULA"
- einfo "3. Download ${At}"
- einfo "4. Move ${At} to your DISTDIR directory"
-}
-
-src_unpack() {
- if [ ! -r ${DISTDIR}/${At} ]; then
- eerror "cannot read ${At}. Please check the permission and try again."
- die
- fi
- unpack ${At} || die
-}
-
-src_install () {
- into /opt/${P}
- dolib.so "Headers and Libraries/LINUX/libFdfTk.so" || die
- insinto /opt/${P}/include
- doins "Headers and Libraries/Headers/FdfTk.h" || die
- # It doesn't support Perl 5.8.*
- #if use perl; then
- # eval `perl '-V:package'`
- # eval `perl '-V:version'`
- # eval `perl '-V:archname'`
- # insinto /usr/lib/${package}/vendor_perl/${version}/Acrobat
- # exeinto /usr/lib/${package}/vendor_perl/${version}/${archname}/auto/Acrobat/FDF
- # doexe "Headers and Libraries/LINUX/FDF.so" || die
- # doins "Headers and Libraries/Headers/FDF.pm" || die
- #fi
-
- into /usr
- dodoc ReadMe.txt Documentation/*.pdf
-
- dodir /etc/env.d
- echo "LDPATH=/opt/${P}/lib" >${D}/etc/env.d/55${P}
-}
diff --git a/app-text/fdftk/metadata.xml b/app-text/fdftk/metadata.xml
deleted file mode 100644
index f93818d4dfc6..000000000000
--- a/app-text/fdftk/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>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/feathernotes/Manifest b/app-text/feathernotes/Manifest
new file mode 100644
index 000000000000..e7f3dcef6859
--- /dev/null
+++ b/app-text/feathernotes/Manifest
@@ -0,0 +1 @@
+DIST feathernotes-1.2.0.tar.gz 926273 BLAKE2B ae945ae6adb95d3cd8ef42becfcd68a591ef62f97f05d514f19a9c07e6900b2230e89361b65abfc2082797755bcb8b6c521b72a6406a21886ba6ab386f23295f SHA512 f6aabc0d4bee5f3af20a86035befbc27eddedc5ec37c9a353723a80fb0f691af6ad57d5f50a0e8504336c141822227f8287ed61e52d084b34e3b8ab5246315c0
diff --git a/app-text/feathernotes/feathernotes-1.2.0.ebuild b/app-text/feathernotes/feathernotes-1.2.0.ebuild
new file mode 100644
index 000000000000..3f3075fd6e7a
--- /dev/null
+++ b/app-text/feathernotes/feathernotes-1.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION=" Lightweight Qt Notes-Manager for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherNotes"
+SRC_URI="https://github.com/tsujan/FeatherNotes/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FeatherNotes-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="spell X"
+
+RDEPEND="
+ dev-qt/qtbase:6[dbus,gui,network,widgets,xml,X?]
+ dev-qt/qtsvg:6
+ spell? ( app-text/hunspell:= )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITHOUT_X11=$(usex !X)
+ -DWITH_HUNSPELL=$(usex spell)
+ )
+ cmake_src_configure
+}
diff --git a/app-text/feathernotes/feathernotes-9999.ebuild b/app-text/feathernotes/feathernotes-9999.ebuild
new file mode 100644
index 000000000000..880fc704e847
--- /dev/null
+++ b/app-text/feathernotes/feathernotes-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3 cmake xdg
+
+DESCRIPTION=" Lightweight Qt Notes-Manager for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherNotes"
+EGIT_REPO_URI="https://github.com/tsujan/FeatherNotes"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="spell X"
+
+RDEPEND="
+ dev-qt/qtbase:6[dbus,gui,network,widgets,xml,X?]
+ dev-qt/qtsvg:6
+ spell? ( app-text/hunspell:= )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITHOUT_X11=$(usex !X)
+ -DWITH_HUNSPELL=$(usex spell)
+ )
+ cmake_src_configure
+}
diff --git a/app-text/feathernotes/metadata.xml b/app-text/feathernotes/metadata.xml
new file mode 100644
index 000000000000..25af69d6ae8f
--- /dev/null
+++ b/app-text/feathernotes/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>arthurzam@gentoo.org</email>
+ <name>Arthur Zamarin</name>
+ </maintainer>
+ <use>
+ <flag name="X">
+ Link application against X11 libraries which adds
+ support for virtual desktop awareness and tab DND
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">tsujan/FeatherNotes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/fictionup/Manifest b/app-text/fictionup/Manifest
index 9746bf146192..fbb4b3516ad9 100644
--- a/app-text/fictionup/Manifest
+++ b/app-text/fictionup/Manifest
@@ -1 +1 @@
-DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2a4f6a563ea9d5fc1c25ff417a98f487fd26f1c578234007ccb52902390e6292fd3f1b3ec0331a31d00e25e9c3 SHA512 375dbfb27cab05693197b0774875ebbafdb5c4a1bc67db318e00712b821d37fc647b5047fbca083ad145847aa61b81486e4f5192524c233d3facdec3447beb6e
+DIST fictionup-0.2.1.tar.gz 375892 BLAKE2B 1aa80517116e2154227fbc374efe6f051c665c7a2cbc0b2f7c71373a1f535ea41189db4528134b0031f754507d214e6f787df3b571443b6dc5d17f60535069c6 SHA512 c6fadac5bfbd88356dd90b4d2673d2d3dd4d7b5cc26d0b0e1141862143d79b8cfbb71cbbe1c82fe52e4777aed43a677efba1479d14ac64d3931d6bcf31dbc127
diff --git a/app-text/fictionup/fictionup-0.1.ebuild b/app-text/fictionup/fictionup-0.1.ebuild
deleted file mode 100644
index 08b5f5315776..000000000000
--- a/app-text/fictionup/fictionup-0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="A command-line markdown to fb2 convertor"
-HOMEPAGE="http://cdslow.org.ru/fictionup/"
-SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND="dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-src_install() {
- cmake-utils_src_install
- mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF} || die "doc mv failed"
-}
diff --git a/app-text/fictionup/fictionup-0.2.1.ebuild b/app-text/fictionup/fictionup-0.2.1.ebuild
new file mode 100644
index 000000000000..8ed3f78991ae
--- /dev/null
+++ b/app-text/fictionup/fictionup-0.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Command-line markdown to fb2 convertor"
+HOMEPAGE="http://cdslow.org.ru/fictionup/"
+SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libyaml"
+RDEPEND="${DEPEND}"
diff --git a/app-text/fictionup/metadata.xml b/app-text/fictionup/metadata.xml
index af04cd4a1e5f..f4e295b81e8a 100644
--- a/app-text/fictionup/metadata.xml
+++ b/app-text/fictionup/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
index 14a13d1a7628..6cbbb39a7ea0 100644
--- a/app-text/flpsed/Manifest
+++ b/app-text/flpsed/Manifest
@@ -1,3 +1 @@
-DIST flpsed-0.7.0.tar.gz 119159 BLAKE2B 1a051651d3d4835abea7ef3237340140feba465d9d42009b10fa18ac5aa927efeced7418477e096a9a5722f0e9217ba0546e324402ef5b84892adbba3f258c32 SHA512 0d5112f4e4f4401a1942767d0de1b38cffbc37e0f798b59e9371c37892c6d2e2448146baff2737e416ab9ec5d96963728918d4a49fc059ac1119d8ac946db59e
-DIST flpsed-0.7.2.tar.gz 146678 BLAKE2B 0e42f1e5653e9b372047216119fb7fdaab98ad3710c0ef717352ce23443e38fb23bd86e4c39663cb0fa51f80393d2f956658f825f3926dd12b28521bc2d1a7ba SHA512 d0e2f7d34e48555d74f58e9df16fa6d29e8fda1fb4c6e58ccdda512f25d7f7ee0e3657e11564cdb9dec483c14f42078636430e5ec987165cc7c6c5de8990984d
DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321
diff --git a/app-text/flpsed/flpsed-0.7.0.ebuild b/app-text/flpsed/flpsed-0.7.0.ebuild
deleted file mode 100644
index 671e2fb01d23..000000000000
--- a/app-text/flpsed/flpsed-0.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- >=x11-libs/fltk-1.3.0:1
- app-text/ghostscript-gpl[X]"
-
-DEPEND="${RDEPEND}"
diff --git a/app-text/flpsed/flpsed-0.7.2.ebuild b/app-text/flpsed/flpsed-0.7.2.ebuild
deleted file mode 100644
index 5e75d7154621..000000000000
--- a/app-text/flpsed/flpsed-0.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- >=x11-libs/fltk-1.3.0:1
- app-text/ghostscript-gpl[X]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
-}
-
-src_install() {
- default
-
- doicon ${PN}.png
- doicon -s scalable ${PN}.svg
- domenu ${PN}.desktop
-}
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index 7e38407047ce..f3c15f0bc3f0 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils
+inherit desktop xdg
DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
+HOMEPAGE="https://flpsed.org/flpsed.html"
+SRC_URI="https://flpsed.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
-RDEPEND="x11-libs/libX11
+RDEPEND="
+ x11-libs/libX11
x11-libs/libXext
x11-libs/libXft
>=x11-libs/fltk-1.3.0:1
app-text/ghostscript-gpl[X]"
DEPEND="${RDEPEND}"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.7.2-desktop.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-desktop.patch )
src_install() {
default
diff --git a/app-text/flpsed/metadata.xml b/app-text/flpsed/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/flpsed/metadata.xml
+++ b/app-text/flpsed/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
new file mode 100644
index 000000000000..de219933828b
--- /dev/null
+++ b/app-text/foliate/Manifest
@@ -0,0 +1 @@
+DIST foliate-3.1.0.tar.bz2 7902106 BLAKE2B cd804b168529ebde3312954de6e907d4de30ef4342dbcf872757f485d5b5e223c96629c01d6e0e0b3bb7cfcc1e98015b034b053d6a6429138a8aa1ed40b0b0c2 SHA512 36dfb6618b04fcfdd3d298133f9fb592e987b898420da08d1e2e1539f162abc4c06cf28e3c9e6ae5f008554fdec9ab36a69333f5c5074b069c345ae729301236
diff --git a/app-text/foliate/foliate-3.1.0.ebuild b/app-text/foliate/foliate-3.1.0.ebuild
new file mode 100644
index 000000000000..87f75f240349
--- /dev/null
+++ b/app-text/foliate/foliate-3.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="ar cs de el es eu fa_IR fr he hi hr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
+inherit meson plocale xdg gnome2-utils
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="${MESON_DEPEND}"
+RDEPEND=">=dev-libs/gjs-1.76
+ >=gui-libs/gtk-4.12
+ gui-libs/libadwaita
+ net-libs/webkit-gtk:6[introspection]
+ sys-devel/gettext"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ plocale_find_changes "${S}"/po '' '.po'
+
+ rm_po() {
+ rm po/${1}.po
+ sed -e "/^${1}/d" -i po/LINGUAS
+ }
+
+ plocale_for_each_disabled_locale rm_po
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml
new file mode 100644
index 000000000000..56812b6b96b7
--- /dev/null
+++ b/app-text/foliate/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ A simple and modern GTK eBook viewer, built with GJS and Epub.js.
+ Supported formats:
+ epub, epub3, azw, azw3, mobi, fb2, fb2.zip, cbr, cbz, cbt, cb7, txt
+ </longdescription>
+ <upstream>
+ <remote-id type="github">johnfactotum/foliate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/freepwing/Manifest b/app-text/freepwing/Manifest
deleted file mode 100644
index ba91bca17361..000000000000
--- a/app-text/freepwing/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freepwing-1.4.3.tar.gz 129499 BLAKE2B d21e6a6e84fff368a6b483dfe68d46f0955ba234e924a7b7c1b50d4124404c3a274d9a6dbe439cc476e9eb146d1c9039ede7b47488b7a7e514a0ca0915f288a9 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734
diff --git a/app-text/freepwing/freepwing-1.4.3.ebuild b/app-text/freepwing/freepwing-1.4.3.ebuild
deleted file mode 100644
index 4e5d4445ce6a..000000000000
--- a/app-text/freepwing/freepwing-1.4.3.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
-
-IUSE=""
-
-DESCRIPTION="FreePWING is a free JIS X 4081 (subset of EPWING V1) formatter"
-HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/freepwing/"
-SRC_URI="ftp://ftp.sra.co.jp/pub/misc/freepwing/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="dev-lang/perl"
-
-src_install() {
- emake install DESTDIR="${D}" \
- perllibdir=`perl -V:vendorlib | cut -d\' -f2` \
- pkgdocdir=/usr/share/doc/${PF} || die
-
- dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/app-text/freepwing/metadata.xml b/app-text/freepwing/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/freepwing/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-text/fzy/Manifest b/app-text/fzy/Manifest
new file mode 100644
index 000000000000..a56ac8104276
--- /dev/null
+++ b/app-text/fzy/Manifest
@@ -0,0 +1 @@
+DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
diff --git a/app-text/fzy/files/1.0-cflags.patch b/app-text/fzy/files/1.0-cflags.patch
new file mode 100644
index 000000000000..4805b4814a45
--- /dev/null
+++ b/app-text/fzy/files/1.0-cflags.patch
@@ -0,0 +1,34 @@
+From 89b4a0437dce6f99de80482d484b3e0346067889 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 24 Apr 2020 19:12:16 -0700
+Subject: [PATCH] cflags
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2d23118..713daad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION=1.0
+
+ CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps
++CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps
+ PREFIX?=/usr/local
+ MANDIR?=$(PREFIX)/share/man
+ BINDIR?=$(PREFIX)/bin
+@@ -29,7 +29,7 @@ check: test/fzytest
+ $(DEBUGGER) ./test/fzytest
+
+ fzy: $(OBJECTS)
+- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS)
++ $(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
+
+ %.o: %.c config.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+--
+2.26.2
+
diff --git a/app-text/fzy/fzy-1.0-r1.ebuild b/app-text/fzy/fzy-1.0-r1.ebuild
new file mode 100644
index 000000000000..a7450fedb766
--- /dev/null
+++ b/app-text/fzy/fzy-1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
+else
+ SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Fuzzy text selector (interactive grep) for console"
+HOMEPAGE="https://github.com/jhawthorn/fzy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/1.0-cflags.patch )
+
+src_prepare() {
+ default
+ restore_config config.h
+ tc-export CC
+}
+
+src_install() {
+ local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dobin contrib/fzy-tmux
+ dobin contrib/fzy-dvtm
+ einstalldocs
+ save_config config.h
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+ optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm
+ optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux
+}
diff --git a/app-text/fzy/fzy-9999.ebuild b/app-text/fzy/fzy-9999.ebuild
new file mode 100644
index 000000000000..702455296c5c
--- /dev/null
+++ b/app-text/fzy/fzy-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
+else
+ SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Fuzzy text selector (interactive grep) for console"
+HOMEPAGE="https://github.com/jhawthorn/fzy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+ restore_config config.h
+ tc-export CC
+ sed -i 's/$(LIBS)/$(LIBS) $(LDFLAGS)/g' Makefile || die
+}
+
+src_install() {
+ local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dobin contrib/fzy-tmux
+ dobin contrib/fzy-dvtm
+ einstalldocs
+ save_config config.h
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+ optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm
+ optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux
+}
diff --git a/app-text/fzy/metadata.xml b/app-text/fzy/metadata.xml
new file mode 100644
index 000000000000..628df2e40fcd
--- /dev/null
+++ b/app-text/fzy/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Fuzzy text selector (interactive grep) for console.
+ It can be used to filter any list:
+ files, command history, processes, hostnames, bookmarks, git commits, etc.
+ It's designed to be used both as an editor plugin and on the command line.
+ Rather than clearing the screen, fzy displays its interface directly below
+ the current cursor position, scrolling the screen if necessary.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">jhawthorn/fzy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/gentoo-dtd/Manifest b/app-text/gentoo-dtd/Manifest
new file mode 100644
index 000000000000..77d39c1fa1bc
--- /dev/null
+++ b/app-text/gentoo-dtd/Manifest
@@ -0,0 +1 @@
+DIST gentoo-dtd-20230914.tar.xz 6288 BLAKE2B 0b11fb7c34bf6be994242d93ae3a999d6490a177bcdd596d6b949a903c663fa66c75ea14d52e3d63ab19c806742be470570303c16ab656ce69e8a7406f38ef6c SHA512 29f8a12ddb2e9764c1d1eace26a4e7ae559c9001c32313e55708529a894a93a54c17c856e34589c016451a594deedb32279d282fbb9452b671089061a073bc71
diff --git a/app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild b/app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild
new file mode 100644
index 000000000000..2f030b713978
--- /dev/null
+++ b/app-text/gentoo-dtd/gentoo-dtd-20230914.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 99999999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/data/dtd.git"
+else
+ # git archive --prefix=${P}/ HEAD | xz >${P}.tar.xz
+ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Document Type Definition for Gentoo-related XML files"
+HOMEPAGE="https://gitweb.gentoo.org/data/dtd.git/"
+
+# Presumably these simple DTDs are not copyrightable,
+# but repositories.dtd says GPL v2 or later.
+LICENSE="public-domain GPL-2+"
+SLOT="0"
+
+RDEPEND="dev-libs/libxml2"
+IDEPEND="${RDEPEND}"
+
+src_install() {
+ insinto /usr/share/xml/gentoo/dtd
+ doins *.dtd
+}
+
+pkg_postinst() {
+ ebegin "Installing catalog entry"
+ xmlcatalog --noout \
+ --add rewriteSystem "http://www.gentoo.org/dtd/" \
+ "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \
+ --add rewriteSystem "https://www.gentoo.org/dtd/" \
+ "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \
+ "${EROOT}"/etc/xml/catalog
+ eend $?
+}
+
+pkg_postrm() {
+ ebegin "Cleaning catalog"
+ xmlcatalog --noout \
+ --del "http://www.gentoo.org/dtd/" \
+ --del "https://www.gentoo.org/dtd/" \
+ "${EROOT}"/etc/xml/catalog
+ eend $?
+}
diff --git a/app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild b/app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild
new file mode 100644
index 000000000000..2f030b713978
--- /dev/null
+++ b/app-text/gentoo-dtd/gentoo-dtd-99999999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 99999999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/data/dtd.git"
+else
+ # git archive --prefix=${P}/ HEAD | xz >${P}.tar.xz
+ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Document Type Definition for Gentoo-related XML files"
+HOMEPAGE="https://gitweb.gentoo.org/data/dtd.git/"
+
+# Presumably these simple DTDs are not copyrightable,
+# but repositories.dtd says GPL v2 or later.
+LICENSE="public-domain GPL-2+"
+SLOT="0"
+
+RDEPEND="dev-libs/libxml2"
+IDEPEND="${RDEPEND}"
+
+src_install() {
+ insinto /usr/share/xml/gentoo/dtd
+ doins *.dtd
+}
+
+pkg_postinst() {
+ ebegin "Installing catalog entry"
+ xmlcatalog --noout \
+ --add rewriteSystem "http://www.gentoo.org/dtd/" \
+ "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \
+ --add rewriteSystem "https://www.gentoo.org/dtd/" \
+ "file://${EPREFIX}/usr/share/xml/gentoo/dtd/" \
+ "${EROOT}"/etc/xml/catalog
+ eend $?
+}
+
+pkg_postrm() {
+ ebegin "Cleaning catalog"
+ xmlcatalog --noout \
+ --del "http://www.gentoo.org/dtd/" \
+ --del "https://www.gentoo.org/dtd/" \
+ "${EROOT}"/etc/xml/catalog
+ eend $?
+}
diff --git a/app-text/gentoo-dtd/metadata.xml b/app-text/gentoo-dtd/metadata.xml
new file mode 100644
index 000000000000..eee04478cf76
--- /dev/null
+++ b/app-text/gentoo-dtd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>ulm@gentoo.org</email>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="gentoo">data/dtd</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
deleted file mode 100644
index 57b8d5959cdf..000000000000
--- a/app-text/getxbook/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST getxbook-1.0.tar.bz2 22314 BLAKE2B cc3b652d4c580c8a5f41a0fc58c2d7cfc9e783fe2c159fb871c0a89d8246f65f9601265e8a7b51c593ef27a726b07faa84a9d2333f2d448b1661d1dad2e48e0f SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941
-DIST getxbook-1.2.tar.xz 23776 BLAKE2B 327a35a73a5e29eefcf3f87cd8ba1237da5d045e3ef009d3ae708797fa78e6d844baa4cba2e8ff021d71951ca100e087d69a98dac3ddce953afa549b63e7e1f8 SHA512 fec397d4fd979421658f7ef9535f3c25369c8bd4ea2f9adcd719f760fd01265ed789f9eca34374b245c24acd485b951c91fa92a36d5b6401a0e0bf4db746788d
diff --git a/app-text/getxbook/files/getxbook-1.0.patch b/app-text/getxbook/files/getxbook-1.0.patch
deleted file mode 100644
index 50da6328bf8a..000000000000
--- a/app-text/getxbook/files/getxbook-1.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- Makefile | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f6507b5..d080f2b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,12 @@
- # See COPYING file for copyright and license details.
--include config.mk
-+VERSION = 1.0
-+RELDATE = 2012-08-19
-+PREFIX = /usr
-+MANPREFIX = $(PREFIX)/share/man
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra \
-+ -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
-+CC ?= cc
-+LD = $(CC)
-
- NAME = getxbook
-
-@@ -20,16 +27,16 @@ $(BIN): util.a
-
- .o:
- @echo LD $@
-- @$(LD) -o $@ $< util.a $(LDFLAGS)
-+ $(LD) $(LDFLAGS) -o $@ $< util.a
-
- .c.o:
- @echo CC $<
-- @$(CC) -c $(CFLAGS) $<
-+ $(CC) -c $(CFLAGS) $<
-
- util.a: $(LIB)
- @echo AR $@
-- @$(AR) -r -c $@ $(LIB)
-- @ranlib $@
-+ $(AR) -r -c $@ $(LIB)
-+ $(RANLIB) $@
-
- install: all
- mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/getxbook/files/getxbook-1.2.patch b/app-text/getxbook/files/getxbook-1.2.patch
deleted file mode 100644
index da0ac83264e1..000000000000
--- a/app-text/getxbook/files/getxbook-1.2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r -U2 getxbook-1.2.orig/Makefile getxbook-1.2/Makefile
---- getxbook-1.2.orig/Makefile 2015-07-28 21:52:40.000000000 +0600
-+++ getxbook-1.2/Makefile 2017-12-16 11:27:18.554822718 +0700
-@@ -1,4 +1,13 @@
- # See COPYING file for copyright and license details.
--include config.mk
-+VERSION = 1.2
-+RELDATE = 2015-07-28
-+PREFIX = /usr
-+MANPREFIX = $(PREFIX)/share/man
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror -g -D_POSIX_C_SOURCE=200112L \
-+ -DVERSION=\"$(VERSION)\"
-+CC ?= cc
-+LD = $(CC)
-+LIBS = -lssl -lcrypto
-+LDFLAGS += $(LIBS)
-
- NAME = getxbook
-@@ -21,13 +30,13 @@
- .o:
- @echo LD $@
-- @$(LD) -o $@ $< util.a $(LDFLAGS)
-+ $(LD) -o $@ $< util.a $(LDFLAGS)
-
- .c.o:
- @echo CC $<
-- @$(CC) -c $(CFLAGS) $<
-+ $(CC) -c $(CFLAGS) $<
-
- util.a: $(LIB)
- @echo AR $@
-- @$(AR) -r -s -c $@ $(LIB)
-+ $(AR) -r -s -c $@ $(LIB)
-
- install: all
diff --git a/app-text/getxbook/getxbook-1.0-r1.ebuild b/app-text/getxbook/getxbook-1.0-r1.ebuild
deleted file mode 100644
index 575f7242613f..000000000000
--- a/app-text/getxbook/getxbook-1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Download books from google, amazon, barnes and noble"
-HOMEPAGE="http://njw.me.uk/software/getxbook/"
-SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf djvu ocr tk"
-
-DEPEND=""
-RDEPEND="
- djvu? ( app-text/djvu )
- pdf? ( media-gfx/imagemagick )
- ocr? (
- app-text/tesseract
- pdf? ( media-gfx/exact-image app-text/pdftk )
- )
- tk? ( dev-lang/tk:0= )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}.patch
- tc-export CC AR RANLIB
-}
-
-src_install() {
- DOCS=( README LEGAL )
- default
-
- use pdf && dobin extras/mkpdf.sh
- use djvu && dobin extras/mkdjvu.sh
-
- if use ocr; then
- dobin extras/mkocrtxt.sh
- use pdf && dobin extras/mkocrpdf.sh
- use djvu && dobin extras/mkocrdjvu.sh
- fi
- use tk && dobin getxbookgui.tcl
-}
diff --git a/app-text/getxbook/getxbook-1.2.ebuild b/app-text/getxbook/getxbook-1.2.ebuild
deleted file mode 100644
index b1acfc5e944d..000000000000
--- a/app-text/getxbook/getxbook-1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Download books from google, amazon, barnes and noble"
-HOMEPAGE="http://njw.me.uk/software/getxbook/"
-SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf djvu ocr tk"
-
-DEPEND=""
-RDEPEND="
- djvu? ( app-text/djvu )
- pdf? ( media-gfx/imagemagick )
- ocr? (
- app-text/tesseract
- pdf? ( media-gfx/exact-image app-text/pdftk )
- )
- tk? ( dev-lang/tk:0= )"
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${P}.patch
- tc-export CC AR
-}
-
-src_install() {
- DOCS=( README LEGAL )
- default
-
- use pdf && dobin extras/mkpdf.sh
- use djvu && dobin extras/mkdjvu.sh
-
- if use ocr; then
- dobin extras/mkocrtxt.sh
- use pdf && dobin extras/mkocrpdf.sh
- use djvu && dobin extras/mkocrdjvu.sh
- fi
- use tk && dobin getxbookgui.tcl
-}
diff --git a/app-text/getxbook/metadata.xml b/app-text/getxbook/metadata.xml
deleted file mode 100644
index 3b5c78cf814d..000000000000
--- a/app-text/getxbook/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>grozin@gentoo.org</email>
- <name>Andrey Grozin</name>
- </maintainer>
- <longdescription lang="en">
- A collection of tools to download books from
- google books' "book preview",
- amazon's "look inside the book",
- barnes and noble's "book viewer",
- optionally using tesseract to produce OCRed pdf or djvu.
- </longdescription>
- <use>
- <flag name="ocr">Use <pkg>app-text/tesseract</pkg> for optical character recognition</flag>
- </use>
-</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 0c90c42ed8e5..d536b91c10ca 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,2 +1,3 @@
-DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
-DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
+DIST ghostscript-10.02.1.tar.xz 68017088 BLAKE2B b491473f0b3d50121e4373e21af3d8cdf55d9ca4390b240c4cb88d0d44e707e32570a7f1f05cb656d1b65443fcd7e37f5eab404d72a20f83d8fd87370a585467 SHA512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11
+DIST ghostscript-10.03.0.tar.xz 68041176 BLAKE2B c64e0fc9dd290b81e61793671e8645f16b04070685f6ab9d35a60cb910d7504e1e686525af8b74121ae31a5b344e2332efd8bdf99f2a4c5586bff747b8df78d7 SHA512 74d7da586eefbf3fb3c085bb4d2b73ee667fd0ae9cff73ece613c77c443148b847086f91802124baf91ac35cdc83be07199799378def92c8fbd96ced7d0ee9a8
+DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch
new file mode 100644
index 000000000000..a9356f861c52
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/922448
+https://bugs.ghostscript.com/show_bug.cgi?id=707502
+https://git.ghostscript.com/?p=ghostpdl.git;h=8f5c77af6c0b84bdea719010cf4f67877e857b2b
+
+From 8f5c77af6c0b84bdea719010cf4f67877e857b2b Mon Sep 17 00:00:00 2001
+From: Ken Sharp <Ken.Sharp@artifex.com>
+Date: Fri, 19 Jan 2024 08:44:33 +0000
+Subject: [PATCH] X device - fix compiler 'warning'
+
+Bug #707502 "- -Wincompatible-pointer-types warning in devices/gdevxini.c"
+
+This is probably an oversight from when we changed a load of variables
+to size_t.
+
+Seems odd that compilers (well gcc) should refuse to compile becuase of
+a warning, but that's compilers. The pointer type is incorrect so let's
+fix it.
+--- a/devices/gdevx.h
++++ b/devices/gdevx.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2001-2023 Artifex Software, Inc.
++/* Copyright (C) 2001-2024 Artifex Software, Inc.
+ All Rights Reserved.
+
+ This software is provided AS-IS with no warranty, either express or
+@@ -39,7 +39,7 @@ typedef struct gx_device_X_s {
+ bool is_buffered;
+ bool IsPageDevice;
+ byte *buffer; /* full-window image */
+- long buffer_size;
++ size_t buffer_size;
+ gx_device_color_info orig_color_info;
+
+ /* An XImage object for writing bitmap images to the screen */
+--- a/devices/gdevxini.c
++++ b/devices/gdevxini.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2001-2023 Artifex Software, Inc.
++/* Copyright (C) 2001-2024 Artifex Software, Inc.
+ All Rights Reserved.
+
+ This software is provided AS-IS with no warranty, either express or
+@@ -621,7 +621,7 @@ x_set_buffer(gx_device_X * xdev)
+ }
+ if (mdev->width != xdev->width || mdev->height != xdev->height) {
+ byte *buffer;
+- ulong space;
++ size_t space;
+
+ if (gdev_mem_data_size(mdev, xdev->width, xdev->height, &space) < 0 ||
+ space > xdev->space_params.MaxBitmap) {
+--
+2.34.1
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch
new file mode 100644
index 000000000000..82677ea5418e
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/919065
+https://bugs.ghostscript.com/show_bug.cgi?id=707130
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b7beb19ad06e
+
+From b7beb19ad06e08b889a44694ff813ed5f6c96da4 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Thu, 14 Sep 2023 09:01:43 +0100
+Subject: [PATCH] Bug 707130: Cast to void ** to avoid compiler warning
+
+--- a/base/fapi_ft.c
++++ b/base/fapi_ft.c
+@@ -1280,7 +1280,7 @@ gs_fapi_ft_get_scaled_font(gs_fapi_server * a_server, gs_fapi_font * a_font,
+
+ if (a_font->retrieve_tt_font != NULL) {
+ unsigned int ms;
+- code = a_font->retrieve_tt_font(a_font, &own_font_data, &ms);
++ code = a_font->retrieve_tt_font(a_font, (void **)&own_font_data, &ms);
+ if (code == 0) {
+ data_owned = false;
+ open_args.memory_base = own_font_data;
+--
+2.34.1
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch
new file mode 100644
index 000000000000..494c7080317a
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.03.0-c99.patch
@@ -0,0 +1,25 @@
+https://bugs.ghostscript.com/show_bug.cgi?id=707649
+https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=90cabe08422afdd16bac5dd9217602679d943045
+
+From 90cabe08422afdd16bac5dd9217602679d943045 Mon Sep 17 00:00:00 2001
+From: Ken Sharp <Ken.Sharp@artifex.com>
+Date: Fri, 8 Mar 2024 09:19:05 +0000
+Subject: [PATCH] Bug #707649 - fix apply_sasl in error cases.
+
+Forgot to dereference the pointers before assigning the values, if we
+get non-fatal errors returned from stringprep.
+--- a/pdf/pdf_sec.c
++++ b/pdf/pdf_sec.c
+@@ -183,8 +183,8 @@ static int apply_sasl(pdf_context *ctx, char *Password, int Len, char **NewPassw
+ * this easy: the errors we want to ignore are the ones with
+ * codes less than 100. */
+ if ((int)err < 100) {
+- NewPassword = Password;
+- NewLen = Len;
++ *NewPassword = Password;
++ *NewLen = Len;
+ return 0;
+ }
+
+--
+2.34.1
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild
new file mode 100644
index 000000000000..bd7de413886b
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+ app-text/libpaper:=
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.9:2=
+ >=media-libs/jbig2dec-0.19:=
+ >=media-libs/lcms-2.6:2
+ >=media-libs/libpng-1.6.2:=
+ media-libs/libjpeg-turbo:=
+ >=media-libs/openjpeg-2.1.0:2=
+ >=media-libs/tiff-4.0.1:=
+ >=sys-libs/zlib-1.2.7
+ cups? ( >=net-print/cups-1.3.8 )
+ dbus? ( sys-apps/dbus )
+ gtk? ( x11-libs/gtk+:3 )
+ unicode? ( net-dns/libidn:= )
+ X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+# bug #844115 for newer poppler-data dep
+RDEPEND="
+ ${DEPEND}
+ >=app-text/poppler-data-0.4.11-r2
+ >=media-fonts/urw-fonts-2.4.9
+ l10n_ja? ( media-fonts/kochi-substitute )
+ l10n_ko? ( media-fonts/baekmuk-fonts )
+ l10n_zh-CN? ( media-fonts/arphicfonts )
+ l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.02.1-c99.patch
+ "${FILESDIR}"/${PN}-10.02.1-c99-2.patch
+)
+
+src_prepare() {
+ if [[ -n ${MY_PATCHSET} ]] ; then
+ # apply various patches, many borrowed from Fedora
+ # https://src.fedoraproject.org/rpms/ghostscript
+ # and Debian
+ # https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+ eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*}
+ fi
+
+ default
+
+ # Remove internal copies of various libraries
+ rm -r cups/libs || die
+ rm -r freetype || die
+ rm -r jbig2dec || die
+ rm -r jpeg || die
+ rm -r lcms2mt || die
+ rm -r libpng || die
+ rm -r tiff || die
+ rm -r zlib || die
+ rm -r openjpeg || die
+ # Remove internal CMaps (CMaps from poppler-data are used instead)
+ rm -r Resource/CMap || die
+
+ if ! use gtk ; then
+ sed -e "s:\$(GSSOX)::" \
+ -e "s:.*\$(GSSOX_XENAME)$::" \
+ -i base/unix-dll.mak || die "sed failed"
+ fi
+
+ # Force the include dirs to a neutral location.
+ sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+ -i configure.ac || die
+ # Some files depend on zlib.h directly. Redirect them. #573248
+ # Also make sure to not define OPJ_STATIC to avoid linker errors due to
+ # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+ sed -e '/^zlib_h/s:=.*:=:' \
+ -e 's|-DOPJ_STATIC ||' \
+ -i base/lib.mak || die
+
+ # Search path fix
+ # put LDFLAGS after BINDIR, bug #383447
+ sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+ -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+ -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+ -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+ -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+ -i Makefile.in base/*.mak || die "sed failed"
+
+ # Remove incorrect symlink, bug 590384
+ rm ijs/ltmain.sh || die
+ eautoreconf
+
+ cd ijs || die
+ eautoreconf
+}
+
+src_configure() {
+ # Unsupported upstream, bug #884841
+ filter-lto
+
+ local FONTPATH
+ for path in \
+ "${EPREFIX}"/usr/share/fonts/urw-fonts \
+ "${EPREFIX}"/usr/share/fonts/Type1 \
+ "${EPREFIX}"/usr/share/fonts
+ do
+ FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}"
+ done
+
+ # Do not add --enable-dynamic here, it's not supported fully upstream
+ # https://bugs.ghostscript.com/show_bug.cgi?id=705895
+ # bug #884707
+ #
+ # leptonica and tesseract are bundled but modified upstream, like in
+ # mujs/mupdf.
+ PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \
+ --enable-freetype \
+ --enable-fontconfig \
+ --enable-openjpeg \
+ --disable-compile-inits \
+ --with-drivers=ALL \
+ --with-fontpath="${FONTPATH}" \
+ --with-ijs \
+ --with-jbig2dec \
+ --with-libpaper \
+ --with-system-libtiff \
+ $(use_enable cups) \
+ $(use_enable dbus) \
+ $(use_enable gtk) \
+ $(use_with cups pdftoraster) \
+ $(use_with unicode libidn) \
+ $(use_with X x) \
+ DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+ cd "${S}/ijs" || die
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake so all
+
+ cd ijs || die
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-so install
+
+ # move gsc to gs, bug #343447
+ # gsc collides with gambit, bug #253064
+ mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+ cd "${S}/ijs" || die
+ emake DESTDIR="${D}" install
+
+ # Sometimes the upstream versioning deviates from the tarball(!)
+ # bug #844115#c32
+ local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die)
+ my_gs_version=${my_gs_version##*/}
+
+ # Install the CMaps from poppler-data properly, bug #409361
+ dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild
new file mode 100644
index 000000000000..7bd11e3f8484
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+ app-text/libpaper:=
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.9:2=
+ >=media-libs/jbig2dec-0.19:=
+ >=media-libs/lcms-2.6:2
+ >=media-libs/libpng-1.6.2:=
+ media-libs/libjpeg-turbo:=
+ >=media-libs/openjpeg-2.1.0:2=
+ >=media-libs/tiff-4.0.1:=
+ >=sys-libs/zlib-1.2.7
+ cups? ( >=net-print/cups-1.3.8 )
+ dbus? ( sys-apps/dbus )
+ gtk? ( x11-libs/gtk+:3 )
+ unicode? ( net-dns/libidn:= )
+ X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+# bug #844115 for newer poppler-data dep
+RDEPEND="
+ ${DEPEND}
+ >=app-text/poppler-data-0.4.11-r2
+ >=media-fonts/urw-fonts-2.4.9
+ l10n_ja? ( media-fonts/kochi-substitute )
+ l10n_ko? ( media-fonts/baekmuk-fonts )
+ l10n_zh-CN? ( media-fonts/arphicfonts )
+ l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.02.1-c99.patch
+)
+
+src_prepare() {
+ if [[ -n ${MY_PATCHSET} ]] ; then
+ # apply various patches, many borrowed from Fedora
+ # https://src.fedoraproject.org/rpms/ghostscript
+ # and Debian
+ # https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+ eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*}
+ fi
+
+ default
+
+ # Remove internal copies of various libraries
+ rm -r cups/libs || die
+ rm -r freetype || die
+ rm -r jbig2dec || die
+ rm -r jpeg || die
+ rm -r lcms2mt || die
+ rm -r libpng || die
+ rm -r tiff || die
+ rm -r zlib || die
+ rm -r openjpeg || die
+ # Remove internal CMaps (CMaps from poppler-data are used instead)
+ rm -r Resource/CMap || die
+
+ if ! use gtk ; then
+ sed -e "s:\$(GSSOX)::" \
+ -e "s:.*\$(GSSOX_XENAME)$::" \
+ -i base/unix-dll.mak || die "sed failed"
+ fi
+
+ # Force the include dirs to a neutral location.
+ sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+ -i configure.ac || die
+ # Some files depend on zlib.h directly. Redirect them. #573248
+ # Also make sure to not define OPJ_STATIC to avoid linker errors due to
+ # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+ sed -e '/^zlib_h/s:=.*:=:' \
+ -e 's|-DOPJ_STATIC ||' \
+ -i base/lib.mak || die
+
+ # Search path fix
+ # put LDFLAGS after BINDIR, bug #383447
+ sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+ -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+ -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+ -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+ -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+ -i Makefile.in base/*.mak || die "sed failed"
+
+ # Remove incorrect symlink, bug 590384
+ rm ijs/ltmain.sh || die
+ eautoreconf
+
+ cd ijs || die
+ eautoreconf
+}
+
+src_configure() {
+ # Unsupported upstream, bug #884841
+ filter-lto
+
+ local FONTPATH
+ for path in \
+ "${EPREFIX}"/usr/share/fonts/urw-fonts \
+ "${EPREFIX}"/usr/share/fonts/Type1 \
+ "${EPREFIX}"/usr/share/fonts
+ do
+ FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}"
+ done
+
+ # Do not add --enable-dynamic here, it's not supported fully upstream
+ # https://bugs.ghostscript.com/show_bug.cgi?id=705895
+ # bug #884707
+ #
+ # leptonica and tesseract are bundled but modified upstream, like in
+ # mujs/mupdf.
+ PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \
+ --enable-freetype \
+ --enable-fontconfig \
+ --enable-openjpeg \
+ --disable-compile-inits \
+ --with-drivers=ALL \
+ --with-fontpath="${FONTPATH}" \
+ --with-ijs \
+ --with-jbig2dec \
+ --with-libpaper \
+ --with-system-libtiff \
+ $(use_enable cups) \
+ $(use_enable dbus) \
+ $(use_enable gtk) \
+ $(use_with cups pdftoraster) \
+ $(use_with unicode libidn) \
+ $(use_with X x) \
+ DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+ cd "${S}/ijs" || die
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake so all
+
+ cd ijs || die
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-so install
+
+ # move gsc to gs, bug #343447
+ # gsc collides with gambit, bug #253064
+ mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+ cd "${S}/ijs" || die
+ emake DESTDIR="${D}" install
+
+ # Sometimes the upstream versioning deviates from the tarball(!)
+ # bug #844115#c32
+ local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die)
+ my_gs_version=${my_gs_version##*/}
+
+ # Install the CMaps from poppler-data properly, bug #409361
+ dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild
new file mode 100644
index 000000000000..191b93c50073
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.03.0-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+ app-text/libpaper:=
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.9:2=
+ >=media-libs/jbig2dec-0.19:=
+ >=media-libs/lcms-2.6:2
+ >=media-libs/libpng-1.6.2:=
+ media-libs/libjpeg-turbo:=
+ >=media-libs/openjpeg-2.1.0:2=
+ >=media-libs/tiff-4.0.1:=
+ >=sys-libs/zlib-1.2.7
+ cups? ( >=net-print/cups-1.3.8 )
+ dbus? ( sys-apps/dbus )
+ gtk? ( x11-libs/gtk+:3 )
+ unicode? ( net-dns/libidn:= )
+ X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+# bug #844115 for newer poppler-data dep
+RDEPEND="
+ ${DEPEND}
+ >=app-text/poppler-data-0.4.11-r2
+ >=media-fonts/urw-fonts-2.4.9
+ l10n_ja? ( media-fonts/kochi-substitute )
+ l10n_ko? ( media-fonts/baekmuk-fonts )
+ l10n_zh-CN? ( media-fonts/arphicfonts )
+ l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.03.0-c99.patch
+)
+
+src_prepare() {
+ if [[ -n ${MY_PATCHSET} ]] ; then
+ # apply various patches, many borrowed from Fedora
+ # https://src.fedoraproject.org/rpms/ghostscript
+ # and Debian
+ # https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+ eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*}
+ fi
+
+ default
+
+ # Remove internal copies of various libraries
+ rm -r cups/libs || die
+ rm -r freetype || die
+ rm -r jbig2dec || die
+ rm -r jpeg || die
+ rm -r lcms2mt || die
+ rm -r libpng || die
+ rm -r tiff || die
+ rm -r zlib || die
+ rm -r openjpeg || die
+ # Remove internal CMaps (CMaps from poppler-data are used instead)
+ rm -r Resource/CMap || die
+
+ if ! use gtk ; then
+ sed -e "s:\$(GSSOX)::" \
+ -e "s:.*\$(GSSOX_XENAME)$::" \
+ -i base/unix-dll.mak || die "sed failed"
+ fi
+
+ # Force the include dirs to a neutral location.
+ sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+ -i configure.ac || die
+ # Some files depend on zlib.h directly. Redirect them. #573248
+ # Also make sure to not define OPJ_STATIC to avoid linker errors due to
+ # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+ sed -e '/^zlib_h/s:=.*:=:' \
+ -e 's|-DOPJ_STATIC ||' \
+ -i base/lib.mak || die
+
+ # Search path fix
+ # put LDFLAGS after BINDIR, bug #383447
+ sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+ -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+ -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+ -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+ -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+ -i Makefile.in base/*.mak || die "sed failed"
+
+ # Remove incorrect symlink, bug 590384
+ rm ijs/ltmain.sh || die
+ eautoreconf
+
+ cd ijs || die
+ eautoreconf
+}
+
+src_configure() {
+ # Unsupported upstream, bug #884841
+ filter-lto
+
+ # bug #899952
+ append-lfs-flags
+
+ local FONTPATH
+ for path in \
+ "${EPREFIX}"/usr/share/fonts/urw-fonts \
+ "${EPREFIX}"/usr/share/fonts/Type1 \
+ "${EPREFIX}"/usr/share/fonts
+ do
+ FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}"
+ done
+
+ # Do not add --enable-dynamic here, it's not supported fully upstream
+ # https://bugs.ghostscript.com/show_bug.cgi?id=705895
+ # bug #884707
+ #
+ # leptonica and tesseract are bundled but modified upstream, like in
+ # mujs/mupdf.
+ PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \
+ --enable-freetype \
+ --enable-fontconfig \
+ --enable-openjpeg \
+ --disable-compile-inits \
+ --with-drivers=ALL \
+ --with-fontpath="${FONTPATH}" \
+ --with-ijs \
+ --with-jbig2dec \
+ --with-libpaper \
+ --with-system-libtiff \
+ $(use_enable cups) \
+ $(use_enable dbus) \
+ $(use_enable gtk) \
+ $(use_with cups pdftoraster) \
+ $(use_with unicode libidn) \
+ $(use_with X x) \
+ DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+ cd "${S}/ijs" || die
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake so all
+ emake -C ijs
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-so install
+
+ # move gsc to gs, bug #343447
+ # gsc collides with gambit, bug #253064
+ mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+ cd "${S}/ijs" || die
+ emake DESTDIR="${D}" install
+
+ # Sometimes the upstream versioning deviates from the tarball(!)
+ # bug #844115#c32
+ local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die)
+ my_gs_version=${my_gs_version##*/}
+
+ # Install the CMaps from poppler-data properly, bug #409361
+ dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
deleted file mode 100644
index 51a818491724..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_P=${P/-gpl}
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET=1
-
-SRC_URI="
- https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
- https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
-"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
- app-text/libpaper
- media-libs/fontconfig
- >=media-libs/freetype-2.4.9:2=
- media-libs/jbig2dec
- >=media-libs/lcms-2.6:2
- >=media-libs/libpng-1.6.2:0=
- >=media-libs/openjpeg-2.1.0:2=
- >=sys-libs/zlib-1.2.7
- virtual/jpeg:0
- cups? ( >=net-print/cups-1.3.8 )
- dbus? ( sys-apps/dbus )
- gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
- unicode? ( net-dns/libidn:= )
- tiff? ( >=media-libs/tiff-4.0.1:0= )
- X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
- app-text/poppler-data
- >=media-fonts/urw-fonts-2.4.9
- l10n_ja? ( media-fonts/kochi-substitute )
- l10n_ko? ( media-fonts/baekmuk-fonts )
- l10n_zh-CN? ( media-fonts/arphicfonts )
- l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # apply various patches, many borrowed from Fedora
- # http://pkgs.fedoraproject.org/cgit/ghostscript.git
- eapply "${WORKDIR}/patches/"*.patch
- default
-
- # remove internal copies of various libraries
- rm -r cups/libs || die
- rm -r freetype || die
- rm -r jbig2dec || die
- rm -r jpeg || die
- rm -r lcms2mt || die
- rm -r libpng || die
- rm -r tiff || die
- rm -r zlib || die
- rm -r openjpeg || die
- # remove internal CMaps (CMaps from poppler-data are used instead)
- rm -r Resource/CMap || die
-
- if ! use gtk ; then
- sed -e "s:\$(GSSOX)::" \
- -e "s:.*\$(GSSOX_XENAME)$::" \
- -i base/unix-dll.mak || die "sed failed"
- fi
-
- # Force the include dirs to a neutral location.
- sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
- -i configure.ac || die
- # Some files depend on zlib.h directly. Redirect them. #573248
- # Also make sure to not define OPJ_STATIC to avoid linker errors due to
- # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
- sed -e '/^zlib_h/s:=.*:=:' \
- -e 's|-DOPJ_STATIC ||' \
- -i base/lib.mak || die
-
- # search path fix
- # put LDFLAGS after BINDIR, bug #383447
- sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
- -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
- -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
- -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
- -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
- -i Makefile.in base/*.mak || die "sed failed"
-
- # remove incorrect symlink, bug 590384
- rm ijs/ltmain.sh || die
- eautoreconf
-
- cd ijs || die
- eautoreconf
-}
-
-src_configure() {
- local FONTPATH
- for path in \
- "${EPREFIX}"/usr/share/fonts/urw-fonts \
- "${EPREFIX}"/usr/share/fonts/Type1 \
- "${EPREFIX}"/usr/share/fonts \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
- do
- FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
- done
-
- PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
- econf \
- --enable-dynamic \
- --enable-freetype \
- --enable-fontconfig \
- --enable-openjpeg \
- --disable-compile-inits \
- --with-drivers=ALL \
- --with-fontpath="$FONTPATH" \
- --with-ijs \
- --with-jbig2dec \
- --with-libpaper \
- --without-luratech \
- $(use_enable cups) \
- $(use_enable dbus) \
- $(use_enable gtk) \
- $(use_with cups pdftoraster) \
- $(use_with unicode libidn) \
- $(use_with tiff system-libtiff) \
- $(use_with X x)
-
- cd "${S}/ijs" || die
- econf \
- --enable-shared \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake so all
-
- cd ijs || die
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" install-so install
-
- # move gsc to gs, bug #343447
- # gsc collides with gambit, bug #253064
- mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
- cd "${S}/ijs" || die
- emake DESTDIR="${D}" install
-
- # rename the original cidfmap to cidfmap.GS
- mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
- # install our own cidfmap to handle CJK fonts
- insinto /usr/share/ghostscript/${PVM}/Resource/Init
- doins \
- "${WORKDIR}/fontmaps/CIDFnmap" \
- "${WORKDIR}/fontmaps/cidfmap"
- for X in ${LANGS} ; do
- if use l10n_${X} ; then
- doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
- fi
- done
-
- # install the CMaps from poppler-data properly, bug #409361
- dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- if ! use l10n_de; then
- rm -r "${ED}"/usr/share/man/de || die
- fi
-}
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 9f69512715cb..dd57cc77263a 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -1,13 +1,22 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
+ <email>codec@gentoo.org</email>
+ <name>Gentoo Codec Project</name>
+ </maintainer>
+ <maintainer type="project">
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
+ <slots>
+ <subslots>Reflect ABI of libgs.so.</subslots>
+ </slots>
<upstream>
- <remote-id type="sourceforge">djvu</remote-id>
+ <remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
+ <remote-id type="github">ArtifexSoftware/ghostpdl</remote-id>
<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
+ <bugs-to>https://bugs.ghostscript.com/</bugs-to>
</upstream>
<use>
<flag name="unicode">Add support for unicode passwords via <pkg>net-dns/libidn</pkg></flag>
diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
deleted file mode 100644
index ae1288678f5b..000000000000
--- a/app-text/glosung/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST glosung-3.6.2.tar.bz2 65089 BLAKE2B 247cca9079c361316f3f3648667ffe18e9bd8c62c30d2944f07840ffca2972d9cedadfef7da6a05944c141351805cf170248729a10b577aad0846f75e8e09454 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11
-DIST glosung-3.6.4.tar.bz2 71887 BLAKE2B f5e2d2c54e4d66daf175961e78eadcd67dee04e0713e084de877068ea34cb63ff09f100195d1d902174c18b0842aaabb007dac4f67cd2d8d3ba7ecaacbd2c700 SHA512 c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349
diff --git a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
deleted file mode 100644
index 715b201ca64f..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN glosung-3.6.2/src/losung.c glosung-3.6.2-patched/src/losung.c
---- glosung-3.6.2/src/losung.c 2010-01-04 15:28:38.000000000 -0500
-+++ glosung-3.6.2-patched/src/losung.c 2013-01-21 14:34:14.318711560 -0500
-@@ -31,7 +31,6 @@
- #endif /* WIN32 */
-
- #include <glib/gi18n.h>
--#include <glib/goption.h>
-
- #include "util.h"
-
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
deleted file mode 100644
index 0f4ac73a06bd..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -17,6 +17,7 @@
-
-
- import os
-+import SCons.Util
-
- version = '3.6.2'
-
-@@ -32,14 +33,22 @@
- (this option is only for packaging)''')
-
- env = Environment (
-- LINK = 'gcc',
-- CC = 'gcc',
- CPPPATH = '',
- LINKFLAGS = '',
- CCFLAGS = '',
- ENV = os.environ,
- TARFLAGS = '-c -j')
-
-+if os.environ.has_key('CC'):
-+ env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+ env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-
- if env['PLATFORM'] == 'win32':
- prefix = ARGUMENTS.get ('PREFIX', '')
-@@ -58,7 +68,7 @@
- BuildDir ('build', 'src')
-
- cpppath = ['#', '#build']
--ccflags = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
-+ccflags = ['-std=c99',
- # '-DLIBXML_STATIC',
- '-DVERSION=\\"' + version + '\\"',
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
-@@ -74,7 +74,7 @@
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
-
--linkflags = ['-Wl,--export-dynamic', '-L.']
-+linkflags = []
- # -L/usr/lib'
- # `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
-
-@@ -83,9 +83,6 @@
- ccflags.append ('-pg', '-fprofile-arcs')
- linkflags.append ('-pg', '-fprofile-arcs')
-
--if env['PLATFORM'] != 'win32':
-- linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
- ccflags += [
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
deleted file mode 100644
index 15c12bf94888..000000000000
--- a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -17,6 +17,7 @@
-
-
- import os
-+import SCons.Util
-
- version = '3.6.2'
-
-@@ -32,14 +33,23 @@
- (this option is only for packaging)''')
-
- env = Environment (
-- LINK = 'gcc',
-- CC = 'gcc',
-+ CC = '',
- CPPPATH = '',
- LINKFLAGS = '',
- CCFLAGS = '',
- ENV = os.environ,
- TARFLAGS = '-c -j')
-
-+if os.environ.has_key('CC'):
-+ env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+ env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-
- if env['PLATFORM'] == 'win32':
- prefix = ARGUMENTS.get ('PREFIX', '')
-@@ -58,7 +68,7 @@
- BuildDir ('build', 'src')
-
- cpppath = ['#', '#build']
--ccflags = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
-+ccflags = ['-std=c99',
- # '-DLIBXML_STATIC',
- '-DVERSION=\\"' + version + '\\"',
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
-@@ -74,7 +74,7 @@
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
-
--linkflags = ['-Wl,--export-dynamic', '-L.']
-+linkflags = []
- # -L/usr/lib'
- # `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
-
-@@ -83,9 +83,6 @@
- ccflags.append ('-pg', '-fprofile-arcs')
- linkflags.append ('-pg', '-fprofile-arcs')
-
--if env['PLATFORM'] != 'win32':
-- linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
- ccflags += [
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
deleted file mode 100644
index 9adece925b19..000000000000
--- a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
---- glosung-3.6.4-original/SConstruct 2016-01-22 22:11:00.785053522 -0500
-+++ glosung-3.6.4/SConstruct 2016-01-22 22:14:04.434058592 -0500
-@@ -17,6 +17,7 @@
-
-
- import os
-+import SCons.Util
-
- version = '3.6.4'
-
-@@ -32,14 +33,23 @@
- (this option is only for packaging)''')
-
- env = Environment (
-- LINK = 'gcc',
-- CC = 'gcc',
- CPPPATH = '',
- LINKFLAGS = '',
- CCFLAGS = '',
- ENV = os.environ,
- TARFLAGS = '-c -j')
-
-+if os.environ.has_key('CC'):
-+ env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+ env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
- if env['PLATFORM'] == 'win32':
- prefix = ARGUMENTS.get ('PREFIX', '')
- install_dir = ARGUMENTS.get ('DESTDIR', '')
-@@ -57,21 +67,18 @@
- VariantDir('build', 'src')
-
- cpppath = ['#', '#build']
--ccflags = ['-O2', '-std=c99', '-Wall', '-g',
-+ccflags = ['-std=c99',
- # '-DLIBXML_STATIC',
- '-DVERSION=\\"' + version + '\\"',
- '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
- '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
-
--linkflags = ['-L.']
-+linkflags = []
-
- if ARGUMENTS.get ('profile'):
- ccflags.append ('-pg', '-fprofile-arcs')
- linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
-
--if env['PLATFORM'] != 'win32':
-- linkflags.append ('-Wl,--as-needed')
--
- #if not (ARGUMENTS.get ('dev')):
- if (ARGUMENTS.get ('dev')):
- ccflags += [
diff --git a/app-text/glosung/files/glosung.desktop b/app-text/glosung/files/glosung.desktop
deleted file mode 100644
index 7372b0f47123..000000000000
--- a/app-text/glosung/files/glosung.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=GLosung - Herrnhut's Watchwords
-Name[de]=GLosung - Herrnhuter Losungen
-Name[hu]=GLosung - Herrnhuter-i Útmutató
-Comment=Gods Word for every day
-Comment[de]=Gottes Wort für jeden Tag
-Comment[hu]=Isten igéje minden napra
-Exec=glosung
-Icon=/usr/share/glosung/glosung.png
-Terminal=false
-Type=Application
-Categories=Utility;X-Red-Hat-Extra;Spirituality;
diff --git a/app-text/glosung/glosung-3.6.2-r1.ebuild b/app-text/glosung/glosung-3.6.2-r1.ebuild
deleted file mode 100644
index 6bf0c06d72a6..000000000000
--- a/app-text/glosung/glosung-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
-HOMEPAGE="http://www.godehardt.org/losung.html"
-SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/libxml2
- >=gnome-base/gconf-2.0:2
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- net-misc/curl
- >=x11-libs/gtk+-2.10:2
-"
-
-DEPEND="${RDEPEND}
- >=dev-util/scons-0.93
- >=dev-util/intltool-0.22
- >=sys-devel/gettext-0.10
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-3.6.2-glib-includes.patch"
- if has_version '>=dev-util/scons-2.3.2'; then
- epatch "${FILESDIR}/${PN}-3.6.2-scons-2.3.2-respectflags.patch"
- else
- epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch"
- fi
-}
-
-src_compile() {
- tc-export CC
- scons ${MAKEOPTS} || die "scons make died"
-}
-
-src_install() {
- scons install DESTDIR="${D}" || die "scons install died"
- #Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
- cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
-}
diff --git a/app-text/glosung/glosung-3.6.4.ebuild b/app-text/glosung/glosung-3.6.4.ebuild
deleted file mode 100644
index 581b7533a9f3..000000000000
--- a/app-text/glosung/glosung-3.6.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
-HOMEPAGE="http://www.godehardt.org/losung.html"
-SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-3.6.4-scons-respectflags.patch")
-
-RDEPEND="
- dev-libs/libxml2
- >=gnome-base/gconf-2.0:2
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- net-misc/curl
- >=x11-libs/gtk+-2.10:2
-"
-
-DEPEND="${RDEPEND}
- >=dev-util/scons-0.93
- >=dev-util/intltool-0.22
- >=sys-devel/gettext-0.10
- virtual/pkgconfig
-"
-
-src_compile() {
- tc-export CC
- scons ${MAKEOPTS} || die "scons make died"
-}
-
-src_install() {
- scons install DESTDIR="${D}" || die "scons install died"
- #Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
- cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
-}
diff --git a/app-text/glosung/metadata.xml b/app-text/glosung/metadata.xml
deleted file mode 100644
index 88f24ae3103f..000000000000
--- a/app-text/glosung/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="project">
- <email>theology@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">glosung</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 93aec0d90a1d..93fd7cd93417 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1 +1,2 @@
+DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
index eecc54560695..bac8aab4078f 100644
--- a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
@@ -2,7 +2,7 @@
+++ b/bootstrap.make 2013-04-11 20:35:26.710082615 +0200
@@ -1,4 +1,4 @@
-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
-+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "${EPYTHON}" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
_db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
_db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
@@ -13,7 +13,7 @@
_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
-+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "${EPYTHON}" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
_db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
_db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
_chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
@@ -24,7 +24,7 @@
_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
-+_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "${EPYTHON}" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
_db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
_db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
_chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
deleted file mode 100644
index 132d14159a00..000000000000
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ /dev/null
@@ -1,67 +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 multibuild python-r1
-
-DESCRIPTION="A collection of documentation utilities for the Gnome project"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
- >=dev-libs/libxslt-1.1.8
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/scrollkeeper-dtd
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/awk
- virtual/pkgconfig
-"
-# dev-libs/glib needed for eautofoo, bug #255114.
-
-# If there is a need to reintroduce eautomake or eautoreconf, make sure
-# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
-
-src_prepare() {
- # Stop build from relying on installed package
- eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
-
- gnome2_src_prepare
-
- # Leave shebang alone
- sed -e '/s+^#!.*python.*+#/d' \
- -i xml2po/xml2po/Makefile.{am,in} || die
-
- python_prepare() {
- mkdir -p "${BUILD_DIR}"
- }
- python_foreach_impl python_prepare
-}
-
-src_configure() {
- ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- MAKEOPTS="${MAKEOPTS} -j1" python_foreach_impl run_in_build_dir gnome2_src_compile #574282
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
- python_replicate_script "${ED}"/usr/bin/xml2po
-}
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
new file mode 100644
index 000000000000..e768dd0948e2
--- /dev/null
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="A collection of documentation utilities for the Gnome project"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-python3.patch"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
+ >=dev-libs/libxslt-1.1.8
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.4
+ app-text/scrollkeeper-dtd
+"
+BDEPEND="
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ app-alternatives/awk
+ virtual/pkgconfig
+"
+# dev-libs/glib needed for eautofoo, bug #255114.
+
+# If there is a need to reintroduce eautomake or eautoreconf, make sure
+# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
+
+src_prepare() {
+ # Stop build from relying on installed package
+ eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
+ eapply "${DISTDIR}"/${P}-python3.patch
+
+ # Empty py-compile, so it doesn't write its own pyo/pyc files
+ echo > "${S}"/py-compile
+ chmod a+x "${S}"/py-compile || die
+
+ gnome2_src_prepare
+
+ # Leave shebang alone
+ sed -e '/s+^#!.*python.*+#/d' \
+ -i xml2po/xml2po/Makefile.{am,in} || die
+
+ python_prepare() {
+ mkdir -p "${BUILD_DIR}"
+ }
+ python_foreach_impl python_prepare
+}
+
+src_configure() {
+ ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+ MAKEOPTS="${MAKEOPTS} -j1" python_foreach_impl run_in_build_dir gnome2_src_compile #574282
+}
+
+src_test() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ python_foreach_impl run_in_build_dir gnome2_src_install
+ python_foreach_impl run_in_build_dir python_optimize
+ python_replicate_script "${ED}"/usr/bin/xml2po
+}
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index 4cbddcaa19ad..b176e403791e 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">Archive/gnome-doc-utils</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/gnopaster/Manifest b/app-text/gnopaster/Manifest
deleted file mode 100644
index d7d5a3efdc0f..000000000000
--- a/app-text/gnopaster/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnopaster-0.0.9.pl.gz 2791 BLAKE2B e83b1163bfe520a33b7cf8e76eccd35051bab4bc816bba0ec24e2655e7f47fec2ddb8dbc6f0aaeb804feadf1ef4e41b4e8148d7b3f03a6e0c586c34bfea47791 SHA512 db7f6ffa7e0d4d9c4fcfaf830ee0b9aa40736ef8e67b12b8de4a4a0ad9e02964fa4c5b8521fed6299c336fb7ecd7cbfe8a9f7b2b0d5ed823545b5e67ff6c48cc
diff --git a/app-text/gnopaster/gnopaster-0.0.9.ebuild b/app-text/gnopaster/gnopaster-0.0.9.ebuild
deleted file mode 100644
index d4ff316741bf..000000000000
--- a/app-text/gnopaster/gnopaster-0.0.9.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
-
-DESCRIPTION="A submitter for gnopaste, a nopaste service like http://nopaste.info"
-HOMEPAGE="http://gnopaste.sf.net"
-SRC_URI="mirror://sourceforge/gnopaste/${P}.pl.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
- dev-perl/libwww-perl
- dev-perl/Config-Simple"
-
-src_install() {
- dobin ${WORKDIR}/${P}.pl
- dosym ${P}.pl /usr/bin/${PN}
-}
diff --git a/app-text/gnopaster/metadata.xml b/app-text/gnopaster/metadata.xml
deleted file mode 100644
index bf00a5257491..000000000000
--- a/app-text/gnopaster/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">gnopaste</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
deleted file mode 100644
index 1b383b6e1de8..000000000000
--- a/app-text/gocr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gocr-0.49.tar.gz 392386 BLAKE2B 9e2661f33b321b60ca761a259db31fce58be80f2408f003c31cac5a4b4c30d7943b864b36c4c6044c2db2a71efcb6d0b5b22fb17dc33dd971920f6c0210664e6 SHA512 4559ab2cb05d67212da1857a9e7280abea0b4a172454d5145f04f7d23237d065c7b17ea110123ebbea5d62e589c507e73957e1b15e856b19f9bfc5efbecf467c
-DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
diff --git a/app-text/gocr/gocr-0.49.ebuild b/app-text/gocr/gocr-0.49.ebuild
deleted file mode 100644
index 88b3005d5a37..000000000000
--- a/app-text/gocr/gocr-0.49.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="An OCR (Optical Character Recognition) reader"
-HOMEPAGE="http://jocr.sourceforge.net"
-SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc scanner tk"
-
-DEPEND=">=media-libs/netpbm-9.12
- doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
- tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}
- tk? (
- media-gfx/xli
- scanner? ( media-gfx/xsane )
- )"
-
-src_compile() {
- local mymakes="src man"
-
- use doc && mymakes="${mymakes} doc examples"
-
- emake ${mymakes}
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
- dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO
-
- # remove the tk frontend if tk is not selected
- use tk || rm "${ED}"/usr/bin/gocr.tcl
- # and install the documentation and examples
- if use doc ; then
- dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
- insinto /usr/share/doc/${PF}/examples
- doins "${S}"/examples/*.{fig,tex,pcx}
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
deleted file mode 100644
index d117bc57f841..000000000000
--- a/app-text/gocr/gocr-0.50.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="An OCR (Optical Character Recognition) reader"
-HOMEPAGE="http://jocr.sourceforge.net"
-SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc scanner tk"
-
-DEPEND=">=media-libs/netpbm-9.12
- doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
- tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}
- tk? (
- media-gfx/xli
- scanner? ( media-gfx/xsane )
- )"
-
-src_compile() {
- local mymakes="src man"
-
- use doc && mymakes="${mymakes} doc examples"
-
- emake ${mymakes}
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
- dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO
-
- # remove the tk frontend if tk is not selected
- use tk || rm "${ED}"/usr/bin/gocr.tcl
- # and install the documentation and examples
- if use doc ; then
- dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
- insinto /usr/share/doc/${PF}/examples
- doins "${S}"/examples/*.{fig,tex,pcx}
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
deleted file mode 100644
index 822a31236591..000000000000
--- a/app-text/gocr/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>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jocr</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
deleted file mode 100644
index 7a2da33f0339..000000000000
--- a/app-text/goldendict/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
deleted file mode 100644
index 6e6d03675a4f..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Fri, 30 Mar 2018 22:53:24 +0300
-Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
-
----
- ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 62 insertions(+), 6 deletions(-)
-
-diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
-index ed1172bd..56e8f788 100644
---- a/ffmpegaudio.cc
-+++ b/ffmpegaudio.cc
-@@ -91,6 +91,7 @@ struct DecoderContext
- QByteArray audioData_;
- QDataStream audioDataStream_;
- AVFormatContext * formatContext_;
-+ AVCodec * codec_;
- AVCodecContext * codecContext_;
- AVIOContext * avioContext_;
- AVStream * audioStream_;
-@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
- audioData_( audioData ),
- audioDataStream_( audioData_ ),
- formatContext_( NULL ),
-+ codec_( NULL ),
- codecContext_( NULL ),
- avioContext_( NULL ),
- audioStream_( NULL ),
-@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
- return false;
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+#else
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-+#endif
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
- // Find audio stream, use the first audio stream if available
- for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
- if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-+#else
-+ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
-+#endif
- {
- audioStream_ = formatContext_->streams[i];
- break;
-@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
- return false;
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
- codecContext_ = audioStream_->codec;
-- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
-- if ( !codec )
-+ codec_ = avcodec_find_decoder( codecContext_->codec_id );
-+ if ( !codec_ )
- {
- errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
- return false;
- }
-+#else
-+ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
-+ if ( !codec_ )
-+ {
-+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
-+ return false;
-+ }
-+ codecContext_ = avcodec_alloc_context3( codec_ );
-+ if ( !codecContext_ )
-+ {
-+ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
-+ return false;
-+ }
-+ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
-+#endif
-
-- ret = avcodec_open2( codecContext_, codec, NULL );
-+ ret = avcodec_open2( codecContext_, codec_, NULL );
- if ( ret < 0 )
- {
- errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
- return false;
- }
-
-- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
-+ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
- codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
- return true;
- }
-@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
-
- // Closing a codec context without prior avcodec_open2() will result in
- // a crash in ffmpeg
-- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
-+ if ( audioStream_ && codecContext_ && codec_ )
- {
- audioStream_->discard = AVDISCARD_ALL;
-- avcodec_close( audioStream_->codec );
-+ avcodec_close( codecContext_ );
-+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
-+ avcodec_free_context( &codecContext_ );
-+#endif
- }
-
- avformat_close_input( &formatContext_ );
-@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
- if ( packet.stream_index == audioStream_->index )
- {
- AVPacket pack = packet;
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
- int gotFrame = 0;
- do
- {
-@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
- pack.data += len;
- }
- while( pack.size > 0 );
-+#else
-+ int ret = avcodec_send_packet( codecContext_, &pack );
-+ /* read all the output frames (in general there may be any number of them) */
-+ while( ret >= 0 )
-+ {
-+ ret = avcodec_receive_frame( codecContext_, frame);
-+
-+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+ break;
-+
-+ playFrame( frame );
-+ }
-+#endif
- }
- // av_free_packet() must be called after each call to av_read_frame()
- #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
-@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
- #endif
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
- {
-@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
- playFrame( frame );
- }
- }
-+#else
-+ /* flush the decoder */
-+ av_init_packet( &packet );
-+ int ret = avcodec_send_packet(codecContext_, &packet );
-+ while( ret >= 0 )
-+ {
-+ ret = avcodec_receive_frame(codecContext_, frame);
-+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+ break;
-+ playFrame( frame );
-+ }
-+#endif
-
- #if LIBAVCODEC_VERSION_MAJOR < 54
- av_free( frame );
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
deleted file mode 100644
index 247ec52931b9..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Tue, 10 Apr 2018 18:44:43 +0300
-Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991)
-
----
- fulltextsearch.hh | 1 +
- initializing.cc | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/fulltextsearch.hh b/fulltextsearch.hh
-index da7e2943..adf9619f 100644
---- a/fulltextsearch.hh
-+++ b/fulltextsearch.hh
-@@ -6,6 +6,7 @@
- #include <QRegExp>
- #include <QAbstractListModel>
- #include <QList>
-+#include <QAction>
-
- #include "dictionary.hh"
- #include "ui_fulltextsearch.h"
-diff --git a/initializing.cc b/initializing.cc
-index 0db6909b..59e605d6 100644
---- a/initializing.cc
-+++ b/initializing.cc
-@@ -1,6 +1,7 @@
- /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
- * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
-
-+#include <QIcon>
- #include "initializing.hh"
- #include <QCloseEvent>
-
-From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001
-From: Perfect Gentleman <perfect007gentleman@gmail.com>
-Date: Wed, 11 Apr 2018 00:04:12 +0700
-Subject: [PATCH] Update groups_widgets.hh
-
-fixes https://github.com/goldendict/goldendict/issues/991
----
- groups_widgets.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/groups_widgets.hh b/groups_widgets.hh
-index ce442fa2..2064e3bb 100644
---- a/groups_widgets.hh
-+++ b/groups_widgets.hh
-@@ -8,6 +8,7 @@
-
- #include <vector>
-
-+#include <QAction>
- #include <QListWidget>
- #include <QSortFilterProxyModel>
-
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
deleted file mode 100644
index 01fdb3b2a297..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/goldendict.pro
-+++ b/goldendict.pro
-@@ -36,7 +36,8 @@
- QT += sql
- CONFIG += exceptions \
- rtti \
-- stl
-+ stl \
-+ qtsingleapplication
- OBJECTS_DIR = build
- UI_DIR = build
- MOC_DIR = build
-@@ -632,5 +633,3 @@
- TS_OUT ~= s/.ts/.qm/g
- PRE_TARGETDEPS += $$TS_OUT
-
--include( qtsingleapplication/src/qtsingleapplication.pri )
--
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
deleted file mode 100644
index cbbb665fe20e..000000000000
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV^^}
-MY_PV=${MY_PV/_/-}
-inherit desktop qmake-utils
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg libav"
-
-RDEPEND="
- app-arch/bzip2
- >=app-text/hunspell-1.2:=
- dev-libs/eb
- dev-libs/lzo
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+),X]
- dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- media-libs/libvorbis
- media-libs/tiff:0
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXtst
- ffmpeg? (
- media-libs/libao
- libav? ( media-video/libav:0= )
- !libav? ( media-video/ffmpeg:0= )
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
- "${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
- "${FILESDIR}/${PN}-1.5.0-ffmpeg-4.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
-
- # disable git
- sed -i \
- -e '/git describe/s/^/#/' \
- ${PN}.pro || die
-
- # fix installation path
- sed -i \
- -e '/PREFIX = /s:/usr/local:/usr:' \
- ${PN}.pro || die
-
- # add trailing semicolon
- sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
-}
-
-src_configure() {
- local myconf=()
- use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-
- eqmake5 "${myconf[@]}"
-}
-
-src_install() {
- dobin ${PN}
- domenu redist/${PN}.desktop
- doicon redist/icons/${PN}.png
-
- insinto /usr/share/apps/${PN}/locale
- doins locale/*.qm
-
- insinto /usr/share/${PN}/help
- doins help/*.qch
-}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
deleted file mode 100644
index 54e5ea46ce69..000000000000
--- a/app-text/goldendict/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="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">goldendict/goldendict</remote-id>
- <remote-id type="sourceforge">goldendict</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index a3614b2193d2..a0889b63e8c2 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1 +1 @@
-DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
+DIST grip-4.6.2.tar.gz 152280 BLAKE2B 02a5fb21190fe167428fb36390a087094c064fc11bc2016579391b3568bd421c8f0920f7b325e5be8140ebd8e7f7a0c0e20085f9d8899daf3ee85f27f33ffa9d SHA512 e4dc38d25198a1670df7ecf950fc2c815c3e8507571d54d3df844547ee7db0d1a7cbbbaa23fd7daa1391eea12a2788890d5cee09aa64b8bf1039beeb78a5d25f
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
deleted file mode 100644
index 2a8b144c5550..000000000000
--- a/app-text/grip/grip-4.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy{,3} python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
-HOMEPAGE="https://github.com/joeyespo/grip"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=dev-python/docopt-0.6.2
- >=dev-python/flask-0.10.1
- >=dev-python/markdown-2.5.1
- >=dev-python/path-and-address-1.0.0
- >=dev-python/pygments-1.6
- >=dev-python/requests-2.4.1
-"
diff --git a/app-text/grip/grip-4.6.2.ebuild b/app-text/grip/grip-4.6.2.ebuild
new file mode 100644
index 000000000000..7e8469d79e06
--- /dev/null
+++ b/app-text/grip/grip-4.6.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
+HOMEPAGE="https://github.com/joeyespo/grip"
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="amd64"
+
+RDEPEND="
+ !media-sound/grip
+ >=dev-python/docopt-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+ >=dev-python/markdown-2.5.1[${PYTHON_USEDEP}]
+ >=dev-python/path-and-address-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+"
diff --git a/app-text/grip/metadata.xml b/app-text/grip/metadata.xml
index 2411725f8215..964769343250 100644
--- a/app-text/grip/metadata.xml
+++ b/app-text/grip/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>bkohler@gentoo.org</email>
+ <name>Ben Kohler</name>
+ </maintainer>
<upstream>
<remote-id type="github">joeyespo/grip</remote-id>
<remote-id type="pypi">grip</remote-id>
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index 163ced47f42b..8c97f3f999b7 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,4 +1 @@
-DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 BLAKE2B f124608b13888f337fc35ed02b4757818d145943a13f645da73dbf0735a4a5627026ad995435b822f6022d61f6cf0a6821824a1272c389459adb16932bc06bcc SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821
-DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 BLAKE2B 20112b60a2a9f5f5b1d805280cd5dc77e8d039a768410a3f2259aa60449c660eb6c3764d14edd3db819dd68a830ba38aebe5bc0d6014dcd04752a194b1da87dd SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97
-DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 BLAKE2B 1092b6245eb60a2e54cadf6193a402ad085923224e05d35f80453505fb2f0a4e97822746907d1f9a8c0b95f82d0b1396b7ff81d133099def75b850e54a899725 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416
DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
deleted file mode 100644
index 982a5c7df90e..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- econf \
- --without-ruby19 \
- --docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- # Dont install README twice nor license
- rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
deleted file mode 100644
index 9fb120002304..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- # ruby is only uses for tests
- econf \
- --without-ruby \
- --docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
deleted file mode 100644
index 9fb120002304..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- # ruby is only uses for tests
- econf \
- --without-ruby \
- --docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..c2a7aacdc072
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # ruby is only used for tests
+ econf --without-ruby
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+ rm -r "${ED}"/usr/share/doc/${PN} || die
+}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
deleted file mode 100644
index 3b75ffe4aea8..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.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
-inherit eutils autotools
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
- default_src_prepare
- eautoreconf
-}
-
-src_configure() {
- # ruby is only uses for tests
- econf \
- --without-ruby \
- --docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
- default
-
- prune_libtool_files
- rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/metadata.xml b/app-text/groonga-normalizer-mysql/metadata.xml
index 41debbe3ed13..85e4ed814fa2 100644
--- a/app-text/groonga-normalizer-mysql/metadata.xml
+++ b/app-text/groonga-normalizer-mysql/metadata.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>grknight@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 2c60f422ecf0..3365de78b855 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,4 +1,2 @@
-DIST groonga-5.0.3.tar.gz 12421501 BLAKE2B 22b695fca6c4d0859b7a9ed5b1bc46be48493faa513524634662b0d520d1159bc70b4dc34d82ba83e5c57681f01f01dbe47d5a957f110eab2db65cf8eefe878f SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158
-DIST groonga-5.0.9.tar.gz 12851324 BLAKE2B a58084146e5e8fbcbc56f9737a3623b4385123cc449fb63b136f3f312d31d5574620831a4fa6e759381950ee6aa035e4d6a4c277c26c7d8ebb1e99fe5bf02e75 SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6
-DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
+DIST groonga-13.0.1.tar.gz 24694524 BLAKE2B 326ca810bdf4634b778eb6efc7a6c56626b0c5b563d9b896da23a103399e51ca57e8d1dd87aa05dbbe527f67cb6875924ca073f007698f5077437e2b191b995a SHA512 54eda0c70f932f249dbf58f01367d9a05a9d8e6e9a1df92e0a9070f452596cfc38da59b02c5128a585f9e19d460ce8100dd2677aaba7049e129a963491b22362
DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
diff --git a/app-text/groonga/groonga-13.0.1.ebuild b/app-text/groonga/groonga-13.0.1.ebuild
new file mode 100644
index 000000000000..670474842073
--- /dev/null
+++ b/app-text/groonga/groonga-13.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="benchmark debug doc +exact-alloc-count examples futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd"
+REQUIRED_USE="
+ sphinx? ( doc )
+"
+
+DEPEND="
+ acct-group/groonga
+ acct-user/groonga
+ >=dev-libs/onigmo-6.1.1:0=
+ dev-libs/rapidjson
+ dev-libs/xxhash
+ benchmark? ( >=dev-libs/glib-2.8 )
+ jemalloc? ( dev-libs/jemalloc:0= )
+ libedit? ( >=dev-libs/libedit-3 )
+ libevent? ( dev-libs/libevent:0= )
+ lzo? ( dev-libs/lzo )
+ mecab? ( >=app-text/mecab-0.80 )
+ msgpack? ( dev-libs/msgpack:= )
+ sphinx? ( >=dev-python/sphinx-1.0.1 )
+ zeromq? ( net-libs/zeromq:0= )
+ zlib? ( sys-libs/zlib:0= )
+ zstd? ( app-arch/zstd:0= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ sphinx? ( dev-python/sphinx )
+"
+
+src_prepare() {
+ default
+
+ elibtoolize
+}
+
+src_configure() {
+ # httpd is a bundled copy of nginx; disabled for security reasons
+ # prce only is used with httpd
+ # Apache arrow, kytea and libstemmer are not available in Gentoo repo
+ # ruby is only used for an http test
+ local econfopts=(
+ --disable-groonga-httpd
+ --without-pcre
+ --without-kytea
+ --without-libstemmer
+ --disable-arrow
+ --with-log-path="${EPREFIX}"/var/log/${PN}.log
+ --without-luajit
+ --without-ruby
+ --with-shared-onigmo
+ --with-onigmo=system
+ --with-xxhash
+ $(use_enable benchmark)
+ $(use_enable debug memory-debug)
+ $(use_enable doc document)
+ $(use_enable exact-alloc-count)
+ $(use_enable futex)
+ $(use_with jemalloc)
+ $(use_enable libedit)
+ $(use_with libevent)
+ $(use_with lzo)
+ $(use_with mecab)
+ $(use_enable msgpack message-pack)
+ $(use_with msgpack message-pack "${ESYSROOT}/usr")
+ $(use_enable nfkc)
+ $(use_with sphinx sphinx-build)
+ $(use_enable static-libs static)
+ $(use_enable uyield)
+ $(use_enable zeromq)
+ $(use_with zlib)
+ $(use_with zstd)
+ )
+
+ econf "${econfopts[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ keepdir /var/{log,lib}/${PN}
+ fowners groonga:groonga /var/{log,lib}/${PN}
+
+ if ! use examples ; then
+ rm -r "${ED}/usr/share/${PN}" || die
+ fi
+}
diff --git a/app-text/groonga/groonga-5.0.3.ebuild b/app-text/groonga/groonga-5.0.3.ebuild
deleted file mode 100644
index 2663234e73a5..000000000000
--- a/app-text/groonga/groonga-5.0.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
- libedit? ( >=dev-libs/libedit-3 )
- libevent? ( dev-libs/libevent )
- lzo? ( dev-libs/lzo )
- mecab? ( >=app-text/mecab-0.80 )
- msgpack? ( dev-libs/msgpack )
- sphinx? ( >=dev-python/sphinx-1.0.1 )
- zeromq? ( net-libs/zeromq )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
- enewgroup groonga
- enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
- elibtoolize
-}
-
-src_configure() {
- # httpd is a bundled copy of nginx; disabled for security reasons
- # prce only is used with httpd
- # kytea and libstemmer are not available in portage
- # ruby is only used for an http test
- econf \
- --disable-groonga-httpd \
- --without-pcre \
- --without-kytea \
- --without-libstemmer \
- --with-log-path="${EROOT}var/log/${PN}.log" \
- --docdir="${EROOT}usr/share/doc/${P}" \
- --without-ruby \
- $(use_enable abort) \
- $(use_enable benchmark) \
- $(use_enable debug memory-debug) \
- $(use_enable doc document) \
- $(use_enable dynamic-malloc-change) \
- $(use_enable exact-alloc-count) \
- $(use_enable fmalloc) \
- $(use_enable futex) \
- $(use_enable libedit) \
- $(use_with libevent) \
- $(use_with lzo) \
- $(use_with mecab) \
- $(use_with msgpack message-pack "${EROOT}usr") \
- $(use_enable nfkc) \
- $(use_with sphinx sphinx-build) \
- $(use_enable static-libs static) \
- $(use_enable uyield) \
- $(use_enable zeromq) \
- $(use_with zlib)
-}
-
-src_install() {
- default
-
- prune_libtool_files
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- keepdir /var/{log,lib}/${PN}
- fowners groonga:groonga /var/{log,lib}/${PN}
-
- dodoc README.md
-
- use examples || rm -r "${D}usr/share/${PN}" || die
- # Extra init script
- rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild
deleted file mode 100644
index 2663234e73a5..000000000000
--- a/app-text/groonga/groonga-5.0.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
- libedit? ( >=dev-libs/libedit-3 )
- libevent? ( dev-libs/libevent )
- lzo? ( dev-libs/lzo )
- mecab? ( >=app-text/mecab-0.80 )
- msgpack? ( dev-libs/msgpack )
- sphinx? ( >=dev-python/sphinx-1.0.1 )
- zeromq? ( net-libs/zeromq )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
- enewgroup groonga
- enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
- elibtoolize
-}
-
-src_configure() {
- # httpd is a bundled copy of nginx; disabled for security reasons
- # prce only is used with httpd
- # kytea and libstemmer are not available in portage
- # ruby is only used for an http test
- econf \
- --disable-groonga-httpd \
- --without-pcre \
- --without-kytea \
- --without-libstemmer \
- --with-log-path="${EROOT}var/log/${PN}.log" \
- --docdir="${EROOT}usr/share/doc/${P}" \
- --without-ruby \
- $(use_enable abort) \
- $(use_enable benchmark) \
- $(use_enable debug memory-debug) \
- $(use_enable doc document) \
- $(use_enable dynamic-malloc-change) \
- $(use_enable exact-alloc-count) \
- $(use_enable fmalloc) \
- $(use_enable futex) \
- $(use_enable libedit) \
- $(use_with libevent) \
- $(use_with lzo) \
- $(use_with mecab) \
- $(use_with msgpack message-pack "${EROOT}usr") \
- $(use_enable nfkc) \
- $(use_with sphinx sphinx-build) \
- $(use_enable static-libs static) \
- $(use_enable uyield) \
- $(use_enable zeromq) \
- $(use_with zlib)
-}
-
-src_install() {
- default
-
- prune_libtool_files
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- keepdir /var/{log,lib}/${PN}
- fowners groonga:groonga /var/{log,lib}/${PN}
-
- dodoc README.md
-
- use examples || rm -r "${D}usr/share/${PN}" || die
- # Extra init script
- rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
deleted file mode 100644
index c2d0b8a7b0fa..000000000000
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
- libedit? ( >=dev-libs/libedit-3 )
- libevent? ( dev-libs/libevent )
- lzo? ( dev-libs/lzo )
- mecab? ( >=app-text/mecab-0.80 )
- msgpack? ( dev-libs/msgpack )
- sphinx? ( >=dev-python/sphinx-1.0.1 )
- zeromq? ( net-libs/zeromq )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
- enewgroup groonga
- enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
- default_src_prepare
- elibtoolize
-}
-
-src_configure() {
- # httpd is a bundled copy of nginx; disabled for security reasons
- # prce only is used with httpd
- # kytea and libstemmer are not available in portage
- # ruby is only used for an http test
- econf \
- --disable-groonga-httpd \
- --without-pcre \
- --without-kytea \
- --without-libstemmer \
- --with-log-path="${EROOT}var/log/${PN}.log" \
- --docdir="${EROOT}usr/share/doc/${P}" \
- --without-ruby \
- $(use_enable abort) \
- $(use_enable benchmark) \
- $(use_enable debug memory-debug) \
- $(use_enable doc document) \
- $(use_enable dynamic-malloc-change) \
- $(use_enable exact-alloc-count) \
- $(use_enable fmalloc) \
- $(use_enable futex) \
- $(use_enable libedit) \
- $(use_with libevent) \
- $(use_with lzo) \
- $(use_with mecab) \
- $(use_with msgpack message-pack "${EROOT}usr") \
- $(use_enable nfkc) \
- $(use_with sphinx sphinx-build) \
- $(use_enable static-libs static) \
- $(use_enable uyield) \
- $(use_enable zeromq) \
- $(use_with zlib)
-}
-
-src_install() {
- local DOCS=( README.md )
- default
-
- prune_libtool_files
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- keepdir /var/{log,lib}/${PN}
- fowners groonga:groonga /var/{log,lib}/${PN}
-
- use examples || rm -r "${D}usr/share/${PN}" || die
- # Extra init script
- rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-8.0.2-r2.ebuild b/app-text/groonga/groonga-8.0.2-r2.ebuild
new file mode 100644
index 000000000000..b4a0b1ae286c
--- /dev/null
+++ b/app-text/groonga/groonga-8.0.2-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd"
+REQUIRED_USE="
+ abort? ( dynamic-malloc-change )
+ fmalloc? ( dynamic-malloc-change )
+ sphinx? ( doc )
+"
+
+DEPEND="
+ >=dev-libs/onigmo-6.1.1:0=
+ benchmark? ( >=dev-libs/glib-2.8 )
+ jemalloc? ( dev-libs/jemalloc:0= )
+ libedit? ( >=dev-libs/libedit-3 )
+ libevent? ( dev-libs/libevent:0= )
+ lzo? ( dev-libs/lzo )
+ mecab? ( >=app-text/mecab-0.80 )
+ msgpack? ( dev-libs/msgpack:= )
+ sphinx? ( >=dev-python/sphinx-1.0.1 )
+ zeromq? ( net-libs/zeromq:0= )
+ zlib? ( sys-libs/zlib:0= )
+ zstd? ( app-arch/zstd:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ acct-group/groonga
+ acct-user/groonga
+"
+BDEPEND="
+ virtual/pkgconfig
+ sphinx? ( dev-python/sphinx )
+"
+
+src_prepare() {
+ default
+
+ elibtoolize
+}
+
+src_configure() {
+ # httpd is a bundled copy of nginx; disabled for security reasons
+ # prce only is used with httpd
+ # Apache arrow, kytea and libstemmer are not available in Gentoo repo
+ # ruby is only used for an http test
+ local econfopts=(
+ --disable-groonga-httpd
+ --without-pcre
+ --without-kytea
+ --without-libstemmer
+ --disable-arrow
+ --with-log-path="${EPREFIX}"/var/log/${PN}.log
+ --without-ruby
+ --with-shared-onigmo
+ --with-onigmo=system
+ $(use_enable abort)
+ $(use_enable benchmark)
+ $(use_enable debug memory-debug)
+ $(use_enable doc document)
+ $(use_enable dynamic-malloc-change)
+ $(use_enable exact-alloc-count)
+ $(use_enable fmalloc)
+ $(use_enable futex)
+ $(use_with jemalloc)
+ $(use_enable libedit)
+ $(use_with libevent)
+ $(use_with lzo)
+ $(use_with mecab)
+ $(use_enable msgpack message-pack)
+ $(use_with msgpack message-pack "${ESYSROOT}/usr")
+ $(use_enable nfkc)
+ $(use_with sphinx sphinx-build)
+ $(use_enable static-libs static)
+ $(use_enable uyield)
+ $(use_enable zeromq)
+ $(use_with zlib)
+ $(use_with zstd)
+ )
+
+ econf "${econfopts[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ keepdir /var/{log,lib}/${PN}
+ fowners groonga:groonga /var/{log,lib}/${PN}
+
+ if ! use examples ; then
+ rm -r "${ED}/usr/share/${PN}" || die
+ fi
+}
diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild
deleted file mode 100644
index c628d1b0675e..000000000000
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd"
-
-RDEPEND=">=dev-libs/onigmo-6.1.1:0=
- benchmark? ( >=dev-libs/glib-2.8 )
- jemalloc? ( dev-libs/jemalloc:0= )
- libedit? ( >=dev-libs/libedit-3 )
- libevent? ( dev-libs/libevent:0= )
- lzo? ( dev-libs/lzo )
- mecab? ( >=app-text/mecab-0.80 )
- msgpack? ( dev-libs/msgpack )
- sphinx? ( >=dev-python/sphinx-1.0.1 )
- zeromq? ( net-libs/zeromq:0= )
- zlib? ( sys-libs/zlib:0= )
- zstd? ( app-arch/zstd:0= )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
- enewgroup groonga
- enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
- default_src_prepare
- elibtoolize
-}
-
-src_configure() {
- # httpd is a bundled copy of nginx; disabled for security reasons
- # prce only is used with httpd
- # Apache arrow, kytea and libstemmer are not available in Gentoo repo
- # ruby is only used for an http test
- local econfopts=(
- --disable-groonga-httpd
- --without-pcre
- --without-kytea
- --without-libstemmer
- --disable-arrow
- --with-log-path="${EROOT%/}/var/log/${PN}.log"
- --docdir="${EROOT%/}/usr/share/doc/${P}"
- --without-ruby
- --with-shared-onigmo
- --with-onigmo=system
- $(use_enable abort)
- $(use_enable benchmark)
- $(use_enable debug memory-debug)
- $(use_enable doc document)
- $(use_enable dynamic-malloc-change)
- $(use_enable exact-alloc-count)
- $(use_enable fmalloc)
- $(use_enable futex)
- $(use_with jemalloc)
- $(use_enable libedit)
- $(use_with libevent)
- $(use_with lzo)
- $(use_with mecab)
- $(use_enable msgpack message-pack)
- $(use_with msgpack message-pack "${EROOT%/}/usr")
- $(use_enable nfkc)
- $(use_with sphinx sphinx-build)
- $(use_enable static-libs static)
- $(use_enable uyield)
- $(use_enable zeromq)
- $(use_with zlib)
- $(use_with zstd)
- )
- econf "${econfopts[@]}"
-}
-
-src_install() {
- local DOCS=( README.md )
- default
-
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- keepdir /var/{log,lib}/${PN}
- fowners groonga:groonga /var/{log,lib}/${PN}
-
- use examples || rm -r "${D%/}/usr/share/${PN}" || die
-}
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 937c8f296172..e44ae2d43a92 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>grknight@gentoo.org</email>
-</maintainer>
-<use>
- <flag name="abort">Enable query abortion</flag>
- <flag name="benchmark">Build benchmark programs</flag>
- <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag>
- <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
- <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
- <flag name="futex">Use futex</flag>
- <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
- <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
- <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
- <flag name="nfkc">Use nfkc based utf8 normalization</flag>
- <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
- <flag name="uyield">Build for detecting race conditions</flag>
- <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
-</use>
+ <!-- maintainer-needed -->
+ <use>
+ <flag name="abort">Enable query abortion</flag>
+ <flag name="benchmark">Build benchmark programs</flag>
+ <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag>
+ <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
+ <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
+ <flag name="futex">Use futex</flag>
+ <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
+ <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
+ <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
+ <flag name="nfkc">Use nfkc based utf8 normalization</flag>
+ <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
+ <flag name="uyield">Build for detecting race conditions</flag>
+ <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">groonga/groonga</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index 0718f58bd03a..e9bd0d97025a 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1 +1 @@
-DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
+DIST grutatxt-2.200.0.tar.gz 20751 BLAKE2B 1df00316b4379f7922348fa6a90e53ed0a34e5498558b00a7dde09e7eea53098ce9b66e44260a95575b52180baff5b78073339d0f47370e30b8c61042ae40c4b SHA512 2ecf5145c42efbfde69278ecd9a7bbddceef79aed036a659e126f02ba2c20968c10425004298f6fb786b0e9407b4c78f25885ea4f112dbca111b6bf8b7e834c0
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
deleted file mode 100644
index 665c38e090d3..000000000000
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app
-
-MY_PN="Grutatxt"
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A converter from plain text to HTML and other markup languages"
-HOMEPAGE="http://triptico.com/software/grutatxt.html"
-SRC_URI="http://www.triptico.com/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
-
-# set the script path to /usr/bin, rather than /usr/local/bin
-myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin"
diff --git a/app-text/grutatxt/grutatxt-2.200.0.ebuild b/app-text/grutatxt/grutatxt-2.200.0.ebuild
new file mode 100644
index 000000000000..f9d512ab0d7e
--- /dev/null
+++ b/app-text/grutatxt/grutatxt-2.200.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME="Grutatxt"
+DIST_VERSION="2.20"
+
+inherit perl-module
+
+DESCRIPTION="A converter from plain text to HTML and other markup languages"
+HOMEPAGE="https://triptico.com/software/grutatxt.html"
+# upstream no longer versions the tarballs
+SRC_URI="https://triptico.com/download/${PN}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
diff --git a/app-text/grutatxt/metadata.xml b/app-text/grutatxt/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/grutatxt/metadata.xml
+++ b/app-text/grutatxt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index e517025f3b5d..dee73ee1e7f6 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,2 +1 @@
-DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
-DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
+DIST gspell-1.12.2.tar.xz 442824 BLAKE2B 6a574339dfa4930e5506d63d5f0cf27d8433c2914ce1204edc8366992ebf05bf78d4777029fa17f05be73291510897862c63479e59e72522a4c4943647f66539 SHA512 c13df805f6128cfd19c41e4936fbb49516f80e09d27e79380d5638cbd1a8a3bfc6aae5ef8a4faa748495fe529bde92805bbd5530610b113c58daa36f273a5af8
diff --git a/app-text/gspell/gspell-1.12.2.ebuild b/app-text/gspell/gspell-1.12.2.ebuild
new file mode 100644
index 000000000000..8a3f1d0034a9
--- /dev/null
+++ b/app-text/gspell/gspell-1.12.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=app-text/enchant-2.2:2
+ >=dev-libs/glib-2.44:2
+ >=x11-libs/gtk+-3.20:3[introspection?]
+ dev-libs/icu:=
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+"
+DEPEND="${RDEPEND}
+ test? ( sys-apps/dbus )
+"
+BDEPEND="
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ >=dev-build/gtk-doc-am-1.25
+ >=sys-devel/gettext-0.19.6
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ test? (
+ app-text/enchant:2[hunspell]
+ || (
+ app-dicts/myspell-en[l10n_en(+)]
+ app-dicts/myspell-en[l10n_en-US(+)]
+ )
+ )
+"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
+
+src_prepare() {
+ use vala && vala_setup
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ virtx dbus-run-session emake check
+}
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
deleted file mode 100644
index 93c3d40003f4..000000000000
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- app-text/iso-codes
- >=app-text/enchant-1.6.0:0/0
- >=dev-libs/glib-2.44:2
- >=x11-libs/gtk+-3.20:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
- vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.25
- >=sys-devel/gettext-0.19.4
- virtual/pkgconfig
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable introspection) \
- $(use_enable vala)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
deleted file mode 100644
index 18dcf94ede51..000000000000
--- a/app-text/gspell/gspell-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- app-text/iso-codes
- >=app-text/enchant-2.1.3
- >=dev-libs/glib-2.44:2
- >=x11-libs/gtk+-3.20:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
- vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.25
- >=sys-devel/gettext-0.19.4
- virtual/pkgconfig
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable introspection) \
- $(use_enable vala)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
index 39980802b1da..b05cd3f331a8 100644
--- a/app-text/gspell/metadata.xml
+++ b/app-text/gspell/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gspell</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 78d160b5e3e9..020f9dce8a9a 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,3 +1,2 @@
DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
-DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
new file mode 100644
index 000000000000..a1eabd0729d5
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+# gtkspell doesn't use sourceforge mirroring system it seems.
+SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ x11-libs/gtk+:2
+ >=app-text/enchant-1.1.6:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-build/gtk-doc-am
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ # Fix intltoolize broken file, see upstream #577133
+ sed -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in || die
+}
+
+src_configure() {
+ econf --disable-gtk-doc
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
deleted file mode 100644
index e3cea83f8f0b..000000000000
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Spell checking widget for GTK"
-HOMEPAGE="http://gtkspell.sourceforge.net/"
-# gtkspell doesn't use sourceforge mirroring system it seems.
-SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
- >=app-text/enchant-1.1.6"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty
-
-src_prepare() {
- # Fix intltoolize broken file, see upstream #577133
- sed -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in || die
-}
-
-src_configure() {
- econf --disable-static
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..bb86dc87b15e
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 vala
+
+MY_P="${PN}3-${PV}"
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="3/0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ app-text/enchant:2
+ app-text/iso-codes
+ dev-libs/glib:2
+ x11-libs/gtk+:3[introspection?]
+ >=x11-libs/pango-1.8.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-build/gtk-doc-am-1.17
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )"
+
+src_configure() {
+ use vala && vala_setup
+
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
deleted file mode 100644
index a8b3ddf550a8..000000000000
--- a/app-text/gtkspell/gtkspell-3.0.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 vala
-
-DESCRIPTION="Spell checking widget for GTK"
-HOMEPAGE="http://gtkspell.sourceforge.net/"
-MY_P="${PN}3-${PV}"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="3/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=app-text/enchant-2.0.0
- app-text/iso-codes
- dev-libs/glib:2
- x11-libs/gtk+:3[introspection?]
- >=x11-libs/pango-1.8.0[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.17
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
deleted file mode 100644
index 0c11422fc626..000000000000
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 vala
-
-DESCRIPTION="Spell checking widget for GTK"
-HOMEPAGE="http://gtkspell.sourceforge.net/"
-MY_P="${PN}3-${PV}"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=app-text/enchant-1.1.6
- app-text/iso-codes
- dev-libs/glib:2
- x11-libs/gtk+:3[introspection?]
- >=x11-libs/pango-1.8.0[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.17
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/app-text/gtkspell/metadata.xml b/app-text/gtkspell/metadata.xml
index 12e634dd9407..f81ad1418040 100644
--- a/app-text/gtkspell/metadata.xml
+++ b/app-text/gtkspell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 1c82dc1e0c1e..d67f3279c6c4 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1 +1 @@
-DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
+DIST gtranslator-45.3.tar.xz 1524700 BLAKE2B 5437f479d5276ef405cbd82c37aaa34b1cc4fe1ffa01d32e1e946adb65da0668ac6eb7359cb374a968367a16564959efb6d260dbeb148d34aca3c69cd545926e SHA512 6b4db2f12ec57db6b0ee7ae0030f2fe5bc748e0b501e3ea6f529e47e5e77196a47cf5bf6333fe84c314eaec20d353e7a2bf9a8bea75bbbcd7da438c2dc5e22c9
diff --git a/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch
new file mode 100644
index 000000000000..78a7ac9b67d1
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-45.2-Revert-Add-GDA-6-compatibility.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gtranslator/-/merge_requests/127
+
+From 9d8f92d37a7af3eca6985de72f52b45a21f9c91d Mon Sep 17 00:00:00 2001
+From: Daniel Garcia Moreno <daniel.garcia@suse.com>
+Date: Thu, 22 Sep 2022 08:20:11 +0200
+Subject: [PATCH] Revert "Add GDA 6 compatibility"
+
+This reverts commit 27c3f164422c193246aa4f71facf77d2a97ee94c
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 076812bd..f734e496 100644
+--- a/meson.build
++++ b/meson.build
+@@ -119,7 +119,7 @@ gtr_deps = [
+ gtk_dep,
+ libadwaita_dep,
+ libspell_dep,
+- dependency('libgda-6.0'),
++ dependency('libgda-5.0'),
+ dependency('gio-2.0', version: '>= 2.36.0'),
+ dependency('gsettings-desktop-schemas'),
+ dependency('gthread-2.0', version: '>= 2.13.0'),
+--
+2.35.1
+
diff --git a/app-text/gtranslator/gtranslator-3.32.0.ebuild b/app-text/gtranslator/gtranslator-3.32.0.ebuild
deleted file mode 100644
index a833ec4d1aa2..000000000000
--- a/app-text/gtranslator/gtranslator-3.32.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.36.0:2
- >=x11-libs/gtk+-3.22.20:3
- gnome-extra/libgda:5=
- gnome-base/gsettings-desktop-schemas
- >=app-text/gspell-1.2.0:=
- >=x11-libs/gtksourceview-4.0.2:4
- >=dev-libs/libxml2-2.4.12:2
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-libs/libxml2:2
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-# gtk-doc? ( >=dev-util/gtk-doc-1.28 )
-
-src_configure() {
- # Needs gtk-doc we don't have at the time of gtranslator-3.32.0 introduction
- #local emesonargs=(
- # $(meson_use gtk-doc gtk_doc)
- #)
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-text/gtranslator/gtranslator-45.3.ebuild b/app-text/gtranslator/gtranslator-45.3.ebuild
new file mode 100644
index 000000000000..ef91db5918ed
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-45.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="gtk-doc"
+
+DEPEND="
+ >=dev-libs/glib-2.71.3:2
+ >=gui-libs/gtk-4.6.0:4
+ >=gui-libs/libadwaita-1.1.0
+ gnome-extra/libgda:5=
+ gnome-base/gsettings-desktop-schemas
+ >=gui-libs/gtksourceview-5.4.0:5
+ >=dev-libs/libxml2-2.4.12:2
+ net-libs/libsoup:3.0
+ >=dev-libs/json-glib-1.2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.28
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-45.2-Revert-Add-GDA-6-compatibility.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use gtk-doc gtk_doc)
+ -Dprofile=default
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index 8a993fd39f8b..b5c704d5c64a 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription lang="en">
- Gtranslator is an enhanced gettext po file editor for the GNOME desktop
- environment.
- It handles all forms of gettext po files and includes very useful features
- like find/replace, translation memory, different translator profiles,
- messages table (for having an overview of the translations/messages in the
- po file), easy navigation and editing of translation messages and comments
- of the translation where accurate.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">gtranslator</remote-id>
- </upstream>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
+ Gtranslator is an enhanced gettext po file editor for the GNOME desktop
+ environment.
+ It handles all forms of gettext po files and includes very useful features
+ like find/replace, translation memory, different translator profiles,
+ messages table (for having an overview of the translations/messages in the
+ po file), easy navigation and editing of translation messages and comments
+ of the translation where accurate.
+ </longdescription>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gtranslator</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index 29cbaff662b1..b22dca3b813f 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,2 +1,2 @@
DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
-DIST gv-3.7.3.tar.gz 754282 BLAKE2B cdc2133e9be41e420401d23ab7691ca27ccbcabbe5c4d2c892f5661b5c47afc1f5b90f9f240a735d33e66813dcdda0a7a5c78580719ad715048fcaf6a2991446 SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3
+DIST gv-3.7.4.tar.gz 759287 BLAKE2B 2f18309d16a3c11dc0da0fa507f43c8128a4cabff8c1675895fac011702db677ef51989d2536bcbc7d3b4aa3e3cdf470a2a3e4699109b501141caffeb7e532a8 SHA512 f6dc072b6b72b6c543733501c719aa38c81a2e2fc63fbf1459b8a3a50a1a70eca9fc9def2fbeb51cb7bb81cfc3b20f136732d935740693bf541d7135975df648
diff --git a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch b/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
deleted file mode 100644
index 76c88b158b27..000000000000
--- a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
-
-http://bugs.gentoo.org/399753
-
---- src/Scrollbar.c
-+++ src/Scrollbar.c
-@@ -1006,7 +1006,7 @@
- TOPLOC = newtop;
- SHOWNLENGTH = newbot-newtop+1;
-
-- (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
-+ (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
-
- ENDMESSAGE(Redisplay)
- }
diff --git a/app-text/gv/files/gv-3.7.4-bounding-box.patch b/app-text/gv/files/gv-3.7.4-bounding-box.patch
new file mode 100644
index 000000000000..b55ddbd4a3ee
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-bounding-box.patch
@@ -0,0 +1,15 @@
+Fix bounding box recognition
+https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-bounding-box.patch
+
+diff a/src/ps.c b/src/ps.c
+--- a/src/ps.c
++++ b/src/ps.c
+@@ -357,7 +357,7 @@ static int parse_boundingbox(const char *l, int *boundingbox) {
+ while (*p == ' ' || *p == '\t')
+ p++;
+ fury = strtod(p, &pe);
+- if (*pe != '\n' && *pe != '\0' && *pe != ' ' && *pe != '\t') {
++ if (*pe != '\n' && *pe != '\r'&& *pe != '\0' && *pe != ' ' && *pe != '\t') {
+ return 0;
+ }
+
diff --git a/app-text/gv/files/gv-3.7.4-bug1071238.patch b/app-text/gv/files/gv-3.7.4-bug1071238.patch
new file mode 100644
index 000000000000..d50f67c79cb8
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-bug1071238.patch
@@ -0,0 +1,22 @@
+Fix NULL access segfault
+https://bugzilla.redhat.com/show_bug.cgi?id=1071238
+https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-bug1071238.patch
+
+diff a/src/zoom.c b/src/zoom.c
+--- a/src/zoom.c
++++ b/src/zoom.c
+@@ -104,12 +104,12 @@ zoom_createZoom(Widget w _GL_UNUSED, XtP
+
+ BEGINMESSAGE(zoom_createZoom)
+
+- if (!(gv_psfile != NULL || (gv_gs_arguments && *gv_gs_arguments))) {
++ if (!gv_psfile) {
+ INFMESSAGE(no file) ENDMESSAGE(zoom_createZoom)
+ return;
+ }
+
+- if (strcmp(gv_filename, "-")) {
++ if (gv_filename != NULL && strcmp(gv_filename, "-")) {
+ stat(gv_filename, &sbuf);
+ if (mtime != sbuf.st_mtime) {
+ INFMESSAGE1(file has changed) ENDMESSAGE1(zoom_createZoom)return;
diff --git a/app-text/gv/files/gv-3.7.4-bz1536211.patch b/app-text/gv/files/gv-3.7.4-bz1536211.patch
new file mode 100644
index 000000000000..94808a8b8ea8
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-bz1536211.patch
@@ -0,0 +1,28 @@
+Fix PDF printing
+https://bugzilla.redhat.com/show_bug.cgi?id=1536211
+https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-bz1536211.patch
+
+diff -up a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -198,7 +198,7 @@ gv_intern_res_unix.dat :
+ @echo "" >> gv_intern_res_unix.dat
+ @echo "GV.gsInterpreter: gs" >> gv_intern_res_unix.dat
+ @echo "GV.gsCmdScanPDF: gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s %s pdf2dsc.ps -c quit" >> gv_intern_res_unix.dat
+- @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=pswrite -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat
++ @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=ps2write -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat
+ @echo "GV.gsX11Device: -sDEVICE=x11" >> gv_intern_res_unix.dat
+ @echo "GV.gsX11AlphaDevice: -sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> gv_intern_res_unix.dat
+ @echo "GV.gsSafeDir: True" >> gv_intern_res_unix.dat
+diff -up a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1134,7 +1134,7 @@ gv_intern_res_unix.dat :
+ @echo "" >> gv_intern_res_unix.dat
+ @echo "GV.gsInterpreter: gs" >> gv_intern_res_unix.dat
+ @echo "GV.gsCmdScanPDF: gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s %s pdf2dsc.ps -c quit" >> gv_intern_res_unix.dat
+- @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=pswrite -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat
++ @echo "GV.gsCmdConvPDF: gs -dNOPAUSE -dQUIET -dBATCH -sDEVICE=ps2write -sOutputFile=%s -f %s -c save pop quit" >> gv_intern_res_unix.dat
+ @echo "GV.gsX11Device: -sDEVICE=x11" >> gv_intern_res_unix.dat
+ @echo "GV.gsX11AlphaDevice: -sDEVICE=x11 -dTextAlphaBits=4 -dGraphicsAlphaBits=2 -dMaxBitmap=10000000 -dNOPLATFONTS" >> gv_intern_res_unix.dat
+ @echo "GV.gsSafeDir: True" >> gv_intern_res_unix.dat
diff --git a/app-text/gv/files/gv-3.7.4-dat.patch b/app-text/gv/files/gv-3.7.4-dat.patch
new file mode 100644
index 000000000000..aeaea246d029
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-dat.patch
@@ -0,0 +1,15 @@
+Change tab to space in gv_user_res.dat
+http://savannah.gnu.org/patch/?7998
+https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-dat.patch
+
+--- a/src/gv_user_res.dat
++++ b/src/gv_user_res.dat
+@@ -39,7 +39,7 @@
+ save_marked
+ GV.scale: 0
+ GV.scaleBase: 1
+-GV.scales: Natural size, 1.000, screen \n\
++GV.scales: Natural size, 1.000, screen \n\
+ Pixel based, 1.000, pixel \n\
+ Arbitrary magnification, -2 \n\
+ Fit height to window, -3 \n\
diff --git a/app-text/gv/files/gv-3.7.4-overflow.patch b/app-text/gv/files/gv-3.7.4-overflow.patch
new file mode 100644
index 000000000000..05cbda055f63
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-overflow.patch
@@ -0,0 +1,27 @@
+Fix buffer overflows in resource.c
+https://savannah.gnu.org/patch/?10096
+https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-overflow.patch
+
+diff a/src/resource.c b/src/resource.c
+--- a/src/resource.c
++++ b/src/resource.c
+@@ -230,15 +230,15 @@ resource_buildDatabase (
+ s = resource_getResource(db,app_class,app_name, "international",0);
+ if (s == NULL || !strcasecmp(s, "False"))
+ {
+- sprintf(locale1, "noint:%s%s", loc_lang, loc_terr);
+- sprintf(locale2, "noint:%s", loc_lang);
++ snprintf(locale1, 100, "noint:%s%s", loc_lang, loc_terr);
++ snprintf(locale2, 100, "noint:%s", loc_lang);
+ strcpy(locale3, "C");
+ }
+ else
+ {
+ strcpy(locale1, locale);
+- sprintf(locale2, "%s%s%s", loc_lang, loc_terr, loc_cs);
+- sprintf(locale3, "%s%s", loc_lang, loc_cs);
++ snprintf(locale2, 100, "%s%s%s", loc_lang, loc_terr, loc_cs);
++ snprintf(locale3, 100, "%s%s", loc_lang, loc_cs);
+ }
+
+ if (debug_p)
diff --git a/app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch b/app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch
new file mode 100644
index 000000000000..540d590e4520
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-remove-aliasing-violation.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/855011
+
+diff -ruN a/src/Scrollbar.c b/src/Scrollbar.c
+--- a/src/Scrollbar.c
++++ b/src/Scrollbar.c
+@@ -1364,12 +1364,6 @@
+ INFMESSAGE(returning due to LookAhead) ENDMESSAGE(NotifyThumb)
+ return;
+ }
+- /*
+- thumbProc is not pretty, but is necessary for backwards
+- compatibility on those architectures for which it work{s,ed};
+- the intent is to pass a (truncated) float by value.
+- */
+- XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&TOP);
+ XtCallCallbacks (w, XtNjumpProc, (XtPointer)&TOP);
+ ENDMESSAGE(NotifyThumb)
+ }
diff --git a/app-text/gv/files/gv-3.7.4-resource.patch b/app-text/gv/files/gv-3.7.4-resource.patch
new file mode 100644
index 000000000000..15c39e3cbdae
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.4-resource.patch
@@ -0,0 +1,33 @@
+Check for null pointers in resource requests
+https://savannah.gnu.org/bugs/?38727
+https://src.fedoraproject.org/rpms/gv/blob/rawhide/f/gv-resource.patch
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -1449,7 +1449,7 @@
+ if (s) gv_gs_arguments = s;
+
+ s = resource_getResource(db,gv_class,gv_name,"gsSafeDir",NULL);
+- if (!strcasecmp(s,"true")) gv_gs_safeDir = 1; else gv_gs_safeDir = 0;
++ if (s && !strcasecmp(s,"true")) gv_gs_safeDir = 1; else gv_gs_safeDir = 0;
+
+ s = resource_getResource(db,gv_class,gv_name,"gsSafer",NULL);
+ if (s && !strcasecmp(s,"true")) gv_gs_safer = 1; else gv_gs_safer = 0;
+@@ -1468,13 +1468,13 @@
+ }
+
+ s = resource_getResource(db,gv_class,gv_name,"infoVerbose",NULL);
+- if (!strcasecmp(s, "Silent")) gv_infoVerbose=0;
+- else if (!strcasecmp(s, "Errors")) gv_infoVerbose=1;
+- else if (!strcasecmp(s, "All")) gv_infoVerbose=2;
++ if (!s || !strcasecmp(s, "Errors")) gv_infoVerbose=1;
++ else if (!strcasecmp(s, "Silent")) gv_infoVerbose=0;
++ else if (!strcasecmp(s, "All")) gv_infoVerbose=2;
+ else gv_infoVerbose = 1;
+
+ s = resource_getResource(db,gv_class,gv_name,"xinerama",NULL);
+- if (!strcasecmp(s, "Off")) gv_xinerama=0;
++ if (!s || !strcasecmp(s, "Off")) gv_xinerama=0;
+ else if (!strcasecmp(s, "On")) gv_xinerama=1;
+ else if (!strcasecmp(s, "Auto")) gv_xinerama=-1;
+ else gv_xinerama = 0;
diff --git a/app-text/gv/gv-3.7.3-r1.ebuild b/app-text/gv/gv-3.7.3-r1.ebuild
deleted file mode 100644
index e93336e80634..000000000000
--- a/app-text/gv/gv-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
-HOMEPAGE="https://www.gnu.org/software/gv/"
-SRC_URI="mirror://gnu/gv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="xinerama"
-
-RDEPEND="app-text/ghostscript-gpl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXaw3d-1.6-r1[unicode]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.7.3-libXaw3d-1.6.patch
-}
-
-src_configure() {
- # Grab -DXAW_INTERNATIONALIZATION if needed
- append-cppflags "$($(tc-getPKG_CONFIG) --cflags xaw3d)"
-
- export ac_cv_lib_Xinerama_main=$(usex xinerama)
- econf --enable-scrollbar-code
-}
-
-src_install() {
- default
- doicon "${FILESDIR}"/gv_icon.xpm
- make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
-}
diff --git a/app-text/gv/gv-3.7.3.90-r1.ebuild b/app-text/gv/gv-3.7.3.90-r1.ebuild
new file mode 100644
index 000000000000..31c99c911a54
--- /dev/null
+++ b/app-text/gv/gv-3.7.3.90-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="https://www.gnu.org/software/gv/"
+# Change 'gnu-alpha' to 'gnu' for final release, like 3.7.4
+SRC_URI="https://alpha.gnu.org/gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="xinerama"
+
+RDEPEND="
+ app-text/ghostscript-gpl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libXaw3d-1.6-r1[unicode(+)]
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ export ac_cv_lib_Xinerama_main=$(usex xinerama)
+ econf --enable-scrollbar-code
+}
+
+src_install() {
+ rm README.{I18N,TRANSLATION} || die
+ default
+
+ doicon "${FILESDIR}"/gv_icon.xpm
+ make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
+}
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
deleted file mode 100644
index 95b3ac253ccb..000000000000
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
-HOMEPAGE="https://www.gnu.org/software/gv/"
-# Change 'gnu-alpha' to 'gnu' for final release, like 3.7.4
-SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="xinerama"
-
-RDEPEND="app-text/ghostscript-gpl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXaw3d-1.6-r1[unicode]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- export ac_cv_lib_Xinerama_main=$(usex xinerama)
- econf --enable-scrollbar-code
-}
-
-src_install() {
- default
- doicon "${FILESDIR}"/gv_icon.xpm
- make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
-}
diff --git a/app-text/gv/gv-3.7.4.ebuild b/app-text/gv/gv-3.7.4.ebuild
new file mode 100644
index 000000000000..872bc434e38e
--- /dev/null
+++ b/app-text/gv/gv-3.7.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop gnuconfig toolchain-funcs
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="https://www.gnu.org/software/gv/"
+SRC_URI="https://ftp.gnu.org/gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="xinerama"
+
+RDEPEND="
+ app-text/ghostscript-gpl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=x11-libs/libXaw3d-1.6-r1[unicode(+)]
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-resource.patch
+ "${FILESDIR}"/${P}-dat.patch
+ "${FILESDIR}"/${P}-bounding-box.patch
+ "${FILESDIR}"/${P}-bug1071238.patch
+ "${FILESDIR}"/${P}-bz1536211.patch
+ "${FILESDIR}"/${P}-overflow.patch
+ "${FILESDIR}"/${P}-remove-aliasing-violation.patch
+)
+
+src_prepare() {
+ default
+ gnuconfig_update
+}
+
+src_configure() {
+ export ac_cv_lib_Xinerama_main=$(usex xinerama)
+ econf --enable-scrollbar-code
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ rm README.{I18N,TRANSLATION} || die
+ default
+
+ doicon "${FILESDIR}"/gv_icon.xpm
+ make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
+}
diff --git a/app-text/gv/metadata.xml b/app-text/gv/metadata.xml
index c439b06d8c84..e2fedda90ee1 100644
--- a/app-text/gv/metadata.xml
+++ b/app-text/gv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/halibut/Manifest b/app-text/halibut/Manifest
new file mode 100644
index 000000000000..f285e42d4109
--- /dev/null
+++ b/app-text/halibut/Manifest
@@ -0,0 +1 @@
+DIST halibut-1.3.tar.gz 995916 BLAKE2B 78a4409ff1f787134f7cd4eb307e77c81865a2591b55b359b0ef7a45b303cd361f85d344972714dfe8b3e823345de715d99ea542bf3cdf63d6d92548d027c27b SHA512 872f0cdb398002843d7e1b19f6eaf80ff848ce5ffee8653fa88da63c57e89efcbfaadc09b476280d25d38136f7d8af286fa98b9b36598515e0eb50f1945ee34a
diff --git a/app-text/halibut/halibut-1.3.ebuild b/app-text/halibut/halibut-1.3.ebuild
new file mode 100644
index 000000000000..5370336f4d85
--- /dev/null
+++ b/app-text/halibut/halibut-1.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="yet another free document preparation system"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
diff --git a/app-text/halibut/metadata.xml b/app-text/halibut/metadata.xml
new file mode 100644
index 000000000000..85e4ed814fa2
--- /dev/null
+++ b/app-text/halibut/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
index af0d97d7f58b..7d24903aa838 100644
--- a/app-text/hd2u/hd2u-1.0.3.ebuild
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -1,24 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-
-inherit eutils
+EAPI=7
DESCRIPTION="Dos2Unix like text file converter"
HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
SLOT="0"
LICENSE="GPL-2"
-IUSE=""
DEPEND="
dev-libs/popt"
RDEPEND="${DEPEND}
!app-text/dos2unix"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
diff --git a/app-text/hd2u/metadata.xml b/app-text/hd2u/metadata.xml
index 3cf14bf74636..6258504e5133 100644
--- a/app-text/hd2u/metadata.xml
+++ b/app-text/hd2u/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 29ae5ef9f593..003099220e62 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1 +1,7 @@
-DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
+DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
+DIST highlight-4.6.tar.bz2 1488327 BLAKE2B 952171929aa021c80690b2ddcd5adba3b6c7e54425cfc851368b768a53c749e34495b0832d4ce5546b5bc68c0ea4e3b5bd6df4f379e02702fd3a497adc52d60b SHA512 0214f2141ecf2ab350368ff165dc5f58eb3a23b31142b9d1c443a35f8ea72b9e33770c2de185cd2e3645e298ad41ec1fd45db5ebf546da3144e1dc93da32b811
+DIST highlight-4.8.tar.bz2 1492966 BLAKE2B f0bc746cb671037c2a5f1557c6114c143448de8fe295f4b74d38daecc615bfb50e50b5f3f3ee488488f1bc52dc11b283f13cbaa956959946d2dcaca91a6ef804 SHA512 c04e94b2fdb1ebda37937a8bdcdb1bb5afe171a74ca58ddf40b1972bc62a07dc02d628bc962b1db654805a446f32da8d7af41a0c162476cf47a3535128ca6ace
+DIST highlight-4.8.tar.bz2.asc 488 BLAKE2B 466905e2a4b1b577feba593e2d6e855e09764cdb08ddbd5aa3b4c62c4b06bc19a013df16aa1dfc81d4e52765641d5f98615233609d7b4f039f6f8c6a929d345a SHA512 929c5b0a25a2f5a0b9204afb03b5456b2b62d07e519799602b06a0ad2d4bc1d9eac92965571732b0eaffe780904321ebffb31cdf61b6fe644ecc39ddb983c7b8
+DIST highlight-4.9.tar.bz2 1498248 BLAKE2B 09ff0a5cc81da45270a8382dc6b2a2d3b44d1f084e661fae4a3d39d2ded9af6c77b1fb0d51d32c59f22ccba1612ab7faf68b5e918dda70c9f2e25b29b5c44ecd SHA512 280abd98182c5b95f629ca126e8a59ca6bf6f9e301fc7678aa3e4cb37b714827dfdfab1e008c798e203c7408355be63e01e88f93eacfcf2c5fad95afc6e22112
+DIST highlight-4.9.tar.bz2.asc 488 BLAKE2B cbd3541f65ec714ff1fda17fb141aa19f53952634a2027819fdbf50f7cf781f875b76ebd9a82119347f17940d8200f856082dfff51ff994a71a2ece04d654764 SHA512 04c2aca4050cae0dde97340a1ebafd968526e2d811e4551e8895acca50613f7e5902e31d735a0da1427d69e85e152530776fa1b9f5896efe410d8f9437768298
+DIST highlight-test-suite-a3479468672cdbc570a17ae84e047fe8f0b88798.tar.bz2 33310 BLAKE2B a06f2503fc571f5978f648fdc677f58f3fdfa759f9b5cf31a85d03589bbbfd2b56c7055517c59292369653503047af63d9c3bfbbe541a50bd2ea2adede28f60c SHA512 9583fe0af315e0dd1e37e137adf5c97a83832885a5a8a12b91790d7d7b0758c03fd76c02fbda368a2481eaec98f7b010a530bc31da98337d6fa7201aadb023ce
diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
deleted file mode 100644
index 31970057d9a6..000000000000
--- a/app-text/highlight/files/highlight-3.42-qmake-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Fri, 2 Mar 2018 19:15:35 +0000
-Subject: [PATCH] fix directories passed to qmake being ignored
-
-contains() matches the whole value, add regular expressions for the path
-components.
----
- src/gui-qt/highlight.pro | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
-index bae8d7c..0380a90 100644
---- a/src/gui-qt/highlight.pro
-+++ b/src/gui-qt/highlight.pro
-@@ -43,13 +43,13 @@ unix {
- PKGCONFIG += lua
-
- # to make it run within Qt Creator
-- !contains(DEFINES, DATA_DIR) {
-+ !contains(DEFINES, DATA_DIR.*) {
- DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\"
- }
-- !contains(DEFINES, CONFIG_DIR) {
-+ !contains(DEFINES, CONFIG_DIR.*) {
- DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\"
- }
-- !contains(DEFINES, DOC_DIR) {
-+ !contains(DEFINES, DOC_DIR.*) {
- DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\"
- }
- }
diff --git a/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch
new file mode 100644
index 000000000000..02009164f4e9
--- /dev/null
+++ b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch
@@ -0,0 +1,13 @@
+Unnecessary (the linker gets the right library from pkgconfig anyway)
+and breaks slotted Lua. See Bug #761511 for details.
+
+--- a/src/gui-qt/highlight.pro
++++ b/src/gui-qt/highlight.pro
+@@ -39,7 +39,6 @@
+ unix {
+ DESTDIR = ../
+ LIBS += -L.. -lhighlight
+- LIBS += -llua
+ CONFIG += link_pkgconfig
+ PKGCONFIG += lua
+
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
deleted file mode 100644
index 0309f3970645..000000000000
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-RDEPEND="
- dev-lang/lua:0=
- qt5? (
- dev-libs/double-conversion:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-myhlopts=(
- "CXX=$(tc-getCXX)"
- "AR=$(tc-getAR)"
- "LDFLAGS=${LDFLAGS}"
- "CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
- "DESTDIR=${D}"
- "PREFIX=${EPREFIX}/usr"
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- "conf_dir=${EPREFIX}/etc/highlight/"
-)
-
-PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398
-
-src_prepare() {
- default
-
- sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
- -i src/core/datadir.cpp || die
-
- if has_version "<dev-lang/lua-5.2"; then
- sed -e "s/-DUSE_LUA52//" -i src/makefile || die
- fi
-
- # We set it via eqmake5, otherwise it forces clang...
- sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
- -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
- -i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- eqmake5 \
- 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- emake -f makefile "${myhlopts[@]}"
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- emake
- popd > /dev/null || die
- fi
-}
-
-src_install() {
- emake -f makefile "${myhlopts[@]}" install
- if use qt5; then
- emake -f makefile "${myhlopts[@]}" install-gui
- docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
- fi
-
- if ! use examples ; then
- rm -r "${ED}"/usr/share/doc/${PF}/extras || die
- fi
-}
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
new file mode 100644
index 000000000000..9271ef7b7f6f
--- /dev/null
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt5"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ ${LUA_DEPS}
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+"
+BDEPEND="
+ virtual/pkgconfig
+ qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
+myhlopts=(
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ LDFLAGS="${LDFLAGS}"
+ CFLAGS="${CXXFLAGS} -DNDEBUG"
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}/usr"
+ HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+ HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+ doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+ conf_dir="${EPREFIX}/etc/highlight/"
+)
+
+src_prepare() {
+ default
+
+ # disable man page compression
+ sed -e "/GZIP/d" -i makefile || die
+
+ sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ -i src/core/datadir.cpp || die
+
+ sed -r -i \
+ -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+ "${S}"/extras/tcl/makefile \
+ "${S}"/extras/swig/makefile \
+ || die "Failed to set Lua implementation"
+
+ # We set it via eqmake5, otherwise it forces clang...
+ sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+ -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+ -i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+ if use qt5 ; then
+ pushd src/gui-qt > /dev/null || die
+ eqmake5 \
+ 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+ if use qt5 ; then
+ pushd src/gui-qt > /dev/null || die
+ emake
+ popd > /dev/null || die
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+ if use qt5; then
+ emake -f makefile "${myhlopts[@]}" install-gui
+ docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+ fi
+
+ if ! use examples ; then
+ rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+ fi
+}
diff --git a/app-text/highlight/highlight-4.6.ebuild b/app-text/highlight/highlight-4.6.ebuild
new file mode 100644
index 000000000000..d6d49225f645
--- /dev/null
+++ b/app-text/highlight/highlight-4.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ ${LUA_DEPS}
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/boost
+"
+BDEPEND="
+ virtual/pkgconfig
+ gui? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
+myhlopts=(
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ LDFLAGS="${LDFLAGS}"
+ CFLAGS="${CXXFLAGS} -DNDEBUG"
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}/usr"
+ HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+ HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+ doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+ conf_dir="${EPREFIX}/etc/highlight/"
+ examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+ default
+
+ # Disable man page compression
+ sed \
+ -e "/GZIP/d" \
+ -e "/COPYING/d" \
+ -i makefile || die
+
+ sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ -i src/core/datadir.cpp || die
+
+ sed -r -i \
+ -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+ "${S}"/extras/tcl/makefile \
+ "${S}"/extras/swig/makefile \
+ || die "Failed to set Lua implementation"
+
+ # We set it via eqmake5, otherwise it forces clang...
+ sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+ -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+ -i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+ if use gui ; then
+ pushd src/gui-qt > /dev/null || die
+ eqmake5 \
+ 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+ if use gui ; then
+ emake -C src/gui-qt
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+
+ if use gui; then
+ emake -f makefile "${myhlopts[@]}" install-gui
+ docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+ fi
+
+ if ! use examples ; then
+ rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+ fi
+}
diff --git a/app-text/highlight/highlight-4.8.ebuild b/app-text/highlight/highlight-4.8.ebuild
new file mode 100644
index 000000000000..8f8dade1af5b
--- /dev/null
+++ b/app-text/highlight/highlight-4.8.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+inherit lua-single qmake-utils toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="
+ http://www.andre-simon.de/zip/${P}.tar.bz2
+ verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ ${LUA_DEPS}
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/boost
+"
+BDEPEND="
+ virtual/pkgconfig
+ gui? ( dev-qt/linguist-tools:5 )
+ verify-sig? ( sec-keys/openpgp-keys-andresimon )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
+myhlopts=(
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ LDFLAGS="${LDFLAGS}"
+ CFLAGS="${CXXFLAGS} -DNDEBUG"
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}/usr"
+ HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+ HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+ doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+ conf_dir="${EPREFIX}/etc/highlight/"
+ examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+ default
+
+ # Disable man page compression
+ sed \
+ -e "/GZIP/d" \
+ -e "/COPYING/d" \
+ -i makefile || die
+
+ sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ -i src/core/datadir.cpp || die
+
+ sed -r -i \
+ -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+ "${S}"/extras/tcl/makefile \
+ "${S}"/extras/swig/makefile \
+ || die "Failed to set Lua implementation"
+
+ # We set it via eqmake5, otherwise it forces clang...
+ sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+ -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+ -i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+ if use gui ; then
+ pushd src/gui-qt > /dev/null || die
+ eqmake5 \
+ 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+ if use gui ; then
+ emake -C src/gui-qt
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+
+ if use gui; then
+ emake -f makefile "${myhlopts[@]}" install-gui
+ docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+ fi
+
+ if ! use examples ; then
+ rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+ fi
+}
diff --git a/app-text/highlight/highlight-4.9.ebuild b/app-text/highlight/highlight-4.9.ebuild
new file mode 100644
index 000000000000..b7e7bd01dd57
--- /dev/null
+++ b/app-text/highlight/highlight-4.9.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/andresimon.asc
+inherit lua-single qmake-utils toolchain-funcs verify-sig xdg
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+# This is arbitrary; upstream uses master. Update when possible.
+TESTSUITE_COMMIT="a3479468672cdbc570a17ae84e047fe8f0b88798"
+SRC_URI="
+ http://www.andre-simon.de/zip/${P}.tar.bz2
+ test? ( https://gitlab.com/tajmone/${PN}-test-suite/-/archive/${TESTSUITE_COMMIT}/${PN}-test-suite-${TESTSUITE_COMMIT}.tar.bz2 )
+ verify-sig? ( http://www.andre-simon.de/zip/${P}.tar.bz2.asc )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples gui test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+ ${LUA_DEPS}
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/boost
+"
+BDEPEND="
+ virtual/pkgconfig
+ gui? ( dev-qt/linguist-tools:5 )
+ verify-sig? ( sec-keys/openpgp-keys-andresimon )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
+myhlopts=(
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ LDFLAGS="${LDFLAGS}"
+ CFLAGS="${CXXFLAGS} -DNDEBUG"
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}/usr"
+ HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+ HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+ doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+ conf_dir="${EPREFIX}/etc/highlight/"
+ examples_dir="${EPREFIX}/usr/share/doc/${PF}/extras"
+)
+
+src_prepare() {
+ default
+
+ # Disable man page compression
+ sed \
+ -e "/GZIP/d" \
+ -e "/COPYING/d" \
+ -i makefile || die
+
+ sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ -i src/core/datadir.cpp || die
+
+ sed -r -i \
+ -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+ "${S}"/extras/tcl/makefile \
+ "${S}"/extras/swig/makefile \
+ || die "Failed to set Lua implementation"
+
+ # We set it via eqmake5, otherwise it forces clang...
+ sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+ -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+ -i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+ if use gui ; then
+ pushd src/gui-qt > /dev/null || die
+ eqmake5 \
+ 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
+ if use gui ; then
+ emake -C src/gui-qt
+ fi
+}
+
+src_test() {
+ find "../${PN}-test-suite-${TESTSUITE_COMMIT}" -mindepth 1 -maxdepth 1 -type d | sort | while read line
+ do
+ "${SHELL}" "${line}/regression.sh" || die "Regression tests failed for language $(basename "${line}")"
+ done
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+
+ if use gui; then
+ emake -f makefile "${myhlopts[@]}" install-gui
+ docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+ fi
+
+ if ! use examples ; then
+ rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+ fi
+}
diff --git a/app-text/highlight/metadata.xml b/app-text/highlight/metadata.xml
index 7b4a61aab741..19b56b196be5 100644
--- a/app-text/highlight/metadata.xml
+++ b/app-text/highlight/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">saalen/highlight</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/hnb/files/hnb-1.9.18-fno-common.patch b/app-text/hnb/files/hnb-1.9.18-fno-common.patch
new file mode 100644
index 000000000000..89a4321c4144
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/ui.h
++++ b/src/ui.h
+@@ -38,6 +38,9 @@ extern int hnb_edit_posup;
+ extern int hnb_edit_posdown;
+
+ extern int ui_inited;
++extern int nodes_above;
++extern int active_line;
++extern int nodes_below;
+
+ void ui_getstr (char *prompt, char *datastorage);
+
+--- a/src/ui_draw.c
++++ b/src/ui_draw.c
+@@ -39,9 +39,9 @@
+
+ #define KEEPLINES 5
+
+-int nodes_above;
+-int active_line;
+-int nodes_below;
++extern int nodes_above;
++extern int active_line;
++extern int nodes_below;
+
+ static Node *up (Node *sel, Node *node)
+ {
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
index a38796bc73be..2c262725c22e 100644
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="A program to organize many kinds of data in one place"
HOMEPAGE="http://hnb.sourceforge.net/"
@@ -13,20 +14,22 @@ LICENSE="GPL-2"
KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="sys-libs/ncurses"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-include.patch
+ "${FILESDIR}"/${P}-printf.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
src_prepare() {
+ default
+
rm -r ${P} || die
rm src/cli_history.o || die
- epatch \
- "${FILESDIR}"/${P}-flags.patch \
- "${FILESDIR}"/${P}-include.patch \
- "${FILESDIR}"/${P}-printf.patch
-
tc-export AR CC PKG_CONFIG
# bug #532552
diff --git a/app-text/hnb/metadata.xml b/app-text/hnb/metadata.xml
index b426f3b5f745..b3064f5795a7 100644
--- a/app-text/hnb/metadata.xml
+++ b/app-text/hnb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/app-text/htag/htag-0.0.24-r1.ebuild b/app-text/htag/htag-0.0.24-r1.ebuild
index a326995bb2ee..4a62922a36ea 100644
--- a/app-text/htag/htag-0.0.24-r1.ebuild
+++ b/app-text/htag/htag-0.0.24-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
inherit perl-module
@@ -12,13 +12,12 @@ SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~mips ppc ~sparc x86"
-IUSE=""
src_install() {
newbin htag.pl htag
- # establish "${D}"usr/share/doc/${PF}, mv 2 folders in 1 line
+ # establish "${D}"/usr/share/doc/${PF}, mv 2 folders in 1 line
perl-module_src_install
- mv ./{example-scripts,docs/sample-config/} "${ED}"usr/share/doc/${PF}/ || die
+ mv ./{example-scripts,docs/sample-config/} "${ED}"/usr/share/doc/${PF}/ || die
dodoc docs/{MACRO_DESCRIPTION,README}
insinto /usr/share/htag/plugins
diff --git a/app-text/htag/metadata.xml b/app-text/htag/metadata.xml
index 3e927f8d7480..df1ea8d84522 100644
--- a/app-text/htag/metadata.xml
+++ b/app-text/htag/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 3189849f3292..b789100379d5 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,5 +1,3 @@
-DIST html-xml-utils-7.1.tar.gz 319559 BLAKE2B 4c07a13a6b59c9d336a5620f2c9b1109fc5289339348d287136ac91f5dd508780a97dc9e30ae361c1c8237ecfa16996a6cd79cb4eaf6d9b6ba9bd97806009fd2 SHA512 a17328500552ad28136a08d0c7dd992d53afbc853ffd8930b516b3218915f4f159234f27af66d135a51dc25eb6c35e6f14d6f0006bdfc2abf351ac8298334d48
-DIST html-xml-utils-7.4.tar.gz 343008 BLAKE2B 29c8e437afabd04fd511d3498c94cfe8ef027478b7bd4d0390635a5dd18be20971413217ba083e7fb7b82d9b10a9d943b8a90f761cd6ab192829ee64a11a0952 SHA512 88a527c29ef23b34ecb778085aafd399943764a18a3e4b39ff27b3e2cc3effa84b9ffe7c2a0df80fb27a38a7e4d4ceef6db91da46cbb2b4f9fd59903d4868a20
-DIST html-xml-utils-7.5.tar.gz 342037 BLAKE2B 0398c35593438fc3f46c459a6aba5f2c8814aed70087f27b3205a864fc349159691d282f6636073a8c8c0e8a711cd4efd070ba83f04348315f6b657b7495150c SHA512 32d9d36189a0f1a2f72578f7a449faa1ae85077de697e9021499981ee1a26e002d0a79a96ebe7f9e914b4a32320e098413a59a059c1541789599602e8be39d86
-DIST html-xml-utils-7.6.tar.gz 343469 BLAKE2B 8273aee01df43df43e9a3b6d384061d4ef6065c60829a225e088a8e24c9c7d5cf91bce2a7624a88a9821c5fdce327754d93dfa3ddd583e27de21b714cea9f91d SHA512 ea9faec48b9f8a8e4c2ce4b4f504bf1641d83f624366a162ffd8cba1b4a3cb5ae019f82c472986dc8cfb97454b8a469b2e8e11852b6ed93ed5bce84528a07baa
-DIST html-xml-utils-7.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460
+DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
+DIST html-xml-utils-8.5.tar.gz 421376 BLAKE2B 8fa959104db2d5765ceaf49be815f16c1422a3c7b94e0e8cd91e3bd0a8b18dfc33dff5d98204d7fe5694cfb711d213a5d82f58159b6d493fc78336d8dae1824d SHA512 f1140a81e66cc2f46dd0507a8948b2c267230fa8aed3dc79e91eeb2b6bcfe7053378da9d35fd053f8a8bc25c46491388aa7fd519c7e1c7757e73a7e1b1c67d87
+DIST html-xml-utils-8.6.tar.gz 421530 BLAKE2B 8c13a36798c5bb2e325f0df38696a9428b6c3ca087bbb4d1e7d9f2dd372e0aff386b7747e117016ad733ac07ab56a38b5ad0bcb1a0aa6b5ffd58de0ba2d8027d SHA512 0050b789a4921fa66b863255f1fd1ef9826e4b778ebc6dc67592fe854ec314b13cd8b162af67dae204018867966cfd5cb9822345917d3de3dc76c797bc0d2ec1
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
deleted file mode 100644
index a55cccd45c2e..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
- multilib-minimal_src_compile
-}
-
-src_install() {
- multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.4.ebuild b/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
deleted file mode 100644
index 080b0bdc12c5..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
- multilib-minimal_src_compile
-}
-
-src_install() {
- multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.5.ebuild b/app-text/html-xml-utils/html-xml-utils-7.5.ebuild
deleted file mode 100644
index 882068c2edf7..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.5.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
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
- multilib-minimal_src_compile
-}
-
-src_install() {
- multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.6.ebuild b/app-text/html-xml-utils/html-xml-utils-7.6.ebuild
deleted file mode 100644
index 882068c2edf7..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.6.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
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
- multilib-minimal_src_compile
-}
-
-src_install() {
- multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
deleted file mode 100644
index 882068c2edf7..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.7.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
-
-inherit multilib-minimal
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-
-RESTRICT="test"
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
- sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf
-}
-
-src_compile() {
- multilib-minimal_src_compile
-}
-
-src_install() {
- multilib-minimal_src_install
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
new file mode 100644
index 000000000000..40dab6ff6400
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
+SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ net-dns/libidn2:=
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+src_test() {
+ # Lots of tests lack a shebang and use bashisms
+ emake check SHELL="${BROOT}"/bin/bash
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-8.5.ebuild b/app-text/html-xml-utils/html-xml-utils-8.5.ebuild
new file mode 100644
index 000000000000..bf51929c322d
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-8.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
+SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ net-dns/libidn2:=
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+src_test() {
+ # Lots of tests lack a shebang and use bashisms
+ emake check SHELL="${BROOT}"/bin/bash
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-8.6.ebuild b/app-text/html-xml-utils/html-xml-utils-8.6.ebuild
new file mode 100644
index 000000000000..29a2f7e8e4d0
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-8.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
+SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ net-dns/libidn2:=
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+src_test() {
+ # Lots of tests lack a shebang and use bashisms
+ # (seems to be better wrt bashisms as of 8.6, but still no shebang. recheck?)
+ emake check SHELL="${BROOT}"/bin/bash
+}
diff --git a/app-text/html-xml-utils/metadata.xml b/app-text/html-xml-utils/metadata.xml
index 294c350c6960..115e9d64a669 100644
--- a/app-text/html-xml-utils/metadata.xml
+++ b/app-text/html-xml-utils/metadata.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>monsieurp@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index b8e14c97c5df..910122596915 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,3 +1,2 @@
-DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
-DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
-DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
+DIST html2text-2.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769b2c8cd758022e9b650a2cbd1788064ada1949e9efddc591c819b0c86890e22504bebde68c2973c353b6fa85da33 SHA512 e7fbd795b06895d866e3379c343860dc8816d5069b476cd13abeb066ba1ad222050863c1d52c6b2c05d426a17af7b427913341c8205964b21f18a3d26c3528c4
+DIST html2text-2.2.3.tar.gz 329841 BLAKE2B 311defd6aa6affc6f1ad59d9971f0315b6f2d748b4ae26e2c5f61cbd090ff76f0f0df7155acb1ec5c0114a6b6253eb27fc73d327162dca2a144afae74cdf4afa SHA512 ff851abdc0f672d6bf8de494d6595362d5b71eeb03f4f761e32afb50bb75fe12c0cede8c7ca4ca7290b1c9e0f08aaff9821946dd272e1a30ce3b585e452cf6ec
diff --git a/app-text/html2text/files/html2text-1.3.2a-compiler.patch b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
deleted file mode 100644
index 19a1341209d4..000000000000
--- a/app-text/html2text/files/html2text-1.3.2a-compiler.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -38,8 +38,8 @@
- return 0;
- }
- EOF
--CXX=unknown;
--for i in "CC" "g++" "cc" "$CC"; do
-+CXX=${CXX-unknown}
-+for i in "$CXX" "CC" "g++" "cc"; do
- if $i -c $tmp_file.C 2>/dev/null; then
- CXX="$i";
- break;
diff --git a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
deleted file mode 100644
index 949d8958a449..000000000000
--- a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/urlistream.C
-+++ b/urlistream.C
-@@ -362,7 +362,7 @@
- int
- urlistream::get()
- {
-- char ch;
-+ unsigned char ch;
- int ret = ::read(fd_, &ch, 1);
- return (ret > 0 ? ch : -1);
- }
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
deleted file mode 100644
index 06cb76ed7dca..000000000000
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="HTML to text converter"
-HOMEPAGE="http://www.mbayer.de/html2text/"
-SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
- http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff
- http://www.mbayer.de/html2text/downloads/patch-amd64-${P}.diff
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-PATCHES=(
- "${FILESDIR}/${P}-compiler.patch"
- "${FILESDIR}/${P}-urlistream-get.patch"
- "${DISTDIR}/patch-utf8-${P}.diff"
- "${DISTDIR}/patch-amd64-${P}.diff"
-)
-
-src_prepare() {
- default
- gunzip html2text.1.gz html2textrc.5.gz || die
- tc-export CXX
-}
-
-src_compile() {
- emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
-}
-
-src_install() {
- dobin html2text
- doman html2text.1 html2textrc.5
- dodoc CHANGES CREDITS KNOWN_BUGS README TODO
-}
diff --git a/app-text/html2text/html2text-2.1.1.ebuild b/app-text/html2text/html2text-2.1.1.ebuild
new file mode 100644
index 000000000000..2a2be554d110
--- /dev/null
+++ b/app-text/html2text/html2text-2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+ SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_configure() {
+ # non-autoconf configure
+ tc-export CXX
+ default
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ MANDIR="${EPREFIX}/usr/share/man" \
+ DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+ install
+}
diff --git a/app-text/html2text/html2text-2.2.3.ebuild b/app-text/html2text/html2text-2.2.3.ebuild
new file mode 100644
index 000000000000..990f9f594abc
--- /dev/null
+++ b/app-text/html2text/html2text-2.2.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+ SRC_URI="https://github.com/grobian/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ emake check
+}
diff --git a/app-text/html2text/metadata.xml b/app-text/html2text/metadata.xml
index cd4b982119ec..c8e4623184d3 100644
--- a/app-text/html2text/metadata.xml
+++ b/app-text/html2text/metadata.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>jazzoslav@gmail.com</email>
- <name>Jaroslav Rakhmatoullin</name>
- </maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">grobian/html2text</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/html401/files/html401-decl.diff b/app-text/html401/files/html401-decl.diff
index 27819a8afd17..e5c5bd4b22d9 100644
--- a/app-text/html401/files/html401-decl.diff
+++ b/app-text/html401/files/html401-decl.diff
@@ -1,5 +1,5 @@
---- HTML4.cat.orig 2004-11-06 20:25:39.000000000 +0900
-+++ HTML4.cat 2004-11-06 21:16:08.543377286 +0900
+--- a/HTML4.cat 2004-11-06 20:25:39.000000000 +0900
++++ b/HTML4.cat 2004-11-06 21:16:08.543377286 +0900
@@ -1,5 +1,9 @@
OVERRIDE YES
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
deleted file mode 100644
index 777837fcc2f2..000000000000
--- a/app-text/html401/html401-19991224-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
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
-HOMEPAGE="http://www.w3.org/TR/html401/"
-SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND="app-text/sgml-common"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
- sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
- "/usr/share/sgml/${PN}/HTML4.cat"
- epatch "${FILESDIR}"/${PN}-decl.diff
-}
-
-src_install() {
- insinto /usr/share/sgml/${PN}
- doins HTML4.cat HTML4.decl *.dtd *.ent
- insinto /usr/share/doc/${PF}/html
- doins -r *.html $(ls -p | fgrep "/" | sed "s#/##")
-}
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
new file mode 100644
index 000000000000..65a3e66ba88e
--- /dev/null
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
+HOMEPAGE="https://www.w3.org/TR/html401/"
+SRC_URI="https://www.w3.org/TR/1999/REC-html401-${PV}/html40.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${PN}-decl.diff )
+
+src_install() {
+ insinto /usr/share/sgml/${PN}
+ doins HTML4.cat HTML4.decl *.dtd *.ent
+
+ insinto /etc/sgml
+ newins - html401.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/html401/HTML4.cat"
+ EOF
+
+ docinto html
+ local dirs=( */ )
+ dodoc -r *.html "${dirs[@]%/}"
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/html401.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/html401.cat
+ local real=${EROOT}/etc/sgml/html401.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/html401/metadata.xml b/app-text/html401/metadata.xml
index 6f49eba8f496..076793e3f54b 100644
--- a/app-text/html401/metadata.xml
+++ b/app-text/html401/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
deleted file mode 100644
index 0e5f1befb819..000000000000
--- a/app-text/htmlc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST htmlc-2.4.0.tgz 132584 BLAKE2B 42f0948e7f896130b539d8d0f0936ddfa21986d3eeab2b30598572eca12952a0010edb1044b259ed13242534a66351c9855e43bbac613028d926370f6221e0d2 SHA512 8de81041cea0c6d07188cb0d8cd553c1d20ea37d01a8d7425d23a10c7fd3d93dc1f7c1e3de473cb624720dc7588a3d891432d5945a23d1f253d2109cdafc15dc
-DIST htmlc-2.6.tgz 286727 BLAKE2B 47e5460c08f7ce5010615e0dec99bc60b2e0f6857d0347c50357837930ca68b369a66001846ef3855cd54cdf6f1dac73ab45546be659a05b1e202438e4914865 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4
diff --git a/app-text/htmlc/files/werror.patch b/app-text/htmlc/files/werror.patch
deleted file mode 100644
index 4576b47b80a4..000000000000
--- a/app-text/htmlc/files/werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Dont build with -Werror like switches.
-Need to patch Makefile and *NOT* Makefile.in since otherwise this triggers a
-rebuild of the Makefile which needs htmlc to be installed first.
-https://bugs.gentoo.org/show_bug.cgi?id=553172
-
-Index: htmlc-2.6.0/config/Makefile
-===================================================================
---- htmlc-2.6.0.orig/config/Makefile
-+++ htmlc-2.6.0/config/Makefile
-@@ -40,7 +40,7 @@ MANDIR = $(PREFIXINSTALLDIR)/man/man$(MA
-
- # The Caml compilers (those defaults should be OK)
- CAMLDEP = $(OCAML_COMMAND_SEARCH_PATH)ocamldep
--CAML_FLAGS = -w A -warn-error A #-safe-string
-+CAML_FLAGS = -w A #-safe-string
- CAMLBYT_FLAGS = $(CAML_FLAGS) -g -annot
- CAMLBYT = $(OCAML_COMMAND_SEARCH_PATH)ocamlc $(CAMLBYT_FLAGS)
- CAMLBIN_FLAGS = $(CAML_FLAGS) -inline 10000
diff --git a/app-text/htmlc/htmlc-2.40.0.ebuild b/app-text/htmlc/htmlc-2.40.0.ebuild
deleted file mode 100644
index 8f9c4893199b..000000000000
--- a/app-text/htmlc/htmlc-2.40.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
-MY_P="${P/0[.]/.}"
-
-DESCRIPTION="HTML template files expander"
-HOMEPAGE="http://htmlc.inria.fr/"
-SRC_URI="http://htmlc.inria.fr/${MY_P}.tgz"
-
-LICENSE="htmlc"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="+ocamlopt"
-# Files for the tests are missing...
-#RESTRICT="test"
-
-DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- ./configure \
- --install-root-dir "${ED}usr" \
- || die
-}
-
-src_compile() {
- if use ocamlopt ; then
- emake bin
- else
- emake byt
- fi
-}
-
-src_install() {
- if use ocamlopt ; then
- emake installbin
- else
- emake installbyt
- fi
- emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
- dodoc README Announce* CHANGES
-}
diff --git a/app-text/htmlc/htmlc-2.60.0.ebuild b/app-text/htmlc/htmlc-2.60.0.ebuild
deleted file mode 100644
index b10f6905b522..000000000000
--- a/app-text/htmlc/htmlc-2.60.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
-MY_P="${P/0[.]/.}"
-
-DESCRIPTION="HTML template files expander"
-HOMEPAGE="http://htmlc.inria.fr/"
-SRC_URI="http://htmlc.inria.fr/${MY_P%.0}.tgz"
-
-LICENSE="htmlc"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt"
-# Files for the tests are missing...
-#RESTRICT="test"
-
-DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/werror.patch"
-}
-
-src_configure() {
- ./configure \
- --install-root-dir "${ED}usr" \
- || die
-}
-
-src_compile() {
- if use ocamlopt ; then
- emake bin
- else
- emake byt
- fi
-}
-
-src_install() {
- if use ocamlopt ; then
- emake installbin
- else
- emake installbyt
- fi
- emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
- dodoc README Announce* CHANGES
-}
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
deleted file mode 100644
index 75c9ea74812d..000000000000
--- a/app-text/htmlc/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>ml@gentoo.org</email>
- <name>Gentoo ML Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 404d247221e8..aec781289683 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1 +1 @@
-DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
+DIST htmldoc-1.9.16-source.tar.gz 3389563 BLAKE2B 1c83e37313fb0a1196d4db3ddca47d4a418ab7aeb8f910c9a27178312a1b0239beddaf81f322b24dcf75dff7e838278fcfa0eed17b5aa493790de2393bcddebf SHA512 c901ed259ef8c0520ed03e314149e7a2fc3b5bffa9c8e9c6c3b023a8c9de1e37b7fa72d224fa7d072f3a5d4b379635d7cfaa016df672da296be8395b49fa935b
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
deleted file mode 100644
index 9fd2fd29c494..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1"
-SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
-IUSE="fltk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4:0=
- virtual/jpeg:0
- fltk? ( x11-libs/fltk:1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
- default
-
- # make sure not to use the libs htmldoc ships with
- rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'
-
- # Fix the documentation path in a few places. Some Makefiles aren't
- # autotoolized =(
- for file in configure doc/Makefile doc/htmldoc.man; do
- sed -i "${file}" \
- -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
- || die "failed to fix documentation path in ${file}"
- done
-}
-
-src_configure() {
- CC=$(tc-getCC) CXX=$(tc-getCXX) DSTROOT="${D}" econf $(use_with fltk gui)
-}
-
-src_install() {
- emake DSTROOT="${D}" install
-}
diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild b/app-text/htmldoc/htmldoc-1.9.16.ebuild
new file mode 100644
index 000000000000..20805c240a90
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.9.16.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs xdg
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="fltk ssl"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ media-libs/libjpeg-turbo:=
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ ssl? ( net-libs/gnutls:= )
+ fltk? ( x11-libs/fltk:1 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+
+ # Fix the documentation path in a few places. Some Makefiles aren't
+ # autotoolized =(
+ for file in configure doc/Makefile doc/htmldoc.man; do
+ sed -i "${file}" \
+ -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+ || die "failed to fix documentation path in ${file}"
+ done
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with fltk gui)
+ $(use_enable ssl)
+ $(use_enable ssl gnutls)
+ )
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake STRIPPROG="true" DSTROOT="${ED}" install
+}
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
index 6f49eba8f496..8eab97c666e9 100644
--- a/app-text/htmldoc/metadata.xml
+++ b/app-text/htmldoc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">michaelrsweet/htmldoc</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index a2d1afc50502..4c58bcbbe842 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,11 +7,11 @@ inherit flag-o-matic toolchain-funcs
DESCRIPTION="HTML Include System by Ulli Meybohm"
HOMEPAGE="http://www.meybohm.de/"
-SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos"
S="${WORKDIR}/${PN}"
PATCHES=(
diff --git a/app-text/htmlinc/metadata.xml b/app-text/htmlinc/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/htmlinc/metadata.xml
+++ b/app-text/htmlinc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 1b2a9718606d..7776b73b67a8 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,2 +1 @@
-DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
-DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
+DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
diff --git a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
deleted file mode 100644
index 824eee774c21..000000000000
--- a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-HTMLMIN_GIT_REVISION="7bcbb995778fc07e427872dc74af9646fd0c907d"
-
-DESCRIPTION="A configurable HTML Minifier with safety features"
-HOMEPAGE="https://github.com/mankyd/htmlmin"
-SRC_URI="https://github.com/mankyd/${PN}/archive/${HTMLMIN_GIT_REVISION}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
- sed '/prune/d' -i MANIFEST.in
- default
-}
diff --git a/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
new file mode 100644
index 000000000000..c57dc344d252
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1
+
+# upstream doesn't do tags much
+EGIT_COMMIT=220b1d16442eb4b6fafed338ee3b61f698a01e63
+DESCRIPTION="A configurable HTML Minifier with safety features"
+HOMEPAGE="https://github.com/mankyd/htmlmin"
+SRC_URI="
+ https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+ sed '/prune/d' -i MANIFEST.in || die
+ distutils-r1_src_prepare
+}
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
deleted file mode 100644
index 95105e76d782..000000000000
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable HTML Minifier with safety features"
-HOMEPAGE="https://github.com/mankyd/htmlmin"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
- sed '/prune/d' -i MANIFEST.in
- default
-}
diff --git a/app-text/htmlmin/metadata.xml b/app-text/htmlmin/metadata.xml
index 2b2dd5ca9914..d57782f96382 100644
--- a/app-text/htmlmin/metadata.xml
+++ b/app-text/htmlmin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>python@gentoo.org</email>
@@ -9,7 +9,9 @@
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="pypi">htmlmin</remote-id>
+ <remote-id type="github">mankyd/htmlmin</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/htmlrecode/metadata.xml b/app-text/htmlrecode/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/htmlrecode/metadata.xml
+++ b/app-text/htmlrecode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 64a9b40c6242..4df9f10537d4 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,2 +1 @@
-DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
-DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
+DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
diff --git a/app-text/htmltidy/files/11CVE-2015-5522.patch b/app-text/htmltidy/files/11CVE-2015-5522.patch
deleted file mode 100644
index b4d6158ea04a..000000000000
--- a/app-text/htmltidy/files/11CVE-2015-5522.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
-From: Geoff McLane <ubuntu@geoffair.info>
-Date: Wed, 3 Jun 2015 20:26:03 +0200
-Subject: [PATCH] Issue #217 - avoid len going negative, ever...
-
----
- src/lexer.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index 376a3d8..664f806 100644
---- a/src/lexer.c
-+++ b/src/lexer.c
-@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
- /* and prompts attributes unless --literal-attributes is set to yes */
- /* #994841 - Whitespace is removed from value attributes */
-
-- if (munge &&
-+ /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
-+ if ((len > 0) && munge &&
- TY_(tmbstrcasecmp)(name, "alt") &&
- TY_(tmbstrcasecmp)(name, "title") &&
- TY_(tmbstrcasecmp)(name, "value") &&
- TY_(tmbstrcasecmp)(name, "prompt"))
- {
-- while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
-+ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
- --len;
-
-- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
-+ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
- {
- ++start;
- --len;
diff --git a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch b/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
deleted file mode 100644
index 942a61e1464c..000000000000
--- a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: tidy-20090325/include/platform.h
-===================================================================
---- tidy-20090325.orig/include/platform.h
-+++ tidy-20090325/include/platform.h
-@@ -24,7 +24,7 @@ extern "C" {
- */
-
- /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
--/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
-+#define TIDY_CONFIG_FILE "/etc/tidyrc"
- /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
-
- /*
-@@ -33,7 +33,7 @@ extern "C" {
- It enables tidy to find config files named ~/.tidyrc if
- the HTML_TIDY environment variable is not set.
- */
--/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
-+#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
-
- /*
- Uncomment the following #define if your
-@@ -48,7 +48,7 @@ extern "C" {
- Contributed by Todd Lewis.
- */
-
--/* #define SUPPORT_GETPWNAM */
-+#define SUPPORT_GETPWNAM
-
-
- /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
deleted file mode 100644
index 4c805cf2226f..000000000000
--- a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN tidy.old/configure.in tidy-26/configure.in
---- tidy.old/configure.in 2006-02-13 17:17:49.000000000 +0100
-+++ tidy-26/configure.in 2006-02-13 17:17:20.000000000 +0100
-@@ -72,7 +72,7 @@
- if test $debug_build = yes; then
- CFLAGS="$save_cflags -g"
- else
-- CFLAGS="-O2 $save_cflags"
-+ CFLAGS="$save_cflags"
- fi
- #
- # =============================================
diff --git a/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch b/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch
new file mode 100644
index 000000000000..476db036730f
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,34 +393,7 @@
+ endif ()
+
+
+-#------------------------------------------------------------------------
+-# Static Library
+-# The static library always builds.
+-#------------------------------------------------------------------------
+-set(name tidy-static)
+-add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
+-if (WIN32)
+- set_target_properties( ${name} PROPERTIES
+- OUTPUT_NAME ${LIB_NAME}_static )
+-else ()
+- set_target_properties( ${name} PROPERTIES
+- OUTPUT_NAME ${LIB_NAME} )
+-
+-endif ()
+-if (NOT TIDY_CONSOLE_SHARED) # user wants default static linkage
+- list ( APPEND add_LIBS ${name} )
+-endif ()
+-install(TARGETS ${name}
+- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+- )
+ install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} )
+-if(MSVC)
+- # install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION lib OPTIONAL)
+- INSTALL(FILES ${PROJECT_BINARY_DIR}/${name}.dir/Debug/${name}.pdb
+- DESTINATION lib CONFIGURATIONS Debug )
+-endif()
+
+ #------------------------------------------------------------------------
+ # Dynamic Library
diff --git a/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch b/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch
new file mode 100644
index 000000000000..22d716f01561
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch
@@ -0,0 +1,29 @@
+https://github.com/htacg/tidy-html5/issues/1012
+https://bugs.gentoo.org/916074
+
+commit e411ad0d2582471fe0961900b2789ee8b5b9cc4c
+Author: Markus Pister <pister@absint.com>
+Date: Wed Jan 5 08:30:10 2022 +0100
+
+ Attribute 'type' in tag 'ol' allowed for (X)HTML5
+
+ Mark the attribute 'type' as allowed for tag 'ol' in (X)HTML5.
+
+ The attribute type was deprecated in HTML4. This decision was reverted
+ for HTML5, see
+
+ https://www.w3.org/TR/2014/NOTE-html5-diff-20141209/#changed-attributes
+
+ This fixes htacg#1012.
+
+--- a/src/attrdict.c
++++ b/src/attrdict.c
+@@ -2321,7 +2321,7 @@ const AttrVersion TY_(W3CAttrsFor_OL)[] =
+ { TidyAttr_START, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 },
+ { TidyAttr_STYLE, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|HT50|XH50 }, /* CORE override */
+ { TidyAttr_TITLE, xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */
+- { TidyAttr_TYPE, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx },
++ { TidyAttr_TYPE, xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 },
+ { TidyAttr_XMLNS, xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|XH11|XB10|HT50|XH50 }, /* CORE override */
+ { TidyAttr_XML_LANG, xxxx|xxxx|xxxx|xxxx|X10T|xxxx|xxxx|X10F|xxxx|xxxx|X10S|XH11|XB10|xxxx|XH50 }, /* CORE override */
+ INCLUDE_CORE_ATTRIBS
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
deleted file mode 100644
index d3a18bca8cce..000000000000
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="tidy"
-MY_P="${MY_PN}-${PV}"
-
-inherit eutils autotools
-
-DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
-HOMEPAGE="http://tidy.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
- mirror://gentoo/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- # Required to setup the source dist for autotools
- einfo "Setting up autotools for source build"
- cp -R ./build/gnuauto/* . || die "could not prepare autotools environment"
-
- # Stop tidy from appending -O2 to our CFLAGS
- epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch
-
- # Define /etc/tidyrc for system wide config, bug 154834
- epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch
-
- # Fix security bug 561452
- epatch "${FILESDIR}"/11CVE-2015-5522.patch
-
- eautoreconf
-}
-
-src_compile() {
- default
-
- if use doc ; then
- doxygen htmldoc/doxygen.cfg || die "error making apidocs"
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- # Now the man page is provided as an xsl file, which
- # we can't use until htmltidy is merged.
- # I have generated the man page and quickref which is on
- # the mirrors. (bug #132429)
- doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
-
- # Fix name before installing
- mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
- "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
- cd "${S}"/htmldoc
- # Install basic html documentation
- dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
- # If use 'doc' is set, then we also want to install the
- # api documentation
- use doc && dohtml -r api
-}
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
new file mode 100644
index 000000000000..a0d767ef3275
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
+RUBY_OPTIONAL="yes"
+
+inherit cmake ruby-ng
+
+MY_PN="tidy-html5"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="https://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/58" # subslot is SOVERSION
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="deprecated test"
+
+RESTRICT="!test? ( test )"
+ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch
+ "${FILESDIR}"/${PN}-5.8.0-ol_type.patch
+)
+
+DOCS=( README.md README/CHANGELOG.md )
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ use test && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+ # suppress ruby-ng export
+ default
+}
+
+src_prepare() {
+ # suppress ruby-ng export
+ cmake_src_prepare
+}
+
+src_compile() {
+ # suppress ruby-ng export
+ cmake_src_compile
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DTIDY_CONSOLE_SHARED=ON
+ )
+ use deprecated && mycmakeargs+=(
+ -DBUILD_TAB2SPACE=ON
+ -DTIDY_COMPAT_HEADERS=ON
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ cd regression_testing || die
+ rm -f Gemfile.lock
+ ${RUBY} ./test.rb test -t "${BUILD_DIR}/tidy" || die "Test execution failed"
+}
+
+src_install() {
+ cmake_src_install
+ use deprecated && dobin "${BUILD_DIR}"/tab2space
+}
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 3fbef354e7d1..88aa1fd61eb2 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
<upstream>
- <remote-id type="sourceforge">tidy</remote-id>
+ <remote-id type="cpe">cpe:/a:htacg:tidy</remote-id>
+ <remote-id type="github">htacg/tidy-html5</remote-id>
</upstream>
+ <use>
+ <flag name="deprecated">Install tools and header files which are now considered deprecated</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index 32554a498f6a..4542df73951f 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,2 +1 @@
-DIST htp-1.16.tar.gz 141133 BLAKE2B 58f0ab7df1400d561ec1994a98ce4fa3acaa3299b51d9382f9baaecbd95a623795d72204617c153fd4e165910fdabd0328e737cccb242be2075edd2573af55c1 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0
DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
diff --git a/app-text/htp/files/htp-1.19-fix-perl-5.26.patch b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch
new file mode 100644
index 000000000000..b3adff7db2be
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-fix-perl-5.26.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/668250
+--- a/homepage/ref/pphtp.pl
++++ b/homepage/ref/pphtp.pl
+@@ -6,7 +6,7 @@
+ # -n include line numbers
+ # -s include EBNF like syntax
+
+-require "hlhtp.pl";
++require "./hlhtp.pl";
+
+
+ while ($ARGV[0] =~ /^-(.*)/) {
diff --git a/app-text/htp/files/htp-1.19-no-prestrip.patch b/app-text/htp/files/htp-1.19-no-prestrip.patch
new file mode 100644
index 000000000000..c47b9e4d4241
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-no-prestrip.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.sub
++++ b/src/Makefile.sub
+@@ -46,7 +46,7 @@ install: install-bin
+
+ install-bin: $(HTP)
+ mkdir -p $(bindir)
+- $(INSTALL) -s $(HTP) $(bindir)
++ $(INSTALL) $(HTP) $(bindir)
+
+ #
+ # explicit dependency: final executable
diff --git a/app-text/htp/files/htp-1.19-parallel-make.patch b/app-text/htp/files/htp-1.19-parallel-make.patch
new file mode 100644
index 000000000000..850b1d18e330
--- /dev/null
+++ b/app-text/htp/files/htp-1.19-parallel-make.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/827173
+https://sources.debian.org/patches/htp/1.19-8/0004-Parallel-ftbfs.patch/
+
+Description: Fix occasional parallel FTBFS
+ Various source files indirectly include $(d)/version.inc,
+ don't regenerate it in the middle of the build.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- htp-1.19.orig/src/Makefile.sub
++++ htp-1.19/src/Makefile.sub
+@@ -57,14 +57,12 @@ $(HTP) : $(OBJ$(d))
+ #
+ # implicit dependencies for source code
+ #
+-$(OBJ$(d)) : %.$(OBJEXT) : %.c
++$(OBJ$(d)) : %.$(OBJEXT) : %.c $(d)/version.inc
+ ifdef WIN32DMC
+ cd $(dir $<); $(CC) $(CCOPT) $(DEFINES) $(notdir $<)
+ else
+ $(CC) $(CCOPT) $(DEFINES) -o $*.$(OBJEXT) $<
+ endif
+
+-$(d)/htp.$(OBJEXT) $(d)/ver.$(OBJEXT): $(d)/version.inc
+-
+ # restore parent dir
+ d := $(p$(d))
+
diff --git a/app-text/htp/files/strip.patch b/app-text/htp/files/strip.patch
deleted file mode 100644
index 9c92e757bc9e..000000000000
--- a/app-text/htp/files/strip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-don't strip
-
-http://bugs.gentoo.org/240110
-
---- src/Makefile
-+++ src/Makefile
-@@ -33,7 +33,7 @@
-
- install-bin: $(MAINEXE)
- mkdir -p $(bindir)
-- $(INSTALL) -s $(MAINEXE) $(bindir)
-+ $(INSTALL) $(MAINEXE) $(bindir)
-
- #
- # explicit dependency: final executable
diff --git a/app-text/htp/htp-1.16-r1.ebuild b/app-text/htp/htp-1.16-r1.ebuild
deleted file mode 100644
index f3fd15c02c87..000000000000
--- a/app-text/htp/htp-1.16-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An HTML preprocessor"
-HOMEPAGE="http://htp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-# HTP does not use autoconf, have to set options defined in Makefile.config
-
-src_prepare() {
- epatch "${FILESDIR}"/strip.patch #240110
- # let src_test take care of testing
- sed -i -e '/SUBDIRS /s:tests::' Makefile || die
- # don't install doc files with +x perms
- sed -i -e '$aINSTALL += -m644' homepage/ref/{*/,}Makefile || die
- # make src_test abort on failure
- sed -i -e '/DIFF.*FAILED/s/echo/exit 1; :/' tests/Makefile || die
- # the png file in this test isn't fetchable
- sed -i -e 's: width="630" height="331"::' tests/png.html.exp || die
-}
-
-src_compile() {
- emake \
- CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
- CC="$(tc-getCC)" \
- LINK='$(CC) $(LDFLAGS)' \
- || die
-}
-
-src_test() {
- emake -C tests || die
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- prefix='$(DESTDIR)/usr' \
- pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
- install || die
-}
diff --git a/app-text/htp/htp-1.19-r1.ebuild b/app-text/htp/htp-1.19-r1.ebuild
new file mode 100644
index 000000000000..c01e19b48e7d
--- /dev/null
+++ b/app-text/htp/htp-1.19-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An HTML preprocessor"
+HOMEPAGE="http://htp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.19-no-prestrip.patch
+ "${FILESDIR}"/${PN}-1.19-parallel-make.patch
+ "${FILESDIR}"/${PN}-1.19-fix-perl-5.26.patch
+)
+
+src_compile() {
+ # TOOD: Tests are always run by the Makefile right now
+ emake \
+ CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
+ CC="$(tc-getCC)" \
+ LINK='$(CC) $(LDFLAGS)'
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ prefix='$(DESTDIR)/usr' \
+ pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
+ install
+}
diff --git a/app-text/htp/htp-1.19.ebuild b/app-text/htp/htp-1.19.ebuild
deleted file mode 100644
index 962eb9f37525..000000000000
--- a/app-text/htp/htp-1.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An HTML preprocessor"
-HOMEPAGE="http://htp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RESTRICT="test"
-
-QA_PRESTRIPPED="/usr/bin/htp"
-
-src_compile() {
- emake \
- CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
- CC="$(tc-getCC)" \
- LINK='$(CC) $(LDFLAGS)'
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- prefix='$(DESTDIR)/usr' \
- pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
- install
-}
diff --git a/app-text/htp/metadata.xml b/app-text/htp/metadata.xml
index ae333307c43c..c52150a31f29 100644
--- a/app-text/htp/metadata.xml
+++ b/app-text/htp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>web-apps@gentoo.org</email>
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index f27735636f48..6cdfe356aec2 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,2 +1 @@
-DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
-DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
+DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac
diff --git a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
deleted file mode 100644
index be56cabc50bc..000000000000
--- a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- hunspell-1.6.2/src/tools/chmorph.cxx
-+++ hunspell-1.6.2/src/tools/chmorph.cxx
-@@ -55,11 +55,11 @@
- if (!argv[i]) {
- fprintf(
- stderr,
-- "chmorph - change affixes by morphological analysis and generation\n"
-- "correct syntax is:\nchmorph affix_file "
-+ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+ "correct syntax is:\nhunspell-chmorph affix_file "
- "dictionary_file file_to_convert STRING1 STRING2\n"
- "STRINGS may be arbitrary parts of the morphological descriptions\n"
-- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
- " (convert informal Hungarian second person texts to formal third "
- "person texts)\n");
- exit(1);
---- hunspell-1.6.2/src/tools/example.cxx
-+++ hunspell-1.6.2/src/tools/example.cxx
-@@ -48,9 +48,9 @@
- /* first parse the command line options */
-
- if (argc < 4) {
-- fprintf(stderr, "example (now it works with more dictionary files):\n");
-+ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
- fprintf(stderr,
-- "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
- exit(1);
- }
-
---- hunspell-1.6.2/src/tools/Makefile.am
-+++ hunspell-1.6.2/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
-
- AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
-
-@@ -6,8 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.6.la
-
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
-
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.6.la
-@@ -16,14 +16,14 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- ../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
-
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.6.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
-
- bulkcheck_SOURCES=bulkcheck.cxx
- bulkcheck_LDADD = ../hunspell/libhunspell-1.6.la
-
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-
- noinst_PROGRAMS=example bulkcheck
-
---- hunspell-1.6.2/src/tools/munch.cxx
-+++ hunspell-1.6.2/src/tools/munch.cxx
-@@ -78,14 +78,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "munch word_list_file affix_file\n");
-+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "munch word_list_file affix_file\n");
-+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
-
---- hunspell-1.6.2/src/tools/unmunch.cxx
-+++ hunspell-1.6.2/src/tools/unmunch.cxx
-@@ -73,14 +73,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "unmunch dic_file affix_file\n");
-+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "unmunch dic_file affix_file\n");
-+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
-
---- hunspell-1.6.2/tests/test.sh
-+++ hunspell-1.6.2/tests/test.sh
-@@ -74,7 +74,7 @@
- shopt -s expand_aliases
-
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
--alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
-+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
-
- if [ "$VALGRIND" != "" ]; then
- rm -f $TEMPDIR/test.pid*
-@@ -83,7 +83,7 @@
- fi
-
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
-- alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
-+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
- fi
-
- # Tests good words
diff --git a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
deleted file mode 100644
index c45b9cc8a154..000000000000
--- a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From d3e2d1d29615f4861fd3354353d426bd8701389d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 13 Nov 2018 10:37:42 +0100
-Subject: [PATCH] Rename some executables which have too generic names
-
-to be placed in /usr/bin - this patch prefixes them with 'hunspell-'
-
-Real authorship is a bit unclear as Gentoo is using this kind of patch since
-hunspell-1.1.3 which was added to Gentoo back in 2006-01-29 and the
-corresponding bug report didn't mention the patch at all:
-
-https://bugs.gentoo.org/114482
-https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch?hideattic=0&view=log
----
- src/tools/Makefile.am | 14 +++++++-------
- src/tools/chmorph.cxx | 6 +++---
- src/tools/example.cxx | 4 ++--
- src/tools/munch.cxx | 4 ++--
- src/tools/unmunch.cxx | 4 ++--
- tests/Makefile.am | 2 +-
- tests/test.sh | 2 +-
- 7 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
-index 1786e8e..190bffe 100644
---- a/src/tools/Makefile.am
-+++ b/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
-
- AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
-
-@@ -6,8 +6,8 @@ hzip_SOURCES=hzip.cxx
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.7.la
-
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
-
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.7.la
-@@ -17,11 +17,11 @@ nodist_hunspell_SOURCES= ../../config.h
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- ../hunspell/libhunspell-1.7.la @CURSESLIB@ @READLINELIB@
-
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.7.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.7.la
-
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
-
- noinst_PROGRAMS=example
-
-diff --git a/src/tools/chmorph.cxx b/src/tools/chmorph.cxx
-index 6e5add6..163186d 100644
---- a/src/tools/chmorph.cxx
-+++ b/src/tools/chmorph.cxx
-@@ -55,11 +55,11 @@ int main(int, char** argv) {
- if (!argv[i]) {
- fprintf(
- stderr,
-- "chmorph - change affixes by morphological analysis and generation\n"
-- "correct syntax is:\nchmorph affix_file "
-+ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+ "correct syntax is:\nhunspell-chmorph affix_file "
- "dictionary_file file_to_convert STRING1 STRING2\n"
- "STRINGS may be arbitrary parts of the morphological descriptions\n"
-- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
- " (convert informal Hungarian second person texts to formal third "
- "person texts)\n");
- exit(1);
-diff --git a/src/tools/example.cxx b/src/tools/example.cxx
-index 8213a5f..c3cc76a 100644
---- a/src/tools/example.cxx
-+++ b/src/tools/example.cxx
-@@ -48,9 +48,9 @@ int main(int argc, char** argv) {
- /* first parse the command line options */
-
- if (argc < 4) {
-- fprintf(stderr, "example (now it works with more dictionary files):\n");
-+ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
- fprintf(stderr,
-- "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
- exit(1);
- }
-
-diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
-index 5f51fc6..c8f8beb 100644
---- a/src/tools/munch.cxx
-+++ b/src/tools/munch.cxx
-@@ -78,14 +78,14 @@ int main(int argc, char** argv) {
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "munch word_list_file affix_file\n");
-+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "munch word_list_file affix_file\n");
-+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
-
-diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx
-index 82c2f9d..663e8ea 100644
---- a/src/tools/unmunch.cxx
-+++ b/src/tools/unmunch.cxx
-@@ -73,14 +73,14 @@ int main(int argc, char** argv) {
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "unmunch dic_file affix_file\n");
-+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr, "correct syntax is:\n");
-- fprintf(stderr, "unmunch dic_file affix_file\n");
-+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6dc3e93..88d882c 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = suggestiontest
-
- TEST_EXTENSIONS = .dic
- AM_TESTS_ENVIRONMENT = export HUNSPELL=$(top_builddir)/src/tools/hunspell; \
-- export ANALYZE=$(top_builddir)/src/tools/analyze; \
-+ export ANALYZE=$(top_builddir)/src/tools/hunspell-analyze; \
- export LIBTOOL=$(top_builddir)/libtool;
- DIC_LOG_COMPILER = $(top_srcdir)/tests/test.sh
-
-diff --git a/tests/test.sh b/tests/test.sh
-index 3fcf42c..8580d09 100755
---- a/tests/test.sh
-+++ b/tests/test.sh
-@@ -64,7 +64,7 @@ fi
- shopt -s expand_aliases
-
- [[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell
--[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/analyze
-+[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/hunspell-analyze
- [[ "$LIBTOOL" = "" ]] && LIBTOOL="$(dirname $0)"/../libtool
- alias hunspell='"$LIBTOOL" --mode=execute "$HUNSPELL"'
- alias analyze='"$LIBTOOL" --mode=execute "$ANALYZE"'
---
-2.19.1
-
diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
new file mode 100644
index 000000000000..121c53e4595e
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -0,0 +1,61 @@
+From b9a07b1ff100d5efeb5698d0ffe1c56935c681b8 Mon Sep 17 00:00:00 2001
+From: zimous <zimous@matfyz.cz>
+Date: Mon, 2 Sep 2019 12:46:53 +0200
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/692614
+---
+ configure.ac | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9426a94..958375f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,11 +52,23 @@ AC_ARG_WITH(
+ AS_IF([test "x$with_ui" != xno], [
+ AC_CHECK_LIB([ncursesw],[tparm],[
+ CURSESLIB=-lncursesw
++ AC_CHECK_LIB([tinfow],[tgetent], [
++ CURSESLIB="$CURSESLIB -ltinfow"
++ ])
+ ],[AC_CHECK_LIB([curses],[tparm],[
+ CURSESLIB=-lcurses
++ AC_CHECK_LIB([tinfo],[tgetent], [
++ CURSESLIB="$CURSESLIB -ltinfo"
++ ])
+ ],[AC_CHECK_LIB([ncurses],[tparm],[
+ CURSESLIB=-lncurses
+- ])])])
++ AC_CHECK_LIB([tinfo],[tgetent], [
++ CURSESLIB="$CURSESLIB -ltinfo"
++ ])
++ ],
++ [-ltinfo])],
++ [-ltinfo])],
++ [-ltinfow])
+ if test "$CURSESLIB" != "" ; then
+ echo Compiling with curses user interface.
+ AC_CHECK_HEADERS([curses.h])
+@@ -78,13 +90,15 @@ AC_ARG_WITH(
+ )
+ READLINELIB=""
+ AS_IF([test "x$with_readline" != xno],
+- [AC_CHECK_LIB([tinfo],[tgetent], [
++ [AC_CHECK_LIB([tinfow],[tgetent], [
++ TERMLIB=-ltinfow
++ ],[AC_CHECK_LIB([tinfo],[tgetent], [
+ TERMLIB=-ltinfo
+- ],[AC_CHECK_LIB([curses],[tparm],[
++ ],[AC_CHECK_LIB([curses],[tparm],[
+ TERMLIB=-lncurses
+ ],[AC_CHECK_LIB([termcap],[tgetent],[
+ TERMLIB=-ltermcap
+- ])])])
++ ])])])])
+ LDSAVE=$LDFLAGS
+ LDFLAGS="$LDFLAGS $TERMLIB"
+ AC_CHECK_LIB([readline],[readline],[
+--
+2.24.1
+
diff --git a/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
new file mode 100644
index 000000000000..52696b968608
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
@@ -0,0 +1,149 @@
+From d3e2d1d29615f4861fd3354353d426bd8701389d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 13 Nov 2018 10:37:42 +0100
+Subject: [PATCH] Rename some executables which have too generic names
+
+to be placed in /usr/bin - this patch prefixes them with 'hunspell-'
+
+Real authorship is a bit unclear as Gentoo is using this kind of patch since
+hunspell-1.1.3 which was added to Gentoo back in 2006-01-29 and the
+corresponding bug report didn't mention the patch at all:
+
+https://bugs.gentoo.org/114482
+https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch?hideattic=0&view=log
+---
+ src/tools/Makefile.am | 14 +++++++-------
+ src/tools/chmorph.cxx | 6 +++---
+ src/tools/munch.cxx | 4 ++--
+ src/tools/unmunch.cxx | 4 ++--
+ tests/Makefile.am | 2 +-
+ tests/test.sh | 2 +-
+ 7 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
+index 1786e8e..190bffe 100644
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
+
+ AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+
+@@ -6,8 +6,8 @@ hzip_SOURCES=hzip.cxx
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.7.la
+
+-munch_SOURCES=munch.cxx munch.h
+-unmunch_SOURCES=unmunch.cxx unmunch.h
++hunspell_munch_SOURCES=munch.cxx munch.h
++hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
+
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.7.la
+@@ -17,11 +17,11 @@ nodist_hunspell_SOURCES= ../../config.h
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ ../hunspell/libhunspell-1.7.la @CURSESLIB@ @READLINELIB@
+
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.7.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.7.la
+
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
+
+ noinst_PROGRAMS=example
+
+diff --git a/src/tools/chmorph.cxx b/src/tools/chmorph.cxx
+index 6e5add6..163186d 100644
+--- a/src/tools/chmorph.cxx
++++ b/src/tools/chmorph.cxx
+@@ -55,11 +55,11 @@ int main(int, char** argv) {
+ if (!argv[i]) {
+ fprintf(
+ stderr,
+- "chmorph - change affixes by morphological analysis and generation\n"
+- "correct syntax is:\nchmorph affix_file "
++ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
++ "correct syntax is:\nhunspell-chmorph affix_file "
+ "dictionary_file file_to_convert STRING1 STRING2\n"
+ "STRINGS may be arbitrary parts of the morphological descriptions\n"
+- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
++ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+ " (convert informal Hungarian second person texts to formal third "
+ "person texts)\n");
+ exit(1);
+diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
+index 5f51fc6..c8f8beb 100644
+--- a/src/tools/munch.cxx
++++ b/src/tools/munch.cxx
+@@ -78,14 +78,14 @@ int main(int argc, char** argv) {
+ wf = mystrdup(argv[1]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "munch word_list_file affix_file\n");
++ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+ exit(1);
+ }
+ if (argv[2]) {
+ af = mystrdup(argv[2]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "munch word_list_file affix_file\n");
++ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+ exit(1);
+ }
+
+diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx
+index 82c2f9d..663e8ea 100644
+--- a/src/tools/unmunch.cxx
++++ b/src/tools/unmunch.cxx
+@@ -73,14 +73,14 @@ int main(int argc, char** argv) {
+ wf = mystrdup(argv[1]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "unmunch dic_file affix_file\n");
++ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+ exit(1);
+ }
+ if (argv[2]) {
+ af = mystrdup(argv[2]);
+ } else {
+ fprintf(stderr, "correct syntax is:\n");
+- fprintf(stderr, "unmunch dic_file affix_file\n");
++ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+ exit(1);
+ }
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 6dc3e93..88d882c 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = suggestiontest
+
+ TEST_EXTENSIONS = .dic
+ AM_TESTS_ENVIRONMENT = export HUNSPELL=$(top_builddir)/src/tools/hunspell; \
+- export ANALYZE=$(top_builddir)/src/tools/analyze; \
++ export ANALYZE=$(top_builddir)/src/tools/hunspell-analyze; \
+ export LIBTOOL=$(top_builddir)/libtool;
+ DIC_LOG_COMPILER = $(top_srcdir)/tests/test.sh
+
+diff --git a/tests/test.sh b/tests/test.sh
+index 3fcf42c..8580d09 100755
+--- a/tests/test.sh
++++ b/tests/test.sh
+@@ -64,7 +64,7 @@ fi
+ shopt -s expand_aliases
+
+ [[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell
+-[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/analyze
++[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/hunspell-analyze
+ [[ "$LIBTOOL" = "" ]] && LIBTOOL="$(dirname $0)"/../libtool
+ alias hunspell='"$LIBTOOL" --mode=execute "$HUNSPELL"'
+ alias analyze='"$LIBTOOL" --mode=execute "$ANALYZE"'
+--
+2.19.1
+
diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
deleted file mode 100644
index d4a295cdf9af..000000000000
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic versionator
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
-
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-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 ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND=""
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de_1901" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
- AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
- AUTHORS.myspell README.myspell license.myspell README.md
-)
-
-PATCHES=(
- # Upstream package creates some executables which names are too generic
- # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
- # It modifies a Makefile.am file, hence eautoreconf.
- "${FILESDIR}/${PN}-1.6.2-renameexes.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # missing somehow, and I am too lazy to fix it properly
- [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
- # I wanted to put the include files in /usr/include/hunspell.
- # You can do that, libreoffice can find them anywhere, just
- # ping me when you do so ; -- scarabeus
- local myeconfargs=(
- $(use_enable nls)
- $(use_with ncurses ui)
- $(use_with readline readline)
- $(use_enable static-libs static)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- #342449
- pushd "${ED%/}"/usr/$(get_libdir)/ >/dev/null
- ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so}
- popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.7.0.ebuild b/app-text/hunspell/hunspell-1.7.0.ebuild
deleted file mode 100644
index 9d0357167faa..000000000000
--- a/app-text/hunspell/hunspell-1.7.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
-
-SLOT="0/$(ver_cut 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-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 ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- ncurses? ( sys-libs/ncurses:0= )
- readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND=""
-for lang in ${LANGS}; do
- IUSE+=" l10n_${lang}"
- case ${lang} in
- de-1901) dict="de_1901" ;;
- pt-BR) dict="pt-br" ;;
- *) dict="${lang}" ;;
- esac
- PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
- AUTHORS ChangeLog NEWS THANKS license.hunspell
- license.myspell README.md
-)
-
-PATCHES=(
- # Upstream package creates some executables which names are too generic
- # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
- # It modifies a Makefile.am file, hence eautoreconf.
- "${FILESDIR}/${PN}-1.7.0-renameexes.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # missing somehow, and I am too lazy to fix it properly
- [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
- # I wanted to put the include files in /usr/include/hunspell.
- # You can do that, libreoffice can find them anywhere, just
- # ping me when you do so ; -- scarabeus
- local myeconfargs=(
- $(use_enable nls)
- $(use_with ncurses ui)
- $(use_with readline readline)
- $(use_enable static-libs static)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- #342449
- pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
- ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
- popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.7.2-r1.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..97635c6a1145
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is
+it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
+inherit autotools flag-o-matic
+
+DESCRIPTION="Spell checker, morphological analyzer library and command-line tool"
+HOMEPAGE="https://hunspell.github.io/"
+SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+ virtual/libiconv
+ ncurses? ( sys-libs/ncurses:= )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-devel/gettext-0.18
+"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+ IUSE+=" l10n_${lang}"
+ case ${lang} in
+ de-1901) dict="de_1901" ;;
+ pt-BR) dict="pt-br" ;;
+ *) dict="${lang}" ;;
+ esac
+ PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README )
+
+PATCHES=(
+ # Upstream package creates some executables which names are too generic
+ # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+ # It modifies a Makefile.am file, hence eautoreconf.
+ "${FILESDIR}/hunspell-1.7.2-renameexes.patch"
+
+ "${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Missing somehow...
+ [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+ # I wanted to put the include files in /usr/include/hunspell.
+ # You can do that, libreoffice can find them anywhere, just
+ # ping me when you do so ; -- scarabeus
+ local myeconfargs=(
+ "$(use_enable nls)"
+ "$(use_with ncurses ui)"
+ "$(use_with readline readline)"
+ "$(use_enable static-libs static)"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+ einstalldocs
+
+ # Bug #908872
+ keepdir "/usr/share/myspell"
+}
diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
new file mode 100644
index 000000000000..2b5009ebd494
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is
+it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
+inherit autotools flag-o-matic
+
+DESCRIPTION="Spell checker, morphological analyzer library and command-line tool"
+HOMEPAGE="https://hunspell.github.io/"
+SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+ ncurses? ( sys-libs/ncurses:= )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+ IUSE+=" l10n_${lang}"
+ case ${lang} in
+ de-1901) dict="de_1901" ;;
+ pt-BR) dict="pt-br" ;;
+ *) dict="${lang}" ;;
+ esac
+ PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README )
+
+PATCHES=(
+ # Upstream package creates some executables which names are too generic
+ # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+ # It modifies a Makefile.am file, hence eautoreconf.
+ "${FILESDIR}/hunspell-1.7.2-renameexes.patch"
+
+ "${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Missing somehow...
+ [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+ # I wanted to put the include files in /usr/include/hunspell.
+ # You can do that, libreoffice can find them anywhere, just
+ # ping me when you do so ; -- scarabeus
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with ncurses ui)
+ $(use_with readline readline)
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ einstalldocs
+
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ # bug #342449
+ pushd "${ED}"/usr/$(get_libdir)/ >/dev/null || die
+ ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} || die
+ popd >/dev/null || die
+}
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 3df52fea111e..8c5ebb71fbc5 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,9 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
+ <maintainer type="person" proxied="yes">
+ <email>zurabid2016@gmail.com</email>
+ <name>Zurab Kvachadze</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
- <remote-id type="sourceforge">hunspell</remote-id>
<remote-id type="github">hunspell/hunspell</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/hyperestraier/files/hyperestraier-configure.patch b/app-text/hyperestraier/files/hyperestraier-configure.patch
index 4e747d9c754b..0daee36183c6 100644
--- a/app-text/hyperestraier/files/hyperestraier-configure.patch
+++ b/app-text/hyperestraier/files/hyperestraier-configure.patch
@@ -1,3 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -67,6 +67,7 @@
+ SKLIBS = @MYSKLIBS@
+ APPLIBS = @MYAPPLIBS@
+ LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
++AR = @AR@
+ RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+ MYPOSTCMD = @MYPOSTCMD@
+
--- a/configure.in
+++ b/configure.in
@@ -24,24 +24,6 @@
@@ -33,8 +43,17 @@
enables="$enables (debug)"
stable="yes"
fi
-@@ -187,19 +169,20 @@
+@@ -180,26 +161,28 @@
+ then
+ MYCFLAGS="-Wall -fPIC -fsigned-char -O1"
+ fi
+- if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
++ if $CC --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
+ then
+ MYCFLAGS="-Wall -fPIC -fsigned-char -O1"
+ fi
fi
++AC_CHECK_TOOL(AR, ar)
# Underlying libraries
+PKG_PROG_PKG_CONFIG
@@ -110,6 +129,15 @@
#================================================================
+@@ -134,7 +112,7 @@
+ then
+ MYCFLAGS="-Wall -fPIC -fsigned-char -O1"
+ fi
+-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
++if $CC --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
+ then
+ MYCFLAGS="-Wall -fPIC -fsigned-char -O1"
+ fi
@@ -158,7 +136,7 @@
AC_CHECK_LIB(lzo2, main)
AC_CHECK_LIB(bz2, main)
diff --git a/app-text/hyperestraier/files/hyperestraier-java-11.patch b/app-text/hyperestraier/files/hyperestraier-java-11.patch
new file mode 100644
index 000000000000..fa143fb23872
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-java-11.patch
@@ -0,0 +1,78 @@
+--- a/javanative/Database.java
++++ b/javanative/Database.java
+@@ -135,7 +135,7 @@
+ /** last happened error code */
+ private int ecode;
+ /** callback function to inform of database events */
+- private DatabaseInformer informer;
++ private long informer;
+ //----------------------------------------------------------------
+ // constructors and finalizers
+ //----------------------------------------------------------------
+--- a/javanative/database.c
++++ b/javanative/database.c
+@@ -19,7 +19,7 @@
+
+
+ /* global variables */
+-JNIEnv *infoenv = NULL;
++static JavaVM* jvm = NULL;
+
+
+ /* private function prototypes */
+@@ -181,8 +181,8 @@
+ err = TRUE;
+ }
+ (*env)->SetLongField(env, obj, fid, 0);
+- fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";");
+- if((infoobj = (*env)->GetObjectField(env, obj, fid)) != NULL)
++ fid = (*env)->GetFieldID(env, cls, "informer", "J");
++ if((infoobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL)
+ (*env)->DeleteGlobalRef(env, infoobj);
+ (*env)->SetObjectField(env, obj, fid, NULL);
+ return err ? FALSE : TRUE;
+@@ -735,16 +735,17 @@
+ throwillarg(env);
+ return;
+ }
+- fid = (*env)->GetFieldID(env, cls, "informer", "L" CLSDBINFO ";");
+- if((oldobj = (*env)->GetObjectField(env, obj, fid)) != NULL)
++ fid = (*env)->GetFieldID(env, cls, "informer", "J");
++ if((oldobj = (jobject)(*env)->GetLongField(env, obj, fid)) != NULL)
+ (*env)->DeleteGlobalRef(env, oldobj);
+ (*env)->SetObjectField(env, obj, fid, NULL);
+ if(!(informer = (*env)->NewGlobalRef(env, informer))){
+ throwoutmem(env);
+ return;
+ }
+- (*env)->SetObjectField(env, obj, fid, informer);
+- infoenv = env;
++ (*env)->SetLongField(env, obj, fid, (PTRNUM)informer);
++ if(jvm == NULL)
++ (*env)->GetJavaVM(env, &jvm);
+ est_mtdb_set_informer((ESTMTDB *)(PTRNUM)coreptr, dbinform, informer);
+ }
+
+@@ -767,10 +768,12 @@
+
+ /* callback function for database events */
+ static void dbinform(const char *message, void *opaque){
++ JNIEnv *infoenv;
+ jstring msgobj;
+ jobject opobj;
+ jclass cls;
+ jmethodID mid;
++ (*jvm)->GetEnv(jvm, (void **)&infoenv, JNI_VERSION_1_8);
+ if(!(msgobj = (*infoenv)->NewStringUTF(infoenv, message))) return;
+ opobj = (jobject)opaque;
+ cls = (*infoenv)->GetObjectClass(infoenv, opobj);
+--- a/javanative/myconf.h
++++ b/javanative/myconf.h
+@@ -69,7 +69,6 @@
+ #define CLSDOC "estraier/Document"
+ #define CLSCOND "estraier/Condition"
+ #define CLSDB "estraier/Database"
+-#define CLSDBINFO "estraier/DatabaseInformer"
+ #define CLSRES "estraier/Result"
+
+
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
new file mode 100644
index 000000000000..c6658e72af58
--- /dev/null
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+USE_RUBY="ruby27 ruby30 ruby31"
+RUBY_OPTIONAL="yes"
+
+inherit autotools java-pkg-opt-2 perl-functions ruby-ng
+
+DESCRIPTION="a full-text search system for communities"
+HOMEPAGE="https://fallabs.com/hyperestraier/"
+SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
+SLOT="0"
+IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib"
+
+RDEPEND="dev-db/qdbm
+ bzip2? ( app-arch/bzip2 )
+ java? ( >=virtual/jre-1.8:* )
+ lzo? ( dev-libs/lzo )
+ mecab? ( app-text/mecab )
+ perl? ( dev-lang/perl )
+ ruby? ( $(ruby_implementations_depend) )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
+S="${WORKDIR}/all/${P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-configure.patch
+ "${FILESDIR}"/${PN}-java-11.patch
+ "${FILESDIR}"/${PN}-perl.patch
+ "${FILESDIR}"/${PN}-ruby19.patch
+)
+HTML_DOCS=( doc/. )
+
+AT_NOELIBTOOLIZE="yes"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ use ruby && ruby-ng_pkg_setup
+}
+
+he_foreach_api() {
+ local u d
+ for u in java perl ruby; do
+ if ! use "${u}"; then
+ continue
+ fi
+ if [[ "${u}" != "ruby" ]]; then
+ for d in ${u}native ${u}pure; do
+ if [[ ! -d "${d}" ]]; then
+ continue
+ fi
+ einfo "${EBUILD_PHASE} ${d}"
+ cd "${d}"
+ case "${EBUILD_PHASE}" in
+ prepare)
+ mv configure.{in,ac}
+ eautoreconf
+ ;;
+ configure)
+ econf
+ ;;
+ compile)
+ emake
+ ;;
+ test)
+ if [[ "${d}" == "${u}native" ]]; then
+ emake check
+ fi
+ ;;
+ install)
+ if [[ "${u}" != "java" ]]; then
+ emake DESTDIR="${D}" install
+ else
+ java-pkg_dojar *.jar
+ if [[ "${d}" == "${u}native" ]]; then
+ dolib.so lib*.so*
+ fi
+ fi
+ ;;
+ esac
+ cd - >/dev/null
+ done
+ else
+ PATCHES= ruby-ng_src_${EBUILD_PHASE}
+ fi
+ done
+}
+
+he_foreach_ruby_api() {
+ local d
+ for d in rubynative rubypure; do
+ cd "${d}"
+ case "${EBUILD_PHASE}" in
+ prepare)
+ sed -i \
+ -e "/RUBY=/cRUBY=\"${RUBY}\"" \
+ -e "/=\`.*ruby/s|ruby|${RUBY}|" \
+ configure.in
+
+ mv configure.{in,ac}
+ eautoreconf
+ ;;
+ configure)
+ econf
+ ;;
+ compile)
+ emake
+ ;;
+ test)
+ if [[ "${d}" == "${u}native" ]]; then
+ emake check
+ fi
+ ;;
+ install)
+ emake DESTDIR="${D}" install
+ ;;
+ esac
+ cd - >/dev/null
+ done
+}
+
+src_prepare() {
+ default
+ java-pkg-opt-2_src_prepare
+
+ sed -i \
+ -e "/^CFLAGS/s|$| ${CFLAGS}|" \
+ -e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
+ -e '/^LDENV/d' \
+ -e 's/make\( \|$\)/$(MAKE)\1/g' \
+ Makefile.in {java,perl,ruby}*/Makefile.in
+
+ mv configure.{in,ac}
+ eautoreconf
+ he_foreach_api # prepare
+}
+
+all_ruby_prepare() {
+ sed -i "/^RUNENV /s|\.\.|${WORKDIR}/all/${P}|" ruby*/Makefile.in
+ sed -i "s|\.\./\.\.|${WORKDIR}/all/${P}|" rubynative/src/extconf.rb
+}
+
+each_ruby_prepare() {
+ he_foreach_ruby_api
+}
+
+src_configure() {
+ econf \
+ $(use_enable bzip2 bzip) \
+ $(use_enable debug) \
+ $(use_enable lzo) \
+ $(use_enable mecab) \
+ $(use_enable zlib)
+ he_foreach_api
+}
+
+each_ruby_configure() {
+ he_foreach_ruby_api
+}
+
+src_compile() {
+ default
+ he_foreach_api
+}
+
+each_ruby_compile() {
+ he_foreach_ruby_api
+}
+
+src_test() {
+ default
+ he_foreach_api
+}
+
+each_ruby_test() {
+ he_foreach_ruby_api
+}
+
+src_install() {
+ emake DESTDIR="${D}" MYDOCS= install
+ einstalldocs
+ he_foreach_api
+ use static-libs || find "${ED}" -name '*.a' -delete || die
+
+ if use perl; then
+ perl_delete_module_manpages
+ perl_fix_packlist
+ fi
+
+ rm -f "${D}"/usr/bin/*test
+}
+
+each_ruby_install() {
+ he_foreach_ruby_api
+}
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
deleted file mode 100644
index a31998f22220..000000000000
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-RUBY_OPTIONAL="yes"
-
-inherit autotools java-pkg-opt-2 perl-functions ruby-ng
-
-IUSE="bzip2 debug java lzo mecab perl ruby +zlib"
-
-DESCRIPTION="a full-text search system for communities"
-HOMEPAGE="http://fallabs.com/hyperestraier/"
-SRC_URI="http://fallabs.com/hyperestraier/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-
-RDEPEND="dev-db/qdbm
- bzip2? ( app-arch/bzip2 )
- java? ( >=virtual/jre-1.4:* )
- lzo? ( dev-libs/lzo )
- mecab? ( app-text/mecab )
- perl? ( dev-lang/perl )
- ruby? ( $(ruby_implementations_depend) )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.4:* )"
-S="${WORKDIR}/all/${P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-configure.patch
- "${FILESDIR}"/${PN}-perl.patch
- "${FILESDIR}"/${PN}-ruby19.patch
-)
-HTML_DOCS=( doc/. )
-
-AT_NOELIBTOOLIZE="yes"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- use ruby && ruby-ng_pkg_setup
-}
-
-he_foreach_api() {
- local u d
- for u in java perl ruby; do
- if ! use "${u}"; then
- continue
- fi
- if [[ "${u}" != "ruby" ]]; then
- for d in ${u}native ${u}pure; do
- if [[ ! -d "${d}" ]]; then
- continue
- fi
- einfo "${EBUILD_PHASE} ${d}"
- cd "${d}"
- case "${EBUILD_PHASE}" in
- prepare)
- mv configure.{in,ac}
- eautoreconf
- ;;
- configure)
- econf
- ;;
- compile)
- emake
- ;;
- test)
- if [[ "${d}" == "${u}native" ]]; then
- emake check
- fi
- ;;
- install)
- if [[ "${u}" != "java" ]]; then
- emake DESTDIR="${D}" install
- else
- java-pkg_dojar *.jar
- if [[ "${d}" == "${u}native" ]]; then
- dolib.so lib*.so*
- fi
- fi
- ;;
- esac
- cd - >/dev/null
- done
- else
- PATCHES= ruby-ng_src_${EBUILD_PHASE}
- fi
- done
-}
-
-he_foreach_ruby_api() {
- local d
- for d in rubynative rubypure; do
- cd "${d}"
- case "${EBUILD_PHASE}" in
- prepare)
- sed -i \
- -e "/RUBY=/cRUBY=\"${RUBY}\"" \
- -e "/=\`.*ruby/s|ruby|${RUBY}|" \
- configure.in
-
- mv configure.{in,ac}
- eautoreconf
- ;;
- configure)
- econf
- ;;
- compile)
- emake
- ;;
- test)
- if [[ "${d}" == "${u}native" ]]; then
- emake check
- fi
- ;;
- install)
- emake DESTDIR="${D}" install
- ;;
- esac
- cd - >/dev/null
- done
-}
-
-src_prepare() {
- default
- java-pkg-opt-2_src_prepare
-
- sed -i \
- -e "/^CFLAGS/s|$| ${CFLAGS}|" \
- -e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
- -e '/^LDENV/d' \
- -e 's/make\( \|$\)/$(MAKE)\1/g' \
- Makefile.in {java,perl,ruby}*/Makefile.in
-
- mv configure.{in,ac}
- eautoreconf
- he_foreach_api # prepare
-}
-
-all_ruby_prepare() {
- sed -i "/^RUNENV /s|\.\.|${WORKDIR}/all/${P}|" ruby*/Makefile.in
- sed -i "s|\.\./\.\.|${WORKDIR}/all/${P}|" rubynative/src/extconf.rb
-}
-
-each_ruby_prepare() {
- he_foreach_ruby_api
-}
-
-src_configure() {
- econf \
- $(use_enable bzip2 bzip) \
- $(use_enable debug) \
- $(use_enable lzo) \
- $(use_enable mecab) \
- $(use_enable zlib)
- he_foreach_api
-}
-
-each_ruby_configure() {
- he_foreach_ruby_api
-}
-
-src_compile() {
- default
- he_foreach_api
-}
-
-each_ruby_compile() {
- he_foreach_ruby_api
-}
-
-src_test() {
- default
- he_foreach_api
-}
-
-each_ruby_test() {
- he_foreach_ruby_api
-}
-
-src_install() {
- emake DESTDIR="${D}" MYDOCS= install
- einstalldocs
- he_foreach_api
-
- if use perl; then
- perl_delete_module_manpages
- perl_fix_packlist
- fi
-
- rm -f "${D}"/usr/bin/*test
-}
-
-each_ruby_install() {
- he_foreach_ruby_api
-}
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
index 63e7b3c8bb44..95ab1cd58417 100644
--- a/app-text/hyperestraier/metadata.xml
+++ b/app-text/hyperestraier/metadata.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://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>
- <use>
- <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support for Estraier</flag>
- </use>
+ <maintainer type="person">
+ <email>hattya@gentoo.org</email>
+ <name>Akinori Hattori</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <use>
+ <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support for Estraier</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/idnits/Manifest b/app-text/idnits/Manifest
new file mode 100644
index 000000000000..44069ce0add6
--- /dev/null
+++ b/app-text/idnits/Manifest
@@ -0,0 +1 @@
+DIST idnits-2.17.1.tar.gz 60480 BLAKE2B b2248236590bf025f9e06a4d804ac9d0cd207406809f17a2393dfbce2d0712c60aef58c8a4d7388c61495956ce0d2b0c5c491e290b178b7c46dcbc711615a847 SHA512 deed0c73e95e292443ec3e2ca447d2e6ceb9cbafd0775163e247185c158e74b7a4cd1e906474ca45ab40d92eac6e881e417df4c6e84a15277c71c711c590f55a
diff --git a/app-text/idnits/idnits-2.17.1.ebuild b/app-text/idnits/idnits-2.17.1.ebuild
new file mode 100644
index 000000000000..87ff6c1483d2
--- /dev/null
+++ b/app-text/idnits/idnits-2.17.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A tool to check internet-drafts (IDs) for submission nits"
+HOMEPAGE="https://www.ietf.org/tools/idnits/"
+SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ app-shells/bash
+ sys-apps/coreutils
+ app-alternatives/awk
+"
+
+src_install() {
+ dobin idnits
+ dodoc about changelog todo
+}
diff --git a/app-text/idnits/metadata.xml b/app-text/idnits/metadata.xml
new file mode 100644
index 000000000000..2b0b24ef145c
--- /dev/null
+++ b/app-text/idnits/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ietf-tools/idnits</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/info2html/Manifest b/app-text/info2html/Manifest
deleted file mode 100644
index 38befd45ab5c..000000000000
--- a/app-text/info2html/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST info2html-2.0.tar 51200 BLAKE2B 0209e7792689f68c8f596dcb0771395014963240f2071aa970f50611f752e9b9cf524ba2083a72a9b0f4346f8e14e23aedfde4497b05c02dae90b223ebcf6311 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06
diff --git a/app-text/info2html/files/info2html-2.0-xss.patch b/app-text/info2html/files/info2html-2.0-xss.patch
deleted file mode 100644
index a2254bdbbe2b..000000000000
--- a/app-text/info2html/files/info2html-2.0-xss.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u info2html-2.0-orig/info2html info2html-2.0/info2html
---- info2html-2.0-orig/info2html 2006-09-01 14:55:13.000000000 +0200
-+++ info2html-2.0/info2html 2006-09-01 15:05:41.000000000 +0200
-@@ -42,7 +42,7 @@
-
- use CGI;
- $ENV{'REQUEST_METHOD'} or
-- print "Note: I'm really supposed to be run as a CGI!\n";
-+ print "Note: I'm really supposed to be run as a CGI\!\n";
-
- #-- patterns
- $NODEBORDER = '\037\014?'; #-- delimiter of an info node
-@@ -62,7 +62,7 @@
- #---------------------------------------------------------
- # Don't reveal where we're looking... --jonh 5/20/97 (and reapplied 5/4/1998)
- sub DieFileNotFound{
-- local($FileName) = @_;
-+ local($FileName) = &XssEscape(@_);
- #-- TEXT : error message if a file could not be opened
- print <<"EOF";
- <html><head><title>Info Files - Error Message</title>
-@@ -104,6 +104,28 @@
- }
-
- #----------------------------------------------------------
-+# XssEscape
-+#----------------------------------------------------------
-+sub XssEscape {
-+ local($Tag) = @_;
-+ #-- output escaping is required to protect browser
-+ # against `cross site' and `cross frame scripting'
-+
-+ $Tag =~ s/&/&amp;/gs; # ampersand
-+ $Tag =~ s/#/&#35;/gs;
-+ $Tag =~ s/;/&#59;/gs;
-+ $Tag =~ s/[\000-\037\177-\237]/&iquest;/gs; # "ctrl" codes 0-31 and 127-159
-+ $Tag =~ s/</&lt;/gs; # less-than symbol
-+ $Tag =~ s/>/&gt;/gs; # greater-than symbol
-+ $Tag =~ s/"/&quot;/gs; # double quote
-+ $Tag =~ s/\240/&nbsp;/gs; # non-breaking space
-+ $Tag =~ s/\255/&shy;/gs; # soft hyphen
-+ # the rest is interpreted
-+ # as ISO 8859-1
-+ $Tag;
-+}
-+
-+#----------------------------------------------------------
- # ParsHeaderToken
- #----------------------------------------------------------
- # Parses the heaer line of an info node for a specific
-@@ -493,6 +515,8 @@
- #----------------------------------------------------------
- sub ReplyNotFoundMessage{
- local($FileName,$Tag) = @_;
-+ $FileName = &XssEscape($FileName);
-+ $Tag = &XssEscape($Tag);
- print <<"EOF";
- <html><head><title>Info Files - Error Message</title>
- $BOTS_STAY_AWAY
-Only in info2html-2.0: info2html.orig
-Only in info2html-2.0: info2html.rej
diff --git a/app-text/info2html/info2html-2.0.ebuild b/app-text/info2html/info2html-2.0.ebuild
deleted file mode 100644
index dde163431903..000000000000
--- a/app-text/info2html/info2html-2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils webapp
-
-DESCRIPTION="Converts GNU .info files to HTML"
-HOMEPAGE="http://info2html.sourceforge.net/"
-SRC_URI="mirror://sourceforge/info2html/${P}.tar"
-
-LICENSE="freedist"
-# webapp.eclass deals with SLOTting
-#SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 hppa sparc x86"
-
-RDEPEND="dev-lang/perl"
-
-src_unpack() {
- local infos state line i
- unpack ${A}
- cd ${S}
-
- # filter user-provided data to prevent cross-frame/site scripting attacks
- # bug #91354 (fix from Werner Fink)
- epatch "${FILESDIR}"/info2html-2.0-xss.patch
-
- # Fixup INFODIR for paths in /etc/profile.env INFOPATH
- infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
- sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g")
- # Default path to /usr/share/info and /usr/local/share/info
- [[ -z ${infos} ]] && export infos="/usr/share/info"
- infos=( ${INFOPATH//:/ } )
- mv ${S}/info2html.conf ${S}/info2html.conf.orig
- touch ${S}/info2html.conf
- state="copy"
- inserted="no"
- while read line; do
- [[ ${line} == "@INFODIR = (" ]] && state="insert"
- [[ ${line} == ");" ]] && state="copy"
- case ${state} in
- "copy")
- echo ${line} >> ${S}/info2html.conf
- ;;
- "insert")
- echo ${line} >> ${S}/info2html.conf
- for info in "${infos[@]}"; do
- echo " '${info}'," >> ${S}/info2html.conf
- done
- echo " '/usr/local/share/info'" >> ${S}/info2html.conf
- state="skip"
- inserted="yes"
- ;;
- "skip")
- ;;
- esac
- done < ${S}/info2html.conf.orig
- [[ ${state} == "copy" && ${inserted} == "yes" ]] ||
- die "Setting up info2html.conf failed"
-}
-
-src_install() {
- webapp_src_preinst
-
- exeinto ${MY_CGIBINDIR}
- cp info2html infocat info2html.css info2html.conf ${D}/${MY_CGIBINDIR}
- # README zapped by info2html-gentoo.patch; it only listed
- # the homepage so it doesn't add anything useful.
- # dodoc README
-
- webapp_src_install
-}
diff --git a/app-text/info2html/metadata.xml b/app-text/info2html/metadata.xml
deleted file mode 100644
index 5020ed8cb0fc..000000000000
--- a/app-text/info2html/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>web-apps@gentoo.org</email>
- <name>Gentoo Webapps</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">info2html</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 176e81708d69..0f1bd88a2f75 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1 +1 @@
-DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
+DIST iso-codes-v4.16.0.tar.gz 15163129 BLAKE2B 8fcdb3c12c502c1e14169765db9c9dd7778fc5d4bb0da37aa6b27efeebd5ce9f3e825e5b1a7ae8d659babf2d6b9124af08b40ed8a2a1235e88df50be9c204ca5 SHA512 04d93eb37ff309c850a1af6d4cf6bb92a16e25ee35ee12e16325f6e7b476ba40bbf5d11e2f4c425111220480911b1dbc9e244189ea7487f1f0ea4dbce2307c96
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
deleted file mode 100644
index 0b54092aefcb..000000000000
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
- app-arch/xz-utils
- sys-devel/gettext
-"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-# l10n_find_plocales_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
- local std loc all_locales=()
-
- ebegin "Looking for new locales"
- for std in "${all_stds[@]}"; do
- pushd "${std}" >/dev/null || die
- for loc in *.po; do
- all_locales+=( "${loc%.po}" )
- done
- popd >/dev/null
- done
-
- all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
- if [[ ${PLOCALES} != "${all_locales}" ]]; then
- eend 1
- eerror "There are changes in locales! This ebuild should be updated to:"
- eerror "PLOCALES=\"${all_locales}\""
- die "Update PLOCALES in the ebuild"
- else
- eend 0
- fi
-}
-
-src_prepare() {
- default
-
- local std loc mylinguas
- local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
- check_existing_locales
-
- # Modify the Makefiles so they only install requested locales.
- for std in "${all_stds[@]}"; do
- einfo "Preparing ${std} ..."
- pushd "${std}" >/dev/null || die
- mylinguas=()
- for loc in *.po; do
- if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
- mylinguas+=( "${loc}" )
- fi
- done
-
- sed \
- -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
- -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
- -i Makefile.am Makefile.in || die "sed in ${std} folder failed"
- popd >/dev/null
- done
-}
diff --git a/app-text/iso-codes/iso-codes-4.16.0.ebuild b/app-text/iso-codes/iso-codes-4.16.0.ebuild
new file mode 100644
index 000000000000..4aad8abc0e5a
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.16.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mr ms mt my na nah nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ro_MD ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+ local std loc all_locales=()
+
+ ebegin "Looking for new locales"
+ for std in "${all_stds[@]}"; do
+ pushd "${std}" >/dev/null || die
+ for loc in *.po; do
+ all_locales+=( "${loc%.po}" )
+ done
+ popd >/dev/null
+ done
+
+ all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+ if [[ ${PLOCALES} != "${all_locales}" ]]; then
+ eend 1
+ eerror "There are changes in locales! This ebuild should be updated to:"
+ eerror "PLOCALES=\"${all_locales}\""
+ die "Update PLOCALES in the ebuild"
+ else
+ eend 0
+ fi
+}
+
+src_prepare() {
+ default
+
+ local std loc mylinguas
+ local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+ check_existing_locales
+
+ # Modify the Makefiles so they only install requested locales.
+ for std in "${all_stds[@]}"; do
+ einfo "Preparing ${std} ..."
+ pushd "${std}" >/dev/null || die
+ mylinguas=()
+ for loc in *.po; do
+ if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+ mylinguas+=( "${loc}" )
+ fi
+ done
+
+ sed \
+ -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+ -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+ -i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+ popd >/dev/null
+ done
+}
diff --git a/app-text/iso-codes/metadata.xml b/app-text/iso-codes/metadata.xml
index c5fcc42a3a25..db23b120593e 100644
--- a/app-text/iso-codes/metadata.xml
+++ b/app-text/iso-codes/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <stabilize-allarches/>
<longdescription lang="en">
This package provides the ISO-639 Language code list, the ISO-3166
Territory code list, and ISO-3166-2 sub-territory lists, and all their
diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest
index b3afe26bca2a..9adc3f1a1118 100644
--- a/app-text/itex2mml/Manifest
+++ b/app-text/itex2mml/Manifest
@@ -1 +1 @@
-DIST itexToMML-1.5.6.tar.gz 155394 BLAKE2B be83c2de3a7ffd0a60fa45c38bb7fb224afbbfe3e715d09813137886ab0274fad4670a6156066e2f4f15ea1e3ff63f9f5cb4a30fc64256801af45455ea3d498b SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171
+DIST itexToMML-1.6.1.tar.gz 513185 BLAKE2B d3bf94a0eb95b7c448e0691e4ae5bd6ba37de97f86331ebaad5dea034d0bb259514b3acee0c926b711500ce0f7069ec95838a172385d9459167a7a3b29200d77 SHA512 6d35c5d2b5c5bbf8e1a938c5a7005dd32af85896df812e305931b4d8aafd57c2c4b31311495477109d53a6447ddfa9ffa2af3c92fb8176157d651851a2383409
diff --git a/app-text/itex2mml/itex2mml-1.5.6.ebuild b/app-text/itex2mml/itex2mml-1.5.6.ebuild
deleted file mode 100644
index 16120ff44755..000000000000
--- a/app-text/itex2mml/itex2mml-1.5.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="A LaTeX into XHTML/MathML converter"
-HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/itexToMML/itex-src"
-
-src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin itex2MML
- dodoc ../README
-}
diff --git a/app-text/itex2mml/itex2mml-1.6.1.ebuild b/app-text/itex2mml/itex2mml-1.6.1.ebuild
new file mode 100644
index 000000000000..4b5b27122fed
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="LaTeX to XHTML/MathML converter"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
+S="${WORKDIR}/itexToMML/itex-src"
+
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+src_configure() {
+ # fix bug #719070
+ sed -i -e "s/\$(CXX) \$(CFLAGS)/ \$(CXX) ${CFLAGS} ${LDFLAGS}/" Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+ dobin itex2MML
+ dodoc ../README
+}
diff --git a/app-text/itex2mml/metadata.xml b/app-text/itex2mml/metadata.xml
index 1b2becffa26c..bef24d2c2337 100644
--- a/app-text/itex2mml/metadata.xml
+++ b/app-text/itex2mml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index b1b67aa58426..c6c186302fcb 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -1,7 +1,2 @@
-DIST JabRef-3.7.jar 36702576 BLAKE2B a06dd79792f47cb202573a1e620da3f15c9b29705bac5e712e1c95d4df0c21c4c52d2ea30704b9e7427af11cd52ec01fd83017cb343e728ab1d073a7f2513690 SHA512 74ed9fcfa3e6e4a3facf588d8fa2d73374137d9796ba79aa9c97df6807348af5f5ca9b8670e8909d06847f8501c9a344e300172be444be9b2bd773cd4d6314c4
-DIST JabRef-3.8.1.jar 36739725 BLAKE2B edee679afcbcf3745a251e372608ac24fefc29bec9e99e41fcbbb296255edfb2ea8df38f187efe7d6345855af62e0bee82a835f781418a3202cde19abc00fff0 SHA512 9241fb586da7bc6047dc6eb6e5b31800003bf31d6262033b54629e0c81856b56234a5c671ce7ab87d3b7332a70551c81c2275354e97607ad9f513686c5826780
DIST JabRef-3.8.2.jar 37003442 BLAKE2B 7414128603c8a3c41c0f88003b504636fa64865fbdc0ed82b23b54855750d56631f55e371382209f331579f47ac4b3d3b1ed1d389f50f168dcc2468dff3a411c SHA512 84546987ffdef106643b3aba3216041809ac42464ff37fb63dbe806e282c19c25139d8532b695a4f5ca8ad638eb23860b32bd3806e82409e2d38425d5a42e830
-DIST JabRef-3.8.jar 36714920 BLAKE2B 4a26b40168a66dd8872ff194ce687589bb5b0c679d24c1f3acb133ead2d7fde4ce305b3ef27e1cab99045657701b83054d42c17a7bc6e25e0afba13e1d6ec0e6 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854
-DIST JabRef-4.0.jar 56583311 BLAKE2B cb45bad15d507ddfa9320b7805c9c8fee4be888eb2e209a1e9447d0923e729683ebac4dc91df29172da062946c9aca816200034106238de573e7c34a31ff601b SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2
-DIST JabRef-4.1.jar 55587800 BLAKE2B fdbe44b672d0cab611c41a4c28fbe4e11e72ed4b0dff4b743a03ab49ad74a8472173e28c0b576a23d7a5a40c2b23bc6ce6f72aed378b3e5aca4e8b96abcaaf27 SHA512 22fae27a7eb8653e11fc5bd91f721dde49be9d1d79e1a4c05282893c25f993babe8a6df29e154bbb749e9ecc940b42b37401ab3f453401dc8eaa24e2e118d1a6
DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19
diff --git a/app-text/jabref-bin/jabref-bin-3.7.ebuild b/app-text/jabref-bin/jabref-bin-3.7.ebuild
deleted file mode 100644
index 1e671d607b1b..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.7.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 eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- app-arch/unzip
-"
-RDEPEND="
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
deleted file mode 100644
index c69c8a61c6e9..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.8.1.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
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.2-r1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2-r1.ebuild
new file mode 100644
index 000000000000..f25ab978d02a
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="https://www.jabref.org/"
+# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="MIT JSON"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="virtual/jre:1.8"
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+ cp -v "${DISTDIR}/${A}" . || die
+ unzip ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+ java-pkg_newjar "JabRef-${MY_PV}.jar"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+ newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+ make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
deleted file mode 100644
index a0ff6dfe94b0..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.8.2.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
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.ebuild b/app-text/jabref-bin/jabref-bin-3.8.ebuild
deleted file mode 100644
index 9bd260099483..000000000000
--- a/app-text/jabref-bin/jabref-bin-3.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
-SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- app-arch/unzip
-"
-RDEPEND="
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/icons/JabRef-icon-48.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
-}
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
deleted file mode 100644
index a4bf511e4d47..000000000000
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_WANT_TARGET=1.8
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/external/JabRef-icon-128.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
- ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
- ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
- ewarn "Jabref 4.x is under heavy development and very unstable."
-}
diff --git a/app-text/jabref-bin/jabref-bin-4.1.ebuild b/app-text/jabref-bin/jabref-bin-4.1.ebuild
deleted file mode 100644
index a4bf511e4d47..000000000000
--- a/app-text/jabref-bin/jabref-bin-4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_WANT_TARGET=1.8
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/external/JabRef-icon-128.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
- ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
- ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
- ewarn "Jabref 4.x is under heavy development and very unstable."
-}
diff --git a/app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..ce903d0506ad
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.3.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_WANT_TARGET=1.8
+
+inherit desktop java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="https://www.jabref.org/"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+S="${WORKDIR}"
+
+LICENSE="MIT JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-java/openjdk:8[javafx]
+ virtual/jre:1.8
+"
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+ cp -v "${DISTDIR}/${A}" . || die
+ unzip ${A} images/external/JabRef-icon-128.png || die
+}
+
+src_install() {
+ java-pkg_newjar "JabRef-${MY_PV}.jar"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+ newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
+ make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+ ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+ ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+ ewarn "Jabref 4.x is under heavy development and very unstable."
+}
diff --git a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
deleted file mode 100644
index a4bf511e4d47..000000000000
--- a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_WANT_TARGET=1.8
-
-inherit eutils java-pkg-2
-
-MY_PV_1="${PV/_beta/b}"
-MY_PV="${MY_PV_1/_rc/}"
-MY_URI_PV_1="${PV/rc/}"
-MY_URI_PV="${MY_URI_PV_1//_/%20}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://www.jabref.org/"
-SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
- >=virtual/jre-1.8
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
- cp -v "${DISTDIR}/${A}" . || die
- unzip ${A} images/external/JabRef-icon-128.png || die
-}
-
-src_install() {
- java-pkg_newjar "JabRef-${MY_PV}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
- ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
- ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
- ewarn "Jabref 4.x is under heavy development and very unstable."
-}
diff --git a/app-text/jabref-bin/jabref-bin-4.9999.ebuild b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
deleted file mode 100644
index 9c54f3b9b7e9..000000000000
--- a/app-text/jabref-bin/jabref-bin-4.9999.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
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Java GUI manages bibliographies in a BibTeX database"
-HOMEPAGE="http://www.jabref.org/"
-KEYWORDS=""
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
- >=virtual/jre-1.8
- "
-
-S="${WORKDIR}"
-
-src_unpack() {
- einfo "Downloading the latest Jabref development snapshot."
- einfo "Upstream updates these a few times per day."
- wget "https://builds.jabref.org/master/JabRef--master--latest.jar" -O ${P}.jar || die "wget failed"
- unzip ${P}.jar images/external/JabRef-icon-48.png || die "icon extraction failed"
-}
-
-src_install() {
- java-pkg_newjar "${P}.jar"
- java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
- newicon images/external/JabRef-icon-48.png JabRef-bin-icon.png
- make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
- ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
- ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
- ewarn "Jabref 4.x is under heavy development and very unstable."
-}
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index e2170f6bc5a1..b4fbf1e649a4 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nicolasbock@gentoo.org</email>
@@ -20,8 +20,8 @@
</longdescription>
<upstream>
<remote-id type="sourceforge">jabref</remote-id>
- <changelog>https://github.com/JabRef/jabref/blob/master/CHANGELOG.md</changelog>
- <doc>http://help.jabref.org/</doc>
+ <changelog>https://github.com/JabRef/jabref/blob/main/CHANGELOG.md</changelog>
+ <doc>https://docs.jabref.org/</doc>
<remote-id type="github">JabRef/jabref</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
deleted file mode 100644
index 2759022f01e2..000000000000
--- a/app-text/jabref/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
deleted file mode 100644
index 731fc02ac090..000000000000
--- a/app-text/jabref/jabref-2.10-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
- dev-java/antlr:3
- dev-java/fontbox:1.7
- dev-java/jempbox:1.7
- dev-java/log4j:0
- dev-java/spin:0
- dev-java/microba:0
- >=dev-java/glazedlists-1.8.0:0
- "
-
-DEPEND="
- >=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-RDEPEND="
- >=virtual/jre-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
- # Remove bundled dependencies.
- rm lib/antlr*.jar || die
- rm lib/fontbox*.jar || die
- rm lib/jempbox*.jar || die
- rm lib/spin.jar || die
- rm lib/microba.jar || die
- rm lib/glazedlists*.jar || die
-
- # Remove unjarlib target (do this only once we have removed all
- # bundled dependencies in lib).
- #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
- # Fix license file copy operation for microba bundled lib.
- sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
- local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
- local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
- eant \
- -Dgentoo.classpath=${CLASSPATH} \
- jars \
- $(usex doc docs "")
-}
-
-src_install() {
- java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
- use doc && java-pkg_dojavadoc build/docs/API
- dodoc src/txt/README
-
- java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
- newicon src/images/JabRef-icon-48.png JabRef-icon.png
- make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10-r4.ebuild b/app-text/jabref/jabref-2.10-r4.ebuild
deleted file mode 100644
index 3574c04c59cd..000000000000
--- a/app-text/jabref/jabref-2.10-r4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
- dev-java/antlr:0
- dev-java/antlr:3
- dev-java/fontbox:1.7
- dev-java/jempbox:1.7
- dev-java/log4j:0
- dev-java/spin:0
- dev-java/microba:0
- >=dev-java/glazedlists-1.8.0:0
- "
-
-DEPEND="
- >=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-RDEPEND="
- >=virtual/jre-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
- # Remove bundled dependencies.
- rm lib/antlr*.jar || die
- rm lib/fontbox*.jar || die
- rm lib/jempbox*.jar || die
- rm lib/spin.jar || die
- rm lib/microba.jar || die
- rm lib/glazedlists*.jar || die
-
- # Remove unjarlib target (do this only once we have removed all
- # bundled dependencies in lib).
- #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
- # Fix license file copy operation for microba bundled lib.
- sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
- local EXTERNAL_JARS="antlr,antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
- local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
- eant \
- -Dgentoo.classpath=${CLASSPATH} \
- jars \
- $(usex doc docs "")
-}
-
-src_install() {
- java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
- use doc && java-pkg_dojavadoc build/docs/API
- dodoc src/txt/README
-
- java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
- newicon src/images/JabRef-icon-48.png JabRef-icon.png
- make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
deleted file mode 100644
index 9bbc4a0655f8..000000000000
--- a/app-text/jabref/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>nicolasbock@gentoo.org</email>
- <name>Nicolas Bock</name>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jabref</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
deleted file mode 100644
index d0ae8cf6453b..000000000000
--- a/app-text/jadetex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
diff --git a/app-text/jadetex/files/80jadetex.cnf b/app-text/jadetex/files/80jadetex.cnf
deleted file mode 100644
index a5976a74e09e..000000000000
--- a/app-text/jadetex/files/80jadetex.cnf
+++ /dev/null
@@ -1,37 +0,0 @@
-% -- jadetex configuration params added by texmf-update --
-% latex settings
-main_memory.latex = 1100000
-param_size.latex = 1500
-stack_size.latex = 1500
-hash_extra.latex = 15000
-string_vacancies.latex = 45000
-pool_free.latex = 47500
-nest_size.latex = 500
-save_size.latex = 5000
-pool_size.latex = 500000
-max_strings.latex = 55000
-font_mem_size.latex= 400000
-
-% jadetex & pdfjadetex
-main_memory.jadetex = 1500000
-param_size.jadetex = 1500
-stack_size.jadetex = 1500
-hash_extra.jadetex = 50000
-string_vacancies.jadetex = 45000
-pool_free.jadetex = 47500
-nest_size.jadetex = 500
-save_size.jadetex = 5000
-pool_size.jadetex = 500000
-max_strings.jadetex = 55000
-
-main_memory.pdfjadetex = 2500000
-param_size.pdfjadetex = 1500
-stack_size.pdfjadetex = 1500
-hash_extra.pdfjadetex = 50000
-string_vacancies.pdfjadetex = 45000
-pool_free.pdfjadetex = 47500
-nest_size.pdfjadetex = 500
-save_size.pdfjadetex = 5000
-pool_size.pdfjadetex = 500000
-max_strings.pdfjadetex = 55000
-% -- jadetex configuration ends here --
diff --git a/app-text/jadetex/files/format.jadetex.cnf b/app-text/jadetex/files/format.jadetex.cnf
deleted file mode 100644
index d88f7eb0bff8..000000000000
--- a/app-text/jadetex/files/format.jadetex.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-# JadeTeX
-jadetex pdftex language.dat -translate-file=cp227.tcx \&latex jadetex.ini
-pdfjadetex pdftex language.dat -translate-file=cp227.tcx \&pdflatex pdfjadetex.ini
diff --git a/app-text/jadetex/jadetex-3.13-r7.ebuild b/app-text/jadetex/jadetex-3.13-r7.ebuild
deleted file mode 100644
index d1f1a0cc071a..000000000000
--- a/app-text/jadetex/jadetex-3.13-r7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package texlive-common
-
-DESCRIPTION="TeX macros used by Jade TeX output"
-HOMEPAGE="http://jadetex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE=""
-RESTRICT="test"
-
-DEPEND=">=app-text/openjade-1.3.1
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-plaingeneric"
-
-src_compile() {
- fmt_call="$(has_version '>=app-text/texlive-core-2019' \
- && echo "fmtutil-user" || echo "fmtutil")"
- VARTEXFONTS="${T}/fonts" emake
- VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}" env -u TEXINPUTS \
- $fmt_call --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
- || die "failed to build format"
-}
-
-src_install() {
- # Runtime files
- insinto /usr/share/texmf-site/tex/jadetex
- doins dsssl.def jadetex.ltx jadetex.cfg {pdf,}jadetex.ini *.sty
-
- insinto /var/lib/texmf
- doins -r texmf-var/*
-
- etexlinks "${FILESDIR}/format.jadetex.cnf"
-
- # Doc/manpages
- dodoc ChangeLog*
- doman *.1
- dohtml -r .
-
- # Support for our latex setup
- insinto /etc/texmf/texmf.d
- doins "${FILESDIR}/80jadetex.cnf"
- insinto /etc/texmf/fmtutil.d
- doins "${FILESDIR}/format.jadetex.cnf"
-}
-
-pkg_postinst() {
- etexmf-update
- elog
- elog "If jadetex fails with \"TeX capacity exceeded, sorry [save size=5000]\","
- elog "increase save_size in /etc/texmf/texmf.d/80jadetex.cnf and."
- elog "remerge jadetex. See bug #21501."
- elog
-}
-
-pkg_postrm() {
- etexmf-update
-}
diff --git a/app-text/jadetex/metadata.xml b/app-text/jadetex/metadata.xml
deleted file mode 100644
index 964ad3bf6d73..000000000000
--- a/app-text/jadetex/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>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jadetex</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 62e75c2e6c8e..d415981d9743 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1 +1,2 @@
-DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
+DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
+DIST jo-1.6.tar.gz 151941 BLAKE2B 13d7d68c33d7f89ebb4a5cdb448082bd4d245060ebf8c85149c39f2a184f03f1ac1c380833a742894c37c0815e3627569cfe29f202f9aa3dcec7fa089f99b918 SHA512 a2cb1327c8255e0f8d1b6e6056bbce081d7703192bdb974e908549b863d7db645531dbeff87629a6ed53626295ab7ca8a72816d104f9188846ef175c8a9acb07
diff --git a/app-text/jo/files/jo-1.1-version.patch b/app-text/jo/files/jo-1.1-version.patch
deleted file mode 100644
index 446df4aa9211..000000000000
--- a/app-text/jo/files/jo-1.1-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_PREREQ([2.64])
--AC_INIT([jo], [1.0], [jpmens@gmail.com])
-+AC_INIT([jo], [1.1], [jpmens@gmail.com])
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_SRCDIR([jo.c])
-
diff --git a/app-text/jo/jo-1.1.ebuild b/app-text/jo/jo-1.1.ebuild
deleted file mode 100644
index 704769988141..000000000000
--- a/app-text/jo/jo-1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="JSON output from a shell"
-HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1-version.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
diff --git a/app-text/jo/jo-1.4.ebuild b/app-text/jo/jo-1.4.ebuild
new file mode 100644
index 000000000000..bf84777ca6d8
--- /dev/null
+++ b/app-text/jo/jo-1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+ export bashcompdir=$(get_bashcompdir)
+ default
+}
+
+src_install() {
+ default
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
+}
diff --git a/app-text/jo/jo-1.6.ebuild b/app-text/jo/jo-1.6.ebuild
new file mode 100644
index 000000000000..162d12aebd86
--- /dev/null
+++ b/app-text/jo/jo-1.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jpmens/${PN}"
+else
+ SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ export bashcompdir=$(get_bashcompdir)
+ default
+}
+
+src_install() {
+ default
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
+}
diff --git a/app-text/jo/jo-9999.ebuild b/app-text/jo/jo-9999.ebuild
new file mode 100644
index 000000000000..162d12aebd86
--- /dev/null
+++ b/app-text/jo/jo-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jpmens/${PN}"
+else
+ SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ export bashcompdir=$(get_bashcompdir)
+ default
+}
+
+src_install() {
+ default
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
+}
diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
index aa1c918e2462..b063edbe677f 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,10 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jer@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">jpmens/jo</remote-id>
- </upstream>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">jpmens/jo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/jpdftweak/Manifest b/app-text/jpdftweak/Manifest
deleted file mode 100644
index d0776d425372..000000000000
--- a/app-text/jpdftweak/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jpdftweak-src-0.9.zip 129611 BLAKE2B 182e81323144cf543ff50c2f95acd009ae53eedf838a00cd8596a2db0c53858fc56ed424e3719a0eedd653be3492a2e4e3af6971ab30a77dbab878f74892c342 SHA512 55e68ba13876f2ac24b635af955d3054fed00135f05532625f40a245cc39176398bf6c0bf4a393e9e475604933727a7fdb270b94b38390b8ca9a41447d6652f7
diff --git a/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild b/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild
deleted file mode 100644
index d7923408a8da..000000000000
--- a/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Swiss Army Knife for PDF files"
-HOMEPAGE="http://jpdftweak.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="dev-java/itext:0
- dev-java/jgoodies-forms:0"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip:0
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}"
-
-java_prepare() {
- cd lib || die
-
- java-pkg_jar-from jgoodies-forms forms.jar
- java-pkg_jar-from itext iText.jar itext.jar
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- java-pkg_dolauncher ${PN} --main ${PN}.Main
-
- dodoc README.txt
- dohtml manual/*
-}
diff --git a/app-text/jpdftweak/metadata.xml b/app-text/jpdftweak/metadata.xml
deleted file mode 100644
index 6909e49b5a32..000000000000
--- a/app-text/jpdftweak/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>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <longdescription>
- jPDF Tweak is a Java Swing application that can combine, split, rotate,
- reorder, watermark, encrypt, sign, and otherwise tweak PDF files.
-
- You can use it to make printable booklets from your PDFs, to add PDF
- bookmarks, effects (page transitions), to combine multiple PDF files,
- to watermark them, to rotate pages that do not fit, to attach files to
- your PDF, to encrypt and sign your PDFs, to change metadata (like
- author or keywords), and much more.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">jpdftweak</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/katarakt/Manifest b/app-text/katarakt/Manifest
new file mode 100644
index 000000000000..3a47b281192c
--- /dev/null
+++ b/app-text/katarakt/Manifest
@@ -0,0 +1 @@
+DIST katarakt-v0.2.tar.gz 52004 BLAKE2B af014425bbf9c36350f4c10e57d9668f4a362d786c660f032381f6cf68b006d384c88bb0f4cabee4c0bc8e5f01ad25a44ef38d100ddfdfe955a442313b77b322 SHA512 a07054e0e9915f6239b8149bbd08c8b5ec095b0e9ffb54e03761ad9e59914f66166e4b8359298721a6b46c2bcf5114f40ad117c4826a32660c1fba28f69b8e68
diff --git a/app-text/katarakt/files/katarakt-0.2-install.patch b/app-text/katarakt/files/katarakt-0.2-install.patch
new file mode 100644
index 000000000000..96cb6f4b6140
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-install.patch
@@ -0,0 +1,26 @@
+From 4801619c7752b317da8d57183f590d9c3cce42e1 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 30 Jan 2020 19:22:05 +0100
+Subject: [PATCH] build: Install binary
+
+Add an install target for the binary.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ katarakt.pro | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..220dfd68b1b9 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -57,3 +57,6 @@ web.depends = $$website.target
+ web.CONFIG = phony
+
+ QMAKE_EXTRA_TARGETS += documentation website doc web
++
++target.path = $$INSTALL_ROOT/$$PREFIX/bin/
++INSTALLS += target
+--
+2.24.1
+
diff --git a/app-text/katarakt/files/katarakt-0.2-poppler.patch b/app-text/katarakt/files/katarakt-0.2-poppler.patch
new file mode 100644
index 000000000000..7979bf6a59cd
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-poppler.patch
@@ -0,0 +1,29 @@
+From 23b68e9c48204d43b37b23735ad9ea0b219fec7b Mon Sep 17 00:00:00 2001
+From: Philipp Erhardt <Philipp.Erhardt@informatik.stud.uni-erlangen.de>
+Date: Mon, 19 Oct 2020 20:42:37 +0200
+Subject: [PATCH] Fix compilation if the version number contains a leading zero
+
+---
+ katarakt.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..84cd59797d0a 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -17,9 +17,9 @@ unix {
+
+ isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf
+ POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+- POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+- POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++ POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed "\'s,^0*\\(.\\),\1,\'")
++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "\'s,^0*\\(.\\),\1,\'")
++ POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed "\'s,^0*\\(.\\),\1,\'")
+
+ DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+ DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
+--
+2.33.0
+
diff --git a/app-text/katarakt/katarakt-0.2.ebuild b/app-text/katarakt/katarakt-0.2.ebuild
new file mode 100644
index 000000000000..161ff49aee54
--- /dev/null
+++ b/app-text/katarakt/katarakt-0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A simple PDF viewer designed to use as much available screen space as possible"
+HOMEPAGE="https://gitlab.cs.fau.de/Qui_Sum/katarakt"
+SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+"
+RDEPEND="
+ app-text/poppler:=[qt5]
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-install.patch"
+ "${FILESDIR}/${P}-poppler.patch"
+)
+
+src_configure() {
+ eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install doc
+ doman doc/katarakt.1
+}
diff --git a/app-text/katarakt/metadata.xml b/app-text/katarakt/metadata.xml
new file mode 100644
index 000000000000..7a3b0ef78c18
--- /dev/null
+++ b/app-text/katarakt/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>kurt@kmk-computers.de</email>
+ <name>Kurt Kanzenbach</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ katarakt is a simple PDF viewer. It is designed to use as much available
+ screen space as possible.
+
+ There are currently two layouts. The presentation layout is very simple and
+ only supports scrolling on a per page basis. As the name suggests the
+ current page is displayed in the center and zoomed to fit the window. It is
+ active by default.
+
+ The grid layout is much more advanced and offers continuous (smooth, per
+ pixel) scrolling, zooming and adjusting the column count. Pages keep their
+ correct relative size and are shown in a grid.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 4dc06faa6f59..c44092fd5cf1 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1 +1 @@
-DIST kbibtex-0.9.tar.xz 4184288 BLAKE2B 90baf7c4960540566c59b198de307703d0f34ff6f4284933c187625b2e4065739fb16b004408fec5929d4923e7f651091915841c94ef09797419daa737ae39eb SHA512 bdd849094f66feb1bd6d02131580cb5d2e1f8d172a4e36141a48d3fc38375b5f4512078d13d6310f326b5cb7b15364616308eaac6c2c10ef897f8f752e1f6682
+DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d
diff --git a/app-text/kbibtex/kbibtex-0.10.0.ebuild b/app-text/kbibtex/kbibtex-0.10.0.ebuild
new file mode 100644
index 000000000000..11a10b600ce5
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.10.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org optfeature
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+ KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="webengine"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-text/poppler[qt5]
+ dev-libs/icu:=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ virtual/tex-base
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-tex/bibtex2html
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "PDF or PostScript document previews" "media-gfx/okularpart:5" "kde-apps/okular:5"
+ fi
+ ecm_pkg_postinst
+}
diff --git a/app-text/kbibtex/kbibtex-0.9.ebuild b/app-text/kbibtex/kbibtex-0.9.ebuild
deleted file mode 100644
index 3d572fc00944..000000000000
--- a/app-text/kbibtex/kbibtex-0.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="webengine zotero"
-
-DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- $(add_qt_dep qtxmlpatterns)
- app-text/poppler[qt5]
- dev-libs/icu:=
- virtual/tex-base
- webengine? ( $(add_qt_dep qtwebengine 'widgets') )
- zotero? (
- app-crypt/qca[qt5(+)]
- dev-libs/qoauth:5
- )
-"
-RDEPEND="${DEPEND}
- !app-text/kbibtex:4
- dev-tex/bibtex2html
-"
-
-RESTRICT+=" test"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
- $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake-utils_use_find_package zotero Qca-qt5)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version "kde-apps/okular:${SLOT}" ; then
- elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
- fi
-}
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
index bbd2b00bbf69..32ff49f58c38 100644
--- a/app-text/kbibtex/metadata.xml
+++ b/app-text/kbibtex/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">office/kbibtex</remote-id>
+ </upstream>
<use>
<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for HTML previews</flag>
- <flag name="zotero">Enable support for synchronisation with zotero.org web service</flag>
</use>
</pkgmetadata>
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 6c498dc97cc3..c3c46af89a36 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1 +1 @@
-DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
+DIST kchmviewer-8.0.tar.gz 311899 BLAKE2B f317dcc17fa88f30a4a1867b59b16bdc78457b46f4f3d3b78bd5d9d50745bf2d2329df170568c7814a02814a77b319bbd1d9f8edc3c1da0071a6ce64965b26bf SHA512 28ae8ee8a6f4a9be2e8a9666f6326906e04f34ad80a363697fc7e5bfbc745e6671884add3f57b6a1264f2056428cb0a31504da9c69a0bede0c3b485a08e75048
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
deleted file mode 100644
index 897c62a998c2..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Gentoo still ships QtWebKit in 5.6 and later, so don't try and fail to use QtWebEngine.
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -113,21 +113,11 @@
- }
-
- greaterThan(QT_MAJOR_VERSION, 4) {
-- # Qt 5
-- greaterThan(QT_MINOR_VERSION, 5) {
-- # Qt 5.6+
-- error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
-- QT += webengine webenginewidgets
-- DEFINES += USE_WEBENGINE
-- SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
-- HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
-- } else {
- # Qt 5.0-5.5
- QT += webkit webkitwidgets
- DEFINES += USE_WEBKIT
- SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
- HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
-- }
- } else {
- message("Qt4 is not supported anymore, please do not report any errors")
- QT += webkit webkitwidgets
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
deleted file mode 100644
index 75bfed89cbdd..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -108,7 +108,7 @@
- HEADERS += dbus_interface.h
- SOURCES += dbus_interface.cpp
- CONFIG += dbus
-- LIBS += ../lib/libebook/libebook.a
-+ LIBS += ../lib/libebook/libebook.a -lchm -lzip
- POST_TARGETDEPS += ../lib/libebook/libebook.a
- }
-
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch b/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch
new file mode 100644
index 000000000000..144d673b2b17
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-8.0-custom-url-scheme-registration.patch
@@ -0,0 +1,59 @@
+From 9ac73e7ad15de08aab6b1198115be2eb44da7afe Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Fri, 21 May 2021 15:57:21 -0700
+Subject: [PATCH] Custom URL scheme registration needs to be applied once per
+ https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
+
+---
+ src/viewwindow_webengine.cpp | 20 +++++++++++++-------
+ src/viewwindow_webengine.h | 3 ---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/viewwindow_webengine.cpp b/src/viewwindow_webengine.cpp
+index 631d84d..34f3396 100644
+--- a/src/viewwindow_webengine.cpp
++++ b/src/viewwindow_webengine.cpp
+@@ -63,16 +63,22 @@ ViewWindow::ViewWindow( QWidget * parent )
+ m_contextMenuLink = 0;
+ m_storedScrollbarPosition = -1; // see header
+
+- // Use our network emulation layer. I don't know if we transfer the ownership when we install it,
+- // so we create one per page. May be unnecessary.
+- m_provider = new DataProvider_QWebEngine( this );
+-
+- page()->profile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), m_provider );
+- page()->profile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), m_provider );
+-
+ // All links are going through us
+ //page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+
++ // This needs to be done only once
++ static bool providerInstalled = false;
++
++ if ( !providerInstalled )
++ {
++ // Use our network emulation layer. We do not transfer the ownership when we install it. See https://doc.qt.io/qt-5/qwebengineurlschemehandler.html
++ DataProvider_QWebEngine * provider = new DataProvider_QWebEngine( 0 );
++
++ QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_CHM::urlScheme(), provider );
++ QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( EBook_EPUB::urlScheme(), provider );
++ providerInstalled = true;
++ }
++
+ connect( this, SIGNAL( loadFinished(bool)), this, SLOT( onLoadFinished(bool)) );
+
+ // Search results highlighter
+diff --git a/src/viewwindow_webengine.h b/src/viewwindow_webengine.h
+index 0adea31..3e96690 100644
+--- a/src/viewwindow_webengine.h
++++ b/src/viewwindow_webengine.h
+@@ -128,9 +128,6 @@ class ViewWindow : public QWebEngineView
+ // It is set to -1 if no scrollbar position has been set and the page is not loaded yet
+ // It is set to 0 if no scrollbar position has been set and the page is loaded already
+ int m_storedScrollbarPosition;
+-
+- // Data provider
+- DataProvider_QWebEngine * m_provider;
+ };
+
+ #endif // VIEWWINDOW_WEBENGINE_H
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch
new file mode 100644
index 000000000000..18360c897821
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-8.0-no-qtwebkit.patch
@@ -0,0 +1,28 @@
+From a4a3984465cb635822953350c571950ae726b539 Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Sun, 23 May 2021 15:01:24 -0700
+Subject: [PATCH] Only add Webkit stuff to QT if we're compiling under 5.6.
+ Thanks to @u-235 for reporting.
+
+---
+ src/src.pro | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index f502259..e75d6a9 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -60,12 +60,7 @@ FORMS += tab_bookmarks.ui \
+ toolbareditor.ui
+ RESOURCES += resources/images.qrc
+
+-QT += webkit \
+- xml \
+- network \
+- widgets \
+- webkitwidgets \
+- printsupport
++QT += xml network widgets printsupport
+
+ linux-g++*:{
+ LIBS += -lX11
diff --git a/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch
new file mode 100644
index 000000000000..b4ed3b500c8d
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-8.0-underlinking.patch
@@ -0,0 +1,30 @@
+From e3b09edbbae17ad19661a7514afe5a9d84ca0ffa Mon Sep 17 00:00:00 2001
+From: George Yunaev <gyunaev@ulduzsoft.com>
+Date: Sun, 23 May 2021 15:03:06 -0700
+Subject: [PATCH] Adding support for old single-pass gcc linker which requires
+ a specific order of libraries. Thanks to @u-235 for reporting and patch.
+
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index e75d6a9..14c31a1 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -40,7 +40,6 @@ SOURCES += config.cpp \
+ textencodings.cpp \
+ treeitem_toc.cpp \
+ treeitem_index.cpp
+-LIBS += -lchm -lzip
+ TARGET = ../bin/kchmviewer
+ CONFIG += threads \
+ warn_on \
+@@ -106,6 +105,7 @@ unix:!macx: {
+ LIBS += ../lib/libebook/libebook.a
+ POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
++LIBS += -lchm -lzip
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ # Qt 5
diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
deleted file mode 100644
index f38835061d77..000000000000
--- a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Feature rich chm file viewer, based on Qt"
-HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- dev-libs/chmlib
- dev-libs/libzip:=
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-force-qtwebkit.patch"
- "${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- dodoc ChangeLog DBUS-bindings FAQ README
- doicon packages/kchmviewer.png
- dobin bin/kchmviewer
- domenu packages/kchmviewer.desktop
-}
diff --git a/app-text/kchmviewer/kchmviewer-8.0.ebuild b/app-text/kchmviewer/kchmviewer-8.0.ebuild
new file mode 100644
index 000000000000..23823fd53382
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Feature rich chm file viewer, based on Qt"
+HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
+SRC_URI="https://github.com/gyunaev/${PN}/archive/refs/tags/RELEASE_${PV/./_}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/kchmviewer-RELEASE_8_0"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/chmlib
+ dev-libs/libzip:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-underlinking.patch"
+ "${FILESDIR}/${P}-custom-url-scheme-registration.patch"
+ "${FILESDIR}/${P}-no-qtwebkit.patch"
+)
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ dodoc ChangeLog DBUS-bindings FAQ README
+ doicon packages/kchmviewer.png
+ dobin bin/kchmviewer
+ domenu packages/kchmviewer.desktop
+}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
index 9826a818187b..59f7e66a3fa5 100644
--- a/app-text/kchmviewer/metadata.xml
+++ b/app-text/kchmviewer/metadata.xml
@@ -1,20 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <longdescription lang="en">
- KchmViewer is a chm (MS HTML help file format) viewer It uses Trolltech Qt
- widget library with optional KDE libraries. It does not require KDE, but may
- be compiled with full KDE support, including KDE widgets and KIO/KHTML. The
- main advantage of KchmViewer is extra support for non-English languages.
- Unlike other viewers, KchmViewer in most cases is able to detect help file
- encoding, correctly shows tables of context of Russian, Korean, Chinese and
- Japanese help files, and does correct search in non-English help files
- (search for MBCS languages - ja/ko/ch is still in progress).
- </longdescription>
<upstream>
<remote-id type="github">gyunaev/kchmviewer</remote-id>
</upstream>
diff --git a/app-text/keepnote/Manifest b/app-text/keepnote/Manifest
deleted file mode 100644
index 858ddf053e0e..000000000000
--- a/app-text/keepnote/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST keepnote-0.7.9.tar.gz 786634 BLAKE2B e14b41f6d5e983ef4ef27e10a2b39f8972cfd47c34a15f7efd97c1c809a29c50554d5edd5fcd0ff8624861fc0a33662c6f00eef675519fdab11d8cef9b67da1d SHA512 1d818fab1fea69b6369209dbaad403b2431352ba359d4f233ab412fd56a57e970b6b6adf63201811ce45faee471cf3521c6b4ccecc67f3befc727b2e77189ac5
diff --git a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch b/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch
deleted file mode 100644
index 7c06aab2c91d..000000000000
--- a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 14 07:08:05 UTC 2012
-Subject: desktop file
-
-respect fd.o desktop entry spec
-
-# desktop-file-validate keepnote.desktop
-keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
-keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName"
-keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" looks redundant with value "Program na spr?vu pozn?mok" of key "GenericName[sk]"
-keepnote.desktop: error: value "Office" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-
---- desktop/keepnote.desktop
-+++ desktop/keepnote.desktop
-@@ -1,14 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
- Name=KeepNote
- GenericName=Note-taking Application
- GenericName[sk]=Program na správu poznámok
--Comment=Note-taking Application
--Comment[sk]=Program na správu poznámok
- Icon=keepnote
- Exec=keepnote %f
--Categories=Office
-+Categories=Office;
- #MimeType=
- Terminal=false
- StartupNotify=false
diff --git a/app-text/keepnote/keepnote-0.7.9-r2.ebuild b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
deleted file mode 100644
index d991974ffc3d..000000000000
--- a/app-text/keepnote/keepnote-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit gnome2-utils distutils-r1
-
-DESCRIPTION="A note taking application"
-HOMEPAGE="http://keepnote.org/"
-SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-misc/xdg-utils"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.8-desktopfile.patch )
-DOCS=( CHANGES )
-
-python_test() {
- "${PYTHON}" test/testing.py || die
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- einfo
- elog "optional dependencies:"
- elog " app-text/gtkspell:2 (spell checking)"
- einfo
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-text/keepnote/metadata.xml b/app-text/keepnote/metadata.xml
deleted file mode 100644
index 406d1cd53480..000000000000
--- a/app-text/keepnote/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <maintainer status="active">
- <email>rasmus@alum.mit.edu</email>
- <name>Matt Rasmussen</name>
- </maintainer>
- <doc lang="en">http://keepnote.org/manual/</doc>
- <bugs-to>https://code.google.com/p/keepnote/issues/list</bugs-to>
- </upstream>
- <longdescription lang="en">
- KeepNote is a note taking application . With KeepNote, you can
- store your class notes, TODO lists, research notes, journal entries,
- paper outlines, etc in a simple notebook hierarchy with rich-text
- formatting, images, and more. Using full-text search, you can
- retrieve any note for later reference.
- </longdescription>
-</pkgmetadata>
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index a15fbd6af693..27a4f377995e 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1 +1 @@
-DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
+DIST kjots-5.1.1.tar.xz 232816 BLAKE2B e90f0d4964a939898bd484ce691a0586725705d27e65af513ebfcd7b2bd1eec731e2374e550e92def736c72bad12e272c9cae1c32eabda67a2c1c45cb6655b69 SHA512 b0b4c3f9e11d5cc91b6667bc0483e1e3c62535473e99abbe6fb8e5e4519c1a2b72372de42f63fa2f6e730b40e03fcbc99cd0e189084f0122bfccf45185d2b088
diff --git a/app-text/kjots/kjots-5.0.2.ebuild b/app-text/kjots/kjots-5.0.2.ebuild
deleted file mode 100644
index 1aaa4567bdef..000000000000
--- a/app-text/kjots/kjots-5.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Note taking utility by KDE"
-HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep akonadi-notes)
- $(add_kdeapps_dep kmime)
- $(add_kdeapps_dep kontactinterface)
- $(add_kdeapps_dep kpimtextedit)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtwidgets)
- dev-libs/grantlee:5
- dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
- !app-text/kjots:4
-"
diff --git a/app-text/kjots/kjots-5.1.1.ebuild b/app-text/kjots/kjots-5.1.1.ebuild
new file mode 100644
index 000000000000..39834da4447e
--- /dev/null
+++ b/app-text/kjots/kjots-5.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.103.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+DESCRIPTION="Note taking utility by KDE"
+HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="speech"
+
+DEPEND="
+ >=dev-libs/grantlee-5.3:5
+ dev-libs/ktextaddons:5[speech?]
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-23.04.0:5
+ >=kde-apps/akonadi-notes-23.04.0:5
+ >=kde-apps/kmime-23.04.0:5
+ >=kde-apps/kontactinterface-23.04.0:5
+ >=kde-apps/kpimtextedit-23.04.0:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+ >=kde-apps/kdepim-runtime-23.04.0:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package speech KF5TextEditTextToSpeech)
+ )
+
+ ecm_src_configure
+}
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index 2fdbf33d963d..8e5041d0d9ff 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">pim/kjots</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
new file mode 100644
index 000000000000..fb204db40447
--- /dev/null
+++ b/app-text/kramdown-rfc/Manifest
@@ -0,0 +1,2 @@
+DIST kramdown-rfc2629-1.6.36.gem 60928 BLAKE2B e1f5a3299ddca462b7ab3935019b95f58aebfc5de52271142b41cbf03102a574181b0d29d5701e0f6b710eb7c8b85dda0f9700b8e47698b6d079cd8c07d720b0 SHA512 d3c32bd0e692ebf5dfb428617ce6ae37ac91ff99021a59e11df205e88c76699c8fabd8dd7922f6e9a5653b12e3c113eeedbb38b6edd656d67cd16b5f03a3136e
+DIST kramdown-rfc2629-1.6.39.gem 62464 BLAKE2B 4063bab5ef8081c5a2aba3d881990d9ea4e6dd5ce01bf85e0ce6bc63b0fc6c1e8e9be413b00588c5e6e473ee26dfb6060aa8767ce6b4053c1b8750f79182e540 SHA512 bdfc611895f734a28e65b8d6b750fec387bb504d35feb8c6bbf4dbaf83b19b65fb61187e9b5e58ec64dbe72cbc9cc6efa78a349752340634ef2dc565bb096589
diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch
new file mode 100644
index 000000000000..65a5fbed234f
--- /dev/null
+++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch
@@ -0,0 +1,31 @@
+From 8e7bd5a8b95e06568af75f3268529434ea989b2b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Mon, 27 Mar 2023 11:18:37 +0200
+Subject: [PATCH] Drop dependency on certified
+
+--- a/kramdown-rfc2629.gemspec
++++ b/kramdown-rfc2629.gemspec
+@@ -6,7 +6,6 @@ spec = Gem::Specification.new do |s|
+ "kramdown" markdown parser. Mostly useful for RFC writers.}
+ s.add_dependency('kramdown', '~> 2.4.0')
+ s.add_dependency('kramdown-parser-gfm', '~> 1.1')
+- s.add_dependency('certified', '~> 1.0')
+ s.add_dependency('json_pure', '~> 2.0')
+ s.add_dependency('unicode-name', '~> 1.0')
+ s.add_dependency('unicode-blocks', '~> 1.0')
+--- a/lib/kramdown-rfc/command.rb
++++ b/lib/kramdown-rfc/command.rb
+@@ -134,9 +134,7 @@ def do_the_tls_dance
+ warn "** Configuration problem with OpenSSL certificate store."
+ warn "** You may want to examine #{OpenSSL::X509::DEFAULT_CERT_FILE}"
+ warn "** and #{OpenSSL::X509::DEFAULT_CERT_DIR}."
+- warn "** Activating suboptimal workaround."
+- warn "** Occasionally run `certified-update` to maintain that workaround."
+- require 'certified'
++ exit 1
+ end
+ end
+ end
+--
+2.39.2
+
diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch
new file mode 100644
index 000000000000..089ca1f4dea3
--- /dev/null
+++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch
@@ -0,0 +1,27 @@
+From 4e64df2e00dec244fe1f44233553e1936004b98d Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 25 Jun 2023 17:32:52 +0200
+Subject: [PATCH] Remove bin/echars
+
+--- a/kramdown-rfc2629.gemspec
++++ b/kramdown-rfc2629.gemspec
+@@ -8,14 +8,10 @@ spec = Gem::Specification.new do |s|
+ s.add_dependency('kramdown-parser-gfm', '~> 1.1')
+ s.add_dependency('certified', '~> 1.0')
+ s.add_dependency('json_pure', '~> 2.0')
+- s.add_dependency('unicode-name', '~> 1.0')
+- s.add_dependency('unicode-blocks', '~> 1.0')
+- s.add_dependency('unicode-scripts', '~> 1.0')
+ s.add_dependency('net-http-persistent', '~> 4.0')
+- s.add_dependency('differ', '~>0.1')
+- s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/echars bin/kramdown-rfc-extract-markdown bin/kramdown-rfc-extract-sourcecode data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm bin/kramdown-rfc-clean-svg-ids)
++ s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown bin/kramdown-rfc-extract-sourcecode data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm bin/kramdown-rfc-clean-svg-ids)
+ s.require_path = 'lib'
+- s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',
++ s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit',
+ 'kramdown-rfc-extract-markdown',
+ 'kramdown-rfc-extract-sourcecode',
+ 'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
+--
+2.39.3
+
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild
new file mode 100644
index 000000000000..eca764b9c1dd
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.36.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+# The software got renamed from kramdown-rfc2629 to kramdown-rfc,
+# however the gem coordinate is still kramdown-rfc2629.
+RUBY_FAKEGEM_NAME="${PN}2629"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+# Explicitly use the gemspec file over the metadata file of the gem, as
+# the latter contains dependencies that we patched out.
+RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch
+ "${FILESDIR}"/${PN}-1.6.35-Remove-bin-echars.patch
+)
+
+ruby_add_rdepend "
+ >=dev-ruby/json-2.0.0
+ >=dev-ruby/kramdown-2.4.0
+ >=dev-ruby/kramdown-parser-gfm-1.1.0
+ >=dev-ruby/net-http-persistent-4.0
+"
+
+all_ruby_prepare() {
+ sed -i 's/json_pure/json/' "${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild
new file mode 100644
index 000000000000..eca764b9c1dd
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+# The software got renamed from kramdown-rfc2629 to kramdown-rfc,
+# however the gem coordinate is still kramdown-rfc2629.
+RUBY_FAKEGEM_NAME="${PN}2629"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+# Explicitly use the gemspec file over the metadata file of the gem, as
+# the latter contains dependencies that we patched out.
+RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch
+ "${FILESDIR}"/${PN}-1.6.35-Remove-bin-echars.patch
+)
+
+ruby_add_rdepend "
+ >=dev-ruby/json-2.0.0
+ >=dev-ruby/kramdown-2.4.0
+ >=dev-ruby/kramdown-parser-gfm-1.1.0
+ >=dev-ruby/net-http-persistent-4.0
+"
+
+all_ruby_prepare() {
+ sed -i 's/json_pure/json/' "${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/app-text/kramdown-rfc/metadata.xml b/app-text/kramdown-rfc/metadata.xml
new file mode 100644
index 000000000000..c84d9ca8a5a3
--- /dev/null
+++ b/app-text/kramdown-rfc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type='person'>
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type='github'>cabo/kramdown-rfc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 0d4e2b12d737..f618c954865f 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1 +1 @@
-DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
+DIST krop-0.6.0.tar.gz 48331 BLAKE2B ca6a00a410ed4e18a401fab3a21bc49c86f73165f68b192ab83c8fad74111ba9a9941f464a2646faa5a3317bbb45cdc89bed19c901999c0b11db353ac2997a65 SHA512 51a988e4fcb65d11cc26cf5b0c808e79097a66ef8ec4751a6c051289cd77b3328ebc8ecd9829adc466f87330beb8bc715d290cc20be415a7b8f179378b7bcb4f
diff --git a/app-text/krop/files/krop-0.6.0-links.patch b/app-text/krop/files/krop-0.6.0-links.patch
new file mode 100644
index 000000000000..c311b10cf88e
--- /dev/null
+++ b/app-text/krop/files/krop-0.6.0-links.patch
@@ -0,0 +1,64 @@
+From a39f8328cf59492e68643f499c0d0fbda910444c Mon Sep 17 00:00:00 2001
+From: Armin Straub <31167361+arminstraub@users.noreply.github.com>
+Date: Sun, 17 Jan 2021 15:50:49 -0600
+Subject: [PATCH] Preserve links within a PDF (thanks to chrthi)
+
+---
+ ChangeLog | 4 ++++
+ krop/mainwindow.py | 1 +
+ krop/pdfcropper.py | 11 +++++++++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index eb7dbb1..4ffbedb 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++krop (0.6.1) 2021-00-00 -- Armin Straub
++
++ * Preserve links within a PDF (thanks to chrthi for doing this).
++
+ krop (0.6.0) 2020-06-09 -- Armin Straub
+
+ + Fixed aspect ratios, like letter size, can be chosen for selections.
+diff --git a/krop/mainwindow.py b/krop/mainwindow.py
+index fd1ae32..e8adadf 100644
+--- a/krop/mainwindow.py
++++ b/krop/mainwindow.py
+@@ -413,6 +413,7 @@ def slotKrop(self):
+ pdf = PdfFile()
+ pdf.loadFromFile(inputFileName)
+ cropper = PdfCropper()
++ cropper.copyDocumentRoot(pdf)
+ for nr in pages:
+ c = self.viewer.cropValues(nr)
+ cropper.addPageCropped(pdf, nr, c, alwaysinclude, rotation)
+diff --git a/krop/pdfcropper.py b/krop/pdfcropper.py
+index 679c6fc..db30646 100644
+--- a/krop/pdfcropper.py
++++ b/krop/pdfcropper.py
+@@ -55,6 +55,8 @@ def writeToFile(self, filename):
+ stream.close()
+ def addPageCropped(self, pdffile, pagenumber, croplist, rotate=0):
+ pass
++ def copyDocumentRoot(self, pdffile):
++ pass
+
+
+ class PyPdfFile(AbstractPdfFile):
+@@ -110,6 +112,15 @@ def cropPage(self, page, crop, rotate):
+ if rotate != 0:
+ page.rotateClockwise(rotate)
+
++ def copyDocumentRoot(self, pdffile):
++ # Sounds promising in PyPDF2 (see PdfFileWriter.cloneDocumentFromReader),
++ # but doesn't seem to produce a readable PDF:
++ # self.output.cloneReaderDocumentRoot(pdffile.reader)
++ # Instead, this copies at least the named destinations for links:
++ for dest in pdffile.reader.namedDestinations.values():
++ self.output.addNamedDestinationObject(dest)
++
++
+ def optimizePdfGhostscript(oldfilename, newfilename):
+ import subprocess
+ subprocess.check_call(('gs', '-sDEVICE=pdfwrite', '-sOutputFile=' + newfilename,
diff --git a/app-text/krop/files/krop-0.6.0-pikepdf.patch b/app-text/krop/files/krop-0.6.0-pikepdf.patch
new file mode 100644
index 000000000000..17f59f2f72b3
--- /dev/null
+++ b/app-text/krop/files/krop-0.6.0-pikepdf.patch
@@ -0,0 +1,150 @@
+From b1d17b605088e118a8799fd027a892310e00d29e Mon Sep 17 00:00:00 2001
+From: Hongzhuo Liang <lianghongzhuo@126.com>
+Date: Fri, 27 Jan 2023 17:57:04 +0100
+Subject: [PATCH] support pikepdf instead of pypdf2
+
+---
+ krop/mainwindow.py | 1 -
+ krop/pdfcropper.py | 79 ++++++++++++++--------------------------------
+ 2 files changed, 24 insertions(+), 56 deletions(-)
+
+diff --git a/krop/mainwindow.py b/krop/mainwindow.py
+index e8adadf..fd1ae32 100644
+--- a/krop/mainwindow.py
++++ b/krop/mainwindow.py
+@@ -413,7 +413,6 @@ def slotKrop(self):
+ pdf = PdfFile()
+ pdf.loadFromFile(inputFileName)
+ cropper = PdfCropper()
+- cropper.copyDocumentRoot(pdf)
+ for nr in pages:
+ c = self.viewer.cropValues(nr)
+ cropper.addPageCropped(pdf, nr, c, alwaysinclude, rotation)
+diff --git a/krop/pdfcropper.py b/krop/pdfcropper.py
+index db30646..42500de 100644
+--- a/krop/pdfcropper.py
++++ b/krop/pdfcropper.py
+@@ -15,23 +15,8 @@
+
+ import copy
+ import sys
++from pikepdf import Pdf
+
+-# Unless specified otherwise, use PyPDF2 instead of pyPdf if available.
+-usepypdf2 = '--no-PyPDF2' not in sys.argv
+-if usepypdf2:
+- try:
+- from PyPDF2 import PdfFileReader, PdfFileWriter
+- except ImportError:
+- usepypdf2 = False
+-if not usepypdf2:
+- try:
+- from pyPdf import PdfFileReader, PdfFileWriter
+- except ImportError:
+- _msg = "Please install PyPDF2 (or its predecessor pyPdf) first."\
+- "\n\tOn recent versions of Ubuntu, the following should do the trick:"\
+- "\n\tsudo apt-get install python-pypdf2"\
+- "\n\t(or, if using python3) sudo apt-get install python3-pypdf2"
+- raise RuntimeError(_msg)
+
+ class PdfEncryptedError(Exception):
+ pass
+@@ -55,8 +40,6 @@ def writeToFile(self, filename):
+ stream.close()
+ def addPageCropped(self, pdffile, pagenumber, croplist, rotate=0):
+ pass
+- def copyDocumentRoot(self, pdffile):
+- pass
+
+
+ class PyPdfFile(AbstractPdfFile):
+@@ -64,23 +47,16 @@ class PyPdfFile(AbstractPdfFile):
+ def __init__(self):
+ self.reader = None
+ def loadFromStream(self, stream):
+- if usepypdf2:
+- self.reader = PdfFileReader(stream, strict=False)
+- else:
+- self.reader = PdfFileReader(stream)
+- if self.reader.isEncrypted:
+- try:
+- if not self.reader.decrypt(''):
+- raise PdfEncryptedError
+- except:
+- raise PdfEncryptedError
+- def getPage(self, nr):
+- page = self.reader.getPage(nr-1)
++ self.reader = Pdf.open(stream)
++ if self.reader.is_encrypted:
++ raise PdfEncryptedError
++
+
+ class PyPdfCropper(AbstractPdfCropper):
+ """Implementation of PdfCropper using pyPdf"""
+ def __init__(self):
+- self.output = PdfFileWriter()
++ self.pdf = Pdf.new()
++
+ def writeToStream(self, stream):
+ # For certain large pdf files, PdfFileWriter.write() causes the error:
+ # maximum recursion depth exceeded while calling a Python object
+@@ -88,37 +64,31 @@ def writeToStream(self, stream):
+ # We therefore temporarily increase the recursion limit.
+ old_reclimit = sys.getrecursionlimit()
+ sys.setrecursionlimit(10000)
+- self.output.write(stream)
++ self.pdf.save(stream)
+ sys.setrecursionlimit(old_reclimit)
++
+ def addPageCropped(self, pdffile, pagenumber, croplist, alwaysinclude, rotate=0):
+- page = pdffile.reader.getPage(pagenumber)
++ page = pdffile.reader.pages[pagenumber]
+ if not croplist and alwaysinclude:
+- self.output.addPage(page)
++ self.pdf.pages.append(page)
+ for c in croplist:
+- newpage = copy.copy(page)
+- self.cropPage(newpage, c, rotate)
+- self.output.addPage(newpage)
+- def cropPage(self, page, crop, rotate):
++ new_box = self.getCropPageParm(page, c)
++ # Update the various PDF boxes
++ new_page = copy.copy(page)
++ new_page.mediabox = new_box
++ new_page.cropbox = new_box
++ new_page.trimbox = new_box
++ if rotate != 0:
++ new_page.rotate(rotate, True)
++ self.pdf.pages.append(new_page)
++
++ def getCropPageParm(self, page, crop):
+ # Note that the coordinate system is up-side down compared with Qt.
+- x0, y0 = page.cropBox.lowerLeft
+- x1, y1 = page.cropBox.upperRight
++ x0, y0, x1, y1 = page.cropbox
+ x0, y0, x1, y1 = float(x0), float(y0), float(x1), float(y1)
+ x0, x1 = x0+crop[0]*(x1-x0), x1-crop[2]*(x1-x0)
+ y0, y1 = y0+crop[3]*(y1-y0), y1-crop[1]*(y1-y0)
+- # Update the various PDF boxes
+- for box in (page.artBox, page.bleedBox, page.cropBox, page.mediaBox, page.trimBox):
+- box.lowerLeft = (x0, y0)
+- box.upperRight = (x1, y1)
+- if rotate != 0:
+- page.rotateClockwise(rotate)
+-
+- def copyDocumentRoot(self, pdffile):
+- # Sounds promising in PyPDF2 (see PdfFileWriter.cloneDocumentFromReader),
+- # but doesn't seem to produce a readable PDF:
+- # self.output.cloneReaderDocumentRoot(pdffile.reader)
+- # Instead, this copies at least the named destinations for links:
+- for dest in pdffile.reader.namedDestinations.values():
+- self.output.addNamedDestinationObject(dest)
++ return [x0, y0, x1, y1]
+
+
+ def optimizePdfGhostscript(oldfilename, newfilename):
+@@ -128,4 +98,3 @@ def optimizePdfGhostscript(oldfilename, newfilename):
+
+ PdfFile = PyPdfFile
+ PdfCropper = PyPdfCropper
+-
diff --git a/app-text/krop/krop-0.5.1.ebuild b/app-text/krop/krop-0.5.1.ebuild
deleted file mode 100644
index a4be44a8bdc3..000000000000
--- a/app-text/krop/krop-0.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit eutils distutils-r1 xdg-utils
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
- dev-python/PyPDF2[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP}]"
-
-src_install() {
- distutils-r1_src_install
- domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/app-text/krop/krop-0.6.0-r2.ebuild b/app-text/krop/krop-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..e7d983914683
--- /dev/null
+++ b/app-text/krop/krop-0.6.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{9,10,11} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit desktop distutils-r1 xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
+else
+ SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 ~x86"
+fi
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-links.patch"
+ "${FILESDIR}/${P}-pikepdf.patch"
+)
+
+RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+ dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
+
+src_install() {
+ distutils-r1_src_install
+ domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/app-text/krop/krop-0.6.0-r3.ebuild b/app-text/krop/krop-0.6.0-r3.ebuild
new file mode 100644
index 000000000000..21c3bf034087
--- /dev/null
+++ b/app-text/krop/krop-0.6.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit desktop distutils-r1 xdg
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
+else
+ SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+LICENSE="GPL-3+"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${P}-links.patch"
+ "${FILESDIR}/${P}-pikepdf.patch"
+)
+
+RDEPEND="
+ dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+ dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+"
+
+src_install() {
+ distutils-r1_src_install
+ domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
deleted file mode 100644
index bd6bb00454f4..000000000000
--- a/app-text/krop/krop-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
-else
- SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
- dev-python/PyPDF2[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP}]"
-
-src_install() {
- distutils-r1_src_install
- domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/app-text/krop/metadata.xml b/app-text/krop/metadata.xml
index 49bbc63e4ae6..0581997322f1 100644
--- a/app-text/krop/metadata.xml
+++ b/app-text/krop/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
@@ -8,4 +8,7 @@
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
+<upstream>
+ <remote-id type="github">arminstraub/krop</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
deleted file mode 100644
index 2422ee0fb088..000000000000
--- a/app-text/landslide/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
deleted file mode 100644
index df5e16ccb516..000000000000
--- a/app-text/landslide/landslide-1.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Generates a slideshow using the slides that power the html5-slides presentation"
-HOMEPAGE="https://github.com/adamzap/landslide"
-SRC_URI="https://github.com/adamzap/landslide/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- "
-
-python_install_all() {
- use examples && EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/app-text/landslide/metadata.xml b/app-text/landslide/metadata.xml
deleted file mode 100644
index 3304ab920105..000000000000
--- a/app-text/landslide/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>naota@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">adamzap/landslide</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 3a4f4ed94a7e..56717604ad5c 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,2 +1 @@
-DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
-DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
+DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
diff --git a/app-text/languagetool/files/languagetool.initd b/app-text/languagetool/files/languagetool.initd
new file mode 100644
index 000000000000..79568f20051a
--- /dev/null
+++ b/app-text/languagetool/files/languagetool.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ after modules
+}
+
+start() {
+ ebegin "Starting languagetool [server]"
+ start-stop-daemon --start --background --exec /bin/bash -- /usr/bin/languagetool-server \
+ --config "/etc/languagetool.cfg" --allow-origin "*" --port 8081
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping languagetool [server]"
+ start-stop-daemon --stop --exec /bin/bash -- /usr/bin/languagetool-server
+ eend $?
+}
diff --git a/app-text/languagetool/languagetool-4.5.ebuild b/app-text/languagetool/languagetool-4.5.ebuild
deleted file mode 100644
index c50594e3392d..000000000000
--- a/app-text/languagetool/languagetool-4.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
- dev-java/commons-cli:1
- dev-java/commons-collections:4
- dev-java/commons-io:1
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/guava:20
- dev-java/hamcrest-core:1.3
- dev-java/jcommander:0
- dev-java/jna:4
- dev-java/slf4j-api:0
- dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
- ${CP_DEPEND}"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
- rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
- # Loads of bundled stuff :(
- #java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
- java-pkg_dojar *.jar libs/*.jar
-
- local DIR=/usr/share/${PN}/lib/language-modules
- java-pkg_addcp "${EPREFIX}${DIR}"
- insinto ${DIR}
- doins -r org META-INF
-
- java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
- java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-
- dodoc CHANGES.md README.md
-
- unset MY_DEPEND
- java-pkg_gen-cp MY_DEPEND
- java-pkg_register-dependency "${MY_DEPEND}"
-}
diff --git a/app-text/languagetool/languagetool-4.6.ebuild b/app-text/languagetool/languagetool-4.6.ebuild
deleted file mode 100644
index 1e732211206c..000000000000
--- a/app-text/languagetool/languagetool-4.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2 desktop xdg-utils
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
- dev-java/commons-cli:1
- dev-java/commons-collections:4
- dev-java/commons-io:1
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/guava:20
- dev-java/hamcrest-core:1.3
- dev-java/jcommander:0
- dev-java/jna:4
- dev-java/slf4j-api:0
- dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
- ${CP_DEPEND}"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
- rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
- # Loads of bundled stuff :(
- #java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
- java-pkg_dojar *.jar libs/*.jar
-
- local DIR=/usr/share/${PN}/lib/language-modules
- java-pkg_addcp "${EPREFIX}${DIR}"
- insinto ${DIR}
- doins -r org META-INF
-
- java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
- java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
- java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer
- newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
- domenu "${FILESDIR}"/${PN}.desktop
-
- dodoc CHANGES.md README.md
-
- unset MY_DEPEND
- java-pkg_gen-cp MY_DEPEND
- java-pkg_register-dependency "${MY_DEPEND}"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-text/languagetool/languagetool-5.4-r2.ebuild b/app-text/languagetool/languagetool-5.4-r2.ebuild
new file mode 100644
index 000000000000..d7a7b86d7aef
--- /dev/null
+++ b/app-text/languagetool/languagetool-5.4-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit java-pkg-2 desktop xdg-utils
+
+MY_PN=LanguageTool
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A proof-reading tool for many languages"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CP_DEPEND="
+ dev-java/commons-cli:1
+ dev-java/commons-collections:4
+ dev-java/commons-io:1
+ dev-java/commons-lang:3.6
+ dev-java/commons-logging:0
+ dev-java/hamcrest-core:1.3
+ dev-java/jcommander:0
+ dev-java/jna:4
+ dev-java/slf4j-api:0
+"
+
+RDEPEND="
+ >=virtual/jre-1.8
+ ${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+ rm libs/commons-{cli,collections4,io,lang3,logging}.jar || die
+ rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die
+
+ # Loads of bundled stuff :(
+ #java-pkg-2_src_prepare
+}
+
+src_compile() { :; }
+
+src_install() {
+ java-pkg_dojar *.jar libs/*.jar
+
+ local DIR=/usr/share/${PN}/lib/language-modules
+ java-pkg_addcp "${EPREFIX}${DIR}"
+ insinto ${DIR}
+ doins -r org META-INF
+
+ java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
+ java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
+ java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer --config /etc/languagetool.cfg
+ newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
+ domenu "${FILESDIR}"/${PN}.desktop
+ newinitd "${FILESDIR}/languagetool.initd" languagetool
+
+ dodoc CHANGES.md README.md
+
+ unset MY_DEPEND
+ java-pkg_gen-cp MY_DEPEND
+ java-pkg_register-dependency "${MY_DEPEND}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-text/languagetool/metadata.xml b/app-text/languagetool/metadata.xml
index 84f8f1cf6bcb..2e4c5182444f 100644
--- a/app-text/languagetool/metadata.xml
+++ b/app-text/languagetool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index c6e5dc8d88d7..dc0ce03ce646 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,2 +1,2 @@
-DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
-DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
+DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
+DIST lcdf-typetools-2.110.tar.gz 674355 BLAKE2B 17bd88039648285d7010cd3e2d20aa0192c3dfb9343ebb60e988ae50c8cd22d7690d538760e3e503ed8cfa30218b048b317e8f5c01e7f7adc74ed9140a557fb4 SHA512 691c2a6c7aadace4741ad8d991575ea81fa56f243cf8eb37a8639dfced06daf565c82a1601f0d7e4490f868179ce7a83551000395fa17da214b7eb1344738c0c
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
deleted file mode 100644
index 7b13fdda8e33..000000000000
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- econf $(use_with kpathsea)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc NEWS.md README.md ONEWS
-}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
deleted file mode 100644
index d538c2e96354..000000000000
--- a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- econf $(use_with kpathsea)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc NEWS.md README.md ONEWS
-}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
new file mode 100644
index 000000000000..85540689e1c1
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Font utilities for eg manipulating OTF"
+HOMEPAGE="
+ https://lcdf.org/type/#typetools
+ https://github.com/kohler/lcdf-typetools
+"
+SRC_URI="https://lcdf.org/type/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+kpathsea"
+
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ # gcc ICE with LTO: https://gcc.gnu.org/PR100010
+ filter-flags -fdevirtualize-at-ltrans
+
+ use kpathsea && has_version 'dev-libs/kpathsea' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+ econf $(use_with kpathsea)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc NEWS.md README.md ONEWS
+}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild
new file mode 100644
index 000000000000..18ff420fc49b
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.110.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Font utilities for eg manipulating OTF"
+HOMEPAGE="
+ https://lcdf.org/type/#typetools
+ https://github.com/kohler/lcdf-typetools
+"
+SRC_URI="https://lcdf.org/type/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+kpathsea"
+
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( NEWS.md README.md ONEWS )
+
+src_configure() {
+ # gcc ICE with LTO: https://gcc.gnu.org/PR100010
+ filter-flags -fdevirtualize-at-ltrans
+
+ if use kpathsea; then
+ has_version 'dev-libs/kpathsea' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+ fi
+ econf $(use_with kpathsea)
+}
diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
index 37d6794d875f..6fe6129930ca 100644
--- a/app-text/lcdf-typetools/metadata.xml
+++ b/app-text/lcdf-typetools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
@@ -9,6 +9,9 @@
<email>fonts@gentoo.org</email>
<name>Fonts</name>
</maintainer>
+<upstream>
+ <remote-id type="github">kohler/lcdf-typetools</remote-id>
+</upstream>
<longdescription lang="en">
The LCDF Typetools package contains several programs for manipulating
PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index b755f2674718..2deb7f2d7be7 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,2 +1,2 @@
-DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
-DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
+DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f
+DIST lesspipe-2.12.tar.gz 171915 BLAKE2B b1181cc5ca6ec8ca918bff31def6d6fde5f6bcfde9d48e0a23a088ee9ff178e3e9ff330b1c27a3d74b63d227c94292141414bec8c25d0035f9fec01c6760b8b9 SHA512 9c6945b0f5a5672e3b9b0035ebc63ab3197c1b3d1dfc3d4a2280c1f11421d98ccc5c016273a308a96f61a47f4da6d6658502534284fff81fd75365a4ba91c27e
diff --git a/app-text/lesspipe/files/all-completions.patch b/app-text/lesspipe/files/all-completions.patch
new file mode 100644
index 000000000000..dfd8ed90dd34
--- /dev/null
+++ b/app-text/lesspipe/files/all-completions.patch
@@ -0,0 +1,51 @@
+From 621e2897c19155df8d0a5931a0c862bfdac22a0a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Wed, 17 Jan 2024 22:08:29 -0500
+Subject: [PATCH] add configure option to always install all completions
+
+This is useful for distro packaging. Many distros have a policy that
+shell completions shall always be installed, even if the shell they are
+for is not installed at the time.
+
+This is useful because buildbot chroots often don't have additional
+shells installed, so users will *never* get zsh completions.
+---
+ configure | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 68d03a1..d521962 100755
+--- a/configure
++++ b/configure
+@@ -10,10 +10,10 @@ use Getopt::Long;
+ # find sxw2txt and other scripts in current dir, if scripts not installed yet
+ $ENV{PATH} .= ':.';
+
+-use vars qw($opt_help $opt_prefix $opt_nomake $opt_shell);
++use vars qw($opt_help $opt_prefix $opt_nomake $opt_shell $opt_all_completions);
+
+ Getopt::Long::Configure("prefix_pattern=--");
+-my $result = GetOptions('help+', 'prefix=s', 'shell=s', 'nomake+');
++my $result = GetOptions('help+', 'prefix=s', 'shell=s', 'nomake+', 'all-completions+');
+ if ( $ARGV[0] or ! $result or $opt_help) {
+ print << 'EOF';
+ Usage: configure [options]
+@@ -21,6 +21,7 @@ Options:
+ --help print this message
+ --shell=<filename> specify an alternative shell path (zsh/bash) to use
+ --nomake do not generate a Makefile
++ --all-completions always install all completions
+ Directory and file names:
+ --prefix=PREFIX install lesspipe.sh in PREFIX/bin (/usr/local)
+
+@@ -47,8 +48,8 @@ if ( $opt_shell and -f $opt_shell and $opt_shell =~ /^\// ) {
+ my @bad = ();
+ my $shell = check_shell_vers();
+ if ( ! $opt_nomake ) {
+- my $no_bash = grep {/bash/} @bad;
+- my $no_zsh = grep {/zsh/} @bad;
++ my $no_bash = (grep {/bash/} @bad and ! $opt_all_completions);
++ my $no_zsh = (grep {/zsh/} @bad and ! $opt_all_completions);
+ open OUT, ">Makefile";
+ while (<DATA>) {
+ next if /bash_complete_dir/ and $no_bash;
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
deleted file mode 100644
index 0eefc64e5ed0..000000000000
--- a/app-text/lesspipe/lesspipe-1.83-r1.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"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build.
- :
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
deleted file mode 100644
index e879930b2086..000000000000
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build.
- :
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- dodoc ChangeLog README TODO
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
deleted file mode 100644
index 4ecd47310905..000000000000
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build.
- :
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.11-r1.ebuild b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
new file mode 100644
index 000000000000..975d91af0d67
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+DESCRIPTION="Preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+# Please check again on bumps! (bug #734896)
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="dev-lang/perl"
+BDEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ test? ( app-editors/vim )
+"
+
+PATCHES=(
+ # Backport patch to allow installing completions for shells that aren't
+ # yet installed.
+ #
+ # https://github.com/wofr06/lesspipe/pull/142
+ "${FILESDIR}"/all-completions.patch
+)
+
+src_configure() {
+ # Not an autoconf script.
+ #
+ # PG0301
+ # By default, only completions for installed shells are installed.
+ # Unconditionally install zsh too.
+ edo ./configure --prefix="${EPREFIX}"/usr --all-completions
+}
+
+src_compile() {
+ # Nothing to build (avoids the "all" target)
+ :
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+ einstalldocs
+
+ # The upstream Makefile intentionally installs to the wrong directory, then prints:
+ # In bash, please preload the completion, dynamic invocation does not work
+ # . /usr/share/bash-completion/less_completion
+ # Or consider installing the file less_completion in /etc/bashcompletion.d
+ rm "${ED}"/usr/share/bash-completion/less_completion || die
+ insinto /etc/bash_completion.d
+ doins less_completion
+}
+
+pkg_preinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+ elog "The latter is the Gentoo-specific version. Make sure to update your"
+ elog "LESSOPEN environment variable if you wish to use this copy."
+ fi
+}
diff --git a/app-text/lesspipe/lesspipe-2.12.ebuild b/app-text/lesspipe/lesspipe-2.12.ebuild
new file mode 100644
index 000000000000..9e0fa293f993
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo
+
+DESCRIPTION="Preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+# Please check again on bumps! (bug #734896)
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+ dev-lang/perl
+ dev-perl/Text-CSV
+"
+BDEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ test? ( app-editors/vim )
+"
+
+src_configure() {
+ # Not an autoconf script.
+ #
+ # PG0301
+ # By default, only completions for installed shells are installed.
+ # Unconditionally install zsh too.
+ edo ./configure --prefix="${EPREFIX}"/usr --all-completions
+}
+
+src_compile() {
+ # Nothing to build (avoids the "all" target)
+ :
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+ einstalldocs
+
+ # The upstream Makefile intentionally installs to the wrong directory, then prints:
+ # In bash, please preload the completion, dynamic invocation does not work
+ # . /usr/share/bash-completion/less_completion
+ # Or consider installing the file less_completion in /etc/bashcompletion.d
+ rm "${ED}"/usr/share/bash-completion/less_completion || die
+ insinto /etc/bash_completion.d
+ doins less_completion
+}
+
+pkg_preinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+ elog "The latter is the Gentoo-specific version. Make sure to update your"
+ elog "LESSOPEN environment variable if you wish to use this copy."
+ fi
+}
diff --git a/app-text/lesspipe/metadata.xml b/app-text/lesspipe/metadata.xml
index 0ad8b1ed80c7..6d48d5fa839d 100644
--- a/app-text/lesspipe/metadata.xml
+++ b/app-text/lesspipe/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/app-text/letterize/Manifest b/app-text/letterize/Manifest
index 5af3e840fb33..da948413558c 100644
--- a/app-text/letterize/Manifest
+++ b/app-text/letterize/Manifest
@@ -1,2 +1 @@
-DIST letterize-1.3.tar.gz 7772 BLAKE2B 5daabb1de19affb5857c4a64c92b15744b3a8f79a8df127195a843a452868f4c810d83b186e12b09279aaaf99871aa75718d9cb5e90f2cb9ec2e0761b0899623 SHA512 481caa2ecd487e7950faa87e1468887fbc4b3964d02ea86394489834bc6368bad590c54744d08cfa00b34b05ebab094f24a0b84ea91af4ab8e56455c6615bdb8
DIST letterize-1.4.tar.gz 7464 BLAKE2B 2739388697a462884826e4b0ac2f1d48bd12f903cc9cc11302104c3e27f56479b1494609c3dee5671bf5464a034a0e5cf6da7255f2ad265590054111022cd1b7 SHA512 7e57c6ebe8c5a1bfa16e6cf3f1b01f7e27127c32a1ea373a5221d807d5926b7064153c16c0081a83fec64bdb72379fc18540dedb639d7ec3cf318747438e414a
diff --git a/app-text/letterize/files/letterize-1.4-clang16.patch b/app-text/letterize/files/letterize-1.4-clang16.patch
new file mode 100644
index 000000000000..82a1258a60d3
--- /dev/null
+++ b/app-text/letterize/files/letterize-1.4-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/870775
+--- a/letterize.c
++++ b/letterize.c
+@@ -234,3 +234,3 @@
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
diff --git a/app-text/letterize/letterize-1.3.ebuild b/app-text/letterize/letterize-1.3.ebuild
deleted file mode 100644
index 62c2e3ba59b5..000000000000
--- a/app-text/letterize/letterize-1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generate English-plausible alphabetic mnemonics for a phone number"
-HOMEPAGE="http://www.catb.org/~esr/letterize/"
-SRC_URI="http://www.catb.org/~esr/letterize/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
- doman ${PN}.1
- dodoc README
-}
diff --git a/app-text/letterize/letterize-1.4.ebuild b/app-text/letterize/letterize-1.4.ebuild
index ef254475f276..d28a490c6729 100644
--- a/app-text/letterize/letterize-1.4.ebuild
+++ b/app-text/letterize/letterize-1.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs
@@ -12,10 +12,14 @@ SRC_URI="http://www.catb.org/~esr/letterize/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-src_prepare() {
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_configure() {
tc-export CC
+ default
}
src_install() {
diff --git a/app-text/letterize/metadata.xml b/app-text/letterize/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/letterize/metadata.xml
+++ b/app-text/letterize/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index 907099d0d309..ad0a14117aa3 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1 +1 @@
-DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
+DIST libabw-0.1.3.tar.xz 318808 BLAKE2B 234ff797bf3798bc7f14f2b3f0d0cc2d80eda2a6ba2d656288c26e58d53b9798003d7f45ad7c9a0f504da36c8c8ba367f8fe5b565a85fbc6a1f1627d89e7e353 SHA512 0d2646e1bad1e11b3da43714ac5931fc67ffdbc4e7a25a44ef5b6e6a41de1e0ae14596b4a87cceb07bf56dbbe9344622b3d60afcb054ee0ab8577ca8e9b5c289
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
deleted file mode 100644
index 55a551b2fc4f..000000000000
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing abiword documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
- dev-libs/librevenge
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.46
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # bug 619470
- append-cxxflags -std=c++14
-
- econf \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
new file mode 100644
index 000000000000..a7f464e8e4d7
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="doc static-libs"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+RDEPEND="
+ dev-libs/librevenge
+ dev-libs/libxml2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ dev-build/libtool
+"
+
+src_configure() {
+ # bug 619470
+ append-cxxflags -std=c++14
+
+ local myeconfargs=(
+ $(use_with doc docs)
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libabw/metadata.xml b/app-text/libabw/metadata.xml
index 13ce236ee519..f632b40c7d8a 100644
--- a/app-text/libabw/metadata.xml
+++ b/app-text/libabw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index b9dc46f930d0..105c5030daaf 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,2 +1 @@
-DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
-DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
+DIST libe-book-0.1.3.tar.xz 416268 BLAKE2B 569bb68603bec5635a7ecdc8312f759816aff3d8e45e0ea9a14dc8c291ebb4dfd8ed430994d255e6be95a6ef4407f459c8d9c3d3945d4fd63841e0401f1c70a2 SHA512 56dfa93816b8a1b7e223bda517ff81547fd7b311c3fe2bea64b12c4290642d4b9ed3778df06c4ee7a65f2b9db57702c00c32aec819efb7820115165af3d5ebdc
diff --git a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
deleted file mode 100644
index 9869b308c73c..000000000000
--- a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -64,6 +64,7 @@
- libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_SOURCES = \
- EBOOKDocument.cpp
-
-+libe_book_internal_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
- libe_book_internal_la_SOURCES = \
- EBOOKBitStream.cpp \
- EBOOKBitStream.h \
diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
deleted file mode 100644
index 624051a757aa..000000000000
--- a/app-text/libebook/files/libebook-0.1.2-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001
-From: eroen <eroen@occam.eroen.eu>
-Date: Mon, 19 Dec 2016 19:53:15 +0100
-Subject: [PATCH] Check for librevenge-stream if tests are enabled
-
-X-Gentoo-Bug: 603098
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6e00ed5..ecbd14b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[
- PKG_CHECK_MODULES([REVENGE_GENERATORS],[
- librevenge-generators-0.0
- ])
-+])
-+AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[
- PKG_CHECK_MODULES([REVENGE_STREAM],[
- librevenge-stream-0.0
- ])
---
-2.11.0
-
diff --git a/app-text/libebook/files/libebook-0.1.3-icu-68.patch b/app-text/libebook/files/libebook-0.1.3-icu-68.patch
new file mode 100644
index 000000000000..964b8b7e195d
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.3-icu-68.patch
@@ -0,0 +1,27 @@
+From 9ea3b4c2552770b66b83d44b6e6ccdd338296316 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 10:52:10 +0100
+Subject: [PATCH] Fix build with icu-68.0
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/lib/EBOOKCharsetConverter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp
+index 0d85fa3..c9f8be0 100644
+--- a/src/lib/EBOOKCharsetConverter.cpp
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *const in, const unsigned le
+ m_converterToUTF8.get(), m_converterToUnicode.get(),
+ &outText, outText + out.size(), &inText, inText + length,
+ nullptr, nullptr, nullptr, nullptr,
+- TRUE, TRUE, &status)
++ true, true, &status)
+ ;
+ if (status==U_BUFFER_OVERFLOW_ERROR)
+ {
+--
+2.29.2
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
deleted file mode 100644
index e91c7a75c406..000000000000
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="libe-book"
-MY_P="${MY_PN}-${PV}"
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing various ebook formats"
-HOMEPAGE="https://www.sourceforge.net/projects/libebook/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="doc test tools"
-
-RDEPEND="
- dev-libs/icu:=
- dev-libs/librevenge
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- dev-util/gperf
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${P}-boost-1.59-makefile.patch"
- "${FILESDIR}/${P}-tests.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # bug 618854
- append-cxxflags -std=c++14
-
- econf \
- --disable-static \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable test tests) \
- $(use_with tools)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libebook/libebook-0.1.3-r3.ebuild b/app-text/libebook/libebook-0.1.3-r3.ebuild
new file mode 100644
index 000000000000..b1c6b846d593
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.3-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="libe-book-${PV}"
+inherit autotools
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="https://sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="doc test tools"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-text/liblangtag
+ dev-libs/icu:=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ dev-util/gperf
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${P}-icu-68.patch" )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-werror
+ $(use_with doc docs)
+ $(use_enable test tests)
+ $(use_with tools)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
deleted file mode 100644
index 37b315119bd4..000000000000
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="libe-book"
-MY_P="${MY_PN}-${PV}"
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing various ebook formats"
-HOMEPAGE="https://www.sourceforge.net/projects/libebook/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc test tools"
-
-RDEPEND="
- app-text/liblangtag
- dev-libs/icu:=
- dev-libs/librevenge
- dev-libs/libxml2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- dev-util/gperf
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # bug 618854
- append-cxxflags -std=c++14
-
- econf \
- --disable-static \
- --disable-werror \
- $(use_with doc docs) \
- $(use_enable test tests) \
- $(use_with tools)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libebook/metadata.xml b/app-text/libebook/metadata.xml
index 70dbb606d4c5..4353583eba8b 100644
--- a/app-text/libebook/metadata.xml
+++ b/app-text/libebook/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..014a84f1b19e
--- /dev/null
+++ b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="EPUB generator for librevenge"
+HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="debug doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ test? (
+ dev-util/cppunit
+ dev-libs/libxml2:2
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+src_configure() {
+ econf \
+ --disable-weffc \
+ $(use_enable debug) \
+ $(use_with doc docs) \
+ $(use_enable test tests)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
deleted file mode 100644
index da571d0a4452..000000000000
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="EPUB generator for librevenge"
-HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="debug doc test"
-
-RDEPEND="
- dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? (
- dev-util/cppunit
- dev-libs/libxml2:2
- )
-"
-
-src_configure() {
- econf \
- --disable-weffc \
- $(use_enable debug) \
- $(use_with doc docs) \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libepubgen/metadata.xml b/app-text/libepubgen/metadata.xml
index 13ce236ee519..f632b40c7d8a 100644
--- a/app-text/libepubgen/metadata.xml
+++ b/app-text/libepubgen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 00c59b08dfc3..710f9294bb53 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1 +1 @@
-DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
+DIST libetonyek-0.1.10.tar.xz 1494000 BLAKE2B 1c47b410050380d134d96b5551f0c9186c24aa0ea52c801e26655e3013f030e92198d8e3f19e8a341744206eeaad2d10ca130f286fd42c8a9c3b56f773cfa7d5 SHA512 516a14fcb7b7b5898484a4263d593a036ac728b90144da9d1c22a5d0fdffc879839e19a7b390f99d924c390d433e64433fb08939b1e04ca24359315571c5772b
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild
new file mode 100644
index 000000000000..4cad77ca17f5
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.10-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-text/liblangtag
+ dev-libs/librevenge
+ dev-libs/libxml2
+ >=dev-util/mdds-2.0:1=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ media-libs/glm
+ dev-build/libtool
+ test? ( dev-util/cppunit )
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+ default
+ [[ -d m4 ]] || mkdir "m4"
+ [[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-werror
+ $(use_with doc docs)
+ $(use_enable static-libs static)
+ $(use_enable test tests)
+ )
+ if has_version ">=dev-util/mdds-2.1"; then
+ myeconfargs+=( --with-mdds=2.1 )
+ else
+ myeconfargs+=( --with-mdds=2.0 )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.9.ebuild b/app-text/libetonyek/libetonyek-0.1.9.ebuild
deleted file mode 100644
index bd8b3c336f21..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
- inherit autotools git-r3
-else
- SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="doc static-libs test"
-
-RDEPEND="
- app-text/liblangtag
- dev-libs/librevenge
- dev-libs/libxml2
- >=dev-util/mdds-1.3.1:1=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- media-libs/glm
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-werror
- $(use_with doc docs)
- $(use_enable static-libs static)
- $(use_enable test tests)
- )
- if has_version ">=dev-util/mdds-1.4"; then
- myeconfargs+=( --with-mdds=1.4 )
- else
- myeconfargs+=( --with-mdds=1.2 )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index a59ca6e00967..874395b30224 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,61 +1,62 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-if [[ ${PV} = 9999 ]]; then
+MDDS_VER="3.0"
+
+if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
inherit autotools git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
+
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
SLOT="0"
IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
RDEPEND="
app-text/liblangtag
dev-libs/librevenge
dev-libs/libxml2
- >=dev-util/mdds-1.3.1:1=
+ dev-util/mdds:1/${MDDS_VER}
sys-libs/zlib
"
DEPEND="${RDEPEND}
dev-libs/boost
media-libs/glm
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ dev-build/libtool
test? ( dev-util/cppunit )
"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
+ [[ ${PV} == *9999* ]] && eautoreconf
}
src_configure() {
local myeconfargs=(
--disable-werror
+ --with-mdds="${MDDS_VER}"
$(use_with doc docs)
$(use_enable static-libs static)
$(use_enable test tests)
)
- if has_version ">=dev-util/mdds-1.4"; then
- myeconfargs+=( --with-mdds=1.4 )
- else
- myeconfargs+=( --with-mdds=1.2 )
- fi
-
econf "${myeconfargs[@]}"
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
index 13ce236ee519..f632b40c7d8a 100644
--- a/app-text/libetonyek/metadata.xml
+++ b/app-text/libetonyek/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 6d45082a4aff..16f844a8ca24 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1 +1 @@
-DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
+DIST libexttextcat-3.4.7.tar.xz 1122804 BLAKE2B 45d4fab17d66ede2a32cf65a8ee79c85ccb9993b1b5a5260f77a468c67478a28a9a45bf5fc9c5e6f6eb9f21407dff861d08649c6398373f00b036dd49f9cd4ee SHA512 ccd95061419aedd651c3b899fade6d3cc8ebf87ddfea622edecacd810798de8257829255e3cb3325fa2a0b9f54bc20d4e24b6596ae37891ed3fbe7c0425ff864
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
deleted file mode 100644
index 345828583432..000000000000
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library implementing N-gram-based text categorization"
-HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
-SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libexttextcat/libexttextcat-3.4.7.ebuild b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
new file mode 100644
index 000000000000..4a99457d295e
--- /dev/null
+++ b/app-text/libexttextcat/libexttextcat-3.4.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library implementing N-gram-based text categorization"
+HOMEPAGE="https://wiki.documentfoundation.org/Libexttextcat"
+SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+
+src_configure() {
+ econf \
+ --disable-werror
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/libexttextcat/metadata.xml b/app-text/libexttextcat/metadata.xml
index 13ce236ee519..f632b40c7d8a 100644
--- a/app-text/libexttextcat/metadata.xml
+++ b/app-text/libexttextcat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index beb1de92287b..e5454b6256c0 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1 +1 @@
-DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
+DIST libgepub-0.7.1.tar.xz 28576 BLAKE2B a65ecdd13bfcc96fbf0e1998d24cc565f0bd60213f278fdf592dcdf1ad6a1b40c9c10e3ffc3fe9ac500d92f5471619432badd746dfc57538e96a2b6a138b0a26 SHA512 9a9c56cffab485b78f0fdf115e655c4f395ee6e3f00b203fee5dfbb2054aa58540ca1fe8dc9dd82460ae3b39e89471e128086be10e77b247d0ce7b195bfbe8e3
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
deleted file mode 100644
index 9685b374db7e..000000000000
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="GObject based library for handling and rendering epub documents"
-HOMEPAGE="https://git.gnome.org/browse/libgepub"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection"
-
-RDEPEND="
- app-arch/libarchive
- dev-libs/glib:2
- dev-libs/libxml2
- net-libs/libsoup:2.4
- net-libs/webkit-gtk:4
- x11-libs/gtk+:3
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_configure() {
- meson_src_configure \
- $(meson_use introspection)
-}
diff --git a/app-text/libgepub/libgepub-0.7.1.ebuild b/app-text/libgepub/libgepub-0.7.1.ebuild
new file mode 100644
index 000000000000..b11faee98b41
--- /dev/null
+++ b/app-text/libgepub/libgepub-0.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="GObject based library for handling and rendering epub documents"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+IUSE="+introspection webkit"
+
+RDEPEND="
+ net-libs/libsoup:3.0
+ dev-libs/glib:2
+ dev-libs/libxml2
+ app-arch/libarchive:=
+ webkit? ( >=net-libs/webkit-gtk-2.38.0:4.1[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ # Tests are not executed by `meson test` and they require GTK+3
+ sed -i -e "/subdir('tests')/d" meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use introspection)
+ $(meson_use webkit widget)
+ )
+ meson_src_configure
+}
diff --git a/app-text/libgepub/metadata.xml b/app-text/libgepub/metadata.xml
index 4cbddcaa19ad..e45303093deb 100644
--- a/app-text/libgepub/metadata.xml
+++ b/app-text/libgepub/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <use>
+ <flag name="webkit">Build with GepubWidget based on Webkit</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/libgepub</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 500f78e73eca..bd5ab04d1740 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,2 +1 @@
-DIST libgxps-0.3.0.tar.xz 93000 BLAKE2B 8e04ae281aa8ee637d597265992a5bf6df3592b7d251d657dae3833c8cca848f7142f926964d96586f50ce9987dee94841be15554a733816a3b4f0acef282f12 SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013
-DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
+DIST libgxps-0.3.2.tar.xz 79956 BLAKE2B 4e41361a90fe24816aff33e90dc1084d0c1c799a4c9368364e73d9a5df34a45be75bb9906ee272cd1956b3631894d4be63070cce57983e2401dc1496f08c3e33 SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9
diff --git a/app-text/libgxps/libgxps-0.3.0.ebuild b/app-text/libgxps/libgxps-0.3.0.ebuild
deleted file mode 100644
index 53b633dea4b7..000000000000
--- a/app-text/libgxps/libgxps-0.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg-utils
-
-DESCRIPTION="Library for handling and rendering XPS documents"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+introspection jpeg lcms tiff"
-
-RDEPEND="
- >=app-arch/libarchive-2.8
- >=dev-libs/glib-2.36:2
- media-libs/freetype:2
- media-libs/libpng:0
- >=x11-libs/cairo-1.10[svg]
- introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- tiff? ( media-libs/tiff:0[zlib] )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/gtk-doc-am
- virtual/pkgconfig
-"
-
-# There is no automatic test suite, only an interactive test application
-RESTRICT="test"
-
-src_configure() {
- local emesonargs=(
- -Denable-test=false
- -Denable-gtk-doc=false
- -Denable-man=true
- -Ddisable-introspection=$(usex introspection false true)
- -Dwith-liblcms2=$(usex lcms true false)
- -Dwith-libjpeg=$(usex jpeg true false)
- -Dwith-libtiff=$(usex tiff true false)
- )
-
- xdg_environment_reset
- meson_src_configure
-}
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
deleted file mode 100644
index b83d66060673..000000000000
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg-utils
-
-DESCRIPTION="Library for handling and rendering XPS documents"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="gtk-doc +introspection jpeg lcms tiff"
-
-RDEPEND="
- >=app-arch/libarchive-2.8
- >=dev-libs/glib-2.36:2
- media-libs/freetype:2
- media-libs/libpng:0
- >=x11-libs/cairo-1.10[svg]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- tiff? ( media-libs/tiff:0[zlib] )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- gtk-doc? ( dev-util/gtk-doc )
- virtual/pkgconfig
-"
-
-# There is no automatic test suite, only an interactive test application
-RESTRICT="test"
-
-src_configure() {
- local emesonargs=(
- -Denable-test=false
- $(meson_use gtk-doc enable-gtk-doc)
- -Denable-man=true
- -Ddisable-introspection=$(usex introspection false true)
- $(meson_use lcms with-liblcms2)
- $(meson_use jpeg with-libjpeg)
- $(meson_use tiff with-libtiff)
- )
-
- xdg_environment_reset
- meson_src_configure
-}
diff --git a/app-text/libgxps/libgxps-0.3.2-r3.ebuild b/app-text/libgxps/libgxps-0.3.2-r3.ebuild
new file mode 100644
index 000000000000..f8d91b750c47
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.3.2-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg-utils
+
+DESCRIPTION="Library for handling and rendering XPS documents"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+IUSE="gtk-doc +introspection jpeg lcms tiff"
+
+RDEPEND="
+ >=app-arch/libarchive-2.8
+ >=dev-libs/glib-2.36:2
+ media-libs/freetype:2
+ media-libs/libpng:0
+ >=x11-libs/cairo-1.10[svg(+)]
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lcms? ( media-libs/lcms:2 )
+ tiff? ( media-libs/tiff:=[zlib] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ gtk-doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig
+"
+
+# There is no automatic test suite, only an interactive test application
+RESTRICT="test"
+
+src_configure() {
+ local emesonargs=(
+ -Denable-test=false
+ $(meson_use gtk-doc enable-gtk-doc)
+ -Denable-man=true
+ -Ddisable-introspection=$(usex introspection false true)
+ $(meson_use lcms with-liblcms2)
+ $(meson_use jpeg with-libjpeg)
+ $(meson_use tiff with-libtiff)
+ )
+
+ xdg_environment_reset
+ meson_src_configure
+}
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
index 39980802b1da..d3a4eae54712 100644
--- a/app-text/libgxps/metadata.xml
+++ b/app-text/libgxps/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/libgxps</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 31edb96d0f2a..0d9dc5a7892a 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1 +1 @@
-DIST liblangtag-0.6.2.tar.bz2 766080 BLAKE2B e19599cb6445e40d21d4aec394ab3bcfe447badf096e8efd6e13caa48ce5cec832cb853f4924ce0204a747949506b49b05c175c2726fa3904424cc25b8dc9869 SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f
+DIST liblangtag-0.6.7.tar.bz2 757041 BLAKE2B 456fe453624dbdeb5a1cad621b4f1a28a9f8b3bc4b33a89efb22dfc006d36f8b634db4b085cac665d517c5bf56d750c81d0d201679480f1a0c180f0ab1dc3c49 SHA512 3628728f46865507d8794c1e7286c6ca04fc49f905594ab76db7bd2c8d8f9fac1e33693314d56bca6fdd8f99b8d207e6e6d2f751474832ceb60a4cdbf10fed68
diff --git a/app-text/liblangtag/liblangtag-0.6.2.ebuild b/app-text/liblangtag/liblangtag-0.6.2.ebuild
deleted file mode 100644
index 3c6be86ce448..000000000000
--- a/app-text/liblangtag/liblangtag-0.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils xdg-utils
-
-DESCRIPTION="An interface library to access tags for identifying languages"
-HOMEPAGE="https://tagoh.bitbucket.org/liblangtag/"
-SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-3 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="debug doc introspection static-libs test"
-
-RDEPEND="
- dev-libs/libxml2
- introspection? ( dev-libs/gobject-introspection )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection-common )
- test? ( dev-libs/check )
-"
-
-# Upstream expect liblangtag to be installed when one runs tests...
-RESTRICT="test"
-
-src_prepare() {
- default
- xdg_environment_reset
- if [[ -d docs/html ]]; then
- rm -r docs/html || die "Failed to remove existing gtk-doc"
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable doc gtk-doc) \
- $(use_enable introspection) \
- $(use_enable static-libs static) \
- $(use_enable test)
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/app-text/liblangtag/liblangtag-0.6.7.ebuild b/app-text/liblangtag/liblangtag-0.6.7.ebuild
new file mode 100644
index 000000000000..7d8e6ddb24f1
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.6.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Interface library to access tags for identifying languages"
+HOMEPAGE="https://bitbucket.org/tagoh/liblangtag/wiki/Home"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+IUSE="debug doc introspection test"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libxml2
+ introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+"
+BDEPEND="
+ sys-devel/gettext
+ dev-build/libtool
+ doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection-common )
+"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ if [[ -d docs/html ]]; then
+ rm -r docs/html || die "Failed to remove existing gtk-doc"
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable doc gtk-doc)
+ $(use_enable introspection)
+ $(use_enable test)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index eb7dc90a5e65..4ec4bf37c824 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libmspub/files/libmspub-0.1.4-gcc10.patch b/app-text/libmspub/files/libmspub-0.1.4-gcc10.patch
new file mode 100644
index 000000000000..5e5d60e2b097
--- /dev/null
+++ b/app-text/libmspub/files/libmspub-0.1.4-gcc10.patch
@@ -0,0 +1,27 @@
+From 698bed839c9129fa7a90ca1b5a33bf777bc028d1 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 11 Jun 2019 12:15:28 +0200
+Subject: missing include
+
+Change-Id: I3c5c085f55223688cdc7b972f7c7981411881263
+Reviewed-on: https://gerrit.libreoffice.org/73814
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+Tested-by: Michael Stahl <Michael.Stahl@cib.de>
+---
+ src/lib/MSPUBMetaData.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
+index 9167f4f..27bdd4f 100644
+--- a/src/lib/MSPUBMetaData.h
++++ b/src/lib/MSPUBMetaData.h
+@@ -13,6 +13,7 @@
+ #include <map>
+ #include <utility>
+ #include <vector>
++#include <stdint.h>
+
+ #include <librevenge/librevenge.h>
+
+--
+cgit v1.2.1
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 536dfc3cfcd7..dfb60ca4296b 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit flag-o-matic
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools flag-o-matic
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
+fi
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-
IUSE="doc static-libs"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
@@ -28,28 +30,32 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ dev-build/libtool
"
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
+
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
+
+ # Needed for Clang: stale libtool. bug #832764
+ eautoreconf
}
src_configure() {
# bug 619044
append-cxxflags -std=c++14
- econf \
- --disable-werror \
- $(use_with doc docs) \
+ local myeconfargs=(
+ --disable-werror
+ $(use_with doc docs)
$(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index c627cd0bee6f..81c8ae0ea3ec 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit flag-o-matic
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools flag-o-matic
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+ inherit git-r3
+else
+ SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
+fi
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
IUSE="doc static-libs"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
@@ -28,28 +30,30 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ dev-build/libtool
"
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
+
+ # Needed for Clang: stale libtool. bug #832764
+ eautoreconf
}
src_configure() {
# bug 619044
append-cxxflags -std=c++14
- econf \
- --disable-werror \
- $(use_with doc docs) \
+ local myeconfargs=(
+ --disable-werror
+ $(use_with doc docs)
$(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/libmspub/metadata.xml b/app-text/libmspub/metadata.xml
index 13ce236ee519..f632b40c7d8a 100644
--- a/app-text/libmspub/metadata.xml
+++ b/app-text/libmspub/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index c569172748d7..e0a19edb5676 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1 +1 @@
-DIST libmwaw-0.3.15.tar.xz 1289744 BLAKE2B 9aed923542e795904761e4969299785906aa65c735541788d91eb41e80420ac6c6df4df5e0cfa156c71d4e100c601e5e984de10c6a5f66eebe6ffb5f0374cc1d SHA512 0b2443fc6bc9da9247f7585743424df440f89317af989018d8b972864bf91e3c5cd78c39094a45d9de8114906b2b2a93f68ddb967af8565e4b499f643d86e682
+DIST libmwaw-0.3.22.tar.xz 1476620 BLAKE2B 8133dbd06fdde5caabe9284fd0535e97335385a96ceea4ea9bc1d6f2a28f14f22f6943d71ee6631cb8d67c8791b56ed3d928bb18c723c7aec0b8cf7faf8427d7 SHA512 8682e7006430764cb825cd0bf4822ff42ea3035606e13a804afb9fa3c6dc583f34ae24cea226c1d31eae95224525289801c0afa3853adc6ab396bb9df34a60b4
diff --git a/app-text/libmwaw/libmwaw-0.3.15.ebuild b/app-text/libmwaw/libmwaw-0.3.15.ebuild
deleted file mode 100644
index e32ab9325291..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
- inherit autotools git-r3
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc static-libs tools"
-
-BDEPEND="
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-DEPEND="
- dev-libs/librevenge
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- # zip is hard enabled as the zlib is dep on the rdeps anyway
- local myeconfargs=(
- --enable-zip
- --disable-werror
- $(use_with doc docs)
- $(use_enable static-libs static)
- $(use_enable tools)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libmwaw/libmwaw-0.3.22.ebuild b/app-text/libmwaw/libmwaw-0.3.22.ebuild
new file mode 100644
index 000000000000..85950b4859c4
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.22.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
+ inherit git-r3
+else
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc tools"
+
+DEPEND="
+ dev-libs/librevenge
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-build/libtool
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+ default
+
+ # Refresh stale libtool, bug #814512
+ eautoreconf
+}
+
+src_configure() {
+ # zip is hard enabled as the zlib is dep on the rdeps anyway
+ local myeconfargs=(
+ --enable-zip
+ --disable-werror
+ $(use_with doc docs)
+ $(use_enable tools)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index cc207bd575ba..281ce4247464 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-if [[ ${PV} = 9999 ]]; then
+inherit autotools
+
+if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
- inherit autotools git-r3
+ inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
@@ -16,22 +18,24 @@ HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="doc static-libs tools"
+IUSE="doc tools"
-BDEPEND="
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
DEPEND="
dev-libs/librevenge
sys-libs/zlib
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-build/libtool
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
src_prepare() {
default
- [[ ${PV} == 9999 ]] && eautoreconf
+
+ # Refresh stale libtool, bug #814512
+ eautoreconf
}
src_configure() {
@@ -40,7 +44,6 @@ src_configure() {
--enable-zip
--disable-werror
$(use_with doc docs)
- $(use_enable static-libs static)
$(use_enable tools)
)
econf "${myeconfargs[@]}"
@@ -48,5 +51,5 @@ src_configure() {
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
index 09f5b872fd22..f8fefe6463f0 100644
--- a/app-text/libmwaw/metadata.xml
+++ b/app-text/libmwaw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 451b45940f83..375b0acbf16f 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1 +1 @@
-DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
+DIST libnumbertext-1.0.11.tar.xz 302676 BLAKE2B 48fae62c95c20991c9fe7012a0ad59b5a2ffd88d0866714e88f8d4d72e94f3d6c0edb0977da324a26c83ee1af73367fae88bbf7ad0792be371ad4bfbe63ef8d5 SHA512 0c4d2b98d8cef46a2c51c4265f96ac2af6e58d3b8e63e7b6a40134e86d1dc7bec38e048abf227d1ebad7774ba8a6d68a1fac464739914b2d14786c309819c836
diff --git a/app-text/libnumbertext/libnumbertext-1.0.11.ebuild b/app-text/libnumbertext/libnumbertext-1.0.11.ebuild
new file mode 100644
index 000000000000..7784c1d2d893
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE=""
+
+src_configure() {
+ econf \
+ --disable-werror
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
deleted file mode 100644
index 7dfb49ac5382..000000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_configure() {
- econf \
- --disable-werror
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libnumbertext/metadata.xml b/app-text/libnumbertext/metadata.xml
index 13ce236ee519..f632b40c7d8a 100644
--- a/app-text/libnumbertext/metadata.xml
+++ b/app-text/libnumbertext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 4613e27ad6e6..065f4991de86 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1 +1 @@
-DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
+DIST libodfgen-0.1.8.tar.xz 386156 BLAKE2B 8cc55cd6ad39927ca1fec459cb484362877f0eb0a044d806a93ec573ca2d840fece17fdbb58b0b30869af945fe9ddaa23a88729c1802b2b1321d5551f94a32c5 SHA512 e4a15aa7f1db483cdbb9c531bfb234b4794890cc583c70e8aa3374771be8928e7917105d48dab80d1ab6d57e43fa78415097d9b897cb12fb2a609f4647ee99d6
diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild
deleted file mode 100644
index 7d98bc7374e8..000000000000
--- a/app-text/libodfgen/libodfgen-0.1.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
- inherit autotools git-r3
-else
- SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
-HOMEPAGE="http://libwpd.sourceforge.net/"
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-
-IUSE="doc"
-
-RDEPEND="dev-libs/librevenge"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_with doc docs)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild
new file mode 100644
index 000000000000..d2ddb1a63b84
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit edo
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
+ inherit autotools git-r3
+else
+ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sourceforge.net/"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/librevenge
+ dev-libs/libxml2:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+src_prepare() {
+ default
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with doc docs) \
+ $(use_enable test)
+}
+
+src_test() {
+ cd test || die
+
+ # TODO: send patch upstream to have 'make check' run these
+ while read -r test_name ; do
+ edo "${test_name}"
+ done < <(find . -maxdepth 1 -type f -executable || die)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 03f14c4c7029..66cc56a445b5 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,28 +1,34 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-if [[ ${PV} == 9999 ]]; then
+inherit edo
+
+if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
HOMEPAGE="http://libwpd.sourceforge.net/"
+
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
-IUSE="doc"
-
-RDEPEND="dev-libs/librevenge"
+RDEPEND="
+ dev-libs/librevenge
+ dev-libs/libxml2:2
+"
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ doc? ( app-text/doxygen )
"
src_prepare() {
@@ -33,7 +39,16 @@ src_prepare() {
src_configure() {
econf \
--disable-static \
- $(use_with doc docs)
+ $(use_with doc docs) \
+ $(use_enable test)
+}
+
+src_test() {
+ cd test || die
+
+ while read -r test_name ; do
+ edo "${test_name}"
+ done < <(find . -maxdepth 1 -type f -executable || die)
}
src_install() {
diff --git a/app-text/libodfgen/metadata.xml b/app-text/libodfgen/metadata.xml
index d7faa3c71f7a..0ae8367cec70 100644
--- a/app-text/libodfgen/metadata.xml
+++ b/app-text/libodfgen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 01c33d1cd47f..e8ed3c20daac 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,2 +1,3 @@
-DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
-DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
+DIST libpaper-2.1.2.tar.gz 1264200 BLAKE2B d931c70ea1b26e57ef5cf120189dbf089d7b122ab195b154e6dc100845f63acd051195662d1b019a2f738ebe65047207b39609f4db0e748eaabc3868f3a2ccb0 SHA512 29c5d8074c10f6413b4eaf779153828e59b4b7353e6b380b37ed6cac04a92dc367da775a62e561b47064728f4173cb526d05a8abd80334ad229ee2a42039ac7b
+DIST libpaper-2.1.3.tar.gz 1263513 BLAKE2B 920fa9857cef5773a3570bd613152f09726cfeb8e07f8152460b37ee863b76ea28ef4c2d80d010e10368e952281e5138b1412c22e1cbfa27053bb3b6067bbcbf SHA512 7ebd469b7d6f22cd98e5811cf87403d066974dc2624d35653803c318258cb68506dc2abeb7129b03231aa32c36a7461275b20f4a43c51f0cd70b2db59a1a2988
+DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
deleted file mode 100644
index 0dbca3f2a9e2..000000000000
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools multilib-minimal
-
-MY_PV=${PV/_p/+nmu}
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
-SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( README ChangeLog debian/changelog )
-
-src_prepare() {
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-static
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- dodir /etc
- (paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
- || die "papersize config failed"
-
- if ! has_version app-text/libpaper ; then
- echo
- elog "run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
- echo
- fi
-}
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
deleted file mode 100644
index 7016e7ddeabd..000000000000
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-MY_PV=${PV/_p/+nmu}
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
-SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( README ChangeLog debian/changelog )
-
-src_prepare() {
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
- eautoreconf
- default
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-static
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- einstalldocs
-
- dodir /etc
- (paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
- || die "papersize config failed"
-
- if ! has_version app-text/libpaper ; then
- echo
- elog "run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
- echo
- fi
-}
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
new file mode 100644
index 000000000000..99fc37a02be5
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for handling paper characteristics"
+HOMEPAGE="https://packages.debian.org/unstable/source/libpaper"
+SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DOCS=( README ChangeLog debian/changelog )
+
+src_prepare() {
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+ default
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-static
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -exec rm -f {} +
+
+ einstalldocs
+
+ dodir /etc
+ (paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
+ || die "papersize config failed"
+
+ if ! has_version app-text/libpaper ; then
+ echo
+ elog "run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
+ echo
+ fi
+}
diff --git a/app-text/libpaper/libpaper-2.1.2.ebuild b/app-text/libpaper/libpaper-2.1.2.ebuild
new file mode 100644
index 000000000000..842963ab584e
--- /dev/null
+++ b/app-text/libpaper/libpaper-2.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for handling paper characteristics"
+HOMEPAGE="https://github.com/rrthomas/libpaper"
+SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz"
+
+# See README.
+# paperspecs is public-domain
+LICENSE="LGPL-2.1+ GPL-3+ public-domain"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # Gnulib false positives #898346
+ # These are all tested without an #include first
+ MIN alignof static_assert
+)
+
+src_configure() {
+ econf --enable-relocatable
+}
+
+src_install() {
+ default
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/libpaper/libpaper-2.1.3.ebuild b/app-text/libpaper/libpaper-2.1.3.ebuild
new file mode 100644
index 000000000000..06d8f269983b
--- /dev/null
+++ b/app-text/libpaper/libpaper-2.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for handling paper characteristics"
+HOMEPAGE="https://github.com/rrthomas/libpaper"
+SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz"
+
+# See README.
+# paperspecs is public-domain
+LICENSE="LGPL-2.1+ GPL-3+ public-domain"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # Gnulib false positives #898346
+ # These are all tested without an #include first
+ MIN alignof static_assert
+)
+
+src_configure() {
+ econf --enable-relocatable
+}
+
+src_install() {
+ default
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml
index c439b06d8c84..51e48c3b98f8 100644
--- a/app-text/libpaper/metadata.xml
+++ b/app-text/libpaper/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>printing@gentoo.org</email>
- <name>Gentoo Printing Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rrthomas/libpaper</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index e15f19284937..ecc2644ca8e3 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Library parsing QuarkXpress documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="debug doc test tools"
+RESTRICT="!test? ( test )"
RDEPEND="
- dev-libs/librevenge
dev-libs/icu:=
+ dev-libs/librevenge
"
DEPEND="${RDEPEND}
dev-libs/boost
+ test? ( dev-util/cppunit )
"
BDEPEND="
virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ doc? ( app-text/doxygen )
"
src_configure() {
@@ -37,5 +39,5 @@ src_configure() {
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/libqxp/metadata.xml b/app-text/libqxp/metadata.xml
index e99ec98e14f8..b2796e63fc69 100644
--- a/app-text/libqxp/metadata.xml
+++ b/app-text/libqxp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 23d84a9fb974..6311d5b76c16 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,2 +1,2 @@
-DIST libspectre-0.2.7.tar.gz 387947 BLAKE2B 1d8c5ce045e90cb10a159615d3b011dafd24fa07c8bbd79349663880d077b53944495cba7f5a77e8e32735123762d0f6fcd2feb382258b8d35107284f72243b8 SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
-DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
+DIST libspectre-0.2.11.tar.gz 435887 BLAKE2B 46e289553dafe520c76a779ce64f8f5e320541221d885e5707284dd6d89ace7985a0a658fcf26c5ea750fd2751dd2bab0913333cda563ab5ee29c4132f8c99a5 SHA512 97335bc927006031fad8be55befae44bec33347f058f5b1fcf828a8a8d45a6fae2d51ceae4aaffcfa563c7592fdffe1e5a4993f145d6832ec81019c00ae0e37f
+DIST libspectre-0.2.12.tar.gz 436264 BLAKE2B 932f934e4ef66c4319d60ea88842d01caf3663262f6b67606dfc5750eba7d9e13a1e3e0b15764215e703ff1542c3c09387ee4f572075e828ae2f3680d002821c SHA512 3a4045c1e94e7de23b437393389397dd2448363458023b5aa8e43fa0553a160216f038e157374cefc1d09fa74711ad4899aac1fc353c482bd5fe970d9a97461f
diff --git a/app-text/libspectre/files/libspectre-0.2.0-interix.patch b/app-text/libspectre/files/libspectre-0.2.0-interix.patch
deleted file mode 100644
index 7b607542dfad..000000000000
--- a/app-text/libspectre/files/libspectre-0.2.0-interix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru libspectre-0.2.0.orig/libspectre/spectre-utils.c libspectre-0.2.0/libspectre/spectre-utils.c
---- libspectre-0.2.0.orig/libspectre/spectre-utils.c 2008-05-06 08:35:07 +0200
-+++ libspectre-0.2.0/libspectre/spectre-utils.c 2008-05-06 08:49:51 +0200
-@@ -148,6 +148,17 @@
- spectre_strdup_vprintf (const char *format,
- va_list args)
- {
-+#ifdef __INTERIX
-+ /* no [v]asprintf here, so we need to do something else. */
-+ char * string = NULL;
-+ char buf[524288];
-+
-+ if(vsprintf(buf, format, args) < 0)
-+ return NULL;
-+
-+ string = strdup(buf);
-+ return string;
-+#else
- char *string = NULL;
- int len = vasprintf (&string, format, args);
-
-@@ -155,6 +166,7 @@
- string = NULL;
-
- return string;
-+#endif
- }
-
- char *
diff --git a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
deleted file mode 100644
index e9a4eda192ba..000000000000
--- a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fixed error namespace for >=ghostscript-gpl-9.18
-
-https://bugs.gentoo.org/563540
-
---- libspectre-0.2.7/libspectre/spectre-gs.c
-+++ libspectre-0.2.7/libspectre/spectre-gs.c
-@@ -43,12 +43,12 @@
-
- if (code <= -100) {
- switch (code) {
-- case e_Fatal:
-+ case gs_error_Fatal:
- fprintf (stderr, "fatal internal error %d", code);
- return TRUE;
- break;
-
-- case e_ExecStackUnderflow:
-+ case gs_error_ExecStackUnderflow:
- fprintf (stderr, "stack overflow %d", code);
- return TRUE;
- break;
-@@ -109,9 +109,9 @@
- set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
- error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
- 0, &exit_code);
-- error = error == e_NeedInput ? 0 : error;
-+ error = error == gs_error_NeedInput ? 0 : error;
- free (set);
-- if (error != e_NeedInput && critic_error_code (error)) {
-+ if (error != gs_error_NeedInput && critic_error_code (error)) {
- fclose (fd);
- return FALSE;
- }
-@@ -126,7 +126,7 @@
- read = fread (buf, sizeof (char), to_read, fd);
- error = gsapi_run_string_continue (ghostscript_instance,
- buf, read, 0, &exit_code);
-- error = error == e_NeedInput ? 0 : error;
-+ error = error == gs_error_NeedInput ? 0 : error;
- left -= read;
- }
-
diff --git a/app-text/libspectre/libspectre-0.2.11.ebuild b/app-text/libspectre/libspectre-0.2.11.ebuild
new file mode 100644
index 000000000000..9ca5e16ca44f
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.11.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc"
+
+RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen[doc] )
+"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug asserts)
+ $(use_enable debug checks)
+ --disable-test
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake
+ if use doc; then
+ doxygen || die
+ fi
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/. )
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libspectre/libspectre-0.2.12.ebuild b/app-text/libspectre/libspectre-0.2.12.ebuild
new file mode 100644
index 000000000000..9ca5e16ca44f
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc"
+
+RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen[doc] )
+"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug asserts)
+ $(use_enable debug checks)
+ --disable-test
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake
+ if use doc; then
+ doxygen || die
+ fi
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/. )
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libspectre/libspectre-0.2.7.ebuild b/app-text/libspectre/libspectre-0.2.7.ebuild
deleted file mode 100644
index 7fbb9e521c29..000000000000
--- a/app-text/libspectre/libspectre-0.2.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc static-libs"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.62"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-DOCS="NEWS README TODO"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.2.0-interix.patch
- has_version \>=app-text/ghostscript-gpl-9.18 \
- && epatch "${FILESDIR}"/${PN}-0.2.7-gs918.patch
- eautoreconf # need new libtool for interix
-}
-
-src_configure() {
- econf \
- $(use_enable debug asserts) \
- $(use_enable debug checks) \
- $(use_enable static-libs static) \
- --disable-test
-}
-
-src_compile() {
- emake
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- default
- use doc && dohtml -r doc/html/*
- find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
deleted file mode 100644
index aa8bb8ab1bea..000000000000
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="A library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc static-libs"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.62"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${PN}-0.2.0-interix.patch
- eautoreconf # need new libtool for interix
-}
-
-src_configure() {
- econf \
- $(use_enable debug asserts) \
- $(use_enable debug checks) \
- $(use_enable static-libs static) \
- --disable-test
-}
-
-src_compile() {
- emake
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- default
- use doc && dohtml -r doc/html/*
- prune_libtool_files
-}
diff --git a/app-text/libspectre/metadata.xml b/app-text/libspectre/metadata.xml
index f3cab85cf603..92e1bf951816 100644
--- a/app-text/libspectre/metadata.xml
+++ b/app-text/libspectre/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">libspectre/libspectre</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index e3a393cb4e8c..dc2604772e8d 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1 +1 @@
-DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
+DIST libstaroffice-0.0.7.tar.xz 707920 BLAKE2B f06786f600414a086f9b08b413ef1e028b15070ce90b4be03b18dd69787f4812b4ecbc245381e0ed464fabe0c1147149a3c4df248181b236e5d8bb766b398985 SHA512 fae873457a8018c1613667aa92771981503585513ab01bdbd2dd6d506ed4f72a7a8fdcfcb8953a46dfcb8fd902d2c9ef8ccd1a5ff15c83990a89847fb98009f8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
deleted file mode 100644
index e88162618cf6..000000000000
--- a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-DESCRIPTION="Import filter for old StarOffice documents"
-HOMEPAGE="https://github.com/fosnola/libstaroffice"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-IUSE="debug doc tools +zlib"
-
-RDEPEND="
- dev-libs/librevenge
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable debug) \
- $(use_with doc docs) \
- $(use_enable tools) \
- $(use_enable zlib zip)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
new file mode 100644
index 000000000000..05ec38fcf6d5
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+IUSE="debug doc tools +zlib"
+
+BDEPEND="
+ doc? ( app-text/doxygen )
+"
+DEPEND="
+ dev-libs/librevenge
+ zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ [[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_with doc docs)
+ $(use_enable tools)
+ $(use_enable zlib zip)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
index 7578276aed40..a4cfd8260b1e 100644
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@@ -1,45 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
+fi
DESCRIPTION="Import filter for old StarOffice documents"
HOMEPAGE="https://github.com/fosnola/libstaroffice"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
IUSE="debug doc tools +zlib"
-RDEPEND="
+BDEPEND="
+ doc? ( app-text/doxygen )
+"
+DEPEND="
dev-libs/librevenge
zlib? ( sys-libs/zlib )
"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
-"
+RDEPEND="${DEPEND}"
src_prepare() {
default
- [[ ${PV} == 9999 ]] && eautoreconf
+ [[ ${PV} == *9999* ]] && eautoreconf
}
src_configure() {
- econf \
- --disable-werror \
- $(use_enable debug) \
- $(use_with doc docs) \
- $(use_enable tools) \
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_with doc docs)
+ $(use_enable tools)
$(use_enable zlib zip)
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/libstaroffice/metadata.xml b/app-text/libstaroffice/metadata.xml
index 27a1e937c80d..f9a75b8ce693 100644
--- a/app-text/libstaroffice/metadata.xml
+++ b/app-text/libstaroffice/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index c05f26f93137..9ab2fb345b48 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
IUSE="doc +tools"
RDEPEND="dev-libs/librevenge"
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ doc? ( app-text/doxygen )
"
PATCHES=( "${FILESDIR}/${P}-gcc-4.8.patch" )
diff --git a/app-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
index 19419ec1fa6e..c702ee54c412 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index 37d0f698e130..ba88efdcccdd 100644
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -1 +1 @@
-DIST libwpg-0.3.3.tar.xz 328664 BLAKE2B 02ffaf8ea96e66dea94d847c85e17db5b7efcc5891bb1bf4069e664ece09f808b7462fcbb08a75d6ab17fff4ea51a8e494c48fba1540aed132f47d05b746e1a5 SHA512 99f8346b336eb902626fe07836c73870a57e100620ddd242ce7c2866e564483ed024a3a0b2804f81a0f59a0873310c3a93c005d306437a27818a6f4374c0c491
+DIST libwpg-0.3.4.tar.xz 340428 BLAKE2B 68df99682307811e7bf376ff1329aaf18313e447b8dcdd2229cedc30afa122eafcf6a527c375cf547b88600129460ff2db2390124200f4ee100367ea534cea83 SHA512 dcc34abc3cf8793dca579b2233e7c84d0ea53a7372c325678d81fbe52c700e6a8af32c4b17e490a39873a692d44ba7b3af68d605d87cef0be8ea13d2f7b95c0e
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
deleted file mode 100644
index 79b75e002d3a..000000000000
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library to read and parse graphics in WPG"
-HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
- app-text/libwpd:0.10[tools]
- dev-libs/librevenge
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_configure() {
- local myeconfargs=(
- --program-suffix=-${SLOT}
- $(use_with doc docs)
- $(use_enable static-libs static)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libwpg/libwpg-0.3.4.ebuild b/app-text/libwpg/libwpg-0.3.4.ebuild
new file mode 100644
index 000000000000..48deab175c5e
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.3.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="C++ library to read and parse graphics in WPG"
+HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0.3"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
+IUSE="doc"
+
+RDEPEND="
+ app-text/libwpd:0.10[tools]
+ dev-libs/librevenge
+"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/boost
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+src_configure() {
+ local myeconfargs=(
+ --program-suffix=-${SLOT}
+ $(use_with doc docs)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/libwpg/metadata.xml b/app-text/libwpg/metadata.xml
index f341402a4a4e..bb9cb0fabe4a 100644
--- a/app-text/libwpg/metadata.xml
+++ b/app-text/libwpg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 2c5946f198aa..c90c80ccfba6 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1 +1 @@
-DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
+DIST libwps-0.4.14.tar.xz 719016 BLAKE2B 9f89b8534851760bb2cc3453e75840dea22eb09fd51a1d8ec7b7308fbb63ef7e34416ccfdbb5b1abc87616b7da17edc0bcf1e7fcc93414bf197dd904f6de759b SHA512 bbf9047f35d1b42c2da8deee24116d6a3fb20749a4255d369b62967a99185f52f21dda3e1b385056c1924995f2a72b670960bb476f38c3bf78933e25ff4a5779
diff --git a/app-text/libwps/libwps-0.4.10.ebuild b/app-text/libwps/libwps-0.4.10.ebuild
deleted file mode 100644
index 7f0beb210daf..000000000000
--- a/app-text/libwps/libwps-0.4.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc debug static-libs tools"
-
-RDEPEND="
- dev-libs/librevenge
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_with doc docs) \
- $(use_enable static-libs static) \
- $(use_enable tools)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libwps/libwps-0.4.14.ebuild b/app-text/libwps/libwps-0.4.14.ebuild
new file mode 100644
index 000000000000..09779f50de3f
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.14.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
+IUSE="debug doc tools"
+
+DEPEND="dev-libs/librevenge"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-text/doxygen )
+"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_with doc docs)
+ $(use_enable tools)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
index e942043e4489..78e528e747bf 100644
--- a/app-text/libwps/metadata.xml
+++ b/app-text/libwps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
index f5697fc876de..d38ce9c286df 100644
--- a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils autotools
+inherit autotools
DESCRIPTION="A set of tools to create and apply patch to XML files using XPath"
HOMEPAGE="http://xmlpatch.sourceforge.net/"
@@ -12,29 +12,33 @@ SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="test static-libs"
+IUSE="test"
+RESTRICT="!test? ( test )"
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+ dev-libs/glib:2
dev-libs/libxml2"
DEPEND="${RDEPEND}
- test? ( dev-libs/check )
- virtual/pkgconfig"
+ test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
src_configure() {
econf \
- $(use_enable static-libs static) \
+ --disable-static \
$(use_with test check)
}
-DOCS=( LEGAL_NOTICE README TODO ChangeLog )
-
src_install() {
default
- find "${D}" -name '*.la' -delete
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/app-text/libxmlpatch/metadata.xml b/app-text/libxmlpatch/metadata.xml
index ddc9bcf76f3d..0a4e7b0f969c 100644
--- a/app-text/libxmlpatch/metadata.xml
+++ b/app-text/libxmlpatch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 13d8bb69572c..e5ce01ec717c 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,2 +1,2 @@
-DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
+DIST linuxdoc-tools-0.9.82.tar.bz2 550046 BLAKE2B 3bf9b9680659a3a6873e31116975fca7372167a701e630d762d37fcacf7acb9f1df4031558c4db24769e598a17b206e1c09607e341fc90f91497c15ff0cb05a1 SHA512 82560d9dc4db231e0a2c1fa3732d062bfd6af2cd3c5ffa0960939b2888533882437ddeeb54219e31acc7eaa10fdeee84ba206d32516cc5ed4f3fba2eab1ec0e4
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch
new file mode 100644
index 000000000000..28e6b697a3ad
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch
@@ -0,0 +1,245 @@
+Patch emailed to upstream.
+
+From 216e770ced47ad0017cd43033ef213c2634fe87a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Dec 2022 08:53:14 +0000
+Subject: [PATCH] sgmls-1.1: fix configure script with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result. In this case, it led to a build failure
+(see https://bugs.gentoo.org/883203).
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/883203
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sgmls-1.1/configure
++++ b/sgmls-1.1/configure
+@@ -110,13 +110,14 @@ cat >doit.c <<\EOF
+
+ #include <ctype.h>
+ #include <signal.h>
++#include <stdlib.h>
+
+-static int whoops()
++static void whoops(int signal)
+ {
+ _exit(1);
+ }
+
+-main()
++int main(void)
+ {
+ int c;
+ #ifdef isascii
+@@ -213,9 +214,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdio.h>
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ remove("foo");
+@@ -231,9 +232,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <unistd.h>
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ getopt(argc, argv, "v");
+@@ -249,9 +250,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <unistd.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ access("foo", 4);
+@@ -267,9 +268,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <unistd.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ vfork();
+@@ -285,9 +286,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <sys/wait.h>
++int main(int argc, char **argv)
+ {
+
+ if (argc == 0) {
+@@ -306,10 +307,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
++#include <stdlib.h>
+ #include <string.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ strerror(0);
+@@ -326,9 +326,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <strings.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ bcopy((char *)0, (char *)0, 0);
+@@ -340,10 +339,9 @@ if $CC $CFLAGS -o doit doit.c $LIBS >/dev/null 2>&1 && ./doit 2>/dev/null
+ then
+ # Only use BSD_STRINGS if ANSI string functions don't work.
+ cat >doit.c <<\EOF
++#include <stdlib.h>
+ #include <string.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ memcpy((char *)0, (char *)0, 0);
+@@ -363,9 +361,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <signal.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ raise(SIGINT);
+@@ -382,9 +379,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <stdio.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ fpos_t pos;
+@@ -404,12 +400,11 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ pid_t pid;
+@@ -436,14 +431,15 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+
+-static int whoops()
++static void whoops(int signal)
+ {
+ _exit(1);
+ }
+
+-main()
++int main(void)
+ {
+ char buf[30];
+ #ifdef SIGSEGV
+@@ -469,10 +465,9 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <nl_types.h>
++#include <stdlib.h>
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ nl_catd d = catopen("foo", 0);
+@@ -492,12 +487,11 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <limits.h>
++#include <stdlib.h>
+
+ char c = UCHAR_MAX;
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ #if CHAR_MIN < 0
+ exit(!(c < 0));
+@@ -512,7 +506,8 @@ then
+ char_signed=
+ else
+ cat >doit.c <<\EOF
+-main()
++#include <stdlib.h>
++int main(void)
+ {
+ int i;
+
+--
+2.38.1
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
deleted file mode 100644
index 808897c2186f..000000000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
-EAPI=5
-
-inherit autotools epatch latex-package perl-functions sgml-catalog toolchain-funcs vcs-snapshot
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
-SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="
- || ( app-text/openjade app-text/opensp )
- app-text/sgml-common
- dev-lang/perl:=
- || ( sys-apps/gawk sys-apps/mawk )
- sys-apps/groff
-"
-DEPEND="${RDEPEND}
- sys-devel/flex
- doc? (
- dev-texlive/texlive-fontsrecommended
- virtual/latex-base
- )
-"
-
-src_prepare() {
- [[ ${PATCHES} ]] && epatch -p1 "${PATCHES[@]}"
- epatch_user
-
- # Update the build system with Gentoo paths.
- sed -i \
- -e "s|share/doc/${PN}|share/doc/${PF}|g" \
- Makefile.in || die
-
- eautoreconf
-}
-
-src_configure() {
- perl_set_version
- tc-export CC
- local myeconfargs=(
- --disable-docs
- --with-texdir="${TEXMF}/tex/latex/${PN}"
- --with-perllibdir="${VENDOR_ARCH}"
- --with-installed-iso-entities
- )
- use doc && myeconfargs+=(--enable-docs="txt pdf html")
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Prevent access violations from bitmap font files generation.
- use doc && export VARTEXFONTS="${T}/fonts"
- default_src_compile
-}
-
-src_install() {
- # Override latex-package.eclass
- default_src_install
-}
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
-
-pkg_postinst() {
- latex-package_pkg_postinst
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- latex-package_pkg_postrm
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
new file mode 100644
index 000000000000..f0cd0dfe61eb
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE="doc"
+
+RDEPEND="
+ || ( app-text/openjade app-text/opensp )
+ app-text/sgml-common
+ dev-lang/perl:=
+ sys-apps/groff
+"
+DEPEND="${RDEPEND}
+ app-alternatives/lex
+ app-alternatives/awk
+ doc? (
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
+
+src_prepare() {
+ default_src_prepare
+ # Pregenerated configure scripts fail.
+ eautoreconf
+}
+
+src_configure() {
+ perl_set_version
+ tc-export CC
+ local myeconfargs=(
+ --disable-docs
+ --with-texdir="${TEXMF}/tex/latex/${PN}"
+ --with-perllibdir="${VENDOR_ARCH}"
+ --with-installed-iso-entities
+ )
+ use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Prevent access violations from bitmap font files generation.
+ use doc && export VARTEXFONTS="${T}/fonts"
+ default_src_compile
+}
+
+src_install() {
+ # Makefile ignores docdir configuration option.
+ emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+ dodoc ChangeLog README
+
+ insinto /etc/sgml
+ newins - linuxdoc.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work around sgml-catalog.eclass removing it
+ cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/linuxdoc.cat
+ local real=${EROOT}/etc/sgml/linuxdoc.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ latex-package_pkg_postinst
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ latex-package_pkg_postrm
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
deleted file mode 100644
index bfa36dc64cdf..000000000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
-EAPI=5
-
-inherit autotools latex-package perl-functions sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
-SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+ MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="
- || ( app-text/openjade app-text/opensp )
- app-text/sgml-common
- dev-lang/perl:=
- sys-apps/groff
-"
-DEPEND="${RDEPEND}
- sys-devel/flex
- virtual/awk
- doc? (
- dev-texlive/texlive-fontsrecommended
- virtual/latex-base
- )
-"
-
-src_prepare() {
- # Pregenerated configure scripts fail.
- eautoreconf
-}
-
-src_configure() {
- perl_set_version
- tc-export CC
- local myeconfargs=(
- --disable-docs
- --with-texdir="${TEXMF}/tex/latex/${PN}"
- --with-perllibdir="${VENDOR_ARCH}"
- --with-installed-iso-entities
- )
- use doc && myeconfargs+=(--enable-docs="txt pdf html")
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Prevent access violations from bitmap font files generation.
- use doc && export VARTEXFONTS="${T}/fonts"
- default_src_compile
-}
-
-src_install() {
- # Makefile ignores docdir configuration option.
- emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
- dodoc ChangeLog README
-}
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
-
-pkg_postinst() {
- latex-package_pkg_postinst
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- latex-package_pkg_postrm
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
new file mode 100644
index 000000000000..3bf30133b667
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE="doc"
+
+RDEPEND="
+ || ( app-text/openjade app-text/opensp )
+ app-text/sgml-common
+ dev-lang/perl:=
+ sys-apps/groff
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/awk
+ app-alternatives/lex
+ doc? (
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.82-configure-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ # Pregenerated configure scripts fail.
+ eautoreconf
+}
+
+src_configure() {
+ perl_set_version
+ tc-export CC
+ local myeconfargs=(
+ --disable-docs
+ --with-texdir="${TEXMF}/tex/latex/${PN}"
+ --with-perllibdir="${VENDOR_ARCH}"
+ --with-installed-iso-entities
+ )
+ use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Prevent access violations from bitmap font files generation.
+ use doc && export VARTEXFONTS="${T}/fonts"
+
+ default
+}
+
+src_install() {
+ # Makefile ignores docdir configuration option.
+ emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+ dodoc ChangeLog README
+
+ insinto /etc/sgml
+ newins - linuxdoc.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work around sgml-catalog.eclass removing it
+ cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/linuxdoc.cat
+ local real=${EROOT}/etc/sgml/linuxdoc.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ latex-package_pkg_postinst
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ latex-package_pkg_postrm
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
index c7c7ce7d220b..11c81e94bca2 100644
--- a/app-text/linuxdoc-tools/metadata.xml
+++ b/app-text/linuxdoc-tools/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>itumaykin+gentoo@gmail.com</email>
- <name>Coacher</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9,
and is a toolset for processing LinuxDoc DTD SGML files.
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 6dba89603d97..11ef261f10d0 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1 +1 @@
-DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
+DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile
index 0bd94cab00f2..66a3fe4c4fd8 100644
--- a/app-text/llpp/files/Makefile
+++ b/app-text/llpp/files/Makefile
@@ -10,8 +10,8 @@ LIBDIR ?= /usr/lib
# includes and libs
PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
CPPFLAGS += -D_GNU_SOURCE -DFFP
-CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
-LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell ${PKG_CONFIG} --cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell ${PKG_CONFIG} --libs $(PKGCONF_DEPS))
# ocaml
CAMLOPT = ocamlopt
diff --git a/app-text/llpp/files/llpp-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch
deleted file mode 100644
index b1527e1856f1..000000000000
--- a/app-text/llpp/files/llpp-30-keysym.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 5 Jun 2018 11:56:06 -0400
-Subject: [PATCH] Do not use CPPFLAGS to add headers to source files
-
-Source code, e.g. #include, belongs in the source code, not the build
-system. Build systems are for defining include paths, not the includes
-themselves.
-
-Drop the KeySym keyword since it seems to be a useless alias for
-uint32_t which might as well be used directly instead of indirectly
-using #define everywhere.
----
- link.c | 4 ++--
- wsi/x11/keysym2ucs.c | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/link.c b/link.c
-index 783b12f..e8dcac3 100644
---- a/link.c
-+++ b/link.c
-@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v)
- {
- CAMLparam1 (keysym_v);
- CAMLlocal1 (str_v);
-- KeySym keysym = Int_val (keysym_v);
-+ uint32_t keysym = Int_val (keysym_v);
- Rune rune;
-- extern long keysym2ucs (KeySym);
-+ extern long keysym2ucs (uint32_t);
- int len;
- char buf[5];
-
-diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c
-index 38f9f1f..0f907c2 100644
---- a/wsi/x11/keysym2ucs.c
-+++ b/wsi/x11/keysym2ucs.c
-@@ -37,6 +37,8 @@
- * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
- */
-
-+#include <inttypes.h>
-+
- struct codepair {
- unsigned short keysym;
- unsigned short ucs;
-@@ -816,7 +818,7 @@ struct codepair {
- { 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */
- };
-
--long keysym2ucs(KeySym keysym)
-+long keysym2ucs(uint32_t keysym)
- {
- int min = 0;
- int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile
new file mode 100644
index 000000000000..6e4eabf8bf5c
--- /dev/null
+++ b/app-text/llpp/files/llpp-33-makefile
@@ -0,0 +1,91 @@
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq "$(VERSION)" ""
+VERSION = 33
+endif
+
+# paths
+PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
+
+# includes and libs
+PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
+CPPFLAGS += -D_GNU_SOURCE -DFFP
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell ${PKG_CONFIG} --cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell ${PKG_CONFIG} --libs $(PKGCONF_DEPS))
+
+# ocaml
+CAMLOPT = ocamlopt
+CAMLFLAGS = -g -w +a -safe-string -I +lablGL
+
+VPATH = wsi/x11
+
+C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c
+C_OBJ = $(C_SRC:.c=.o)
+OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml
+OCAML_OBJ = $(OCAML_SRC:.ml=.cmx)
+MOD = unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard adoc/*.adoc)
+MANS = $(SRCMANS:.adoc=.1)
+
+DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES += $(wildcard *.sh) KEYS README BUILDING
+DISTFILES += misc/ adoc/
+
+all: llpp $(MANS)
+
+# dependency ordering
+config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx
+confstruct.cmx: wsi.cmx utils.cmx
+ffi.cmx: config.cmx
+glutils.cmx: ffi.cmx
+help.cmx: help.cmi config.cmx utils.cmx
+listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx
+main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx
+main.cmx: CAMLFLAGS += -thread
+parser.cmx: utils.cmx
+wsi.cmi: utils.cmx keys.cmx
+wsi.cmx: wsi.cmi
+
+link.o: glfont.c
+version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION)
+
+# ordinary targets
+llpp: $(OCAML_OBJ) $(C_OBJ)
+ $(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ)
+
+
+confstruct.ml: genconfstr.sh
+ sh $< >$@
+
+# pattern rules
+%.o: %.c
+ $(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
+
+%.cmx: %.ml
+ $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.cmi: %.mli
+ $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.1: %.adoc
+ a2x -d manpage -f manpage $<
+
+# special targets
+clean:
+ $(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
+
+dist: clean
+ mkdir llpp-$(VERSION)
+ cp -r $(DISTFILES) llpp-$(VERSION)
+ tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
+ rm -rf llpp-$(VERSION)
+
+install:
+ install -Dm755 llpp "$(DESTDIR)"$(PREFIX)/bin/llpp
+ install -Dm644 -t "$(DESTDIR)"$(PREFIX)/share/man/man1 $(MANS)
+ install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac
+ install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify
+ install -Dm755 misc/llpphtml "$(DESTDIR)"$(PREFIX)/bin/llpphtml
+ install -Dm644 misc/llpp.desktop "$(DESTDIR)"$(PREFIX)/share/applications/llpp.desktop
+
+.PHONY: all clean dist install
diff --git a/app-text/llpp/files/llpp.desktop b/app-text/llpp/files/llpp.desktop
index 9d81141aede6..59c5fcde4e87 100644
--- a/app-text/llpp/files/llpp.desktop
+++ b/app-text/llpp/files/llpp.desktop
@@ -5,7 +5,7 @@ Exec=llpp %f
TryExec=llpp
Terminal=false
Type=Application
-MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;image/png;
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;
Categories=Office;Viewer;Graphics
Actions=View
Version=1.0
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
deleted file mode 100644
index 9fc50c6f10e2..000000000000
--- a/app-text/llpp/llpp-30.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/fontconfig:1.0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- virtual/pkgconfig
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- >=dev-lang/ocaml-4.02[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${P}-keysym.patch )
-
-src_prepare() {
- default
-
- # use custom makefile from archlinux with minor changes
- cp "${FILESDIR}"/Makefile "${S}" || die
-
- # re-add desktop file removed upstream
- cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
-}
-
-src_compile() {
- emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
- dodoc README Thanks
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
new file mode 100644
index 000000000000..f4c105ef4d10
--- /dev/null
+++ b/app-text/llpp/llpp-33.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=app-text/mupdf-1.17.0:0=
+ app-arch/bzip2
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ media-libs/jbig2dec:=
+ media-libs/openjpeg:2
+ sys-libs/zlib
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-misc/xsel
+"
+DEPEND="${RDEPEND}
+ dev-ml/lablgl:=[glut,ocamlopt?]"
+BDEPEND="
+ app-text/asciidoc
+ >=dev-lang/ocaml-4.09[ocamlopt?]
+ virtual/pkgconfig
+"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+src_prepare() {
+ default
+
+ # use custom makefile from archlinux with minor changes
+ cp "${FILESDIR}"/${P}-makefile "${S}"/Makefile || die
+
+ # re-add desktop file removed upstream
+ cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+
+ # remove empty interface definition
+ rm "${S}"/main.mli || die
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+ emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" PREFIX="/usr" install
+ dodoc README Thanks
+}
diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index 6f49eba8f496..6554536432ea 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">moosotc/llpp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/logmerge/logmerge-0.5.2b-r1.ebuild b/app-text/logmerge/logmerge-0.5.2b-r1.ebuild
new file mode 100644
index 000000000000..9fc47fd81530
--- /dev/null
+++ b/app-text/logmerge/logmerge-0.5.2b-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Small and powerful script to merge two or more logfiles"
+HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge"
+SRC_URI="https://github.com/ildar-shaimordanov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+ default
+ dobin logmerge
+}
diff --git a/app-text/logmerge/logmerge-0.5.2b.ebuild b/app-text/logmerge/logmerge-0.5.2b.ebuild
deleted file mode 100644
index a7f24d5fd1f8..000000000000
--- a/app-text/logmerge/logmerge-0.5.2b.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Small and powerful script to merge two or more logfiles"
-HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge"
-SRC_URI="https://github.com/ildar-shaimordanov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/perl"
-
-src_install() {
- default
- dobin ${PN}
-}
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
index d0b9b2fdc5d0..11265970dec4 100644
--- a/app-text/logmerge/metadata.xml
+++ b/app-text/logmerge/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <longdescription>
- Merge multiple logs such that multilined entries appear in chronological order without breaks.
- </longdescription>
<upstream>
<remote-id type="github">ildar-shaimordanov/logmerge</remote-id>
</upstream>
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
deleted file mode 100644
index 673ad8d54d5f..000000000000
--- a/app-text/lout/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lout-3.40.tar.gz 2172651 BLAKE2B 0bf2ee498d6fbb91e353d46fe1f7f0f44053be174df901b08ee630f0b4935e19c056a50e2eda4d07ab69aac6d7bf738b42277bb37060e967db73ace6a51029af SHA512 adffbb44b9328f0d64b1c8f08fe0217307b1cca870827ca54e0aaae5a2258f519e3e6f0adc715ba6d192dd731ab26c2cc86aa8611d991d5665503842e599c061
diff --git a/app-text/lout/files/lout-3.38-makefile.patch b/app-text/lout/files/lout-3.38-makefile.patch
deleted file mode 100644
index cb7fc66bf432..000000000000
--- a/app-text/lout/files/lout-3.38-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- lout-3.38/makefile.orig 2008-10-13 23:35:17.000000000 +0200
-+++ lout-3.38/makefile 2009-09-04 16:40:00.000000000 +0200
-@@ -295,11 +295,9 @@
- ZLIB =
- ZLIBPATH =
-
--CC = gcc
--
- RCOPY = cp -r
-
--COPTS = -ansi -pedantic -Wall -O3
-+COPTS += -ansi -pedantic -Wall
-
- CFLAGS = -DOS_UNIX=$(OSUNIX) \
- -DOS_DOS=$(OSDOS) \
-@@ -333,7 +331,7 @@
- z49.o z50.o z51.o z52.o
-
- lout: $(OBJS)
-- $(CC) -o lout $(OBJS) $(ZLIB) -lm
-+ $(CC) $(COPTS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
- chmod a+x lout
-
- $(OBJS): externs.h
-@@ -341,7 +339,7 @@
- externs.h:
-
- prg2lout: prg2lout.c
-- $(CC) $(COPTS) -o prg2lout prg2lout.c
-+ $(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
- chmod a+x prg2lout
-
- all: lout prg2lout
diff --git a/app-text/lout/lout-3.40.ebuild b/app-text/lout/lout-3.40.ebuild
deleted file mode 100644
index e6d0cc7f1f25..000000000000
--- a/app-text/lout/lout-3.40.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-IUSE="zlib doc"
-
-DESCRIPTION="High-level language for document formatting"
-HOMEPAGE="http://savannah.nongnu.org/projects/lout"
-SRC_URI="mirror://nongnu/lout/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.38-makefile.patch"
-)
-
-src_compile() {
- tc-export CC
- local myconf
- use zlib && myconf="$myconf PDF_COMPRESSION=1 ZLIB=-lz"
- emake COPTS="${CFLAGS}" BINDIR="${EPREFIX}"/usr/bin \
- LOUTLIBDIR="${EPREFIX}"/usr/share/lout \
- LOUTDOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man/man1 \
- ${myconf} lout prg2lout || die "emake prg2lout lout failed"
-}
-
-compile_doc() {
- #
- # SYNOPSIS: compile_doc file times
- #
-
- einfo "${1}:"
- # yes, it *is* necessary to run this 6 times...
- for i in $(seq 1 $(expr $2 - 1)) ; do
- einfo " pass $i"
- lout all -o ${docdir}/$1 -e /dev/null
- done
- # in the last one, let errors be reported
- einfo " final pass"
- lout all -o ${docdir}/$1 || die "final pass failed"
-}
-
-src_install() {
- local bindir libdir docdir mandir
- bindir=${ED}usr/bin
- libdir=${ED}usr/share/lout
- docdir=${ED}usr/share/doc/${PF}
- mandir=${ED}usr/share/man/man1
- export LOUTLIB=${libdir}
- export PATH="${bindir}:${PATH}"
-
- mkdir -p ${bindir} ${docdir} ${mandir}
-
- make BINDIR=${bindir} \
- LOUTLIBDIR=${libdir} \
- LOUTDOCDIR=${docdir} \
- MANDIR=${mandir} \
- install installdoc installman || die "make install failed"
-
- lout -x -s "${ED}"usr/share/lout/include/init || die "lout init failed"
-
- mv ${docdir}/README{,.docs}
- dodoc README READMEPDF blurb blurb.short whatsnew
-
- if use doc ; then
- einfo "building postscript documentation (may take a while)"
- cd doc/user
- compile_doc user.ps 6
- cd ../design
- compile_doc design.ps 3
- cd ../expert
- compile_doc expert.ps 4
- cd ../slides
- compile_doc slides.ps 2
- fi
-}
diff --git a/app-text/lout/metadata.xml b/app-text/lout/metadata.xml
deleted file mode 100644
index d87f47dba103..000000000000
--- a/app-text/lout/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">lout</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
new file mode 100644
index 000000000000..c01019b38596
--- /dev/null
+++ b/app-text/lowdown/Manifest
@@ -0,0 +1 @@
+DIST lowdown-1.1.0.tar.gz 599219 BLAKE2B f623399cb41c5eaf180550283c5b2738993563ff30be4cfa1a471df036ed4289057d3f886a7727d85283896fbfe1316e9cc86d32c629cea1fd775af16cf58839 SHA512 b7b788694abf6760ca4abbd8d5d2c226d5406067ebf9b55307f136e1ab373e517fb20187659c09029463872310a5b39a0129842d1bc6b7bd64f2d440390e2676
diff --git a/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
new file mode 100644
index 000000000000..0337f3d68d99
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
@@ -0,0 +1,11 @@
+diff --git a/lowdown.in.pc b/lowdown.in.pc
+index 078d0c0..a31aaac 100644
+--- a/lowdown.in.pc
++++ b/lowdown.in.pc
+@@ -9,5 +9,5 @@ URL: https://kristaps.bsd.lv/lowdown
+ Version: @VERSION@
+ Requires:
+ Libs.private:
+-Libs: -L${libdir} -llowdown -lm
++Libs: -L${libdir} -llowdown -lm -lmd
+ Cflags: -I${includedir}
diff --git a/app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch b/app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch
new file mode 100644
index 000000000000..bdee817b8895
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-1.1.0-shared-linking.patch
@@ -0,0 +1,45 @@
+diff --git a/Makefile b/Makefile
+index 32acb09..552d6d3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -184,11 +184,11 @@ installwww: www
+ $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+ $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+
+-lowdown: liblowdown.a main.o
+- $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
++lowdown: liblowdown.so main.o compats.o
++ $(CC) -o $@ main.o compats.o -L. -llowdown $(LDFLAGS) $(LDADD_MD5) -lm $(LDADD)
+
+ lowdown-diff: lowdown
+- ln -f lowdown lowdown-diff
++ ln -s lowdown lowdown-diff
+
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+@@ -206,14 +206,14 @@ uninstall:
+ rm -f $(MANDIR)/man$$section/$$name ; \
+ done
+
+-install: bins
++install: bins install_libs
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(MANDIR)/man1
+ mkdir -p $(DESTDIR)$(MANDIR)/man5
+ mkdir -p $(DESTDIR)$(SHAREDIR)/lowdown/odt
+ $(INSTALL_DATA) share/odt/styles.xml $(DESTDIR)$(SHAREDIR)/lowdown/odt
+ $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+- $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
++ ln -s lowdown $(DESTDIR)$(BINDIR)/lowdown-diff
+ for f in $(MAN1S) $(MAN5S) ; do \
+ name=`basename $$f .html` ; \
+ section=$${name##*.} ; \
+@@ -256,7 +256,7 @@ install_static: liblowdown.a install_lib_common
+
+ uninstall_libs: uninstall_shared uninstall_static
+
+-install_libs: install_shared install_static
++install_libs: install_shared
+
+ distcheck: lowdown.tar.gz.sha512
+ mandoc -Tlint -Werror man/*.[135]
diff --git a/app-text/lowdown/lowdown-1.1.0.ebuild b/app-text/lowdown/lowdown-1.1.0.ebuild
new file mode 100644
index 000000000000..dd3d86d63148
--- /dev/null
+++ b/app-text/lowdown/lowdown-1.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0/2"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+DEPEND="
+ virtual/libcrypt:=
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+# configure tests for a bunch of BSD functions on Linux
+QA_CONFIG_IMPL_DECL_SKIP=(
+ crypt_newhash
+ crypt_checkpass
+ warnc
+ errc
+ getexecname
+ getprogname
+ memset_s
+ pledge
+ recallocarray
+ strlcat
+ strlcpy
+ strtonum
+ TAILQ_FOREACH_SAFE
+ unveil
+)
+
+PATCHES=(
+ "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+ "${FILESDIR}/lowdown-1.1.0-shared-linking.patch"
+)
+
+src_configure() {
+ append-flags -fPIC
+ tc-export CC AR
+
+ ./configure \
+ PREFIX="/usr" \
+ MANDIR="/usr/share/man" \
+ LDFLAGS="${LDFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LIBDIR="/usr/$(get_libdir)" \
+ || die "./configure failed"
+}
+
+src_compile() {
+ emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}" emake regress
+}
diff --git a/app-text/lowdown/metadata.xml b/app-text/lowdown/metadata.xml
new file mode 100644
index 000000000000..80961c799908
--- /dev/null
+++ b/app-text/lowdown/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">kristapsdz/lowdown</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
deleted file mode 100644
index eef46afd6200..000000000000
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools toolchain-funcs
-
-MY_P="${PN}${PV//./}"
-
-DESCRIPTION="Powerful Multilingual File Viewer"
-#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="!app-editors/levee
- sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
- dev-lang/perl"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-headers.patch
- "${FILESDIR}"/${PN}-tinfo.patch
- "${FILESDIR}"/${PN}-xz.patch
-)
-DOCS=( README hello.sample )
-HTML_DOCS=( index.html relnote.html hello.sample.gif )
-
-src_prepare() {
- default
-
- cd src
- mv configure.{in,ac}
- eautoreconf
-}
-
-src_configure() {
- ECONF_SOURCE=src econf
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
diff --git a/app-text/lv/lv-4.51-r5.ebuild b/app-text/lv/lv-4.51-r5.ebuild
new file mode 100644
index 000000000000..58fee6c0a2bb
--- /dev/null
+++ b/app-text/lv/lv-4.51-r5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P="${PN}${PV//./}"
+
+DESCRIPTION="Powerful Multilingual File Viewer"
+HOMEPAGE="https://github.com/ttdoda/lv"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="!app-editors/levee
+ sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-tinfo.patch
+ "${FILESDIR}"/${PN}-xz.patch
+)
+DOCS=( README hello.sample )
+HTML_DOCS=( index.html relnote.html hello.sample.gif )
+
+src_prepare() {
+ default
+
+ cd src
+ mv configure.{in,ac}
+ eautoreconf
+}
+
+src_configure() {
+ ECONF_SOURCE=src econf
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
diff --git a/app-text/lv/metadata.xml b/app-text/lv/metadata.xml
index 44629a6d665c..491c88b3a31f 100644
--- a/app-text/lv/metadata.xml
+++ b/app-text/lv/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slyfox@gentoo.org</email>
- <name>Sergei Trofimovich</name>
- </maintainer>
<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 5245af498122..fbfe6541cf5b 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,2 +1 @@
-DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
-DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
+DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4
diff --git a/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch
new file mode 100644
index 000000000000..2395f1ce66b7
--- /dev/null
+++ b/app-text/mandoc/files/mandoc-1.14.5-r1-www-install.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index f4e2954..191c7e2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -535,9 +535,11 @@ soelim: $(SOELIM_OBJS)
+ # --- maintainer targets ---
+
+ www-install: www
+- $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+- $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+- $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
++ mkdir -p $(DESTDIR)$(HTDOCDIR)/man
++ mkdir -p $(DESTDIR)$(HTDOCDIR)/includes
++ $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
++ $(INSTALL_DATA) $(WWW_MANS) $(DESTDIR)$(HTDOCDIR)/man
++ $(INSTALL_DATA) $(WWW_INCS) $(DESTDIR)$(HTDOCDIR)/includes
+
+ depend: config.h
+ mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
diff --git a/app-text/mandoc/files/mandoc.cron-r0 b/app-text/mandoc/files/mandoc.cron-r0
new file mode 100644
index 000000000000..785564901765
--- /dev/null
+++ b/app-text/mandoc/files/mandoc.cron-r0
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# need MANPATH
+. /etc/profile.env
+
+exec nice makewhatis -T utf8 2>/dev/null
diff --git a/app-text/mandoc/mandoc-1.14.4.ebuild b/app-text/mandoc/mandoc-1.14.4.ebuild
deleted file mode 100644
index 8c8b1bec615d..000000000000
--- a/app-text/mandoc/mandoc-1.14.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="http://mdocml.bsd.lv/"
-SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- default
-
- # The db-install change is to support parallel installs.
- sed -i \
- -e '/ar rs/s:ar:$(AR):' \
- -e '/^db-install:/s:$: base-install:' \
- Makefile || die
-
- cat <<-EOF > "configure.local"
- PREFIX="${EPREFIX}/usr"
- BINDIR="${EPREFIX}/usr/bin"
- SBINDIR="${EPREFIX}/usr/sbin"
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- MANDIR="${EPREFIX}/usr/share/man"
- INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
- EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
- MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
- BINM_MAN=mman
- BINM_SOELIM=msoelim
- BINM_APROPOS=mapropos
- BINM_WHATIS=mwhatis
- BINM_MAKEWHATIS=mmakewhatis
- MANM_MAN=mandoc_man
- MANM_MDOC=mandoc_mdoc
- MANM_ROFF=mandoc_roff
- MANM_EQN=mandoc_eqn
- MANM_TBL=mandoc_tbl
- MANM_MANCONF=mman.conf
-
- CFLAGS="${CFLAGS} ${CPPFLAGS}"
- LDFLAGS="${LDFLAGS} $(usex static -static '')"
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- # The STATIC variable is only used by man.cgi.
- STATIC=
- EOF
-}
diff --git a/app-text/mandoc/mandoc-1.14.5.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild
deleted file mode 100644
index 4b5e8af2d4fa..000000000000
--- a/app-text/mandoc/mandoc-1.14.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="http://mdocml.bsd.lv/"
-SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- default
-
- # The db-install change is to support parallel installs.
- sed -i \
- -e '/ar rs/s:ar:$(AR):' \
- -e '/^db-install:/s:$: base-install:' \
- Makefile || die
-
- cat <<-EOF > "configure.local"
- PREFIX="${EPREFIX}/usr"
- BINDIR="${EPREFIX}/usr/bin"
- SBINDIR="${EPREFIX}/usr/sbin"
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- MANDIR="${EPREFIX}/usr/share/man"
- INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
- EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
- MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
- BINM_MAN=mman
- BINM_SOELIM=msoelim
- BINM_APROPOS=mapropos
- BINM_WHATIS=mwhatis
- BINM_MAKEWHATIS=mmakewhatis
- MANM_MAN=mandoc_man
- MANM_MDOC=mandoc_mdoc
- MANM_ROFF=mandoc_roff
- MANM_EQN=mandoc_eqn
- MANM_TBL=mandoc_tbl
- MANM_MANCONF=mman.conf
-
- CFLAGS="${CFLAGS} ${CPPFLAGS}"
- LDFLAGS="${LDFLAGS} $(usex static -static '')"
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- # The STATIC variable is only used by man.cgi.
- STATIC=
- EOF
-}
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
new file mode 100644
index 000000000000..07c5d97647c2
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="https://mdocml.bsd.lv/"
+SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cgi selinux system-man test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/zlib
+ system-man? ( !sys-apps/man-db )
+"
+DEPEND="${RDEPEND}
+ cgi? ( sys-libs/zlib[static-libs] )
+"
+BDEPEND="
+ cgi? ( app-text/highlight )
+ test? ( dev-lang/perl )
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-makewhatis )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
+)
+
+pkg_pretend() {
+ if use system-man ; then
+ # only support uncompressed and gzip
+ [[ -n ${PORTAGE_COMPRESS+unset} ]] && \
+ [[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
+ ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # The db-install change is to support parallel installs.
+ sed -i \
+ -e '/ar rs/s:ar:$(AR):' \
+ -e '/^db-install:/s:$: base-install:' \
+ Makefile || die
+
+ # make-4.3 doesn't like the CC line (bug #706024)
+ # and "echo -n" is not portable
+ sed \
+ -e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
+ -e 's@echo -n@printf@g' \
+ -i configure || die
+
+ cat <<-EOF > "configure.local"
+ PREFIX="${EPREFIX}/usr"
+ BINDIR="${EPREFIX}/usr/bin"
+ SBINDIR="${EPREFIX}/usr/sbin"
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+ MANDIR="${EPREFIX}/usr/share/man"
+ INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+ EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+ MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+ CFLAGS="${CFLAGS} ${CPPFLAGS}"
+ LDFLAGS="${LDFLAGS}"
+ AR="$(tc-getAR)"
+ CC="$(tc-getCC)"
+ # The STATIC variable is only used by man.cgi.
+ STATIC=
+
+ # conflicts with sys-apps/groff
+ BINM_SOELIM=msoelim
+ MANM_ROFF=mandoc_roff
+ # conflicts with sys-apps/man-pages
+ MANM_MAN=mandoc_man
+
+ # fix utf-8 locale on musl
+ $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+ EOF
+ use system-man || cat <<-EOF >> "configure.local"
+ BINM_MAN=mman
+ BINM_APROPOS=mapropos
+ BINM_WHATIS=mwhatis
+ BINM_MAKEWHATIS=mmakewhatis
+ MANM_MDOC=mandoc_mdoc
+ MANM_EQN=mandoc_eqn
+ MANM_TBL=mandoc_tbl
+ MANM_MANCONF=mman.conf
+ EOF
+ if use cgi; then
+ cp cgi.h{.example,} || die
+ fi
+ if [[ -n "${MANDOC_CGI_H}" ]]; then
+ cp "${MANDOC_CGI_H}" cgi.h || die
+ fi
+
+ # ./configure does not propagate all configure.local
+ # settings to Makefile.local settings.
+ tc-export AR
+}
+
+src_compile() {
+ default
+ use cgi && emake man.cgi
+}
+
+src_test() {
+ emake regress
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use cgi && emake DESTDIR="${D}" cgi-install www-install
+
+ if use system-man ; then
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
+ fi
+}
+
+pkg_postinst() {
+ if use system-man ; then
+ elog "Generating mandoc database"
+ makewhatis || die
+ fi
+}
diff --git a/app-text/mandoc/metadata.xml b/app-text/mandoc/metadata.xml
index aebca33be179..8e701fbbd8ba 100644
--- a/app-text/mandoc/metadata.xml
+++ b/app-text/mandoc/metadata.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
-</maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="cgi">build man.cgi web plugin for viewing man pages</flag>
+ <flag name="system-man">set as the default man provider</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 5bf1e81a9d7f..e9a237b608f4 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
inherit toolchain-funcs
DESCRIPTION="Enable colorization of man pages"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
S=${WORKDIR}
@@ -26,6 +25,5 @@ src_compile() {
src_install() {
dobin ${PN}
- insinto /etc/env.d
- echo "MANPAGER=manpager" | newins - 00manpager
+ echo "MANPAGER=manpager" | newenvd - 00manpager
}
diff --git a/app-text/manpager/metadata.xml b/app-text/manpager/metadata.xml
index 56c124413057..73dda144f9ac 100644
--- a/app-text/manpager/metadata.xml
+++ b/app-text/manpager/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 1a77121a7156..67f47900de21 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,5 +1,3 @@
-DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e3a71d28ae407eb78a0f714383fc005dc020cdb911a5596548274a55466133d8e03cbf47df29c062973f243f88ad0b1e9caa8410fbdfe2b8d SHA512 85b095603da1114cd4749ddbcf7bdd513c868ee17434df47037f7e0b914546fd13a6911949579ee981b5c33dcb13eb0ffa9585d4cbedd9bff4dc56e32bdcf4cb
-DIST master-pdf-editor-5.3.02_qt5.amd64.tar.gz 16333023 BLAKE2B 99c1291cd5d354e304e873dd2528806898109f0a9a79c87eb89394ec8300ab692294c5b04fa7fb712df82fa683cd3ed549b9842417d2b13f6a3f5f41fcfa334e SHA512 bf1118f1eefe3f46addacba832eee757112a91154de5929c825845983e7b6bc681bff84501082e696bb14acf6652ea180912ae48a0dfea270053fc42a3200448
-DIST master-pdf-editor-5.3.12_qt5.amd64.tar.gz 16350912 BLAKE2B a633af3f9a99542b5c61c27b237c5788468d163ea3297d17134e6f4404cbf6bfd579bb9b1febbb27892e40b369405c05c827b0b01433039cb9d9b2f062a785bd SHA512 526ff0998734eb24406907b3ffbf8801fc04cd49aa620ea57e20cb885d7d3e94e279592bd937e306151f91f82c459cf6810c80e51d438fde0db9dbeef46edbbe
-DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
-DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
+DIST master-pdf-editor-5.9.35-qt5.x86_64.tar.gz 16885977 BLAKE2B 68dc3f4746e3259f64e2eeac99797b062c308291a62d79c9a070d76df6ad19c12b07108c754091464f6f5d04d287cb8fdf6335165c10232dca1d2d1ecdae4b68 SHA512 7dbfcbec7fd6f963340375e3067f4f76f2f0d2c239385652c4621574829426f09328f707bfc399901cd801f19ce0bb0d483c3dd37d48fad1b90dafeccf64559e
+DIST master-pdf-editor-5.9.40-qt5.x86_64.tar.gz 18902781 BLAKE2B cf72f072c5a4efce66913662d75ae95e9dd10e98945f7c38793003b0e69b7ab3945d1c01858483e7d2dc717ec2de12c659ed50b12deb9aae74eb2c3bb76f9b61 SHA512 5fd2d4b76ed25ef8cc226f2234d2a163df7135a27c80a49cee293aba5864d5759e0a22d417a4b9b35b5b0146a8f372ce8cec0652ce4d9df9f0c9c67dd2dd6beb
+DIST master-pdf-editor-5.9.82-qt5.x86_64.tar.gz 80442378 BLAKE2B bd6357097451595388be3471b291ceb23b6815ed9ce68956223860c089265ae3693cee1c90f94e567e26b3a0f11b8dee8c2cf40e0184141e2539b44303d6a4c4 SHA512 d4613b5d5353e3bd39bcf953adff2d086e20de6a627e5e6dade62cb7887254b949659174ee3ba86ac525d2373fcedbdb286dc83ffca910c577cbf9ccc14ced39
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild
deleted file mode 100644
index 96ecd510bd39..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.2.20.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils desktop
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
- >=dev-qt/qtcore-5.4.1:5
- >=dev-qt/qtgui-5.4.1:5
- >=dev-qt/qtnetwork-5.4.1:5
- >=dev-qt/qtprintsupport-5.4.1:5
- >=dev-qt/qtsvg-5.4.1:5
- >=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
- insinto /opt/${PN}
- doins -r fonts lang stamps templates masterpdfeditor5.png
-
- exeinto /opt/${PN}
- doexe masterpdfeditor5
- dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
- make_desktop_entry "masterpdfeditor5 %f" \
- "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
- "Office;Graphics;Viewer" \
- "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.3.02.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.3.02.ebuild
deleted file mode 100644
index c1a2f781209e..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.3.02.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils desktop
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
- >=dev-qt/qtcore-5.4.1:5
- >=dev-qt/qtgui-5.4.1:5
- >=dev-qt/qtnetwork-5.4.1:5
- >=dev-qt/qtprintsupport-5.4.1:5
- >=dev-qt/qtsvg-5.4.1:5
- >=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
- insinto /opt/${PN}
- doins -r fonts lang stamps templates masterpdfeditor5.png
-
- exeinto /opt/${PN}
- doexe masterpdfeditor5
- dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
- make_desktop_entry "masterpdfeditor5 %f" \
- "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
- "Office;Graphics;Viewer" \
- "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild
deleted file mode 100644
index 7b474ad5521c..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
- >=dev-qt/qtcore-5.4.1:5
- >=dev-qt/qtgui-5.4.1:5
- >=dev-qt/qtnetwork-5.4.1:5
- >=dev-qt/qtprintsupport-5.4.1:5
- >=dev-qt/qtsvg-5.4.1:5
- >=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
- insinto /opt/${PN}
- doins -r fonts lang stamps templates masterpdfeditor5.png
-
- exeinto /opt/${PN}
- doexe masterpdfeditor5
- dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
- make_desktop_entry "masterpdfeditor5 %f" \
- "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
- "Office;Graphics;Viewer" \
- "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
deleted file mode 100644
index 7b474ad5521c..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.3.22.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
- >=dev-qt/qtcore-5.4.1:5
- >=dev-qt/qtgui-5.4.1:5
- >=dev-qt/qtnetwork-5.4.1:5
- >=dev-qt/qtprintsupport-5.4.1:5
- >=dev-qt/qtsvg-5.4.1:5
- >=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
- insinto /opt/${PN}
- doins -r fonts lang stamps templates masterpdfeditor5.png
-
- exeinto /opt/${PN}
- doexe masterpdfeditor5
- dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
- make_desktop_entry "masterpdfeditor5 %f" \
- "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
- "Office;Graphics;Viewer" \
- "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild
deleted file mode 100644
index f1c1c8618ca9..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="https://code-industry.net/public/${P}-qt5-all.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-RDEPEND="
- >=dev-qt/qtcore-5.9.8:5
- >=dev-qt/qtgui-5.9.8:5
- >=dev-qt/qtnetwork-5.9.8:5
- >=dev-qt/qtprintsupport-5.9.8:5
- >=dev-qt/qtsvg-5.9.8:5
- >=media-gfx/sane-backends-1.0
-"
-
-QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
- insinto /opt/${PN}
- doins -r fonts lang stamps templates masterpdfeditor5.png
-
- exeinto /opt/${PN}
- doexe masterpdfeditor5
- dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
-
- make_desktop_entry "masterpdfeditor5 %f" \
- "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
- "Office;Graphics;Viewer" \
- "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.9.35.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.35.ebuild
new file mode 100644
index 000000000000..69d1eed91eb1
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.35.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+ sys-libs/glibc
+ >=dev-qt/qtcore-5.12.9:5
+ >=dev-qt/qtgui-5.12.9:5
+ >=dev-qt/qtnetwork-5.12.9:5
+ >=dev-qt/qtprintsupport-5.12.9:5
+ >=dev-qt/qtsvg-5.12.9:5
+ dev-qt/qtwidgets:5
+ media-libs/libglvnd
+ >=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r fonts lang stamps templates masterpdfeditor5.png
+
+ exeinto /opt/${PN}
+ doexe masterpdfeditor5
+ dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+ make_desktop_entry "masterpdfeditor5 %f" \
+ "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+ "Office;Graphics;Viewer" \
+ "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild
new file mode 100644
index 000000000000..69d1eed91eb1
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.40.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+ sys-libs/glibc
+ >=dev-qt/qtcore-5.12.9:5
+ >=dev-qt/qtgui-5.12.9:5
+ >=dev-qt/qtnetwork-5.12.9:5
+ >=dev-qt/qtprintsupport-5.12.9:5
+ >=dev-qt/qtsvg-5.12.9:5
+ dev-qt/qtwidgets:5
+ media-libs/libglvnd
+ >=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r fonts lang stamps templates masterpdfeditor5.png
+
+ exeinto /opt/${PN}
+ doexe masterpdfeditor5
+ dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+ make_desktop_entry "masterpdfeditor5 %f" \
+ "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+ "Office;Graphics;Viewer" \
+ "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild
new file mode 100644
index 000000000000..cc47f27cf8f1
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.82.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+ sys-libs/glibc
+ dev-libs/pkcs11-helper
+ >=dev-qt/qtcore-5.12.9:5
+ >=dev-qt/qtgui-5.12.9:5
+ >=dev-qt/qtnetwork-5.12.9:5
+ >=dev-qt/qtprintsupport-5.12.9:5
+ >=dev-qt/qtsvg-5.12.9:5
+ dev-qt/qtwidgets:5
+ media-libs/libglvnd
+ >=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r fonts lang stamps templates masterpdfeditor5.png
+
+ exeinto /opt/${PN}
+ doexe masterpdfeditor5
+ dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+ make_desktop_entry "masterpdfeditor5 %f" \
+ "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+ "Office;Graphics;Viewer" \
+ "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/master-pdf-editor/metadata.xml b/app-text/master-pdf-editor/metadata.xml
index 82340dc648a0..609ebb835863 100644
--- a/app-text/master-pdf-editor/metadata.xml
+++ b/app-text/master-pdf-editor/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>joaompssantos@gmail.com</email>
<name>Joao Santos</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
index b75bc4c44d79..f4a8cd628072 100644
--- a/app-text/mathtex/Manifest
+++ b/app-text/mathtex/Manifest
@@ -1 +1 @@
-DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
+DIST mathtex-1.05.zip 161624 BLAKE2B 9812cfadcc5d47286afb86c6ad38f5bdf932ef39efad2228b04b3b39cbb7543f78be9d82cfa8bbfcc72c9f46fa1931e39aeb71e3abab865dcd60e4e9717e2377 SHA512 f116618de4264efdbccb122b0e9769bbe622f6300266284a96e65f37346c000364063f201b31554bde62a4a4e13c0c8f16d570dca359d3ef27bc0f7622af3715
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
deleted file mode 100644
index c04f8dc4dfea..000000000000
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc"
-HOMEPAGE="http://www.forkosh.com/mathtex.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="png"
-
-RDEPEND="app-text/dvipng
- virtual/latex-base"
-DEPEND=""
-
-S=${WORKDIR}
-
-einfo_run_command() {
- einfo "${@}"
- ${@} || die
-}
-
-src_compile() {
- einfo_run_command $(tc-getCC) \
- ${CFLAGS} ${LDFLAGS} \
- -DLATEX=\"/usr/bin/latex\" \
- -DDVIPNG=\"/usr/bin/dvipng\" \
- $(use png && echo "-DPNG") \
- mathtex.c -o mathtex
-}
-
-src_install() {
- dobin mathtex
- dodoc README
- dohtml mathtex.html
-}
-
-pkg_postinst() {
- elog "To use mathtex in your web-pages, just link /usr/bin/mathtex"
- elog "to your cgi-bin subdirectory!"
-}
diff --git a/app-text/mathtex/mathtex-1.05.ebuild b/app-text/mathtex/mathtex-1.05.ebuild
new file mode 100644
index 000000000000..47b8d0d3f71b
--- /dev/null
+++ b/app-text/mathtex/mathtex-1.05.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc"
+HOMEPAGE="https://www.ctan.org/pkg/mathtex"
+SRC_URI="https://mirrors.ctan.org/support/${PN}.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="png"
+
+RDEPEND="app-text/dvipng
+ virtual/latex-base"
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+einfo_run_command() {
+ einfo "${@}"
+ ${@} || die
+}
+
+src_compile() {
+ einfo_run_command $(tc-getCC) \
+ ${CFLAGS} ${LDFLAGS} \
+ -DLATEX=\"/usr/bin/latex\" \
+ -DDVIPNG=\"/usr/bin/dvipng\" \
+ $(use png && echo "-DPNG") \
+ mathtex.c -o mathtex
+}
+
+src_install() {
+ dobin mathtex
+ dodoc README mathtex.html
+}
+
+pkg_postinst() {
+ elog "To use mathtex in your web-pages, just link /usr/bin/mathtex"
+ elog "to your cgi-bin subdirectory!"
+}
diff --git a/app-text/mathtex/metadata.xml b/app-text/mathtex/metadata.xml
index c3330bb45b70..24bacc8e9ec5 100644
--- a/app-text/mathtex/metadata.xml
+++ b/app-text/mathtex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
new file mode 100644
index 000000000000..554bfbc00189
--- /dev/null
+++ b/app-text/mdbook/Manifest
@@ -0,0 +1,238 @@
+DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
+DIST ammonia-3.3.0.crate 46061 BLAKE2B 082ee30f39ad788c9ae87888f003c2f6d08fbea7ae4983f1f5419c87c5303d860ecabf6f530bb76ff03da44c1f72f664053da79e6e3f4991e39b23104bcedd97 SHA512 8bed262b3790a5629918f188c246f0039f4e3b46908b367993e61c280a99c775b85982bb5cdce5c66781a40b8b7f8ab1ebbe2900d590ee3ba0788dd5d854b155
+DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
+DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163
+DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
+DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011
+DIST assert_cmd-2.0.13.crate 23917 BLAKE2B 72fbb8afc12429a96c89b07dce8b2a969a1c2656aedf19ac9cd2bd1e5d5f29b3c558616858ad01a86807b787c88efc556ad432a55b59b0df5b4bdbeb9b6ab05e SHA512 3599483d28f1893945b63d693f38d656724f382ac7a0c2cb0773d72e6bba3dcc9137cca51575fca984c2435b081cd6ad68ed5d1fa04e606484926528cc41a305
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244
+DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9
+DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
+DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.4.2.crate 42602 BLAKE2B 768d4ca52aca73d8acf2f494a66957ed2603eefd5a04332ed0880d230c2cc6ef3bfdc0792fa6f288a0eb132913dbb256793e580bc34f4a40e8200e1fbafe97a9 SHA512 ef4c20e6e78a2ecee97e17189b7100a504d8176c7c15d7f17d62157a116d66f83f8b2bba472a4acf02cd3edbd94b20a7047af918c3f3b371e2e04f7474be0214
+DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb
+DIST bstr-1.9.0.crate 380170 BLAKE2B 06ae5065a5d566b6333e911a5b97e3999ad2f0bc19b27023187004c81cd01e5315dcac920ff87a6bb87ccfbb949364f1361dc04d342e24f9f54490b5d44a81d1 SHA512 dc313a16c38ad881128977a20bb390e7c95a96d9530596433a7c4fd7f77d5fffd079d436006dd8d2bfc4aacdd7f0aff229504444250418f6aa3f8d6d4df9abba
+DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
+DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
+DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3
+DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.33.crate 221279 BLAKE2B cc7b71b996a1c15b6b013d06f57ffd8af78b72fab87c0e9123f87918d404787ade2217e8e58fb0153552e49c6e11ca6e820eb0c0f1add8c43619849fa096a214 SHA512 172996d2ccc8733957d45fcc24fefb3531c7b33a798ab9f494be23f08d6d2bc350401574c626fd8eec0191ba28c0f7b73af7bc4235ec72a4b1d437fb7e89c875
+DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9
+DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2
+DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b
+DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
+DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6
+DIST crossbeam-channel-0.5.11.crate 90434 BLAKE2B 8666f039a0e4ac6f0f8be2d08ce3349d8ad4aa7d0f38c638dfa6dc6a7f30a1629e42f87757d9e054e836941dff6a8efa53b5337706bc5958d33dee61f38e7bcd SHA512 1d37bae1c946d402c1fce37f22a82037d68896770757aa91d209387f947d39c514df52e0ce94317141513784511ac626482f16099cc3b62ca28a52f387b69c71
+DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864
+DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2
+DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9
+DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
+DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae
+DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
+DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c
+DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
+DIST elasticlunr-rs-3.0.2.crate 109533 BLAKE2B 139430cb7e7ca84a925f6eb7fbb5fc169ef1eb2704f5766a05f1574807794613679d1a9246f310afc1d57c5b5150d2be299e3c8f4583e6f6b4dbb1acf81fd774 SHA512 2f65cc09ac0a9a806fe36a617fe1fd8b6eddc2fa427012ed3fa2eee2f05743089820a801063d0fcd38bf5269b70b6b5f5ad0e6d706cfd461fcf4a62a9f956361
+DIST env_filter-0.1.0.crate 11553 BLAKE2B 8e358517c0aeda431239f14610925bcfd6be3bd346c7628e1818cdbaa1796bfdf2454db99cd06bc6ffdca95e7ff47c0a621d1f4c3bb50ecd1641f9d19efe4b4d SHA512 a0ab51c2b905466d23c75fd77b430dff2956556b7687ea434050c78a497cbe63018c5730be950724c0ca6aefe29bbc379ac01c8a7cd2779a69c5a03e92a21bf1
+DIST env_logger-0.11.1.crate 28442 BLAKE2B a60201afe8151f8f6472bfc002ebbe6570cbf64e59c39c3e0650780a3599f3fba1f1229ded2ac23fad3c55684a9611289be302e196d7bbd3fe9a74dfa5680bfb SHA512 6b4b6a527e5145b38139f412a321972c728366388ddcdef88ffc2932a10b78e97ea50a560f6574216d1917562d193edac1df3805b56cb3cb80e69bfaa58d98f2
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
+DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3
+DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
+DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
+DIST futf-0.1.5.crate 11344 BLAKE2B 2cc5e5f5d4ace47e9273546e46c500432da47f246cee18f24607432305dec9481ec3d02b8a9bff4724efe05ea1d235294c52ee4eeb2f5f285ce56c2987b62d24 SHA512 4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3
+DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c
+DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4
+DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc
+DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3
+DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d
+DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951
+DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d
+DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee
+DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25
+DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
+DIST h2-0.3.24.crate 167814 BLAKE2B df25fee9f6e39f8ddcb9c1be4775d055328606b3454786a397c50564e3e8340d72d0fd58581239063e29fb80acf92444e1d588b0672817b12cc5c1322652189d SHA512 4741e2732f08c6388c112877f52d6f859088026f75bf928f90b06a521d43e8e8c10f14d088f8a17b42a0a613ee43009882077a68df9300d17365d936400f1695
+DIST handlebars-5.1.0.crate 97779 BLAKE2B 584b6f710a4860168b0ca6e587adf19181ea7580a733ba2570380d0d7418fbf7551a77d5a52677704122e7ba7f2d63d3740d6f95a2731119669e6335389ff81a SHA512 6f80735c183bdfea58547329bfd72bc63aa21e6bdf74dc06782adfbb4e987ee31f0f86d9ceee4abab99b5ea2083c3d3369856ac51123e3bfaa0e4704e2406d64
+DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
+DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1
+DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
+DIST hermit-abi-0.3.5.crate 14437 BLAKE2B 62b2d2d7d2d5d63ee79d98d3604e79705b34c3e50a107e36f06d56783f7df22debba00b135c3d9cecdd5ecdde6bb5e1e052ab7e843dfd791dd9f8eedf931f96e SHA512 28256ece8ed613bb789a194ab44dd071e48c16ce9f8d4622f828b5ffb83fdee18cd7fa939b40987060a43d76d4b76b3b78cc1109ab15c75880517661b8843bc5
+DIST html5ever-0.26.0.crate 72921 BLAKE2B bba23709f6404afcb86dc5af8fe8c0728c4c407de7cfc679c286ef13a790077329f7df2a065eae742e7b4c2303e01793e1b936daadd73f663cf2933845d975c9 SHA512 383a25421cddb0573e41ca93131d681cfbfaf551989337845a197e939a2580751ae90e96605bfc4e187dbd5189b6c014557cc69e3d7d2d2cdfb88eeca8896089
+DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51
+DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462
+DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f
+DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
+DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7
+DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722
+DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
+DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
+DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9
+DIST indexmap-2.2.2.crate 76160 BLAKE2B 1b020e3e33204e9e0cf15e0b91a600296147432002e94ae1061f1d7511e3435a29c1c0c438933eb6a56c7c522cbdfff29a106622041815cbd706b9515e2ab82d SHA512 814cffe0e586940c82c152536a970917ec8702a9b946151ccc8574188fa2cb0fab094888c0e910917c99e37f5f53723ab799999fab4bee395bca7d45adeed40c
+DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
+DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
+DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST js-sys-0.3.67.crate 80764 BLAKE2B aee8b96c8c5811020b3ee4277524902e27d96a027add7b21a8ff94eaac7db15e8de08a9e203ff462b05ce10d0a44aff78a355c07514794e41f49fa936a3c8fb2 SHA512 590d947a869c3435166e34c25b3011351f6804b43887ee76bc2be69b7407b5181bbbc3a5bf6c50867c65d73fcd8e65ac7b0d395710ccd52000beb87f8826be96
+DIST kqueue-1.0.8.crate 12642 BLAKE2B 93a0ee7484655045986d6d5ca800ca001d68bb327f841bff3e54b38beff09ff10c099b2432ebf90cf8213153370e4c4aeab9bb0eb3bb02b1bb494b461dfd2fa0 SHA512 c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3
+DIST kqueue-sys-1.0.4.crate 7160 BLAKE2B d75e152cfccbdf7ae000be14e0f84c6d1fd07290fe498349a8715061a83d8c02011b59578db2c451de011ac3eb4b218aeea73963a2a5cd82e7f5f49de0779632 SHA512 6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5
+DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
+DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62
+DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
+DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
+DIST markup5ever-0.11.0.crate 34667 BLAKE2B 7a4e9c860949296912616fab105b688fc5ad86df012f064efb3e5125aae57869b4e63f4a551fc787e65987e5bb8c0dc26e2ff99651a2e56fa67237796f5967e8 SHA512 c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e
+DIST markup5ever_rcdom-0.2.0.crate 222948 BLAKE2B 2105ceee730f5fbb3c14ddb7bfe8ee5139febc870e37e9ea169f107ac8060ee4f5782b185310bada5f646600c2b8bb7fbed144c056e5b437133443f62a04ad99 SHA512 bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4
+DIST mdbook-0.4.37.tar.gz 1530568 BLAKE2B 42c3daa2c4169fd9baf7aa217b8f0d119b3aa9146c514af35b5d8747111ab1f44e0e66191fb7df2c650bb55fe011af9cbaec399cc7171bf8407f9843e88030f9 SHA512 f7f11ea46b6f1ca89922c0898ce5ed68711cab0e6cc1cde5654454dbd4424fdbd907787d40ac188c82b581223badd4d4d82d65c4bc1119114b3e7062d8c44e8a
+DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473
+DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1
+DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
+DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432
+DIST mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2
+DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
+DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
+DIST normpath-1.1.1.crate 19786 BLAKE2B 39c955c41283051e414f8576fdaa51f11f0ab5a23bfb7f6aaaac38fd9474912721c546810c02da335a9095fdd6d8e37ff2f5fad2aa93d93c21b4be76267088fa SHA512 05f1f498f571c57c2307d201d5fa15c72fd2f297b7854757107bb27684470d43a4d40137d31c735018dd2ba50c11f23dfd5e989909e809bdedcd7bbf018385ca
+DIST notify-6.1.1.crate 40117 BLAKE2B e8f2626841903b7cb261ece9ff7d42aa6655b439a2d613f43a0d518355af2842e8731a6a2a92fdb84d82f0f7cf7423f051ab529cd22248944a19b3338e5b0f29 SHA512 58a44759d96c3ec7c431a37d92e1c1a0f112d75fac9651e9fead7a3a1de46074d79a251320b0522891711879da4ab42dd008c5a28a994039890f8d434d215e69
+DIST notify-debouncer-mini-0.4.1.crate 10227 BLAKE2B 1c4427c0b0b1c995dc779c24585f88aadca3a2791e51a481189ea364b58c391a4956a76bf1cc5857d4193dbf7bcf75a40daaaf56dc772dae4fc81ebd4effccbb SHA512 3ecebffd777828e0c4fdc547f03b055742945b5a34ab4ebb735adda41944a6d5008aef9e887f88c212bf9a8406320bfd0cbe128bdd140f781016d59831b4d1f4
+DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
+DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
+DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96
+DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST opener-0.6.1.crate 19173 BLAKE2B c235ccc8ca6f1f87a30bcf94b0014b5e1df99c6dfd942d5c3ab02f351afdc8c8fa3f7074ab87450eea939bf682d31e3a08ce90d18dcce88aefaaa7ea61425785 SHA512 bd56a5c23a3d1fc3d5828bbffc3f7df6f3d92f03cf38665587ebb5b16a716e04395ee30b239acfa8fc95f4daa67807e48d9cfcc79817f2926880832c4ea4ba2c
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
+DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
+DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
+DIST pest-2.7.7.crate 118478 BLAKE2B e1464444fc114fcfa261e671733f73849001f8481e9e204c3782197a907162b9a037f7e804abf6f4be544ff9736ca63d87b7ea109470a8953b53a5c91e6ce920 SHA512 3edceb5acc379082e1a3e3d3600039232e8440fcf7b323c70951c78bc195069a5758cc6c47a69734f3e2bf323b520587610727105da70a2bd28f963e286dcd76
+DIST pest_derive-2.7.7.crate 35839 BLAKE2B b51f407eb54f9f8f1adbcfc4d1c2af3ac76b0c6d4cfa1a0eaa265a00458e892bd421f3d440904dd404a1818e7b79465d8050ed027f1e6f3e54125a887f4576ab SHA512 5717026ac6882dfa99ecf68d6ffe7dffdf5c74def257039d5619d2878816c245faeae0e5925372f9c636fe1d5067c6227197b34e0657c7788b753ae729dc431f
+DIST pest_generator-2.7.7.crate 18184 BLAKE2B a66c47676bbc7a911a4fc0e4687e445e10b6022277505aaab91632801ee7de59ce8b9ba665bbabe668437ac90e81e3718294d15a1c875cb7b6586f81e86795c8 SHA512 93b41b542bcddbdfd546963ea26d4871a9cfc38a2da55efad3b354ae705ee7f8ee6884279cb8a56da9e33e5f039f72964f2396c89d5346dcd668502a38ac73c3
+DIST pest_meta-2.7.7.crate 41562 BLAKE2B cfe95f7a8cbda7d22126e365ae81c4a7e73ea18112f4b64ba46226f2e05cdbe3d1ffa8721487a48d204cce0e649b8b26ecd8f29fe16064d4f5147decf90476de SHA512 9b515dc49f171362c70e2751bf14bf78792662ac2ef27bf8a32f7f5c49a9204b0b9ae47bf997953a8ed49dd0104095c34cd8ad3f3a6a4c00255b6a7212b58ea5
+DIST phf-0.10.1.crate 5406 BLAKE2B 70532bb97a0089ef2a57a1bd43b4dd30f0289ffc1a15357ffd8a372d82374bd505f4e39d3bfd6bc2d3c2afca39703c89e3ed37ac41c364cee3759bf0cb609f82 SHA512 84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073
+DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1
+DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
+DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
+DIST pin-project-1.1.4.crate 54230 BLAKE2B e90fcdc609f42171b18a42626e59dd904555774c4c012a274149d18ee899ade6969c31d9fd706a363ee2d1a510d80d24e438e04cbed5f4ab26b9d645256e2438 SHA512 e378034c6de9148797d874e9a4ecf66039c662c54c263a06413a2ebf5bbbbdf21419e8738d6b2eca6bb5d2043102e52dc6d0e370e7c242830ced0779e13cb6d8
+DIST pin-project-internal-1.1.4.crate 28249 BLAKE2B 6d8dae4d59d0b71c9a66414cf5babb45285a8d67f798a25e5521495ae23e983b871bc8f70c20d0785b5b53acf9a5cf734f137b581852a542f98b0492cf6568f6 SHA512 b8a687d1d2fa84bccb41eb7652434036c227268177f2f05a7071b0dfb16672fc8a9762ecac6c4e519478cefe16ed4bcc2c77dd9298057dc42f87021f8e0a603b
+DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
+DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0
+DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
+DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
+DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995
+DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769
+DIST pulldown-cmark-0.10.0.crate 139056 BLAKE2B 72974ca5b8fa8de1dccadb65900295ea3a0adf9f86913c89ab16c5c49f65d4f3368453dc2fae807f5cfda5646b26a822e3f7e4b7f6f15bdd7ef058365f3eafef SHA512 cf6dd2f0a3a4a9a1f4032ae7f6084ca7805d54576de8083951c50dfff7a426ee5b0846bc7719ecf07c43a298a02e85ff1fcd891d0a163528361baf19a0b19044
+DIST pulldown-cmark-escape-0.10.0.crate 8944 BLAKE2B 554bef1897d8bd20fb679d155c710cfb8bcba4bec52afe6b8f634b671b6d2e4dc12ad6655df0b94196d57a1f3e1bb39bfdc652e42f3ec90d880529bf5da36e48 SHA512 282bf294d525f0b7550ef33fd8ca8604c62d4175b083f241a4524e377ab26d9f578ff2f52e0bf33e371fdfd0f93adf0d14d0e3171c412046f17bcb91826d25ea
+DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
+DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d
+DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
+DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
+DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960
+DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37
+DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
+DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
+DIST select-0.6.0.crate 60292 BLAKE2B 725c9b4e8d9143633f07472268c834a25040a9f133ba95db1c41ceb45692b98a9fe7fba98c10bdc48524722b37bf9395a105385752c6bd3beb044b7d65aacf07 SHA512 8e5b14ee8cd2d88eb908fdf750cfd724741019ad4bbafa1fdeafde10db0b7cc6a86883d8aad7c1267e772dec63e2f138e57d52ab425b8c5a10faed9329dccdfe
+DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35
+DIST serde-1.0.196.crate 77097 BLAKE2B 22403615511a7621a9d8d54fd2dcc63878cd2de0e43bff6b7921db85e19f34ee5022eb1086890edb6987428cbb707a59277ae007d1536b5d80a7da615fc3f36a SHA512 0917aa36d855ca77726d538fb7fcfcf629722c784d747b3869c0d69444c447d7b1fab556a9eb9594ddf6cc508df636fdde051a1c3909f9c691e4921946ebda19
+DIST serde_derive-1.0.196.crate 55775 BLAKE2B 3d06b3896f0cdd1b1acdcd0046bdbfd1e8a298d6f07d12a2326ff144baaac07fcbd4af1d18b8b1188d4cc192e253fcd79860d1dbb2ecb148025449c0ac954c72 SHA512 f4df7f835e8416e4662c62a46d5f6e6d45ffd103812d681b220f8080310720e27f738a34a8e622df722fed55a1d8c654dd4abfbd78d1fdc871306bf3985baf22
+DIST serde_json-1.0.113.crate 146970 BLAKE2B 8d80b0fc913ba4f008175c6b89955870af6476dc8bae0cd711b748cd0a2bf67b1299396bbd492a1ae5a4ff8050fddc85f0a0ab54f7b24e27529ead3e3d7c920e SHA512 82571b025cd598fca635f18881b52db2364e07eff1b961ca7e3b0591dd41f95503f7188ef1ee6fbc060b9a2360cacbc8a5b85c01fef7879ae3392b29c0004b34
+DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
+DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f
+DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
+DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a
+DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
+DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
+DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c
+DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
+DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45ee88dba9756449f3ef4c4884e491b7810e1c9f10b58012244dafa4422d5589502876f30a43940ee9754ef7b9952ebe4bb41 SHA512 01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
+DIST tempfile-3.10.0.crate 33376 BLAKE2B 303e3bbc2492fd965c5e5ca02229868e94de1b1286175a07b3f9767a174c5a83bb6f6ab59d582f963f9cc4f92362be6a8e898e140397e4314bc18bd8d4e13249 SHA512 0f9bb6420105badfaf7e59f9679b53c6e3f875208ad8b08b9bf38cf67a1512742f1e3dc586136ec9cb760d127da6be69e9f9ed55f18722edf1af3a452e7d93fa
+DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
+DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681
+DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
+DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c
+DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
+DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848
+DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6
+DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303
+DIST tokio-tungstenite-0.20.1.crate 28569 BLAKE2B 3f0534f6ff68c53383dc70c244264373d324d88431c7c4e0e837a3c2dd20047731f58f085f5d7339d7e7bd56a4952da60848b796af1f47817e435c3649d84c52 SHA512 eb4d3ca0f8beca4c835ab174590c6e023ad2e0e19daae36d4296061886a306569bd1a18ac23bb28359179e1d29f93723244cba42905be814b133185b2ef6eeec
+DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c
+DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
+DIST topological-sort-0.2.2.crate 10566 BLAKE2B 4b806d2ac1267104f921c80290dd55227209eea099a30f314a88738f95823221918a5097f4c0e694498e641bce3205c6c6cf5317fe37185de301a2a11bd101b0 SHA512 1334300f1022126138355ce1c4b33f60297765f9dab6888242e78be76b0df9e83560be693eabaaf10f9aea2dfdb90e248b02b0cee89dca495a1e365d9b6e87dc
+DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005
+DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275
+DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521
+DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08
+DIST tungstenite-0.20.1.crate 60095 BLAKE2B 9a9cc88aefe4f30d4e11673d2e3f757861dc5b082c026a6da54728b4a29dff1e88ca20e2641ef35ba95f01f8525b628b6d6e5410fdbd8d02954d626190e52a40 SHA512 e6a9311e521a7f882497ee7756d39de3ef963937f64ac09c20d28af4c49e9f0d14fe95fee3538c930d18ee1f9ad8e93c6faca1c4ddcbc5f444100dc02261c729
+DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
+DIST ucd-trie-0.1.6.crate 45790 BLAKE2B a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823 SHA512 00d9732797029c16d84fe518b2d90de841b87b5ed6c3628b9f097f5340f1e50778749db18f22e4ecc513f53624806ddc3484e5cc9ebffdbb6c0c800bef817e95
+DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828
+DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
+DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
+DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
+DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526
+DIST warp-0.3.6.crate 116794 BLAKE2B ee3396698ba62593e80fe4d0090ada41919f056dadcafdb9533741cbecadb7203a9f436ecfc2d07c21be5034198f12b8c42b6a10e6ae19995d199d71e2a13a6a SHA512 a150a55e1625e2c95aaa0ca3bfc0e9b79e75c5d04898a6ae8cd91fdaad342ebb5c1b2305a6d10640eb0d67b19b3ba8f3fdad3c45b345967da11e29210a131255
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST wasm-bindgen-0.2.90.crate 182529 BLAKE2B 309bf19f4f0551ced885ef7ef80c56bc54431cf06c77e430872fb87e3cfde0c0dc49b018d070b505ea8e488e94a4845ed143430e3c4b70ee48713147b980c6e9 SHA512 c6f73581590a8142b66bdc6373d925f1b1d37d4d09718b49c3454d3d2e16eab3dde97724cbd246420e0c29656bac8ede82eaa0b0e94f22238628dd974223db62
+DIST wasm-bindgen-backend-0.2.90.crate 28348 BLAKE2B 14193bacce7df590b372bbab1126255cca027fd94c76c17ab13b06e7c18346b5ffff5e2c9d0ff5bdc631846fca70eac9a43e4ffcaf58f0c062ee36fe025abf75 SHA512 7b19cfee23dad5b09b6089d2b56692bc183d477fed5db8a91a6b30c574b3de4b1d45004761248d8c5437ce20a5ff64f7e081fccbd84e8ed72fd154e5a06607da
+DIST wasm-bindgen-macro-0.2.90.crate 13904 BLAKE2B bd5e3521c27f7ec3cee0f2ac4cf894ea5a9b9bde65ec55ae9b29d033b986338af92e2dc9932b87dbf739f4ba48230f17a16226cf1826afe13b102225af29c1c8 SHA512 97dc09c02ea4daa1694f3a118aed3ae958373e179bc7ae4d7bcd14b9958f79c03564d678ec04d7f80b6e6a5529f63f1a853b2905055be8a210d41a12ff279007
+DIST wasm-bindgen-macro-support-0.2.90.crate 20008 BLAKE2B 46172ab1e6d03faa2a29d8b2d1bb3b37dcb830d73aa96d0922b63627a6eced1d38729ff85bba7eba3e89dfbd04fbb92a4b87cd74a1a906286c61145e3ad38da9 SHA512 9a5782cebb192276a0a05b54f8cadd994cbb97388d72c85f9c60754ade309684883cb2f916badc1360522a6599172eab84aa2bc981889cf2ef2aed8a4e0a3577
+DIST wasm-bindgen-shared-0.2.90.crate 7264 BLAKE2B 2082267bcfae660b72f6d5996a563d10319a1cd7078b37070f41e96aa56da31ca0a22c168a1e5fe52294f5d7a50c76d06f03d489cfcc0826db29316f2e67ebbc SHA512 f6639c004b17661d0a571181e1447db7eeadbfe93005d6f0e1bab983967591b64cf2ed21e7b77934ad45058adedcae28af1ef141696bd598f9c2d683abf93018
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36
+DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
+DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
+DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
+DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
+DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
+DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
+DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
+DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
+DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
+DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e
+DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
diff --git a/app-text/mdbook/mdbook-0.4.37.ebuild b/app-text/mdbook/mdbook-0.4.37.ebuild
new file mode 100644
index 000000000000..2b512da75f1f
--- /dev/null
+++ b/app-text/mdbook/mdbook-0.4.37.ebuild
@@ -0,0 +1,282 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+ addr2line@0.21.0
+ adler@1.0.2
+ aho-corasick@1.1.2
+ ammonia@3.3.0
+ android-tzdata@0.1.1
+ android_system_properties@0.1.5
+ anstream@0.6.11
+ anstyle-parse@0.2.3
+ anstyle-query@1.0.2
+ anstyle-wincon@3.0.2
+ anstyle@1.0.6
+ anyhow@1.0.79
+ assert_cmd@2.0.13
+ autocfg@1.1.0
+ backtrace@0.3.69
+ base64@0.21.7
+ bitflags@1.3.2
+ bitflags@2.4.2
+ bit-set@0.5.3
+ bit-vec@0.6.3
+ block-buffer@0.10.4
+ bstr@1.9.0
+ bumpalo@3.14.0
+ byteorder@1.5.0
+ bytes@1.5.0
+ cc@1.0.83
+ cfg-if@1.0.0
+ chrono@0.4.33
+ clap@4.4.18
+ clap_builder@4.4.18
+ clap_complete@4.4.10
+ clap_lex@0.6.0
+ colorchoice@1.0.0
+ core-foundation-sys@0.8.6
+ cpufeatures@0.2.12
+ crossbeam-channel@0.5.11
+ crossbeam-deque@0.8.5
+ crossbeam-epoch@0.9.18
+ crossbeam-utils@0.8.19
+ crypto-common@0.1.6
+ data-encoding@2.5.0
+ difflib@0.4.0
+ diff@0.1.13
+ digest@0.10.7
+ doc-comment@0.3.3
+ elasticlunr-rs@3.0.2
+ env_filter@0.1.0
+ env_logger@0.11.1
+ equivalent@1.0.1
+ errno@0.3.8
+ fastrand@2.0.1
+ filetime@0.2.23
+ float-cmp@0.9.0
+ fnv@1.0.7
+ form_urlencoded@1.2.1
+ fsevent-sys@4.1.0
+ futf@0.1.5
+ futures-channel@0.3.30
+ futures-core@0.3.30
+ futures-macro@0.3.30
+ futures-sink@0.3.30
+ futures-task@0.3.30
+ futures-util@0.3.30
+ generic-array@0.14.7
+ getrandom@0.2.12
+ gimli@0.28.1
+ globset@0.4.14
+ h2@0.3.24
+ handlebars@5.1.0
+ hashbrown@0.14.3
+ headers-core@0.2.0
+ headers@0.3.9
+ hermit-abi@0.3.5
+ html5ever@0.26.0
+ httparse@1.8.0
+ httpdate@1.0.3
+ http-body@0.4.6
+ http@0.2.11
+ humantime@2.1.0
+ hyper@0.14.28
+ iana-time-zone-haiku@0.1.2
+ iana-time-zone@0.1.60
+ idna@0.5.0
+ ignore@0.4.22
+ indexmap@2.2.2
+ inotify-sys@0.1.5
+ inotify@0.9.6
+ itoa@1.0.10
+ js-sys@0.3.67
+ kqueue-sys@1.0.4
+ kqueue@1.0.8
+ libc@0.2.153
+ linux-raw-sys@0.4.13
+ lock_api@0.4.11
+ log@0.4.20
+ mac@0.1.1
+ maplit@1.0.2
+ markup5ever@0.11.0
+ markup5ever_rcdom@0.2.0
+ memchr@2.7.1
+ mime@0.3.17
+ mime_guess@2.0.4
+ miniz_oxide@0.7.2
+ mio@0.8.10
+ new_debug_unreachable@1.0.4
+ normalize-line-endings@0.3.0
+ normpath@1.1.1
+ notify-debouncer-mini@0.4.1
+ notify@6.1.1
+ num-traits@0.2.17
+ num_cpus@1.16.0
+ object@0.32.2
+ once_cell@1.19.0
+ opener@0.6.1
+ parking_lot@0.12.1
+ parking_lot_core@0.9.9
+ pathdiff@0.2.1
+ percent-encoding@2.3.1
+ pest@2.7.7
+ pest_derive@2.7.7
+ pest_generator@2.7.7
+ pest_meta@2.7.7
+ phf@0.10.1
+ phf_codegen@0.10.0
+ phf_generator@0.10.0
+ phf_shared@0.10.0
+ pin-project-internal@1.1.4
+ pin-project-lite@0.2.13
+ pin-project@1.1.4
+ pin-utils@0.1.0
+ ppv-lite86@0.2.17
+ precomputed-hash@0.1.1
+ predicates-core@1.0.6
+ predicates-tree@1.0.9
+ predicates@3.1.0
+ pretty_assertions@1.4.0
+ proc-macro2@1.0.78
+ pulldown-cmark-escape@0.10.0
+ pulldown-cmark@0.10.0
+ quote@1.0.35
+ rand@0.8.5
+ rand_chacha@0.3.1
+ rand_core@0.6.4
+ redox_syscall@0.4.1
+ regex-automata@0.4.5
+ regex-syntax@0.8.2
+ regex@1.10.3
+ rustc-demangle@0.1.23
+ rustix@0.38.31
+ rustls-pemfile@1.0.4
+ ryu@1.0.16
+ same-file@1.0.6
+ scoped-tls@1.0.1
+ scopeguard@1.2.0
+ select@0.6.0
+ semver@1.0.21
+ serde@1.0.196
+ serde_derive@1.0.196
+ serde_json@1.0.113
+ serde_urlencoded@0.7.1
+ sha1@0.10.6
+ sha2@0.10.8
+ shlex@1.3.0
+ siphasher@0.3.11
+ slab@0.4.9
+ smallvec@1.13.1
+ socket2@0.5.5
+ string_cache@0.8.7
+ string_cache_codegen@0.5.2
+ strsim@0.10.0
+ syn@1.0.109
+ syn@2.0.48
+ tempfile@3.10.0
+ tendril@0.4.3
+ terminal_size@0.3.0
+ termtree@0.4.1
+ thiserror-impl@1.0.56
+ thiserror@1.0.56
+ tinyvec@1.6.0
+ tinyvec_macros@0.1.1
+ tokio-macros@2.2.0
+ tokio-stream@0.1.14
+ tokio-tungstenite@0.20.1
+ tokio-util@0.7.10
+ tokio@1.36.0
+ toml@0.5.11
+ topological-sort@0.2.2
+ tower-service@0.3.2
+ tracing-core@0.1.32
+ tracing@0.1.40
+ try-lock@0.2.5
+ tungstenite@0.20.1
+ typenum@1.17.0
+ ucd-trie@0.1.6
+ unicase@2.7.0
+ unicode-bidi@0.3.15
+ unicode-ident@1.0.12
+ unicode-normalization@0.1.22
+ url@2.5.0
+ utf8parse@0.2.1
+ utf-8@0.7.6
+ version_check@0.9.4
+ wait-timeout@0.2.0
+ walkdir@2.4.0
+ want@0.3.1
+ warp@0.3.6
+ wasi@0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-backend@0.2.90
+ wasm-bindgen-macro-support@0.2.90
+ wasm-bindgen-macro@0.2.90
+ wasm-bindgen-shared@0.2.90
+ wasm-bindgen@0.2.90
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.6
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-core@0.52.0
+ windows-sys@0.48.0
+ windows-sys@0.52.0
+ windows-targets@0.48.5
+ windows-targets@0.52.0
+ windows_aarch64_gnullvm@0.48.5
+ windows_aarch64_gnullvm@0.52.0
+ windows_aarch64_msvc@0.48.5
+ windows_aarch64_msvc@0.52.0
+ windows_i686_gnu@0.48.5
+ windows_i686_gnu@0.52.0
+ windows_i686_msvc@0.48.5
+ windows_i686_msvc@0.52.0
+ windows_x86_64_gnullvm@0.48.5
+ windows_x86_64_gnullvm@0.52.0
+ windows_x86_64_gnu@0.48.5
+ windows_x86_64_gnu@0.52.0
+ windows_x86_64_msvc@0.48.5
+ windows_x86_64_msvc@0.52.0
+ xml5ever@0.17.0
+ yansi@0.5.1
+"
+inherit cargo toolchain-funcs
+
+DESCRIPTION="Create a book from markdown files"
+HOMEPAGE="https://rust-lang.github.io/mdBook/"
+SRC_URI="
+ https://github.com/rust-lang/mdBook/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz
+ ${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}/${P/b/B}"
+
+# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
+LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1"
+LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="doc"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_compile() {
+ cargo_src_compile
+
+ if use doc; then
+ if tc-is-cross-compiler; then
+ ewarn "html docs were skipped due to cross-compilation"
+ else
+ target/$(usex debug{,} release)/${PN} build -d html guide || die
+ fi
+ fi
+}
+
+src_install() {
+ cargo_src_install
+
+ dodoc CHANGELOG.md README.md
+ use doc && ! tc-is-cross-compiler && dodoc -r guide/html
+}
diff --git a/app-text/mdbook/metadata.xml b/app-text/mdbook/metadata.xml
new file mode 100644
index 000000000000..8ced3c48b9d3
--- /dev/null
+++ b/app-text/mdbook/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
+ <name>Ionen Wolkens</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rust-lang/mdBook</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch b/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch
new file mode 100644
index 000000000000..a5cc60335209
--- /dev/null
+++ b/app-text/mecab/files/0001-configure-remove-terrible-horrible-code-that-resets-.patch
@@ -0,0 +1,33 @@
+From 8ddfa1e8c274759f287c9ee73d4d1625028c3bb8 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 29 Feb 2024 16:44:27 -0500
+Subject: [PATCH] configure: remove terrible horrible code that resets CFLAGS
+ to "-O3"
+
+... and totally ignores all user defined flags.
+---
+ configure.in | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index a5e2a5e..4ac75c1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -85,14 +85,6 @@ else
+ fi
+ fi
+
+-dnl
+-dnl check gcc
+-dnl
+-if test -n "$GCC"; then
+- CFLAGS="-O3 -Wall "
+- CXXFLAGS="-O3 -Wall "
+-fi
+-
+ dnl
+ dnl check Char Code
+ dnl
+--
+2.43.0
+
diff --git a/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch b/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch
new file mode 100644
index 000000000000..5776cf5b2aa5
--- /dev/null
+++ b/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch
@@ -0,0 +1,16 @@
+Dropping usage of binary_function
+--- a/src/dictionary.cpp
++++ b/src/dictionary.cpp
+@@ -65,7 +65,11 @@ int progress_bar_darts(size_t current, size_t total) {
+ }
+
+ template <typename T1, typename T2>
+-struct pair_1st_cmp: public std::binary_function<bool, T1, T2> {
++struct pair_1st_cmp {
++ public:
++ using first_argument_type = bool;
++ using second_argument_type = T1;
++ using result_type = T2;
+ bool operator()(const std::pair<T1, T2> &x1,
+ const std::pair<T1, T2> &x2) {
+ return x1.first < x2.first;
diff --git a/app-text/mecab/files/mecab-0.996-clang-16-register.patch b/app-text/mecab/files/mecab-0.996-clang-16-register.patch
new file mode 100644
index 000000000000..5e782e61fb0c
--- /dev/null
+++ b/app-text/mecab/files/mecab-0.996-clang-16-register.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/894362
+https://github.com/taku910/mecab/pull/66
+
+From 731d738f33dcf62dc9da93104ca1dd6f4c7c9c5f Mon Sep 17 00:00:00 2001
+From: Yuriy Chernyshov <thegeorg@yandex-team.ru>
+Date: Fri, 11 Feb 2022 12:31:33 +0300
+Subject: [PATCH 1/2] Remove register storage specifier
+
+register does not work in modern C / C++.
+--- a/src/char_property.h
++++ b/src/char_property.h
+@@ -37,7 +37,7 @@ class CharProperty {
+ inline const char *seekToOtherType(const char *begin, const char *end,
+ CharInfo c, CharInfo *fail,
+ size_t *mblen, size_t *clen) const {
+- register const char *p = begin;
++ const char *p = begin;
+ *clen = 0;
+ while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) {
+ p += *mblen;
+
+From 82fd6424fde64c77f49695883a18f368ba96850e Mon Sep 17 00:00:00 2001
+From: Yuriy Chernyshov <thegeorg@yandex-team.ru>
+Date: Sat, 12 Feb 2022 14:31:03 +0300
+Subject: [PATCH 2/2] More fixes
+
+--- a/src/darts.h
++++ b/src/darts.h
+@@ -404,10 +404,10 @@ class DoubleArrayImpl {
+ T result;
+ set_result(result, -1, 0);
+
+- register array_type_ b = array_[node_pos].base;
+- register array_u_type_ p;
++ array_type_ b = array_[node_pos].base;
++ array_u_type_ p;
+
+- for (register size_t i = 0; i < len; ++i) {
++ for (size_t i = 0; i < len; ++i) {
+ p = b +(node_u_type_)(key[i]) + 1;
+ if (static_cast<array_u_type_>(b) == array_[p].check)
+ b = array_[p].base;
+@@ -431,12 +431,12 @@ class DoubleArrayImpl {
+ size_t node_pos = 0) const {
+ if (!len) len = length_func_()(key);
+
+- register array_type_ b = array_[node_pos].base;
+- register size_t num = 0;
+- register array_type_ n;
+- register array_u_type_ p;
++ array_type_ b = array_[node_pos].base;
++ size_t num = 0;
++ array_type_ n;
++ array_u_type_ p;
+
+- for (register size_t i = 0; i < len; ++i) {
++ for (size_t i = 0; i < len; ++i) {
+ p = b; // + 0;
+ n = array_[p].base;
+ if ((array_u_type_) b == array_[p].check && n < 0) {
+@@ -469,8 +469,8 @@ class DoubleArrayImpl {
+ size_t len = 0) const {
+ if (!len) len = length_func_()(key);
+
+- register array_type_ b = array_[node_pos].base;
+- register array_u_type_ p;
++ array_type_ b = array_[node_pos].base;
++ array_u_type_ p;
+
+ for (; key_pos < len; ++key_pos) {
+ p = b +(node_u_type_)(key[key_pos]) + 1;
+--- a/src/viterbi.cpp
++++ b/src/viterbi.cpp
+@@ -318,11 +318,11 @@ template <bool IsAllPath> bool connect(size_t pos, Node *rnode,
+ const Connector *connector,
+ Allocator<Node, Path> *allocator) {
+ for (;rnode; rnode = rnode->bnext) {
+- register long best_cost = 2147483647;
++ long best_cost = 2147483647;
+ Node* best_node = 0;
+ for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) {
+- register int lcost = connector->cost(lnode, rnode); // local cost
+- register long cost = lnode->cost + lcost;
++ int lcost = connector->cost(lnode, rnode); // local cost
++ long cost = lnode->cost + lcost;
+
+ if (cost < best_cost) {
+ best_node = lnode;
+
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index f4e881708c9e..13064cdcfed4 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -1,36 +1,42 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=8
-inherit autotools eutils
+inherit autotools flag-o-matic
DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
HOMEPAGE="https://taku910.github.io/mecab/"
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="static-libs unicode"
-DEPEND="dev-lang/perl
- virtual/libiconv"
-RDEPEND=""
-PDEPEND="|| (
+BDEPEND="
+ dev-lang/perl
+ sys-devel/gettext
+"
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ || (
app-dicts/mecab-ipadic[unicode=]
app-dicts/mecab-naist-jdic[unicode=]
- )"
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.98-iconv.patch
+ "${FILESDIR}"/${PN}-0.996-clang-16-register.patch
+ "${FILESDIR}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch
+)
-PATCHES=( "${FILESDIR}"/${PN}-0.98-iconv.patch )
HTML_DOCS=( doc/. )
src_prepare() {
default
- sed -i \
- -e "/CFLAGS/s/-O3/${CFLAGS}/" \
- -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
- configure.in
sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in
mv configure.{in,ac} || die
@@ -38,6 +44,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/924569
+ # https://github.com/taku910/mecab/issues/75
+ filter-lto
+
econf \
$(use_enable static-libs static) \
$(use_with unicode charset UTF-8)
diff --git a/app-text/mecab/mecab-0.996-r2.ebuild b/app-text/mecab/mecab-0.996-r2.ebuild
new file mode 100644
index 000000000000..7ab1b014a7dd
--- /dev/null
+++ b/app-text/mecab/mecab-0.996-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
+HOMEPAGE="https://taku910.github.io/mecab/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="static-libs unicode"
+
+BDEPEND="
+ dev-lang/perl
+ sys-devel/gettext
+"
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ || (
+ app-dicts/mecab-ipadic[unicode=]
+ app-dicts/mecab-naist-jdic[unicode=]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.98-iconv.patch
+ "${FILESDIR}"/${PN}-0.996-clang-16-register.patch
+ "${FILESDIR}"/${PN}-0.996-clang-16-binary_function.patch
+ "${FILESDIR}"/0001-configure-remove-terrible-horrible-code-that-resets-.patch
+)
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ default
+ sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in
+
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ # -Werror=odr -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/924569
+ # https://github.com/taku910/mecab/issues/75
+ filter-lto
+
+ econf \
+ $(use_enable static-libs static) \
+ $(use_with unicode charset UTF-8)
+}
+
+src_install() {
+ default
+ find "${ED}" -name 'Makefile*' -delete || die
+ use static-libs || find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/mecab/metadata.xml b/app-text/mecab/metadata.xml
index 82adca0f7b81..eaec32deefa9 100644
--- a/app-text/mecab/metadata.xml
+++ b/app-text/mecab/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/metadata.xml b/app-text/metadata.xml
index fcbc7cd873ba..5a2c46fa1335 100644
--- a/app-text/metadata.xml
+++ b/app-text/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The app-text category contains tools for working with human-language
@@ -31,4 +31,3 @@
Kategoria app-text zawiera narzędzia do pracy ze zwykłymi plikami tekstowymi.
</longdescription>
</catmetadata>
-
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
deleted file mode 100644
index 77cc913a81f0..000000000000
--- a/app-text/mftrace/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
-DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
deleted file mode 100644
index db4b1471479e..000000000000
--- a/app-text/mftrace/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="project">
- <email>fonts@gentoo.org</email>
- <name>Fonts</name>
-</maintainer>
-<maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
deleted file mode 100644
index 059796f95a34..000000000000
--- a/app-text/mftrace/mftrace-1.2.18-r3.ebuild
+++ /dev/null
@@ -1,42 +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 python-single-r1 toolchain-funcs
-
-DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
-HOMEPAGE="http://lilypond.org/mftrace/"
-SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86 ~x86-fbsd"
-# SLOT 1 was used in pktrace ebuild
-SLOT="1"
-IUSE="test truetype"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/t1utils-1.25
- media-gfx/potrace
- truetype? ( media-gfx/fontforge )
- virtual/latex-base
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- test? ( media-gfx/fontforge )"
-
-src_configure() {
- tc-export CC
- econf \
- --datadir="$(python_get_sitedir)"
-}
-
-src_compile() {
- emake CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install () {
- default
- python_optimize
-}
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
deleted file mode 100644
index fedb8709080c..000000000000
--- a/app-text/mftrace/mftrace-1.2.19-r1.ebuild
+++ /dev/null
@@ -1,42 +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 python-single-r1 toolchain-funcs
-
-DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
-HOMEPAGE="http://lilypond.org/mftrace/"
-SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-# SLOT 1 was used in pktrace ebuild
-SLOT="1"
-IUSE="test truetype"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/t1utils-1.25
- media-gfx/potrace
- truetype? ( media-gfx/fontforge )
- virtual/latex-base
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- test? ( media-gfx/fontforge )"
-
-src_configure() {
- tc-export CC
- econf \
- --datadir="$(python_get_sitedir)"
-}
-
-src_compile() {
- emake CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install () {
- default
- python_optimize
-}
diff --git a/app-text/mht-rip/Manifest b/app-text/mht-rip/Manifest
deleted file mode 100644
index 458cbcb3a8e3..000000000000
--- a/app-text/mht-rip/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mht-rip-0.8.c 9105 BLAKE2B f8b7566b5c875b10992f4b8bd4746f0be6b75cddc2d07f17db9113254ea2354f65d77ddc13f6e930051e8f0bbe564c4f37baf4355be999c2a524f05597d5cf30 SHA512 377643c75e621dfa88f426db8e0f8e0959aaa841d1950ab1cc4d514de1a4120cbd20e9f18aa58607b6012a9417095489de968002bd8d91fd89f71dcc0b90357e
diff --git a/app-text/mht-rip/metadata.xml b/app-text/mht-rip/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/mht-rip/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-text/mht-rip/mht-rip-0.8.ebuild b/app-text/mht-rip/mht-rip-0.8.ebuild
deleted file mode 100644
index f911329069fb..000000000000
--- a/app-text/mht-rip/mht-rip-0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="convert mht/mhtml files to something usable"
-HOMEPAGE="http://www.loganowen.com/mht-rip/"
-SRC_URI="http://www.loganowen.com/mht-rip/${P}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
- cp "${DISTDIR}"/${A} ${PN}.c || die
-}
-
-src_compile() {
- emake ${PN} || die
-}
-
-src_install() {
- dobin ${PN} || die
-}
diff --git a/app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch b/app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch
new file mode 100644
index 000000000000..790d49880649
--- /dev/null
+++ b/app-text/mpage/files/mpage-2.5.6-fix-buildsystem.patch
@@ -0,0 +1,43 @@
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,6 @@
+ # Set this to an ANSI compatible C compiler (preferably gcc)
+ # See also system specific settings below
+ #CC=cc
+-CC=gcc
+
+ ############################################################################
+ #
+@@ -107,7 +106,7 @@
+ # If you are using gcc, you probably don't need to change anything here.
+
+ # Linux:
+-CFLAGS = -O2 -s $(DEFS) -Wall
++CPPFLAGS += $(DEFS)
+
+ # AIX (xlC on aix 4):
+ #CFLAGS = -O2 -s $(DEFS)
+@@ -134,10 +133,6 @@
+ # END OF CONFIGURATION OPTIONS
+ #
+
+-# pattern rules. Should we define these?
+-%$(O): %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
+-
+
+ HEAD = mpage.h
+ DENC = encoding.h
+@@ -150,10 +145,10 @@
+ @echo Done!
+
+ mpage$(E): $(MOBJ)
+- $(CC) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
+
+ msample$(E): $(SOBJ)
+- $(CC) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
+
+ mpage.1: mpage.1.in
+ sed 's:PREFIX:${PREFIX}:' < mpage.1.in > mpage.1
diff --git a/app-text/mpage/metadata.xml b/app-text/mpage/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/mpage/metadata.xml
+++ b/app-text/mpage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild
index 0b6a0146109e..f5e91377a3b5 100644
--- a/app-text/mpage/mpage-2.5.6-r1.ebuild
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="Many to one page printing utility"
HOMEPAGE="http://www.mesa.nl/"
-SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz
+SRC_URI="
+ http://www.mesa.nl/pub/${PN}/${P}.tgz
https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-KEYWORDS="amd64 ppc x86"
LICENSE="freedist"
SLOT="0"
-IUSE=""
-
-src_prepare() {
- sed -i Makefile \
- -e '/^CFLAGS/s|=.*| += $(DEFS)|g' \
- -e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \
- || die "sed Makefile"
- EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \
- 01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \
- 20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch
+KEYWORDS="amd64 ppc x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-buildsystem.patch
+ "${WORKDIR}"/${P}-gentoo-patchset/01_previous_changes.patch
+ "${WORKDIR}"/${P}-gentoo-patchset/10_bts354935_fix_fontdefs.patch
+ "${WORKDIR}"/${P}-gentoo-patchset/20_bts416573_manpage_fixes.patch
+ "${WORKDIR}"/${P}-gentoo-patchset/30_bts443280_libdir_manpage.patch
+)
+
+src_configure() {
+ tc-export CC
}
src_compile() {
emake \
- CC="$(tc-getCC)" \
- PREFIX=/usr \
- MANDIR=/usr/share/man/man1
+ PREFIX="${EPREFIX}"/usr \
+ MANDIR="${EPREFIX}"/usr/share/man/man1
}
-src_install () {
+src_install() {
emake \
- PREFIX="${D}/usr" \
- MANDIR="${D}/usr/share/man/man1" install
- dodoc CHANGES Encoding.format FAQ NEWS README TODO
+ PREFIX="${ED}"/usr \
+ MANDIR="${ED}"/usr/share/man/man1 install
+
+ rm README.{amiga,OS2} || die
+ einstalldocs
+ dodoc Encoding.format
}
diff --git a/app-text/msort/files/msort-8.53-configure-clang16.patch b/app-text/msort/files/msort-8.53-configure-clang16.patch
new file mode 100644
index 000000000000..de19a029caa4
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-configure-clang16.patch
@@ -0,0 +1,18 @@
+https://src.fedoraproject.org/rpms/msort/blob/addd4dfbb265c79e76f3329c691639d3cf837cb4/f/msort-configure-c99.patch
+
+Include <stdio.h> for the printf function. This avoids a check
+failure with future compilers which do not support implicit function
+declarations.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,7 @@ AC_DEFUN([AC_C_LONG_LONG],
+ ])
+
+ AC_DEFUN([AC_C_PRINTF_THSEP],
+-[AC_TRY_COMPILE(,[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no)
++[AC_TRY_COMPILE([#include <stdio.h>],[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no)
+ if test $ac_cv_c_printf_thsep = yes; then
+ AC_DEFINE(HAVE_PRINTF_THSEP, 1, [compiler understands printf flag for thousands separation in ints])
+ fi
+
diff --git a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch b/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
deleted file mode 100644
index 9b3845bc601c..000000000000
--- a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac 2010-01-11 01:56:36.000000000 +0100
-+++ b/configure.ac 2018-09-27 15:05:20.205734233 +0200
-@@ -94,7 +94,7 @@
- AC_CHECK_HEADERS([alloca.h ctype.h errno.h gnu/libc-version.h langinfo.h libintl.h limits.h locale.h stdargs.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/stat.h time.h tre/tre.h unicode/umachine.h unicode/unorm.h uninum/unicode.h uninum/nsdefs.h uninum/uninum.h unistd.h wchar.h wctype.h])
-
- if ${utf8proc}; then
--AC_CHECK_HEADER([utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
-+AC_CHECK_HEADER([libutf8proc/utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <libutf8proc/utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
- fi
-
- if ${uninum}; then
---- a/misc.c 2009-08-05 05:09:21.000000000 +0200
-+++ b/misc.c 2018-09-27 15:10:37.355738021 +0200
-@@ -41,7 +41,7 @@
- #include <unicode/umachine.h>
- #include <unicode/unorm.h>
- #else
--#include <utf8proc.h>
-+#include <libutf8proc/utf8proc.h>
- #include "unorm.h"
- #endif
- #include <tre/regex.h>
---- a/msort.c 2010-01-11 01:53:32.000000000 +0100
-+++ b/msort.c 2018-09-27 15:10:30.275737936 +0200
-@@ -57,7 +57,7 @@
- #ifndef USEUTF8PROC
- #include <unicode/unorm.h>
- #else
--#include <utf8proc.h>
-+#include <libutf8proc/utf8proc.h>
- #include "unorm.h"
- #endif
- #ifdef HAVE_UNINUM_UNICODE_H
diff --git a/app-text/msort/metadata.xml b/app-text/msort/metadata.xml
index f7bd381f8067..dc5a253a178e 100644
--- a/app-text/msort/metadata.xml
+++ b/app-text/msort/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>ck+gentoo@bl4ckb0x.de</email>
+ <email>conikost@gentoo.org</email>
<name>Conrad Kostecki</name>
</maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<longdescription>
Msort is a program for sorting files in sophisticated ways.
It was originally developed for alphabetizing dictionaries of "exotic" languages
diff --git a/app-text/msort/msort-8.53-r2.ebuild b/app-text/msort/msort-8.53-r2.ebuild
new file mode 100644
index 000000000000..39dfa9ff4a68
--- /dev/null
+++ b/app-text/msort/msort-8.53-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A program for sorting files in sophisticated ways"
+HOMEPAGE="https://billposer.org/Software/msort.html"
+SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+IUSE="heap +icu +libuninum"
+
+RDEPEND="dev-libs/tre
+ icu? ( dev-libs/icu:= )
+ !icu? ( dev-libs/libutf8proc:= )
+ libuninum? ( dev-libs/libuninum:= )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-icu-build.patch"
+ "${FILESDIR}/${P}-fix-missing-limits-header.patch"
+ "${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
+ "${FILESDIR}/${P}-respect-users-cflags.patch"
+ "${FILESDIR}/${P}-configure-clang16.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable !heap allocaok)
+ $(use_enable !icu utf8proc)
+ $(use_enable libuninum uninum)
+ --disable-debugbuild
+ )
+
+ econf "${myeconfargs[@]}"
+}
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
deleted file mode 100644
index d70c5e1bf098..000000000000
--- a/app-text/msort/msort-8.53.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A program for sorting files in sophisticated ways"
-HOMEPAGE="https://billposer.org/Software/msort.html"
-SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE="heap +icu +libuninum"
-
-RDEPEND="dev-libs/tre
- icu? ( dev-libs/icu:= )
- !icu? ( dev-libs/libutf8proc:= )
- libuninum? ( dev-libs/libuninum:= )"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-find-utf8proc-headers.patch"
- "${FILESDIR}/${P}-fix-icu-build.patch"
- "${FILESDIR}/${P}-fix-missing-limits-header.patch"
- "${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
- "${FILESDIR}/${P}-respect-users-cflags.patch"
- )
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable !heap allocaok)
- $(use_enable !icu utf8proc)
- $(use_enable libuninum uninum)
- --disable-debugbuild
- )
-
- econf "${myeconfargs[@]}"
-}
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 4fb3292abbca..a4fca6b2b477 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,2 +1,3 @@
-DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
+DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae
+DIST multitail-7.1.2.tar.gz 153409 BLAKE2B 852f7a0f22581b043c65f24bc1a19ffb0e7fa8c91d8152b58a1127a51b1833cded0b22c5430f96417af277927daefeb73d5acef38bdbc54898cc48ec0a4e9436 SHA512 6f006d68a6c0fcfec9f6aada4a1ad0a031b61ea46c60231faa6fd7ea934f6f74ca30f12f8983658c9ae6ae2e08bade9159e3426ed47cd9171d0b190ec9f3e5b5
diff --git a/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch
new file mode 100644
index 000000000000..1c706e0d0236
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch
@@ -0,0 +1,34 @@
+Clang16 will not suppert implicit int and implicit function declarations.
+This patch makes the source code ready for clang16.
+See also: https://bugs.gentoo.org/870412
+
+Bug: https://bugs.gentoo.org/874102
+
+This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/misc.c
++++ b/misc.c
+@@ -477,7 +477,7 @@ void heartbeat(void)
+ mydoupdate();
+ }
+
+-void do_check_for_mail()
++void do_check_for_mail(dtime_t time)
+ {
+ if (check_for_mail > 0 && mail_spool_file != NULL)
+ {
+diff --git a/misc.h b/misc.h
+index febf11a..5566519 100644
+--- a/misc.h
++++ b/misc.h
+@@ -1,5 +1,7 @@
++#import "mt.h"
++
+ void info(void);
+ void statistics_menu(void);
+ void heartbeat(void);
+-void do_check_for_mail();
++void do_check_for_mail(dtime_t time);
+ void store_statistics(proginfo *cur, dtime_t now);
diff --git a/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch
new file mode 100644
index 000000000000..6ad621dd540e
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch
@@ -0,0 +1,29 @@
+Fix mismatching declarations so build does not fail with -Werror=lto-type-mismatch
+
+Bug: https://bugs.gentoo.org/855017
+
+This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/globals.c
++++ b/globals.c
+@@ -81,7 +81,7 @@ double heartbeat_t = 0.0;
+ off64_t msf_prev_size = 0;
+
+ dtime_t msf_last_check = 0;
+-dtime_t mt_started;
++time_t mt_started;
+
+ pid_t children_list[MAX_N_SPAWNED_PROCESSES];
+ pid_t tail_proc = 0; /* process used by checker-proc */
+--- a/selbox.h
++++ b/selbox.h
+@@ -1,4 +1,6 @@
+-int selection_box(void **list, char *needs_mark, int nlines, char type, int what_help, char *heading);
++#include "mt.h"
++
++int selection_box(void **list, char *needs_mark, int nlines, selbox_type_t type, int what_help, char *heading);
+ int select_window(int what_help, char *heading);
+ proginfo * select_subwindow(int f_index, int what_help, char *heading);
+ char * select_file(char *input, int what_help);
diff --git a/app-text/multitail/files/multitail-7.0.0-gentoo.patch b/app-text/multitail/files/multitail-7.0.0-gentoo.patch
new file mode 100644
index 000000000000..5219334abbe0
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.0.0-gentoo.patch
@@ -0,0 +1,32 @@
+Gentoo splits off tinfo from ncurses, so we need to ask pkg-config here what the user has on the system.
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/Makefile
++++ b/Makefile
+@@ -24,10 +24,10 @@ ifeq ($(PLATFORM),Darwin)
+ LDFLAGS+=-lpanel $(NCURSES_LIB) -lutil -lm
+ else
+ ifeq ($(UTF8_SUPPORT),yes)
+- LDFLAGS+=-lpanelw -lncursesw -lutil -lm
++ LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm
+ CPPFLAGS+=-DUTF8_SUPPORT
+ else
+- LDFLAGS+=-lpanel -lncurses -lutil -lm
++ LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm
+ endif
+ endif
+
+@@ -40,10 +40,10 @@ DEPENDS:= $(OBJS:%.o=%.d)
+ all: multitail
+
+ multitail: $(OBJS)
+- $(CC) $(OBJS) $(LDFLAGS) -o multitail
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o multitail $(LIBS)
+
+ ccmultitail: $(OBJS)
+- ccmalloc --no-wrapper -Wextra $(CC) $(OBJS) $(LDFLAGS) -o ccmultitail
++ ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o ccmultitail $(LIBS)
+
+ install: multitail
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 183cf910aa3f..b1c36c1034d5 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>shell-tools@gentoo.org</email>
- <name>Gentoo Shell Tools Project</name>
- </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">folkertvanheusden/multitail</remote-id>
+ </upstream>
</pkgmetadata>
-
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
deleted file mode 100644
index 38b011b1d39f..000000000000
--- a/app-text/multitail/multitail-6.4.1.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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="
- sys-libs/ncurses:0=[unicode?]
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-6.4.1-gentoo.patch
-
- sed \
- -e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
- -i Makefile || die
-
- sed \
- -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
- -i xclip.c ${PN}.conf || die
-
- tc-export CC PKG_CONFIG
-
- use debug && append-flags "-D_DEBUG"
-}
-
-src_compile() {
- emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install () {
- dobin multitail
-
- insinto /etc
- doins multitail.conf
-
- DOCS=( readme.txt thanks.txt )
- HTML_DOCS=( manual.html )
- einstalldocs
-
- doman multitail.1
-
- if use examples; then
- docinto examples
- dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
- fi
-}
-
-pkg_postinst() {
- optfeature "send a buffer to the X clipboard" x11-misc/xclip
-}
diff --git a/app-text/multitail/multitail-6.4.2-r1.ebuild b/app-text/multitail/multitail-6.4.2-r1.ebuild
new file mode 100644
index 000000000000..8f3629c5129d
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic optfeature toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+RESTRICT="test" # bug 492270
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.4.1-gentoo.patch )
+
+src_prepare() {
+ default
+
+ sed \
+ -e "/^DESTDIR/s:=.*$:=${EPREFIX}:g" \
+ -i Makefile || die
+
+ sed \
+ -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+ -i xclip.c ${PN}.conf || die
+}
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+ use debug && append-flags -D_DEBUG
+}
+
+src_compile() {
+ emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install() {
+ dobin multitail
+
+ insinto /etc
+ doins multitail.conf
+
+ DOCS=( readme.txt thanks.txt )
+ HTML_DOCS=( manual.html )
+ einstalldocs
+
+ doman multitail.1
+
+ if use examples; then
+ docinto examples
+ dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+ fi
+}
+
+pkg_postinst() {
+ optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
deleted file mode 100644
index dbb81bb22436..000000000000
--- a/app-text/multitail/multitail-6.4.2.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 flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="
- sys-libs/ncurses:0=[unicode?]
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-6.4.1-gentoo.patch
-
- sed \
- -e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
- -i Makefile || die
-
- sed \
- -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
- -i xclip.c ${PN}.conf || die
-
- tc-export CC PKG_CONFIG
-
- use debug && append-flags "-D_DEBUG"
-}
-
-src_compile() {
- emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install () {
- dobin multitail
-
- insinto /etc
- doins multitail.conf
-
- DOCS=( readme.txt thanks.txt )
- HTML_DOCS=( manual.html )
- einstalldocs
-
- doman multitail.1
-
- if use examples; then
- docinto examples
- dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
- fi
-}
-
-pkg_postinst() {
- optfeature "send a buffer to the X clipboard" x11-misc/xclip
-}
diff --git a/app-text/multitail/multitail-7.0.0.ebuild b/app-text/multitail/multitail-7.0.0.ebuild
new file mode 100644
index 000000000000..a4b9c0057b6a
--- /dev/null
+++ b/app-text/multitail/multitail-7.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/"
+SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.0-gentoo.patch
+ "${FILESDIR}"/${PN}-7.0.0-fix-clang16-build.patch
+ "${FILESDIR}"/${PN}-7.0.0-fix-lto-type-mismatch.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+ # cmake looks for licence.txt to install it, which does not exist in the package
+ cp LICENSE license.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUTF8_SUPPORT=$(usex unicode)
+ )
+ CMAKE_BUILD_TYPE=$(usex debug Debug)
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /etc
+ doins multitail.conf
+
+ rm -rf "${ED}"/usr/{ect,etc} || die
+ rm -rf "${ED}"/usr/share/doc/multitail-VERSION=6.4.3 || die
+
+ DOCS=( readme.txt thanks.txt )
+ HTML_DOCS=( manual.html )
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+ fi
+}
+
+pkg_postinst() {
+ optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/multitail/multitail-7.1.2.ebuild b/app-text/multitail/multitail-7.1.2.ebuild
new file mode 100644
index 000000000000..49dfd6455460
--- /dev/null
+++ b/app-text/multitail/multitail-7.1.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/"
+SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.0.0-gentoo.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+ # cmake looks for licence.txt to install it, which does not exist in the package
+ cp LICENSE license.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUTF8_SUPPORT=$(usex unicode)
+ )
+ CMAKE_BUILD_TYPE=$(usex debug Debug)
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /etc
+ doins multitail.conf
+
+ rm -rf "${ED}"/usr/{ect,etc} || die
+ rm -rf "${ED}"/usr/share/doc/multitail-VERSION=${PV} || die
+
+ local DOCS=( readme.txt thanks.txt )
+ local HTML_DOCS=( manual.html )
+ einstalldocs
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto examples
+ dodoc conversion-scripts/{colors-example.{pl,sh},convert-{geoip,simple}.pl}
+ fi
+}
+
+pkg_postinst() {
+ optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index c8ad1a8bd31f..a835f7c90abd 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,3 @@
-DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
+DIST mupdf-1.22.0-source.tar.gz 55043552 BLAKE2B 745a2fd1d0406acf4fa696585bcd21a4ff36e7539c1d45f886dfe5c9bbf966169e5183e89940d81e88db3014f1ebb0446ae1732b6c2fa25a135251853b71f1f7 SHA512 ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59
+DIST mupdf-1.23.3-source.tar.gz 55144800 BLAKE2B 816e2bf46c2431df9726976efeaa0d7ebd8809cbdd9331a747cca32088aaf21b70e9522614d1dc20c856cc597003be6285f866eae8bbde3098e702acfdea8465 SHA512 37fbebd07680d79a38d289264a4028396ee58fad52c541efa37463e63a45ed8bab71188d6c05eb15e602964d89ee6633575dceb972f7bd8b0b5efdde5af9b737
+DIST mupdf-1.23.7-source.tar.gz 55312697 BLAKE2B 7ceb7c1871d33b77d4a3d52ed2d1af514c09349df019a189fa7df8ad09648fae313d63de4c1ce6b0666d17f9a897d5ac788d0be2d8896d9b7e4e6ecf679bad7c SHA512 581a4a5a16041bb405fbd7c1b9fba47da5745f00cbdf30e0e0468bfe67ac542884193b5957b293a4cdfc52f043b4f19612086f294b93dbd242d34735a1088777
diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
deleted file mode 100644
index decab5015bf5..000000000000
--- a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
+++ /dev/null
@@ -1,533 +0,0 @@
---- /dev/null
-+++ ./platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=mupdf
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
-+Categories=Viewer;Graphics;
-+Actions=View;
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
---- /dev/null
-+++ ./platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires: freetype2 libopenjp2 libcrypto
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lmupdf-js-none
-+Cflags: -I${includedir}
---- /dev/null
-+++ ./platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+" c #000000",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #686666",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CDCCCC",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A7777",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #ABAAAA",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+". c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c #4B8BB8",
-+".0 c #3E769E",
-+".q c #3C749C",
-+".w c #403D3D",
-+".e c #92BAD6",
-+".r c #C8DCEA",
-+".t c #FEFEFE",
-+".y c #3D393A",
-+".u c #3B3738",
-+".i c #355974",
-+".p c #353132",
-+".a c #7A7879",
-+".s c #498BB9",
-+".d c #9BBFD8",
-+".f c #4E8AB4",
-+".g c #787677",
-+".h c #F2F2F2",
-+".j c #F0F0F0",
-+".k c #2F2B2C",
-+".l c #EEEEEE",
-+".z c #727071",
-+".x c #26282D",
-+".c c #ECECEC",
-+".v c #2B2728",
-+".b c #FAFCFD",
-+".n c #EAEAEA",
-+".m c #DEEAF2",
-+".M c #E9EAE9",
-+".N c #C2D8E7",
-+".B c #6E6C6D",
-+".V c #5390BC",
-+".C c #E8E8E8",
-+".Z c #6EA2C6",
-+".A c #272324",
-+".S c #E7E6E7",
-+".D c #E6E6E6",
-+".F c #252122",
-+".G c #29333D",
-+".H c #E4E4E4",
-+".J c #3F7AA5",
-+".K c #231F20",
-+".L c #E2E2E2",
-+".P c #211D1E",
-+".I c #E0E0E0",
-+".U c #EAF1F7",
-+".Y c #6099C2",
-+".T c #1F1B1C",
-+".R c #E9F1F6",
-+".E c #CDDFEB",
-+".W c #4387B6",
-+".Q c #96BBD6",
-+".! c #B1CDE0",
-+".~ c #DEDEDE",
-+".^ c #79A9CA",
-+"./ c #4285B5",
-+".( c #272A31",
-+".) c #5D97BF",
-+"._ c #4185B4",
-+".` c #DCDCDC",
-+".' c #959393",
-+".] c #DADADA",
-+".[ c #314B5F",
-+".{ c #D8D8D8",
-+".} c #D7D8D7",
-+".| c #D6D6D6",
-+"X c #F5F8FB",
-+"X. c #D4D4D4",
-+"XX c #6AA0C5",
-+"Xo c #BDD4E5",
-+"XO c #3A6A8C",
-+"X+ c #232123",
-+"X@ c #D3D4D3",
-+"X# c #D2D2D2",
-+"X$ c #D0D0D0",
-+"X% c #CECECE",
-+"X& c #CCCCCC",
-+"X* c #CADDEB",
-+"X= c #37617F",
-+"X- c #242A31",
-+"X; c #CACACA",
-+"X: c #C8DBE9",
-+"X> c #90B7D3",
-+"X, c #817F7F",
-+"X< c #3F7EAB",
-+"X1 c #548FB9",
-+"X2 c #355873",
-+"X3 c #7D7B7B",
-+"X4 c #C2C2C2",
-+"X5 c #4B8CBA",
-+"X6 c #C0C0C0",
-+"X7 c #D4E4EE",
-+"X8 c #81AECE",
-+"X9 c #659CC3",
-+"X0 c #787576",
-+"Xq c #4788B6",
-+"Xw c #252C35",
-+"Xe c #757373",
-+"Xr c #BABABA",
-+"Xt c #FCFDFE",
-+"Xy c #B6B6B6",
-+"Xu c #C4D9E8",
-+"Xi c #706D6E",
-+"Xp c #8CB5D2",
-+"Xa c #70A3C7",
-+"Xs c #8BB5D1",
-+"Xd c #5491BC",
-+"Xf c #5391BB",
-+"Xg c #282424",
-+"Xh c #272223",
-+"Xj c #6C696A",
-+"Xk c #2F4659",
-+"Xl c #6B6969",
-+"Xz c #407BA5",
-+"Xx c #6A6768",
-+"Xc c #E4E3E3",
-+"Xv c #3E79A3",
-+"Xb c #231E1F",
-+"Xn c #221E1E",
-+"Xm c #E2E1E1",
-+"XM c #211C1D",
-+"XN c #EBF2F7",
-+"XB c #201C1C",
-+"XV c #CFE0EC",
-+"XC c #4588B7",
-+"XZ c #B3CEE1",
-+"XA c #366384",
-+"XS c #5F98C0",
-+"XD c #4386B5",
-+"XF c #DEDDDD",
-+"XG c #2B3D4B",
-+"XH c #615F5F",
-+"XJ c #5F5D5D",
-+"XK c #5E5B5C",
-+"XL c #DCE9F2",
-+"XP c #407DA8",
-+"XI c #86B1CF",
-+"XU c #D4D3D3",
-+"XY c #3A698B",
-+"XT c #3E7BA6",
-+"XR c #232022",
-+"XE c #545152",
-+"XW c #999899",
-+"XQ c #79AACC",
-+"X! c #524F50",
-+"X~ c #CCCDCB",
-+"X^ c #3D749B",
-+"X/ c #93BAD5",
-+"X( c #77A8CA",
-+"X) c #37607E",
-+"X_ c #5B96BF",
-+"X` c #3F84B4",
-+"X' c #CAC9C9",
-+"X] c #C6C5C5",
-+"X[ c #3F7DAA",
-+"X{ c #F2F7FA",
-+"X} c #C2C1C1",
-+"X| c #212023",
-+"o c #9EC1D9",
-+"o. c #444142",
-+"oX c #3F78A0",
-+"oo c #90B8D5",
-+"oO c #FEFEFF",
-+"o+ c #E2ECF4",
-+"o@ c #2B3A47",
-+"o# c #25262A",
-+"o$ c #B1AFB0",
-+"o% c #28313A",
-+"o& c #221D1D",
-+"o* c #262F38",
-+"o= c #629BC2",
-+"o- c #302D2E",
-+"o; c #6199C1",
-+"o: c #201B1B",
-+"o> c #4587B6",
-+"o, c #F0F0F1",
-+"o< c #2D3E4C",
-+"o1 c #2E2B2C",
-+"o2 c #4385B4",
-+"o3 c #A8A7A7",
-+"o4 c #A7A5A6",
-+"o5 c #3D7197",
-+"o6 c #4183B2",
-+"o7 c #4083B1",
-+"o8 c #A5A3A4",
-+"o9 c #3B6F95",
-+"o0 c #5290BC",
-+"oq c #A4C4DB",
-+"ow c #E9F1F7",
-+"oe c #4387B7",
-+"or c #E7EFF5",
-+"ot c #CBDDEA",
-+"oy c #4185B5",
-+"ou c #5B95BE",
-+"oi c #3F83B3",
-+"op c #939192",
-+"oa c #929191",
-+"os c #2B3743",
-+"od c #4C4849",
-+"of c #2A3742",
-+"og c #F4F8FB",
-+"oh c #D8E6F0",
-+"oj c #4C8CB9",
-+"ok c #211F22",
-+"ol c #CFD0D0",
-+"oz c #444041",
-+"ox c #262C34",
-+"oc c #413E3E",
-+"ov c #403C3D",
-+"ob c #3B739B",
-+"on c #858384",
-+"om c #FFFFFF",
-+"oM c #E3EDF4",
-+"oN c #5995BF",
-+"oB c #3E3A3B",
-+"oV c #C7DBE9",
-+"oC c #2F4B61",
-+"oZ c #5793BD",
-+"oA c #3C3839",
-+"oS c #2A3945",
-+"oD c #7E7D7D",
-+"oF c #345873",
-+"oG c #363233",
-+"oH c #7B797A",
-+"oJ c #EFF4F9",
-+"oK c #EEF4F8",
-+"oL c #F3F3F3",
-+"oP c #9ABED7",
-+"oI c #4788B7",
-+"oU c #629AC1",
-+"oY c #ACAAAA",
-+"oT c #F1F1F1",
-+"oR c #EFEFEF",
-+"oE c #737172",
-+"oW c #EDEDED",
-+"oQ c #A9C9DF",
-+"o! c #FBFDFE",
-+"o~ c #EBEBEB",
-+"o^ c #DFEBF3",
-+"o/ c #4581AB",
-+"o( c #6F6D6E",
-+"o) c #EAE9EA",
-+"o_ c #E9E9E9",
-+"o` c #C1D7E6",
-+"o' c #E7E7E7",
-+"o] c #E6E7E6",
-+"o[ c #E5E5E5",
-+"o{ c #3F7BA5",
-+"o} c #242021",
-+"o| c #E3E3E3",
-+"O c #3E79A4",
-+"O. c #221E1F",
-+"OX c #26303A",
-+"Oo c #9C9A9A",
-+"OO c #E1E1E1",
-+"O+ c #201C1D",
-+"O@ c #4488B7",
-+"O# c #DFDFDF",
-+"O$ c #7BAACC",
-+"O% c #356384",
-+"O& c #1E1A1B",
-+"O* c #4386B6",
-+"O= c #4286B5",
-+"O- c #95BAD5",
-+"O; c #DDDDDD",
-+"O: c #1C1819",
-+"O> c #DBDBDB",
-+"O, c #D9D9D9",
-+"O< c #D7D7D7",
-+"O1 c #417FAA",
-+"O2 c #DAE7F1",
-+"O3 c #F5F9FB",
-+"O4 c #D5D5D5",
-+"O5 c #242224",
-+"O6 c #D4D3D4",
-+"O7 c #85B1CF",
-+"O8 c #D3D3D3",
-+"O9 c #699FC4",
-+"O0 c #4D8DB9",
-+"Oq c #222022",
-+"Ow c #34556F",
-+"Oe c #D1D1D1",
-+"Or c #D0CFD0",
-+"Ot c #8A8888",
-+"Oy c #CFCFCF",
-+"Ou c #CDCDCD",
-+"Oi c #CCCDCC",
-+"Op c #CADEEB",
-+"Oa c #E5EEF5",
-+"Os c #C9DCEA",
-+"Od c #ADCADF",
-+"Of c #C8DCE9",
-+"Og c #91B8D4",
-+"Oh c #5994BE",
-+"Oj c #3D82B3",
-+"Ok c #5894BD",
-+"Ol c #3C82B2",
-+"Oz c #4181AD",
-+"Ox c #3B3737",
-+"Oc c #C5C5C5",
-+"Ov c #293643",
-+"Ob c #3E7DAA",
-+"On c #C1C1C1",
-+"Om c #353131",
-+"OM c #D4E3EE",
-+"ON c #B8D1E3",
-+"OB c #BFBFBF",
-+"OV c #9CBFD8",
-+"OC c #80ADCD",
-+"OZ c #649BC2",
-+"OA c #4889B7",
-+"OS c #BDBDBD",
-+"OD c #2E292A",
-+"OF c #4283B1",
-+"OG c #B7B7B7",
-+"OH c #4183B0",
-+"OJ c #5794BF",
-+"OK c #A7C6DC",
-+"OL c #365B77",
-+"OP c #8BB4D1",
-+"OI c #282324",
-+"OU c #272323",
-+"OY c #6C6A6A",
-+"OT c None",
-+/* pixels */
-+" oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT ",
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
-+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
-+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
-+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
-+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
-+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
-+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
-+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
-+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
-+"O#O#O#O#. g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
-+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
-+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
-+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
-+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
-+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
-+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
-+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
-+" Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou "
-+};
diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
deleted file mode 100644
index 90972e8c53ea..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..82f10b28 100644
---- a/Makerules
-+++ b/Makerules
-@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address
- SANITIZE_FLAGS += -fsanitize=leak
-
- ifeq ($(build),debug)
-- CFLAGS += -pipe -g
-- LDFLAGS += -g $(LDREMOVEUNREACH)
- else ifeq ($(build),release)
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
- LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
deleted file mode 100644
index a8c4ef770dce..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-1. debug build (not sure why...)
-2. build shared library
-3. add optional static lib target
-4. Don't install COPYING
-diff --git a/Makefile b/Makefile
-index 37fc48e6..4303e9fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
-
- ifndef build
-- build := release
-+ build := debug
- endif
-
- ifndef OUT
-@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB =
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ)
-+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
-@@ -355,7 +357,7 @@ install: libs apps
-
- install -d $(DESTDIR)$(docdir)
- install -d $(DESTDIR)$(docdir)/examples
-- install README COPYING CHANGES $(DESTDIR)$(docdir)
-+ install README CHANGES $(DESTDIR)$(docdir)
- install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
- install docs/examples/* $(DESTDIR)$(docdir)/examples
-
diff --git a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
deleted file mode 100644
index dc472153ca6b..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-vdupras note: exact same patch as in
-https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked
-diff paths.
-From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
-Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@fedoraproject.org>
-From: Michael J Gruber <mjg@fedoraproject.org>
-Date: Sun, 3 Jun 2018 17:55:46 +0200
-Subject: [PATCH] fix build on big endian
-
-0dc1153 ("Spread of context into all procedures and removal from
-structures", 2017-04-26) missed a few spots that are relevant on big
-endian only.
-
-Add the missing ContextIDs in the call chain so that the build succeeds
-again.
-
-Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
----
- src/cmsmd5.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/cmsmd5.c b/src/cmsmd5.c
-index 4b8f7f9..dd0925a 100644
---- a/thirdparty/lcms2/src/cmsmd5.c
-+++ b/thirdparty/lcms2/src/cmsmd5.c
-@@ -29,7 +29,7 @@
- #ifdef CMS_USE_BIG_ENDIAN
-
- static
--void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
-+void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs)
- {
- do {
-
-@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
- }
-
- #else
--#define byteReverse(buf, len)
-+#define byteReverse(ContextID, buf, len)
- #endif
-
-
-@@ -172,7 +172,7 @@ cmsHANDLE MD5alloc(cmsContext ContextID)
-
-
- static
--void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
-+void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
- {
- _cmsMD5* ctx = (_cmsMD5*) Handle;
- cmsUInt32Number t;
-@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
- }
-
- memmove(p, buf, t);
-- byteReverse(ctx->in, 16);
-+ byteReverse(ContextID, ctx->in, 16);
-
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
- buf += t;
-@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
-
- while (len >= 64) {
- memmove(ctx->in, buf, 64);
-- byteReverse(ctx->in, 16);
-+ byteReverse(ContextID, ctx->in, 16);
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
- buf += 64;
- len -= 64;
-@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
-
- // Destroy the object and return the checksum
- static
--void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle)
-+void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID, cmsHANDLE Handle)
- {
- _cmsMD5* ctx = (_cmsMD5*) Handle;
- cmsUInt32Number count;
-@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, cmsHANDLE Handle)
- if (count < 8) {
-
- memset(p, 0, count);
-- byteReverse(ctx->in, 16);
-+ byteReverse(ContextID, ctx->in, 16);
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
-
- memset(ctx->in, 0, 56);
- } else {
- memset(p, 0, count - 8);
- }
-- byteReverse(ctx->in, 14);
-+ byteReverse(ContextID, ctx->in, 14);
-
- ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0];
- ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1];
-
- MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
-
-- byteReverse((cmsUInt8Number *) ctx->buf, 4);
-+ byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4);
- memmove(ProfileID ->ID8, ctx->buf, 16);
-
- _cmsFree(ctx ->ContextID, ctx);
-@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
- if (MD5 == NULL) goto Error;
-
- // Add all bytes
-- MD5add(MD5, Mem, BytesNeeded);
-+ MD5add(ContextID,MD5, Mem, BytesNeeded);
-
- // Temp storage is no longer needed
- _cmsFree(ContextID, Mem);
-@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
- memmove(Icc, &Keep, sizeof(_cmsICCPROFILE));
-
- // And store the ID
-- MD5finish(&Icc ->ProfileID, MD5);
-+ MD5finish(ContextID, &Icc ->ProfileID, MD5);
- return TRUE;
-
- Error:
---
-2.18.0.rc0.294.g786209a621
-
diff --git a/app-text/mupdf/files/mupdf-1.14-libressl.patch b/app-text/mupdf/files/mupdf-1.14-libressl.patch
deleted file mode 100644
index fcc0a7205c1c..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-libressl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8561b744ac95ab6145a1163fa1d7c490a3329465 Mon Sep 17 00:00:00 2001
-From: William <wonko@undefined.re>
-Date: Mon, 12 Nov 2018 16:50:07 +0100
-Subject: [PATCH] hardcode missing ssl functions
-
----
- source/helpers/pkcs7/pkcs7-openssl.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c
-index 58dbf65..2b1f9e9 100644
---- a/source/helpers/pkcs7/pkcs7-openssl.c
-+++ b/source/helpers/pkcs7/pkcs7-openssl.c
-@@ -511,6 +511,28 @@ static void signer_drop_designated_name(pdf_pkcs7_signer *signer, pdf_pkcs7_desi
- fz_free(osigner->ctx, dn);
- }
-
-+int
-+PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag)
-+{
-+ return OBJ_obj2nid(bag->type);
-+}
-+
-+const STACK_OF(PKCS12_SAFEBAG) *
-+PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
-+{
-+ if (OBJ_obj2nid(bag->type) != NID_safeContentsBag)
-+ return NULL;
-+ return bag->value.safes;
-+}
-+
-+const PKCS8_PRIV_KEY_INFO *
-+PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
-+{
-+ if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag)
-+ return NULL;
-+ return bag->value.keybag;
-+}
-+
- static void add_from_bags(X509 **pX509, EVP_PKEY **pPkey, const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pw);
-
- static void add_from_bag(X509 **pX509, EVP_PKEY **pPkey, PKCS12_SAFEBAG *bag, const char *pw)
---
-2.19.1
-
diff --git a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
deleted file mode 100644
index a1284a63d670..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..5c0fffa4 100644
---- a/Makerules
-+++ b/Makerules
-@@ -113,10 +113,14 @@ else ifeq ($(OS),Linux)
- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
- endif
-
-+ WANT_CURL ?= yes
-+ ifeq "$(WANT_CURL)" "yes"
- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
- ifeq ($(HAVE_CURL),yes)
- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
-- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+ # We have to forcibly add -lpthread to avoid linking errors.
-+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
-+ endif
- endif
-
- HAVE_GLUT := yes
-@@ -125,17 +129,29 @@ else ifeq ($(OS),Linux)
- SYS_GLUT_LIBS := -lglut -lGL
- endif
-
-+ WANT_X11 ?= yes
-+ ifeq "$(WANT_X11)" "yes"
- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
- ifeq ($(HAVE_X11),yes)
- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
-+ endif
-
-- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-- ifeq ($(HAVE_LIBCRYPTO),yes)
-+ WANT_OPENSSL ?= yes
-+ ifeq "$(WANT_OPENSSL)" "yes"
-+ ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
-+ ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes"
-+ HAVE_LIBCRYPTO := yes
-+ LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
-+ LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+ endif
-+ else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
-+ HAVE_LIBCRYPTO := yes
- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
- endif
-+ endif
-
- HAVE_PTHREAD := yes
- ifeq ($(HAVE_PTHREAD),yes)
diff --git a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
deleted file mode 100644
index 79efe32c0e41..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..f1fd93cb 100644
---- a/Makerules
-+++ b/Makerules
-@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux)
- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
- endif
-
-- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+ HAVE_CURL ?= not-unless-portage-tells-me
- ifeq ($(HAVE_CURL),yes)
- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
-- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+ # We have to forcibly add -lpthread to avoid linking errors.
-+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
- endif
-
- HAVE_GLUT := yes
-@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux)
- SYS_GLUT_LIBS := -lglut -lGL
- endif
-
-- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-+ HAVE_X11 ?= not-unless-portage-tells-me
- ifeq ($(HAVE_X11),yes)
- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
-
-- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-+
-+ HAVE_LIBCRYPTO ?= not-unless-portage-tells-me
- ifeq ($(HAVE_LIBCRYPTO),yes)
- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
diff --git a/app-text/mupdf/files/mupdf-1.15-Makefile.patch b/app-text/mupdf/files/mupdf-1.15-Makefile.patch
deleted file mode 100644
index cff348d95e42..000000000000
--- a/app-text/mupdf/files/mupdf-1.15-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a9539342..e76b2c61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
-
- ifndef build
-- build := release
-+ build := debug
- endif
-
- ifndef OUT
-@@ -187,13 +187,15 @@ generate: source/pdf/js/util.js.h
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB =
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
-+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
-@@ -322,7 +324,7 @@ install: libs apps
-
- install -d $(DESTDIR)$(docdir)
- install -d $(DESTDIR)$(docdir)/examples
-- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
-+ install -m 644 README CHANGES $(DESTDIR)$(docdir)
- install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
- install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
-
diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
index 22829279e147..3f3aac4c933a 100644
--- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
+++ b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
@@ -1,5 +1,3 @@
-diff --git a/Makerules b/Makerules
-index 298b5737..b2079435 100644
--- a/Makerules
+++ b/Makerules
@@ -119,13 +119,13 @@ else ifeq ($(OS),Linux)
diff --git a/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
new file mode 100644
index 000000000000..b266655aaeca
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index 7fa74b3..e842374 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+
+ ifndef build
+- build := release
++ build := debug
+ endif
+
+ default: all
+@@ -252,17 +252,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ else
+-MUPDF_LIB = $(OUT)/libmupdf.a
++MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
+ LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
+-THIRD_LIB = $(OUT)/libmupdf-third.a
++THIRD_LIB =
++MUPDF_STATIC = $(OUT)/libmupdf.a
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+ THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+ endif
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
+-$(THIRD_LIB) : $(THIRD_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
diff --git a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch
new file mode 100644
index 000000000000..643b6d2c8b1e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch
@@ -0,0 +1,130 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
++++ b/Makefile
+@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+
++$(HEXDUMP_EXE): scripts/hexdump.c
++ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
++++ b/Makerules
+@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ WARNING_CFLAGS := -Wall -Wsign-compare
+
+ # Feature configuration options
+@@ -156,51 +159,51 @@ else ifeq ($(OS),MACOS)
+ endif
+ endif
+
+- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+ endif
+- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+ endif
+- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+ endif
+- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+ endif
+- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+ endif
+- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+ endif
+- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+ endif
+
+- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
+ ifeq ($(HAVE_SYS_LEPTONICA),yes)
+- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
+ endif
+
+- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
++ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes)
+ ifeq ($(HAVE_SYS_TESSERACT),yes)
+- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
+ endif
+
+- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+ ifeq ($(HAVE_SYS_CURL),yes)
+- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+ endif
+
+ HAVE_GLUT := yes
+@@ -209,16 +212,16 @@ endif
+ SYS_GLUT_LIBS := -lglut -lGL
+ endif
+
+ HAVE_X11 := not-unless-portage-tells-me
+ ifeq ($(HAVE_X11),yes)
+- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+- X11_LIBS := $(shell pkg-config --libs x11 xext)
++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+ endif
+
+ HAVE_LIBCRYPTO := not-unless-portage-tells-me
+ ifeq ($(HAVE_LIBCRYPTO),yes)
+- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+ endif
+
+ HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch
new file mode 100644
index 000000000000..a81c7a008e44
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch
@@ -0,0 +1,39 @@
+--- a/Makerules
++++ b/Makerules
+@@ -139,11 +139,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+- CC = xcrun cc
+- AR = xcrun ar
+- LD = xcrun ld
+- RANLIB = xcrun ranlib
++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++ CC ?= xcrun cc
++ AR ?= xcrun ar
++ LD ?= xcrun ld
++ RANLIB ?= xcrun ranlib
+
+ ifeq (, $(shell which pkg-config))
+ $(warning "No pkg-config found, install it for proper integration of libcrypto")
+@@ -154,9 +154,7 @@ else ifeq ($(OS),MACOS)
+ LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
+ endif
+-
+-else ifeq ($(OS),Linux)
+- HAVE_OBJCOPY := yes
++endif
+
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -229,8 +227,6 @@ else ifeq ($(OS),Linux)
+ PTHREAD_LIBS := -lpthread
+ endif
+
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
new file mode 100644
index 000000000000..4d449a2fec15
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.0-add-desktop-pc-files.patch
@@ -0,0 +1,33 @@
+--- /dev/null
++++ ./platform/debian/mupdf.desktop
+@@ -0,0 +1,15 @@
++[Desktop Entry]
++Name=MuPDF
++GenericName=PDF file viewer
++Exec=mupdf %f
++TryExec=mupdf
++Icon=new-mupdf-icon
++Terminal=false
++Type=Application
++MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
++Categories=Viewer;Graphics;
++Actions=View;
++
++[Desktop Action View]
++Name=View with mupdf
++Exec=mupdf %f
+--- /dev/null
++++ ./platform/debian/mupdf.pc
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: mupdf
++Description: Library for rendering PDF documents
++Requires: freetype2 libopenjp2 libcrypto
++Version: 0.5.0
++Libs: -L${libdir} -lmupdf
++Libs.private: -lmupdf-js-none
++Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch
new file mode 100644
index 000000000000..4f51f72deb1e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.1-fix-aliasing-violation.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/859847
+
+From 8c6f6bf3ad2fd33d15de6ee96175cd29bf804d9f Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 26 Jul 2022 15:47:02 -0400
+Subject: [PATCH] Fix aliasing violation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Noticed when compiling with link-time optimizations.
+
+include/GL/freeglut_std.h:240:18: error: type of `glutBitmapHelvetica18` does not match original declaration [-Werror=lto-type-mismatch]
+ 240 | extern void* glutBitmapHelvetica18;
+ | ^
+src/x11/fg_glutfont_definitions_x11.c:103:27: note: `glutBitmapHelvetica18` was previously declared here
+ 103 | struct freeglutBitmapFont glutBitmapHelvetica18 ;
+ | ^
+src/x11/fg_glutfont_definitions_x11.c:103:27: note: code may be misoptimized unless `-fno-strict-aliasing` is used
+---
+ src/x11/fg_glutfont_definitions_x11.c | 29 ++++++++++++++++++---------
+ 1 file changed, 20 insertions(+), 9 deletions(-)
+
+--- a/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c
++++ b/thirdparty/freeglut/src/x11/fg_glutfont_definitions_x11.c
+@@ -91,14 +91,25 @@ struct freeglutBitmapFont
+ };
+
+
+-struct freeglutStrokeFont glutStrokeRoman ;
+-struct freeglutStrokeFont glutStrokeMonoRoman ;
++static struct freeglutStrokeFont glutStrokeRoman_ ;
++static struct freeglutStrokeFont glutStrokeMonoRoman_ ;
+
+-struct freeglutBitmapFont glutBitmap9By15 ;
+-struct freeglutBitmapFont glutBitmap8By13 ;
+-struct freeglutBitmapFont glutBitmapTimesRoman10 ;
+-struct freeglutBitmapFont glutBitmapTimesRoman24 ;
+-struct freeglutBitmapFont glutBitmapHelvetica10 ;
+-struct freeglutBitmapFont glutBitmapHelvetica12 ;
+-struct freeglutBitmapFont glutBitmapHelvetica18 ;
++static struct freeglutBitmapFont glutBitmap9By15_ ;
++static struct freeglutBitmapFont glutBitmap8By13_ ;
++static struct freeglutBitmapFont glutBitmapTimesRoman10_ ;
++static struct freeglutBitmapFont glutBitmapTimesRoman24_ ;
++static struct freeglutBitmapFont glutBitmapHelvetica10_ ;
++static struct freeglutBitmapFont glutBitmapHelvetica12_ ;
++static struct freeglutBitmapFont glutBitmapHelvetica18_ ;
+
++
++void *glutStrokeRoman = &glutStrokeRoman_ ;
++void *glutStrokeMonoRoman = &glutStrokeMonoRoman_ ;
++
++void *glutBitmap9By15 = &glutBitmap9By15_ ;
++void *glutBitmap8By13 = &glutBitmap8By13_ ;
++void *glutBitmapTimesRoman10 = &glutBitmapTimesRoman10_ ;
++void *glutBitmapTimesRoman24 = &glutBitmapTimesRoman24_ ;
++void *glutBitmapHelvetica10 = &glutBitmapHelvetica10_ ;
++void *glutBitmapHelvetica12 = &glutBitmapHelvetica12_ ;
++void *glutBitmapHelvetica18 = &glutBitmapHelvetica18_ ;
+--
+2.35.1
+
diff --git a/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
new file mode 100644
index 000000000000..9f2b9d692f4e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.21.1-no-drm.patch
@@ -0,0 +1,18 @@
+diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c
+index f764242..83888dc 100644
+--- a/source/html/epub-doc.c
++++ b/source/html/epub-doc.c
+@@ -692,10 +692,12 @@ epub_parse_header(fz_context *ctx, epub_document *doc)
+ epub_chapter **tailp;
+ int i;
+
++ #ifdef GENTOO_MUPDF_DRM
+ if (fz_has_archive_entry(ctx, zip, "META-INF/rights.xml"))
+ fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM");
+ if (fz_has_archive_entry(ctx, zip, "META-INF/encryption.xml"))
+ fz_throw(ctx, FZ_ERROR_GENERIC, "EPUB is locked by DRM");
++ #endif
+
+ fz_var(buf);
+ fz_var(container_xml);
+
diff --git a/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
new file mode 100644
index 000000000000..02fa3bfdd45c
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-cross-fixes.patch
@@ -0,0 +1,120 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makerules
++++ b/Makerules
+@@ -9,6 +9,9 @@ ifeq ($(OS),)
+ OS := $(OS:Darwin=MACOS)
+ endif
+
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ WARNING_CFLAGS := -Wall -Wsign-compare
+
+ # Feature configuration options
+@@ -190,51 +193,51 @@ else ifeq ($(OS),Linux)
+ LDFLAGS += -sTOTAL_MEMORY=48MB
+ endif
+
+- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+ endif
+- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+ endif
+- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+ endif
+- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+ endif
+- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+ endif
+- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+ endif
+- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+ endif
+
+- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
+ ifeq ($(HAVE_SYS_LEPTONICA),yes)
+- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
+ endif
+
+- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
++ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes)
+ ifeq ($(HAVE_SYS_TESSERACT),yes)
+- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
+ endif
+
+- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+ ifeq ($(HAVE_SYS_CURL),yes)
+- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+ endif
+
+ HAVE_GLUT := yes
+@@ -243,18 +246,18 @@ else ifeq ($(OS),Linux)
+ SYS_GLUT_LIBS := -lglut -lGL
+ endif
+
+ HAVE_X11 := not-unless-portage-tells-me
+ ifeq ($(HAVE_X11),yes)
+- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+- X11_LIBS := $(shell pkg-config --libs x11 xext)
++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+ endif
+
+ ifeq ($(HAVE_LIBCRYPTO),)
+ HAVE_LIBCRYPTO := not-unless-portage-tells-me
+ endif
+ ifeq ($(HAVE_LIBCRYPTO),yes)
+- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+ endif
+
+ HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.23.3-darwin.patch b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
new file mode 100644
index 000000000000..c151d81f175d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-darwin.patch
@@ -0,0 +1,45 @@
+--- a/Makerules
++++ b/Makerules
+@@ -161,11 +161,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+- CC = xcrun cc
+- AR = xcrun ar
+- LD = xcrun ld
+- RANLIB = xcrun ranlib
++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++ CC ?= xcrun cc
++ AR ?= xcrun ar
++ LD ?= xcrun ld
++ RANLIB ?= xcrun ranlib
+
+ ifneq ($(ARCHFLAGS),)
+ $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
+@@ -180,15 +180,7 @@ else ifeq ($(OS),MACOS)
+ endif
+ endif
+
+-else ifeq ($(OS),Linux)
+- ifeq ($(PYODIDE_ROOT),)
+- HAVE_OBJCOPY := yes
+- else
+- # Pyodide's ld does not support -b so we cannot use it to create object
+- # files containing font data, so leave HAVE_OBJCOPY unset. And we need
+- # extra memory when linking.
+- LDFLAGS += -sTOTAL_MEMORY=48MB
+- endif
++endif
+
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -263,8 +255,6 @@ else ifeq ($(OS),Linux)
+ PTHREAD_LIBS := -lpthread
+ endif
+
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
new file mode 100644
index 000000000000..b91bd9ad12e3
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.23.3-openssl-x11.patch
@@ -0,0 +1,19 @@
+--- a/Makerules
++++ b/Makerules
+@@ -243,14 +243,14 @@ else ifeq ($(OS),Linux)
+ SYS_GLUT_LIBS := -lglut -lGL
+ endif
+
+- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
++ HAVE_X11 := not-unless-portage-tells-me
+ ifeq ($(HAVE_X11),yes)
+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+
+ ifeq ($(HAVE_LIBCRYPTO),)
+- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
++ HAVE_LIBCRYPTO := not-unless-portage-tells-me
+ endif
+ ifeq ($(HAVE_LIBCRYPTO),yes)
+ LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
deleted file mode 100644
index 353912450236..000000000000
--- a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mupdf-1.3/platform/x11/pdfapp.c
-+++ mupdf-1.3/platform/x11/pdfapp.c
-@@ -866,6 +867,7 @@
- break;
-
- case ' ':
-+ case 'F':
- panto = DONT_PAN;
- if (app->numberlen > 0)
- app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 7a38bb900964..c0d61774dbcf 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>rndxelement@protonmail.com</email>
+ <name>Philipp Rösner</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="drm">Enable support for Digital rights management (DRM)</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
deleted file mode 100644
index 8e081a7e46aa..000000000000
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla"
-
-RDEPEND="
- >=dev-lang/mujs-1.0.4
- media-libs/freetype:2=[static-libs?]
- media-libs/harfbuzz:=[static-libs?]
- media-libs/jbig2dec:=[static-libs?]
- media-libs/libpng:0=[static-libs?]
- >=media-libs/openjpeg-2.1:2=[static-libs?]
- virtual/jpeg[static-libs?]
- curl? ( net-misc/curl[static-libs?] )
- opengl? ( >=media-libs/freeglut-3.0.0:= )
- ssl? (
- libressl? ( dev-libs/libressl:0=[static-libs?] )
- !libressl? ( dev-libs/openssl:0=[static-libs?] )
- )
- X? (
- x11-libs/libX11[static-libs?]
- x11-libs/libXext[static-libs?]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="
- opengl? ( !static-libs )
- curl? ( X )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.14-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.14-Makefile.patch
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
- # See bug #662352
- "${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
- # bug #672998
- "${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- use hppa && append-cflags -ffunction-sections
-
- use javascript || \
- sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
- -i include/mupdf/fitz/config.h
-
- use vanilla || eapply \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -e "1iprefix = ${ED}usr" \
- -e "1ilibdir = ${ED}usr/$(get_libdir)" \
- -e "1idocdir = ${ED}usr/share/doc/${PF}" \
- -i Makerules || die
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
- emake \
- GENTOO_PV=${PV} \
- HAVE_GLUT=$(usex opengl yes no) \
- WANT_CURL=$(usex curl) \
- WANT_OPENSSL=$(usex ssl) \
- WANT_X11=$(usex X) \
- USE_SYSTEM_LIBS=yes \
- USE_SYSTEM_MUJS=yes \
- HAVE_OBJCOPY=no \
- "$@"
-}
-
-src_compile() {
- _emake XCFLAGS="-fpic"
-
- use curl && _emake extra-apps
-
- use static-libs && \
- _emake build/debug/lib${PN}.a
-}
-
-src_install() {
- if use X || use opengl ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a build/debug/lib${PN}.a
- if use opengl ; then
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- dosym ${PN}-gl /usr/bin/${PN}
- elif use X ; then
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
- use curl && dobin build/debug/${PN}-x11-curl
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
deleted file mode 100644
index fca81cfa02fd..000000000000
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
-
-RDEPEND="
- >=dev-lang/mujs-1.0.4
- media-libs/freetype:2=[static-libs?]
- media-libs/harfbuzz:=[static-libs?,truetype]
- media-libs/jbig2dec:=[static-libs?]
- media-libs/libpng:0=[static-libs?]
- >=media-libs/openjpeg-2.1:2=[static-libs?]
- virtual/jpeg[static-libs?]
- curl? ( net-misc/curl[static-libs?] )
- opengl? ( >=media-libs/freeglut-3.0.0:= )
- ssl? (
- libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
- !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
- )
- X? (
- x11-libs/libX11[static-libs?]
- x11-libs/libXext[static-libs?]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="
- opengl? ( !static-libs )
- curl? ( X )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.14-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.14-Makefile.patch
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.14-r3-openssl-curl-x11.patch
- # bug #672998
- "${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- use hppa && append-cflags -ffunction-sections
-
- use javascript || \
- sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
- -i include/mupdf/fitz/config.h
-
- use vanilla || eapply \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
- # See bug #670832
- use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -e "1iprefix = ${ED}usr" \
- -e "1ilibdir = ${ED}usr/$(get_libdir)" \
- -e "1idocdir = ${ED}usr/share/doc/${PF}" \
- -i Makerules || die
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
- emake \
- GENTOO_PV=${PV} \
- HAVE_GLUT=$(usex opengl) \
- HAVE_CURL=$(usex curl) \
- HAVE_LIBCRYPTO=$(usex ssl) \
- HAVE_X11=$(usex X) \
- USE_SYSTEM_LIBS=yes \
- USE_SYSTEM_MUJS=yes \
- HAVE_OBJCOPY=no \
- "$@"
-}
-
-src_compile() {
- _emake XCFLAGS="-fpic"
-
- use curl && _emake extra-apps
-
- use static-libs && \
- _emake build/debug/lib${PN}.a
-}
-
-src_install() {
- if use X || use opengl ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a build/debug/lib${PN}.a
- if use opengl ; then
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- dosym ${PN}-gl /usr/bin/${PN}
- elif use X ; then
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
- use curl && dobin build/debug/${PN}-x11-curl
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild
deleted file mode 100644
index 7d1f75d3ee14..000000000000
--- a/app-text/mupdf/mupdf-1.15.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs xdg desktop
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X +javascript libressl opengl ssl static-libs vanilla"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
- media-libs/freetype:2=[static-libs?]
- media-libs/harfbuzz:=[static-libs?,truetype]
- media-libs/jbig2dec:=[static-libs?]
- media-libs/libpng:0=[static-libs?]
- >=media-libs/openjpeg-2.1:2=[static-libs?]
- virtual/jpeg[static-libs?]
- opengl? ( >=media-libs/freeglut-3.0.0:= )
- ssl? (
- libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
- !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
- )
- X? (
- x11-libs/libX11[static-libs?]
- x11-libs/libXext[static-libs?]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="opengl? ( !static-libs )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.15-Makefile.patch
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- use hppa && append-cflags -ffunction-sections
-
- use javascript || \
- sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
- -i include/mupdf/fitz/config.h
-
- use vanilla || eapply \
- "${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
- # See bug #670832
- use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -e "1iprefix = ${ED}/usr" \
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
- -i Makerules || die
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-
- # We don't use system's freeglut because upstream has a special modified
- # version of it that gives mupdf clipboard support. See bug #653298
-
- # As of v1.15.0, mupdf started using symbols in mujs that were not part
- # of any release. We thus go back to using the bundled version of it.
- # Bug #685244
- emake \
- GENTOO_PV=${PV} \
- HAVE_GLUT=$(usex opengl) \
- HAVE_LIBCRYPTO=$(usex ssl) \
- HAVE_X11=$(usex X) \
- USE_SYSTEM_LIBS=yes \
- USE_SYSTEM_MUJS=no \
- USE_SYSTEM_GLUT=no \
- HAVE_OBJCOPY=no \
- "$@"
-}
-
-src_compile() {
- _emake XCFLAGS="-fpic"
-
- use static-libs && \
- _emake build/debug/lib${PN}.a
-}
-
-src_install() {
- if use X || use opengl ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1
- fi
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- use static-libs && \
- dolib.a build/debug/lib${PN}.a
- if use opengl ; then
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- dosym ${PN}-gl /usr/bin/${PN}
- elif use X ; then
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.22.0-r1.ebuild b/app-text/mupdf/mupdf-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..fc8bbe571872
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.22.0-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="+drm +javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+ dev-libs/gumbo:=
+ media-libs/freetype:2
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0=
+ javascript? ( >=dev-lang/mujs-1.2.0:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+ sys-libs/zlib
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+ "${FILESDIR}"/${PN}-1.19.0-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+ "${FILESDIR}"/${PN}-1.21.1-no-drm.patch
+ "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ use drm && append-cflags -DGENTOO_MUPDF_DRM
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+ # Adjust MuPDF version in .pc file created by the
+ # mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+ sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ #
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ local myemakeargs=(
+ GENTOO_PV=${PV}
+ HAVE_GLUT=$(usex opengl)
+ HAVE_LIBCRYPTO=$(usex ssl)
+ HAVE_X11=$(usex X)
+ USE_SYSTEM_LIBS=yes
+ USE_SYSTEM_MUJS=$(usex javascript)
+ USE_SYSTEM_GLUT=no
+ HAVE_OBJCOPY=no
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ _emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+ if use opengl || use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon -s scalable docs/logo/new-${PN}-icon.svg
+ else
+ rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
+ || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mupdf/mupdf-1.23.3-r1.ebuild b/app-text/mupdf/mupdf-1.23.3-r1.ebuild
new file mode 100644
index 000000000000..7c7e19d9e75c
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.23.3-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="+javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+ dev-libs/gumbo:=
+ media-libs/freetype:2
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0=
+ net-misc/curl
+ javascript? ( >=dev-lang/mujs-1.2.0:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+ sys-libs/zlib
+ X? (
+ media-libs/libglvnd[X]
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+ "${FILESDIR}"/${P}-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${P}-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${P}-cross-fixes.patch
+ "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+ # Adjust MuPDF version in .pc file created by the
+ # mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+ sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ #
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ local myemakeargs=(
+ GENTOO_PV=${PV}
+ HAVE_GLUT=$(usex opengl)
+ HAVE_LIBCRYPTO=$(usex ssl)
+ HAVE_X11=$(usex X)
+ USE_SYSTEM_LIBS=yes
+ USE_SYSTEM_MUJS=$(usex javascript)
+ USE_SYSTEM_GLUT=no
+ HAVE_OBJCOPY=no
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ _emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+ if use opengl || use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon -s scalable docs/logo/new-${PN}-icon.svg
+ else
+ rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc \
+ || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mupdf/mupdf-1.23.7-r1.ebuild b/app-text/mupdf/mupdf-1.23.7-r1.ebuild
new file mode 100644
index 000000000000..d27ecf8911d4
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.23.7-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="+javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+ dev-libs/gumbo:=
+ media-libs/freetype:2
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0=
+ net-misc/curl
+ javascript? ( >=dev-lang/mujs-1.2.0:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+ sys-libs/zlib
+ X? (
+ media-libs/libglvnd[X]
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.21.0-add-desktop-pc-files.patch
+ "${FILESDIR}"/${PN}-1.23.3-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.23.3-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.23.3-cross-fixes.patch
+ "${FILESDIR}"/${PN}-1.21.1-fix-aliasing-violation.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+ # Adjust MuPDF version in .pc file created by the
+ # mupdf-1.21.0-add-desktop-pc-files.patch file
+ sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ #
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ local myemakeargs=(
+ GENTOO_PV=${PV}
+ HAVE_GLUT=$(usex opengl)
+ HAVE_LIBCRYPTO=$(usex ssl)
+ HAVE_X11=$(usex X)
+ USE_SYSTEM_LIBS=yes
+ USE_SYSTEM_MUJS=$(usex javascript)
+ USE_SYSTEM_GLUT=no
+ HAVE_OBJCOPY=no
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ _emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+ if use opengl || use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon -s scalable docs/logo/new-${PN}-icon.svg
+ else
+ rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir and EPREFIX (bugs #734898, #911965)
+ sed -i -e "s:/lib:/$(get_libdir):" \
+ -e "s:/usr:${EPREFIX}/usr:" platform/debian/${PN}.pc \
+ || die "Failed to sed pkgconfig file to respect libdir and EPREFIX in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index eecadde98eb5..d54eb82d5a6e 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1 +1 @@
-DIST mythes-1.2.4.tar.gz 4910303 BLAKE2B aa091344aebd117618d90aa574ec5e68594782511e1aa85a2d46740ecc4ff2cdf1d9f9f6de9dfd454cc0056076bdb9a21ad14d2935e39e4fdbd7753930fda605 SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21
+DIST mythes-1.2.5.tar.xz 2891852 BLAKE2B e292e49187a9b225fdcfccb467afed0b8ce90769bbefe331d7d7f026f2dd6686543b14f3666af5b1693198467206c53da0bbd030420d87c94315f9da769f45a6 SHA512 304fd05619e0ae02c9c29d92a6ada8f4a85f41f331b87b8820728c1919f3dd9c5cd951dbef9a27e649466f94dc5daa19350c9fd09c90d49b198b73b1f9eb770e
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
index 99d138c6b1a0..8acbf740b37a 100644
--- a/app-text/mythes/metadata.xml
+++ b/app-text/mythes/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/mythes/mythes-1.2.4.ebuild b/app-text/mythes/mythes-1.2.4.ebuild
deleted file mode 100644
index 9d0fe705e834..000000000000
--- a/app-text/mythes/mythes-1.2.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A simple thesaurus for Libreoffice"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-text/hunspell"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/mythes/mythes-1.2.5.ebuild b/app-text/mythes/mythes-1.2.5.ebuild
new file mode 100644
index 000000000000..1d2f70215835
--- /dev/null
+++ b/app-text/mythes/mythes-1.2.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple thesaurus for LibreOffice"
+HOMEPAGE="https://github.com/hunspell/mythes"
+SRC_URI="https://github.com/hunspell/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="app-text/hunspell:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --disable-werror \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 8629ab62e8e8..a234f0388999 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,2 +1,2 @@
DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
+DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0
diff --git a/app-text/namazu/files/namazu-emacs-27.patch b/app-text/namazu/files/namazu-emacs-27.patch
new file mode 100644
index 000000000000..cb9dd4de9590
--- /dev/null
+++ b/app-text/namazu/files/namazu-emacs-27.patch
@@ -0,0 +1,14 @@
+--- a/lisp/namazu.el
++++ b/lisp/namazu.el
+@@ -99,9 +99,9 @@
+ (defmacro defgroup (&rest args)
+ nil)
+ (defmacro defcustom (var value doc &rest args)
+- (` (defvar (, var) (, value) (, doc))))
++ `(defvar (, var) (, value) (, doc)))
+ (defmacro defface (var value doc &rest args)
+- (` (make-face (, var))))
++ `(make-face (, var)))
+ (defmacro define-widget (&rest args)
+ nil)))
+
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index e1a49f498885..491c88b3a31f 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 7a542c06eb94..ef46e76118df 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit autotools elisp-common
@@ -9,13 +9,13 @@ DESCRIPTION="Namazu is a full-text search engine"
HOMEPAGE="http://www.namazu.org/"
SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="emacs l10n_ja nls static-libs tk"
RDEPEND="dev-perl/File-MMagic
- emacs? ( virtual/emacs )
+ emacs? ( >=app-editors/emacs-23.1:* )
l10n_ja? (
app-i18n/nkf
|| (
@@ -30,11 +30,12 @@ RDEPEND="dev-perl/File-MMagic
dev-lang/tk:0
www-client/lynx
)"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-emacs-27.patch
"${FILESDIR}"/${PN}-perl-5.18.patch
"${FILESDIR}"/${PN}-perl-5.26.patch
"${FILESDIR}"/${P}-memmove.patch
@@ -43,8 +44,8 @@ PATCHES=(
src_prepare() {
default
- mv configure.{in,ac}
- mv tk${PN}/configure.{in,ac}
+ mv configure.{in,ac} || die
+ mv tk${PN}/configure.{in,ac} || die
eautoreconf
}
@@ -64,7 +65,7 @@ src_configure() {
}
src_compile() {
- emake
+ default
if use emacs; then
cd lisp
@@ -77,7 +78,7 @@ src_test() {
emake -j1 check
}
-src_install () {
+src_install() {
default
find "${ED}" -name '*.la' -delete || die
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre7.ebuild
deleted file mode 100644
index b0e98040e377..000000000000
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common
-
-MY_P="${P/_pre/pre}"
-
-DESCRIPTION="Namazu is a full-text search engine"
-HOMEPAGE="http://www.namazu.org/"
-SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="emacs l10n_ja nls static-libs tk"
-
-RDEPEND="dev-perl/File-MMagic
- emacs? ( virtual/emacs )
- l10n_ja? (
- app-i18n/nkf
- || (
- dev-perl/Text-Kakasi
- app-i18n/kakasi
- app-text/chasen
- app-text/mecab
- )
- )
- nls? ( virtual/libintl )
- tk? (
- dev-lang/tk:0
- www-client/lynx
- )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-
-src_prepare() {
- default
-
- mv configure.{in,ac}
- mv tk${PN}/configure.{in,ac}
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_enable nls)
- $(use_enable static-libs static)
- $(use_enable tk tk${PN})
- )
- use tk && myconf+=(
- --with-${PN}="${EPREFIX}"/usr/bin/${PN}
- --with-mknmz="${EPREFIX}"/usr/bin/mknmz
- --with-indexdir="${EPREFIX}"/var/lib/${PN}/index
- )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake
-
- if use emacs; then
- cd lisp
- rm -f browse*
- elisp-compile *.el
- fi
-}
-
-src_test() {
- emake -j1 check
-}
-
-src_install () {
- default
- find "${ED}" -name '*.la' -delete || die
-
- if use emacs; then
- elisp-install ${PN} lisp/*.el*
- elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-
- docinto lisp
- dodoc lisp/ChangeLog*
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/app-text/namazu/namazu-2.0.22_pre8.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
new file mode 100644
index 000000000000..4c8146e3b313
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common
+
+MY_P="${P/_pre/pre}"
+
+DESCRIPTION="Namazu is a full-text search engine"
+HOMEPAGE="http://www.namazu.org/"
+SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="emacs l10n_ja nls static-libs tk"
+
+RDEPEND="dev-perl/File-MMagic
+ emacs? ( >=app-editors/emacs-23.1:* )
+ l10n_ja? (
+ app-i18n/nkf
+ || (
+ dev-perl/Text-Kakasi
+ app-i18n/kakasi
+ app-text/chasen
+ app-text/mecab
+ )
+ )
+ nls? ( virtual/libintl )
+ tk? (
+ dev-lang/tk:0
+ www-client/lynx
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+ mv tk${PN}/configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ $(use_enable tk tk${PN})
+ )
+ use tk && myconf+=(
+ --with-${PN}="${EPREFIX}"/usr/bin/${PN}
+ --with-mknmz="${EPREFIX}"/usr/bin/mknmz
+ --with-indexdir="${EPREFIX}"/var/lib/${PN}/index
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ cd lisp
+ rm -f browse*
+ elisp-compile *.el
+ fi
+}
+
+src_test() {
+ emake -j1 check
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ if use emacs; then
+ elisp-install ${PN} lisp/*.el*
+ elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+
+ docinto lisp
+ dodoc lisp/ChangeLog*
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 0db66da8ac03..358784e45e64 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,3 +1 @@
-DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
-DIST nfoview-1.24.tar.gz 86037 BLAKE2B 5d565680864f1a73a64d9557e69eda0771dc164f12018ac8964fb1c2225005c1bb881c7b9035c7baed2021838e3a291e52fb5af84cf9c271c046cfddd684270c SHA512 91ad1f9f972b7681655b429c0910475012bd2231e51c6db5659b19fb869779d1de10dadc1d6461fa7d577c051af9b74f1d463543a429e1dca438a4ff17ac2293
-DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
+DIST nfoview-1.28.1.tar.gz 62571 BLAKE2B 5ecfd83e9429f3d616d9b633a5f3042308df06253065946ea13c66f71dd937a2325f252e04812894d000fea3364337378c4d91b2c54ee530c9d225ce7752dc90 SHA512 55179791b1a8058777a8a8527758687ab5924e00086d1c85a95759d85eb65ec46f072ba5bd5521629f39737437002eb6cf4070bc25b0e9246c511c32c6b08e99
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
index f49632fab59f..602aa45fcc02 100644
--- a/app-text/nfoview/metadata.xml
+++ b/app-text/nfoview/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>till2.schaefer@uni-dortmund.de</email>
<name>Till Schäfer</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-text/nfoview/nfoview-1.23.ebuild b/app-text/nfoview/nfoview-1.23.ebuild
deleted file mode 100644
index b7aa96c2ddb9..000000000000
--- a/app-text/nfoview/nfoview-1.23.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- media-fonts/terminus-font"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.24.ebuild b/app-text/nfoview/nfoview-1.24.ebuild
deleted file mode 100644
index b7aa96c2ddb9..000000000000
--- a/app-text/nfoview/nfoview-1.24.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- media-fonts/terminus-font"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.26.ebuild b/app-text/nfoview/nfoview-1.26.ebuild
deleted file mode 100644
index 147b225c7db3..000000000000
--- a/app-text/nfoview/nfoview-1.26.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- media-fonts/terminus-font"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.28.1-r1.ebuild b/app-text/nfoview/nfoview-1.28.1-r1.ebuild
new file mode 100644
index 000000000000..015d8780b5e0
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.28.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 virtualx xdg
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="https://otsaloma.io/nfoview/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/gettext"
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ media-fonts/cascadia-code
+ x11-libs/gtk+:3[introspection]"
+
+EPYTEST_DESELECT=(
+ "nfoview/test/test_util.py::TestModule::test_show_uri__unix"
+ "nfoview/test/test_util.py::TestModule::test_show_uri__windows"
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+ virtx distutils-r1_src_test
+}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
deleted file mode 100644
index 147b225c7db3..000000000000
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- media-fonts/terminus-font"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
new file mode 100644
index 000000000000..71de41a24016
--- /dev/null
+++ b/app-text/nuspell/Manifest
@@ -0,0 +1,2 @@
+DIST nuspell-5.1.3.tar.gz 371496 BLAKE2B 7a4aa05b01bd085e0612cf681783cfa2314a3b775c283f7e25c19d6afbb5af74c7ea2ffe149c68ca422383c24bd043e4b5e6b0895a0acd7c376e3d39f253a867 SHA512 72c868f734848be79c7cfb0502298626307213e4f3f422f8e9ee7dac24cb3d79ea55d04ef0443e7107bb11eb545c79a15a8aea8cb056dc2805c23bd5e3292562
+DIST nuspell-5.1.4.tar.gz 371512 BLAKE2B c1c05cc113cf7a6a4b77671f4fe372b2131a6cbcb328d76517bcbb45863e1fd0f27d76597193cae3a5c686d8e0b480fc831e0aa8dbcbf9f9b65420200a13d444 SHA512 f4119b3fe5944be8f5bc35ccff8d7a93b0f4fa9f129bc97a7b96879a11b5b35bd714b41dd209267417e94c5fed45fd3a74b349f94424f4b90bde07d9694d1d7d
diff --git a/app-text/nuspell/metadata.xml b/app-text/nuspell/metadata.xml
new file mode 100644
index 000000000000..11557a865054
--- /dev/null
+++ b/app-text/nuspell/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
+ <longdescription>
+ Spell checker library and command-line program designed for
+ languages with rich morphology and complex word compounding.
+
+ Nuspell is a pure C++ re-implementation of <pkg>app-text/hunspell</pkg>.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">nuspell/nuspell</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/nuspell/nuspell-5.1.3.ebuild b/app-text/nuspell/nuspell-5.1.3.ebuild
new file mode 100644
index 000000000000..18d0806fde8f
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/5" # due to libnuspell.so.5
+KEYWORDS="amd64 ~loong ~riscv x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/icu-60"
+DEPEND="${RDEPEND}
+ doc? ( virtual/pandoc )
+ test? ( <dev-cpp/catch-3:0 )
+ "
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ if ! use test ; then
+ rm -R external/hunspell/ || die
+ fi
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ einfo
+ einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+ einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+ einfo
+ einfo 'Besides MySpell dictionaries, for other options please'
+ einfo 'see https://nuspell.github.io/#languages-and-users .'
+ einfo
+}
diff --git a/app-text/nuspell/nuspell-5.1.4.ebuild b/app-text/nuspell/nuspell-5.1.4.ebuild
new file mode 100644
index 000000000000..d0791bda1ad5
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/5" # due to libnuspell.so.5
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/icu-60"
+DEPEND="${RDEPEND}
+ doc? ( virtual/pandoc )
+ test? ( >=dev-cpp/catch-3.1.1:0 )
+ "
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ if ! use test ; then
+ rm -R external/hunspell/ || die
+ fi
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ einfo
+ einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+ einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+ einfo
+ einfo 'Besides MySpell dictionaries, for other options please'
+ einfo 'see https://nuspell.github.io/#languages-and-users .'
+ einfo
+}
diff --git a/app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch b/app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch
new file mode 100644
index 000000000000..63dcf95c0def
--- /dev/null
+++ b/app-text/o3read/files/o3read-0.0.4-fix-buildsystem.patch
@@ -0,0 +1,36 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,6 @@
+ PACKAGE = o3read
+ VERSION = 0.0.4
+
+-CC = gcc
+-CFLAGS = -Wall -ansi -pedantic -O -g
+ PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/man/man1
+@@ -16,20 +14,13 @@
+
+ all: $(BINS)
+
+-utf8tolatin1: utf8tolatin1.o
+- $(CC) -o utf8tolatin1 utf8tolatin1.o
++o3totxt: o3read.o
+
+-o3totxt: o3totxt.o o3read.o
+- $(CC) -o o3totxt o3totxt.o o3read.o
++o3tohtml: o3read.o
+
+-o3tohtml: o3tohtml.o o3read.o
+- $(CC) -o o3tohtml o3tohtml.o o3read.o
++o3tosiag: o3read.o
+
+-o3tosiag: o3tosiag.o o3read.o
+- $(CC) -o o3tosiag o3tosiag.o o3read.o
+-
+-o3read: main.o o3read.o
+- $(CC) -o o3read main.o o3read.o
++o3read: main.o
+
+ dist:
+ rm -rf $(PACKAGE)-$(VERSION)
diff --git a/app-text/o3read/metadata.xml b/app-text/o3read/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/o3read/metadata.xml
+++ b/app-text/o3read/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild
index 9b39421c0634..4cf54987a0c9 100644
--- a/app-text/o3read/o3read-0.0.4.ebuild
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit toolchain-funcs
@@ -12,20 +12,16 @@ SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+RESTRICT="test"
-RESTRICT=test
+PATCHES=( "${FILESDIR}"/${P}-fix-buildsystem.patch )
-src_prepare() {
- sed \
- -e 's:-o:$(LDFLAGS) -o:g' \
- -e '/^CC/d' \
- -e '/^CFLAGS/g' \
- -i Makefile || die
+src_configure() {
tc-export CC
}
src_install() {
dobin o3read o3totxt o3tohtml utf8tolatin1
- doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1
+ einstalldocs
+ doman *.1
}
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index 703b3913a3c3..e2db2e2b29da 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,5 +1 @@
-DIST ocrad-0.22.tar.lz 87698 BLAKE2B 90bc7a5fb94476819501a2026e4b55c0d8631acf40926c2840e614066786078235edbd44d6bc47877cf106244bcb90b0291c2fb45a34f7d3a99ca676271e5df7 SHA512 45c7934776d96b6868a0109bf40b6814503c03bf63cb797e6a727599aa79e700a253b4eb3ec8ec8ec7abc3417601dacafc7560b147395171348cdae1b6951254
-DIST ocrad-0.23.tar.lz 87385 BLAKE2B 9f6ece19f815e1e6011aef5c2c90f1772bdc9621586744ddb9c7fde16762ccba42ca887792a9958c3a7ff1d43f8cbab985a2196de1f1a7ada01ad79d30f308b1 SHA512 db3c282dd121b5138d7e0e8d52fe88a3d392aa5ba2a5b821c74a84b1f66f0bfb8f3b9f08a276b6814c6bb6c31b1a51f5bcaf0c6e66e1a4d659ea72f60b383d13
-DIST ocrad-0.24.tar.lz 84506 BLAKE2B 814604ffb04cc3b4e40a7c3a07d90c9d07e4b64afd4d97bc5043e1019eeb347dd1105481dbaa721951efe4aaea729dd87f3510f3ee7dd9b277d96f9d6cb33ea2 SHA512 c43cb4dc678e9588e7061af6ea83a0514181e56201fe5ab68b50b8a1c8e1ae7c7fbf959cdf172b7200b89d9e6b1f42261ead4fbf3a6d0123860feff7954e532d
-DIST ocrad-0.25.tar.lz 91464 BLAKE2B 424d2a67eee85bb2d66568c4869761f2ef63c7c274b3a5a0a1c82920bc23becb97553b76dd4a7af5ca4400e806a05e927581060420f70483eaf8a77bf865e05f SHA512 48a0753d699af909d4d0295005e12ec626dad8772a5212c0d579df3b24cf01f6e457ec61edc708a0f6eebace75f37ce0544e8b19c11c9a25166aafedc92c258f
-DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
+DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 40249c58ed5b..1e689d2596fc 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
-<longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
+ <!-- maintainer-needed -->
+ <longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
program impleme nted as a filter and based on a feature extraction
method. It reads a bitmap ima ge in pbm format and outputs text in
ISO-8859-1 (Latin-1) charset.</longdescription>
+ <upstream>
+ <remote-id type="savannah-nongnu">ocrad</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/ocrad/ocrad-0.22.ebuild b/app-text/ocrad/ocrad-0.22.ebuild
deleted file mode 100644
index 289635030861..000000000000
--- a/app-text/ocrad/ocrad-0.22.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- # ./configure is not based on autotools
- ./configure \
- CPPFLAGS="${CPPFLAGS}" \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- --prefix=/usr
-}
-
-src_install() {
- default
- doman doc/${PN}.1
- doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.23.ebuild b/app-text/ocrad/ocrad-0.23.ebuild
deleted file mode 100644
index 2f4bea7172dc..000000000000
--- a/app-text/ocrad/ocrad-0.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- # ./configure is not based on autotools
- ./configure \
- CPPFLAGS="${CPPFLAGS}" \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- --prefix=/usr
-}
-
-src_install() {
- default
- doman doc/${PN}.1
- doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.24.ebuild b/app-text/ocrad/ocrad-0.24.ebuild
deleted file mode 100644
index 2ccbc7b1dfe4..000000000000
--- a/app-text/ocrad/ocrad-0.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- # ./configure is not based on autotools
- ./configure \
- CPPFLAGS="${CPPFLAGS}" \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- --prefix=/usr
-}
-
-src_install() {
- default
- doman doc/${PN}.1
- doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.25.ebuild b/app-text/ocrad/ocrad-0.25.ebuild
deleted file mode 100644
index 84c6fa87268e..000000000000
--- a/app-text/ocrad/ocrad-0.25.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
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- # ./configure is not based on autotools
- ./configure \
- CPPFLAGS="${CPPFLAGS}" \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- --prefix=/usr
-}
-
-src_install() {
- default
- doman doc/${PN}.1
- doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild
deleted file mode 100644
index 1dc0d0045405..000000000000
--- a/app-text/ocrad/ocrad-0.26.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- # ./configure is not based on autotools
- ./configure \
- CPPFLAGS="${CPPFLAGS}" \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- --prefix=/usr
-}
-
-src_install() {
- default
- doman doc/${PN}.1
- doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.27.ebuild b/app-text/ocrad/ocrad-0.27.ebuild
new file mode 100644
index 000000000000..be1acd75228b
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.27.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+
+BDEPEND="$(unpacker_src_uri_depends)"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+ # ./configure is not based on autotools
+ ./configure \
+ CPPFLAGS="${CPPFLAGS}" \
+ CXX="$(tc-getCXX)" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ --prefix=/usr || die
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ doman doc/${PN}.1
+ doinfo doc/${PN}.info
+}
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index f8855f7a0530..174c42ba0ff0 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1,2 +1 @@
-DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
diff --git a/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch
deleted file mode 100644
index 05957269888e..000000000000
--- a/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile
---- odt2txt-0.4/Makefile 2008-06-23 23:32:28 +0400
-+++ odt2txt-0.4/Makefile 2010-05-24 15:39:16 +0400
-@@ -56,6 +56,9 @@
- CFLAGS += -I$(ZLIB_DIR)
- LIBS = $(ZLIB_DIR)/libz.a
- endif
-+ifeq ($(UNAME_S),Darwin)
-+ LIBS += -liconv
-+endif
- ifeq ($(UNAME_O),Cygwin)
- CFLAGS += -DICONV_CHAR="const char"
- LIBS += -liconv
-
diff --git a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
deleted file mode 100644
index 05957269888e..000000000000
--- a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile
---- odt2txt-0.4/Makefile 2008-06-23 23:32:28 +0400
-+++ odt2txt-0.4/Makefile 2010-05-24 15:39:16 +0400
-@@ -56,6 +56,9 @@
- CFLAGS += -I$(ZLIB_DIR)
- LIBS = $(ZLIB_DIR)/libz.a
- endif
-+ifeq ($(UNAME_S),Darwin)
-+ LIBS += -liconv
-+endif
- ifeq ($(UNAME_O),Cygwin)
- CFLAGS += -DICONV_CHAR="const char"
- LIBS += -liconv
-
diff --git a/app-text/odt2txt/files/odt2txt-0.5-makefile.patch b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch
new file mode 100644
index 000000000000..b87814f3ff58
--- /dev/null
+++ b/app-text/odt2txt/files/odt2txt-0.5-makefile.patch
@@ -0,0 +1,116 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,28 +2,22 @@
+ UNAME_S := $(shell uname -s 2>/dev/null || echo unknown)
+ UNAME_O := $(shell uname -o 2>/dev/null || echo unknown)
+
+-ifdef DEBUG
+-CFLAGS = -O0 -g -Wextra -DMEMDEBUG -DSTRBUF_CHECK
+-#LDFLAGS = -lefence
+-LDFLAGS += -g
+-else
+-CFLAGS = -O2
+-endif
+-
+ ifdef NO_ICONV
+-CFLAGS += -DNO_ICONV
++CPPFLAGS += -DNO_ICONV
+ endif
+
+-LIBS = -lz
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib)
++LDLIBS += $(shell $(PKG_CONFIG) --libs zlib)
++
+ ZIP_OBJS =
+ ifdef HAVE_LIBZIP
+- CFLAGS += -DHAVE_LIBZIP
+- LIBS += -lzip
++ CPPFLAGS += -DHAVE_LIBZIP
++ LDLIBS += -lzip
+ else
+ ZIP_OBJS = kunzip/fileio.o kunzip/zipfile.o
+ endif
+
+-OBJ = odt2txt.o regex.o mem.o strbuf.o $(ZIP_OBJS)
++OBJ = regex.o mem.o strbuf.o $(ZIP_OBJS)
+ TEST_OBJ = t/test-strbuf.o t/test-regex.o
+ ALL_OBJ = $(OBJ) $(TEST_OBJ)
+
+@@ -37,50 +31,44 @@
+ MAN1DIR = $(MANDIR)/man1
+
+ ifeq ($(UNAME_S),FreeBSD)
+- CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include
++ CPPFLAGS += -DICONV_CHAR="const char"
+ LDFLAGS += -L/usr/local/lib
+- LIBS += -liconv
++ LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_S),OpenBSD)
+- CFLAGS += -DICONV_CHAR="const char" -I/usr/local/include
++ CPPFLAGS += -DICONV_CHAR="const char"
+ LDFLAGS += -L/usr/local/lib
+- LIBS += -liconv
++ LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_S),Darwin)
+- CFLAGS += -I/opt/local/include
+- LDFLAGS += -L/opt/local/lib
+- LIBS += -liconv
++ LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_S),NetBSD)
+- CFLAGS += -DICONV_CHAR="const char"
++ CPPFLAGS += -DICONV_CHAR="const char"
+ endif
+ ifeq ($(UNAME_S),SunOS)
+- ifeq ($(CC),cc)
+- ifdef DEBUG
+- CFLAGS = -v -g -DMEMDEBUG -DSTRBUF_CHECK
+- else
+- CFLAGS = -xO3
+- endif
+- endif
+- CFLAGS += -DICONV_CHAR="const char"
++ CPPFLAGS += -DICONV_CHAR="const char"
+ endif
+ ifeq ($(UNAME_S),HP-UX)
+- CFLAGS += -I$(ZLIB_DIR)
+- LIBS = $(ZLIB_DIR)/libz.a
++ CPPFLAGS += -I$(ZLIB_DIR)
++ LDLIBS += $(ZLIB_DIR)/libz.a
++endif
++ifeq ($(UNAME_S),Darwin)
++ LDLIBS += -liconv
+ endif
+ ifeq ($(UNAME_O),Cygwin)
+- CFLAGS += -DICONV_CHAR="const char"
+- LIBS += -liconv
++ CPPFLAGS += -DICONV_CHAR="const char"
++ LDLIBS += -liconv
+ EXT = .exe
+ endif
+ ifneq ($(MINGW32),)
+- CFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR)
+- LIBS = $(REGEX_DIR)/regex.o
++ CPPFLAGS += -DICONV_CHAR="const char" -I$(REGEX_DIR) -I$(ZLIB_DIR)
++ LDLIBS += $(REGEX_DIR)/regex.o
+ ifdef STATIC
+- LIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o)
+- LIBS += $(ZLIB_DIR)/zlib.a
++ LDLIBS += $(wildcard $(ICONV_DIR)/lib/.libs/*.o)
++ LDLIBS += $(ZLIB_DIR)/zlib.a
+ else
+- LIBS += -liconv
++ LDLIBS += -liconv
+ endif
+ EXT = .exe
+ endif
+@@ -89,7 +77,6 @@
+ MAN = odt2txt.1
+
+ $(BIN): $(OBJ)
+- $(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
+
+ t/test-strbuf: t/test-strbuf.o strbuf.o mem.o
+ t/test-regex: t/test-regex.o regex.o strbuf.o mem.o
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index 684b678e70f5..364718ef994b 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">dstosberg/odt2txt</remote-id>
+ </upstream>
</pkgmetadata>
-
diff --git a/app-text/odt2txt/odt2txt-0.4-r1.ebuild b/app-text/odt2txt/odt2txt-0.4-r1.ebuild
deleted file mode 100644
index 180584feabd5..000000000000
--- a/app-text/odt2txt/odt2txt-0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A simple converter from OpenDocument Text to plain text"
-HOMEPAGE="http://stosberg.net/odt2txt/"
-SRC_URI="http://stosberg.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc64 sparc x86 ~x86-macos"
-IUSE=""
-
-RDEPEND="
- !app-office/unoconv
- sys-libs/zlib
- virtual/libiconv
-"
-DEPEND="${RDEPEND}
- sys-apps/groff
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-darwin_iconv.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- emake install DESTDIR="${D}" PREFIX=/usr
- doman odt2txt.1
-}
diff --git a/app-text/odt2txt/odt2txt-0.5-r1.ebuild b/app-text/odt2txt/odt2txt-0.5-r1.ebuild
new file mode 100644
index 000000000000..70a3b4a55b3e
--- /dev/null
+++ b/app-text/odt2txt/odt2txt-0.5-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple converter from OpenDocument Text to plain text"
+HOMEPAGE="http://stosberg.net/odt2txt/"
+SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc64 ~sparc x86"
+
+RDEPEND="
+ !app-office/unoconv
+ sys-libs/zlib
+ virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/groff"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+}
+
+src_install() {
+ emake install DESTDIR="${D}" PREFIX="${EPREFIX}"/usr
+ doman odt2txt.1
+}
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
deleted file mode 100644
index 1931fab8e2e6..000000000000
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple converter from OpenDocument Text to plain text"
-HOMEPAGE="http://stosberg.net/odt2txt/"
-SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc64 ~sparc x86 ~x86-macos"
-IUSE=""
-
-RDEPEND="
- !app-office/unoconv
- sys-libs/zlib
- virtual/libiconv
-"
-DEPEND="${RDEPEND}
- sys-apps/groff
-"
-PATCHES="${FILESDIR}/${P}-darwin_iconv.patch"
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- emake install DESTDIR="${D}" PREFIX=/usr
- doman odt2txt.1
-}
diff --git a/app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch b/app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch
new file mode 100644
index 000000000000..07e1f629d8f7
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch
@@ -0,0 +1,30 @@
+diff --git a/config/configure.in b/config/configure.in
+index 466c4ee..5af1de5 100644
+--- a/config/configure.in
++++ b/config/configure.in
+@@ -12,9 +12,8 @@ dnl
+ dnl Credits: this autoconf script was largely "inspired" <g> by the
+ dnl autoconf script around SP made by Henry Thompson.
+ dnl
+-AC_INIT(dsssl)
++AC_INIT(openjade, 1.3.2)
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE( openjade, 1.3.2)
+ TOP=`pwd`
+ AC_SUBST(TOP)
+ dnl
+diff --git a/include/config.h.in b/include/config.h.in
+index 2a6fd39..f8ccf1c 100644
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -18,8 +18,8 @@
+ #endif
+ #endif
+
+-#define OPENJADE_PACKAGE PACKAGE
+-#define OPENJADE_VERSION VERSION
++#define OPENJADE_PACKAGE "@PACKAGE_NAME@"
++#define OPENJADE_VERSION "@PACKAGE_VERSION@"
+ #ifndef OPENJADE_MESSAGE_DOMAIN
+ #define OPENJADE_MESSAGE_DOMAIN ""
+ #endif
diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
index a4a5fdce9de1..b3509edbf320 100644
--- a/app-text/openjade/metadata.xml
+++ b/app-text/openjade/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">openjade</remote-id>
</upstream>
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
deleted file mode 100644
index 90545f6ec1f4..000000000000
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools sgml-catalog flag-o-matic toolchain-funcs
-
-DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
-HOMEPAGE="http://openjade.sourceforge.net"
-SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
- app-text/sgml-common
- >=app-text/opensp-1.5.1
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}"/${P}-deplibs.patch
- eapply "${FILESDIR}"/${P}-ldflags.patch
- eapply "${FILESDIR}"/${P}-msggen.pl.patch
- eapply "${FILESDIR}"/${P}-respect-ldflags.patch
- eapply "${FILESDIR}"/${P}-libosp-la.patch
- eapply "${FILESDIR}"/${P}-gcc46.patch
- eapply "${FILESDIR}"/${P}-no-undefined.patch
- eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
- eapply "${FILESDIR}"/${P}-chmod.patch #487218
-
- # Please note! Opts are disabled. If you know what you're doing
- # feel free to remove this line. It may cause problems with
- # docbook-sgml-utils among other things.
- #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
- strip-flags
-
- # Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
- # on hppa. Using -O1 works fine. So I force it here.
- use hppa && replace-flags -O2 -O1
-
- ln -s config/configure.in configure.ac || die
- cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
- rm config/missing || die
-
- AT_NOEAUTOMAKE=yes
- eautoreconf
-
- SGML_PREFIX="${EPREFIX}"/usr/share/sgml
-}
-
-src_configure() {
- # avoids dead-store elimination optimization
- # leading to segfaults on GCC 6
- # bug #592590 #596506
- tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
-
- # We need Prefix env, bug #287358
- export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
- econf \
- --enable-http \
- --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
- --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
- --enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --datadir="${EPREFIX}"/usr/share/sgml/${P} \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- unset INCLUDE #412725
- emake -j1 SHELL="${BASH}"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)
-
- make DESTDIR="${D}" \
- SHELL="${BASH}" \
- libdir="${EPREFIX}"/usr/$(get_libdir) \
- install install-man
-
- use static-libs || find "${D}" -name '*.la' -delete || die
-
- dosym openjade /usr/bin/jade
- dosym onsgmls /usr/bin/nsgmls
- dosym osgmlnorm /usr/bin/sgmlnorm
- dosym ospam /usr/bin/spam
- dosym ospent /usr/bin/spent
- dosym osx /usr/bin/sgml2xml
-
- insinto /usr/share/sgml/${P}/
- doins dsssl/builtins.dsl
-
- echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
- insinto /usr/share/sgml/${P}/dsssl
- doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
- newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-
- # Breaks sgml2xml among other things
- #insinto /usr/share/sgml/${P}/unicode
- #doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
- insinto /usr/share/sgml/${P}/pubtext
- doins pubtext/*
-
- HTML_DOCS="doc/*.htm" einstalldocs
-
- insinto /usr/share/doc/${PF}/jadedoc
- doins jadedoc/*.htm
- insinto /usr/share/doc/${PF}/jadedoc/images
- doins jadedoc/images/*
-}
-
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
- "/usr/share/sgml/openjade-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
- "/usr/share/sgml/openjade-${PV}/dsssl/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
- "/etc/sgml/${P}.cat"
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
new file mode 100644
index 000000000000..9e97c0d604f0
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="https://openjade.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+ app-text/sgml-common
+ >=app-text/opensp-1.5.1
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+"
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}"/${P}-deplibs.patch
+ eapply "${FILESDIR}"/${P}-ldflags.patch
+ eapply "${FILESDIR}"/${P}-msggen.pl.patch
+ eapply "${FILESDIR}"/${P}-respect-ldflags.patch
+ eapply "${FILESDIR}"/${P}-libosp-la.patch
+ eapply "${FILESDIR}"/${P}-gcc46.patch
+ eapply "${FILESDIR}"/${P}-no-undefined.patch
+ eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
+ eapply "${FILESDIR}"/${P}-chmod.patch #487218
+ eapply "${FILESDIR}"/${P}-autoconf-2.70.patch #765034
+
+ # Please note! Opts are disabled. If you know what you're doing
+ # feel free to remove this line. It may cause problems with
+ # docbook-sgml-utils among other things.
+ #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+ strip-flags
+
+ # Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
+ # on hppa. Using -O1 works fine. So I force it here.
+ use hppa && replace-flags -O2 -O1
+
+ ln -s config/configure.in configure.ac || die
+ cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+ rm config/missing || die
+
+ AT_NOEAUTOMAKE=yes \
+ eautoreconf
+}
+
+src_configure() {
+ # avoids dead-store elimination optimization
+ # leading to segfaults on GCC 6
+ # bug #592590 #596506
+ tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
+
+ # We need Prefix env, bug #287358
+ CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}" \
+ econf \
+ --enable-http \
+ --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+ --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+ --enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --datadir="${EPREFIX}"/usr/share/sgml/${P} \
+ --disable-static
+}
+
+src_compile() {
+ unset INCLUDE #412725
+ emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+ #dodir /usr/$(get_libdir)
+
+ make DESTDIR="${D}" \
+ SHELL="${BASH}" \
+ libdir="${EPREFIX}"/usr/$(get_libdir) \
+ install install-man
+
+ find "${D}" -name '*.la' -delete || die
+
+ dosym openjade /usr/bin/jade
+ dosym onsgmls /usr/bin/nsgmls
+ dosym osgmlnorm /usr/bin/sgmlnorm
+ dosym ospam /usr/bin/spam
+ dosym ospent /usr/bin/spent
+ dosym osx /usr/bin/sgml2xml
+
+ insinto /usr/share/sgml/${P}
+ doins dsssl/builtins.dsl
+
+ newins - catalog <<-EOF
+ SYSTEM "builtins.dsl" "builtins.dsl"
+ EOF
+ doins -r pubtext
+ insinto /usr/share/sgml/${P}/dsssl
+ doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+ newins "${FILESDIR}"/${P}.dsssl-catalog catalog
+
+ # Breaks sgml2xml among other things
+ #insinto /usr/share/sgml/${P}/unicode
+ #doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+
+ insinto /etc/sgml
+ newins - "${P}.cat" <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/catalog"
+ CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+ EOF
+
+ local HTML_DOCS=( doc/*.htm )
+ einstalldocs
+ dodoc -r jadedoc
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/${P}.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/${P}.cat
+ local real=${EROOT}/etc/sgml/${P}.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ # this one's shared with docbook-dsssl, so we need to do it in postinst
+ if ! grep -q -s ${P}.cat \
+ "${EROOT}"/etc/sgml/sgml-docbook.cat; then
+ ebegin "Adding ${P}.cat to /etc/sgml/sgml-docbook.cat"
+ cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/${P}.cat"
+ EOF
+ eend ${?}
+ fi
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ ebegin "Removing ${P}.cat from /etc/sgml/sgml-docbook.cat"
+ sed -i -e '/${P}/d' \
+ "${EROOT}"/etc/sgml/sgml-docbook.cat
+ eend ${?}
+ if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+ rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+ fi
+ fi
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
deleted file mode 100644
index abbd62a15f53..000000000000
--- a/app-text/openlp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
diff --git a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
deleted file mode 100644
index 0b1de65e85af..000000000000
--- a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN a/setup.cfg b/setup.cfg
---- a/setup.cfg 2016-06-25 13:20:56.000000000 -0500
-+++ b/setup.cfg 2016-09-08 22:30:54.606413547 -0500
-@@ -2,3 +2,5 @@
- exclude=resources.py,vlc.py
- max-line-length = 120
- ignore = E402
-+[install]
-+install_scripts=/usr/bin
-\ No newline at end of file
-diff -urN a/setup.py b/setup.py
---- a/setup.py 2016-06-25 13:20:56.000000000 -0500
-+++ b/setup.py 2016-09-08 22:30:50.523413394 -0500
-@@ -157,7 +157,7 @@
- author_email='raoulsnyman@openlp.org',
- url='http://openlp.org/',
- license='GNU General Public License',
-- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-+ packages=find_packages(exclude=['ez_setup', 'examples', 'tests', 'tests.*']),
- scripts=['openlp.py'],
- include_package_data=True,
- zip_safe=False,
diff --git a/app-text/openlp/metadata.xml b/app-text/openlp/metadata.xml
deleted file mode 100644
index c14282681213..000000000000
--- a/app-text/openlp/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>anarchy@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">openlp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/openlp/openlp-2.4.6.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
deleted file mode 100644
index bd2519a0933b..000000000000
--- a/app-text/openlp/openlp-2.4.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Free church presentation software"
-HOMEPAGE="https://openlp.org/"
-SRC_URI="https://get.openlp.org/"${PV}"/OpenLP-"${PV}".tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/alembic[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/pyenchant-1.3[${PYTHON_USEDEP}]
- dev-python/pyodbc
- dev-python/PyQt5[multimedia,gui,network,svg,webkit,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.5[${PYTHON_USEDEP}]
- dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/OpenLP-${PV}
-
-PATCHES=( "${FILESDIR}"/OpenLP-2.4.2-disable-tests.patch )
-
-python_install_all() {
- distutils-r1_python_install_all
- domenu resources/openlp.desktop
- mv "${D}"/usr/bin/openlp.py "${D}"/usr/bin/openlp
- doicon -s scalable resources/images/openlp.svg
-}
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
new file mode 100644
index 000000000000..f1dcb533a8ce
--- /dev/null
+++ b/app-text/openpaperwork-core/Manifest
@@ -0,0 +1,2 @@
+DIST openpaperwork-core-2.1.2.tar.gz 104694 BLAKE2B cf7cc132758662495d4b586efebccaa20c892cdca2ae3bb68d5fc45639c828b8441906c56067db079c12f1393adcd69d2edec19ca51fe5fcd5930ce2a7005c0c SHA512 88cb55b7b94e1e149042357d3a1c6c2a2184e4810b5895e02ef896554ae88ed0ebacd9c11e401da5e155aec857cd1b148328b1ffd0b760f939e4e97b96d1ce1a
+DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
diff --git a/app-text/openpaperwork-core/metadata.xml b/app-text/openpaperwork-core/metadata.xml
new file mode 100644
index 000000000000..db57600aee06
--- /dev/null
+++ b/app-text/openpaperwork-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id>
+ <remote-id type="pypi">openpaperwork-core</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
new file mode 100644
index 000000000000..58b64fac3c8c
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core part of Paperwork (plugin management)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild
new file mode 100644
index 000000000000..b2cef72ea2c6
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core part of Paperwork (plugin management)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ sys-apps/which
+ sys-devel/gettext"
+
+S=${WORKDIR}/paperwork-${PV}/${PN}
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_compile() {
+ emake l10n_compile
+
+ distutils-r1_python_compile
+}
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
new file mode 100644
index 000000000000..5105be2f8cc7
--- /dev/null
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -0,0 +1,2 @@
+DIST openpaperwork-gtk-2.1.2.tar.gz 59104 BLAKE2B 94782b0fbd29e749b68f277e5c48a8f194d4feafe2f1579615b51bed44855a9113631302e3ed0f8248683ba524e72147da7cdce76e54b266ae9d8dbaa5cba2a5 SHA512 9f11482e68ee01356644fc2a679044a835308f6591b1b3ef6fc079c26e87a5c8c7fa8ba23545e7bf7fc9d37d85151a70cd7bdf4c45c271f67f8a8dcf95a5c440
+DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
diff --git a/app-text/openpaperwork-gtk/metadata.xml b/app-text/openpaperwork-gtk/metadata.xml
new file mode 100644
index 000000000000..5c14ec49f701
--- /dev/null
+++ b/app-text/openpaperwork-gtk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id>
+ <remote-id type="pypi">openpaperwork-gtk</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild
new file mode 100644
index 000000000000..7884f8b08f13
--- /dev/null
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Paperwork plugins"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gui-libs/libhandy
+ x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild
new file mode 100644
index 000000000000..d3f68f150bd4
--- /dev/null
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Paperwork plugins"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gui-libs/libhandy
+ x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ sys-apps/which
+ sys-devel/gettext"
+
+S=${WORKDIR}/paperwork-${PV}/${PN}
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_compile() {
+ emake l10n_compile
+
+ distutils-r1_python_compile
+}
diff --git a/app-text/opensp/files/opensp-1.5-gcc34.patch b/app-text/opensp/files/opensp-1.5-gcc34.patch
deleted file mode 100644
index 60ee56085315..000000000000
--- a/app-text/opensp/files/opensp-1.5-gcc34.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/RangeMap.h~ 2004-04-22 20:34:13.729541096 +0300
-+++ include/RangeMap.h 2004-04-22 20:31:48.473049702 +0300
-@@ -8,6 +8,7 @@
- #include "Boolean.h"
- #include "ISet.h"
- #include "types.h"
-+#include "constant.h"
- #include <stddef.h>
-
- #ifdef SP_NAMESPACE
diff --git a/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch
new file mode 100644
index 000000000000..6e6832957679
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch
@@ -0,0 +1,198 @@
+https://bugs.gentoo.org/889600
+https://src.fedoraproject.org/rpms/opensp/blob/ad3afd1f07f600aa21cd6a3f1960db5570682e47/f/opensp-configure-c99.patch
+
+Avoid implicit function declarations because they have been removed
+from C in 1999. Future compilers are likely to reject them by
+default.
+
+No need to upstream this because the aclocal.m4 file is not checked
+into the repository since:
+
+------------------------------------------------------------------------
+r412 | clasen | 1999-11-06 14:10:34 +0100 (Sat, 06 Nov 1999) | 3 lines
+Changed paths:
+ M /trunk/sp/Makefile.in
+ D /trunk/sp/config/aclocal.m4
+ D /trunk/sp/config/configure.in
+ M /trunk/sp/configure
+ A /trunk/sp/configure.in
+
+Install headers in $(includedir)/OpenSP, move configure.in to toplevel,
+remove generated file aclocal.m4.
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -833,10 +833,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -850,7 +846,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+--- a/configure
++++ b/configure
+@@ -2917,7 +2917,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
+- '' \
++ '#include <stdlib.h>' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+@@ -5186,8 +5186,8 @@ main ()
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -9508,10 +9508,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -9525,7 +9521,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }
+ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -9606,10 +9602,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -9623,7 +9615,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }
+ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -13321,10 +13313,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -13338,7 +13326,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }
+ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -13419,10 +13407,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -13436,7 +13420,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }
+ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -19110,10 +19094,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -19127,7 +19107,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }
+ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -19208,10 +19188,6 @@ else
+ # endif
+ #endif
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+ void fnord() { int i=42;}
+ int main ()
+ {
+@@ -19225,7 +19201,7 @@ int main ()
+ /* dlclose (self); */
+ }
+
+- exit (status);
++ return status;
+ }
+ EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -27450,8 +27426,8 @@ main ()
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+- exit(2);
+- exit (0);
++ return 2;
++ return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+
diff --git a/app-text/opensp/metadata.xml b/app-text/opensp/metadata.xml
index 84b1ddacc397..19b5abd52e4b 100644
--- a/app-text/opensp/metadata.xml
+++ b/app-text/opensp/metadata.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>heroxbd@gentoo.org</email>
<name>Benda Xu</name>
</maintainer>
- <longdescription>An SGML System Conforming to International Standard ISO 8879.</longdescription>
<upstream>
<remote-id type="sourceforge">openjade</remote-id>
</upstream>
diff --git a/app-text/opensp/opensp-1.5.2-r10.ebuild b/app-text/opensp/opensp-1.5.2-r10.ebuild
new file mode 100644
index 000000000000..7d8f3f3e0dd1
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r10.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P=${P/opensp/OpenSP}
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="https://openjade.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/openjade/opensp/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc nls static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ test? (
+ app-text/docbook-xml-dtd:4.5
+ app-text/openjade
+ app-text/sgml-common
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-segfault.patch
+ "${FILESDIR}"/${P}-c11-using.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
+)
+
+src_prepare() {
+ default
+ use prefix && eautoreconf
+}
+
+src_configure() {
+ export CONFIG_SHELL=${BASH} # configure needs bash
+
+ # The following filters are taken from openjade's ebuild. See bug #100828.
+ # Please note! Opts are disabled. If you know what you're doing
+ # feel free to remove this line. It may cause problems with
+ # docbook-sgml-utils among other things.
+ #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+ strip-flags
+ filter-lto
+
+ append-cxxflags -std=gnu++11
+
+ econf \
+ --enable-http \
+ --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+ --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+ --datadir="${EPREFIX}"/usr/share/sgml/${P} \
+ $(use_enable nls) \
+ $(use_enable doc doc-build) \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+ # Skipping tests known not to work
+ emake SHOWSTOPPERS= check
+ SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+
+ find "${ED}" -name '*.la' -delete || die
+
+ dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
deleted file mode 100644
index 655afe2945f7..000000000000
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-MY_P=${P/opensp/OpenSP}
-
-DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
-HOMEPAGE="http://openjade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs test"
-
-DEPEND="net-libs/libnsl:0=
- nls? ( sys-devel/gettext )
- doc? (
- app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2
- )
- test? (
- app-text/docbook-xml-dtd:4.5
- app-text/openjade
- app-text/sgml-common
- )"
-RDEPEND="net-libs/libnsl:0="
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.5-gcc34.patch \
- "${FILESDIR}"/${P}-fix-segfault.patch
-}
-
-src_configure() {
- export CONFIG_SHELL=${BASH} # configure needs bash
-
- # The following filters are taken from openjade's ebuild. See bug #100828.
- # Please note! Opts are disabled. If you know what you're doing
- # feel free to remove this line. It may cause problems with
- # docbook-sgml-utils among other things.
- #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
- strip-flags
-
- econf \
- --enable-http \
- --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
- --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
- --datadir="${EPREFIX}"/usr/share/sgml/${P} \
- $(use_enable nls) \
- $(use_enable doc doc-build) \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
- # Skipping tests known not to work
- emake SHOWSTOPPERS= check
- SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
- install
-
- prune_libtool_files
-
- dodoc AUTHORS BUGS ChangeLog NEWS README
-}
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
deleted file mode 100644
index 9059b26d2475..000000000000
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic autotools
-
-MY_P=${P/opensp/OpenSP}
-
-DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
-HOMEPAGE="http://openjade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_glibc nls static-libs test"
-
-RDEPEND="
- elibc_glibc? ( net-libs/libnsl:0= )
-"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- doc? (
- app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2
- )
- test? (
- app-text/docbook-xml-dtd:4.5
- app-text/openjade
- app-text/sgml-common
- )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-segfault.patch
- epatch "${FILESDIR}"/${P}-c11-using.patch
- use prefix && eautoreconf
-}
-
-src_configure() {
- export CONFIG_SHELL=${BASH} # configure needs bash
-
- # The following filters are taken from openjade's ebuild. See bug #100828.
- # Please note! Opts are disabled. If you know what you're doing
- # feel free to remove this line. It may cause problems with
- # docbook-sgml-utils among other things.
- #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
- strip-flags
-
- econf \
- --enable-http \
- --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
- --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
- --datadir="${EPREFIX}"/usr/share/sgml/${P} \
- $(use_enable nls) \
- $(use_enable doc doc-build) \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
- # Skipping tests known not to work
- emake SHOWSTOPPERS= check
- SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
- install
-
- prune_libtool_files
-
- dodoc AUTHORS BUGS ChangeLog NEWS README
-}
diff --git a/app-text/opensp/opensp-1.5.2-r9.ebuild b/app-text/opensp/opensp-1.5.2-r9.ebuild
new file mode 100644
index 000000000000..6f499d123338
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r9.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P=${P/opensp/OpenSP}
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="https://openjade.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/openjade/opensp/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc nls static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ test? (
+ app-text/docbook-xml-dtd:4.5
+ app-text/openjade
+ app-text/sgml-common
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-segfault.patch
+ "${FILESDIR}"/${P}-c11-using.patch
+)
+
+src_prepare() {
+ default
+ use prefix && eautoreconf
+}
+
+src_configure() {
+ export CONFIG_SHELL=${BASH} # configure needs bash
+
+ # The following filters are taken from openjade's ebuild. See bug #100828.
+ # Please note! Opts are disabled. If you know what you're doing
+ # feel free to remove this line. It may cause problems with
+ # docbook-sgml-utils among other things.
+ #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+ strip-flags
+ filter-lto
+
+ append-cxxflags -std=gnu++11
+
+ econf \
+ --enable-http \
+ --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+ --enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+ --datadir="${EPREFIX}"/usr/share/sgml/${P} \
+ $(use_enable nls) \
+ $(use_enable doc doc-build) \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+ # Skipping tests known not to work
+ emake SHOWSTOPPERS= check
+ SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+ install
+
+ find "${ED}" -name '*.la' -delete || die
+
+ dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/app-text/ots/Manifest b/app-text/ots/Manifest
deleted file mode 100644
index 8e8b840d5ae7..000000000000
--- a/app-text/ots/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
diff --git a/app-text/ots/files/ots-0.5.0-automake-1.13.patch b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
deleted file mode 100644
index 074eb0e53a83..000000000000
--- a/app-text/ots/files/ots-0.5.0-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ots-0.5.0/configure.in.automake-1_13 ots-0.5.0/configure.in
---- ots-0.5.0/configure.in.automake-1_13 2007-04-08 20:12:42.000000000 +0200
-+++ ots-0.5.0/configure.in 2013-01-09 02:31:52.690211708 +0100
-@@ -34,7 +34,7 @@ PACKAGE=ots
-
- dnl Specify a configuration file
- dnl Initialize automake stuff
--AM_CONFIG_HEADER(ots-config.h)
-+AC_CONFIG_HEADERS(ots-config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $OTS_VERSION)
- AM_MAINTAINER_MODE
-
diff --git a/app-text/ots/files/ots-0.5.0-fix-installation.patch b/app-text/ots/files/ots-0.5.0-fix-installation.patch
deleted file mode 100644
index 757f4f86b80b..000000000000
--- a/app-text/ots/files/ots-0.5.0-fix-installation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dic/Makefile.am~ 2003-07-22 16:56:03.000000000 +0200
-+++ dic/Makefile.am 2009-06-01 00:40:17.000000000 +0200
-@@ -1,7 +1,7 @@
- DICTS=bg.xml ca.xml cs.xml cy.xml da.xml de.xml el.xml en.xml eo.xml es.xml \
- et.xml eu.xml fi.xml fr.xml ga.xml gl.xml he.xml hu.xml ia.xml id.xml \
- is.xml it.xml lv.xml mi.xml ms.xml mt.xml nl.xml nn.xml pl.xml pt.xml \
-- ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml en.xml
-+ ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml
-
- pkgdata_DATA = $(DICTS)
-
diff --git a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
deleted file mode 100644
index dd9295930c33..000000000000
--- a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig 2007-04-08 20:17:23.000000000 +0200
-+++ src/Makefile.in 2008-07-05 02:16:42.000000000 +0200
-@@ -108,7 +108,7 @@
-
- lib_LTLIBRARIES = libots-1.la
-
--libots_1_la_LIBADD = $(OTS_LIBS)
-+libots_1_la_LIBADD = $(OTS_LIBS) -lm
- libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
- libots_1_la_SOURCES = libots.h article.c dictionary.c grader.c grader-tf.c grader-tc.c grader-tc.h html.c parser.c text.c stemmer.c highlighter.c wordlist.c relations.c
-
---- src/Makefile.am~ 2007-04-08 18:21:51.000000000 +0200
-+++ src/Makefile.am 2009-06-01 00:28:53.000000000 +0200
-@@ -20,7 +20,7 @@
-
- lib_LTLIBRARIES = libots-1.la
-
--libots_1_la_LIBADD = $(OTS_LIBS)
-+libots_1_la_LIBADD = $(OTS_LIBS) -lm
- libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
- libots_1_la_SOURCES = \
- libots.h \
diff --git a/app-text/ots/files/ots-0.5.0-math.patch b/app-text/ots/files/ots-0.5.0-math.patch
deleted file mode 100644
index da964c25f612..000000000000
--- a/app-text/ots/files/ots-0.5.0-math.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude='*~' -Naur ots-0.5.0.orig/src/grader-tf.c ots-0.5.0/src/grader-tf.c
---- ots-0.5.0.orig/src/grader-tf.c 2008-05-17 12:17:23.000000000 +0000
-+++ ots-0.5.0/src/grader-tf.c 2008-05-17 12:17:37.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "libots.h"
-+#include <math.h>
-
- /*Grader - using the Term frequency algorithm. Will give each line a score*/
-
diff --git a/app-text/ots/metadata.xml b/app-text/ots/metadata.xml
deleted file mode 100644
index 88f5ac008b4a..000000000000
--- a/app-text/ots/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">libots</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
deleted file mode 100644
index 9df04cf45067..000000000000
--- a/app-text/ots/ots-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Open source Text Summarizer, as used in newer releases of abiword and kword"
-HOMEPAGE="http://libots.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib:2
- >=dev-libs/libxml2-2.4.23
- >=dev-libs/popt-1.5
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-src_prepare() {
- # ugly ugly hack, kick upstream to fix its packaging
- touch "${S}"/gtk-doc.make
-
- epatch "${FILESDIR}"/${P}-math.patch
- epatch "${FILESDIR}"/${P}-automake-1.13.patch
- epatch "${FILESDIR}"/${P}-fix-installation.patch
- epatch "${FILESDIR}"/${P}-fix-underlinking.patch
- eautoreconf
-}
-
-src_configure() {
- # bug 97448
- econf \
- --disable-gtk-doc \
- --disable-static
-}
-
-src_compile() {
- # parallel make fails, bug 112932
- emake -j1
-}
-
-src_install() {
- default
- prune_libtool_files
- rm -rf "${D}"/usr/share/doc/libots
-}
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
new file mode 100644
index 000000000000..f4f5cf333d20
--- /dev/null
+++ b/app-text/pandoc-bin/Manifest
@@ -0,0 +1,8 @@
+DIST pandoc-3.1.12.1-linux-amd64.tar.gz 31944196 BLAKE2B 43d50b920f1fa7477f3721f09232f9948b32e0953f1f9f9348809c3dedc33ec41db6569a4a76e40f3144b14e5c0121ef77fa9c8ca1ff8cb2fb49e8eb883b0104 SHA512 362b74a14197a36b68762d8e4dd655bc26eafcc7934f0cd0c15e25c238601f41fb6a196adfda072809b7a3d0bb8f02cc7c2024c319d56257ad9facbfbbabbbf1
+DIST pandoc-3.1.12.1-linux-arm64.tar.gz 34706186 BLAKE2B 5c102f1d03f6f0336d9729e0c9be79bdf715b9739bd6fabff371744f2bb3f3aea552401cec8980972856223ac9cae416e9fa0ff7b606cf56678613649a595976 SHA512 46daa563331df894b779416080a7c76d90ddc6eb58559dd3f678ab50ee99063d59cdf72a02ac9eb5dbd78e17c610c4e07134b671c8d7a07072b81f5681363c87
+DIST pandoc-3.1.12.2-linux-amd64.tar.gz 31993808 BLAKE2B 92b4b1e669ac77295d1b78e97500024829fe9fc5c516c3b7eaf60f3b7bf9bed85af37fd8d436d5e580f764e28e89158093b1dfc73dae5582152bd33577ee32e0 SHA512 70f7e9afb0a37389e89d8dcf349b3219ba499de2ca1f36d0c2786c9c8bdab73999c66b74724cdda1eafb27d8b6ca1ccac4f8343ec599be6265e2039040b46fa4
+DIST pandoc-3.1.12.2-linux-arm64.tar.gz 34763938 BLAKE2B d89738c2f8e71d2018437fc1af7e8ff9f7357620436936faae4536c3e9888cf682ae39ae31a85d5d607ba12bbdc288e872b239ed59bb716498b4bd0d45177171 SHA512 f3624e871fda54f7074b0a9a80acae68e28cfbfc881af9adfd9a1fb3eda7171ec6abf3bdf9981ebf4a4d204c91a2cb331db5d266fe6b82cbe0280981d3447038
+DIST pandoc-3.1.12.3-linux-amd64.tar.gz 32038834 BLAKE2B 829ab9be9923af1b655e294e679d895d777185ebcfede27a4339f045c31d42cf9e33ee1bbb6d144af79d5ebab4f7a282a4fde7246a78dee66d921c43ec151c13 SHA512 0fc397060d08d2669202a5cd72aa3916f4a625fe478f621edcc9d4cb4ea3c3f9fa22793441b3d0da425b5a1d687d88e3125812b157888ad46c50976c69970ab9
+DIST pandoc-3.1.12.3-linux-arm64.tar.gz 34805145 BLAKE2B 87d4ebf9eebbbc0145ae733e662ff28a9e2d1ff4d6dacb3a191c798efc021bc58c574675ce64e41f557fffaf6864fb776e66b2c3dfcaac0281a4e180e07c8455 SHA512 2128d50e7e5ad93744eee99aaef0d6b0a69fd15ec00c8049e35659050101845a3930146568e34af5ba6d254ccd0098158a4b6485a5eb8fd49a6006d41161ca2a
+DIST pandoc-3.1.13-linux-amd64.tar.gz 32092762 BLAKE2B 87e55905550cc6289241b399faa0ae65e913bf1105ba6309a7b7ed63685cc43f267b065c811a335b0774a3b7d6f082f607015f8558b66c8098591513e26c6f4c SHA512 68986e691895770ad51018e5643a02fb848517a1ab68dd0cd99e8511a2a681f9c2bcf1ebc0088c39e1c0f8ebbf4032795b2427696f92ef4a64eab18b7aa588c2
+DIST pandoc-3.1.13-linux-arm64.tar.gz 34869977 BLAKE2B 485a33645c580edf28ebbcee4ce67fa9c7bebb84d4771b0ba23a6b78beb9b92e125d2e8024b061a6b6da839b96969add6f27d420a102ad01305c9a9a120e5478 SHA512 36253cc908c147ee7cda398c52f4ec0a7493e7f0525a3f97cba7cf53e39cf3fd225ecb2f77508fae7c59aa6c79ca85644b9759a0eb0dc918f86fb2049e17858a
diff --git a/app-text/pandoc-bin/metadata.xml b/app-text/pandoc-bin/metadata.xml
new file mode 100644
index 000000000000..dd32ba2128b1
--- /dev/null
+++ b/app-text/pandoc-bin/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xgqt@gentoo.org</email>
+ <name>Maciej Barć</name>
+ </maintainer>
+ <longdescription>
+ Pandoc is a Haskell library for converting from one markup format to
+ another, and a command-line tool that uses this library. It can read
+ markdown and (subsets of) reStructuredText, HTML, LaTeX and Textile, and it
+ can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
+ OpenDocument, ODT, RTF, MediaWiki, Textile, groff man pages, plain text,
+ Emacs Org-Mode, EPUB, and S5 and Slidy HTML slide shows.
+ </longdescription>
+ <use>
+ <flag name="pandoc-symlink">
+ Install pandoc symlink that points to pandoc-bin
+ </flag>
+ </use>
+ <upstream>
+ <bugs-to>https://github.com/jgm/pandoc/issues/</bugs-to>
+ <remote-id type="github">jgm/pandoc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.12.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.12.1.ebuild
new file mode 100644
index 000000000000..1a9e4cefd9f7
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+ https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+ amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+ arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* amd64 arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="
+ pandoc-symlink? (
+ !${CATEGORY}/${MY_PN}
+ !app-text/pandoc-cli
+ !dev-haskell/pandoc
+ )
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped.
+ unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+ exeinto /usr/bin
+ newexe bin/${MY_PN} ${PN}
+ dosym ${PN} /usr/bin/pandoc-lua-bin
+ dosym ${PN} /usr/bin/pandoc-server-bin
+
+ newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+ newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+ dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+ dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+ fi
+}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.12.2.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.12.2.ebuild
new file mode 100644
index 000000000000..99deb0ffec22
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.12.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+ https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+ amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+ arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="
+ pandoc-symlink? (
+ !${CATEGORY}/${MY_PN}
+ !app-text/pandoc-cli
+ !dev-haskell/pandoc
+ )
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped.
+ unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+ exeinto /usr/bin
+ newexe bin/${MY_PN} ${PN}
+ dosym ${PN} /usr/bin/pandoc-lua-bin
+ dosym ${PN} /usr/bin/pandoc-server-bin
+
+ newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+ newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+ dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+ dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+ fi
+}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.12.3.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.12.3.ebuild
new file mode 100644
index 000000000000..6c205a599708
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.12.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+ https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+ amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+ arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="
+ pandoc-symlink? (
+ !${CATEGORY}/${MY_PN}
+ !app-text/pandoc-cli
+ !dev-haskell/pandoc
+ )
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped.
+ unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+ exeinto /usr/bin
+ newexe bin/${MY_PN} ${PN}
+ dosym ${PN} /usr/bin/pandoc-lua-bin
+ dosym ${PN} /usr/bin/pandoc-server-bin
+
+ newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+ newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+ dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+ dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+ fi
+}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild
new file mode 100644
index 000000000000..6c205a599708
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+ https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+ amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+ arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="
+ pandoc-symlink? (
+ !${CATEGORY}/${MY_PN}
+ !app-text/pandoc-cli
+ !dev-haskell/pandoc
+ )
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped.
+ unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+ exeinto /usr/bin
+ newexe bin/${MY_PN} ${PN}
+ dosym ${PN} /usr/bin/pandoc-lua-bin
+ dosym ${PN} /usr/bin/pandoc-server-bin
+
+ newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+ newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+ dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+ dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+ fi
+}
diff --git a/app-text/pandoc-cli/Manifest b/app-text/pandoc-cli/Manifest
new file mode 100644
index 000000000000..7723b3414780
--- /dev/null
+++ b/app-text/pandoc-cli/Manifest
@@ -0,0 +1 @@
+DIST pandoc-cli-0.1.1.tar.gz 10814 BLAKE2B 22ecd904a5e8222f68ef5b72c343a6e87448a8f4839092bca0291864cd34389061119223296171447c1570a1667e9257661ec71bbb9acffe4406ccee7dd67181 SHA512 bf05834761d9c78a21b5aaf20a3a1ca24e035e394e22858506d649ec669d8ca72d8578ad9ba2e4d24bc1681dc8faa9e4c1a39fa1d82414da51e6786b23f31a36
diff --git a/app-text/pandoc-cli/metadata.xml b/app-text/pandoc-cli/metadata.xml
new file mode 100644
index 000000000000..14cb3430e380
--- /dev/null
+++ b/app-text/pandoc-cli/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+ <use>
+ <flag name="lua">Support custom modifications and conversions with the
+pandoc Lua scripting engine.</flag>
+ <flag name="nightly">Add &#39;-nightly-COMPILEDATE&#39; to the output of &#39;--version&#39;.</flag>
+ <flag name="server">Include support for running pandoc as an HTTP server.</flag>
+ </use>
+ <upstream>
+ <remote-id type="hackage">pandoc-cli</remote-id>
+ <remote-id type="github">jgm/pandoc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild b/app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..cc0245832715
--- /dev/null
+++ b/app-text/pandoc-cli/pandoc-cli-0.1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between documentation formats"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lua nightly +server"
+
+RDEPEND=">=dev-haskell/pandoc-3.0:=
+ dev-haskell/text:=
+ >=dev-lang/ghc-8.8.1:=
+ lua? ( >=dev-haskell/hslua-cli-1.4.1:= <dev-haskell/hslua-cli-1.5:=
+ >=dev-haskell/pandoc-lua-engine-0.2:= <dev-haskell/pandoc-lua-engine-0.3:=
+ >=dev-haskell/temporary-1.1:= <dev-haskell/temporary-1.4:= )
+ server? ( >=dev-haskell/pandoc-server-0.1:= <dev-haskell/pandoc-server-0.2:=
+ dev-haskell/safe:=
+ >=dev-haskell/wai-extra-3.0.24:=
+ dev-haskell/warp:= )
+ !<app-text/pandoc-3
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag lua lua) \
+ $(cabal_flag nightly nightly) \
+ $(cabal_flag server server)
+}
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index feb748ef0df5..983aabbbc381 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,6 +1 @@
-DIST pandoc-1.12.4.2.tar.gz 1048263 BLAKE2B 0caef0e612dc45be1a4fec59143ea4640229fdf10f55074afb0e986c3384a0a9c71936b2ee4a981fa0a095fcf79b2c946eb1c8798e43693c8fcf9c886855ba9e SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743
-DIST pandoc-1.13.2.1.tar.gz 1999641 BLAKE2B bbf0f4bdb42a86a72995e3b3bcae7c3b452d6efa5bc68011c1eb87f2e0b024ef6a0df09011a8428f0ff67d6bbc8b53612baafc1312e8557e1c1fea46c4b32391 SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d
-DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90ebbdb1c8c3477f45e277ce88b4f8c37d93fbf0040f287675010010f7cfe2ce9f10b206e8094683b8b781ebaa9718 SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443
-DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
-DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
-DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
+DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212
diff --git a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
deleted file mode 100644
index 7e0f4d375a71..000000000000
--- a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
-index ef9f66a..50b0ec4 100644
---- a/src/Text/Pandoc/Shared.hs
-+++ b/src/Text/Pandoc/Shared.hs
-@@ -143,2 +143,3 @@ import Paths_pandoc (getDataFileName)
- #endif
-+import Codec.Archive.Zip
- #ifdef HTTP_CLIENT
-@@ -152,3 +153,2 @@ import Network.HTTP.Types.Header ( hContentType)
- import Network (withSocketsDo)
--import Codec.Archive.Zip
- #else
diff --git a/app-text/pandoc/files/pandoc-2.18-tests.patch b/app-text/pandoc/files/pandoc-2.18-tests.patch
new file mode 100644
index 000000000000..6cf30a7c9bc6
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-2.18-tests.patch
@@ -0,0 +1,79 @@
+From 9aff86143e12e22cec152fd08ec8b68ee75ccafa Mon Sep 17 00:00:00 2001
+From: John MacFarlane <jgm@berkeley.edu>
+Date: Tue, 31 May 2022 19:49:27 -0700
+Subject: [PATCH] Require skylighting 0.12.3.1 and update tests.
+
+---
+ pandoc.cabal | 4 ++--
+ stack.yaml | 4 ++--
+ test/lhs-test.html | 4 ++--
+ test/lhs-test.html+lhs | 4 ++--
+ test/lhs-test.latex | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/test/lhs-test.html b/test/lhs-test.html
+index 754b25e1f570..85e5d785d14a 100644
+--- a/test/lhs-test.html
++++ b/test/lhs-test.html
+@@ -190,7 +190,7 @@
+ code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+ code span.at { color: #7d9029; } /* Attribute */
+ code span.bn { color: #40a070; } /* BaseN */
+- code span.bu { } /* BuiltIn */
++ code span.bu { color: #008000; } /* BuiltIn */
+ code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+ code span.ch { color: #4070a0; } /* Char */
+ code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+ code span.ex { } /* Extension */
+ code span.fl { color: #40a070; } /* Float */
+ code span.fu { color: #06287e; } /* Function */
+- code span.im { } /* Import */
++ code span.im { color: #008000; font-weight: bold; } /* Import */
+ code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+ code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+ code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
+index 7198397d8f45..32e0baf4d7e2 100644
+--- a/test/lhs-test.html+lhs
++++ b/test/lhs-test.html+lhs
+@@ -190,7 +190,7 @@
+ code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+ code span.at { color: #7d9029; } /* Attribute */
+ code span.bn { color: #40a070; } /* BaseN */
+- code span.bu { } /* BuiltIn */
++ code span.bu { color: #008000; } /* BuiltIn */
+ code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+ code span.ch { color: #4070a0; } /* Char */
+ code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+ code span.ex { } /* Extension */
+ code span.fl { color: #40a070; } /* Float */
+ code span.fu { color: #06287e; } /* Function */
+- code span.im { } /* Import */
++ code span.im { color: #008000; font-weight: bold; } /* Import */
+ code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+ code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+ code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.latex b/test/lhs-test.latex
+index 49521d3c1522..435d1dfefb07 100644
+--- a/test/lhs-test.latex
++++ b/test/lhs-test.latex
+@@ -44,7 +44,7 @@
+ \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
+ \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+-\newcommand{\BuiltInTok}[1]{#1}
++\newcommand{\BuiltInTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{#1}}
+ \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
+ \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
+ \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+@@ -57,7 +57,7 @@
+ \newcommand{\ExtensionTok}[1]{#1}
+ \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+ \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
+-\newcommand{\ImportTok}[1]{#1}
++\newcommand{\ImportTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{\textbf{#1}}}
+ \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
+ \newcommand{\NormalTok}[1]{#1}
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index f0713d9bef06..712e3e36eea3 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -1,26 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
</maintainer>
- <longdescription>
- Pandoc is a Haskell library for converting from one markup
- format to another, and a command-line tool that uses
- this library. It can read markdown and (subsets of)
- reStructuredText, HTML, LaTeX and Textile, and it can write
- markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
- OpenDocument, ODT, RTF, MediaWiki, Textile, groff man pages,
- plain text, Emacs Org-Mode, EPUB, and S5 and Slidy HTML
- slide shows.
- </longdescription>
<use>
- <flag name="embed_data_files">Embed data files in binary for relocatable executable.</flag>
- <flag name="http-conduit">Enable downloading of resources over https.</flag>
+ <flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
<flag name="trypandoc">Build trypandoc cgi executable.</flag>
- <flag name="https">Enable support for downloading of resources over https.</flag>
- <flag name="make-pandoc-man-pages">Build program to regenerate pandoc man pages from README.</flag>
- <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
- <flag name="weigh-pandoc">Build weigh-pandoc to measure memory usage.</flag>
</use>
</pkgmetadata>
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
deleted file mode 100644
index 65d34c37daf1..000000000000
--- a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +http-conduit"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
- >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- embed_data_files? ( dev-haskell/hsb2hs )
- http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.10
- dev-haskell/happy
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
- >=dev-haskell/syb-0.1 <dev-haskell/syb-0.5
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4
- >=dev-haskell/text-0.11 <dev-haskell/text-1.2 )
-"
-
-src_prepare() {
- cabal_chdeps \
- 'scientific >= 0.2 && < 0.3' 'scientific >= 0.2 && < 0.4' \
- 'attoparsec >= 0.10 && < 0.12' 'attoparsec >= 0.10 && < 0.13'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag http-conduit http-conduit)
-}
diff --git a/app-text/pandoc/pandoc-1.13.2.1.ebuild b/app-text/pandoc/pandoc-1.13.2.1.ebuild
deleted file mode 100644
index bf83cd46d3c9..000000000000
--- a/app-text/pandoc/pandoc-1.13.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
- >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
- >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- embed_data_files? ( dev-haskell/hsb2hs )
- https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?]
- !https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/quickcheck-2.4:2
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
- cabal_chdeps \
- 'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4' \
- 'aeson >= 0.7 && < 0.9' 'aeson >= 0.7' \
- 'aeson >= 0.7.0.5 && < 0.9' 'aeson >= 0.7.0.5' \
- 'highlighting-kate >= 0.5.11.1 && < 0.6' 'highlighting-kate >= 0.5.11.1'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag https https) \
- $(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
- haskell-cabal_src_install
-
- doman man/man1/pandoc.1
- doman man/man5/pandoc_markdown.5
-}
diff --git a/app-text/pandoc/pandoc-1.14.0.4.ebuild b/app-text/pandoc/pandoc-1.14.0.4.ebuild
deleted file mode 100644
index 360b86c14045..000000000000
--- a/app-text/pandoc/pandoc-1.14.0.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
- >=dev-haskell/cmark-0.3.3:=[profile?] <dev-haskell/cmark-0.4:=[profile?]
- >=dev-haskell/css-text-0.1.2:=[profile?] <dev-haskell/css-text-0.3:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
- >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
- >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
- >=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?]
- !https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
- if ! use make-pandoc-man-pages; then
- sed -e '/Executable make-pandoc-man-pages/,/Buildable: True/d' \
- -i "${S}/${PN}.cabal" \
- || die "Could not disable build of Executable make-pandoc-man-pages in ${S}/${PN}.cabal"
- sed -e '/, postBuild = /,/makeManPages args bf pkgdescr lbi/d' \
- -i "${S}/Setup.hs" \
- || die "Could not disable build of Executable make-pandoc-man-pages in ${S}/Setup.hs"
- fi
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag https https) \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag trypandoc trypandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
deleted file mode 100644
index 7a70c85e7bf8..000000000000
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="embed_data_files +https +network-uri trypandoc"
-
-RESTRICT=test # likes to break on highlighting-kate update
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
- >=dev-haskell/cmark-0.4.0.1:=[profile?] <dev-haskell/cmark-0.5:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
- >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
- >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
- >=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
- >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- dev-haskell/old-time:=[profile?]
- >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
- >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?]
- !https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.10
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
- embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-https.patch
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag https https) \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
- haskell-cabal_src_install
-
- doman man/pandoc.1
-}
diff --git a/app-text/pandoc/pandoc-1.18.ebuild b/app-text/pandoc/pandoc-1.18.ebuild
deleted file mode 100644
index 6cb3e32e2e75..000000000000
--- a/app-text/pandoc/pandoc-1.18.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https +network-uri trypandoc"
-
-RESTRICT=test # fails to load dynamic libraries
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
- >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
- >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
- >=dev-haskell/highlighting-kate-0.6.2:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- dev-haskell/old-time:=[profile?]
- >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
- >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.8.6.5:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
- >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?]
- !https? ( dev-haskell/http-types:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
- embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'directory >= 1 && < 1.3' 'directory >= 1' \
- 'directory >= 1.2 && < 1.3' 'directory >= 1.2'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag https https) \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag trypandoc trypandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
deleted file mode 100644
index ba14b58cdc40..000000000000
--- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
- >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- dev-haskell/old-time:=[profile?]
- >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/skylighting-0.1.1.4:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
- >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
- >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?]
- !https? ( dev-haskell/http-types:=[profile?] ) )
- weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
- embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
- default
-
- cabal_chdeps \
- 'skylighting >= 0.1.1.4 && < 0.2' 'skylighting >= 0.1.1.4' \
- 'skylighting >= 0.1.1.3 && < 0.2' 'skylighting >= 0.1.1.3'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag https https) \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag trypandoc trypandoc) \
- $(cabal_flag weigh-pandoc weigh-pandoc)
-}
diff --git a/app-text/pandoc/pandoc-1.19.2.1.ebuild b/app-text/pandoc/pandoc-1.19.2.1.ebuild
deleted file mode 100644
index 8aa7bd5a81f5..000000000000
--- a/app-text/pandoc/pandoc-1.19.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://pandoc.org"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
- >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
- >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
- >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
- dev-haskell/old-time:=[profile?]
- >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/skylighting-0.1.1.4:=[profile?] <dev-haskell/skylighting-0.2:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
- >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
- >=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
- >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-7.8.2:=
- https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
- >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
- network-uri? ( >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?]
- !https? ( dev-haskell/http-types:=[profile?] ) )
- weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
- >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
- >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
- embed_data_files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag https https) \
- $(cabal_flag network-uri network-uri) \
- $(cabal_flag trypandoc trypandoc) \
- $(cabal_flag weigh-pandoc weigh-pandoc)
-}
diff --git a/app-text/pandoc/pandoc-2.18-r2.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild
new file mode 100644
index 000000000000..eced4d6a54ab
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.18-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -static,-lua53
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files trypandoc"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+ >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+ >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+ >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+ >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?]
+ >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+ >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+ >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
+ >=dev-haskell/connection-0.3.1:=[profile?]
+ >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+ >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?]
+ >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+ >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+ >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+ >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?]
+ >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?]
+ >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?]
+ >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?]
+ >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?]
+ >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?]
+ >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+ >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+ >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+ >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?]
+ >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?]
+ >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+ >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?]
+ >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+ >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?]
+ >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
+ >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+ >=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+ >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+ >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?]
+ >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?]
+ >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+ >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+ >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+ >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+ >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?]
+ >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+ >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+ >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?]
+ >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+ >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+ >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
+ >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+ >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+ >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?]
+ trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+ >=dev-haskell/wai-extra-3.0.24:=[profile?] )
+ !app-text/pandoc-cli
+ !dev-haskell/pandoc
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0
+ test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+ >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
+ >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+ >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1
+ >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+PATCHES=("${FILESDIR}"/${P}-tests.patch )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag embed-data-files embed_data_files) \
+ --flag=-lua53 \
+ --flag=-static \
+ $(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+ haskell-cabal_src_install
+ doman "${S}/man/${PN}.1"
+}
diff --git a/app-text/pandoc/pandoc-3.ebuild b/app-text/pandoc/pandoc-3.ebuild
new file mode 100644
index 000000000000..ac0df9c34129
--- /dev/null
+++ b/app-text/pandoc/pandoc-3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Metapackage for pandoc version 3"
+HOMEPAGE="https://pandoc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="app-text/pandoc-cli"
+
+pkg_postinst() {
+ elog "The pandoc CLI executable has been split off upstream into a new"
+ elog "package named pandoc-cli, starting with pandoc version 3."
+ elog "This metapackage ${CATEGORY}/${P} was created to ease upgrading,"
+ elog "but it is recommended to switch to ${CATEGORY}/pandoc-cli."
+}
diff --git a/app-text/paper-clip/Manifest b/app-text/paper-clip/Manifest
new file mode 100644
index 000000000000..71dac68e6efc
--- /dev/null
+++ b/app-text/paper-clip/Manifest
@@ -0,0 +1 @@
+DIST paper-clip-5.0.tar.gz 182085 BLAKE2B 07c397218417a5bc87e95aec577465b3f109de4c081bf0f208e0213b71ea7a8f9bac415221a04c8729add7d82adf98c859b60b1b0bd9dbef2db021ee80ff9296 SHA512 2757768414b2177511b61c0a9bde9710b67128a446640bb3ae3bba22a9b30a2b8b036ee32806dc6e4662ffc3d06254006b89e6b63cdc11950b38257e9ea46023
diff --git a/app-text/paper-clip/metadata.xml b/app-text/paper-clip/metadata.xml
new file mode 100644
index 000000000000..e13559a20d75
--- /dev/null
+++ b/app-text/paper-clip/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+ <maintainer type="person">
+ <email>xgqt@gentoo.org</email>
+ <name>Maciej Barć</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/Diego-Ivan/Paper-Clip/issues/</bugs-to>
+ <remote-id type="github">Diego-Ivan/Paper-Clip</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/paper-clip/paper-clip-5.0.ebuild b/app-text/paper-clip/paper-clip-5.0.ebuild
new file mode 100644
index 000000000000..05bae90c8ab3
--- /dev/null
+++ b/app-text/paper-clip/paper-clip-5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+APP_PN="Paper-Clip"
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Edit the title, author, keywords and more details of PDF documents"
+HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/Diego-Ivan/${APP_PN}.git"
+else
+ SRC_URI="https://github.com/Diego-Ivan/${APP_PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${APP_PN}-${PV}"
+
+ KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # Only validations, the appdata one fails.
+
+RDEPEND="
+ >=gui-libs/gtk-4.12.5:4
+ >=gui-libs/libadwaita-1.4.2:1[introspection,vala]
+ app-text/poppler:=[cairo,introspection]
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-libs/libportal:=[gtk,introspection,vala]
+ media-libs/exempi
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/appstream-glib
+ dev-util/desktop-file-utils
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+ vala_setup
+}
+
+src_install() {
+ meson_src_install
+ einstalldocs
+
+ # Symlink "pdf-metadata-editor" (old name?) to "${PN}".
+ dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}"
+
+ mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_pkg_postrm
+}
diff --git a/app-text/paper-clip/paper-clip-9999.ebuild b/app-text/paper-clip/paper-clip-9999.ebuild
new file mode 100644
index 000000000000..8a822daeac38
--- /dev/null
+++ b/app-text/paper-clip/paper-clip-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+APP_PN="Paper-Clip"
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Edit the title, author, keywords and more details of PDF documents"
+HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/Diego-Ivan/${APP_PN}.git"
+else
+ SRC_URI="https://github.com/Diego-Ivan/${APP_PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${APP_PN}-${PV}"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # Only validations, the appdata one fails.
+
+RDEPEND="
+ >=gui-libs/gtk-4.12.5:4
+ >=gui-libs/libadwaita-1.4.2:1[introspection,vala]
+ app-text/poppler:=[cairo,introspection]
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-libs/libportal:=[gtk,introspection,vala]
+ media-libs/exempi
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/appstream-glib
+ dev-util/desktop-file-utils
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+ vala_setup
+}
+
+src_install() {
+ meson_src_install
+ einstalldocs
+
+ # Symlink "pdf-metadata-editor" (old name?) to "${PN}".
+ dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}"
+
+ mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_pkg_postrm
+}
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index e6889e2ce50a..21ae5b75780d 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,2 +1,3 @@
-DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
-DIST paperwork-backend-1.3.0.tar.gz 62119 BLAKE2B 0dcb4c4d3c96cef8ab993449da46a01168be0b1ade8bb56eada723f046a0b82eb9b8b7c15b7706ab8b6be8e22166e2e01082e57d85a68c5ca919a081ad67fade SHA512 127b71db39a54533f520bb6969a36c48b54827f5720efb40728b133d4362901cbe4a20aa84337c1e8262338ae528ed502c23fedee703898a53e08b3bd5dfd7e0
+DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
+DIST paperwork-backend-2.1.2.tar.gz 1346499 BLAKE2B daf8c6dee97b0bdf814bcf7e9c83a80ab878250994a770f5fa6be4c0b4e23f0def51e22c0a8652a19e9294f3fab0b522b25c2a91c306ad760d568faf76a78610 SHA512 0156baa658a9fe26680bf6d146af3f03b98da307ee1cfaf4803f8b70a2ffdb0010fe23c4d4f9b5a572919c4be94a1aad4fd070220849248cdb18c5b1c4bc478b
+DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b
diff --git a/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch b/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch
new file mode 100644
index 000000000000..01eb2a6154b0
--- /dev/null
+++ b/app-text/paperwork-backend/files/paperwork-backend-2.2.1-cairo_workaround.patch
@@ -0,0 +1,52 @@
+From c9430b844fbcedc9119e3d464f5f0c85feb7b197 Mon Sep 17 00:00:00 2001
+From: Jerome Flesch <jflesch@openpaper.work>
+Date: Sun, 4 Feb 2024 20:33:27 +0100
+Subject: [PATCH] Backend/docexport PDF: Workaround Cairo bug that causes
+ occasional crashes when exporting to generated PDF.
+
+Closes #942
+---
+ .../src/paperwork_backend/docexport/pdf.py | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/paperwork-backend/src/paperwork_backend/docexport/pdf.py b/paperwork-backend/src/paperwork_backend/docexport/pdf.py
+index 160e60710..befded73c 100644
+--- a/paperwork-backend/src/paperwork_backend/docexport/pdf.py
++++ b/paperwork-backend/src/paperwork_backend/docexport/pdf.py
+@@ -115,6 +115,8 @@ class PdfCreator(object):
+ )
+ self.pdf_context = cairo.Context(self.pdf_surface)
+
++ self.gc_protection = [] # WORKAROUND(Jflesch): Cairo crash
++
+ def set_page_size(self, img_size):
+ # portrait or landscape
+ if (img_size[0] < img_size[1]):
+@@ -187,6 +189,16 @@ class PdfCreator(object):
+ "pillow_to_surface", img,
+ intermediate="jpeg", quality=int(self.quality * 100)
+ )
++ # WORKAROUND(Jflesch):
++ # If Cairo supports JPEG embedding, we use
++ # cairo.ImageSurface.set_mime_data() instead of the usual Cairo
++ # surface functions to draw the image. It seems this function does
++ # not increment the ref counter of the surface object
++ # --> the Python GC tends to collect it while Cairo is still going
++ # to use it to generate the PDF.
++ # --> we have to keep a reference on it ourselves, until the page has
++ # been generated.
++ self.gc_protection.append(img_surface)
+
+ self.pdf_context.save()
+ try:
+@@ -199,6 +211,7 @@ class PdfCreator(object):
+
+ def next_page(self):
+ self.pdf_context.show_page()
++ self.gc_protection = [] # WORKAROUND(Jflesch): Cairo crash
+
+ def finish(self):
+ self.pdf_surface.flush()
+--
+GitLab
+
diff --git a/app-text/paperwork-backend/metadata.xml b/app-text/paperwork-backend/metadata.xml
index a6369c9ecae4..20c7c0afde7f 100644
--- a/app-text/paperwork-backend/metadata.xml
+++ b/app-text/paperwork-backend/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
<upstream>
+ <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id>
<remote-id type="pypi">paperwork-backend</remote-id>
- <remote-id type="github">openpaperwork/paperwork-backend</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
deleted file mode 100644
index c2523e5983c4..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycountry[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-levenshtein[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]
- dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
deleted file mode 100644
index 05cf31677eb0..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
- dev-python/distro[${PYTHON_USEDEP}]
- dev-python/natsort[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycountry[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-levenshtein[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]
- dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
new file mode 100644
index 000000000000..6bfad6df712f
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-text/openpaperwork-core[${PYTHON_USEDEP}]
+ app-text/openpaperwork-gtk[${PYTHON_USEDEP}]
+ app-text/poppler[introspection]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/Levenshtein[${PYTHON_USEDEP}]
+ dev-python/natsort[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/scikit-learn[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ dev-python/whoosh[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/libpillowfight[${PYTHON_USEDEP}]
+ media-libs/libinsane
+ )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ # remove dep to allow both old python-Levenshtein and new
+ # Levenshtein packages
+ sed -i -e '/python-Levenshtein/d' setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..bedb4d1adafb
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.2.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+# Update from release hash at:
+# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags
+REL_HASH="0bea4054"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2
+ https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-text/openpaperwork-core[${PYTHON_USEDEP}]
+ app-text/openpaperwork-gtk[${PYTHON_USEDEP}]
+ app-text/poppler[introspection]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/scikit-learn[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ dev-python/whoosh[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ ${RDEPEND}
+ dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ sys-apps/which
+ sys-devel/gettext
+ test? (
+ dev-python/libpillowfight[${PYTHON_USEDEP}]
+ media-libs/libinsane
+ )
+"
+S=${WORKDIR}/paperwork-${PV}/${PN}
+
+distutils_enable_tests unittest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+ default
+ cd "${WORKDIR}"/paperwork-${PV} || die
+ eapply "${FILESDIR}"/${P}-cairo_workaround.patch
+}
+
+python_compile() {
+ emake l10n_compile
+
+ distutils-r1_python_compile
+}
diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild
new file mode 100644
index 000000000000..210c3d2fb541
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+# Update from release hash at:
+# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags
+REL_HASH="0bea4054"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2
+ https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-text/openpaperwork-core[${PYTHON_USEDEP}]
+ app-text/openpaperwork-gtk[${PYTHON_USEDEP}]
+ app-text/poppler[introspection]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/scikit-learn[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ dev-python/whoosh[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ ${RDEPEND}
+ dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ sys-apps/which
+ sys-devel/gettext
+ test? (
+ dev-python/libpillowfight[${PYTHON_USEDEP}]
+ media-libs/libinsane
+ )
+"
+S=${WORKDIR}/paperwork-${PV}/${PN}
+
+distutils_enable_tests unittest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+ default
+ cp -a "${WORKDIR}"/${PN} "${WORKDIR}"/paperwork-${PV}/
+}
+
+python_compile() {
+ emake l10n_compile
+
+ distutils-r1_python_compile
+}
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 8560c3e03ca8..2837b256f07d 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,2 +1,3 @@
-DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
-DIST paperwork-1.3.0.tar.gz 4625505 BLAKE2B 866a043216dd603fa4700ac09b998c55735e6a5fe09fc3ab02aeb6b68cc62f239e86f8116d84ae1571235e7d9230cbe25bb878909e3f7e542164d5f76440f367 SHA512 6f0b7b88d62520dd69fe8ee6a033a8cde9e48ba093ce7ec77df26549df29e7a0d8eb2bfef9f74e41a722cbd1d2d7693efbffa5327838708c9af54c76634b967e
+DIST paperwork-2.1.2.tar.gz 5907738 BLAKE2B 9b376e5ed13d69f0664c98d43a41cf876d21d46c31129b50c5c44e6d4279b04d302e7527906dad49b4416f698dfe9f5bafbc5130f41463efb5ca49fed0da308f SHA512 0f75fba66a0b9ed1b4b28caf9dbbcc4a0b7e68fa24f5faa40251c3f39c610be372f89a2f4e2e6807babd930bfeb45cc82216761f0da042deac991d779fdfdfbb
+DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
+DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b
diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml
index e2d2240fe2ca..d7596dc0e9e5 100644
--- a/app-text/paperwork/metadata.xml
+++ b/app-text/paperwork/metadata.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
<longdescription lang="en">
-Paperwork is a personal document manager for scanned documents (and PDFs).
+ Paperwork is a personal document manager for scanned documents (and PDFs).
-It's designed to be easy and fast to use. The idea behind Paperwork is "scan and forget": You should be able to just scan a new document and forget about it until the day you need it again.
+ It's designed to be easy and fast to use. The idea behind Paperwork is "scan and forget": You should be able to just scan a new document and forget about it until the day you need it again.
-In other words, let the machine do most of the work for you.
-</longdescription>
+ In other words, let the machine do most of the work for you.
+ </longdescription>
<upstream>
+ <remote-id type="gnome-gitlab">World/OpenPaperwork</remote-id>
<remote-id type="pypi">paperwork-backend</remote-id>
- <remote-id type="github">openpaperwork/paperwork</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/paperwork/paperwork-1.2.4-r2.ebuild b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
deleted file mode 100644
index 0003108d4289..000000000000
--- a/app-text/paperwork/paperwork-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
- dev-python/libpillowfight[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyinsane:2[${PYTHON_USEDEP}]
- >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.3.0.ebuild b/app-text/paperwork/paperwork-1.3.0.ebuild
deleted file mode 100644
index bff55ca7a05e..000000000000
--- a/app-text/paperwork/paperwork-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
- dev-python/libpillowfight[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
- media-libs/libinsane
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-2.1.2.ebuild b/app-text/paperwork/paperwork-2.1.2.ebuild
new file mode 100644
index 000000000000..1e1cb20f2bb5
--- /dev/null
+++ b/app-text/paperwork/paperwork-2.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 xdg pypi
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
+ ~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
+ ~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+ dev-python/libpillowfight[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ media-libs/libinsane
+ x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # remove dep to allow both old python-Levenshtein and new
+ # Levenshtein packages
+ sed -i -e '/python-Levenshtein/d' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This queries tesseract languages and will fail sandbox with
+ # USE=opencl, bugs #793446 #830012 #852134
+ addpredict /dev/dri/renderD128
+ addpredict /dev/kfd
+ addpredict /dev/nvidiactl
+
+ PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
+ --icon_base_dir="${ED}"/usr/share/icons \
+ --data_base_dir="${ED}"/usr/share
+}
diff --git a/app-text/paperwork/paperwork-2.2.1.ebuild b/app-text/paperwork/paperwork-2.2.1.ebuild
new file mode 100644
index 000000000000..9124bd50a325
--- /dev/null
+++ b/app-text/paperwork/paperwork-2.2.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+# Update from release hash at:
+# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags
+REL_HASH="0bea4054"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2
+ https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
+ ~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
+ ~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+ dev-python/libpillowfight[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyxdg-0.25[${PYTHON_USEDEP}]
+ media-libs/libinsane
+ x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ sys-apps/which
+ sys-devel/gettext"
+
+S=${WORKDIR}/paperwork-${PV}/${PN}-gtk
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+ default
+ cp -a "${WORKDIR}"/${PN}-gtk "${WORKDIR}"/paperwork-${PV}/
+}
+
+python_compile() {
+ emake l10n_compile
+
+ distutils-r1_python_compile
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This queries tesseract languages and will fail sandbox with
+ # USE=opencl, bugs #793446 #830012 #852134
+ addpredict /dev/dri/renderD128
+ addpredict /dev/kfd
+ addpredict /dev/nvidiactl
+
+ PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
+ --icon_base_dir="${ED}"/usr/share/icons \
+ --data_base_dir="${ED}"/usr/share
+}
diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
index ec4ba8b2b180..d4bb69e39730 100644
--- a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/configure.in
-+++ paps-0.6.8/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -18,4 +18,6 @@
DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc)
@@ -7,8 +7,8 @@
+PKG_CHECK_MODULES([PANGO], [pangoft2])
+
AC_OUTPUT(Makefile src/Makefile)
---- paps-0.6.8/src/Makefile.am
-+++ paps-0.6.8/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -7,21 +7,19 @@
bin_PROGRAMS = paps
paps_CFLAGS = -Wall
diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
index baba74b4b8bb..449e776f5e6b 100644
--- a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/acinclude.m4
-+++ paps-0.6.8/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
@@ -78,7 +78,7 @@
AC_PATH_TOOL([$1], [$2])
if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
diff --git a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
index ae334d1d28c0..2c83abf8d576 100644
--- a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
@@ -1,7 +1,7 @@
https://bugs.gentoo.org/show_bug.cgi?id=566050#c2
---- paps-0.6.8/src/paps.c
-+++ paps-0.6.8/src/paps.c
+--- a/src/paps.c
++++ b/src/paps.c
@@ -569,11 +569,14 @@
fclose (file);
diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
index ab97d22a2957..7504b66f6693 100644
--- a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/src/libpaps.c
-+++ paps-0.6.8/src/libpaps.c
+--- a/src/libpaps.c
++++ b/src/libpaps.c
@@ -25,8 +25,9 @@
#include <pango/pango.h>
diff --git a/app-text/paps/metadata.xml b/app-text/paps/metadata.xml
index 54bd128e976a..9a99904e90fd 100644
--- a/app-text/paps/metadata.xml
+++ b/app-text/paps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild
index 3b8795277278..bf4df11e9b57 100644
--- a/app-text/paps/paps-0.6.8-r2.ebuild
+++ b/app-text/paps/paps-0.6.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit autotools eutils
+inherit autotools
DESCRIPTION="Unicode-aware text to PostScript converter"
HOMEPAGE="http://paps.sourceforge.net/"
@@ -12,18 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
RDEPEND="x11-libs/pango"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-as-needed-build.patch
+ "${FILESDIR}"/${P}-fix-doxygen-acinclude.patch
+ "${FILESDIR}"/${P}-fix-freetype-include.patch
+ "${FILESDIR}"/${P}-fix-empty-file.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-fix-as-needed-build.patch \
- "${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \
- "${FILESDIR}"/${P}-fix-freetype-include.patch \
- "${FILESDIR}"/${P}-fix-empty-file.patch
+ default
mv configure.in configure.ac || die
diff --git a/app-text/par/Manifest b/app-text/par/Manifest
index b1107a021b12..1e4ad4bb6667 100644
--- a/app-text/par/Manifest
+++ b/app-text/par/Manifest
@@ -1 +1 @@
-DIST Par152.tar.gz 47999 BLAKE2B 0f76abde64d00d0511d9b0b0ce2a97b13917e08fe3bd1c69fa98ca19dff75a2b55a21f5eaa8bfd0660b6523336de6c29b2a58647196ff6af8c24ec156a426bb0 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e
+DIST Par-1.53.0.tar.gz 52209 BLAKE2B 4069f75e1d0ff397938941ab58020c41cb1b896ab91b370c4f9c9a4d4eea1fe695cc0c27b0129780d40b7274e355ac1f41a933d051bffebc938c284e71971fe6 SHA512 3f8ac57fe19ebcf427b11f4d79f2c5cc9286c1439c38a53d45bd29b9219369db2798efbd0e203ac359d59ebbdd3ead1c50ae75352a1ffc568d4d3b9ad50642b1
diff --git a/app-text/par/metadata.xml b/app-text/par/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/par/metadata.xml
+++ b/app-text/par/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/par/par-1.52-r1.ebuild b/app-text/par/par-1.52-r1.ebuild
deleted file mode 100644
index 7e6f9b7dcf6e..000000000000
--- a/app-text/par/par-1.52-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="Par${PV/./}"
-DESCRIPTION="a paragraph reformatter, vaguely similar to fmt, but better"
-HOMEPAGE="http://www.nicemice.net/par/"
-SRC_URI="http://www.nicemice.net/par/${MY_P/./}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="!dev-util/par
- !app-arch/par"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- make -f protoMakefile CC="$(tc-getCC) -c $CFLAGS" \
- LINK1="$(tc-getCC) $LDFLAGS" || die 'make failed'
-}
-
-src_install() {
- newbin par par-format
- doman par.1
- dodoc releasenotes par.doc
-}
diff --git a/app-text/par/par-1.53.0.ebuild b/app-text/par/par-1.53.0.ebuild
new file mode 100644
index 000000000000..d830449783fc
--- /dev/null
+++ b/app-text/par/par-1.53.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="Par-${PV}"
+DESCRIPTION="a paragraph reformatter, vaguely similar to fmt, but better"
+HOMEPAGE="http://www.nicemice.net/par/"
+SRC_URI="http://www.nicemice.net/par/${MY_P}.tar.gz"
+
+LICENSE="|| ( MIT par )"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+
+DEPEND="!dev-util/par
+ !app-arch/par"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ emake -f protoMakefile CC="$(tc-getCC) ${CFLAGS} -c" \
+ LINK1="$(tc-getCC) ${LDFLAGS}"
+}
+
+src_install() {
+ newbin par par-format
+ doman par.1
+ dodoc releasenotes par.doc
+}
+
+src_test() {
+ emake -f protoMakefile test
+}
diff --git a/app-text/passivetex/Manifest b/app-text/passivetex/Manifest
deleted file mode 100644
index d5d30938649b..000000000000
--- a/app-text/passivetex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST passivetex-1.25.zip 1190258 BLAKE2B bc82a0414c5df9b5619b099899ac3970943672fc3b76fa60549ba36dd60861b591c62174f1f55b58b0f51458bc961ce47fee9b991795e2d321daf3ae4b328e9d SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b
diff --git a/app-text/passivetex/metadata.xml b/app-text/passivetex/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-text/passivetex/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>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/passivetex/passivetex-1.25.ebuild b/app-text/passivetex/passivetex-1.25.ebuild
deleted file mode 100644
index 618cb7a179a3..000000000000
--- a/app-text/passivetex/passivetex-1.25.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 latex-package
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="A namespace-aware XML parser written in Tex"
-# Taken from: http://www.tei-c.org.uk/Software/passivetex/${PN}.zip
-SRC_URI="mirror://gentoo/${P}.zip"
-HOMEPAGE="http://www.tei-c.org.uk/Software/passivetex/"
-LICENSE="MIT"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/latex-base
- >=dev-tex/xmltex-1.9"
-
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-TEXMF=/usr/share/texmf-site
-
-src_install() {
-
- insinto ${TEXMF}/tex/xmltex/passivetex
- doins *.sty *.xmt
-
- dodoc README.passivetex index.xml
- dohtml index.html
-}
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index fc3dcc2ccb44..a70400b64a3c 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1 +1 @@
-DIST pastebinit-1.5.tar.bz2 42941 BLAKE2B 678df7f2e77cc832fc9e152fb451538284033d181d9165b1a1194b254ad08ca1ac3e4612dddf7db6c62c1c3c59265ad94a78cc6df9457565264864ab06bff00b SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099
+DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
diff --git a/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
new file mode 100644
index 000000000000..ee7245c03faa
--- /dev/null
+++ b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
@@ -0,0 +1,13 @@
+Fix DeprecationWarning
+--- a/pastebinit
++++ b/pastebinit
+@@ -32,8 +32,7 @@
+ # Now try to override it with a distributor pastebin
+ try:
+ import distro
+- release = distro.linux_distribution(
+- full_distribution_name=False)[0].lower()
++ release = distro.id()
+ if release == 'debian':
+ defaultPB = "paste.debian.net"
+ elif release == 'fedora':
diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml
index c5629ce6ee70..946d7034d93b 100644
--- a/app-text/pastebinit/metadata.xml
+++ b/app-text/pastebinit/metadata.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
- <use>
- <flag name="crypt">Install pbputs for gpg-encrypted pastes</flag>
- </use>
+ <stabilize-allarches/>
<upstream>
<remote-id type="launchpad">pastebinit</remote-id>
</upstream>
diff --git a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..bf613cf69206
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit optfeature python-single-r1
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
+HOMEPAGE="https://launchpad.net/pastebinit"
+SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/configobj[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ sys-devel/gettext
+ man? (
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-distro.patch )
+
+src_prepare() {
+ default
+ python_fix_shebang "${S}"/${PN}
+}
+
+src_compile() {
+ emake -C po
+
+ if use man; then
+ ebegin "Generating a manpage with xsltproc"
+ xsltproc --nonet \
+ "${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+ pastebinit.xml
+ eend $?
+ fi
+}
+
+src_install() {
+ dobin pastebinit utils/pbput
+ dosym pbput /usr/bin/pbget
+ dosym pbput /usr/bin/pbputs
+
+ einstalldocs
+ doman utils/*.1
+ use man && doman pastebinit.1
+
+ insinto /usr/share/locale
+ doins -r po/mo/*
+
+ insinto /usr/share
+ doins -r pastebin.d
+}
+
+pkg_postinst() {
+ optfeature "identification of your distribution" dev-python/distro
+ optfeature "pbput and pbputs scripts" app-arch/xz-utils
+ optfeature "pbget and pbputs scripts" app-crypt/gnupg
+}
diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5.ebuild
deleted file mode 100644
index c78123910daf..000000000000
--- a/app-text/pastebinit/pastebinit-1.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-single-r1
-
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/configobj[${PYTHON_USEDEP}]
- crypt? ( app-crypt/gnupg )"
-DEPEND="app-text/docbook-xsl-stylesheets"
-
-src_prepare() {
- local mo=""
-
- for lang in ${LINGUAS}; do
- if [ -f po/${lang}.po ]; then
- mo="${mo} ${lang}.mo"
- fi
- done
-
- sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die
- sed -i -e "/#!/s/python3/python/" pastebinit || die
-}
-
-src_compile() {
- emake -C po
- xsltproc --nonet \
- "${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
- pastebinit.xml || die
-}
-
-src_install() {
- dobin pastebinit utils/pbput
- python_fix_shebang "${ED}usr/bin/${PN}"
- dosym pbput /usr/bin/pbget
- use crypt && dosym pbput /usr/bin/pbputs
- dodoc README
- doman pastebinit.1 utils/*.1
- insinto /usr/share/locale
- [[ -d po/mo ]] && doins -r po/mo/*
- insinto /usr/share
- doins -r pastebin.d
-}
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
deleted file mode 100644
index 19a4bcd17c1f..000000000000
--- a/app-text/pdf2djvu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
-DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
-DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
deleted file mode 100644
index 06341298ff68..000000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:23:51 +0200
-Subject: [PATCH] Put Ref in pdf namespace.
-
----
- pdf-backend.hh | 1 +
- pdf2djvu.cc | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index 43899c0..d7872c3 100644
---- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -82,6 +82,7 @@ namespace pdf
- typedef ::Catalog Catalog;
- typedef ::GooString String;
- typedef ::Goffset Offset;
-+ typedef ::Ref Ref;
-
- /* type definitions — annotations
- * ==============================
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index 669eba5..d9e1532 100644
---- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
- int page;
- if (dest->isPageRef())
- {
-- Ref pageref = dest->getPageRef();
-+ pdf::Ref pageref = dest->getPageRef();
- page = catalog->findPage(pageref.num, pageref.gen);
- }
- else
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
deleted file mode 100644
index 356153b5cca0..000000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:49:02 +0200
-Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
- Catalog::findPage(int, int).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
- pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
- pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
----
- pdf-backend.cc | 15 +++++++++++++++
- pdf-backend.hh | 2 ++
- pdf2djvu.cc | 2 +-
- 3 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f1d7662..a1b9b63 100644
---- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
-
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
-+{
-+ return catalog->findPage(pgref.num, pgref.gen);
-+}
-+
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
-+{
-+ return catalog->findPage(pgref);
-+}
-+
-+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
-+{
-+ return find_page_impl<pdf::Catalog>(catalog, pgref);
-+}
-+
- // vim:ts=2 sts=2 sw=2 et
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index d7872c3..d88c956 100644
---- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -436,6 +436,8 @@ namespace pdf
-
- const char * get_c_string(const pdf::String *str);
-
-+ int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
-+
- }
-
- #endif
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index d9e1532..21f2d50 100644
---- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
- if (dest->isPageRef())
- {
- pdf::Ref pageref = dest->getPageRef();
-- page = catalog->findPage(pageref.num, pageref.gen);
-+ page = pdf::find_page(catalog, pageref);
- }
- else
- page = dest->getPageNum();
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
deleted file mode 100644
index b3d8cfad6df2..000000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Tue, 23 Apr 2019 08:23:46 +0200
-Subject: [PATCH] pdf-backend: simplify find_page() implementation.
-
----
- pdf-backend.cc | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f6f5267..a94383e 100644
---- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
-
--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
--{
-- return catalog->findPage(pgref.num, pgref.gen);
--}
--
--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
--{
-- return catalog->findPage(pgref);
--}
--
- int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
- {
-- return find_page_impl<pdf::Catalog>(catalog, pgref);
-+#if POPPLER_VERSION >= 7600
-+ return catalog->findPage(pgref);
-+#else
-+ return catalog->findPage(pgref.num, pgref.gen);
-+#endif
- }
-
- // vim:ts=2 sts=2 sw=2 et
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
deleted file mode 100644
index 7ae0b54679c3..000000000000
--- a/app-text/pdf2djvu/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>printing@gentoo.org</email>
- <name>Gentoo Printing Project</name>
- </maintainer>
- <upstream>
- <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
deleted file mode 100644
index cf33748eec99..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
deleted file mode 100644
index 1b3b34c9947d..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
- "${FILESDIR}"/${P}-poppler-0.76-{1,2,3}.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
deleted file mode 100644
index 84bd0e4be6ee..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
index 715b829b1c2a..de1b4b4f379f 100644
--- a/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
+++ b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
@@ -1,5 +1,5 @@
---- pbm2png.c.orig 2003-09-16 20:12:55.000000000 +0900
-+++ pbm2png.c 2004-02-21 22:09:57.415786664 +0900
+--- a/pbm2png.c
++++ b/pbm2png.c
@@ -145,15 +145,13 @@
sprintf(string,"%s%d.html",basename,index);
f=fopen(string,"w");
diff --git a/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
index 72a0e1b65af9..7e5635332df8 100644
--- a/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
+++ b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
@@ -1,5 +1,5 @@
---- pbm2png.c
-+++ pbm2png.c
+--- a/pbm2png.c
++++ b/pbm2png.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
diff --git a/app-text/pdf2html/metadata.xml b/app-text/pdf2html/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/pdf2html/metadata.xml
+++ b/app-text/pdf2html/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/pdf2html/pdf2html-1.4.ebuild b/app-text/pdf2html/pdf2html-1.4.ebuild
index 6447a075494d..3dfc5cf35421 100644
--- a/app-text/pdf2html/pdf2html-1.4.ebuild
+++ b/app-text/pdf2html/pdf2html-1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="Converts pdf files to html files"
HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/"
@@ -10,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=">=media-libs/libpng-1.4
@@ -19,22 +20,21 @@ RDEPEND="${DEPEND}
app-text/ghostscript-gpl
>=media-gfx/imagemagick-6"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-libpng15.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-libpng15.patch
+)
src_compile() {
tc-export CC
# Rewrite the Makefile as that's simpler
- echo "LDLIBS=-lpng" > Makefile
- echo "all: pbm2png" >> Makefile
+ echo "LDLIBS=-lpng" > Makefile || die "echo failed"
+ echo "all: pbm2png" >> Makefile || die "echo #2 failed"
emake
- echo "pbm2eps9: pbm2eps9.o printer.o" > Makefile
+ echo "pbm2eps9: pbm2eps9.o printer.o" > Makefile || die "echo #3 failed"
emake pbm2eps9
- echo "cp \"${EPREFIX}\"/usr/share/${P}/*.png ." >> pdf2html
+ echo "cp \"${EPREFIX}\"/usr/share/${P}/*.png ." >> pdf2html || die "echo #4 failed"
}
src_install() {
diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
deleted file mode 100644
index e7dae3ff3cac..000000000000
--- a/app-text/pdf2oo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pdf2oo-20090715.tar.gz 14765 BLAKE2B b84b34f4c932468d26ca6f53b596f762ec098fedfee22f1dc568e27a41c7ea9df32cc645a1f2ffd1469441ef579a11f31840fd9ed536853aacdef1f1593f4aeb SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5
diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
deleted file mode 100644
index 9c4c3c2f8dec..000000000000
--- a/app-text/pdf2oo/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">pdf2oo</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild b/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
deleted file mode 100644
index 9db50ba4886a..000000000000
--- a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts pdf files to odf"
-HOMEPAGE="https://sourceforge.net/projects/pdf2oo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
- >=app-text/poppler-0.12.3-r3[utils]
- virtual/imagemagick-tools"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- dobin pdf2oo
- dodoc README
-}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
new file mode 100644
index 000000000000..635713743a4f
--- /dev/null
+++ b/app-text/pdfarranger/Manifest
@@ -0,0 +1,2 @@
+DIST pdfarranger-1.10.0.tar.gz 303125 BLAKE2B 126b47dfdabbe6d75331788dd891e1d8136a70b98e70601e19fd47fc7e3d81c350eb1fc8866a3a09db88b2b760ef964e7a01cf233464440c81a6dc5462101592 SHA512 92aa53a402d2f4c82a7f99f2acc1c328f71ad18835e524588e0f011f3ba8b074bf425ed881bb5f9ce3020833ce37cc3c301fd90b8931b44f909c8647bc1b09af
+DIST pdfarranger-1.10.1.tar.gz 304298 BLAKE2B 9762864072d4d75cf7e4a65f9ec9db040eef53ee97b2867340bc427d350f4b9b9fbc321520bf2e47d1c2ab2c866c8ceaf56b9806378bcdff4897ebc7f6c1e2ee SHA512 a0bebb569570656217e4f9432c0a3fbdb7f441b7ee04dc82f31e449befec19a1fa1045ef7ce95dc75e9feb14fad9a0265307efdf221c8a727091c05348554427
diff --git a/app-text/pdfarranger/metadata.xml b/app-text/pdfarranger/metadata.xml
new file mode 100644
index 000000000000..4ccfb01ea25e
--- /dev/null
+++ b/app-text/pdfarranger/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+ </maintainer>
+ <longdescription lang="en">
+ A small python-gtk application, which helps the user to merge or split pdf documents
+ and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface.
+ It is a frontend for pikepdf.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">jeromerobert/pdfarranger</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/pdfarranger/pdfarranger-1.10.0.ebuild b/app-text/pdfarranger/pdfarranger-1.10.0.ebuild
new file mode 100644
index 000000000000..44ebd2bc40e7
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature xdg desktop
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages"
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="
+ app-text/poppler[introspection,cairo]
+ >=dev-python/pikepdf-6.0.0[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ dev-util/intltool
+"
+
+src_install() {
+ distutils-r1_src_install
+ for x in 16 32 48 256 scalable
+ do doicon -s ${x} data/icons/hicolor/${x}*/*
+ done
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "image file import" media-gfx/img2pdf
+}
diff --git a/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild b/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild
new file mode 100644
index 000000000000..5bb0d5ee7a7a
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.10.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+inherit distutils-r1 optfeature xdg desktop
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages"
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-text/poppler[introspection,cairo]
+ dev-python/pikepdf[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},lcms]
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ distutils-r1_src_install
+ for x in 16 32 48 256 scalable
+ do doicon -s ${x} data/icons/hicolor/${x}*/*
+ done
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "image file import" media-gfx/img2pdf
+}
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index 23af45ba4367..e85ac0372024 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,3 +1 @@
-DIST pdfgrep-1.4.1.tar.gz 151926 BLAKE2B 68b846b26c28e8209fa3ac7a7e6fe3d0c4c6a298e9bea2e3929fd82a44482ec914bd3594f3e07da8c56766e94ca3d4c3c2d6997364393e95b3741b1bf9685ec5 SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735
-DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index 1a839140fb6c..fcea8993d2bb 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -1,20 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jlec@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <email>flo@geekplace.eu</email>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <maintainer type='person'>
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
</maintainer>
<use>
<flag name="unac">Removing accents and ligatures before search</flag>
</use>
<upstream>
- <remote-id type="gitlab">pdfgrep</remote-id>
+ <remote-id type="gitlab">pdfgrep/pdfgrep</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
deleted file mode 100644
index b3ac59a28b3d..000000000000
--- a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool similar to grep which searches text in PDFs"
-HOMEPAGE="http://pdfgrep.org/"
-SRC_URI="https://pdfgrep.org/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pcre test unac"
-
-RDEPEND="
- app-text/poppler:=[cxx]
- pcre? ( dev-libs/libpcre[cxx] )
- unac? ( app-text/unac )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- dev-texlive/texlive-latex
- dev-util/dejagnu
- )"
-
-src_configure() {
- econf \
- $(use_with pcre libpcre) \
- $(use_with unac)
-}
diff --git a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
deleted file mode 100644
index 94665a7d2fba..000000000000
--- a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool similar to grep which searches text in PDFs"
-HOMEPAGE="http://www.pdfgrep.org/"
-SRC_URI="http://www.pdfgrep.org/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pcre test unac"
-
-RDEPEND="
- app-text/poppler:=[cxx]
- dev-libs/libgcrypt:0=
- pcre? ( dev-libs/libpcre[cxx] )
- unac? ( app-text/unac )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexrecommended
- dev-util/dejagnu
- )"
-
-src_configure() {
- econf \
- $(use_with pcre libpcre) \
- $(use_with unac)
-}
diff --git a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
index 41a8ff10f22f..22c87a31ea4d 100644
--- a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,8 +9,9 @@ SRC_URI="https://www.pdfgrep.org/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
IUSE="+pcre test unac"
+RESTRICT="!test? ( test )"
RDEPEND="
app-text/poppler:=[cxx]
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
index 7b4a61aab741..d724efdf402e 100644
--- a/app-text/pdfjam/metadata.xml
+++ b/app-text/pdfjam/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
new file mode 100644
index 000000000000..17672fc01c1e
--- /dev/null
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/./}
+DESCRIPTION="pdfnup, pdfjoin and pdf90"
+HOMEPAGE="http://www.warwick.ac.uk/go/pdfjam"
+SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE=""
+S="${WORKDIR}"/${PN}
+
+DEPEND="virtual/latex-base"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ dobin bin/*
+ dodoc PDFjam-README.html
+ doman man1/*
+}
diff --git a/app-text/pdfjam/pdfjam-2.08.ebuild b/app-text/pdfjam/pdfjam-2.08.ebuild
deleted file mode 100644
index 02f5c07608c9..000000000000
--- a/app-text/pdfjam/pdfjam-2.08.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_PV=${PV/./}
-DESCRIPTION="pdfnup, pdfjoin and pdf90"
-HOMEPAGE="http://www.warwick.ac.uk/go/pdfjam"
-SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-S=${WORKDIR}/${PN}
-
-DEPEND="virtual/latex-base"
-RDEPEND="${DEPEND}"
-
-src_install() {
- dobin bin/* || die
- dodoc PDFjam-README.html || die
- doman man1/* || die
-}
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index b44ac28ba6e2..bc4be7f0c4ab 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1 +1,2 @@
-DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
+DIST pdfminer-20220506.tar.gz 10853104 BLAKE2B b6008db789973fb69537801b8e928761bd0a949cc72ddf380fd71b6373913f6a689b71bee159e6991e99c196b7e8a1fac5530d2bf9c577e53b8b556bed00b85a SHA512 b81916c70f22f3408cf41a50d35937f950ee6205f59fa03603bc7a78d1b1b037311ebaf5661f6d46b9d4190f2f56189fc28b714463dc5854328c14f97fbc28c4
+DIST pdfminer.six-20221105.gh.tar.gz 10857730 BLAKE2B dd9282bfc3c636676f087e6ffc2cfb137f66eee18427f08de488c7bdc13bd27b6cc674d3b75c93d1566668272ee4111e3347664a70152bd4b2f7e4e63664d01b SHA512 72034a75005c91100274f86baa4c8884caad86aacf94ca9d0d5a51d8b3c772aa0bcd766416bed9e26df00bd9a2be585649eaa24321735f532e40a3871e19c6df
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
index c67c1ba87596..4246c8804ba1 100644
--- a/app-text/pdfminer/metadata.xml
+++ b/app-text/pdfminer/metadata.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="pypi">pdfminer</remote-id>
+ <remote-id type="github">pdfminer/pdfminer.six</remote-id>
+ <remote-id type="pypi">pdfminer.six</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
deleted file mode 100644
index 2fc3e5eeaed6..000000000000
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-python_compile_all(){
- use examples && emake -C samples all
-}
-
-python_test() {
- emake test
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( samples/. )
- distutils-r1_python_install_all
-}
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
deleted file mode 100644
index 3f0dbf03188c..000000000000
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-python_compile_all(){
- use examples && emake -C samples all
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( samples/. )
- distutils-r1_python_install_all
-}
diff --git a/app-text/pdfminer/pdfminer-20220506.ebuild b/app-text/pdfminer/pdfminer-20220506.ebuild
new file mode 100644
index 000000000000..cbc3e5638e44
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20220506.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+MY_P="${PN}.six-${PV}"
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/"
+# Release tarballs lack tests
+#SRC_URI="https://github.com/pdfminer/pdfminer.six/releases/download/${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e "s:package.__version__:${PV}:" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use examples && emake -C samples all
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/. )
+ use examples && dodoc -r samples
+ distutils-r1_python_install_all
+}
diff --git a/app-text/pdfminer/pdfminer-20221105.ebuild b/app-text/pdfminer/pdfminer-20221105.ebuild
new file mode 100644
index 000000000000..b02a4d3e19e6
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20221105.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+MY_P="${PN}.six-${PV}"
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/"
+# Release tarballs lack tests
+SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/charset-normalizer-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source "dev-python/sphinx-argparse"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e "s:__VERSION__:${PV}:g" pdfminer/__init__.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ use examples && dodoc -r samples
+ distutils-r1_python_install_all
+}
diff --git a/app-text/pdfpc/Manifest b/app-text/pdfpc/Manifest
new file mode 100644
index 000000000000..37d8526ade6b
--- /dev/null
+++ b/app-text/pdfpc/Manifest
@@ -0,0 +1 @@
+DIST pdfpc-4.6.0.tar.gz 7766521 BLAKE2B 3e8914333a0781d3d750ab71d58c8af1451ce5ab321ecc0639ddcf377cae9a0c62290696455516ce1d70f4ae3ffc5889fe910ced0399787e6a40c8ae76e1f75e SHA512 4ec69cbe21fb8bbb3e381229c391133f92e76b610e1fdf1cffa2c9fa9997ccc879eaef2a6837b34d1e635cdd07c4d0ce98de03fd7ece431a8f35493f0f7d7651
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch
new file mode 100644
index 000000000000..9767dc2a8093
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch
@@ -0,0 +1,59 @@
+https://github.com/pdfpc/pdfpc/issues/672
+https://bugs.gentoo.org/904241
+
+commit a6501085b3e94eb4a01db18fe9dc15d51fcde3a3
+Author: Evgeny Stambulchik <fnevgeny@gmail.com>
+Date: Sat, 11 Feb 2023 23:04:19 +0200
+
+ Skip MOVIE actions when configured with -DMOVIES
+
+--- a/src/classes/action/link_action.vala
++++ b/src/classes/action/link_action.vala
+@@ -47,6 +47,7 @@
+ this.action = mapping.action.copy();
+ }
+
++#if MOVIES
+ /**
+ * Find movie on the current slide by its filename; there seems to be
+ * no better way with the current Glib Poppler bindings.
+@@ -71,6 +72,7 @@
+
+ return null;
+ }
++#endif
+
+ /**
+ * Create from the LinkMapping if the link is an internal link to a named
+@@ -91,6 +93,7 @@
+ return new_obj as ActionMapping;
+ }
+ break;
++#if MOVIES
+ case Poppler.ActionType.MOVIE:
+ unowned var movie_action = (Poppler.ActionMovie*) mapping.action;
+ var movie = movie_action.movie;
+@@ -100,6 +103,7 @@
+ return new_obj as ActionMapping;
+ }
+ break;
++#endif
+ default:
+ break;
+ }
+@@ -167,6 +171,7 @@
+ this.controller.switch_to_slide_number(slide_number);
+
+ break;
++#if MOVIES
+ case Poppler.ActionType.MOVIE:
+ unowned var action = (Poppler.ActionMovie*) this.action;
+ var movie = action.movie;
+@@ -192,6 +197,7 @@
+ }
+ }
+ break;
++#endif
+ default:
+ return false;
+ }
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
new file mode 100644
index 000000000000..9aff761b471f
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
@@ -0,0 +1,31 @@
+https://github.com/pdfpc/pdfpc/issues/686
+https://bugs.gentoo.org/904970
+
+commit 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768
+Author: Evgeny Stambulchik <fnevgeny@gmail.com>
+Date: Tue, 25 Apr 2023 16:11:25 +0300
+
+ Create Lists of nullable types
+
+--- a/src/classes/drawings/drawing_commands.vala
++++ b/src/classes/drawings/drawing_commands.vala
+@@ -54,8 +54,8 @@
+ }
+
+ public void clear() {
+- this.drawing_commands = new List<DrawingCommand>();
+- this.redo_commands = new List<DrawingCommand>();
++ this.drawing_commands = new List<DrawingCommand?>();
++ this.redo_commands = new List<DrawingCommand?>();
+ }
+
+ public void add_line(bool is_eraser,
+@@ -70,7 +70,7 @@
+
+ // After adding a new line you can no longer redo the old
+ // path.
+- this.redo_commands = new List<DrawingCommand>(); // clear
++ this.redo_commands = new List<DrawingCommand?>(); // clear
+
+ bool new_path = true;
+ double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
new file mode 100644
index 000000000000..2428314dd2fe
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
@@ -0,0 +1,22 @@
+--- pdfpc-4.6.0/src/CMakeLists.txt
++++ pdfpc-4.6.0/src/CMakeLists.txt
+@@ -30,8 +30,8 @@
+ endif ()
+
+ if (MDVIEW)
+- pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+- set(MDVIEW_PACKAGES webkit2gtk-4.0)
++ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.1)
++ set(MDVIEW_PACKAGES webkit2gtk-4.1)
+ set(EXTRA_VALA_OPTIONS ${EXTRA_VALA_OPTIONS} -D MDVIEW)
+ endif ()
+
+@@ -136,7 +136,7 @@
+ vala_precompile(VALA_C
+ ${VALA_SRC}
+ PACKAGES
+- webkit2gtk-4.0
++ webkit2gtk-4.1
+ json-glib-1.0
+ gio-2.0
+ gee-0.8
diff --git a/app-text/pdfpc/metadata.xml b/app-text/pdfpc/metadata.xml
new file mode 100644
index 000000000000..780c14d9b256
--- /dev/null
+++ b/app-text/pdfpc/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ulm@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="gstreamer">
+ Compile support for movie playback (<pkg>media-libs/gstreamer</pkg>)
+ </flag>
+ <flag name="soup">
+ Compile support for REST server (<pkg>net-libs/libsoup</pkg>)
+ </flag>
+ <flag name="webkit">
+ Enable viewing Markdown notes (<pkg>net-libs/webkit-gtk</pkg>)
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">pdfpc/pdfpc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
new file mode 100644
index 000000000000..f06648747739
--- /dev/null
+++ b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
+
+#COMMIT_ID=""
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+gstreamer soup webkit"
+
+RDEPEND="
+ app-text/discount:=
+ app-text/poppler:=[cairo]
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8=
+ gnome-base/librsvg
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-plugins/gst-plugins-gtk:1.0=
+ media-plugins/gst-plugins-cairo:1.0=
+ )
+ webkit? ( net-libs/webkit-gtk:4.1= )
+ !webkit? ( soup? (
+ media-gfx/qrencode
+ net-libs/libsoup:2.4
+ ) )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+DOCS=(
+ CHANGELOG.rst
+ FAQ.rst
+ README.rst
+ SUPPORT.rst
+)
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-no-movies.patch"
+ eapply "${FILESDIR}/${P}-vala-0.56.7.patch"
+ use webkit && eapply "${FILESDIR}/${P}-webkit2gtk-4.1.patch"
+
+ cmake_src_prepare
+ vala_setup
+ sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
+ cmake/vala/FindVala.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DMOVIES=$(usex gstreamer on off)
+ -DMDVIEW=$(usex webkit on off)
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ )
+
+ if use webkit; then
+ use soup && ewarn \
+ "USE flag \"webkit\" overrides \"soup\"; disabling REST support."
+ mycmakeargs+=( -DREST=off )
+ else
+ mycmakeargs+=( -DREST=$(usex soup on off) )
+ fi
+
+ cmake_src_configure
+}
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index 333618deefa3..688ed27a60cc 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1 +1 @@
-DIST pdfsandwich-0.1.4.tar.bz2 16401 BLAKE2B cb431f35b199e3e6290c60a3f6c7b2621dd3652a29346092869d8e5f86f5664079de1ef431f9b5e8b9f7cc044d64006295a8176d6a28b2ea5fb820db8c952000 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171
+DIST pdfsandwich-0.1.7.tar.bz2 17461 BLAKE2B edeb08ab55df89ef2d1f3e43446e831c66e57273b36ecd56a4cc5f910ca5b59a03e2a66b13e7150f06f8f3eb26ed14cd1c80d02cd38d6bd6cfe923c30c801577 SHA512 ac315aeba2cc753fddc380e2522d0c41d65ea80372a23c2cd5371ebc239ac104ab5a5a1386378b9e026b2935a767128224f7617a5eb8f5ef9d6874cc18ef83ff
diff --git a/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch b/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch
new file mode 100644
index 000000000000..f16b94379b6a
--- /dev/null
+++ b/app-text/pdfsandwich/files/pdfsandwich-0.1.7-gentoo.patch
@@ -0,0 +1,43 @@
+--- a/Makefile 2020-05-21 20:46:14.961927486 +0200
++++ b/Makefile 2020-05-21 20:49:16.203121793 +0200
+@@ -6,7 +6,7 @@
+
+ SOURCE = pdfsandwich.ml
+ TARGET = pdfsandwich
+-MANUAL = $(TARGET).1.gz
++MANUAL = $(TARGET).1
+
+ VERSION := $(shell cat pdfsandwich_version)
+
+@@ -24,7 +24,7 @@
+
+ $(MANUAL): manual.txt
+ # you need gawk for this:
+- ./txt2man -t PDFSANDWICH manual.txt | gzip -9 > $(MANUAL)
++ ./txt2man -t PDFSANDWICH manual.txt > $(MANUAL)
+
+ # Canceling pathological implicit rule:
+ %: %.o
+@@ -40,7 +40,7 @@
+ include makefile.installprefix
+
+ PREF = $(DESTDIR)$(PREFIX)
+-INSTALL = install -s
++INSTALL = install
+ CP = cp
+ INSTALLBINDIR = $(PREF)/bin
+ INSTALLMANDIR = $(PREF)/share/man/man1
+@@ -47,12 +47,8 @@
+ INSTALLDOCDIR = $(PREF)/share/doc/$(TARGET)
+
+ install: $(DOCFILES) $(ADDITIONAL)
+- (umask 0022; mkdir -p $(INSTALLBINDIR) $(INSTALLDOCDIR) $(INSTALLMANDIR))
++ (umask 0022; mkdir -p $(INSTALLBINDIR))
+ $(INSTALL) $(TARGET) $(INSTALLBINDIR)
+- $(CP) $(DOCFILES) $(INSTALLDOCDIR)
+- gzip -9 $(INSTALLDOCDIR)/changelog
+- $(CP) $(MANUAL) $(INSTALLMANDIR)
+- chmod 644 $(INSTALLDOCDIR)/* $(INSTALLMANDIR)/*
+
+ uninstall:
+ rm -rf $(INSTALLBINDIR)/$(TARGET) $(INSTALLDOCDIR) $(INSTALLMANDIR)/$(MANUAL)
diff --git a/app-text/pdfsandwich/metadata.xml b/app-text/pdfsandwich/metadata.xml
index 0fb15c19e847..cd9cb5c73a76 100644
--- a/app-text/pdfsandwich/metadata.xml
+++ b/app-text/pdfsandwich/metadata.xml
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
<longdescription>
-pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which
-contain only images (no text) will be processed by optical character
-recognition (OCR) and the text will be added to each page invisibly
-"behind" the images.
+ pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which
+ contain only images (no text) will be processed by optical character
+ recognition (OCR) and the text will be added to each page invisibly
+ "behind" the images.
-pdfsandwich is a command line tool which is supposed to be useful to
-OCR scanned books or journals. It is able to recognize the page layout
-even for multicolumn text.
+ pdfsandwich is a command line tool which is supposed to be useful to
+ OCR scanned books or journals. It is able to recognize the page layout
+ even for multicolumn text.
-Essentially, pdfsandwich is a wrapper script which calls the following
-binaries: convert, cuneiform, gs, and hocr2pdf. It is known to run on
-Unix systems and has been tested on Linux and MacOS X. It supports
-parallel processing on multiprocessor systems.
-</longdescription>
+ Essentially, pdfsandwich is a wrapper script which calls the following
+ binaries: unpaper, convert, gs, and tesseract. It supports
+ parallel processing on multiprocessor systems.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">pdfsandwich</remote-id>
</upstream>
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
deleted file mode 100644
index 21bf32dcc96f..000000000000
--- a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="generator of sandwich OCR pdf files"
-HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
-SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="png"
-
-RDEPEND=">=app-text/tesseract-3.00
- media-gfx/exact-image
- app-text/unpaper
- app-text/ghostscript-gpl
- virtual/imagemagick-tools[png?]"
-DEPEND="sys-apps/gawk
- >=dev-lang/ocaml-3.10[ocamlopt]"
-
-src_prepare() {
- sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
- sed -i "s/install -s/install/" Makefile || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
- elog "pdfsandwich relies on the tesseract library for OCR."
- elog "Consequently language support is determined by tesseract's"
- elog "language support which in turn is controlled via the LINGUAS"
- elog "variable in make.conf."
-}
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
new file mode 100644
index 000000000000..df1636b138bf
--- /dev/null
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="generator of sandwich OCR pdf files"
+HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
+SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~x86"
+SLOT="0"
+IUSE="png"
+
+RDEPEND="app-text/tesseract
+ media-gfx/exact-image
+ app-text/unpaper
+ app-text/ghostscript-gpl
+ app-text/poppler
+ virtual/imagemagick-tools[png?]"
+DEPEND="sys-apps/gawk
+ >=dev-lang/ocaml-3.10[ocamlopt]"
+
+DOCS=( changelog )
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+QA_FLAGS_IGNORED="/usr/bin/${PN}"
+QA_TEXTRELS="/usr/bin/${PN}"
+
+src_prepare() {
+ sed -i \
+ -e "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" \
+ Makefile || die
+ # Bug #866043
+ filter-lto
+ default
+}
+
+src_install() {
+ default
+ doman ${PN}.1
+}
+
+pkg_postinst() {
+ elog "pdfsandwich relies on the tesseract library for OCR."
+ elog "Consequently language support is determined by tesseract's"
+ elog "language support which in turn is controlled via the LINGUAS"
+ elog "variable in make.conf."
+}
diff --git a/app-text/pdfshuffler/Manifest b/app-text/pdfshuffler/Manifest
deleted file mode 100644
index b842258dec76..000000000000
--- a/app-text/pdfshuffler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pdfshuffler-0.6.0.tar.gz 48071 BLAKE2B 8bcb513f1dd18cf9d6e17315a7a2ec5bbf5240176acd6deb6ec803900174a39927998210ab5e4aab9a7330821ce7d1ab266e1ae677e03fd51df305ceec9f5836 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe
diff --git a/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch b/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
deleted file mode 100644
index 8228c1765143..000000000000
--- a/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U2 pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py
---- pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py 2012-04-28 21:15:17.000000000 +0700
-+++ pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py 2015-01-11 02:10:02.952809411 +0600
-@@ -72,5 +72,13 @@
-
- import poppler #for the rendering of pdf pages
--from pyPdf import PdfFileWriter, PdfFileReader
-+
-+try:
-+ from PyPDF2 import PdfFileWriter, PdfFileReader
-+except ImportError:
-+ try:
-+ from pyPdf import PdfFileWriter, PdfFileReader
-+ except ImportError:
-+ print('Neither PyPDF2 nor pyPdf found')
-+ sys.exit(1)
-
- from pdfshuffler_iconview import CellRendererImage
diff --git a/app-text/pdfshuffler/metadata.xml b/app-text/pdfshuffler/metadata.xml
deleted file mode 100644
index bab57cb53461..000000000000
--- a/app-text/pdfshuffler/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">pdfshuffler</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
deleted file mode 100644
index 23dcc1238d34..000000000000
--- a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 xdg
-
-DESCRIPTION="GUI app that can merge or split pdfs and rotate, crop and rearrange their pages"
-HOMEPAGE="https://sourceforge.net/projects/pdfshuffler/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="|| ( dev-python/PyPDF2 dev-python/pyPdf )
- dev-python/python-poppler"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README TODO AUTHORS )
-
-PATCHES=( "${FILESDIR}"/${PN}-PyPDF2.patch )
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index f86be2eafbd0..028f6a4638e8 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1 +1 @@
-DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
+DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21
diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
index 03c3390d2bb3..81ba34ef8d7e 100644
--- a/app-text/pdftk/metadata.xml
+++ b/app-text/pdftk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
@@ -9,4 +9,7 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
+<upstream>
+ <remote-id type="gitlab">pdftk-java/pdftk</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-text/pdftk/pdftk-3.0.0.ebuild b/app-text/pdftk/pdftk-3.0.0.ebuild
deleted file mode 100644
index 1f8c20acf72c..000000000000
--- a/app-text/pdftk/pdftk-3.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="gcj-free version of pdftk written in Java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
-else
- SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
- KEYWORDS="amd64 ~x86"
- S="${WORKDIR}/pdftk-v${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-CDEPEND="
- dev-java/bcprov:0
- dev-java/commons-lang:3.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.7"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.7"
-
-src_install() {
- java-pkg_newjar "build/jar/pdftk.jar"
- java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
- doman "${PN}.1"
-}
diff --git a/app-text/pdftk/pdftk-3.3.3-r2.ebuild b/app-text/pdftk/pdftk-3.3.3-r2.ebuild
new file mode 100644
index 000000000000..fce7d1225234
--- /dev/null
+++ b/app-text/pdftk/pdftk-3.3.3-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A port of pdftk into java"
+HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
+SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+# Switch back to bcprov:0 once pdftk updates its bcprov dependency.
+CP_DEPEND="
+ dev-java/bcprov:1.74
+ dev-java/commons-lang:3.6
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ app-text/poppler[cairo]
+ dev-java/system-rules:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
+JAVA_RESOURCE_DIRS="resources/java"
+JAVA_SRC_DIR="java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
+JAVA_TEST_SRC_DIR="test"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir resources || die
+ cp -r {,resources/}java || die
+ rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die
+ find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
+}
+
+src_test() {
+ # some tests seem to need special treatment
+ einfo "Runnig first test"
+ JAVA_TEST_RUN_ONLY=(
+ com.gitlab.pdftk_java.CatTest
+ com.gitlab.pdftk_java.DataTest
+ com.gitlab.pdftk_java.FormTest
+ com.gitlab.pdftk_java.MultipleTest
+ )
+ java-pkg-simple_src_test
+ einfo "Running second test"
+ JAVA_TEST_RUN_ONLY=()
+ JAVA_TEST_EXCLUDES=(
+ com.gitlab.pdftk_java.CatTest
+ com.gitlab.pdftk_java.DataTest
+ com.gitlab.pdftk_java.FormTest
+ com.gitlab.pdftk_java.MultipleTest
+ )
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ doman "${PN}.1"
+}
diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild
index 9fe6b13efc09..5054bbcc6777 100644
--- a/app-text/pdftk/pdftk-9999.ebuild
+++ b/app-text/pdftk/pdftk-9999.ebuild
@@ -1,42 +1,88 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit java-pkg-2 java-ant-2
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
-DESCRIPTION="gcj-free version of pdftk written in Java"
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A port of pdftk into java"
HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
+ S="${WORKDIR}/pdftk-${PV}"
else
SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
S="${WORKDIR}/pdftk-v${PV}"
fi
LICENSE="GPL-2"
SLOT="0"
-JAVA_PKG_STRICT="yes"
-EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
-JAVA_ANT_REWRITE_CLASSPATH="true"
+# Switch back to bcprov:0 once pdftk updates its bcprov dependency.
+CP_DEPEND="
+ dev-java/bcprov:1.74
+ dev-java/commons-lang:3.6
+"
-CDEPEND="
- dev-java/bcprov:0
- dev-java/commons-lang:3.6"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ app-text/poppler[cairo]
+ dev-java/system-rules:0
+ )
+"
RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.7"
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.7"
+DOCS=( CHANGELOG.md README.md )
+
+JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
+JAVA_RESOURCE_DIRS="resources/java"
+JAVA_SRC_DIR="java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
+JAVA_TEST_SRC_DIR="test"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir resources || die
+ cp -r {,resources/}java || die
+ rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die
+ find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
+}
+
+src_test() {
+ # some tests seem to need special treatment
+ einfo "Runnig first test"
+ JAVA_TEST_RUN_ONLY=(
+ com.gitlab.pdftk_java.CatTest
+ com.gitlab.pdftk_java.DataTest
+ com.gitlab.pdftk_java.FormTest
+ com.gitlab.pdftk_java.MultipleTest
+ )
+ java-pkg-simple_src_test
+ einfo "Running second test"
+ JAVA_TEST_RUN_ONLY=()
+ JAVA_TEST_EXCLUDES=(
+ com.gitlab.pdftk_java.CatTest
+ com.gitlab.pdftk_java.DataTest
+ com.gitlab.pdftk_java.FormTest
+ com.gitlab.pdftk_java.MultipleTest
+ )
+ java-pkg-simple_src_test
+}
src_install() {
- java-pkg_newjar "build/jar/pdftk.jar"
- java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
+ java-pkg-simple_src_install
+ doman "${PN}.1"
}
diff --git a/app-text/peg-markdown/Manifest b/app-text/peg-markdown/Manifest
deleted file mode 100644
index 1f4527993e83..000000000000
--- a/app-text/peg-markdown/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST peg-markdown-0.4.14.tar.gz 85692 BLAKE2B a52b894a03921595850d460ced20257096b5a4afb00fca5849c64f7506fd2f39946f2ad13bec50f5032610669bdb14d4f789ceb509b533040a90f228fc443879 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e
diff --git a/app-text/peg-markdown/metadata.xml b/app-text/peg-markdown/metadata.xml
deleted file mode 100644
index e8f120ba5018..000000000000
--- a/app-text/peg-markdown/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>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
- </maintainer>
- <upstream>
- <remote-id type="github">jgm/peg-markdown</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
deleted file mode 100644
index 10e5d2c0581c..000000000000
--- a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Implementation of markdown in C, using a PEG grammar"
-HOMEPAGE="https://github.com/jgm/peg-markdown"
-SRC_URI="https://github.com/jgm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
- dev-util/peg
- test? (
- dev-lang/perl
- virtual/perl-Getopt-Long
- app-text/htmltidy )"
-
-src_prepare() {
- rm -rf peg-* || die "rm failed"
- sed -i \
- -e 's/^PROGRAM=markdown/PROGRAM=peg-markdown/' \
- -e 's/$(CC) `/$(CC) $(LDFLAGS) `/g' \
- -e 's/^\t$(LEG)/\tleg/' \
- -e 's/^$(PEGDIR):/dummy:/' \
- -e '/$(PEGDIR)/d' \
- -e 's/$(LEG) //g' \
- Makefile || die 'sed failed'
- sed -i \
- -e '/strdup/d' markdown_peg.h || die 'sed .h failed'
-}
-
-src_install() {
- dobin peg-markdown
- dodoc README.markdown
-}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index ce3e37783912..5d37f3e38a90 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,3 +1,3 @@
-DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
-DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
-DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
+DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b
+DIST pelican-4.9.0.gh.tar.gz 1374399 BLAKE2B 2fa91ff9b5ddacac1fd64d9325ccb1fadb9bbfaa9c6098920a43a576f3d8d7be31a98b5250b2ea10bee63993d8b9bb72fdebdf9d57d0518d1f4bddef705e2804 SHA512 a50d0fbad816fa4a73eb94d0aa15cf5f9321ed2bdb50addbebbf0024f2fc7fd73ab94b314b5821068d552dcd1b11a54ca6511117aac732340156f2361a7e832c
+DIST pelican-4.9.1.gh.tar.gz 1374443 BLAKE2B d9dfa234b0f19cd02ccc8867e5b4f6e0444300692d69001baf23943230f27f8a7bc91e98e5c4c3cd194abadf8fb140c0e1a0c3beb39e5d288113ecc4e487c6a6 SHA512 70b7efd7a38dc2069b1eb9141647fa80bf959de36936ad7b4d38407be7e029fc788ef9b9f297d99e5dc6cad67d58fe6ff97f9b542db7e0a9c23e2907d4604e21
diff --git a/app-text/pelican/files/pelican-4.8.0-sphinx-6.patch b/app-text/pelican/files/pelican-4.8.0-sphinx-6.patch
new file mode 100644
index 000000000000..60302f21a072
--- /dev/null
+++ b/app-text/pelican/files/pelican-4.8.0-sphinx-6.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/889706
+https://github.com/getpelican/pelican/commit/33aca76d78601f0f0da635c8a14c89bbbc9ff8d6
+
+From 33aca76d78601f0f0da635c8a14c89bbbc9ff8d6 Mon Sep 17 00:00:00 2001
+From: Justin Mayer <entroP@gmail.com>
+Date: Mon, 1 Aug 2022 12:36:54 +0200
+Subject: [PATCH] Adjust extlinks configuration for Sphinx 5.0+
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -23,7 +23,7 @@
+ '''.format(last_stable)
+
+ extlinks = {
+- 'pelican-doc': ('https://docs.getpelican.com/%s/', '')
++ 'pelican-doc': ('https://docs.getpelican.com/%s/', '%s')
+ }
+
+ # -- Options for HTML output --------------------------------------------------
+
diff --git a/app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch b/app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch
new file mode 100644
index 000000000000..c7d917cdad6e
--- /dev/null
+++ b/app-text/pelican/files/pelican-4.9.1-no-locales-for-tests.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/863962
+https://git.alpinelinux.org/aports/tree/testing/py3-pelican/no-locales-for-tests.patch
+
+--- a/pelican/tests/support.py
++++ b/pelican/tests/support.py
+@@ -150,15 +150,7 @@
+
+
+ def locale_available(locale_):
+- old_locale = locale.setlocale(locale.LC_TIME)
+-
+- try:
+- locale.setlocale(locale.LC_TIME, str(locale_))
+- except locale.Error:
+- return False
+- else:
+- locale.setlocale(locale.LC_TIME, old_locale)
+- return True
++ return False
+
+
+ def can_symlink():
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index 74329b5b96e9..fd35483237c4 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>djc@gentoo.org</email>
- <name>Dirkjan Ochtman</name>
- </maintainer>
+ <!-- maintainer-needed -->
+ <stabilize-allarches/>
<upstream>
<remote-id type="pypi">pelican</remote-id>
<remote-id type="github">getpelican/pelican</remote-id>
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
deleted file mode 100644
index af10a1759f36..000000000000
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples markdown test"
-
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/six-1.4[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-DOCS=( README.rst )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
- fi
- distutils-r1_python_install_all
-}
-
-python_test() {
- nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.0.0.ebuild b/app-text/pelican/pelican-4.0.0.ebuild
deleted file mode 100644
index fe8645d7688c..000000000000
--- a/app-text/pelican/pelican-4.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples markdown test"
-
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/six-1.4[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
- fi
- distutils-r1_python_install_all
-}
-
-python_test() {
- nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.0.1.ebuild b/app-text/pelican/pelican-4.0.1.ebuild
deleted file mode 100644
index c165da40c9a6..000000000000
--- a/app-text/pelican/pelican-4.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples markdown test"
-
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/six-1.4[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
- fi
- distutils-r1_python_install_all
-}
-
-python_test() {
- nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.8.0.ebuild b/app-text/pelican/pelican-4.8.0.ebuild
new file mode 100644
index 000000000000..9997cceed563
--- /dev/null
+++ b/app-text/pelican/pelican-4.8.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="
+ https://getpelican.com/
+ https://pypi.org/project/pelican/
+"
+SRC_URI="
+ https://github.com/getpelican/pelican/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="doc examples markdown"
+
+RDEPEND="
+ >=dev-python/docutils-0.16[${PYTHON_USEDEP}]
+ >=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+ >=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.6[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-10.1[${PYTHON_USEDEP}]
+ >=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+ test? (
+ >=dev-python/markdown-3.1[${PYTHON_USEDEP}]
+ dev-python/typogrify[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( README.rst )
+
+EPYTEST_DESELECT=(
+ # Needs investigation, we weren't running tests at all before
+ pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
+ pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
+ pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
+)
+
+PATCHES=(
+ "${FILESDIR}"/${P}-sphinx-6.patch
+)
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ if use examples; then
+ docinto /usr/share/doc/${PF}
+ docompress -x /usr/share/doc/${PF}/samples
+ dodoc -r samples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
+}
diff --git a/app-text/pelican/pelican-4.9.0.ebuild b/app-text/pelican/pelican-4.9.0.ebuild
new file mode 100644
index 000000000000..a8ec456458a6
--- /dev/null
+++ b/app-text/pelican/pelican-4.9.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="
+ https://getpelican.com/
+ https://pypi.org/project/pelican/
+"
+SRC_URI="
+ https://github.com/getpelican/pelican/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc examples markdown"
+
+RDEPEND="
+ >=dev-python/docutils-0.20.1[${PYTHON_USEDEP}]
+ >=dev-python/blinker-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/feedgenerator-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ >=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.16.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-13.6.0[${PYTHON_USEDEP}]
+ >=dev-python/unidecode-1.3.7[${PYTHON_USEDEP}]
+ >=dev-python/watchfiles-0.21.0[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+ test? (
+ >=dev-python/markdown-3.1[${PYTHON_USEDEP}]
+ dev-python/typogrify[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( README.rst )
+
+EPYTEST_DESELECT=(
+ # Needs investigation, we weren't running tests at all before
+ pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
+ pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
+ pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
+)
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ if use examples; then
+ docinto /usr/share/doc/${PF}
+ docompress -x /usr/share/doc/${PF}/samples
+ dodoc -r samples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
+}
diff --git a/app-text/pelican/pelican-4.9.1.ebuild b/app-text/pelican/pelican-4.9.1.ebuild
new file mode 100644
index 000000000000..34f7a5915fe5
--- /dev/null
+++ b/app-text/pelican/pelican-4.9.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="
+ https://getpelican.com/
+ https://pypi.org/project/pelican/
+"
+SRC_URI="
+ https://github.com/getpelican/pelican/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc examples markdown"
+
+RDEPEND="
+ >=dev-python/docutils-0.20.1[${PYTHON_USEDEP}]
+ >=dev-python/blinker-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/feedgenerator-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ >=dev-python/ordered-set-4.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.16.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-13.6.0[${PYTHON_USEDEP}]
+ >=dev-python/unidecode-1.3.7[${PYTHON_USEDEP}]
+ >=dev-python/watchfiles-0.21.0[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+ test? (
+ >=dev-python/markdown-3.1[${PYTHON_USEDEP}]
+ dev-python/typogrify[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( README.rst )
+
+# For musl, bug 863962
+PATCHES=( "${FILESDIR}/${PN}-4.9.1-no-locales-for-tests.patch" )
+
+EPYTEST_DESELECT=(
+ # Needs investigation, we weren't running tests at all before
+ pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
+ pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
+ pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
+
+ # For musl, bug 863962
+ # Per Alpine https://git.alpinelinux.org/aports/tree/testing/py3-pelican/APKBUILD
+ pelican/tests/test_contents.py::TestPage::test_datetime
+)
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ if use examples; then
+ docinto /usr/share/doc/${PF}
+ docompress -x /usr/share/doc/${PF}/samples
+ dodoc -r samples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
+}
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
deleted file mode 100644
index 7b7d57344621..000000000000
--- a/app-text/pelican/pelican-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples markdown test"
-# Tests fail for this release but are fixed upstream
-RESTRICT="test"
-
-DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/six-1.4[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- )"
-RDEPEND=""
-
-DOCS=( README.rst )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
- fi
- distutils-r1_python_install_all
-}
-
-python_test() {
- nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch b/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch
new file mode 100644
index 000000000000..724873090c1c
--- /dev/null
+++ b/app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch
@@ -0,0 +1,18 @@
+From: Sam James <sam@gentoo.org>
+Date: Fri, 30 Sep 2022 21:51:17 +0100
+Subject: [PATCH] Fix -Wimplicit-int
+
+Fixes build with Clang 16.
+
+Bug: https://bugs.gentoo.org/871081
+--- a/main.c
++++ b/main.c
+@@ -410,7 +410,7 @@ static void dofile(int eflage)
+
+ /*---( main )---------------------------------------------------------------*/
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ struct stat statbuf;
+ unsigned int statype;
diff --git a/app-text/pep/metadata.xml b/app-text/pep/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/pep/metadata.xml
+++ b/app-text/pep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index f1864940b8b8..6ef0fb385c28 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -1,31 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs flag-o-matic
DESCRIPTION="General purpose filter and file cleaning program"
HOMEPAGE="https://hannemyr.com/enjoy/pep.html"
SRC_URI="https://hannemyr.com/enjoy/${PN}${PV//./}.zip -> ${P}.zip"
+S="${WORKDIR}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-
-# pep does not come with autconf so here's a patch to configure
+# pep does not come with autoconf so here's a patch to configure
# Makefile with the correct path
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-include.patch
+ "${FILESDIR}"/${P}-Fix-Wimplicit-int.patch
)
src_prepare() {
default
+
# Darwin lacks stricmp and DIRCHAR
if [[ ${CHOST} == *-darwin* ]] ; then
sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile || die
@@ -35,7 +36,7 @@ src_prepare() {
src_compile() {
# make man page too
- make Doc/pep.1 || die "make man page failed"
+ emake Doc/pep.1
emake CC="$(tc-getCC)"
}
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index f6fcb600816c..5d4d910667e1 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1,2 +1 @@
-DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
diff --git a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch b/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch
deleted file mode 100644
index 0835d166932e..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -758,6 +758,7 @@
- tmpfilename = tmpfilename2; /* later we will refere only to tmp2 */
- }
-
-+ clearfilenameprefix();
- for (i = -1; i < infopathcount; i++) /* go through all paths */
- {
- if (i == -1)
diff --git a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
deleted file mode 100644
index 7a282f354baa..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -742,7 +742,7 @@
- int i, j;
- char *tmpfilename;
-
-- if (strncmp(filename, "dir", 3) == 0)
-+ if (strncmp(filename, "dir", 3) == 0 && !isalnum(filename[3]))
- {
- xfree(buf);
- return opendirfile(number);
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
deleted file mode 100644
index d73ad947c7df..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/initializelinks.c
-+++ b/src/initializelinks.c
-@@ -75,7 +75,7 @@
- * checks if an item belongs to tag table. returns 1 on success and 0 on
- * failure. It should be optimised...
- */
--inline int
-+int
- exists_in_tag_table(char *item)
- {
- if (gettagtablepos(item) != -1)
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -554,7 +554,7 @@
- return 1;
- }
-
--inline void
-+void
- buildcommand(char *dest, char *command, char *filename, const char *tmpfilename)
- {
- strcpy(dest, command);
-@@ -564,7 +564,7 @@
- strcat(dest, tmpfilename);
- }
-
--inline void
-+void
- builddircommand(char *dest, char *command, char *filename, const char *tmpfilename)
- {
- strcpy(dest, command);
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -193,7 +193,7 @@
- return value;
- }
-
--inline void
-+void
- initlocale()
- {
- #ifdef ___DEBUG___
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch b/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch
deleted file mode 100644
index 6679e51acb20..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -9,6 +9,7 @@
- "PO-Revision-Date: 2005-10-11 16:59+0200\n"
- "Last-Translator: Katarina Machalkova <bubli@bubli.org>\n"
- "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-+"Language: cs\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/de.po
-+++ b/po/de.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 1999-04-21 01:50+0200\n"
- "Last-Translator: René van Bevern <rvb@pro-linux.de>\n"
- "Language-Team: German <de@li.org>\n"
-+"Language: de\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -12,6 +12,7 @@
- "PO-Revision-Date: 2005-09-28 23:14+0200\n"
- "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
- "Language-Team: librezale.org <librezale@librezale.org>\n"
-+"Language: eu\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/ja.po
-+++ b/po/ja.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2001-11-21 17:42+0900\n"
- "Last-Translator: Masayuki Hatta <mhatta@gnu.org>\n"
- "Language-Team: Japanese <ja@li.org>\n"
-+"Language: ja\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=euc-jp\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/nl.po
-+++ b/po/nl.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-09-01 21:21+0200\n"
- "Last-Translator: Bas Zoetekouw <bas@debian.org>\n"
- "Language-Team: Dutch <nl@li.org>\n"
-+"Language: nl\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -10,6 +10,7 @@
- "PO-Revision-Date: 2005-09-29 21:59+0200\n"
- "Last-Translator: Krzysztof Krzy¿aniak (eloy) <eloy@debian.org>\n"
- "Language-Team:\n"
-+"Language: pl\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -13,6 +13,7 @@
- "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
- "org>\n"
- "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-+"Language: pt_BR\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/ro.po
-+++ b/po/ro.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-09-30 03:42+0300\n"
- "Last-Translator: Eddy Petrisor <eddy.petrisor@gmail.com>\n"
- "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
-+"Language: ro\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-10-01 10:47+0400\n"
- "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
- "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-+"Language: ru\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-10-06 12:00+0200\n"
- "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
- "Language-Team: Swedish <sv@li.org>\n"
-+"Language: sv\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
---- a/po/vi.po
-+++ b/po/vi.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2005-12-21 15:11+1030\n"
- "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
- "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
-+"Language: vi\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
deleted file mode 100644
index 45be53cd1bf6..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -96,11 +96,14 @@ matchfile(char **buf, char *name)
- {
- /* use strcat rather than strdup, because xmalloc handles all
- * malloc errors */
-- char *thisfile = xmalloc(strlen(dp->d_name)+1);
-+ int len = strlen(dp->d_name)+1;
-+ char *thisfile = xmalloc(len * 2);
-+ char *thisfile_info = thisfile + len;
- strcat(thisfile, dp->d_name);
-
- /* strip suffixes (so "gcc.info.gz" -> "gcc") */
- strip_compression_suffix(thisfile);
-+ strcat(thisfile_info, thisfile);
- strip_info_suffix(thisfile);
-
- /* compare this file with the file we're looking for */
-@@ -109,8 +112,7 @@ matchfile(char **buf, char *name)
- /* we found a match! */
- matched++;
- /* put it in the buffer */
-- strncat(Buf, thisfile, 1023-strlen(Buf));
-- strncat(Buf, ".info", 1023-strlen(Buf));
-+ strncat(Buf, thisfile_info, 1023-strlen(Buf));
-
- /* clean up, and exit the loop */
- xfree(thisfile);
diff --git a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch b/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch
deleted file mode 100644
index 6e9d4954792a..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-do not redefine the basename that the C library provides
-
---- a/src/filehandling_functions.c
-+++ b/src/filehandling_functions.c
-@@ -31,7 +31,6 @@ typedef struct
- }
- Suffixes;
-
--char * basename(char *filename);
-
-
- /******************************************************************************
-@@ -713,20 +712,6 @@ opendirfile(int number)
- return NULL;
- }
-
--char *
--basename(char *filename)
--{
-- int len = strlen(filename);
-- char *a = filename + len;
-- while (a > filename)
-- {
-- a--;
-- if (*a == '/')
-- return a + 1;
-- }
-- return filename; /* when it was a basename */
--}
--
- /*
- * Note: openinfo is a function for reading info files, and putting
- * uncompressed content into a temporary filename. For a flexibility, there
diff --git a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch b/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch
deleted file mode 100644
index a5f14c593f44..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-curses_wchar is set to true/false, so trying to assign it to the compiler
-flags variable makes no sense. it's already been set up the right value
-at this point, so delete the assignment.
-
---- a/macros/curses.m4
-+++ b/macros/curses.m4
-@@ -130,7 +130,6 @@ AC_DEFUN([AC_CHECK_CURSES],[
- else
- AC_DEFINE(CURSES_WCHAR)
- CURSES_WCHAR=true
-- CURSES_FLAGS=$curses_wchar
- AC_SUBST(CURSES_FLAGS)
- fi
-
diff --git a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
deleted file mode 100644
index bbb6ecfe421d..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -118,7 +118,24 @@
-
-
- # curses
-+PKG_CHECK_MODULES(ncursesw,ncursesw,[
-+ curses_includes="$ncursesw_CFLAGS"
-+ curses_libs="$ncursesw_LIBS"
-+ curses_h=ncurses.h
-+ stop_searching=true
-+ found_curses_h=true
-+ USE_CURSES=true],[
-+ PKG_CHECK_MODULES(ncurses,ncurses,[
-+ curses_includes="$ncurses_CFLAGS"
-+ curses_libs="$ncurses_LIBS"
-+ curses_h=ncurses.h
-+ stop_searching=true
-+ found_curses_h=true
-+ USE_CURSES=true],
-+ [])])
-+
- AC_CHECK_CURSES
-+
- if ! test "x$USE_CURSES" = "xtrue"; then
- AC_MSG_ERROR([Curses not found. You need curses to compile pinfo])
- fi
---- a/macros/curses.m4
-+++ b/macros/curses.m4
-@@ -175,8 +175,8 @@
- AC_DEFUN([AC_SEARCH_CURSES_H], [
- AC_MSG_CHECKING([location of curses.h file])
-
-- stop_searching=false
-- found_curses_h=false
-+# stop_searching=false
-+# found_curses_h=false
-
- dnl if a particular location was specified
- if test "x$curses_location" != "xfalse"
diff --git a/app-text/pinfo/files/pinfo-0.6.10-version.patch b/app-text/pinfo/files/pinfo-0.6.10-version.patch
deleted file mode 100644
index 8038fe0879e8..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.10-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/pinfo.texi 2006-03-16 16:40:41.000000000 +0100
-+++ b/doc/pinfo.texi 2010-06-18 16:20:24.000000000 +0200
-@@ -5,7 +5,7 @@
- @c %**end of header
-
- @set EDITION 0.2.1
--@set VERSION 0.6.4
-+@set VERSION 0.6.10
- @set DATE 1 Dec 2001
- @set DATEMAN 21 Mar 1999
-
diff --git a/app-text/pinfo/files/pinfo-0.6.13-fno-common.patch b/app-text/pinfo/files/pinfo-0.6.13-fno-common.patch
new file mode 100644
index 000000000000..676cd4b09d37
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.13-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/parse_config.h
++++ b/src/parse_config.h
+@@ -85,8 +85,6 @@
+ colours;
+ #endif /* HAVE_CURSES_COLOR */
+
+-int use_manual;
+-
+ int parse_config (void);
+ int parse_line (char *line);
+ char *str_toupper (char *s);
diff --git a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
deleted file mode 100644
index 85a80e6f2602..000000000000
--- a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/macros/curses.m4
-+++ b/macros/curses.m4
-@@ -257,8 +257,8 @@
- dnl save CFLAGS and LDFLAGS and set new ones
- CFLAGS_OLD=$CFLAGS
- CFLAGS="$CFLAGS $curses_includes"
-- LDFLAGS_OLD=$LDFLAGS
-- LDFLAGS="$LDFLAGS $curses_libs"
-+ LIBS_OLD=$LIBS
-+ LIBS="$LIBS $curses_libs"
-
- dnl do the compile test
- AC_MSG_CHECKING([if curses is usable])
-@@ -288,7 +288,7 @@
-
- dnl restore variables
- CFLAGS=$CFLAGS_OLD
-- LDFLAGS=$LDFLAGS_OLD
-+ LIBS=$LIBS_OLD
-
- ])
-
diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml
index ece6b81bfbdf..274f2314308e 100644
--- a/app-text/pinfo/metadata.xml
+++ b/app-text/pinfo/metadata.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>jer@gentoo.org</email>
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">baszoetekouw/pinfo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
deleted file mode 100644
index ddab3ae23eab..000000000000
--- a/app-text/pinfo/pinfo-0.6.10-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="http://pinfo.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="nls readline"
-
-RDEPEND="sys-libs/ncurses:0=
- sys-libs/readline:0=
- nls? ( virtual/libintl )
-"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/bison
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.6.9-as-needed.patch \
- "${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch \
- "${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch \
- "${FILESDIR}"/${PN}-0.6.10-version.patch \
- "${FILESDIR}"/${PN}-0.6.10-info-suffix.patch \
- "${FILESDIR}"/${PN}-0.6.10-dir-file.patch \
- "${FILESDIR}"/${PN}-0.6.10-tinfo.patch \
- "${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch \
- "${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch \
- "${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
-
- eautoreconf
-
- append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
-}
-
-src_configure() {
- econf \
- $(use_with readline) \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" sysconfdir=/etc install
-}
diff --git a/app-text/pinfo/pinfo-0.6.10-r7.ebuild b/app-text/pinfo/pinfo-0.6.10-r7.ebuild
deleted file mode 100644
index dc0428966984..000000000000
--- a/app-text/pinfo/pinfo-0.6.10-r7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="http://pinfo.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nls readline"
-
-RDEPEND="
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- nls? ( virtual/libintl )
-"
-
-DEPEND="
- ${RDEPEND}
- sys-apps/texinfo
- sys-devel/bison
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.9-as-needed.patch
- "${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
- "${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
- "${FILESDIR}"/${PN}-0.6.10-version.patch
- "${FILESDIR}"/${PN}-0.6.10-info-suffix.patch
- "${FILESDIR}"/${PN}-0.6.10-dir-file.patch
- "${FILESDIR}"/${PN}-0.6.10-tinfo.patch
- "${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch
- "${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
- "${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
- "${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
- "${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-
- append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
-}
-
-src_configure() {
- econf \
- $(use_with readline) \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install
-}
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 70e4f9f8e0c8..12df4b647966 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,11 +6,11 @@ inherit autotools flag-o-matic
DESCRIPTION="Hypertext info and man viewer based on (n)curses"
HOMEPAGE="https://github.com/baszoetekouw/pinfo"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="nls readline"
RDEPEND="
@@ -22,21 +22,27 @@ RDEPEND="
DEPEND="
${RDEPEND}
sys-apps/texinfo
- sys-devel/bison
+ app-alternatives/yacc
virtual/pkgconfig
nls? ( sys-devel/gettext )
"
PATCHES=(
"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
+ "${FILESDIR}"/${PN}-0.6.13-fno-common.patch
)
src_prepare() {
default
+
+ sed -i -e 's| -Werror||g' configure.ac || die
+
eautoreconf
}
src_configure() {
+ # The following line can be dropped once https://github.com/baszoetekouw/pinfo/pull/35
+ # is merged.
append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
econf \
diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild
deleted file mode 100644
index 961b78a24b48..000000000000
--- a/app-text/pinfo/pinfo-99999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic git-r3
-
-DESCRIPTION="Hypertext info and man viewer based on (n)curses"
-HOMEPAGE="https://github.com/baszoetekouw/pinfo"
-EGIT_REPO_URI="${HOMEPAGE}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls readline"
-
-RDEPEND="
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- nls? ( virtual/libintl )
-"
-
-DEPEND="
- ${RDEPEND}
- sys-apps/texinfo
- sys-devel/bison
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
- "${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
-
- econf \
- $(use_with readline) \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" sysconfdir="${EPREFIX}/etc" install
-}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index cdaaf5c85685..6060bd9aa55e 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,3 +1,3 @@
-DIST po4a-0.54.tar.gz 2686485 BLAKE2B f33f1e27bd24e4429ef8edbdd999333714e9a50e4af2c60ccffec91098bf330776c4ee9de9b6d4cdb459b67a26a1a6e4b8a0ead7efa82fe97584405a15245ef4 SHA512 5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130
-DIST po4a-0.55.tar.gz 2892158 BLAKE2B 606236a4bc143d4a5cc003f7dfaf59f605017478fc7ab3fc66af5eed078a8bb0744690b7191cd2ee0b795229e766145ed47545484e3d20e6a14ae1ac0981772a SHA512 95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599
-DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
+DIST po4a-0.69.tar.gz 4665710 BLAKE2B 2fc1b6cd53f1b282f20cd4932de7f5d6d9882de9f50181f0de89995c9d9b79b5fd2bc53d3757c56c519478e67ac636deb5a011cc8810a002b6bb6dabdb44442b SHA512 9cb5eec547ab18d1c3ebdda212b909fc4f5489a74641ba2d7e0a3a1d060f245d23667c16e687c678c5ccc3809c9315d20673266dcc3764172a899caa397238e3
+DIST po4a-0.70.tar.gz 4832825 BLAKE2B 2cf103cf95860855c8cd3e6090a75fce0791a58badc3a5bae0563c4d9b063af984fda1de5566d61caa23766ebddb66f8fb0a4701bfbc6fe2aafdf2bab292ef26 SHA512 2f12d9b9214b08bb7dd2d864016063845f397d7b71c1aa2292c1da1b71f1ec435cfae527032f4d6610d15d1a6ea40e35165dcba007b75cab635dd722cbc05139
+DIST po4a-0.71.tar.gz 4860322 BLAKE2B 8a5d1f8dd17b435bf1ada91b4c49862eed97775c574d2972d749f6126eb5f654cc4f8a1def3d4b9ddf50f86c8d02e4f328cbb0406eb91e5224e9373c2063441e SHA512 67ba925433d95ebd6675ce2e58b2664a07a00016ca4b5029845e485dfad1804737a00935e2da162e2488e4c21b947e7fa32b40ac3d9b28d4729d8f93c3f2040b
diff --git a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
deleted file mode 100644
index 226fa0e9b6e2..000000000000
--- a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Tue, 13 Jun 2017 21:10:34 +1200
-Subject: [PATCH] Fix broken use of lib '.'
-
- "'.'" is not "."
-
-Bug: https://bugs.gentoo.org/614122
----
- Build.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build.PL b/Build.PL
-index 43c6f80..9ee443b 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -1,6 +1,6 @@
- #!/usr/bin/perl
-
--use lib q('.');
-+use lib q(.);
- use Po4aBuilder;
-
- my $build = Po4aBuilder->new
---
-2.13.1
-
diff --git a/app-text/po4a/files/po4a-0.69-man.patch b/app-text/po4a/files/po4a-0.69-man.patch
new file mode 100644
index 000000000000..02cedf7f1ade
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.69-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -234,7 +234,6 @@
+ }
+ $parser->parse_from_file ($file, $out);
+
+- system("gzip -9 -n -f $out") and die;
+ unlink "$file" || die;
+ }
+
+@@ -253,7 +252,6 @@
+ print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+ }
+- system ("gzip -9 -n -f $outdir/$outfile.$section") and die;
+ }
+ unlink "$file" || die;
+ }
diff --git a/app-text/po4a/files/po4a-man.patch b/app-text/po4a/files/po4a-man.patch
index 6dd94aed153d..b166887283cb 100644
--- a/app-text/po4a/files/po4a-man.patch
+++ b/app-text/po4a/files/po4a-man.patch
@@ -1,18 +1,18 @@
--- a/Po4aBuilder.pm
+++ b/Po4aBuilder.pm
-@@ -233,7 +233,6 @@
+@@ -242,7 +242,6 @@
}
- $parser->parse_from_file ($file, $out);
+ $parser->parse_from_file( $file, $out );
-- system("gzip -9 -f $out") and die;
+- system("gzip -9 -n -f $out") and die;
unlink "$file" || die;
}
-@@ -245,7 +244,6 @@
- if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
- my ($outdir, $section, $outfile) = ($1, $2, $3);
- system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-- system ("gzip -9 -f $outdir/$outfile.$section") and die;
+@@ -264,7 +263,6 @@
+ print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ system("xsltproc -o $outdir/$outfile.$section --nonet $docbook_xsl_url $file") and die;
+ }
+- system("gzip -9 -n -f $outdir/$outfile.$section") and die;
+ }
+ unlink "$file" || die;
}
- unlink "$file" || die;
- }
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
index c1b8da0d8d0e..1a6ce2f18736 100644
--- a/app-text/po4a/metadata.xml
+++ b/app-text/po4a/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
deleted file mode 100644
index 03f447d5d513..000000000000
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-PLOCALES_BACKUP="en"
-
-inherit perl-module l10n
-
-DESCRIPTION="Tools for helping translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="app-text/openjade
- dev-libs/libxslt
- dev-perl/Locale-gettext
- dev-perl/SGMLSpm
- dev-perl/TermReadKey
- dev-perl/Text-WrapI18N
- sys-devel/gettext"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-perl/Module-Build
- test? (
- app-text/docbook-sgml-dtd:4.1
- virtual/tex-base
- )"
-
-# Running tests in parallel fails
-DIST_TEST="do"
-
-PATCHES=(
- # Fix bad escaping of '.' in @INC modification
- "${FILESDIR}"/${PN}-0.45-614122-no-dot-inc.patch
- "${FILESDIR}"/${PN}-man.patch
-)
-
-src_prepare() {
- # Check against locale files in ${S}/pod/bin for mismatches
- # with languages listed in PLOCALES
- local locales_path="${S}/po/bin"
- l10n_find_plocales_changes "${locales_path}" "" ".po"
-
- # Get rid of disabled locales
- my_get_disabled_locales() {
- PERL_RM_FILES=( "${PERL_RM_FILES[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
- }
-
- l10n_for_each_disabled_locale_do my_get_disabled_locales
-
- einfo "Your LINGUAS lists the following languages: ${LINGUAS}"
-
- perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.54.ebuild b/app-text/po4a/po4a-0.54.ebuild
deleted file mode 100644
index b457c515610b..000000000000
--- a/app-text/po4a/po4a-0.54.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-
-inherit perl-module l10n
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="app-text/opensp
- dev-libs/libxslt
- dev-perl/Locale-gettext
- dev-perl/SGMLSpm
- dev-perl/TermReadKey
- dev-perl/Text-WrapI18N
- dev-perl/Unicode-LineBreak
- dev-perl/YAML-Tiny
- sys-devel/gettext"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-perl/Module-Build
- test? (
- app-text/docbook-sgml-dtd:4.1
- virtual/tex-base
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-PERL_RM_FILES=(
- t/09-html.t
-)
-DIST_TEST="do"
-
-src_prepare() {
- l10n_find_plocales_changes "${S}/po/bin" '' '.po'
-
- rm_locale() {
- PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
- }
- l10n_for_each_disabled_locale_do rm_locale
-
- perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.55.ebuild b/app-text/po4a/po4a-0.55.ebuild
deleted file mode 100644
index 0fe06ed676c8..000000000000
--- a/app-text/po4a/po4a-0.55.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-
-inherit perl-module l10n
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="app-text/opensp
- dev-libs/libxslt
- dev-perl/Locale-gettext
- dev-perl/SGMLSpm
- dev-perl/TermReadKey
- dev-perl/Text-WrapI18N
- dev-perl/Unicode-LineBreak
- dev-perl/YAML-Tiny
- sys-devel/gettext"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-perl/Module-Build
- test? (
- app-text/docbook-sgml-dtd:4.1
- virtual/latex-base
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-PERL_RM_FILES=(
- t/09-html.t
-)
-DIST_TEST="do"
-
-src_prepare() {
- l10n_find_plocales_changes "${S}/po/bin" '' '.po'
-
- rm_locale() {
- PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
- }
- l10n_for_each_disabled_locale_do rm_locale
-
- perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.69.ebuild b/app-text/po4a/po4a-0.69.ebuild
new file mode 100644
index 000000000000..d45251ad5468
--- /dev/null
+++ b/app-text/po4a/po4a-0.69.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+ dev-libs/libxslt
+ dev-perl/Locale-gettext
+ dev-perl/Pod-Parser
+ dev-perl/SGMLSpm
+ dev-perl/Syntax-Keyword-Try
+ dev-perl/TermReadKey
+ dev-perl/Text-WrapI18N
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xsl-stylesheets
+ dev-perl/Module-Build
+ sys-devel/gettext
+ test? (
+ app-text/docbook-sgml-dtd:4.1
+ dev-perl/Test-Pod
+ virtual/latex-base
+ )"
+
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+ plocale_find_changes "${S}/po/bin" '' '.po'
+
+ rm_locale() {
+ PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+ }
+ plocale_for_each_disabled_locale rm_locale
+
+ perl-module_src_prepare
+}
diff --git a/app-text/po4a/po4a-0.70.ebuild b/app-text/po4a/po4a-0.70.ebuild
new file mode 100644
index 000000000000..5b80c728dbb4
--- /dev/null
+++ b/app-text/po4a/po4a-0.70.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/files/14077820/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+ dev-libs/libxslt
+ dev-perl/Locale-gettext
+ dev-perl/Pod-Parser
+ dev-perl/SGMLSpm
+ dev-perl/Syntax-Keyword-Try
+ dev-perl/TermReadKey
+ dev-perl/Text-WrapI18N
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xsl-stylesheets
+ dev-perl/Module-Build
+ sys-devel/gettext
+ test? (
+ app-text/docbook-sgml-dtd:4.1
+ dev-perl/Test-Pod
+ virtual/latex-base
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+ plocale_find_changes "${S}/po/bin" '' '.po'
+
+ rm_locale() {
+ PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+ }
+ plocale_for_each_disabled_locale rm_locale
+
+ perl-module_src_prepare
+}
diff --git a/app-text/po4a/po4a-0.71.ebuild b/app-text/po4a/po4a-0.71.ebuild
new file mode 100644
index 000000000000..397bab6b1bee
--- /dev/null
+++ b/app-text/po4a/po4a-0.71.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja ka kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_Hans zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+ dev-libs/libxslt
+ dev-perl/Locale-gettext
+ dev-perl/Pod-Parser
+ dev-perl/SGMLSpm
+ dev-perl/Syntax-Keyword-Try
+ dev-perl/TermReadKey
+ dev-perl/Text-WrapI18N
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xsl-stylesheets
+ dev-perl/Module-Build
+ sys-devel/gettext
+ test? (
+ app-text/docbook-sgml-dtd:4.1
+ dev-perl/Test-Pod
+ virtual/latex-base
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+ plocale_find_changes "${S}/po/bin" '' '.po'
+
+ rm_locale() {
+ PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+ }
+ plocale_for_each_disabled_locale rm_locale
+
+ perl-module_src_prepare
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 8ba7817a349c..ca377eb20e35 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,3 +1,5 @@
-DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
-DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
-DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
+DIST podofo-0.10.1-test-resources.tar.gz 4228392 BLAKE2B 95526d145a18976d5b9f782dfcac15e17bc4ef20a22ca5892905a19193ad88c2855cb8551886754c334f6ca666b9b74fe9a3b5c89ce774fa24e579f563be57c6 SHA512 4cb33e5a6050ef745cda42b7fdf53fee9f45d4d488555b79c9cdd6680c5265065aac92ad3d72ea0b75eee9a73098f920a3dd61b7728db6d2171888cbc83c6d55
+DIST podofo-0.10.1.tar.gz 1690279 BLAKE2B 0fc161c467ffce07c1b2cb1a2124ffddc6c18189b5c8b31dc1212921637601a667cd2b0d6f1269214bd0fe47e8853367283e3053813d45aed01589f0dfb1c29b SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9
+DIST podofo-0.10.3.tar.gz 1691469 BLAKE2B 986b5e8d5d8d77a21e38b99a08ad0d898c375695072a9795c57715049da2ecb8c15dd8717e5939a37fa94a8b48424b1f7a037fc452f0fde9856e9a840e350913 SHA512 80fa86ff7f256a69b963451ef741e49c56447084b26481e52d1a079940102b5d51d9ff1c43952bba22bae61d95c8c44eacc08f55cd18999aec6c563f615b2cf5
+DIST podofo-0.9.8-bug-888463.patch 1269 BLAKE2B 632e9326112eecb484a15a532fc218263eab081acaf2af2bc1cc3d1020347846ce9ce82147d9d2fa9b42d690270b01b68eaf621cfbbdcfce041b8d651754c08e SHA512 9b0764d8697fad57107647a620f6dbe5d8025628faf02b1d6839d3f975216b16a58ccc115f58809aa4e31fb6b4b487b1490eedf468ddc8b90e494f68d8e50dc6
+DIST podofo-0.9.8.tar.gz 1012918 BLAKE2B 5d343128bcf06dbb8ef1d70b32f580a800726c33e4c14c86a6c7df0278a34b2d96cba7975c00d32e792596ca3cb54fa66fee262b49a240cd52e31646947b943e SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
diff --git a/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch
new file mode 100644
index 000000000000..45edd8454dfb
--- /dev/null
+++ b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch
@@ -0,0 +1,37 @@
+https://github.com/podofo/podofo/commit/da91101b7afafa958669e11d0cabaeee3ff50b39
+
+From da91101b7afafa958669e11d0cabaeee3ff50b39 Mon Sep 17 00:00:00 2001
+From: Francesco Pretto <ceztko@gmail.com>
+Date: Fri, 27 Oct 2023 23:41:22 +0200
+Subject: [PATCH] [FIX] ColorTest: Fixed test under linux when compiled with
+ -march=x86-64-v3
+
+Floating point contractions may cause some level of non determinsm when comparing the result of fp operations . See
+https://stackoverflow.com/questions/62353629/does-the-same-floating-point-calculation-producing-different-results-when-perfor
+
+Fixes #103
+---
+ test/unit/ColorTest.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/test/unit/ColorTest.cpp b/test/unit/ColorTest.cpp
+index 419052a7..81f99c5b 100644
+--- a/test/unit/ColorTest.cpp
++++ b/test/unit/ColorTest.cpp
+@@ -426,7 +426,12 @@ TEST_CASE("testCMYKConstructor")
+ double dGreen = M_VALUE * (1.0 - B_VALUE) + B_VALUE;
+ double dBlue = Y_VALUE * (1.0 - B_VALUE) + B_VALUE;
+
+- REQUIRE(color.ConvertToRGB() == PdfColor(1.0 - dRed, 1.0 - dGreen, 1.0 - dBlue));
++ auto rgb1 = color.ConvertToRGB();
++ PdfColor rgb2(1.0 - dRed, 1.0 - dGreen, 1.0 - dBlue);
++
++ ASSERT_EQUAL(rgb1.GetRed(), rgb2.GetRed());
++ ASSERT_EQUAL(rgb1.GetGreen(), rgb2.GetGreen());
++ ASSERT_EQUAL(rgb1.GetBlue(), rgb2.GetBlue());
+ }
+
+ REQUIRE(color.ConvertToCMYK() == PdfColor(C_VALUE, M_VALUE, Y_VALUE, B_VALUE));
+--
+2.41.0
+
diff --git a/app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch b/app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch
new file mode 100644
index 000000000000..f178ae2a6c0c
--- /dev/null
+++ b/app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch
@@ -0,0 +1,15 @@
+Switch from the non-standard upstream CMake Lua module to the one bundled
+with CMake, use only the Lua version requested by the ebuild, and do not
+semi-quietly ignore the absence of Lua.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -433,7 +433,7 @@
+ ENDIF(WANT_FONTCONFIG)
+
+ IF(NOT PODOFO_BUILD_LIB_ONLY)
+-FIND_PACKAGE(LUA)
++FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED)
+ IF(LUA_FOUND)
+ # If we have lua, we can build podofoimpose.
+ MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
diff --git a/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch b/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch
deleted file mode 100644
index 2b25dc7b6856..000000000000
--- a/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 85e66b066de98f38e0430428906d5cf5396876a0 Mon Sep 17 00:00:00 2001
-From: Michelangelo Scopelliti <kernelpanic@gmx.it>
-Date: Thu, 23 Nov 2017 12:29:36 +0000
-Subject: [PATCH] Fix to compile with libressl (does not have OPENSSL_init_ssl)
-
-Bug: https://bugs.gentoo.org/635890
----
- tools/podofosign/podofosign.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp
-index a7be1e5..5c9d146 100644
---- a/tools/podofosign/podofosign.cpp
-+++ b/tools/podofosign/podofosign.cpp
-@@ -875,7 +875,7 @@ int main( int argc, char* argv[] )
- outputfile = NULL;
- }
-
--#ifdef PODOFO_HAVE_OPENSSL_1_1
-+#if defined (PODOFO_HAVE_OPENSSL_1_1) && !defined (LIBRESSL_VERSION_NUMBER)
- OPENSSL_init_ssl(0, NULL);
- #else
- OpenSSL_add_all_algorithms();
---
-2.13.6
-
diff --git a/app-text/podofo/metadata.xml b/app-text/podofo/metadata.xml
index 0a2bfbe2da96..c274503a81d6 100644
--- a/app-text/podofo/metadata.xml
+++ b/app-text/podofo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
@@ -11,7 +11,7 @@
</flag>
</use>
<upstream>
+ <remote-id type="github">podofo/podofo</remote-id>
<remote-id type="sourceforge">podofo</remote-id>
- <changelog>https://sourceforge.net/p/podofo/code/commit_browser</changelog>
</upstream>
</pkgmetadata>
diff --git a/app-text/podofo/podofo-0.10.1-r1.ebuild b/app-text/podofo/podofo-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..03852080e471
--- /dev/null
+++ b/app-text/podofo/podofo-0.10.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://github.com/podofo/podofo"
+# testsuite resources require separate download. Reported at https://github.com/podofo/podofo/issues/102
+SRC_URI="https://github.com/podofo/podofo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://github.com/podofo/podofo-resources/archive/4afe5c3fdb543a4347681b2e52252f1b10f12f24.tar.gz
+ -> ${P}-test-resources.tar.gz
+ )
+"
+
+LICENSE="LGPL-2+ tools? ( GPL-2+ )"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="idn jpeg tiff png fontconfig test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ idn? ( net-dns/libidn:= )
+ dev-libs/openssl:=
+ fontconfig? ( media-libs/fontconfig:= )
+ media-libs/freetype:2=
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
+ dev-libs/libxml2
+ tiff? ( media-libs/tiff:= )
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( fontconfig? ( media-fonts/liberation-fonts ) )
+"
+
+PATCHES=(
+ # Dome optimizations cause testsuite failures due to floating point
+ # contraction. Fixed upstream by adding tolerance to the test itself:
+ # https://github.com/podofo/podofo/issues/103
+ "${FILESDIR}"/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+ if use test; then
+ rmdir extern/resources || die
+ mv "${WORKDIR}"/podofo-resources-4afe5c3fdb543a4347681b2e52252f1b10f12f24 extern/resources || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPODOFO_BUILD_TEST=$(usex test ON OFF)
+ -DPODOFO_BUILD_TOOLS=$(usex tools ON OFF)
+ $(cmake_use_find_package idn Libidn)
+ $(cmake_use_find_package jpeg JPEG)
+ $(cmake_use_find_package tiff TIFF)
+ $(cmake_use_find_package png PNG)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ $(usev !png 'TestImage3')
+ $(usev !jpeg 'TestImage2 TestImage4 TestImage5')
+ # relies on finding arial font
+ $(usev !fontconfig 'testLoadEncrypedFilePdfMemDocument testLoadEncrypedFilePdfParser testCyclicTree testNestedArrayTree testEmptyKidsTree testNestedArrayTree testCreateDelete')
+ )
+
+ cmake_src_test
+}
diff --git a/app-text/podofo/podofo-0.10.3.ebuild b/app-text/podofo/podofo-0.10.3.ebuild
new file mode 100644
index 000000000000..d6b9e345c362
--- /dev/null
+++ b/app-text/podofo/podofo-0.10.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://github.com/podofo/podofo"
+# testsuite resources require separate download. Reported at https://github.com/podofo/podofo/issues/102
+SRC_URI="https://github.com/podofo/podofo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://github.com/podofo/podofo-resources/archive/4afe5c3fdb543a4347681b2e52252f1b10f12f24.tar.gz
+ -> podofo-0.10.1-test-resources.tar.gz
+ )
+"
+
+LICENSE="LGPL-2+ tools? ( GPL-2+ )"
+SLOT="0/2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="idn jpeg tiff png fontconfig test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ idn? ( net-dns/libidn:= )
+ dev-libs/openssl:=
+ fontconfig? ( media-libs/fontconfig:= )
+ media-libs/freetype:2=
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
+ dev-libs/libxml2
+ tiff? ( media-libs/tiff:= )
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( fontconfig? ( media-fonts/liberation-fonts ) )
+"
+
+src_prepare() {
+ cmake_src_prepare
+ if use test; then
+ rmdir extern/resources || die
+ mv "${WORKDIR}"/podofo-resources-4afe5c3fdb543a4347681b2e52252f1b10f12f24 extern/resources || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPODOFO_BUILD_TEST=$(usex test ON OFF)
+ -DPODOFO_BUILD_TOOLS=$(usex tools ON OFF)
+ $(cmake_use_find_package idn Libidn)
+ $(cmake_use_find_package jpeg JPEG)
+ $(cmake_use_find_package tiff TIFF)
+ $(cmake_use_find_package png PNG)
+ $(cmake_use_find_package fontconfig Fontconfig)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ $(usev !png 'TestImage3')
+ $(usev !jpeg 'TestImage2 TestImage4 TestImage5')
+ # relies on finding arial font
+ $(usev !fontconfig 'testLoadEncrypedFilePdfMemDocument testLoadEncrypedFilePdfParser testCyclicTree testNestedArrayTree testEmptyKidsTree testNestedArrayTree testCreateDelete')
+ )
+
+ cmake_src_test
+}
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
deleted file mode 100644
index afde927a0cf1..000000000000
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV%_*}"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
-IUSE="+boost idn libressl debug test +tools"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:=
- idn? ( net-dns/libidn:= )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- media-libs/fontconfig:=
- media-libs/freetype:2=
- virtual/jpeg:0=
- media-libs/libpng:0=
- media-libs/tiff:0=
- sys-libs/zlib:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- boost? ( dev-util/boost-build )
- test? ( dev-util/cppunit )"
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
- cmake-utils_src_prepare
- local x sed_args
-
- if use libressl; then
- sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
- -i tools/podofosign/podofosign.cpp || die #663602
- fi
-
- # bug 620934 - Disable linking with cppunit when possible, since it
- # triggers errors with some older compilers.
- use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
- # bug 556962
- sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
- test/unit/EncryptTest.cpp || die
-
- sed -i \
- -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
- -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
- CMakeLists.txt || die
-
- # Use pkg-config to find headers for bug #459404.
- sed_args=
- for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
- [[ ${x} == -I* ]] || continue
- x=${x#-I}
- if [[ -f ${x}/ft2build.h ]] ; then
- sed_args+=" -e s:/usr/include/\\r\$:${x}:"
- elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
- sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
- fi
- done
- [[ -n ${sed_args} ]] && \
- { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
- # Bug #439784: Add missing unistd include for close() and unlink().
- sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
- test/unit/TestUtils.cpp || die
-
- # TODO: fix these test cases
- # ColorTest.cpp:62:Assertion
- # Test name: ColorTest::testDefaultConstructor
- # expected exception not thrown
- # - Expected: PdfError
- sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
- -i test/unit/ColorTest.h || die
-
- # ColorTest.cpp:42:Assertion
- # Test name: ColorTest::testHexNames
- # assertion failed
- # - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
- sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
- -i test/unit/ColorTest.h || die
-
- # Bug #352125: test failure, depending on installed fonts
- # ##Failure Location unknown## : Error
- # Test name: FontTest::testFonts
- # uncaught exception of type PoDoFo::PdfError
- # - ePdfError_UnsupportedFontFormat
- sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
- -i test/unit/FontTest.h || die
-
- # Test name: EncodingTest::testDifferencesEncoding
- # equality assertion failed
- # - Expected: 1
- # - Actual : 0
- sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
- -i test/unit/EncodingTest.h || die
-
- # Bug #407015: fix to compile with Lua 5.2
- if has_version '>=dev-lang/lua-5.2' ; then
- sed -e 's: lua_open(: luaL_newstate(:' \
- -e 's: luaL_getn(: lua_rawlen(:' -i \
- tools/podofocolor/luaconverter.cpp \
- tools/podofoimpose/planreader_lua.cpp || die
- fi
-}
-
-src_configure() {
-
- # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
- filter-flags -fvisibility-inlines-hidden
-
- mycmakeargs+=(
- "-DPODOFO_BUILD_SHARED=1"
- "-DPODOFO_HAVE_JPEG_LIB=1"
- "-DPODOFO_HAVE_PNG_LIB=1"
- "-DPODOFO_HAVE_TIFF_LIB=1"
- "-DWANT_FONTCONFIG=1"
- "-DUSE_STLPORT=0"
- -DWANT_BOOST=$(usex boost ON OFF)
- -DHAVE_LIBIDN=$(usex idn ON OFF)
- -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
- -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
- )
-
- cmake-utils_src_configure
- mkdir -p "${S}/test/TokenizerTest/objects" || die
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}"/test/unit
- ./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
deleted file mode 100644
index a75c43638425..000000000000
--- a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PVR}"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
-IUSE="+boost idn libressl debug test +tools"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:=
- idn? ( net-dns/libidn:= )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- media-libs/fontconfig:=
- media-libs/freetype:2=
- virtual/jpeg:0=
- media-libs/libpng:0=
- media-libs/tiff:0=
- sys-libs/zlib:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- boost? ( dev-util/boost-build )
- test? ( dev-util/cppunit )"
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
- local x sed_args
-
- # The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
- # equal to ${PV}.
- sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die
-
- # bug 620934 - Disable linking with cppunit when possible, since it
- # triggers errors with some older compilers.
- use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
- # bug 556962
- sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
- test/unit/EncryptTest.cpp || die
-
- sed -i \
- -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
- -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
- CMakeLists.txt || die
-
- # Use pkg-config to find headers for bug #459404.
- sed_args=
- for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
- [[ ${x} == -I* ]] || continue
- x=${x#-I}
- if [[ -f ${x}/ft2build.h ]] ; then
- sed_args+=" -e s:/usr/include/\\r\$:${x}:"
- elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
- sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
- fi
- done
- [[ -n ${sed_args} ]] && \
- { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
- # Bug #439784: Add missing unistd include for close() and unlink().
- sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
- test/unit/TestUtils.cpp || die
-
- # TODO: fix these test cases
- # ColorTest.cpp:62:Assertion
- # Test name: ColorTest::testDefaultConstructor
- # expected exception not thrown
- # - Expected: PdfError
- sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
- -i test/unit/ColorTest.h || die
-
- # ColorTest.cpp:42:Assertion
- # Test name: ColorTest::testHexNames
- # assertion failed
- # - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
- sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
- -i test/unit/ColorTest.h || die
-
- # Bug #352125: test failure, depending on installed fonts
- # ##Failure Location unknown## : Error
- # Test name: FontTest::testFonts
- # uncaught exception of type PoDoFo::PdfError
- # - ePdfError_UnsupportedFontFormat
- sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
- -i test/unit/FontTest.h || die
-
- # Test name: EncodingTest::testDifferencesEncoding
- # equality assertion failed
- # - Expected: 1
- # - Actual : 0
- sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
- -i test/unit/EncodingTest.h || die
-
- # Bug #407015: fix to compile with Lua 5.2
- if has_version '>=dev-lang/lua-5.2' ; then
- sed -e 's: lua_open(: luaL_newstate(:' \
- -e 's: luaL_getn(: lua_rawlen(:' -i \
- tools/podofocolor/luaconverter.cpp \
- tools/podofoimpose/planreader_lua.cpp || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
-
- # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
- filter-flags -fvisibility-inlines-hidden
-
- mycmakeargs+=(
- "-DPODOFO_BUILD_SHARED=1"
- "-DPODOFO_HAVE_JPEG_LIB=1"
- "-DPODOFO_HAVE_PNG_LIB=1"
- "-DPODOFO_HAVE_TIFF_LIB=1"
- "-DWANT_FONTCONFIG=1"
- "-DUSE_STLPORT=0"
- -DWANT_BOOST=$(usex boost ON OFF)
- -DHAVE_LIBIDN=$(usex idn ON OFF)
- -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
- -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}"/test/unit
- ./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild b/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
deleted file mode 100644
index b7e200e657a7..000000000000
--- a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
-HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+boost idn libressl debug test +tools"
-REQUIRED_USE="test? ( tools )"
-
-RDEPEND="dev-lang/lua:=
- idn? ( net-dns/libidn:= )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- media-libs/fontconfig:=
- media-libs/freetype:2=
- virtual/jpeg:0=
- media-libs/libpng:0=
- media-libs/tiff:0=
- sys-libs/zlib:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- boost? ( dev-util/boost-build )
- test? ( dev-util/cppunit )"
-
-PATCHES=(
- "${FILESDIR}/${P}-libressl-bug-635890.patch"
-)
-
-DOCS="AUTHORS ChangeLog TODO"
-
-src_prepare() {
- cmake-utils_src_prepare
- local x sed_args
-
- # The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
- # equal to ${PV}.
- sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die
-
- # bug 620934 - Disable linking with cppunit when possible, since it
- # triggers errors with some older compilers.
- use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
-
- # bug 556962
- sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
- test/unit/EncryptTest.cpp || die
-
- sed -i \
- -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
- -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
- CMakeLists.txt || die
-
- # Use pkg-config to find headers for bug #459404.
- sed_args=
- for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
- [[ ${x} == -I* ]] || continue
- x=${x#-I}
- if [[ -f ${x}/ft2build.h ]] ; then
- sed_args+=" -e s:/usr/include/\\r\$:${x}:"
- elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
- sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
- fi
- done
- [[ -n ${sed_args} ]] && \
- { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
-
- # Bug #439784: Add missing unistd include for close() and unlink().
- sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
- test/unit/TestUtils.cpp || die
-
- # TODO: fix these test cases
- # ColorTest.cpp:62:Assertion
- # Test name: ColorTest::testDefaultConstructor
- # expected exception not thrown
- # - Expected: PdfError
- sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
- -e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
- -i test/unit/ColorTest.h || die
-
- # ColorTest.cpp:42:Assertion
- # Test name: ColorTest::testHexNames
- # assertion failed
- # - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
- sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
- -i test/unit/ColorTest.h || die
-
- # Bug #352125: test failure, depending on installed fonts
- # ##Failure Location unknown## : Error
- # Test name: FontTest::testFonts
- # uncaught exception of type PoDoFo::PdfError
- # - ePdfError_UnsupportedFontFormat
- sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
- -i test/unit/FontTest.h || die
-
- # Test name: EncodingTest::testDifferencesEncoding
- # equality assertion failed
- # - Expected: 1
- # - Actual : 0
- sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
- -i test/unit/EncodingTest.h || die
-
- # Bug #407015: fix to compile with Lua 5.2
- if has_version '>=dev-lang/lua-5.2' ; then
- sed -e 's: lua_open(: luaL_newstate(:' \
- -e 's: luaL_getn(: lua_rawlen(:' -i \
- tools/podofocolor/luaconverter.cpp \
- tools/podofoimpose/planreader_lua.cpp || die
- fi
-}
-
-src_configure() {
-
- # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
- filter-flags -fvisibility-inlines-hidden
-
- mycmakeargs+=(
- "-DPODOFO_BUILD_SHARED=1"
- "-DPODOFO_HAVE_JPEG_LIB=1"
- "-DPODOFO_HAVE_PNG_LIB=1"
- "-DPODOFO_HAVE_TIFF_LIB=1"
- "-DWANT_FONTCONFIG=1"
- "-DUSE_STLPORT=0"
- -DWANT_BOOST=$(usex boost ON OFF)
- -DHAVE_LIBIDN=$(usex idn ON OFF)
- -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
- -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}"/test/unit
- ./podofo-test --selftest || die "self test failed"
-}
diff --git a/app-text/podofo/podofo-0.9.8-r1.ebuild b/app-text/podofo/podofo-0.9.8-r1.ebuild
new file mode 100644
index 000000000000..151d7e2aabf0
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.8-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz
+ https://github.com/podofo/podofo/commit/d0e9f5d503b0cb79516ec9bff989f3d7d625b678.patch -> ${P}-bug-888463.patch"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="+boost idn debug test +tools"
+RESTRICT="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( tools )"
+
+RDEPEND="${LUA_DEPS}
+ idn? ( net-dns/libidn:= )
+ dev-libs/openssl:=
+ media-libs/fontconfig:=
+ media-libs/freetype:2=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/tiff:=
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}
+ test? ( dev-util/cppunit )
+"
+
+BDEPEND="virtual/pkgconfig
+ boost? ( dev-libs/boost )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
+ "${DISTDIR}"/${P}-bug-888463.patch
+)
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+ cmake_src_prepare
+ local x sed_args
+
+ # bug 620934 - Disable linking with cppunit when possible, since it
+ # triggers errors with some older compilers.
+ use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+ # bug 556962
+ sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+ test/unit/EncryptTest.cpp || die
+
+ sed -i \
+ -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+ -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+ CMakeLists.txt || die
+
+ # Use pkg-config to find headers for bug #459404.
+ sed_args=
+ for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+ [[ ${x} == -I* ]] || continue
+ x=${x#-I}
+ if [[ -f ${x}/ft2build.h ]] ; then
+ sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+ elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+ sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+ fi
+ done
+ [[ -n ${sed_args} ]] && \
+ { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+ # Bug #407015: fix to compile with Lua 5.2+
+ case "${ELUA}" in
+ lua5-1|luajit)
+ ;;
+ *)
+ sed -e 's: lua_open(: luaL_newstate(:' \
+ -e 's: luaL_getn(: lua_rawlen(:' -i \
+ tools/podofocolor/luaconverter.cpp \
+ tools/podofoimpose/planreader_lua.cpp || die
+ ;;
+ esac
+}
+
+src_configure() {
+
+ # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+ filter-flags -fvisibility-inlines-hidden
+
+ mycmakeargs+=(
+ "-DPODOFO_BUILD_SHARED=1"
+ "-DPODOFO_HAVE_JPEG_LIB=1"
+ "-DPODOFO_HAVE_PNG_LIB=1"
+ "-DPODOFO_HAVE_TIFF_LIB=1"
+ "-DWANT_FONTCONFIG=1"
+ "-DUSE_STLPORT=0"
+ -DLUA_VERSION="$(lua_get_version)"
+ -DWANT_BOOST=$(usex boost ON OFF)
+ -DHAVE_LIBIDN=$(usex idn ON OFF)
+ # We use libidn for unicode support instead
+ -DCMAKE_DISABLE_FIND_PACKAGE_UNISTRING=ON
+ -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+ -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+ )
+
+ cmake_src_configure
+ mkdir -p "${S}/test/TokenizerTest/objects" || die
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/test/unit || die
+ ./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 44a6d186287d..d5bb2a09ed73 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1 +1,2 @@
-DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
+DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885
+DIST poppler-data-0.4.12.tar.gz 4504754 BLAKE2B 0d34ff1fcc9120b5db2baded9d931ca37128106eecdd54892d0256f9736f799d52eacd4017741797432048def914dd13150c6e3bf8d9ea5b8597a799a497d1c7 SHA512 75f201e4c586ba47eb9a48a33ef6663fe353d0694b602feb7db282d73da7f0daffb0ff7e18e4a6cb40324305efa2413df562666939f4214e2dfd7ff00288f3de
diff --git a/app-text/poppler-data/metadata.xml b/app-text/poppler-data/metadata.xml
index c439b06d8c84..e2fedda90ee1 100644
--- a/app-text/poppler-data/metadata.xml
+++ b/app-text/poppler-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/poppler-data/poppler-data-0.4.12.ebuild b/app-text/poppler-data/poppler-data-0.4.12.ebuild
new file mode 100644
index 000000000000..735eb5a9ab48
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.12.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POPPLER_DATA_EXTRA_VERSION="0.4.11-2"
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz"
+
+# AGPL-3+ for the extra files needed by ghostscript, bug #844115
+LICENSE="AGPL-3+ BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+src_install() {
+ emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+ # We need to include extra cMaps for ghostscript, bug #844115
+ cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die
+
+ # bug #409361
+ dodir /usr/share/poppler/cMaps
+ cd "${ED}"/usr/share/poppler/cMaps || die
+ find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
deleted file mode 100644
index fcd701289a51..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-src_install() {
- emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
- # bug 409361
- dodir /usr/share/poppler/cMaps
- cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
- find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index abdff69112a6..151229e37223 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,7 @@
-DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
-DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
-DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
+DIST poppler-24.02.0.tar.xz 1897604 BLAKE2B ba97ea0807eab8e27112f66bcdcc695fe71881b873e129ebbaab521ad895815cf782faf9e32efd8530ec7c840546a505ef9a1b195258dafd55ce21fe4e11250e SHA512 95a208d21ac4d2d308a7ab3da43b95092ef78cd55ebe873c97e0d6c12d8b9d5c4614f83087616c35e1ed9d67ca606a5e008a98698bd12a332a8206ed4cf55500
+DIST poppler-24.02.0.tar.xz.sig 833 BLAKE2B 9daed6e9c3ba6f42f7b7e81abcf835658a03c4041a221b1de2e3a8e016eebe7b369174379f8faadb6119cac4502bf58e9f1c548e401d417d8ef5c1a2ab5fb322 SHA512 9bb03899e5fc475097a3422ed5f03b528796dc09d14bef0dabbbb457f9d5b20b48db462cc1478522803bae42c5b25ef46715d3ff6c26f4582f2ecf9c1bf1598e
+DIST poppler-24.03.0.tar.xz 1902068 BLAKE2B 34cd3b64b1fbee53727d99bf73a896331c15d816ea77aa678a9ebe4bc6ddf8c859ae004915aba36346dbcb13862d7d6670562e45d99888d444c523d83c90b58a SHA512 7b337249b3a3a4b4702447c7a0d19d2fd3ef5a6159d024d75846f397e223805758d4116eb155421545b17f02f151a96228932d162c0ff8a74147ef21424e9a96
+DIST poppler-24.03.0.tar.xz.sig 833 BLAKE2B efdf579fec7d5aca5ec197220d46e4420f60946992e0c6f0a461f4ebc0b45c363eca269e93ffa36e840a7959c8ca2225da17b62b412a0eb37e4d4e74f98a22c6 SHA512 7276311721a7c6ea35773e38147c816b79359422add5f9b954a1e95fd399f16161ff8791a82db56707b143e207e6cf8264d353b3a6da298c9f65f2e9cb2533d0
+DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4035b19ec3d87c328ef67b22b9e36cc15ef4912da625a55a5befacc95aef6a8ef5dc48aa46cd79943b03985333b47 SHA512 49a9bef20ebdca3b56e53fa610d5ff76a7fba378dd7d8bb64a11bea909bf103ec7fd385e95ca971feab84aaebb523d4c7515a3a42ac0c7eb728e376a1239cfd9
+DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28
+DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
deleted file mode 100644
index f0a8d3c7eb4a..000000000000
--- a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7178d25..934f38f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO
- message("-- CMake >= 2.8.8 is needed to enable Qt5")
- endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
-
-+#
-+# Ugly workaround: Manually patch library paths for Qt4 and Qt5:
-+#
-+IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
-+ GET_CMAKE_PROPERTY(_res VARIABLES)
-+ FOREACH(_var ${_res})
-+ IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64")
-+ STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}")
-+ ENDIF()
-+ ENDFOREACH()
-+ENDIF()
-+
- macro_optional_find_package(Cairo ${CAIRO_VERSION})
- if(CAIRO_FOUND)
- set(HAVE_CAIRO ${CAIRO_FOUND})
diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
deleted file mode 100644
index 259be15c6631..000000000000
--- a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Fri, 6 Oct 2017 08:52:10 +0200
-Subject: [PATCH] [Qt5] Drop unused dependencies
-
----
- CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7485b2ad..04327568 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,10 +147,8 @@ if (ENABLE_QT5)
- find_package(Qt5Core)
- find_package(Qt5Gui)
- find_package(Qt5Xml)
-- find_package(Qt5Widgets)
-- find_package(Qt5Test)
-- if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
-- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
-+ if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
-+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
- set(ENABLE_QT5 OFF)
- endif()
- endif()
---
-2.14.2
-
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
deleted file mode 100644
index a75b84b482f5..000000000000
--- a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-@@ -98,8 +98,6 @@
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
--if(CMAKE_COMPILER_IS_GNUCXX)
-- # set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
- set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
- set(_warn "${_warn} -Wcast-align")
-@@ -124,39 +122,6 @@
- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
-- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
-- if(GCC_HAS_AS_NEEDED)
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-- endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
--if(CMAKE_C_COMPILER MATCHES "icc")
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-+
-\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
deleted file mode 100644
index e54f7c6390a9..000000000000
--- a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/cmake/modules/PopplerMacros.cmake 2018-10-21 18:47:56.000000000 +0200
-+++ b/cmake/modules/PopplerMacros.cmake 2018-11-01 10:43:10.898347039 +0100
-@@ -147,28 +147,6 @@
- endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
-
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
-- set(_warn "-Wall -Wextra -Wpedantic")
-- set(_warn "${_warn} -Wno-unused-parameter")
-- set(_warn "${_warn} -Wcast-align")
-- set(_warn "${_warn} -Wformat-security")
-- set(_warn "${_warn} -Wframe-larger-than=65536")
-- set(_warn "${_warn} -Wmissing-format-attribute")
-- set(_warn "${_warn} -Wnon-virtual-dtor")
-- set(_warn "${_warn} -Woverloaded-virtual")
-- set(_warn "${_warn} -Wmissing-declarations")
-- set(_warn "${_warn} -Wundef")
-- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--
-- # set extra warnings
-- set(_warnx "${_warnx} -Wconversion")
-- set(_warnx "${_warnx} -Wshadow")
--
-- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch
deleted file mode 100644
index 137af0dedc4f..000000000000
--- a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- poppler-0.78.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.78.0/cmake/modules/PopplerMacros.cmake
-@@ -145,28 +145,6 @@
- endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
-
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
-- set(_warn "-Wall -Wextra -Wpedantic")
-- set(_warn "${_warn} -Wno-unused-parameter")
-- set(_warn "${_warn} -Wcast-align")
-- set(_warn "${_warn} -Wformat-security")
-- set(_warn "${_warn} -Wframe-larger-than=65536")
-- set(_warn "${_warn} -Wmissing-format-attribute")
-- set(_warn "${_warn} -Wnon-virtual-dtor")
-- set(_warn "${_warn} -Woverloaded-virtual")
-- set(_warn "${_warn} -Wmissing-declarations")
-- set(_warn "${_warn} -Wundef")
-- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
-- set(_warn "${_warn} -Wshadow")
--
-- # set extra warnings
-- set(_warnx "${_warnx} -Wconversion")
--
-- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch
new file mode 100644
index 000000000000..08eb5beed26b
--- /dev/null
+++ b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch
@@ -0,0 +1,116 @@
+This can be renamed on the next version after 21.08.0. User wanted to test
+some patches committed upstream so ended up needing to rebase this patch.
+
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
+From: Theo Anderson <telans@posteo.de>
+Date: Wed, 14 Apr 2021 10:16:11 +1200
+Subject: [PATCH] build: respect cflags
+
+[Rebased by: Stefan Radermacher <gentoo@zaister.de>]
+Signed-off-by: Theo Anderson <telans@posteo.de>
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -87,20 +87,15 @@ set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
+ # CMake toolchain file). To avoid surprising compilation errors, we emit an
+ # error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE
+ # in the compiler flags logic below.
+-if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types)
+- message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-endif()
+ set(_save_cflags "${CMAKE_C_FLAGS}")
+ set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- # set the default compile warnings
+ set(_warn "-Wall -Wextra -Wpedantic")
+ set(_warn "${_warn} -Wno-unused-parameter")
+ set(_warn "${_warn} -Wcast-align")
+ set(_warn "${_warn} -Wformat-security")
+ set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wlogical-op")
+ set(_warn "${_warn} -Wmissing-format-attribute")
+ set(_warn "${_warn} -Wnon-virtual-dtor")
+ set(_warn "${_warn} -Woverloaded-virtual")
+@@ -116,20 +111,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+
+ set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+ poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+ if(GCC_HAS_AS_NEEDED)
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+@@ -139,56 +120,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(_compiler_flags_changed 1)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+- set(_warn "-Wall -Wextra -Wpedantic")
+- set(_warn "${_warn} -Wno-unused-parameter")
+- set(_warn "${_warn} -Wcast-align")
+- set(_warn "${_warn} -Wformat-security")
+- set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wmissing-format-attribute")
+- set(_warn "${_warn} -Wnon-virtual-dtor")
+- set(_warn "${_warn} -Woverloaded-virtual")
+- set(_warn "${_warn} -Wmissing-declarations")
+- set(_warn "${_warn} -Wundef")
+- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+- set(_warn "${_warn} -Wshadow")
+- set(_warn "${_warn} -Wweak-vtables")
+-
+- # set extra warnings
+- set(_warnx "${_warnx} -Wconversion")
+-
+- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+- set(CMAKE_CXX_FLAGS_DEBUG "-g")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+- set(CMAKE_C_FLAGS_DEBUG "-g")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(_compiler_flags_changed 1)
+-endif()
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
+- set(_compiler_flags_changed 1)
+-endif(CMAKE_C_COMPILER MATCHES "icc")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
+ if(_compiler_flags_changed)
+ # Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags.
+--
+2.33.0
+
diff --git a/app-text/poppler/files/poppler-23.10.0-qt-deps.patch b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch
new file mode 100644
index 000000000000..f906e335717d
--- /dev/null
+++ b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch
@@ -0,0 +1,61 @@
+From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 9 Dec 2020 01:28:25 +0100
+Subject: [PATCH] Move Qt test dependencies into test dir
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 8 ++++----
+ qt5/CMakeLists.txt | 7 +++++--
+ qt6/CMakeLists.txt | 6 ++++--
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,15 +212,15 @@
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Core ${QT5_VERSION})
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Gui ${QT5_VERSION})
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VERSION})
+-find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION})
+-find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION})
++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Widgets ${QT5_VERSION})
++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Test ${QT5_VERSION})
+
+ set(QT6_VERSION "6.2")
+ SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION})
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION})
+-find_soft_mandatory_package(ENABLE_QT6 Qt6Widgets ${QT6_VERSION})
+-find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION})
++find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Widgets ${QT6_VERSION})
++find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Test ${QT6_VERSION})
+
+ # Check for Cairo rendering backend
+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
+--- a/qt5/CMakeLists.txt
++++ b/qt5/CMakeLists.txt
+@@ -9,5 +9,8 @@
+ add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
+
+ add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++
++if(BUILD_QT5_TESTS)
++ add_subdirectory(tests)
++ add_subdirectory(demos)
++endif()
+--- a/qt6/CMakeLists.txt
++++ b/qt6/CMakeLists.txt
+@@ -7,5 +7,7 @@
+
+ add_subdirectory(src)
+
+-add_subdirectory(tests)
+-add_subdirectory(demos)
++if(BUILD_QT6_TESTS)
++ add_subdirectory(tests)
++ add_subdirectory(demos)
++endif()
+--
+2.29.2
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 3f8d6be9f980..ead6228b431b 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>reavertm@gentoo.org</email>
@@ -17,12 +17,18 @@
<email>office@gentoo.org</email>
<description>Please CC on stabilisation bugs</description>
</maintainer>
+<upstream>
+ <remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
+ <remote-id type="freedesktop-gitlab">poppler/poppler</remote-id>
+</upstream>
<use>
+ <flag name="boost">Use boost::small_vector for a serious performance gain</flag>
+ <flag name="gpgme">Enable signatures handling with <pkg>app-crypt/gpgme</pkg></flag>
<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
<flag name="utils">Install command-line PDF converters and various utilities.</flag>
</use>
<slots>
<subslots>Reflects ABI compatibility of libpoppler.so only,
- NOT libpoppler-{glib,qt4,cpp}.so!</subslots>
+ NOT libpoppler-{glib,qt5,cpp}.so!</subslots>
</slots>
</pkgmetadata>
diff --git a/app-text/poppler/poppler-0.77.0.ebuild b/app-text/poppler/poppler-0.77.0.ebuild
deleted file mode 100644
index 4052e96324c6..000000000000
--- a/app-text/poppler/poppler-0.77.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-else
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/88" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
- png? ( media-libs/libpng:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
- cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
- "${FILESDIR}/${PN}-0.71.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-
- # we need to up the C++ version, bug #622526, #643278
- append-cxxflags -std=c++11
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DSPLASH_CMYK=OFF
- -DUSE_FIXEDPOINT=OFF
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake-utils_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild
deleted file mode 100644
index e13bc99957e5..000000000000
--- a/app-text/poppler/poppler-0.79.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-else
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/89" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
- png? ( media-libs/libpng:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
- cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
- "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-
- # we need to up the C++ version, bug #622526, #643278
- append-cxxflags -std=c++11
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DSPLASH_CMYK=OFF
- -DUSE_FIXEDPOINT=OFF
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake-utils_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
deleted file mode 100644
index 44c544ebd76d..000000000000
--- a/app-text/poppler/poppler-0.80.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-else
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/90" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
- png? ( media-libs/libpng:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
- cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
- "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-
- # we need to up the C++ version, bug #622526, #643278
- append-cxxflags -std=c++11
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DSPLASH_CMYK=OFF
- -DUSE_FIXEDPOINT=OFF
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake-utils_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-24.02.0.ebuild b/app-text/poppler/poppler-24.02.0.ebuild
new file mode 100644
index 000000000000..224aa760e772
--- /dev/null
+++ b/app-text/poppler/poppler-24.02.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ SLOT="0/134" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.13
+ >=media-libs/freetype-2.10
+ sys-libs/zlib
+ cairo? (
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/cairo-1.16
+ introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+ )
+ curl? ( net-misc/curl )
+ gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+ jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.49 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ qt6? ( dev-qt/qtbase:6[gui,xml] )
+ tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( >=dev-libs/boost-1.71 )
+ test? (
+ qt5? (
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? ( dev-qt/qtbase:6[widgets] )
+ )
+"
+BDEPEND="
+ >=dev-util/glib-utils-2.64
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+ fi
+
+ default
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ append-lfs-flags # bug #898506
+
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+ -DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+ -DBUILD_CPP_TESTS=$(usex test)
+ -DBUILD_MANUAL_TESTS=$(usex test)
+ -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DENABLE_GPGME=$(usex gpgme)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_LCMS=$(usex lcms)
+ -DENABLE_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ -DENABLE_QT5=$(usex qt5)
+ -DENABLE_QT6=$(usex qt6)
+ -DENABLE_LIBTIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-24.03.0.ebuild b/app-text/poppler/poppler-24.03.0.ebuild
new file mode 100644
index 000000000000..719b3b8646b8
--- /dev/null
+++ b/app-text/poppler/poppler-24.03.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ SLOT="0/135" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.13
+ >=media-libs/freetype-2.10
+ sys-libs/zlib
+ cairo? (
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/cairo-1.16
+ introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+ )
+ curl? ( net-misc/curl )
+ gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+ jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.49 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ qt6? ( dev-qt/qtbase:6[gui,xml] )
+ tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( >=dev-libs/boost-1.71 )
+ test? (
+ qt5? (
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? ( dev-qt/qtbase:6[widgets] )
+ )
+"
+BDEPEND="
+ >=dev-util/glib-utils-2.64
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+ fi
+
+ default
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ append-lfs-flags # bug #898506
+
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+ -DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+ -DBUILD_CPP_TESTS=$(usex test)
+ -DBUILD_MANUAL_TESTS=$(usex test)
+ -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DENABLE_GPGME=$(usex gpgme)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_LCMS=$(usex lcms)
+ -DENABLE_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ -DENABLE_QT5=$(usex qt5)
+ -DENABLE_QT6=$(usex qt6)
+ -DENABLE_LIBTIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-24.04.0.ebuild b/app-text/poppler/poppler-24.04.0.ebuild
new file mode 100644
index 000000000000..83006151fd51
--- /dev/null
+++ b/app-text/poppler/poppler-24.04.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2005-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ SLOT="0/136" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.13
+ >=media-libs/freetype-2.10
+ sys-libs/zlib
+ cairo? (
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/cairo-1.16
+ introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+ )
+ curl? ( net-misc/curl )
+ gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+ jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.49 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ qt6? ( dev-qt/qtbase:6[gui,xml] )
+ tiff? ( media-libs/tiff:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( >=dev-libs/boost-1.71 )
+ test? (
+ qt5? (
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? ( dev-qt/qtbase:6[widgets] )
+ )
+"
+BDEPEND="
+ >=dev-util/glib-utils-2.64
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+ fi
+
+ default
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ append-lfs-flags # bug #898506
+
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+ -DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+ -DBUILD_CPP_TESTS=$(usex test)
+ -DBUILD_MANUAL_TESTS=$(usex test)
+ -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DENABLE_GPGME=$(usex gpgme)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_LCMS=$(usex lcms)
+ -DENABLE_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ -DENABLE_QT5=$(usex qt5)
+ -DENABLE_QT6=$(usex qt6)
+ -DENABLE_LIBTIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 44c544ebd76d..83006151fd51 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,75 +1,103 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2005-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+inherit cmake flag-o-matic toolchain-funcs xdg-utils
if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/90" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ SLOT="0/136" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="https://poppler.freedesktop.org/"
LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
+IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
+RESTRICT="!test? ( test )"
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.13
+ >=media-libs/freetype-2.10
sys-libs/zlib
cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/cairo-1.16
+ introspection? ( >=dev-libs/gobject-introspection-1.64:= )
)
curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
+ gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
+ jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
+ nss? ( >=dev-libs/nss-3.49 )
png? ( media-libs/libpng:0= )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtxml:5
)
- tiff? ( media-libs/tiff:0 )
+ qt6? ( dev-qt/qtbase:6[gui,xml] )
+ tiff? ( media-libs/tiff:= )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
+DEPEND="${COMMON_DEPEND}
+ boost? ( >=dev-libs/boost-1.71 )
+ test? (
+ qt5? (
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? ( dev-qt/qtbase:6[widgets] )
+ )
+"
+BDEPEND="
+ >=dev-util/glib-utils-2.64
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
+fi
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
- "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
- "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)
+src_unpack() {
+ if [[ ${PV} == *9999* ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+ fi
+
+ default
+}
+
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# Clang doesn't grok this flag, the configure nicely tests that, but
# cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
+ if tc-is-clang ; then
sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
fi
@@ -79,44 +107,46 @@ src_prepare() {
else
einfo "policy(SET CMP0002 OLD) - workaround can be removed"
fi
-
- # we need to up the C++ version, bug #622526, #643278
- append-cxxflags -std=c++11
}
src_configure() {
xdg_environment_reset
+ append-lfs-flags # bug #898506
+
local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
+ -DBUILD_QT5_TESTS=$(usex test $(usex qt5))
+ -DBUILD_QT6_TESTS=$(usex test $(usex qt6))
+ -DBUILD_CPP_TESTS=$(usex test)
+ -DBUILD_MANUAL_TESTS=$(usex test)
+ -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
-DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DSPLASH_CMYK=OFF
- -DUSE_FIXEDPOINT=OFF
-DUSE_FLOAT=OFF
-DWITH_Cairo=$(usex cairo)
-DENABLE_LIBCURL=$(usex curl)
-DENABLE_CPP=$(usex cxx)
+ -DENABLE_GPGME=$(usex gpgme)
-DWITH_JPEG=$(usex jpeg)
-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
+ -DENABLE_LCMS=$(usex lcms)
+ -DENABLE_NSS3=$(usex nss)
-DWITH_PNG=$(usex png)
- $(cmake-utils_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
+ -DENABLE_QT5=$(usex qt5)
+ -DENABLE_QT6=$(usex qt6)
+ -DENABLE_LIBTIFF=$(usex tiff)
-DENABLE_UTILS=$(usex utils)
)
use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# live version doesn't provide html documentation
if use cairo && use doc && [[ ${PV} != *9999* ]]; then
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
index 67cbd0ec0e3d..e9e2f73d5176 100644
--- a/app-text/ps2eps/metadata.xml
+++ b/app-text/ps2eps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
@@ -9,8 +9,4 @@
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
- <longdescription lang="en">
- Tool for generating Encapsulated Postscript Format (EPS,EPSF) files
- from one-page Postscript documents
- </longdescription>
</pkgmetadata>
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 407dde790949..4c07540fcae0 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
inherit toolchain-funcs
@@ -11,30 +11,31 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-DEPEND=""
-RDEPEND="app-text/ghostscript-gpl
+RDEPEND="
+ app-text/ghostscript-gpl
!<app-text/texlive-core-2007-r7"
S="${WORKDIR}/${PN}"
-src_compile() {
+src_configure() {
tc-export CC
- cd "${S}/src/C"
- echo "all: bbox" > Makefile
- emake || die "making bbox failed"
+}
+
+src_compile() {
+ cd src/C || die
+ emake bbox
}
src_install() {
- dobin "${S}/src/C/bbox"
- dobin "${S}/bin/ps2eps"
- doman "${S}/doc/man/man1/bbox.1"
- doman "${S}/doc/man/man1/ps2eps.1"
-
- dodoc Changes.txt README.txt
- dohtml "${S}/doc/html/"*
- docinto pdf
- dodoc "${S}/doc/pdf/"*
+ dobin src/C/bbox
+ dobin bin/ps2eps
+
+ doman doc/man/man1/bbox.1
+ doman doc/man/man1/ps2eps.1
+
+ local DOCS=( Changes.txt README.txt doc/pdf )
+ local HTML_DOCS=( doc/html/. )
+ einstalldocs
}
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 2eec26130dcd..6bba4f271f42 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,4 +1,2 @@
-DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
diff --git a/app-text/ps2pkm/metadata.xml b/app-text/ps2pkm/metadata.xml
index c4b55593420b..34452b8a1eb9 100644
--- a/app-text/ps2pkm/metadata.xml
+++ b/app-text/ps2pkm/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
diff --git a/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild b/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
deleted file mode 100644
index 7843327c3e7a..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
- !<app-text/texlive-core-2010
- !app-text/ptex
- ${DEPEND}"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
- econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
deleted file mode 100644
index b545997a4690..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
- !<app-text/texlive-core-2010
- !app-text/ptex
- ${DEPEND}"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
- econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
deleted file mode 100644
index 59318b16b5ac..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="
- !<app-text/texlive-core-2010
- !app-text/ptex
- ${DEPEND}"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
- econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
deleted file mode 100644
index 60873d1ab8fe..000000000000
--- a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-libs/kpathsea-6.2.1"
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
-DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
-
-src_configure() {
- econf --with-system-kpathsea
-}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
new file mode 100644
index 000000000000..c2bf98350593
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="https://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+ econf --with-system-kpathsea
+}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild
new file mode 100644
index 000000000000..9b5072d13ca3
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20230311.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="https://tug.org/texlive/"
+SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${PV#*_p}-source.tar.xz"
+S="${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+ econf \
+ --with-system-kpathsea
+}
diff --git a/app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch b/app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..9d01c2d87de3
--- /dev/null
+++ b/app-text/psiconv/files/psiconv-0.8.3-Wimplicit-function-declaration.patch
@@ -0,0 +1,92 @@
+--- a/extra/checkuid.c
++++ b/extra/checkuid.c
+@@ -19,6 +19,7 @@
+
+
+ #include <stdio.h>
++#include <stdlib.h>
+
+ unsigned long uid1[32] = { /* bit 0 */ 0x000045A0,
+ /* bit 1 */ 0x00008B40,
+--- a/extra/empty.c
++++ b/extra/empty.c
+@@ -20,6 +20,7 @@
+ #include <psiconv/generate.h>
+
+ #include <stdio.h>
++#include <stdlib.h>
+
+ void help(void)
+ {
+--- a/extra/rewrite.c
++++ b/extra/rewrite.c
+@@ -21,6 +21,7 @@
+ #include <psiconv/generate.h>
+
+ #include <stdio.h>
++#include <stdlib.h>
+
+ int main(int argc, char *argv[])
+ {
+--- a/lib/psiconv/error.c
++++ b/lib/psiconv/error.c
+@@ -22,6 +22,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "error.h"
+
+--- a/lib/psiconv/generate_layout.c
++++ b/lib/psiconv/generate_layout.c
+@@ -23,6 +23,8 @@
+ #include "generate_routines.h"
+ #include "error.h"
+
++#include <string.h>
++
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+ #endif
+--- a/lib/psiconv/generate_simple.c
++++ b/lib/psiconv/generate_simple.c
+@@ -23,6 +23,8 @@
+ #include "generate_routines.h"
+ #include "error.h"
+
++#include <string.h>
++
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+ #endif
+--- a/lib/psiconv/list.c
++++ b/lib/psiconv/list.c
+@@ -23,6 +23,7 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include "general.h"
+ #include "list.h"
+ #include "error.h"
+--- a/lib/psiconv/misc.c
++++ b/lib/psiconv/misc.c
+@@ -22,6 +22,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "common.h"
+
+ #ifdef DMALLOC
+--- a/lib/psiconv/parse_driver.c
++++ b/lib/psiconv/parse_driver.c
+@@ -21,6 +21,7 @@
+ #include "compat.h"
+
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "parse.h"
+ #include "parse_routines.h"
diff --git a/app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch b/app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch
new file mode 100644
index 000000000000..4c21a6ed3d4a
--- /dev/null
+++ b/app-text/psiconv/files/psiconv-0.8.3-gcc10-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/program/psiconv/psiconv.c
++++ b/program/psiconv/psiconv.c
+@@ -41,6 +41,8 @@
+ #include "gen.h"
+ #include "psiconv.h"
+
++psiconv_list fileformat_list;
++
+ static void print_help(void);
+ static void print_version(void);
+ static void strtoupper(char *str);
+--- a/program/psiconv/psiconv.h
++++ b/program/psiconv/psiconv.h
+@@ -31,6 +31,6 @@
+ output_function *output;
+ } *psiconv_fileformat;
+
+-psiconv_list fileformat_list; /* of struct psiconv_fileformat */
++extern psiconv_list fileformat_list; /* of struct psiconv_fileformat */
+
+ #endif /* PSICONV_GEN_H */
diff --git a/app-text/psiconv/metadata.xml b/app-text/psiconv/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/psiconv/metadata.xml
+++ b/app-text/psiconv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/psiconv/psiconv-0.8.3-r1.ebuild b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
index 004004aee641..84ee5132d4f5 100644
--- a/app-text/psiconv/psiconv-0.8.3-r1.ebuild
+++ b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit toolchain-funcs
@@ -9,20 +9,23 @@ DESCRIPTION="An interpreter for Psion 5(MX) file formats"
HOMEPAGE="http://huizen.dds.nl/~frodol/psiconv"
SRC_URI="http://huizen.dds.nl/~frodol/${PN}/${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-2"
-IUSE="static-libs"
+SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-src_prepare() {
- tc-export AR
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc10-fno-common.patch
+ "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
src_configure() {
- econf $(use_enable static-libs static)
+ tc-export AR
+ econf --disable-static
}
src_install() {
default
- use static-libs || rm -fr "${D}"usr/lib*/lib${PN}.la
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/app-text/psmark/Manifest b/app-text/psmark/Manifest
new file mode 100644
index 000000000000..c22a67413f94
--- /dev/null
+++ b/app-text/psmark/Manifest
@@ -0,0 +1 @@
+DIST psmark-v2.1.tar.gz 16296 BLAKE2B e4f77b7a3abd86f8214e2f00d85eaef4a7b897b3fad970cf86565ad32ab42e25ab7674e9a1a7116a4cce93f46a99a5d17a21c14fb4ff3b2a860e1e2627b268a7 SHA512 0a765dda878478e767ae02ac0838a9c36a110000b35d557b1b3d17d22c518f42249cd4eba856b476ba8042e026cb49f736077d3bf236f2a9a4f3df4ff4357fef
diff --git a/app-text/psmark/files/psmark-2.1-Makefile-QA.patch b/app-text/psmark/files/psmark-2.1-Makefile-QA.patch
new file mode 100644
index 000000000000..145fe3a32e8e
--- /dev/null
+++ b/app-text/psmark/files/psmark-2.1-Makefile-QA.patch
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,14 +3,13 @@
+ all:
+ make clean
+ make psmark
+
+ psmark:
+- gcc $(CFLAGS) -o psmark psmark.c
+- strip psmark
++ $(CC) $(CFLAGS) $(LDFLAGS) -o psmark psmark.c
+
+ clean:
+ rm -f *.o psmark
+
+ install:
+- install -s psmark /usr/bin/
++ install psmark /usr/bin/
+ install psmark.1 /usr/man/man1/
diff --git a/app-text/psmark/files/psmark-2.1-string.patch b/app-text/psmark/files/psmark-2.1-string.patch
new file mode 100644
index 000000000000..1d1fb3dfbb57
--- /dev/null
+++ b/app-text/psmark/files/psmark-2.1-string.patch
@@ -0,0 +1,15 @@
+--- a/psmark.c
++++ b/psmark.c
+@@ -97,9 +97,9 @@
+ progname);
+ fprintf(stderr,"example:\n %s -i test.ps -o output.ps -b 0.4 -s 15 \"vertical label\""
+ "\n\n",progname);
+- fprintf(stderr,"Notes: The offsets are measured from the bottom left hand corner, but
+- they are not in sync with the page corner: some fiddling is required
+- to get text to appear right in the corner.\n"
++ fprintf(stderr,"Notes: The offsets are measured from the bottom left hand corner, but\n"
++ "they are not in sync with the page corner: some fiddling is required\n"
++ "to get text to appear right in the corner.\n"
+ );
+
+ exit(error ? EXIT_FAILURE : EXIT_SUCCESS);
diff --git a/app-text/psmark/metadata.xml b/app-text/psmark/metadata.xml
new file mode 100644
index 000000000000..ecbed5b5dce7
--- /dev/null
+++ b/app-text/psmark/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <longdescription>
+ Command-line Postscript watermark tool; simple, but useful for things
+ like adding a watermark to outgoing or incoming faxes (eg, use with the
+ sendfax command from net-misc/hylafax).
+ </longdescription>
+</pkgmetadata>
diff --git a/app-text/psmark/psmark-2.1.ebuild b/app-text/psmark/psmark-2.1.ebuild
new file mode 100644
index 000000000000..8d8d4e7fd704
--- /dev/null
+++ b/app-text/psmark/psmark-2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=${PN}-v
+MY_P=${MY_PN}${PV}
+
+DESCRIPTION="Prints watermark-like text on any PostScript document"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://www.antitachyon.com/download/${MY_P}.tar.gz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-string.patch
+ "${FILESDIR}"/${P}-Makefile-QA.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin psmark
+ doman psmark.1
+ dodoc README CHANGELOG
+}
diff --git a/app-text/pspdftool/metadata.xml b/app-text/pspdftool/metadata.xml
index b9fd4eef9db7..8ee0a222965a 100644
--- a/app-text/pspdftool/metadata.xml
+++ b/app-text/pspdftool/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription lang="en">
-Pspdftool is a tool for preprinting preparation of documents. It supports PostScript and PDF files and allows users do several transformations (for example rotation, scale, miror ...) and pages selections.
-</longdescription>
+ Pspdftool is a tool for preprinting preparation of documents. It supports PostScript and PDF files and allows users do several transformations (for example rotation, scale, miror ...) and pages selections.
+ </longdescription>
<upstream>
<remote-id type="sourceforge">pspdftool</remote-id>
</upstream>
diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild
index 5b6cbb7e2ecf..97d533be413d 100644
--- a/app-text/pspdftool/pspdftool-0.03.ebuild
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@@ -1,39 +1,39 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
-ESVN_PROJECT="pspdftool"
-
-[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
+inherit autotools flag-o-matic
DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
HOMEPAGE="https://sourceforge.net/projects/pspdftool"
-[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="zlib"
-DEPEND="zlib? ( sys-libs/zlib ) "
-RDEPEND="${DEPEND}"
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
src_prepare() {
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
src_configure() {
+ # -Werror=strict-aliasing; do not trust for LTO-safety either.
+ # https://bugs.gentoo.org/855023
+ # Upstream is dead for nearly a decade. Not forwarded.
+ append-flags -fno-strict-aliasing
+ filter-lto
+
econf $(use_with zlib)
}
src_install() {
default
- rm -rf "${ED}"/usr/share/doc/${PN}*
+ rm -rf "${ED}"/usr/share/doc/${PN}* || die
}
diff --git a/app-text/pspdftool/pspdftool-9999.ebuild b/app-text/pspdftool/pspdftool-9999.ebuild
deleted file mode 100644
index 96932275aac6..000000000000
--- a/app-text/pspdftool/pspdftool-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
-ESVN_PROJECT="pspdftool"
-
-[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
-HOMEPAGE="https://sourceforge.net/projects/pspdftool"
-[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="zlib"
-
-DEPEND="zlib? ( sys-libs/zlib ) "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with zlib)
-}
-
-src_install() {
- default
- rm -rf "${ED}"/usr/share/doc/${PN}*
-}
diff --git a/app-text/pspresent/files/pspresent-1.3-makefile.patch b/app-text/pspresent/files/pspresent-1.3-makefile.patch
new file mode 100644
index 000000000000..363a52c57285
--- /dev/null
+++ b/app-text/pspresent/files/pspresent-1.3-makefile.patch
@@ -0,0 +1,39 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,28 +4,16 @@
+ #
+
+ # You may need to change these paths
+-X11_CFLAGS=-I/usr/X11R6/include
+-X11_LDLIBS=-L/usr/X11R6/lib -lX11
++X11_CFLAGS = $(shell $(PKG_CONFIG) --cflags x11)
++X11_LDLIBS = $(shell $(PKG_CONFIG) --libs x11)
+
+ # Remove the following two lines to disable XINERAMA support
+-XINERAMA_CFLAGS=-DHAVE_LIBXINERAMA
+-XINERAMA_LDLIBS=-lXext -lXinerama
++ifdef USE_XINERAMA
++XINERAMA_CFLAGS = -DHAVE_LIBXINERAMA $(shell $(PKG_CONFIG) --cflags xinerama)
++XINERAMA_LDLIBS = $(shell $(PKG_CONFIG) --libs xinerama)
++endif
+
+-CC = gcc
+-CFLAGS = -Wall -O2 $(X11_CFLAGS) $(XINERAMA_CFLAGS)
++CPPFLAGS += $(X11_CFLAGS) $(XINERAMA_CFLAGS)
+ LDLIBS = $(X11_LDLIBS) $(XINERAMA_LDLIBS)
+
+-TARGET = pspresent
+-OBJS = pspresent.o gs.o ps.o
+-
+-$(TARGET): $(OBJS)
+- $(CC) -o $(TARGET) $(OBJS) $(LDLIBS)
+-
+-clean:
+- rm $(TARGET) $(OBJS)
+-
+-.SUFFIXES:
+-.SUFFIXES: .c .o
+-
+-.c.o:
+- $(CC) $(CFLAGS) -o $@ -c $<
++pspresent: gs.o ps.o
diff --git a/app-text/pspresent/metadata.xml b/app-text/pspresent/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/pspresent/metadata.xml
+++ b/app-text/pspresent/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild
deleted file mode 100644
index 20931af5b1d4..000000000000
--- a/app-text/pspresent/pspresent-1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A tool to display full-screen PostScript presentations"
-SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
-HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="xinerama"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="x11-libs/libX11
- xinerama? ( x11-libs/libXinerama )
- app-text/ghostscript-gpl"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-src_prepare() {
- default
- if ! use xinerama ; then
- sed -i -e "/^XINERAMA/s/^/#/g" Makefile || die "sed Makefile"
- fi
- sed -i Makefile \
- -e 's|= -Wall -O2|+= -Wall|g' \
- -e 's| -o | $(LDFLAGS)&|g' \
- || die "sed Makefile"
-}
-
-src_compile() {
- emake CC=$(tc-getCC)
-}
-
-src_install() {
- dobin pspresent
- doman pspresent.1
-}
diff --git a/app-text/pspresent/pspresent-1.3-r2.ebuild b/app-text/pspresent/pspresent-1.3-r2.ebuild
new file mode 100644
index 000000000000..167d8e647c8a
--- /dev/null
+++ b/app-text/pspresent/pspresent-1.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool to display full-screen PostScript presentations"
+HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
+SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="xinerama"
+
+RDEPEND="
+ app-text/ghostscript-gpl
+ x11-libs/libX11
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+ use xinerama && export USE_XINERAMA=1
+}
+
+src_install() {
+ dobin pspresent
+ doman pspresent.1
+}
diff --git a/app-text/pstotext/metadata.xml b/app-text/pstotext/metadata.xml
index 7b4a61aab741..d724efdf402e 100644
--- a/app-text/pstotext/metadata.xml
+++ b/app-text/pstotext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r4.ebuild
deleted file mode 100644
index f08483acb74d..000000000000
--- a/app-text/pstotext/pstotext-1.9-r4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Extract ASCII text from a PostScript or PDF file"
-HOMEPAGE="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
-SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
-
-LICENSE="PSTT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE=""
-
-DEPEND="app-arch/ncompress"
-RDEPEND="app-text/ghostscript-gpl"
-
-PATCHES=(
- "${FILESDIR}"/${P}-quote-chars-fix.patch
- "${FILESDIR}"/${PV}-flags.patch
-)
-
-src_prepare() {
- default
- tc-export CC
-}
-
-src_install () {
- dobin pstotext
- doman pstotext.1
-}
diff --git a/app-text/pstotext/pstotext-1.9-r5.ebuild b/app-text/pstotext/pstotext-1.9-r5.ebuild
new file mode 100644
index 000000000000..72c02ff901a4
--- /dev/null
+++ b/app-text/pstotext/pstotext-1.9-r5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Extract ASCII text from a PostScript or PDF file"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
+SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
+
+LICENSE="PSTT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+
+RDEPEND="app-text/ghostscript-gpl"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-quote-chars-fix.patch
+ "${FILESDIR}"/${PV}-flags.patch
+)
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin pstotext
+ doman pstotext.1
+}
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 76920dff8ac6..32a27964115b 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1 +1,2 @@
+DIST psutils-2.09.tar.gz 1231162 BLAKE2B 237c26aaf5d9567177cd092d2651aa4562599776118bc4b7bdc717c03935fbddf94e28e037c603b54cee178687135e88dd9593c4d6bad952e1afcb2838e2bc17 SHA512 962c182a4cd71fbc77892806f9e46985306e75f726a58e218718bda20fdada72e9622bb55cef70ed92709b9c1c227a6542096be9605002f4c476edf529ccd4c1
DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
diff --git a/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch b/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch
new file mode 100644
index 000000000000..0f70648dd600
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-clang-implicit-int.patch
@@ -0,0 +1,16 @@
+--- a/pserror.c
++++ b/pserror.c
+@@ -22,11 +22,11 @@ extern char *program ; /* Defined by mai
+ #define MAX_COLUMN 78 /* maximum column to print upto */
+
+ void message(int flags, char *format, ...)
+ {
+ va_list args ;
+- static column = 0 ; /* current screen column for message wrap */
++ static int column = 0 ; /* current screen column for message wrap */
+ char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */
+ char *bufptr = msgbuf ; /* message buffer pointer */
+
+ if ( (flags & MESSAGE_NL) && column != 0 ) { /* new line if not already */
+ putc('\n', stderr) ;
+
diff --git a/app-text/psutils/files/psutils-1.17-ldflags.patch b/app-text/psutils/files/psutils-1.17-ldflags.patch
deleted file mode 100644
index 124768062a43..000000000000
--- a/app-text/psutils/files/psutils-1.17-ldflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: psutils/Makefile.unix
-===================================================================
---- psutils.orig/Makefile.unix
-+++ psutils/Makefile.unix
-@@ -39,7 +39,7 @@ MANEXT = 1
- MANDIR = /usr/local/share/man/man$(MANEXT)
-
- CC = gcc
--CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
-+CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
-
- BIN = psbook psselect pstops epsffit psnup \
- psresize
-@@ -65,30 +65,24 @@ pserror.o: psutil.h patchlev.h pserror.h
- epsffit.o: epsffit.c pserror.h patchlev.h
-
- epsffit: epsffit.o pserror.o
-- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
-
- psnup: psnup.o psutil.o psspec.o pserror.o
-- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
-
- psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
-
- psresize: psresize.o psutil.o pserror.o psspec.o
-- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
-
- psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
-
- psbook: psbook.o psutil.o pserror.o
-- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
-
- psbook.o: psutil.h patchlev.h pserror.h psbook.c
-
- psselect: psselect.o psutil.o pserror.o
-- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
-
- psselect.o: psutil.h patchlev.h pserror.h psselect.c
-
- pstops: pstops.o psutil.o psspec.o pserror.o
-- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
-
- pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
-
diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch
new file mode 100644
index 000000000000..8e8f03208f78
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-makefile.patch
@@ -0,0 +1,210 @@
+--- a/Makefile.unix
++++ b/Makefile.unix
+@@ -25,10 +25,10 @@
+
+ OS = UNIX
+
+-BINDIR = /usr/local/bin
++BINDIR = $(DESTDIR)$(EPREFIX)/usr/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils
++PERL = "/usr/bin/env perl"
+
+ BINMODE = 0755
+ MANMODE = 0644
+@@ -36,10 +36,9 @@
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR = $(DESTDIR)$(EPREFIX)/usr/share/man/man$(MANEXT)
+
+-CC = gcc
+-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
++CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
+
+ BIN = psbook psselect pstops epsffit psnup \
+ psresize
+@@ -65,30 +64,24 @@
+ epsffit.o: epsffit.c pserror.h patchlev.h
+
+ epsffit: epsffit.o pserror.o
+- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
+
+ psnup: psnup.o psutil.o psspec.o pserror.o
+- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
+
+ psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
+
+ psresize: psresize.o psutil.o pserror.o psspec.o
+- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
+
+ psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
+
+ psbook: psbook.o psutil.o pserror.o
+- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
+
+ psbook.o: psutil.h patchlev.h pserror.h psbook.c
+
+ psselect: psselect.o psutil.o pserror.o
+- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
+
+ psselect.o: psutil.h patchlev.h pserror.h psselect.c
+
+ pstops: pstops.o psutil.o psspec.o pserror.o
+- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
+
+ pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
+
+@@ -99,116 +92,116 @@
+ cp $? $@
+
+ psmerge: psmerge.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixfmps: fixfmps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixmacps: fixmacps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixpsditps: fixpsditps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixpspps: fixpspps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixscribeps: fixscribeps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixtpps: fixtpps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixwfwps: fixwfwps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixwpps: fixwpps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixwwps: fixwwps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixdlsrps: fixdlsrps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ extractres: extractres.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ includeres: includeres.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ epsffit.$(MANEXT): epsffit.man
+- $(PERL) maketext MAN="$(MANPAGES)" $? > $@
++ perl maketext MAN="$(MANPAGES)" $? > $@
+
+ psnup.$(MANEXT): psnup.man
+- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
+
+ psresize.$(MANEXT): psresize.man
+- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
+
+ psbook.$(MANEXT): psbook.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ psselect.$(MANEXT): psselect.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ pstops.$(MANEXT): pstops.man
+- $(PERL) maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@
++ perl maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@
+
+ psmerge.$(MANEXT): psmerge.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixfmps.$(MANEXT): fixfmps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixmacps.$(MANEXT): fixmacps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+
+ fixpsditps.$(MANEXT): fixpsditps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixpspps.$(MANEXT): fixpspps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixscribeps.$(MANEXT): fixscribeps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixtpps.$(MANEXT): fixtpps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixwfwps.$(MANEXT): fixwfwps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixwpps.$(MANEXT): fixwpps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixwwps.$(MANEXT): fixwwps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixdlsrps.$(MANEXT): fixdlsrps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ extractres.$(MANEXT): extractres.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ includeres.$(MANEXT): includeres.man
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+
+ getafm.$(MANEXT): getafm.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ clean:
+ rm -f *.o
diff --git a/app-text/psutils/metadata.xml b/app-text/psutils/metadata.xml
index 13170c3184d8..bdd03acf530b 100644
--- a/app-text/psutils/metadata.xml
+++ b/app-text/psutils/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rrthomas/psutils</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
deleted file mode 100644
index 551a8ecd7021..000000000000
--- a/app-text/psutils/psutils-1.17-r3.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="PostScript Utilities"
-HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
-
-LICENSE="psutils"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-S="${WORKDIR}/${P}.orig"
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-ldflags.patch"
- eapply "${FILESDIR}/${P}-no-fixmacps.patch"
- sed \
- -e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
- "${S}/Makefile.unix" > "${S}/Makefile"
- default
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install () {
- dodir /usr/{bin,share/man}
- emake DESTDIR="${D}" install
- dodoc README
-}
diff --git a/app-text/psutils/psutils-1.17-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
new file mode 100644
index 000000000000..54201ea6112f
--- /dev/null
+++ b/app-text/psutils/psutils-1.17-r5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="PostScript Utilities"
+HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
+S="${WORKDIR}/${P}.orig"
+
+LICENSE="psutils"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-no-fixmacps.patch
+ "${FILESDIR}"/${P}-clang-implicit-int.patch
+)
+
+src_compile() {
+ emake -f Makefile.unix CC="$(tc-getCC)"
+}
+
+src_install() {
+ dodir /usr/{bin,share/man}
+ emake -f Makefile.unix DESTDIR="${D}" install
+ dodoc README
+}
diff --git a/app-text/psutils/psutils-2.09.ebuild b/app-text/psutils/psutils-2.09.ebuild
new file mode 100644
index 000000000000..660720704b57
--- /dev/null
+++ b/app-text/psutils/psutils-2.09.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PostScript Utilities"
+HOMEPAGE="https://github.com/rrthomas/psutils http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
+SRC_URI="https://github.com/rrthomas/psutils/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Newer libpaper needed for fork which provides 'paper'
+RDEPEND="
+ >=app-text/libpaper-1.2.3
+ >=dev-lang/perl-5.14
+ dev-perl/IPC-Run3
+"
+BDEPEND="${RDEPEND}"
diff --git a/app-text/pybookreader/Manifest b/app-text/pybookreader/Manifest
deleted file mode 100644
index 25e7ba7e7355..000000000000
--- a/app-text/pybookreader/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyBookReader-0.5.0.tar.gz 285488 BLAKE2B 70f2a5c52e2310fa87c9a1e07d0ef4877ec6448ee288162994b037c4373c269206505d2b2f49b61727650ea251283dcac62bb53ca659cf2fd1c0b9374b534124 SHA512 0eb3b71b58c62706ac6cca70150d28071a0a24e02ae2949a8a26c02f5d060effec941d97ad3c5e4fc5a47fb222c315a91258ef31360e2f164f85b6728e6e239d
diff --git a/app-text/pybookreader/metadata.xml b/app-text/pybookreader/metadata.xml
deleted file mode 100644
index 87f48c530938..000000000000
--- a/app-text/pybookreader/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>grozin@gentoo.org</email>
- <name>Andrey Grozin</name>
- </maintainer>
- <longdescription>A book reader for .fb2 .html and plain text (possibly gzipped)</longdescription>
- <upstream>
- <remote-id type="sourceforge">pybookreader</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild b/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
deleted file mode 100644
index 0164ae4eb511..000000000000
--- a/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="PyBookReader-${PV}"
-
-DESCRIPTION="A book reader for .fb2 .html and plain text (possibly gzipped)"
-HOMEPAGE="http://pybookreader.narod.ru/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
deleted file mode 100644
index 9a0697265e9a..000000000000
--- a/app-text/pylize/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
diff --git a/app-text/pylize/files/pylize-pillow.patch b/app-text/pylize/files/pylize-pillow.patch
deleted file mode 100644
index 0b454b0b1712..000000000000
--- a/app-text/pylize/files/pylize-pillow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Change PIL imports for Pillow compat
-https://bugs.gentoo.org/show_bug.cgi?id=471502
---- a/pylize.in
-+++ b/pylize.in
-@@ -113,7 +113,7 @@
- def mkLogoLink(meta):
- if meta.has_key('logo'):
- try:
-- import Image
-+ from PIL import Image
- if os.path.exists(meta['logo']):
- i = Image.open(meta['logo'])
- else:
diff --git a/app-text/pylize/metadata.xml b/app-text/pylize/metadata.xml
deleted file mode 100644
index cd617926fcf3..000000000000
--- a/app-text/pylize/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>
-pylize is a Python script that generates a set of HTML files that
-make up an on-screen presentation from a master file. The HTML files
-can be viewed with any CSS-aware browser. The master file contains
-the text for all the slides and some additional information like
-title, author etc. pylize can also create a template master file for
-you
-</longdescription>
-</pkgmetadata>
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
deleted file mode 100644
index a82f173bad45..000000000000
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
-HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
-SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
-
-IUSE="doc"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-python/empy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
-
-python_configure() {
- set -- "${PYTHON}" configure.py
- echo "$@"
- "$@" || die
-}
-
-python_compile_all() {
- if use doc; then
- emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize" || die
- fi
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize "${ED%/}/usr/share/pylize"
-}
-
-python_install_all() {
- local DOCS=( Changelog README README.empy TODO )
- use doc && local HTML_DOCS=( doc/. )
- distutils-r1_python_install_all
-}
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
deleted file mode 100644
index 781743a9264a..000000000000
--- a/app-text/pytextile/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
-DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
deleted file mode 100644
index c752a82be216..000000000000
--- a/app-text/pytextile/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="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator.
- Textile simplifies the work of creating (X)HTML.</longdescription>
- <upstream>
- <remote-id type="pypi">textile</remote-id>
- <remote-id type="github">textile/python-textile</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
deleted file mode 100644
index 222e6d2ff4a2..000000000000
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-MY_PN="python-textile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/textile/python-textile"
-SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="
- dev-python/regex[${PYTHON_USEDEP}]
- "
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
- # This resolves a nasty race condition, courtesy of Arfrever
- sed -e 's:with-id = 1::' -i setup.cfg || die
- # remove useless --cov arg injection
- rm pytest.ini || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- py.test || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
deleted file mode 100644
index d06e62c366e2..000000000000
--- a/app-text/pytextile/pytextile-3.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-
-inherit distutils-r1
-
-MY_PN="python-textile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/textile/python-textile"
-SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- # remove useless --cov arg injection
- rm pytest.ini || die
- # remove useless pytest-runner dep
- sed -e "s/pytest-runner//g" -i setup.py || die
-}
-
-python_test() {
- pytest || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
deleted file mode 100644
index 081b6340c159..000000000000
--- a/app-text/q-text-as-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST q-1.5.0.tar.gz 58746 BLAKE2B a35f7ea605a42e81be1ee4899ed9e8c2b4e81e896b6e4c1eb6045b64cc7fa3ffdf6f754be168b3ebe25faa4c8b80f63e2ffff3174231357260263acf335b8d5c SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55
diff --git a/app-text/q-text-as-data/metadata.xml b/app-text/q-text-as-data/metadata.xml
deleted file mode 100644
index 5405551a7a2a..000000000000
--- a/app-text/q-text-as-data/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>robbat2@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">harelba/q</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild b/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
deleted file mode 100644
index 3441091a9944..000000000000
--- a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-# Does not yet support py3
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-r1
-
-DESCRIPTION="A CLI tool that allows direct execution of SQL-like queries on text"
-HOMEPAGE="http://harelba.github.io/q/"
-MY_P="q-${PV}"
-SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# No dependencies other than python >= 2.5
-# http://harelba.github.io/q/requirements.html
-RDEPEND="${PYTHON_DEPS}"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-q_install() {
- python_newexe bin/q q-text-as-data
-}
-
-src_install() {
- python_foreach_impl q_install
- newdoc bin/.qrc dot-qrc
- dodoc doc/*
-}
-
-pkg_postinst() {
- einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;"
- einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'."
-}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index d97b6c54637c..c868a806c643 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,6 +1,9 @@
-DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
-DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
-DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
-DIST qpdf-8.4.0.tar.gz 16981811 BLAKE2B ac0f7b6ab0ca5b421229bf3813cba6b59cc5b7472080246b1384db468e14a4e634f00e1e9e9347e2f8ac8d7e5c15c1b1c18e954f4249298e5ee4778f996fc4ee SHA512 13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028
-DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
-DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
+DIST qpdf-11.7.0-doc.zip 6874893 BLAKE2B b14b0f68f4599bd4f396cccbc35b13b0f52b72856de1afd3fdb0c70b33e1702c4afd7c954011df72905c06ff262b08dc9519e44dcef9b7633423d38208542795 SHA512 7ceeff62788defe3649a8d242220c7c8208ebe92dbd9d67b4b53d5036afb1cdbcfe46b4140b064b0542cba2d8eaaad6eedec1ed7b7bd0ccafe2dd7aa20efaa69
+DIST qpdf-11.7.0.tar.gz 18124824 BLAKE2B aa10e154899a7fd53d696b9521cc8a44d4a336094711ddc2a506dac8841ae12ce5bcd604555725d2b6bae3c63a6a3f6ef0e9ab6baf38dd3d7fa71507234378a3 SHA512 6ee302671fd4513c5b22f101feb773b4101de6cc5ff6b0e25d1daa03df82420f87ce7db49a6c47758d7e8bbc3beeb997d4671d52e4cf0ac0d4f817f10677d1f9
+DIST qpdf-11.7.0.tar.gz.asc 833 BLAKE2B e0b15e6ed6b67fc222f7b4d9f863e8630af814bede3605ca56b83b287d7e02c700092e59f3805565884b55af96c4ddd407331cae26273287b546c32a7975c331 SHA512 ef5aa1661944fd56c3f929ee1ffc78229667ed1d1c639aab82a0ff3a3891455e4dcf3dffbb17e9d22862d6426a263182360b19dd58435a2413c19761abc9b966
+DIST qpdf-11.8.0-doc.zip 6886718 BLAKE2B de4e706cc27a73dffa40561fc1b0342a6c6d5e2b3bced0dbf6dbe43c969911b61f6e74fd3fd871833078ed70c50fca28dd316ad8d6ff0344d668a958a9d1840b SHA512 5b2748d4b0b0367d4fd2773e697f6e125d92c397b62ee63388bce85c74a051e1b17d487941128927e3493669bd00196caa842eee76db0f05827a650a067b6939
+DIST qpdf-11.8.0.tar.gz 18150965 BLAKE2B 6843a268d472c83169d33ef5f216da9428ec84a73a93cd81fde8f122c088ad1401df47c209d7aa4f3a5b950ddef0d8926908b0a9efefad13757eb0ea7dc1db86 SHA512 e558cd4f0066ace73670ead7a49b0343862cdd275bd013eb10cbef6e161a13955101e6d78de8e87bb05a68498c3018152e9d20d61c01dce55d3810e7f5768aa9
+DIST qpdf-11.8.0.tar.gz.asc 833 BLAKE2B 02c0cfec3bab48a3d49783cb68bd6b6c6382536f5d15a54357b54e02b7ef2b5a3517c7448cebf255eebac60feeef2cfe6b42ffe5bfeec5db07db24059f97df69 SHA512 4dce7d90fef819edbb5bb5a46983c9cd6d181f1e58e36b439a0e9e38aca9cb9954fb5f6886cd2284f9852e205a3a4035827f4baa693a96c293ea604dcddb430e
+DIST qpdf-11.9.0-doc.zip 6893438 BLAKE2B 102b7bbe0a7c1b12c2956c3f8e400b4259ca1c95e359308a940a4f8b4c304f6b0866f794fb58eba792fec2e7ad52209cb0c2cad4494358a185b6a9720d0a7cfb SHA512 91a94cbda66a9c3bbbad9a433d9de78b83989757917fb150aa175cebb3aa295ba3e631e84e97cba3df3bdb4715fba411984b293a6b0df0f4549de2a77a4c257f
+DIST qpdf-11.9.0.tar.gz 18552462 BLAKE2B 3f79bef4b8d276cb73db1a08eb72cc67dec803c942c5e6f5322ecfc2fb017c7169aebb6b0790f1789970c86f4c8790465d0315ff8b355dd7e395a02192a605cb SHA512 5e0a990797081f121b3a52fddedea199baf1af260093a384ed6df347e052601622b03c9ff62b7ea069d81464eb0381932428cb8c0565b3686961f7505021a165
+DIST qpdf-11.9.0.tar.gz.asc 833 BLAKE2B 6f00b52643b76828f65ce45ac031a72369753495ee96d5facaf708c80a41a669f5eb407c0e5d25492214813b307fc4cc7ae42b97f9ad6d78d92cc51cc98a87ed SHA512 dd58a1721ce6e15b77bfde1ab68bb37a9d2b1d755872811fb24fadef7be4cf562bb8f8371fd56bdc583d0f6da50654696cc4576234d9fd74319e3f1f2bb7b5cf
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index ce823e597ac8..9248740ded39 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
<name>Gentoo Printing Project</name>
</maintainer>
- <use>
- <flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
- </use>
<upstream>
+ <remote-id type="cpe">cpe:/a:qpdf_project:qpdf</remote-id>
+ <remote-id type="github">qpdf/qpdf</remote-id>
<remote-id type="sourceforge">qpdf</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/qpdf/qpdf-11.7.0.ebuild b/app-text/qpdf/qpdf-11.7.0.ebuild
new file mode 100644
index 000000000000..8139978232c7
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.7.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 cmake verify-sig
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="
+ https://qpdf.sourceforge.io/
+ https://github.com/qpdf/qpdf/
+"
+SRC_URI="
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz
+ doc? (
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip
+ )
+ verify-sig? (
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc
+ )
+"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gnutls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:= )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl[tiff(+)]
+ media-libs/tiff
+ sys-apps/diffutils
+ )
+"
+BDEPEND="
+ dev-lang/perl
+ doc? ( app-arch/unzip )
+ verify-sig? ( sec-keys/openpgp-keys-jberkenbilt )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # glibc only (bug #899052)
+ malloc_info
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc
+
+src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
+src_configure() {
+ local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+ local crypto_provider_lowercase=${crypto_provider,,}
+
+ # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+ local mycmakeargs=(
+ -DINSTALL_EXAMPLES=$(usex examples)
+
+ # Avoid automagic crypto deps
+ -DUSE_IMPLICIT_CRYPTO=OFF
+ -DALLOW_CRYPTO_NATIVE=ON
+
+ # Breaks install with USE=-doc in 11.0.0?
+ #-DINSTALL_MANUAL=ON
+
+ -DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+ -DREQUIRE_CRYPTO_${crypto_provider}=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use doc ; then
+ mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+ fi
+
+ cmake_src_install
+
+ # Completions
+ dobashcomp completions/bash/qpdf
+
+ insinto /usr/share/zsh/site-functions
+ doins completions/zsh/_qpdf
+}
diff --git a/app-text/qpdf/qpdf-11.8.0.ebuild b/app-text/qpdf/qpdf-11.8.0.ebuild
new file mode 100644
index 000000000000..055841cf1036
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.8.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 cmake verify-sig
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="
+ https://qpdf.sourceforge.io/
+ https://github.com/qpdf/qpdf/
+"
+SRC_URI="
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz
+ doc? (
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip
+ )
+ verify-sig? (
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc
+ )
+"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gnutls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:= )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl[tiff(+)]
+ media-libs/tiff
+ sys-apps/diffutils
+ )
+"
+BDEPEND="
+ dev-lang/perl
+ doc? ( app-arch/unzip )
+ verify-sig? ( sec-keys/openpgp-keys-jberkenbilt )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # glibc only (bug #899052)
+ malloc_info
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc
+
+src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
+src_configure() {
+ local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+ local crypto_provider_lowercase=${crypto_provider,,}
+
+ # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+ local mycmakeargs=(
+ -DINSTALL_EXAMPLES=$(usex examples)
+
+ # Avoid automagic crypto deps
+ -DUSE_IMPLICIT_CRYPTO=OFF
+ -DALLOW_CRYPTO_NATIVE=ON
+
+ # Breaks install with USE=-doc in 11.0.0?
+ #-DINSTALL_MANUAL=ON
+
+ -DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+ -DREQUIRE_CRYPTO_${crypto_provider}=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use doc ; then
+ mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+ fi
+
+ cmake_src_install
+
+ # Completions
+ dobashcomp completions/bash/qpdf
+
+ insinto /usr/share/zsh/site-functions
+ doins completions/zsh/_qpdf
+}
diff --git a/app-text/qpdf/qpdf-11.9.0.ebuild b/app-text/qpdf/qpdf-11.9.0.ebuild
new file mode 100644
index 000000000000..055841cf1036
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.9.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 cmake verify-sig
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="
+ https://qpdf.sourceforge.io/
+ https://github.com/qpdf/qpdf/
+"
+SRC_URI="
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz
+ doc? (
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip
+ )
+ verify-sig? (
+ https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz.asc
+ )
+"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gnutls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? ( dev-libs/openssl:= )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl[tiff(+)]
+ media-libs/tiff
+ sys-apps/diffutils
+ )
+"
+BDEPEND="
+ dev-lang/perl
+ doc? ( app-arch/unzip )
+ verify-sig? ( sec-keys/openpgp-keys-jberkenbilt )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # glibc only (bug #899052)
+ malloc_info
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jberkenbilt.asc
+
+src_unpack() {
+ if use verify-sig ; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
+src_configure() {
+ local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+ local crypto_provider_lowercase=${crypto_provider,,}
+
+ # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+ local mycmakeargs=(
+ -DINSTALL_EXAMPLES=$(usex examples)
+
+ # Avoid automagic crypto deps
+ -DUSE_IMPLICIT_CRYPTO=OFF
+ -DALLOW_CRYPTO_NATIVE=ON
+
+ # Breaks install with USE=-doc in 11.0.0?
+ #-DINSTALL_MANUAL=ON
+
+ -DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+ -DREQUIRE_CRYPTO_${crypto_provider}=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use doc ; then
+ mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+ fi
+
+ cmake_src_install
+
+ # Completions
+ dobashcomp completions/bash/qpdf
+
+ insinto /usr/share/zsh/site-functions
+ doins completions/zsh/_qpdf
+}
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
deleted file mode 100644
index 90ccfa2f8961..000000000000
--- a/app-text/qpdf/qpdf-7.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/18"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl[tiff]
- )
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
- perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- CONFIG_SHELL=/bin/bash econf \
- $(use_enable static-libs static) \
- $(use_enable test test-compare-images)
-}
-
-src_install() {
- default
-
- if ! use perl ; then
- rm "${ED}"/usr/bin/fix-qdf || die
- rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/qpdf/qpdf-7.1.1.ebuild b/app-text/qpdf/qpdf-7.1.1.ebuild
deleted file mode 100644
index df045305bb67..000000000000
--- a/app-text/qpdf/qpdf-7.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/18"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl[tiff]
- )
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
- perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- CONFIG_SHELL=/bin/bash econf \
- $(use_enable static-libs static) \
- $(use_enable test test-compare-images)
-}
-
-src_install() {
- default
-
- if ! use perl ; then
- rm "${ED}"/usr/bin/fix-qdf || die
- rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
deleted file mode 100644
index c65bd546a027..000000000000
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl[tiff]
- )
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
- perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable test test-compare-images)
- )
- CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use perl ; then
- rm "${ED%/}"/usr/bin/fix-qdf || die
- rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/qpdf/qpdf-8.4.0.ebuild b/app-text/qpdf/qpdf-8.4.0.ebuild
deleted file mode 100644
index 320e39eb2a68..000000000000
--- a/app-text/qpdf/qpdf-8.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl[tiff]
- )
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
- perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable test test-compare-images)
- )
- CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use perl ; then
- rm "${ED}"/usr/bin/fix-qdf || die
- rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-8.4.1.ebuild b/app-text/qpdf/qpdf-8.4.1.ebuild
deleted file mode 100644
index 4555441c255b..000000000000
--- a/app-text/qpdf/qpdf-8.4.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl[tiff]
- )
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
- perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable test test-compare-images)
- )
- CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use perl ; then
- rm "${ED}"/usr/bin/fix-qdf || die
- rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-8.4.2.ebuild b/app-text/qpdf/qpdf-8.4.2.ebuild
deleted file mode 100644
index 320e39eb2a68..000000000000
--- a/app-text/qpdf/qpdf-8.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
- test? (
- sys-apps/diffutils
- media-libs/tiff
- app-text/ghostscript-gpl[tiff]
- )
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
- perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable test test-compare-images)
- )
- CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use perl ; then
- rm "${ED}"/usr/bin/fix-qdf || die
- rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
- fi
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index ea1c426859c8..75b9a6a5e99d 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,3 +1 @@
-DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
-DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941a00182900e33266a03d9b6ded4b8ba7ac446de9ed8095f8876dfd3ecfb26b20cc146c82d9c9228fd5c136ad36d749061 SHA512 c72f766b0ffb175e0577f08975490b985e859cb41ccf1d6bcdb618664b96b3c4d0fe4ffab2e493ac20b87b85aa658f3beb5b0d430d21deae78df4c503649f1c0
-DIST qpdfview-0.4.18_pre4.tar.gz 782305 BLAKE2B 0e79a30e9774a1afb7f38bd932e8e1b2a7930acca217b7ac485f4857211449f5a8f902706b4638023667002d2f98fc116a180b2ec0219a360fe8c3025023cc39 SHA512 24431a27c279c290ce95a7db52f87e6cade0683dab53a3c494823020a7df9150919af31f20f63ff4c7337f5548b3e7252df0d8a6043a8c50ebb18e41f387838d
+DIST qpdfview-0.5.tar.gz 925408 BLAKE2B 8ce8ff82893c90012ea1b35a582e87783da87e6eba3d4a10e78fe7810c269908ed1541cf40b1eb17fc474254131cebbc4832a3f46a2016262c485d48e222791b SHA512 1b6b479bb42f4568c21b5f6cb0c552c4323739ba9fe46cea80cc199f48b0b49a278e0a2fb0d21f83bafb467e43dd37352b99ef41795d140220bb82d704e03926
diff --git a/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch b/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch
new file mode 100644
index 000000000000..07acf1a02bd3
--- /dev/null
+++ b/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/909037
+--- a/qpdfview.pri
++++ b/qpdfview.pri
+@@ -12,4 +12,4 @@ isEmpty(APP_DIR_DATA_PATH):APP_DIR_DATA_PATH = data
+ win32:include(qpdfview_win32.pri)
+ os2:include(qpdfview_os2.pri)
+
+-CONFIG += c++11
++CONFIG += c++17
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 481838d89529..9e9a7f9e3fdc 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+ </maintainer>
<maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
diff --git a/app-text/qpdfview/qpdfview-0.4.16.ebuild b/app-text/qpdfview/qpdfview-0.4.16.ebuild
deleted file mode 100644
index 8ae9621ec5dc..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.16.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
-
-inherit l10n qmake-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- cups? ( net-print/cups )
- dbus? ( dev-qt/qtdbus:5 )
- djvu? ( app-text/djvu )
- fitz? ( >=app-text/mupdf-1.7:= )
- pdf? (
- >=app-text/poppler-0.35[qt5]
- dev-qt/qtxml:5
- )
- postscript? ( app-text/libspectre )
- sqlite? ( dev-qt/qtsql:5[sqlite] )
- svg? ( dev-qt/qtsvg:5 )
- !svg? ( virtual/freedesktop-icon-theme )
- synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
- local mylrelease="$(qt5_get_bindir)"/lrelease
-
- prepare_locale() {
- "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
- }
-
- rm_help() {
- rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
- }
-
- l10n_find_plocales_changes translations ${PN}_ .ts
- l10n_for_each_locale_do prepare_locale
- l10n_for_each_disabled_locale_do rm_help
-
- # adapt for prefix
- sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
- default
-}
-
-src_configure() {
- local myconfig=() i=
- for i in cups dbus djvu pdf svg synctex; do
- use ${i} || myconfig+=(without_${i})
- done
- use fitz && myconfig+=(with_fitz)
- use postscript || myconfig+=(without_ps)
- use sqlite || myconfig+=(without_sql)
-
- local myqmakeargs=(
- qpdfview.pro
- CONFIG+="${myconfig[@]}"
- PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild
deleted file mode 100644
index a6c1da2e0daa..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
-
-inherit l10n qmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
- cups? ( net-print/cups )
- djvu? ( app-text/djvu )
- fitz? ( >=app-text/mupdf-1.7:= )
- postscript? ( app-text/libspectre )
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5[cups?]
- dev-qt/qtwidgets:5
- dbus? ( dev-qt/qtdbus:5 )
- pdf? ( >=app-text/poppler-0.35[qt5]
- dev-qt/qtxml:5 )
- sqlite? ( dev-qt/qtsql:5[sqlite] )
- svg? ( dev-qt/qtsvg:5 )
- !svg? ( virtual/freedesktop-icon-theme )
- synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
- local mylrelease="$(qt5_get_bindir)"/lrelease
-
- prepare_locale() {
- "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
- }
-
- rm_help() {
- rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
- }
-
- l10n_find_plocales_changes translations ${PN}_ .ts
- l10n_for_each_locale_do prepare_locale
- l10n_for_each_disabled_locale_do rm_help
-
- # adapt for prefix
- sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
- default
-}
-
-src_configure() {
- local myconfig=() i=
- for i in cups dbus djvu pdf svg synctex; do
- use ${i} || myconfig+=(without_${i})
- done
- use fitz && myconfig+=(with_fitz)
- use postscript || myconfig+=(without_ps)
- use sqlite || myconfig+=(without_sql)
-
- local myqmakeargs=(
- qpdfview.pro
- CONFIG+="${myconfig[@]}"
- PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
deleted file mode 100644
index 47d005b062d9..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
-
-inherit l10n qmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
- cups? ( net-print/cups )
- djvu? ( app-text/djvu )
- fitz? ( >=app-text/mupdf-1.7:= )
- postscript? ( app-text/libspectre )
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5[cups?]
- dev-qt/qtwidgets:5
- dbus? ( dev-qt/qtdbus:5 )
- pdf? ( >=app-text/poppler-0.35[qt5]
- dev-qt/qtxml:5 )
- sqlite? ( dev-qt/qtsql:5[sqlite] )
- svg? ( dev-qt/qtsvg:5 )
- !svg? ( virtual/freedesktop-icon-theme )
- synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
- local mylrelease="$(qt5_get_bindir)"/lrelease
-
- prepare_locale() {
- "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
- }
-
- rm_help() {
- rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
- }
-
- l10n_find_plocales_changes translations ${PN}_ .ts
- l10n_for_each_locale_do prepare_locale
- l10n_for_each_disabled_locale_do rm_help
-
- # adapt for prefix
- sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
- default
-}
-
-src_configure() {
- local myconfig=() i=
- for i in cups dbus djvu pdf svg synctex; do
- use ${i} || myconfig+=(without_${i})
- done
- use fitz && myconfig+=(with_fitz)
- use postscript || myconfig+=(without_ps)
- use sqlite || myconfig+=(without_sql)
-
- local myqmakeargs=(
- qpdfview.pro
- CONFIG+="${myconfig[@]}"
- PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-text/qpdfview/qpdfview-0.5.ebuild b/app-text/qpdfview/qpdfview-0.5.ebuild
new file mode 100644
index 000000000000..23bf1eb4974d
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="af ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru rue sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW"
+inherit plocale qmake-utils xdg
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}.0/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+RDEPEND="
+ cups? ( net-print/cups )
+ djvu? ( app-text/djvu )
+ fitz? ( >=app-text/mupdf-1.7:= )
+ postscript? ( app-text/libspectre )
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5[cups?]
+ dev-qt/qtwidgets:5
+ dbus? ( dev-qt/qtdbus:5 )
+ pdf? ( >=app-text/poppler-0.35[qt5]
+ dev-qt/qtxml:5 )
+ sqlite? ( dev-qt/qtsql:5[sqlite] )
+ svg? ( dev-qt/qtsvg:5 )
+ !svg? ( virtual/freedesktop-icon-theme )
+ synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch
+)
+
+src_prepare() {
+ default
+
+ local mylrelease="$(qt5_get_bindir)"/lrelease
+ p_locale() {
+ "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+ }
+
+ rm_help() {
+ rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+ }
+
+ plocale_find_changes translations ${PN}_ .ts
+ plocale_for_each_locale p_locale
+ plocale_for_each_disabled_locale rm_help
+
+ # adapt for prefix
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+}
+
+src_configure() {
+ local myconfig=() i=
+ for i in cups dbus djvu pdf svg synctex; do
+ use ${i} || myconfig+=(without_${i})
+ done
+ use fitz && myconfig+=(with_fitz)
+ use postscript || myconfig+=(without_ps)
+ use sqlite || myconfig+=(without_sql)
+
+ local myqmakeargs=(
+ qpdfview.pro
+ CONFIG+="${myconfig[*]}"
+ PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+ )
+ eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
diff --git a/app-text/qtikz/Manifest b/app-text/qtikz/Manifest
new file mode 100644
index 000000000000..02c04a4cbe9d
--- /dev/null
+++ b/app-text/qtikz/Manifest
@@ -0,0 +1 @@
+DIST ktikz-0.13.2.tar.gz 2043961 BLAKE2B 57c53b70e4d526e8dcec5a1414d76c1d0d7c3412af908e85b56b03605a9c1d097892b7195e7d1e43dcdecd92411e1961276a9f51989797660e3dfd5bdca91acc SHA512 23399a1b70bc6f93683b502160b02fb10e767e51c82b9bf0b4ce985800d8278dec7451442c762919cf37de29d3620cff42661e6c22c63ab1823d087cecb0d847
diff --git a/app-text/qtikz/metadata.xml b/app-text/qtikz/metadata.xml
new file mode 100644
index 000000000000..1c5b023661aa
--- /dev/null
+++ b/app-text/qtikz/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>arthurzam@gentoo.org</email>
+ <name>Arthur Zamarin</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">fhackenberger/ktikz</remote-id>
+ <bugs-to>https://github.com/fhackenberger/ktikz/issues</bugs-to>
+ <changelog>https://github.com/fhackenberger/ktikz/blob/master/Changelog</changelog>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/qtikz/qtikz-0.13.2.ebuild b/app-text/qtikz/qtikz-0.13.2.ebuild
new file mode 100644
index 000000000000..b7f3b0979bc2
--- /dev/null
+++ b/app-text/qtikz/qtikz-0.13.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg optfeature
+
+DESCRIPTION="editor for the TikZ drawing language"
+HOMEPAGE="https://github.com/fhackenberger/ktikz"
+SRC_URI="
+ https://github.com/fhackenberger/ktikz/archive/${PV}.tar.gz -> ktikz-${PV}.tar.gz
+"
+S="${WORKDIR}/ktikz-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ app-text/poppler[qt5]
+"
+RDEPEND="${DEPEND}
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-pictures
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ dev-qt/qthelp:5
+"
+
+src_configure() {
+ local myqmakeargs=(
+ PREFIX=/usr
+ QMAKECOMMAND="$(qt5_get_bindir)/qmake"
+ LRELEASECOMMAND="$(qt5_get_bindir)/lrelease"
+ QCOLLECTIONGENERATORCOMMAND="$(qt5_get_bindir)/qcollectiongenerator"
+ )
+ eqmake5 ${PN}.pro "${myqmakeargs[@]}"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ local DOCS=( README.md )
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "viewing documentation" dev-qt/assistant:5
+}
diff --git a/app-text/queequeg/Manifest b/app-text/queequeg/Manifest
deleted file mode 100644
index 2e0f66a18edc..000000000000
--- a/app-text/queequeg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST queequeg-0.91.tar.gz 69449 BLAKE2B bd9db4bc6be37e8ee327fa5f6072cc4b2bc4b48fbfae194ef2466ebc26478c3ab3aadef212a69bf816ebdcd020c57af2b953eb9ef6a4c6d5be6516255c51666c SHA512 e5366577e587fd3f286c917135cd043ef599ef6ee673757f3538668f749ce6a57c2a257f31f1e9d38724cb6ee4680b4401800c23f84ae27deac75392ab6c5e34
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
deleted file mode 100644
index e7804710f371..000000000000
--- a/app-text/queequeg/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">queequeg</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/queequeg/queequeg-0.91-r2.ebuild b/app-text/queequeg/queequeg-0.91-r2.ebuild
deleted file mode 100644
index bd13a71a2779..000000000000
--- a/app-text/queequeg/queequeg-0.91-r2.ebuild
+++ /dev/null
@@ -1,51 +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 python-single-r1
-
-DESCRIPTION="A checker for English grammar, for people who are not native English"
-HOMEPAGE="http://queequeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-dicts/wordnet"
-RDEPEND="${DEPEND}"
-
-src_compile() {
- local dictdir=/usr/dict
-
- if has_version ">=app-dicts/wordnet-2.0"; then
- dictdir=/usr/share/wordnet/dict
- fi
-
- emake dict WORDNETDICT=${dictdir}
-
- python_fix_shebang qq
-}
-
-src_install() {
- local prefix=/usr/lib/queequeg
-
- python_moduleinto "${prefix}"
- python_domodule *.py
- insinto "${prefix}"
- [[ -f "dict.txt" ]] && doins dict.txt || doins dict.cdb
-
- exeinto "${prefix}"
- doexe qq
- dodir /usr/bin
- dosym ../lib/queequeg/qq /usr/bin/qq
-
- dodoc README TODO
- dodoc htdocs/*
-}
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index b0e3f1c2ec3e..fe3f1ccb63c1 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,2 +1 @@
-DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
-DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
+DIST rarian-0.8.4.tar.bz2 402769 BLAKE2B bc077a6584f7ad0967cdaf298769d1da5ea4b9545191bcf7a8d4f07178666c416b8471a79447e6e3ff52bb2bfd8c55afc7d1638211d245abd9d4efe82c30a7a2 SHA512 5daf8c70438db566f8c4fc6a9b553898e078882307951e7060873fb4c32c12a6482f560f14dab9376917996a3a2f84a36bdf2721fa94c3e63379e3ea0ed131d4
diff --git a/app-text/rarian/metadata.xml b/app-text/rarian/metadata.xml
index 39980802b1da..809a04df5730 100644
--- a/app-text/rarian/metadata.xml
+++ b/app-text/rarian/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+<upstream>
+ <remote-id type="freedesktop-gitlab">rarian/rarian</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
deleted file mode 100644
index f620a54c2025..000000000000
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A documentation metadata library"
-HOMEPAGE="https://rarian.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
- https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-r3-patches.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
- dev-libs/libxslt
- dev-libs/tinyxml
- || (
- sys-apps/util-linux
- app-misc/getopt )
-"
-DEPEND="${RDEPEND}
- !<app-text/scrollkeeper-9999
-"
-
-DOCS=( ChangeLog NEWS README )
-
-PATCHES=(
- "${WORKDIR}"/0001-Fix-uri-of-omf-files-produced-by-rarian-sk-preinstal.patch
- "${WORKDIR}"/0002-Allow-building-against-system-copy-of-tinyxml.patch
- "${WORKDIR}"/0003-Allow-to-specify-only-the-prefix-of-an-info-page-e.g.patch
- "${WORKDIR}"/0004-Fix-a-crash-when-opening-files-without-dots-in-their.patch
- "${WORKDIR}"/0005-Make-librarian-obey-to-LC_MESSAGES.patch
- "${WORKDIR}"/0006-Fix-m4-syntax-so-that-autoreconf-doesn-t-break.patch
- "${WORKDIR}"/0007-Remove-the-nonexistent-dist-gzip-Automake-option.patch
- "${WORKDIR}"/0008-Fix-OMF-category-parsing.patch
- "${WORKDIR}"/0009-Allow-the-getopt-command-to-be-customized-at-configu.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
- # https://bugs.gentoo.org/show_bug.cgi?id=409811
- # https://bugs.freedesktop.org/show_bug.cgi?id=53264
- if ! has_version sys-apps/util-linux; then
- myconf=( --with-getopt=getopt-long )
- fi
-
- econf \
- --localstatedir="${EPREFIX}"/var \
- $(use_enable static-libs static) \
- ${myconf[@]}
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/app-text/rarian/rarian-0.8.4.ebuild b/app-text/rarian/rarian-0.8.4.ebuild
new file mode 100644
index 000000000000..b0989eb38327
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="https://rarian.freedesktop.org/"
+SRC_URI="https://gitlab.freedesktop.org/rarian/rarian/-/releases/${PV}/downloads/assets/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/libxslt
+ dev-libs/tinyxml
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-libs/check-0.9.6 )
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/util-linux
+"
+
+src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}"/var
+ $(use_with test check)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ keepdir /var/lib/rarian
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 60a68bcd2dd9..4f4570366e0c 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,3 +1,3 @@
-DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
-DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
-DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
+DIST recode-3.7.12.tar.gz 2399126 BLAKE2B 420ba6f96d532da4ae0e1861b512c39ad59f1f63b0e0ef061dcff95c15ff4ed82a3b7bb72f6abb29f85588476a76cb5d50151ca9e3f857c2c1c09727ccdd2890 SHA512 365602bf7b20e5362d13d1ab5269419f7f0838fb81dc01c466ea99c38eb1b979f8d707d24ca3dabbd3a0c65cde97704b570007ac60689d88bbafd33351d37d95
+DIST recode-3.7.13.tar.gz 2400432 BLAKE2B 457ba7855aeb5ae8b0cc32ee82b5b61b1b46ba2908406c0c10a76ae242343f421e81038b9bb6784089e8e3e687ecc0f61a6263c24f6b234962f94853e9359734 SHA512 af86754ed2ed1dc414f1dd7ab3564d606abb309766fb02bf085e56241527a74ac7141617956d01b0797e8e426cfb39ec597bd221d8ad58d9246e96b228e65b00
+DIST recode-3.7.14.tar.gz 2297471 BLAKE2B c353c287f0eb8fd461f1a98b47bb6e24067051edf4ef40badb5598b242aad4f560d1097ea826db8dc7f24206a86cc58207090fe746da2be6cd11e5b3d5961567 SHA512 ca0e9aa392f0571cfd1cf9566a15d7651a80edf40d603eadaa4c4ee2d7843ffa9d6074be30a21dac2ab192fe601f8581721d719d055911eeccb455acfe112596
diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch
deleted file mode 100644
index c7bcc27c8750..000000000000
--- a/app-text/recode/files/recode-3.6-as-if.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/283029
-
---- a/m4/flex.m4
-+++ b/m4/flex.m4
-@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
- dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
- AC_DEFUN(ad_AC_PROG_FLEX,
- [AC_CHECK_PROGS(LEX, flex, missing)
--if test "$LEX" = missing; then
-+AS_IF([test "$LEX" = missing], [dnl
- LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
- LEX_OUTPUT_ROOT=lex.yy
- AC_SUBST(LEX_OUTPUT_ROOT)dnl
--else
-+], [:
- AC_PROG_LEX
- AC_DECL_YYTEXT
--fi])
-+])])
diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff
deleted file mode 100644
index 3b7eb8ba20e6..000000000000
--- a/app-text/recode/files/recode-3.6-gettextfix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/239372
-
-patch by Dmitry Karasik
-
---- recode-3.6/m4/gettext.m4
-+++ recode-3.6/m4/gettext.m4
-@@ -109,12 +109,12 @@
- else
- ac_items="$LINGUAS"
- for ac_item in $ac_items; do
-- case "$ALL_LINGUAS" in
-- *$ac_item*)
-+ for supported_item in $ALL_LINGUAS; do
-+ if test "$ac_item" = "$supported_item"; then
- ac_print="$ac_print $ac_item"
- MOFILES="$MOFILES $ac_item.mo"
-- ;;
-- esac
-+ fi
-+ done
- done
- fi
- AC_SUBST(MOFILES)
diff --git a/app-text/recode/files/recode-3.7.13-no-help2man.patch b/app-text/recode/files/recode-3.7.13-no-help2man.patch
new file mode 100644
index 000000000000..bc493d429e28
--- /dev/null
+++ b/app-text/recode/files/recode-3.7.13-no-help2man.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/890256
+https://github.com/rrthomas/recode/commit/dcdd5d26c0c2c49f8113b63186449d6a1e3a509e
+
+From dcdd5d26c0c2c49f8113b63186449d6a1e3a509e Mon Sep 17 00:00:00 2001
+From: Reuben Thomas <rrt@sc3d.org>
+Date: Fri, 6 Jan 2023 20:11:03 +0100
+Subject: [PATCH] src/Makefile.am: allow build without help2man
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnits
+ bin_PROGRAMS = recode
+ lib_LTLIBRARIES = librecode.la
+ noinst_LTLIBRARIES = libmerged.la
+-man_MANS = recode.1
++dist_man_MANS = recode.1
+ include_HEADERS = recode.h recodext.h
+
+ H_STEPS = common.h decsteps.h inisteps.h tersteps.h \
+@@ -100,12 +100,12 @@ merged.c: mergelex.py $(L_STEPS)
+ # Depend on recode$(EXEEXT) rather than explicitly make-ing it, as otherwise
+ # we break parallel builds, as libmerged.la can be built twice in parallel,
+ # which can fail.
+-recode.1: main.c $(top_srcdir)/configure.ac recode$(EXEEXT)
++recode.1: main.c $(top_srcdir)/configure.ac
+ ## Exit gracefully if recode.1 is not writeable, such as during distcheck!
+ $(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
+ $(top_srcdir)/build-aux/missing --run $(HELP2MAN) --locale=en_US.UTF-8 \
+ --name="converts files between character sets" \
+- --output=$@ ./recode; \
++ --output=$@ ./recode$(EXEEXT); \
+ fi
+
+ main.o: main.c ../config.status
+@@ -169,5 +169,3 @@ strip-pool.c strip-data.c: stamp-strip
+ stamp-strip: ../tables.py $(MNEMONICS_DS) $(CHARSETS_DEF)
+ $(TABLES_PY) -C $(srcdir) -p $(MNEMONICS_DS) $(CHARSETS_DEF)
+ @echo timestamp > $(srcdir)/$@
+-
+-DISTCLEANFILES = recode.1
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,5 +1,5 @@
+ # Makefile for Recode regression tests.
+-# Copyright © 1996-2022 Free Software Foundation, Inc.
++# Copyright © 1996-2023 Free Software Foundation, Inc.
+ # François Pinard <pinard@iro.umontreal.ca>, 1988.
+
+ # This program is free software; you can redistribute it and/or modify
+
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
index 3e927f8d7480..e404cde1655d 100644
--- a/app-text/recode/metadata.xml
+++ b/app-text/recode/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
+ <slots>
+ <subslots>SONAME version for librecode</subslots>
+ </slots>
+ <upstream>
+ <remote-id type="github">rrthomas/recode</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
deleted file mode 100644
index c54f1f42b139..000000000000
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE="1.11" # bug 419455
-
-inherit autotools eutils flag-o-matic libtool toolchain-funcs multilib-minimal
-
-MY_P=${P%_*}
-MY_PV=${PV%_*}
-DEB_PATCH=${PV#*p}
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-SRC_URI="
- mirror://gnu/${PN}/${MY_P}.tar.gz
- mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="nls static-libs"
-
-DEPEND="
- sys-devel/flex
- nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # fix #571106 by restoring pre-GCC5 inline semantics
- append-cflags -std=gnu89
-
- rm "${WORKDIR}"/debian/patches/series || die
- epatch \
- "${FILESDIR}/${MY_P}-gettextfix.diff" \
- "${FILESDIR}"/${MY_P}-as-if.patch \
- "${WORKDIR}"/debian/patches/*
- sed -i '1i#include <stdlib.h>' src/argmatch.c || die
-
- # Remove old libtool macros
- rm "${S}"/acinclude.m4 || die
-
- eautoreconf
- elibtoolize
-}
-
-multilib_src_configure() {
- # on solaris -lintl is needed to compile
- [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
- # --without-included-gettext means we always use system headers
- # and library
- ECONF_SOURCE="${S}" econf \
- --without-included-gettext \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -exec rm -v {} + || die
-}
diff --git a/app-text/recode/recode-3.7.12-r1.ebuild b/app-text/recode/recode-3.7.12-r1.ebuild
new file mode 100644
index 000000000000..f1022f1199c3
--- /dev/null
+++ b/app-text/recode/recode-3.7.12-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+# librecode soname version
+SLOT="0/3"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+ ${RDEPEND}
+ app-alternatives/lex
+"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+python_check_deps() {
+ python_has_version "dev-python/cython[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC LD
+
+ # on solaris -lintl is needed to compile
+ [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+ # -fanalyzer substantially slows down the build and isn't useful for
+ # us. It's useful for upstream as it's static analysis, but it's not
+ # useful when just getting something built.
+ export gl_cv_warn_c__fanalyzer=no
+
+ econf \
+ $(use_enable nls) \
+ --disable-static
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/recode/recode-3.7.13.ebuild b/app-text/recode/recode-3.7.13.ebuild
new file mode 100644
index 000000000000..1e3a064b1bd6
--- /dev/null
+++ b/app-text/recode/recode-3.7.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+# librecode soname version
+SLOT="0/3"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+ ${RDEPEND}
+ app-alternatives/lex
+"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-help2man.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/cython[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC LD
+
+ # on solaris -lintl is needed to compile
+ [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+ # -fanalyzer substantially slows down the build and isn't useful for
+ # us. It's useful for upstream as it's static analysis, but it's not
+ # useful when just getting something built.
+ export gl_cv_warn_c__fanalyzer=no
+
+ econf \
+ $(use_enable nls) \
+ --disable-static
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/recode/recode-3.7.14.ebuild b/app-text/recode/recode-3.7.14.ebuild
new file mode 100644
index 000000000000..5c79c92e8c65
--- /dev/null
+++ b/app-text/recode/recode-3.7.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+# librecode soname version
+SLOT="0/3"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+ ${RDEPEND}
+ app-alternatives/lex
+"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+python_check_deps() {
+ python_has_version "dev-python/cython[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC LD
+
+ # On Solaris, -lintl is needed to compile
+ [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+ # -fanalyzer substantially slows down the build and isn't useful for
+ # us. It's useful for upstream as it's static analysis, but it's not
+ # useful when just getting something built.
+ export gl_cv_warn_c__fanalyzer=no
+
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
deleted file mode 100644
index a6c2e5b129fe..000000000000
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
-SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="nls static-libs"
-
-DEPEND="
- sys-devel/flex
- nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/Recode-${REV}"
-
-# tests fail.
-RESTRICT="test"
-
-src_configure() {
- tc-export CC LD
- # on solaris -lintl is needed to compile
- [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
- # --without-included-gettext means we always use system headers
- # and library
- econf \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -v {} + || die
-}
diff --git a/app-text/reed/Manifest b/app-text/reed/Manifest
deleted file mode 100644
index 47ba50db7de7..000000000000
--- a/app-text/reed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST reed-5.4.tar.gz 32414 BLAKE2B 3a74b5d3501a37671247f8f2eb2baa674e6418669ad59825733faeff100ae7920ee43cd5506ecde9a8d733ec8462266166b59b525cf1a74edd1eea9182127ac1 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7
diff --git a/app-text/reed/metadata.xml b/app-text/reed/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/reed/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-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild
deleted file mode 100644
index 10999a62f908..000000000000
--- a/app-text/reed/reed-5.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="This is a text pager (text file viewer), used to display etexts"
-# Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist.
-HOMEPAGE="http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/"
-SRC_URI="http://www.sacredchao.net/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS BUGS NEWS README )
-
-src_prepare() {
- sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \
- -e 's: wrap::' \
- -e 's:-s reed:reed:' \
- -e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \
- -i Makefile.in || die
- rm wrap.1 #Collision with talkfilters, bug #247396
- tc-export CC PKG_CONFIG
-}
-
-src_configure() {
- ./configures --prefix=/usr || die
-}
diff --git a/app-text/refbase/metadata.xml b/app-text/refbase/metadata.xml
index 4652275b5605..63cb8119895d 100644
--- a/app-text/refbase/metadata.xml
+++ b/app-text/refbase/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/app-text/refbase/refbase-0.9.6_p20180223.ebuild b/app-text/refbase/refbase-0.9.6_p20180223.ebuild
index 425caca6082e..6962ac419d28 100644
--- a/app-text/refbase/refbase-0.9.6_p20180223.ebuild
+++ b/app-text/refbase/refbase-0.9.6_p20180223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,18 +7,19 @@ inherit webapp
DESCRIPTION="Web-based solution for managing scientific literature, references and citations"
HOMEPAGE="http://www.refbase.net/"
SRC_URI="https://sourceforge.net/code-snapshots/svn/r/re/refbase/code/refbase-code-r1422-branches-bleeding-edge.zip -> ${P}.zip"
+
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND=">=dev-lang/php-5.3[mysql,mysqli(+),session]
virtual/httpd-php
app-admin/webapp-config
app-text/bibutils"
-DEPEND="app-arch/unzip"
+
+BDEPEND="app-arch/unzip"
S="${WORKDIR}/${PN}-code-r1422-branches-bleeding-edge"
-src_install () {
+src_install() {
webapp_src_preinst
DOCS="AUTHORS BUGS ChangeLog NEWS README TODO UPDATE"
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
deleted file mode 100644
index f45f90060c1d..000000000000
--- a/app-text/referencer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
diff --git a/app-text/referencer/files/referencer-1.2.2-lib_path.patch b/app-text/referencer/files/referencer-1.2.2-lib_path.patch
deleted file mode 100644
index 220b47d8b488..000000000000
--- a/app-text/referencer/files/referencer-1.2.2-lib_path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dominik Kriegner <dominik.kriegner@gmail.com>
-Date: Tue, 29 Nov 2016 09:56:00 +0000
-Subject: [PATCH] fix build issue
-Patch's original author is Askhat Bakarov on arch
-https://aur.archlinux.org/cgit/aur.git/commit/?h=referencer&id=961f2b5e4b286f27f610e5267465c63021b8a50f
-
-Project-Bug-URL: https://bugs.launchpad.net/referencer/+bug/1645639
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=601174
-merged upstream: http://bazaar.launchpad.net/~referencer-devs/referencer/trunk/revision/939
-
---- a/src/Document.C 2014-01-27 03:43:00.000000000 +0700
-+++ b/src/Document.C 2016-11-03 16:25:00.698676538 +0700
-@@ -297,7 +297,7 @@
-
- lib_path = lib_path->get_parent();
- up_dir_level += "../";
-- if (lib_path == 0) {
-+ if (!lib_path) {
- doc_is_relative_to_library = false;
- break;
- }
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
deleted file mode 100644
index 8b254b7dbc9a..000000000000
--- a/app-text/referencer/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>dominik.kriegner@gmail.com</email>
- <name>Dominik Kriegner</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
- <remote-id type="launchpad">referencer</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/referencer/referencer-1.2.2-r1.ebuild b/app-text/referencer/referencer-1.2.2-r1.ebuild
deleted file mode 100644
index 6e6d213af97b..000000000000
--- a/app-text/referencer/referencer-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit xdg python-single-r1 flag-o-matic
-
-DESCRIPTION="Application to organise documents or references, and to generate BibTeX files"
-HOMEPAGE="https://launchpad.net/referencer"
-SRC_URI="https://launchpad.net/${PN}/1./${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=app-text/poppler-0.12.3-r3[cairo]
- >=dev-cpp/gtkmm-2.8:2.4
- >=dev-cpp/libglademm-2.6.0
- >=dev-cpp/gconfmm-2.14.0
- >=dev-libs/boost-1.52.0-r4:="
-
-DEPEND="
- ${RDEPEND}
- >=app-text/gnome-doc-utils-0.3.2
- virtual/pkgconfig
- >=dev-lang/perl-5.8.1
- dev-perl/libxml-perl
- dev-util/intltool
- app-text/rarian
- test? ( app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper-dtd:1.0 )"
-
-PATCHES=( ${FILESDIR}/${PN}-${PV}-lib_path.patch )
-
-src_prepare () {
- default
- python_fix_shebang plugins
-}
-
-src_configure() {
- append-cxxflags -std=gnu++11
- econf \
- --disable-update-mime-database \
- --enable-python
-}
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index ab5a5916cc9a..624ca952093e 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,2 +1 @@
-DIST restview-2.8.1.tar.gz 46103 BLAKE2B 3f5b8852b1d174736333461181e9cad06c16ea8ac40e5041c5bf8246360e161609d99ac26a7a32f1dec518c017a30ecf1ac46eea80569b0d213ae62bee8ecc5d SHA512 cbc6057df06a108ced9bfbc7442730c8bbe3bbe334eb6f708dd54e899ed6630bfb05e532c403a9a1a36b170dbe933a5829ada3b014147a3834c492456ca65363
-DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c
+DIST restview-3.0.0.tar.gz 49774 BLAKE2B 21a8a25964b995287ce8c584424eae8db5d6190ebf60a435a9af50a9995083fba61d5ccd1a06b1eb193590bc68219f98298a4773fab565bd711cca1eacd8149b SHA512 55b053f03964eb637245810894e970e16a3d1be4587e44802410afbb5c046921e7f3c07825e4f7889569d2f7a980f0a320835d0c2994bb5df0d66c3ebcffc797
diff --git a/app-text/restview/metadata.xml b/app-text/restview/metadata.xml
index 573ddfb8edd2..f8194520164f 100644
--- a/app-text/restview/metadata.xml
+++ b/app-text/restview/metadata.xml
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">restview</remote-id>
- </upstream>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">mgedmin/restview</remote-id>
+ <remote-id type="pypi">restview</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/restview/restview-2.8.1.ebuild b/app-text/restview/restview-2.8.1.ebuild
deleted file mode 100644
index b7a7637a5e31..000000000000
--- a/app-text/restview/restview-2.8.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/readme_renderer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGES.rst )
-
-python_test() {
- esetup.py test
-}
diff --git a/app-text/restview/restview-2.9.2.ebuild b/app-text/restview/restview-2.9.2.ebuild
deleted file mode 100644
index 01d1f9c130b6..000000000000
--- a/app-text/restview/restview-2.9.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/readme_renderer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGES.rst )
-
-python_test() {
- esetup.py test
-}
diff --git a/app-text/restview/restview-3.0.0.ebuild b/app-text/restview/restview-3.0.0.ebuild
new file mode 100644
index 000000000000..b26aed69c63b
--- /dev/null
+++ b/app-text/restview/restview-3.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="
+ https://mg.pov.lt/restview/
+ https://pypi.org/project/restview/
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/readme-renderer[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+distutils_enable_tests pytest
diff --git a/app-text/rman/files/rman-3.2-format-security.patch b/app-text/rman/files/rman-3.2-format-security.patch
index 77070026bdb9..4ea7740a6822 100644
--- a/app-text/rman/files/rman-3.2-format-security.patch
+++ b/app-text/rman/files/rman-3.2-format-security.patch
@@ -1,8 +1,3 @@
- rman.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rman.c b/rman.c
-index d09e547..e5fc88d 100644
--- a/rman.c
+++ b/rman.c
@@ -1372,7 +1372,7 @@ HTML(enum command cmd) {
diff --git a/app-text/rman/files/rman-3.2-gentoo.diff b/app-text/rman/files/rman-3.2-gentoo.diff
deleted file mode 100644
index ece1e3807e66..000000000000
--- a/app-text/rman/files/rman-3.2-gentoo.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urN rman-3.2.orig/Makefile rman-3.2/Makefile
---- rman-3.2.orig/Makefile 2003-07-26 12:15:00.000000000 -0700
-+++ rman-3.2/Makefile 2005-07-12 01:01:37.000000000 -0700
-@@ -15,13 +15,8 @@
- # this must be a directory that's in your bin PATH.
- # MANDIR holds the man page.
-
--BINDIR = /opt/local/bin
--#BINDIR = /usr/local/bin
--#BINDIR = //C/bin
--MANDIR = /usr/local/man/man1
--# popular alternative
--#BINDIR = /opt/local/bin
--#MANDIR = /opt/local/man/man1
-+BINDIR = /usr/bin
-+MANDIR = /usr/share/man/man1
-
-
- ### if you have GNU gcc, use these definitions
diff --git a/app-text/rman/files/rman-3.2-gentoo.patch b/app-text/rman/files/rman-3.2-gentoo.patch
new file mode 100644
index 000000000000..676d555ce375
--- /dev/null
+++ b/app-text/rman/files/rman-3.2-gentoo.patch
@@ -0,0 +1,18 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,13 +15,8 @@
+ # this must be a directory that's in your bin PATH.
+ # MANDIR holds the man page.
+
+-BINDIR = /opt/local/bin
+-#BINDIR = /usr/local/bin
+-#BINDIR = //C/bin
+-MANDIR = /usr/local/man/man1
+-# popular alternative
+-#BINDIR = /opt/local/bin
+-#MANDIR = /opt/local/man/man1
++BINDIR = /usr/bin
++MANDIR = /usr/share/man/man1
+
+
+ ### if you have GNU gcc, use these definitions
diff --git a/app-text/rman/files/rman-3.2-incompatible-pointer-types.patch b/app-text/rman/files/rman-3.2-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..bb7645c23f34
--- /dev/null
+++ b/app-text/rman/files/rman-3.2-incompatible-pointer-types.patch
@@ -0,0 +1,24 @@
+From 1120713781a5da03a56d3f8d59904c0fd20f6dd6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@proton.me>
+Date: Mon, 11 Dec 2023 17:05:26 -0600
+Subject: [PATCH] fix build with -Werror=incompatible-pointer-types
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
+--- a/rman.c
++++ b/rman.c
+@@ -268,7 +268,7 @@ stricmp(const char *s1, const char *s2) {
+ else return 1;
+ }
+
+-int lcexceptionscmp(const char **a, const char **b) { return stricmp(*a, *b); }
++int lcexceptionscmp(const void *a, const void *b) { return stricmp((const char *)a, (const char *)b); }
+
+ int
+ strincmp(const char *s1, const char *s2, size_t n) {
+--
+2.43.0
+
diff --git a/app-text/rman/files/rman-3.2-ldflags.patch b/app-text/rman/files/rman-3.2-ldflags.patch
index 4a6f5f5d9eab..7f0745b2e0f2 100644
--- a/app-text/rman/files/rman-3.2-ldflags.patch
+++ b/app-text/rman/files/rman-3.2-ldflags.patch
@@ -1,7 +1,5 @@
-Index: rman-3.2/Makefile
-===================================================================
---- rman-3.2.orig/Makefile
-+++ rman-3.2/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -102,7 +102,7 @@ all: rman
# everyone but me zaps assertions with the -DNDEBUG flag
diff --git a/app-text/rman/metadata.xml b/app-text/rman/metadata.xml
index 142b07948920..fc390f3663dc 100644
--- a/app-text/rman/metadata.xml
+++ b/app-text/rman/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index d891857e3a63..5a1788b76257 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan"
HOMEPAGE="https://sourceforge.net/projects/polyglotman/"
@@ -11,17 +11,15 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
RESTRICT="test"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.diff \
- "${FILESDIR}"/${P}-ldflags.patch \
- "${FILESDIR}"/${P}-format-security.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-format-security.patch
+)
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/app-text/rman/rman-3.2-r2.ebuild b/app-text/rman/rman-3.2-r2.ebuild
new file mode 100644
index 000000000000..aa1eb01c9cef
--- /dev/null
+++ b/app-text/rman/rman-3.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan"
+HOMEPAGE="https://sourceforge.net/projects/polyglotman/"
+SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-incompatible-pointer-types.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+}
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
new file mode 100644
index 000000000000..86ed0c9de3fc
--- /dev/null
+++ b/app-text/rnc2rng/Manifest
@@ -0,0 +1,2 @@
+DIST rnc2rng-2.6.6.tar.gz 18089 BLAKE2B be9b2a22770bed034b4ad93bba23dba7e1f58c553cef4e1a507a00ffb62c6f6e937df22e4d5f2fd3c542acebd72adb82320cddf34f873d35f442be0d457b3cba SHA512 a0f108383ad927c2d9e1cc11960ddaab99a8cb4bf0417cd8e7ccdbc7925746b2fa8c1cbd96a74e89f7166eb8e330c224a49d97aa2ef5d83d7a0c4254240fb308
+DIST rnc2rng-2.7.0.tar.gz 19000 BLAKE2B 37375d2608c2fc5ffb87521de8d83f0d4a70449d399ea6d181b40c7e6f561c27e0e2ac6d4df5b0086890b626366cd6b8ceca60580f05a3bbd152d7315808fb1f SHA512 29507e49d29f7da23dcf24fd1328dd4ee0aa37192817d6d2c9ec76ede56a1c6b041ffdb6b755e2e9b0c155f4f68616cb7f9a49e711e4e389097c97840b5e3e66
diff --git a/app-text/rnc2rng/metadata.xml b/app-text/rnc2rng/metadata.xml
new file mode 100644
index 000000000000..03867676a63c
--- /dev/null
+++ b/app-text/rnc2rng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ulm@gentoo.org</email>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">djc/rnc2rng</remote-id>
+ <remote-id type="pypi">rnc2rng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild
new file mode 100644
index 000000000000..6128abda57bf
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.6.6-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+ "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-text/rnc2rng/rnc2rng-2.7.0.ebuild b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild
new file mode 100644
index 000000000000..6128abda57bf
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+ "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 453784645d4c..435382f3cbd2 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">rnv</remote-id>
</upstream>
diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild
index 1ca31dcce3d1..4d5043c9f5c4 100644
--- a/app-text/rnv/rnv-1.7.11-r1.ebuild
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit unpacker toolchain-funcs
DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
@@ -26,7 +26,9 @@ src_prepare() {
src_configure() {
LIBS="-ldl -lm" \
- econf --with-scm="/usr"
+ econf \
+ --with-scm-inc="/usr/include" \
+ --with-scm-lib="/usr/$(get_libdir)"
}
src_install() {
diff --git a/app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch b/app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch
new file mode 100644
index 000000000000..db2b112641a8
--- /dev/null
+++ b/app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/troff_generator.c b/Source/troff_generator.c
+index 1b123b8..94ddcda 100644
+--- a/Source/troff_generator.c
++++ b/Source/troff_generator.c
+@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include <ctype.h>
+
+ #include <sys/param.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+
+ #include "troff_generator.h"
+ #include "util.h"
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index a746d82a0260..dcd3426ebeb1 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>4z0r@ovidiu.at</email>
+ <maintainer type="person" proxied="yes">
+ <email>ovi@ovidiu.at</email>
<name>Ovidiu - Dan Bogat</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/app-text/robodoc/robodoc-4.99.43-r1.ebuild b/app-text/robodoc/robodoc-4.99.43-r1.ebuild
new file mode 100644
index 000000000000..df1ddb680824
--- /dev/null
+++ b/app-text/robodoc/robodoc-4.99.43-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Automating Software Documentation"
+HOMEPAGE="https://www.xs4all.nl/~rfsber/Robo/robodoc.html"
+SRC_URI="https://rfsber.home.xs4all.nl/Robo/archives/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+PATCHES=(
+ "${FILESDIR}/${P}_clean_libc.patch"
+)
+
+RDEPEND=">=dev-util/ctags-5.3.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ default
+
+ insinto /usr/share/${PN}
+ doins Contributions/*
+
+ if use examples; then
+ insinto /usr/share/${PN}
+ doins -r Examples/PerlExample
+ fi
+}
diff --git a/app-text/robodoc/robodoc-4.99.43.ebuild b/app-text/robodoc/robodoc-4.99.43.ebuild
index e539d2a3d151..2055ffdc5a0a 100644
--- a/app-text/robodoc/robodoc-4.99.43.ebuild
+++ b/app-text/robodoc/robodoc-4.99.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,12 +15,6 @@ IUSE="examples"
RDEPEND=">=dev-util/ctags-5.3.1"
DEPEND="${RDEPEND}"
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking
-}
-
src_install() {
default
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
new file mode 100644
index 000000000000..5a7001dc6a9c
--- /dev/null
+++ b/app-text/ronn-ng/Manifest
@@ -0,0 +1,2 @@
+DIST ronn-ng-0.10.1.tar.gz 78696 BLAKE2B 1e56b90c5919e0a1af317da78161b34124268521fbc379fbba09ff9cb344073665460abc53fd961e4773ee444f33fba7e72ae3f6af84f8a170cfb1e89e557922 SHA512 3f6ee5355c7a19d5cb04c1b677028dd13ad2ff620acdb2e83d9b6f154a7b1e7b5a77ea0bcfbcef4bbb46a60b1c0fbc52fda079ff860c83a71f89b8fed0b83665
+DIST ronn-ng-0.9.1.gem 69120 BLAKE2B 9da30156104ef448c458199ee33fb5369f7d97c7bbeac8072567127b964456a34226bcc15f72d6f2875f524175d31ec9652a282b369e818748790cd07f290786 SHA512 5ad7dc426d9bc77bca86fbb06775a3b19f1b8d79f5a4331d117e9fa394e7a9c3b0440b70b993672d77a24f56f5da3ebd0e41a5183f4330707b7ddb83c9108bdf
diff --git a/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch b/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch
new file mode 100644
index 000000000000..b9e05cfff455
--- /dev/null
+++ b/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch
@@ -0,0 +1,40 @@
+https://github.com/apjanke/ronn-ng/commit/e194bf62b1d0c0828cc83405e60dc5ece829e62f
+
+From e194bf62b1d0c0828cc83405e60dc5ece829e62f Mon Sep 17 00:00:00 2001
+From: Andrew Janke <andrew@apjanke.net>
+Date: Fri, 6 Jan 2023 07:25:48 -0500
+Subject: [PATCH] Workaround for Psych 4.0+ in tests
+
+Psych 4.0, shipped with Ruby 3.1, switched to a "safe load" by default, and requires you to explicitly set allowed classes. But previous Psych versions didn't support this kwarg, so the call needs to be made differently depending on which version of Psych/Ruby this is running under.
+
+Co-authored-by: Takuya Noguchi <takninnovationresearch@gmail.com>
+---
+ test/test_ronn_document.rb | 7 ++++++-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/test/test_ronn_document.rb b/test/test_ronn_document.rb
+index 75788dc..cd573fe 100644
+--- a/test/test_ronn_document.rb
++++ b/test/test_ronn_document.rb
+@@ -137,6 +137,11 @@ def canonicalize(text)
+
+ test 'converting to yaml' do
+ require 'yaml'
++ actual = begin
++ YAML.load(@doc.to_yaml, permitted_classes: [Time])
++ rescue ArgumentError # Remove this line when Ruby 3.0.x support is dropped
++ YAML.load(@doc.to_yaml)
++ end
+ assert_equal({
+ 'section' => '1',
+ 'name' => 'hello',
+@@ -146,7 +151,7 @@ def canonicalize(text)
+ 'toc' => [['NAME', 'NAME']],
+ 'organization' => nil,
+ 'manual' => nil
+- }, YAML.load(@doc.to_yaml))
++ }, actual)
+ end
+
+ test 'converting to json' do
+
diff --git a/app-text/ronn-ng/metadata.xml b/app-text/ronn-ng/metadata.xml
new file mode 100644
index 000000000000..34c0224a9905
--- /dev/null
+++ b/app-text/ronn-ng/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">apjanke/ronn-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/ronn-ng/ronn-ng-0.10.1.ebuild b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
new file mode 100644
index 000000000000..d1fb0d67cc93
--- /dev/null
+++ b/app-text/ronn-ng/ronn-ng-0.10.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown"
+HOMEPAGE="https://github.com/apjanke/ronn-ng"
+SRC_URI="https://github.com/apjanke/ronn-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND+="!app-text/ronn"
+
+DEPS="
+ >=dev-ruby/kramdown-2.1:2
+ >=dev-ruby/kramdown-parser-gfm-1.0.1:1
+ >=dev-ruby/nokogiri-1.14.3:0
+"
+
+ruby_add_rdepend "
+ =dev-ruby/mustache-1*
+ ${DEPS}
+"
+
+ruby_add_bdepend "${DEPS}"
+
+all_ruby_prepare() {
+ # Avoid tests with code blocks that are fragile for e.g. presence /
+ # absence of a source highlighter.
+ rm -f test/code_blocks*.ro{ff,nn} || die
+}
+
+each_ruby_prepare() {
+ # Make sure that we always use the right interpreter during tests
+ sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb || die
+ # ... and during the man page build.
+ sed -i -e "/sh 'ronn/s:ronn:${RUBY} bin/ronn:" Rakefile || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/ronn.1 man/ronn-format.7
+}
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild
new file mode 100644
index 000000000000..52d4f1f76746
--- /dev/null
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown"
+HOMEPAGE="https://github.com/apjanke/ronn-ng"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~arm64-macos"
+
+IUSE=""
+
+RDEPEND+="!app-text/ronn"
+
+DEPS="
+ >=dev-ruby/kramdown-2.1:2
+ >=dev-ruby/nokogiri-1.9.0:0
+"
+
+ruby_add_rdepend "
+ =dev-ruby/mustache-1*
+ ${DEPS}
+"
+
+ruby_add_bdepend "${DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-psych-4-tests.patch
+)
+
+all_ruby_prepare() {
+ sed -i -e '/mustache/ s/0.7/1.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+ # Make sure that we always use the right interpreter during tests
+ sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb || die
+ # ... and during the man page build.
+ sed -i -e "/sh 'ronn/s:ronn:${RUBY} bin/ronn:" Rakefile || die
+}
+
+each_ruby_compile() {
+ #if ! [[ -f man/ronn.1 ]] ; then
+ # einfo "Building man pages using ${RUBY}"
+ # PATH="${S}/bin:${PATH}" ${RUBY} -S rake man || die
+ #fi
+ :;
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/ronn.1 man/ronn-format.7
+}
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
deleted file mode 100644
index fe5035bfa679..000000000000
--- a/app-text/ronn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml
deleted file mode 100644
index dfaa4cf0e494..000000000000
--- a/app-text/ronn/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>ruby@gentoo.org</email>
- <name>Gentoo Ruby Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">rtomayko/ronn</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
deleted file mode 100644
index 9c72157f73c1..000000000000
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and HTML"
-HOMEPAGE="https://github.com/rtomayko/ronn/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-IUSE=""
-
-DEPS="
- >=dev-ruby/hpricot-0.8.2
- >=dev-ruby/mustache-0.7.0
- >=dev-ruby/rdiscount-1.5.8"
-
-ruby_add_rdepend "${DEPS}"
-
-ruby_add_bdepend "${DEPS}"
-
-all_ruby_prepare() {
- # Avoid test failing due to changes in hash handling in ruby 1.8.7:
- # https://github.com/rtomayko/ronn/issues/56
- sed -i -e '81 s:^:#:' test/test_ronn.rb || die
-}
-
-each_ruby_prepare() {
- # Make sure that we always use the right interpreter during tests.
- sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
-}
-
-all_ruby_compile() {
- PATH="${S}/bin:${PATH}" rake man || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/ronn.1 man/ronn-format.7
-}
diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest
index 22504e8ef825..663bf3fe4630 100644
--- a/app-text/rpl/Manifest
+++ b/app-text/rpl/Manifest
@@ -1 +1,3 @@
-DIST rpl-1.5.5.tar.gz 11397 BLAKE2B 29511d894a7b3e67cfdf4378902219acedb0a0b85c4a9c8aa879f9cede8ad57aeefd91b21ee79ac01b924a64b2f48248896f31ffb6934a4f79dda135114ebca9 SHA512 f43af366b8fc34b6c4578841f50046170810187119eb0730405a082f64d5c095fd9d28fabf1f0fda1dad85f24e98047df4d695b39b7ea5b99d32efc18634000f
+DIST rpl-1.15.2.gh.tar.gz 25452 BLAKE2B 95c826723683786411ff4ff5fe3a31ef4784fd682a735c369b758137aaf94b936aa4c714ed5db51c987710bb79dfeb46a8ec5837f97242d488ea4d92d980f202 SHA512 67418a89e3ab8770dce4945d3db5d7a54986ba4357a902249062d28d9abda5856c82e41092b703e138fe6d70e6ea3c5f5cd57eead83d0d39addda6c746e85d81
+DIST rpl-1.15.5.gh.tar.gz 24401 BLAKE2B 91f0914ce80167305f9b403f691e58cd3f219d9e22f0ae7587b6dc5c60809e03bf38bd3878696916026b7cd0e597b67a6fcbb97d55005fd113e80aa7296f0e95 SHA512 1669a2de5b09090a3058421e2f9560f9b155151ec6d91f9d4f3b43070082d2541981de7754f047771c515e6d1450998c55e3b018a589a5ae4bd48e28464bb858
+DIST rpl-1.9.1.gh.tar.gz 22858 BLAKE2B 583a29fd34d7a0d2b3a35b0966a6bd42ac2851750806a97846785dc0331bd5d2199ffba3309184e64a4aa7194f9ae4b9ecb2acc500830b841bd34e2184ec1798 SHA512 be480c6788fa1eb672b892d798deb7d263eae227dac5d93a55f28ebf3b4a43f896eb10edd00e52aad1cd57f4a80faf4a4552b4762b26da273cd05f0c5bce754a
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
index 4962fc76aac4..a973364c904e 100644
--- a/app-text/rpl/metadata.xml
+++ b/app-text/rpl/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">rpl</remote-id>
+ <remote-id type="github">rrthomas/rpl</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/rpl/rpl-1.15.2.ebuild b/app-text/rpl/rpl-1.15.2.ebuild
new file mode 100644
index 000000000000..902a5491d3c1
--- /dev/null
+++ b/app-text/rpl/rpl-1.15.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="http://rpl.sourceforge.net/
+ https://github.com/rrthomas/rpl"
+SRC_URI="
+ https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+ dev-python/argparse-manpage[${PYTHON_USEDEP}]
+ sys-apps/help2man[nls]
+"
diff --git a/app-text/rpl/rpl-1.15.5.ebuild b/app-text/rpl/rpl-1.15.5.ebuild
new file mode 100644
index 000000000000..7137111d7232
--- /dev/null
+++ b/app-text/rpl/rpl-1.15.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_11 )
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="https://rpl.sourceforge.net/ https://github.com/rrthomas/rpl"
+SRC_URI="
+ https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+BDEPEND="
+ ${RDEPEND}
+ dev-python/argparse-manpage[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/chainstream[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest-datafiles[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i "s/VERSION = importlib.metadata.version('rpl')/VERSION = '${PV}'/" rpl/__init__.py || die
+ distutils-r1_src_prepare
+}
diff --git a/app-text/rpl/rpl-1.5.5-r1.ebuild b/app-text/rpl/rpl-1.5.5-r1.ebuild
deleted file mode 100644
index 11c7d47074cb..000000000000
--- a/app-text/rpl/rpl-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Intelligent recursive search/replace utility"
-HOMEPAGE="http://rpl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-python_prepare_all() {
- iconv -f latin1 -t utf8 -o setup.py.new setup.py || die
- mv setup.py.new setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman ${PN}.1
-}
diff --git a/app-text/rpl/rpl-1.9.1.ebuild b/app-text/rpl/rpl-1.9.1.ebuild
new file mode 100644
index 000000000000..8cbb8fa54646
--- /dev/null
+++ b/app-text/rpl/rpl-1.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="http://rpl.sourceforge.net/ https://github.com/rrthomas/rpl"
+SRC_URI="https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+ dev-python/argparse-manpage[${PYTHON_USEDEP}]
+ sys-apps/help2man[nls]
+"
+
+python_compile_all() {
+ # Compile man file
+ emake rpl.1
+}
diff --git a/app-text/rtf2html/metadata.xml b/app-text/rtf2html/metadata.xml
index 9de0fd52d0e2..ed64c873d352 100644
--- a/app-text/rtf2html/metadata.xml
+++ b/app-text/rtf2html/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
index d5f0c353c4c1..f48b71d62643 100644
--- a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
+++ b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
-
-inherit base flag-o-matic
+EAPI=7
DESCRIPTION="RTF to HTML converter"
HOMEPAGE="http://rtf2html.sourceforge.net/"
@@ -12,23 +10,12 @@ SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
src_prepare() {
+ default
+
# CFLAGS are incorrectly parsed, so handle this here
sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed'
- use !debug && filter-flags "-g*"
-
- base_src_prepare
-}
-
-src_configure() {
- econf $(use_enable debug)
}
diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
deleted file mode 100644
index 328c9e906856..000000000000
--- a/app-text/sablotron/files/1.0.3-libsablot-expat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
-index abd2041..1307b1c 100644
---- a/src/engine/Makefile.am
-+++ b/src/engine/Makefile.am
-@@ -76,4 +76,5 @@ include_HEADERS = \
- sabcfg.h
-
- libsablot_la_LDFLAGS = -version-info 100:3:100
-+libsablot_la_LIBADD = @EXPAT_LIBS@
-
diff --git a/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
new file mode 100644
index 000000000000..edc1e3141d94
--- /dev/null
+++ b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
@@ -0,0 +1,11 @@
+--- a/src/command/sabcmd.cpp
++++ b/src/command/sabcmd.cpp
+@@ -168,7 +168,7 @@
+
+ char askhelp[] = "Type sabcmd --help to display a help message.\n";
+ char msgConflict[] = "conflict with preceding switches: ";
+-char version_txt[] = "\nsabcmd "SAB_VERSION" ("SAB_DATE")\n"\
++char version_txt[] = "\nsabcmd " SAB_VERSION " (" SAB_DATE ")\n"\
+ "copyright (C) 2000 - 2005 Ginger Alliance (www.gingerall.com)\n";
+ char dbg_usage[] = "\nDebugging options:\n"\
+ "\t--debug\t\t\tdisplay results of the command line parse\n"\
diff --git a/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
new file mode 100644
index 000000000000..3dcf8c881efa
--- /dev/null
+++ b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/894710
+--- a/src/engine/hash.cpp
++++ b/src/engine/hash.cpp
+@@ -305,8 +305,8 @@ void HashTable::report(Sit S, MsgType type, MsgCode code, const Str& arg1, const
+
+ oolong hash(const Str& key)
+ {
+- register oolong a, b, c, len;
+- register const char *k = (const char*) key;
++ oolong a, b, c, len;
++ const char *k = (const char*) key;
+
+ /* Set up the internal state */
+ len = key.length();
diff --git a/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch
new file mode 100644
index 000000000000..614a6d7ffe24
--- /dev/null
+++ b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch
@@ -0,0 +1,8 @@
+--- a/src/engine/Makefile.am
++++ b/src/engine/Makefile.am
+@@ -76,4 +76,5 @@ include_HEADERS = \
+ sabcfg.h
+
+ libsablot_la_LDFLAGS = -version-info 100:3:100
++libsablot_la_LIBADD = @EXPAT_LIBS@
+
diff --git a/app-text/sablotron/metadata.xml b/app-text/sablotron/metadata.xml
index 6f49eba8f496..5e2c2974f79d 100644
--- a/app-text/sablotron/metadata.xml
+++ b/app-text/sablotron/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">sablotron</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
deleted file mode 100644
index 622e9320de00..000000000000
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An XSLT Parser in C++"
-HOMEPAGE="http://www.gingerall.org/sablotron.html"
-SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
-
-# Sablotron can optionally be built under GPL, using MPL for now
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND=">=dev-libs/expat-1.95.6-r1"
-DEPEND="${RDEPEND}
- >=dev-perl/XML-Parser-2.3"
-
-PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
-
-src_prepare() {
- default
- sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- econf \
- $(use_enable perl perlconnect) \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README README_JS RELEASE src/TODO
-}
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..0dcfdf96034b
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN="Sablot"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="https://sourceforge.net/projects/sablotron/"
+SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
+
+# Sablotron can optionally be built under GPL, using MPL for now
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl"
+
+RDEPEND="
+ >=dev-libs/expat-1.95.6-r1
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ >=dev-perl/XML-Parser-2.3
+"
+DOCS=(
+ README README_JS RELEASE src/TODO
+)
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
+ "${FILESDIR}"/${PN}-1.0.3-cxx11.patch
+)
+
+src_prepare() {
+ default
+ sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable perl perlconnect) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/sablotron/sablotron-1.0.3-r3.ebuild b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..d702dafc4941
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="Sablot-${PV}"
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="https://sourceforge.net/projects/sablotron/"
+SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+# Sablotron can optionally be built under GPL, using MPL for now
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl"
+
+DEPEND=">=dev-libs/expat-1.95.6-r1"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-perl/XML-Parser-2.3"
+
+DOCS=( README README_JS RELEASE src/TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
+ "${FILESDIR}"/${PN}-1.0.3-cxx11.patch
+ "${FILESDIR}"/${PN}-1.0.3-drop-register-keyword.patch
+)
+
+src_prepare() {
+ default
+ sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable perl perlconnect)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
deleted file mode 100644
index 4f68b792fa7f..000000000000
--- a/app-text/sary/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sary-1.2.0.tar.gz 393787 BLAKE2B bcfb393dbae4b5edd51b35a9bb542a1988a4293a321a72f9e3fbce48abbd034bcb96bac915fb330166c5d8adcb2f2b572e808b76508c0411521aef722422c074 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632
diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
deleted file mode 100644
index c7ef82c510d5..000000000000
--- a/app-text/sary/metadata.xml
+++ /dev/null
@@ -1,16 +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>Sary is a suffix array library and tools. It provides
-fast full-text search facilities for text files on the order of 10 to
-100 MB using a data structure called a suffix array. It can also
-search specific fields in a text file by assigning index points to
-those fields.</longdescription>
- <upstream>
- <remote-id type="sourceforge">sary</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/sary/sary-1.2.0-r1.ebuild b/app-text/sary/sary-1.2.0-r1.ebuild
deleted file mode 100644
index 1155888702a7..000000000000
--- a/app-text/sary/sary-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="Sary: suffix array library and tools"
-HOMEPAGE="http://sary.sourceforge.net/"
-SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
-IUSE="static-libs"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- echo "libsary_la_LIBADD = @GLIB_LIBS@" >> sary/Makefile.am || die
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
- eautoreconf
-}
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- dodoc AUTHORS ChangeLog NEWS README TODO
-
- if ! use static-libs ; then
- find "${ED}" -name '*.la' -delete
- fi
-
-}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index c96515c8bed0..c0a6b67afccb 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,4 +1 @@
-DIST scdoc-1.3.1.tar.gz 9392 BLAKE2B 609f25252f0ee864ba3500961aa1048c6490278f4861fb4494ca62365a20d0cb128e53a6397bd089bd5a37f25f7f3c080f6921f1c4f4ca7e4af729c87e1994fc SHA512 6064de8c76eb959708b32e93634223565e5d4b390069d4fcd2d87d27bb472a333c60b21de87d676eb57ff5f8ed6445d3c3bd92dfe7dd611f9886abc38e8d21d2
-DIST scdoc-1.5.2.tar.gz 10542 BLAKE2B 07ceb1b3b57026a4e67e575f02042c2c882cdbd29712a4d3726ff39b4356bb63a35a99b21dd68fee31aad6fb2df14b1886bb2694098bc9096c5ff9e41600e7c4 SHA512 755c1c7fbae6cbeb75ca2aa2498cb3b2cf644e5118188c3e4a4636d74764b475b1818dcb5bd08ff70e017af9c1f8cb2e351db36a2cc98885724731e4247201eb
-DIST scdoc-1.8.1.tar.gz 11204 BLAKE2B 0427aae7aa6ad5a5258d3e00f9ea87f4faa9c3c8f9931fbed66659eaf62263c32377ee3ea68afdd7c02720f0550b1c8a9f8849245f1ec560ce86c198f6c44d0c SHA512 16845acac3d59eb878f1a41d5fa95d9910166da3ac292173506b778d29f5289a26a6529aac765c07b2e04bbc6924b32b68ff68f7491a03a1050e53251a193eaf
-DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
+DIST scdoc-1.11.3.tar.gz 12768 BLAKE2B c39ed51f9279aa8a08bbd99a3d3780ef37654a37f687c7de340266d9c7a6edceb8f6824baaa34c756440d45bd51611ab28f7f2e42ea632b943f6018d6e5f5a04 SHA512 fbecc505b44c396890c53c05183d34336160dbd02993ee120421fc6e2a3ec78ba349747e8acfe97af956a0081c923309290ff97fb7babafbc3ca8addc9ec92f9
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index 442a873c810e..4160f5fe1fa2 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -1,15 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>hilobakho@gmail.com</email>
- <name>Mykyta Holubakha</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>arthurzam@gentoo.org</email>
+ <name>Arthur Zamarin</name>
</maintainer>
<upstream>
- <remote-id type="github">swaywm/sway</remote-id>
+ <remote-id type="sourcehut">~sircmpwn/scdoc</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/scdoc/scdoc-1.11.3.ebuild b/app-text/scdoc/scdoc-1.11.3.ebuild
new file mode 100644
index 000000000000..e8aa2def5372
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.11.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+ inherit git-r3
+else
+ SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+ default
+
+ sed -e 's/-Werror//' \
+ -i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+ local MY_HS="./scdoc"
+ if tc-is-cross-compiler; then
+ tc-export_build_env
+ MY_HS="./hostscdoc"
+ emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+ CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+ mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+ fi
+
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+ PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/scdoc/scdoc-1.3.1.ebuild b/app-text/scdoc/scdoc-1.3.1.ebuild
deleted file mode 100644
index c8999bc80532..000000000000
--- a/app-text/scdoc/scdoc-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' \
- -e 's/CFLAGS=/CFLAGS+=/' \
- -i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
- local MY_HS="./scdoc"
- if tc-is-cross-compiler; then
- tc-export_build_env
- MY_HS="./hostscdoc"
- emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
- mv scdoc hostscdoc || die 'Failed to rename host scdoc'
- fi
- emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
-}
diff --git a/app-text/scdoc/scdoc-1.5.2.ebuild b/app-text/scdoc/scdoc-1.5.2.ebuild
deleted file mode 100644
index 3c018008f000..000000000000
--- a/app-text/scdoc/scdoc-1.5.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
- inherit git-r3
-else
- SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' \
- -i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
- local MY_HS="./scdoc"
- if tc-is-cross-compiler; then
- tc-export_build_env
- MY_HS="./hostscdoc"
- emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
- mv scdoc hostscdoc || die 'Failed to rename host scdoc'
- fi
- emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
-}
diff --git a/app-text/scdoc/scdoc-1.8.1.ebuild b/app-text/scdoc/scdoc-1.8.1.ebuild
deleted file mode 100644
index 2e828db3f05e..000000000000
--- a/app-text/scdoc/scdoc-1.8.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
- inherit git-r3
-else
- SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' \
- -i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
- local MY_HS="./scdoc"
- if tc-is-cross-compiler; then
- tc-export_build_env
- MY_HS="./hostscdoc"
- emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
- mv scdoc hostscdoc || die 'Failed to rename host scdoc'
- fi
- emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
-}
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
deleted file mode 100644
index 13560ac4771e..000000000000
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
- inherit git-r3
-else
- SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' \
- -i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
- local MY_HS="./scdoc"
- if tc-is-cross-compiler; then
- tc-export_build_env
- MY_HS="./hostscdoc"
- emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
- mv scdoc hostscdoc || die 'Failed to rename host scdoc'
- fi
- emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
- PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
-}
diff --git a/app-text/scdoc/scdoc-1.9.3.ebuild b/app-text/scdoc/scdoc-1.9.3.ebuild
deleted file mode 100644
index d32ef2884483..000000000000
--- a/app-text/scdoc/scdoc-1.9.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
- inherit git-r3
-else
- SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
- default
-
- sed -e 's/-Werror//' \
- -i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
- local MY_HS="./scdoc"
- if tc-is-cross-compiler; then
- tc-export_build_env
- MY_HS="./hostscdoc"
- emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
- CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
- mv scdoc hostscdoc || die 'Failed to rename host scdoc'
- fi
- emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" install
-}
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index a73e37542026..938aa8493a7c 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT"
@@ -35,10 +35,11 @@ src_compile() {
CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
mv scdoc hostscdoc || die 'Failed to rename host scdoc'
fi
- emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
- PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+ PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
}
diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
index d23324a6570b..8bfd28e95fc7 100644
--- a/app-text/scrollkeeper-dtd/metadata.xml
+++ b/app-text/scrollkeeper-dtd/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">scrollkeeper</remote-id>
</upstream>
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
deleted file mode 100644
index 581c5f9bd798..000000000000
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DTD_FILE="scrollkeeper-omf.dtd"
-
-DESCRIPTION="DTD from the Scrollkeeper package"
-HOMEPAGE="http://scrollkeeper.sourceforge.net/"
-SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}"
-
-LICENSE="FDL-1.1"
-SLOT="1.0"
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.4.19"
-DEPEND="${RDEPEND}
- !<app-text/scrollkeeper-9999-r1"
-
-S="${WORKDIR}"
-
-src_unpack() { :; }
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
- insinto /usr/share/xml/scrollkeeper/dtds
- doins "${DISTDIR}/${DTD_FILE}"
-}
-
-pkg_postinst() {
- einfo "Installing catalog..."
-
- # Install regular DOCTYPE catalog entry
- "${EROOT}"usr/bin/xmlcatalog --noout --add "public" \
- "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
- "${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
- "${EROOT}"etc/xml/catalog
-
- # Install catalog entry for calls like: xmllint --dtdvalid URL ...
- "${EROOT}"usr/bin/xmlcatalog --noout --add "system" \
- "${SRC_URI}" \
- "${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
- "${EROOT}"etc/xml/catalog
-}
-
-pkg_postrm() {
- # Remove all sk-dtd from the cache
- einfo "Cleaning catalog..."
-
- "${EROOT}"usr/bin/xmlcatalog --noout --del \
- "${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
- "${EROOT}"etc/xml/catalog
-}
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild
new file mode 100644
index 000000000000..850565cc4b1b
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DTD_FILE="scrollkeeper-omf.dtd"
+
+DESCRIPTION="DTD from the Scrollkeeper package"
+HOMEPAGE="https://scrollkeeper.sourceforge.net/"
+SRC_URI="https://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}"
+S="${WORKDIR}"
+
+LICENSE="FDL-1.1"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+RDEPEND=">=dev-libs/libxml2-2.4.19"
+DEPEND="${RDEPEND}"
+
+src_unpack() { :; }
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/xml/scrollkeeper/dtds
+ doins "${DISTDIR}/${DTD_FILE}"
+}
+
+pkg_postinst() {
+ einfo "Installing catalog..."
+
+ # Install regular DOCTYPE catalog entry
+ "${EROOT}"/usr/bin/xmlcatalog --noout --add "public" \
+ "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+ "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+ "${EROOT}"/etc/xml/catalog
+
+ # Install catalog entry for calls like: xmllint --dtdvalid URL ...
+ "${EROOT}"/usr/bin/xmlcatalog --noout --add "system" \
+ "${SRC_URI}" \
+ "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+ "${EROOT}"/etc/xml/catalog
+}
+
+pkg_postrm() {
+ # Remove all sk-dtd from the cache
+ einfo "Cleaning catalog..."
+
+ "${EROOT}"/usr/bin/xmlcatalog --noout --del \
+ "${EROOT}"/usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+ "${EROOT}"/etc/xml/catalog
+}
diff --git a/app-text/scrollkeeper/metadata.xml b/app-text/scrollkeeper/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/app-text/scrollkeeper/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
deleted file mode 100644
index bb8c99747484..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Dummy scrollkeeper for testing rarian"
-HOMEPAGE="https://gnome.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~app-text/scrollkeeper-dtd-1.0"
-RDEPEND=""
-PDEPEND="app-text/rarian"
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index c30f650ef318..0425d328344b 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1 +1 @@
-DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
+DIST sdcv-0.5.4.tar.gz 66706 BLAKE2B 9cb481f497483b502bec18765b9cbc31e8dd278e30ebd29005158a724669e171181a82c837b63016b9e88a84973831587d2b137bbbdb2290a89a73d3f0917f81 SHA512 6bae3a2c0f37ed9380f54715626efeea0df75d2525baa583c0915bba4d082d9ece40ee799a1e1bb5d36b7ccebace853653b6fab57d472a432b910f690235ee21
diff --git a/app-text/sdcv/files/sdcv-0.5.3-t_list.patch b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
new file mode 100644
index 000000000000..c26a93522bd1
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/t_list b/tests/t_list
+index a8c92c4..c410cf2 100755
+--- a/tests/t_list
++++ b/tests/t_list
+@@ -1,11 +1,10 @@
+ #!/bin/sh
+
+ PATH_TO_SDCV="$1"
+-ndicts=`"$PATH_TO_SDCV" -l | wc -l`
++TEST_DIR="$2"
++ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
+ ndicts=$(($ndicts-1))
+-ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
+-nspe=`find "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic -name "*.ifo" | wc -l`
+-nmy=$(($ncom+$nspe))
++nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
+
+ if [ $nmy -ne $ndicts ]; then
+ echo "should be: $nmy, we have: $ndicts" >&2
diff --git a/app-text/sdcv/files/sdcv-t_list.patch b/app-text/sdcv/files/sdcv-t_list.patch
deleted file mode 100644
index 8bd23892fc7a..000000000000
--- a/app-text/sdcv/files/sdcv-t_list.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sdcv-0.5.2/tests/t_list.orig 2017-08-16 10:14:23.000000000 +0300
-+++ sdcv-0.5.2/tests/t_list 2018-08-26 15:12:31.501052398 +0300
-@@ -1,11 +1,10 @@
- #!/bin/sh
-
- PATH_TO_SDCV="$1"
--ndicts=`"$PATH_TO_SDCV" -l | wc -l`
-+TEST_DIR="$2"
-+ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
- ndicts=$(($ndicts-1))
--ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
--nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
--nmy=$(($ncom+$nspe))
-+nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
-
- if [ $nmy -ne $ndicts ]; then
- echo "should be: $nmy, we have: $ndicts" >&2
diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index 0b6f03db0294..734e5e979f92 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <longdescription>sdcv - console version of StarDict program.</longdescription>
+ <!-- maintainer-needed -->
<use>
<flag name="darkterm">Improve readability of color output on terminals with
dark background.</flag>
diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
deleted file mode 100644
index 59a8f62a0b14..000000000000
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="https://dushistov.github.io/sdcv/"
-SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="darkterm nls readline test"
-
-RDEPEND="
- >=dev-libs/glib-2.6.1
- sys-libs/zlib
- readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
- nls? ( >=sys-devel/gettext-0.14.1 )
- test? ( app-misc/jq )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-t_list.patch"
- "${FILESDIR}/${PN}-t_interactive.patch"
-)
-
-src_prepare() {
- if use darkterm; then
- sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
- fi
-
- rm_loc() {
- rm "po/${1}.po" || die
- }
- l10n_for_each_disabled_locale_do rm_loc
-
- # do not install locale-specific man pages unless asked to
- if ! has uk ${LINGUAS-uk}; then
- sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_NLS="$(usex nls)"
- -DWITH_READLINE="$(usex readline)"
- -DBUILD_TESTS="$(usex test ON OFF)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use nls && cmake-utils_src_compile lang
-}
-
-src_install() {
- # with USE=nls, but empty intersection of LINGUAS and list of
- # supported translations, this directory is required, see bug 583386
- mkdir -p "${BUILD_DIR}/locale"
- cmake-utils_src_install
- dodoc doc/DICTFILE_FORMAT
-}
diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
new file mode 100644
index 000000000000..3e098b509d52
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+inherit cmake plocale
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/"
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+IUSE="darkterm nls readline test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.36
+ sys-libs/zlib
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ nls? ( >=sys-devel/gettext-0.14.1 )
+ test? ( app-misc/jq )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.5.3-t_list.patch"
+ "${FILESDIR}/${PN}-t_interactive.patch"
+)
+
+src_prepare() {
+ if use darkterm; then
+ sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+ fi
+
+ rm_loc() {
+ rm "po/${1}.po" || die
+ }
+ plocale_for_each_disabled_locale rm_loc
+
+ # do not install locale-specific man pages unless asked to
+ if ! has uk ${LINGUAS-uk}; then
+ sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_NLS="$(usex nls)"
+ -DWITH_READLINE="$(usex readline)"
+ -DBUILD_TESTS="$(usex test ON OFF)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use nls && cmake_src_compile lang
+}
+
+src_install() {
+ # with USE=nls, but empty intersection of LINGUAS and list of
+ # supported translations, this directory is required, see bug 583386
+ mkdir -p "${BUILD_DIR}/locale"
+ cmake_src_install
+ dodoc doc/DICTFILE_FORMAT
+}
diff --git a/app-text/sgml-common/metadata.xml b/app-text/sgml-common/metadata.xml
index 6f49eba8f496..076793e3f54b 100644
--- a/app-text/sgml-common/metadata.xml
+++ b/app-text/sgml-common/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
deleted file mode 100644
index 4ae7b574b727..000000000000
--- a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Base ISO character entities and utilities for SGML"
-HOMEPAGE="https://www.iso.org/standard/16387.html"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
-
-src_prepare() {
- # We use a hacked version of install-catalog that supports the ROOT
- # variable, puts quotes around the CATALOG files, and can be prefixed.
- cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
- || die "Copy of install-catalog.in failed"
-
- default
- eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
-}
-
-pkg_postinst() {
- local installer="${EROOT%/}/usr/bin/install-catalog"
- if [[ ! -x ${installer} ]]; then
- eerror "install-catalog not found! Something went wrong!"
- die "install-catalog not found! Something went wrong!"
- fi
-
- einfo "Installing Catalogs..."
- "$installer" --add \
- "${EROOT%/}"/etc/sgml/sgml-ent.cat \
- "${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
- "$installer" --add \
- "${EROOT%/}"/etc/sgml/sgml-docbook.cat \
- "${EROOT%/}"/etc/sgml/sgml-ent.cat
-
- local file
- while IFS="" read -d $'\0' -r file; do
- einfo "Fixing ${file}"
- awk '/"$/ { print $1 " " $2 }
- ! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new || die "awk failed"
- mv ${file}.new ${file} || die "mv failed"
- done < <(find "${EROOT%/}/etc/sgml/" -name "*.cat" -o -name "catalog" -print0)
-}
-
-pkg_prerm() {
- cp "${EROOT%/}/usr/bin/install-catalog" "${T}" || die "cp failed"
-}
-
-pkg_postrm() {
- if [[ ! -x ${T}/install-catalog ]]; then
- return
- fi
-
- einfo "Removing Catalogs..."
- if [[ -e ${EROOT%/}/etc/sgml/sgml-ent.cat ]]; then
- "${T}"/install-catalog --remove \
- "${EROOT%/}"/etc/sgml/sgml-ent.cat \
- "${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog \
- || die "install-catalog failed"
- fi
-
- if [[ -e ${EROOT%/}/etc/sgml/sgml-docbook.cat ]]; then
- "${T}"/install-catalog --remove \
- "${EROOT%/}"/etc/sgml/sgml-docbook.cat \
- "${EROOT%/}"/etc/sgml/sgml-ent.cat \
- || die "install-catalog failed"
- fi
-}
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
new file mode 100644
index 000000000000..a9d1f6dfcdd8
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix sgml-catalog-r1
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="https://www.iso.org/standard/16387.html"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
+
+LICENSE="FDL-1.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
+
+src_prepare() {
+ # We use a hacked version of install-catalog that supports the ROOT
+ # variable, puts quotes around the CATALOG files, and can be prefixed.
+ cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
+ || die "Copy of install-catalog.in failed"
+
+ default
+ eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
+}
+
+src_install() {
+ default
+
+ # own /etc/sgml/catalog
+ insinto /etc/sgml
+ newins - catalog <<<''
+ newins - sgml-ent.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+ EOF
+ newins - sgml-docbook.cat <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+ EOF
+}
+
+pkg_preinst() {
+ # preserve old files
+ local f
+ for f in /etc/sgml/{catalog,sgml-docbook.cat}; do
+ if [[ -s ${EROOT}${f} ]]; then
+ cp "${EROOT}${f}" "${ED}${f}" || die
+ fi
+ done
+
+ # and back them up in case postrm killed them
+ for f in sgml-ent.cat sgml-docbook.cat; do
+ cp "${ED}/etc/sgml/${f}" "${T}" || die
+ done
+}
+
+pkg_postinst() {
+ # restore backed up files if necessary
+ for f in sgml-ent.cat sgml-docbook.cat; do
+ if ! cmp -s "${T}/${f}" "${EROOT}/etc/sgml/${f}"; then
+ cp "${T}/${f}" "${EROOT}"/etc/sgml/ || die
+ fi
+ done
+
+ # re-append sgml-ent.cat if necessary
+ if ! grep -q -s sgml-ent.cat "${EROOT}/etc/sgml/sgml-docbook.cat"; then
+ ebegin "Adding sgml-ent.cat to /etc/sgml/sgml-docbook.cat"
+ cat >> "${EROOT}/etc/sgml/sgml-docbook.cat" <<-EOF
+ CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+ EOF
+ eend ${?}
+ fi
+
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ ebegin "Removing sgml-ent.cat from /etc/sgml/sgml-docbook.cat"
+ sed -i -e '/sgml-ent\.cat/d' \
+ "${EROOT}"/etc/sgml/sgml-docbook.cat
+ eend ${?}
+ if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+ rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+ fi
+ fi
+
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
deleted file mode 100644
index a2359f4ff667..000000000000
--- a/app-text/sgmltools-lite/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
-DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
deleted file mode 100644
index 465570abcce8..000000000000
--- a/app-text/sgmltools-lite/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-needed -->
- <use>
- <flag name="jadetex">
- Add support for <pkg>app-text/jadetex</pkg> (for processing
- tex files produced by the TeX backend of Jade)
- </flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">sgmltools-lite</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
deleted file mode 100644
index 533ea51065bf..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 sgml-catalog
-
-DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/sgmltools-lite/${P}.tar.gz
- mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="jadetex"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/sgml-common
- app-text/docbook-sgml-dtd:3.1
- app-text/docbook-dsssl-stylesheets
- app-text/openjade
- jadetex? ( app-text/jadetex )
- || (
- www-client/w3m
- www-client/lynx
- )"
-DEPEND=${RDEPEND}
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \
- "/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
-
-src_prepare() {
- ecvs_clean
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- einstall etcdir="${D}"/etc/sgml
-
- dodoc ChangeLog POSTINSTALL README*
- dohtml -r .
-
- insinto /usr/share/sgml/docbook/dsssl-stylesheets/
- doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images
-
- rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die
-
- # Remove file provided by sgml-common
- rm "${ED}"/usr/bin/sgmlwhich || die
-
- # List of backends to alias with sgml2*
- # Do not provide sgml2{txt,rtf,html} anymore, they are part of
- # linuxdoc-tools
- local BACKENDS=""
- if use jadetex; then
- BACKENDS="ps dvi pdf"
- else
- # Remove the backends that require jadetex
- rm "${D}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die
- fi
-
- # Create simple alias scripts that people are used to
- # And make the manpages for those link to the sgmltools-lite manpage
- mandir="${D}"/usr/share/man/man1
- ScripTEXT="#!/bin/sh\n/usr/bin/sgmltools --backend="
- for back in ${BACKENDS}; do
- echo -e ${ScripTEXT}${back} '$*' > sgml2${back}
- dobin sgml2${back}
-
- ln -sf sgmltools-lite.1 "${mandir}/sgml2${back}.1" || die
- done
-
- python_fix_shebang "${D}"
- python_optimize "${ED%/}/usr/share/sgml/misc/sgmltools/python"
-}
-
-pkg_postinst() {
- sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
- sgml-catalog_pkg_postrm
-}
diff --git a/app-text/sgrep/files/sgrep-1.94a-clang16.patch b/app-text/sgrep/files/sgrep-1.94a-clang16.patch
new file mode 100644
index 000000000000..8892f79bbb01
--- /dev/null
+++ b/app-text/sgrep/files/sgrep-1.94a-clang16.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/871036
+--- a/sgrep.h
++++ b/sgrep.h
+@@ -20,2 +20,3 @@
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+@@ -616,2 +617,3 @@
+ int create_index(const IndexOptions *options);
++int index_query(IndexOptions *options, int argc, char *argv[]);
+ int add_region_to_index(struct IndexWriterStruct *writer,
diff --git a/app-text/sgrep/metadata.xml b/app-text/sgrep/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/sgrep/metadata.xml
+++ b/app-text/sgrep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/sgrep/sgrep-1.94a-r2.ebuild b/app-text/sgrep/sgrep-1.94a-r2.ebuild
new file mode 100644
index 000000000000..de456e40df77
--- /dev/null
+++ b/app-text/sgrep/sgrep-1.94a-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
+HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
+SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i "s:/usr/lib:${EPREFIX}/etc:g" sgrep.1 || die
+
+ # Clang 16, bug #900533
+ eautoreconf
+}
+
+src_configure() {
+ econf --datadir="${EPREFIX}"/etc
+}
+
+src_install() {
+ dobin sgrep
+ doman sgrep.1
+ dodoc AUTHORS ChangeLog NEWS README sample.sgreprc
+
+ insinto /etc
+ newins sample.sgreprc sgreprc
+}
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a.ebuild
deleted file mode 100644
index 2f7bae2fad40..000000000000
--- a/app-text/sgrep/sgrep-1.94a.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
-
-DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
-SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
-HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
- default
- sed -i -e "s:/usr/lib:/etc:g" sgrep.1 || die
-}
-
-src_configure() {
- econf --datadir="${EPREFIX}"/etc
-}
-
-src_install() {
- dobin sgrep
- doman sgrep.1
- dodoc AUTHORS ChangeLog NEWS README sample.sgreprc
- insinto /etc
- newins sample.sgreprc sgreprc
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 8d13bc890bf0..d45ce28ccf21 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,3 +1,3 @@
-DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706 SHA512 cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
-DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
-DIST sigil-0.9.17.tar.gz 21262675 BLAKE2B fdba78eb1167e97c4190d7ae6d8d6de8055e0cac0e1105a3bdc1ddacbfa2f8403a293018ec464c72b8024f1ef0c1e9b230ca90586fdbb1d2fb3826e0fd327137 SHA512 ae233cdd62ab114d6c600f0fe75f9778e8cbb60bc7d81c99e10b6e20b9b85246de6c281d255b46a85c4d531e70ee1beffde1aa172c7b027121e097b4fb8e338c
+DIST Sigil_User_Guide_2022.05.17.epub 8894634 BLAKE2B 8a7c5b5add54d87dfe791a0dbbc0c6cd37ae2eb2ff77f46ae36643785fb714d9fbc0fe470d024f7112be2933ca4fb57a4bfdfd340083be15fffca69296640ea9 SHA512 bac3f55d28d02f53c8fdac51333194e0f27c6669876360a6d0244b1e2683dae0e7046977fab6e75dba7170c8aca3a7539f3d6cddab3ddc3e45985930c455968a
+DIST sigil-2.0.2.tar.gz 26683849 BLAKE2B 4e72f63553569339710b7dd19992d9498c068235cf90189df2957ed8cec9963e5b53d2ba96313734e911d55e665ac95317b334274ed118874d8e499971f2e85a SHA512 b6fa7ff7e9fa568f93c61755f531e51cb26e149118da7873dafccacb1495346276389780435270237ed3d60e9c56fc153de9548859563039ea3070d347a1f6ca
+DIST sigil-2.1.0.tar.gz 26918715 BLAKE2B d31aeea2ef0de2ecdedd50329bdf306e53aca0d4615cc97efa45013670b1f47af6a6152da4fdee20bf3a02c99f9b1337f07347170d50f28ddf48a52a089a5fc0 SHA512 542d6fc71b0353e3b5440d40e4c9f205c5205fb3e409935015b8f3689f8dcc74d8a96035963a740791f3a8acd63b2e0d81afe9be7716098e0727be6daf6c8ceb
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index ec9790cba787..4daa9a331609 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,19 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>arthurzam+gentoo@gmail.com</email>
+ <email>arthurzam@gentoo.org</email>
<name>Arthur Zamarin</name>
</maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
- It is designed to edit books in ePub format.</longdescription>
<use>
<flag name="plugins">Installed needed Python packages for using Sigil plugins</flag>
- <flag name="system-mathjax">Use the system-wide <pkg>dev-libs/mathjax</pkg> instead of bundled</flag>
</use>
<upstream>
<remote-id type="github">Sigil-Ebook/Sigil</remote-id>
diff --git a/app-text/sigil/sigil-0.9.13.ebuild b/app-text/sigil/sigil-0.9.13.ebuild
deleted file mode 100644
index 4fe858867563..000000000000
--- a/app-text/sigil/sigil-0.9.13.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
-
-MY_P="Sigil-${PV}"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-text/hunspell:=
- dev-libs/boost:=[threads]
- dev-libs/libpcre:3=[pcre16]
- dev-libs/mathjax
- dev-libs/xerces-c[icu]
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-qt/qtconcurrent-5.4:5
- >=dev-qt/qtcore-5.4:5
- >=dev-qt/qtgui-5.4:5
- >=dev-qt/qtprintsupport-5.4:5
- >=dev-qt/qtwebkit-5.4:5
- >=dev-qt/qtwidgets-5.4:5
- >=dev-qt/qtxmlpatterns-5.4:5
- sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_configure() {
- python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
- local mycmakeargs=(
- -DINSTALL_BUNDLED_DICTS=0
- -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax
- -DUSE_SYSTEM_LIBS=1
- -DSYSTEM_LIBS_REQUIRED=1
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
- -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${ED}"/usr/share/sigil/
- python_optimize "${ED}"/usr/share/sigil/
- DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
deleted file mode 100644
index f2afdb994b88..000000000000
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-text/hunspell:=
- dev-libs/boost:=[threads]
- dev-libs/libpcre:3=[pcre16]
- dev-libs/xerces-c[icu]
- dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-qt/qtconcurrent-5.12:5
- >=dev-qt/qtcore-5.12:5
- >=dev-qt/qtgui-5.12:5
- >=dev-qt/qtprintsupport-5.12:5
- >=dev-qt/qtwebengine-5.12:5[widgets]
- >=dev-qt/qtwidgets-5.12:5
- >=dev-qt/qtxmlpatterns-5.12:5
- sys-libs/zlib[minizip]
- plugins? (
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- )
- system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_prepare() {
- # bundled is a exact copy of the package, and upstream plan to switch soon
- rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
- local mycmakeargs=(
- -DINSTALL_BUNDLED_DICTS=0
- -DUSE_SYSTEM_LIBS=1
- -DSYSTEM_LIBS_REQUIRED=1
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
- -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
- )
- use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${ED}"/usr/share/sigil/
- python_optimize "${ED}"/usr/share/sigil/
- DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-0.9.17.ebuild b/app-text/sigil/sigil-0.9.17.ebuild
deleted file mode 100644
index 2faaf3abb786..000000000000
--- a/app-text/sigil/sigil-0.9.17.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-text/hunspell:=
- dev-libs/boost:=[threads]
- dev-libs/libpcre:3=[pcre16]
- dev-libs/xerces-c[icu]
- dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-qt/qtconcurrent-5.12:5
- >=dev-qt/qtcore-5.12:5
- >=dev-qt/qtgui-5.12:5
- >=dev-qt/qtprintsupport-5.12:5
- >=dev-qt/qtwebengine-5.12:5[widgets]
- >=dev-qt/qtwidgets-5.12:5
- >=dev-qt/qtxmlpatterns-5.12:5
- sys-libs/zlib[minizip]
- plugins? (
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- )
- system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_prepare() {
- # bundled is a exact copy of the package, and upstream plan to switch soon
- rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
- local mycmakeargs=(
- -DINSTALL_BUNDLED_DICTS=0
- -DUSE_SYSTEM_LIBS=1
- -DSYSTEM_LIBS_REQUIRED=1
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
- -DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
- )
- use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${ED}"/usr/share/sigil/
- python_optimize "${ED}"/usr/share/sigil/
- DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-2.0.2-r1.ebuild b/app-text/sigil/sigil-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..84046fb4b6eb
--- /dev/null
+++ b/app-text/sigil/sigil-2.0.2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit xdg cmake python-single-r1
+
+DOC_VERSION="2022.05.17"
+DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub"
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="doc +plugins qt6"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-text/hunspell:=
+ dev-libs/libpcre2:=[pcre16]
+ sys-libs/zlib[minizip]
+ $(python_gen_cond_dep '
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/dulwich[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ ')
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ ')
+ $(python_gen_impl_dep 'tk') )
+ !qt6? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ ') )
+ )
+ qt6? (
+ dev-qt/qtbase:6[concurrent,cups,network,widgets,xml]
+ dev-qt/qt5compat:6
+ dev-qt/qtwebengine:6[widgets]
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/PyQt6[${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}]
+ ') )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ !qt6? ( dev-qt/linguist-tools:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DTRY_NEWER_FINDPYTHON3=1
+ -DPython3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPython3_LIBRARY="$(python_get_library_path)"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ -DUSE_QT5=$(usex !qt6)
+ -DINSTALL_BUNDLED_DICTS=0
+ -DSYSTEM_LIBS_REQUIRED=1
+ -DUSE_SYSTEM_LIBS=1
+ )
+ # use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_fix_shebang "${ED}"/usr/share/sigil/
+ python_optimize "${ED}"/usr/share/sigil/
+
+ if use doc; then
+ dodoc "${DISTDIR}/${DOC_FILE}"
+ docompress -x /usr/share/doc/${PF}/${DOC_FILE}
+ fi
+}
diff --git a/app-text/sigil/sigil-2.1.0-r1.ebuild b/app-text/sigil/sigil-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..19c4ff1455cf
--- /dev/null
+++ b/app-text/sigil/sigil-2.1.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit xdg cmake python-single-r1
+
+DOC_VERSION="2022.05.17"
+DOC_FILE="Sigil_User_Guide_${DOC_VERSION}.epub"
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://github.com/Sigil-Ebook/sigil-user-guide/releases/download/${DOC_VERSION}/${DOC_FILE} )"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc +plugins qt6"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-text/hunspell:=
+ dev-libs/libpcre2:=[pcre16]
+ sys-libs/zlib[minizip]
+ $(python_gen_cond_dep '
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/dulwich[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ ')
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ ')
+ $(python_gen_impl_dep 'tk') )
+ !qt6? (
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ ') )
+ )
+ qt6? (
+ dev-qt/qtbase:6[concurrent,cups,network,widgets,xml]
+ dev-qt/qt5compat:6
+ dev-qt/qtwebengine:6[widgets]
+ dev-qt/qtsvg:6
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/PyQt6[${PYTHON_USEDEP}]
+ dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}]
+ ') )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ !qt6? ( dev-qt/linguist-tools:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DTRY_NEWER_FINDPYTHON3=1
+ -DPython3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPython3_LIBRARY="$(python_get_library_path)"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ -DUSE_QT5=$(usex !qt6)
+ -DINSTALL_BUNDLED_DICTS=0
+ -DSYSTEM_LIBS_REQUIRED=1
+ -DUSE_SYSTEM_LIBS=1
+ )
+ # use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_fix_shebang "${ED}"/usr/share/sigil/
+ python_optimize "${ED}"/usr/share/sigil/
+
+ if use doc; then
+ dodoc "${DISTDIR}/${DOC_FILE}"
+ docompress -x /usr/share/doc/${PF}/${DOC_FILE}
+ fi
+}
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
deleted file mode 100644
index 73b8c11d860d..000000000000
--- a/app-text/silvercity/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST SilverCity-0.9.7.tar.gz 278396 BLAKE2B 30419ee4d2cafe56cbfc1b73a3b188214c58e29a154810bed9b837d9fdc6709f7691c1662cc1da0a5eb1b326a430f958d66bb5629ae2f3a3afe2442f2e11957d SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
deleted file mode 100644
index 624b33e3a10e..000000000000
--- a/app-text/silvercity/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>web-apps@gentoo.org</email>
- <name>Gentoo Webapps</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">silvercity</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/silvercity/silvercity-0.9.7-r1.ebuild b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
deleted file mode 100644
index 36a16f780317..000000000000
--- a/app-text/silvercity/silvercity-0.9.7-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_PN="SilverCity"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A lexical analyser for many languages"
-HOMEPAGE="http://silvercity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
- # Fix line endings.
- find -type f -exec sed -e 's/\r$//' -i {} + || die "sed failed"
-
- # Fix permissions.
- chmod -x CSS/default.css || die "chmod failed"
-
- # Fix shebang.
- sed -e 's:#!/usr/home/sweetapp/bin/python:#!/usr/bin/env python:' \
- -i PySilverCity/Scripts/cgi-styler-form.py || die "sed failed"
-
- distutils-r1_python_prepare_all
-}
diff --git a/app-text/simple-fb2-reader/Manifest b/app-text/simple-fb2-reader/Manifest
index 24bbd04833dd..67b0cc0ee732 100644
--- a/app-text/simple-fb2-reader/Manifest
+++ b/app-text/simple-fb2-reader/Manifest
@@ -1 +1 @@
-DIST simple-fb2-reader-1.1.2.tar.gz 95181 BLAKE2B 4bcfc361fe25e2fbbd6767d4517dac61e50f2e907c969402dc76be688228e612c489758ae2adef731a30e9a9aac19b2fb5786ad768e83354c8d082edfbf2b634 SHA512 0d0b95cedf8b0863fc415ba710da7bae140fda6a9cc947f20986fae0f348653ab73a85425ba34fc9beb747372ad3fcffdf8c3c173386678653cdf10318abe64c
+DIST simple-fb2-reader-1.1.3.tar.gz 94550 BLAKE2B 857f3b472d6dc2e7c4b1935b8123a1ae269df436457ad061cd8bb2d051b77fe2f318e37f1e2adc93add132870879a0fe53bf36eaaf9998bdfaf6993dd34d32c2 SHA512 6c683ca1cd29e09a2c3ceef2057f61cba8a7711d7c6508a3ebb40ccf3440e90ec87c34ff9832d11f2f9215f8bccd4d365cd725ec5d4004562763e1bdbae3cc7a
diff --git a/app-text/simple-fb2-reader/metadata.xml b/app-text/simple-fb2-reader/metadata.xml
index 07d74f27a515..5dec6bf1c5a9 100644
--- a/app-text/simple-fb2-reader/metadata.xml
+++ b/app-text/simple-fb2-reader/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild
deleted file mode 100644
index c7d3c54be77d..000000000000
--- a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils xdg-utils
-DESCRIPTION="A simple gtk3 reader for fb2 ebooks"
-HOMEPAGE="https://github.com/Cactus64k/simple-fb2-reader"
-SRC_URI="https://github.com/Cactus64k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="x11-libs/gtk+:3
- dev-libs/libxml2
- dev-libs/libzip
- dev-db/sqlite"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/pkgconfig"
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
new file mode 100644
index 000000000000..d52a38df90b5
--- /dev/null
+++ b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake xdg
+DESCRIPTION="A simple gtk3 reader for fb2 ebooks"
+HOMEPAGE="https://github.com/Cactus64k/simple-fb2-reader"
+SRC_URI="https://github.com/Cactus64k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="x11-libs/gtk+:3
+ dev-libs/libxml2
+ dev-libs/libzip
+ dev-db/sqlite"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_prepare() {
+ xdg_src_prepare
+ cmake_src_prepare
+}
diff --git a/app-text/sloccount/files/sloccount-2.26-gentoo.patch b/app-text/sloccount/files/sloccount-2.26-gentoo.patch
index c3a031190a36..5e4010b81f32 100644
--- a/app-text/sloccount/files/sloccount-2.26-gentoo.patch
+++ b/app-text/sloccount/files/sloccount-2.26-gentoo.patch
@@ -1,5 +1,5 @@
---- break_filelist.old 2013-10-14 17:23:01.523330534 +0800
-+++ break_filelist 2004-08-01 12:17:28.000000000 +0800
+--- a/break_filelist
++++ b/break_filelist
@@ -177,7 +177,7 @@
"p" => "pascal", "pas" => "pascal", "pp" => "pascal", "dpr" => "pascal",
"py" => "python",
@@ -18,3 +18,65 @@
($firstline =~
m~^#!\s*\@_?(SCRIPT_)?(PATH_)?(BA|K)?SH(ELL)?(\d+)?\@?(\s|\Z)~)) {
# Note: wish(1) uses a funny trick; see wish(1) for more info.
+--- a/makefile
++++ b/makefile
+@@ -37,7 +37,7 @@
+ # Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".
+ # The "-Wall" option turns on warnings in gcc. gcc users might also want
+ # to consider using "-Werror", which turns warnings into errors.
+-CC=gcc -Wall
++CFLAGS+= -Wall
+
+ # Set this to the name of your "install" program. On some systems,
+ # "install -C" would be useful (so unchanged files won't be modified),
+@@ -124,34 +124,34 @@
+
+ MANPAGES=sloccount.1.gz
+
+-MYDOCS=sloccount.html README TODO ChangeLog
++MYDOCS=README TODO ChangeLog
+
+
+ all: $(COMPILED_EXECUTABLES)
+
+ lexcount1$(EXE_SUFFIX): lexcount1.c
+- $(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) lexcount1.c -o lexcount1$(EXE_SUFFIX)
+
+ c_count$(EXE_SUFFIX): c_count.c
+- $(CC) c_count.c -o c_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) c_count.c -o c_count$(EXE_SUFFIX)
+
+ php_count$(EXE_SUFFIX): php_count.c
+- $(CC) php_count.c -o php_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) php_count.c -o php_count$(EXE_SUFFIX)
+
+ pascal_count.c: pascal_count.l driver.c driver.h
+ flex -Cfe -t pascal_count.l > pascal_count.c
+
+ pascal_count$(EXE_SUFFIX): pascal_count.c
+- $(CC) pascal_count.c -o pascal_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) pascal_count.c -o pascal_count$(EXE_SUFFIX)
+
+ jsp_count.c: jsp_count.l driver.c driver.h
+ flex -Cfe -t jsp_count.l > jsp_count.c
+
+ jsp_count$(EXE_SUFFIX): jsp_count.c
+- $(CC) jsp_count.c -o jsp_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) jsp_count.c -o jsp_count$(EXE_SUFFIX)
+
+ ml_count$(EXE_SUFFIX): ml_count.c
+- $(CC) ml_count.c -o ml_count$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ml_count.c -o ml_count$(EXE_SUFFIX)
+
+ sloccount.1.gz: sloccount.1
+ gzip -c sloccount.1 > sloccount.1.gz
+@@ -162,7 +162,7 @@
+
+ # This is USC's code counter, not built by default:
+ c_lines: C_LINES.C
+- $(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) C_LINES.C -o c_lines$(EXE_SUFFIX)
+
+ install_prefix:
+ $(INSTALL_A_DIR) $(PREFIX)
diff --git a/app-text/sloccount/metadata.xml b/app-text/sloccount/metadata.xml
index 79d462e85571..aaab041e8885 100644
--- a/app-text/sloccount/metadata.xml
+++ b/app-text/sloccount/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/app-text/sloccount/sloccount-2.26-r3.ebuild b/app-text/sloccount/sloccount-2.26-r3.ebuild
index 0c1bc3de2f75..8c1be8fa076d 100644
--- a/app-text/sloccount/sloccount-2.26-r3.ebuild
+++ b/app-text/sloccount/sloccount-2.26-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Tools for counting Source Lines of Code (SLOC) for a large number of languages"
HOMEPAGE="http://www.dwheeler.com/sloccount/"
@@ -11,40 +11,42 @@ SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="dev-lang/perl
- >=sys-apps/sed-4
- app-shells/bash"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-libexec.patch
+ "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
+ # support for
+ # 1) .ebuild
+ # 2) #!/sbin/openrc-run
+ # 3) CFLAGS/CPPFLAGS/LDFLAGS
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-libexec.patch
- epatch "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
- # support for .ebuild and #!/sbin/openrc-run:
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- sed -i \
- -e 's|^CC=gcc|CFLAGS+=|g' \
- -e 's|$(CC)|& $(CFLAGS) $(LDFLAGS)|g' \
- -e '/^DOC_DIR/ { s/-$(RPM_VERSION)//g }' \
- -e '/^MYDOCS/ { s/[^ =]\+\.html//g }' \
- makefile || die "sed makefile failed"
-
- #fixed hard-codes libexec_dir in sloccount
+ default
+
+ # fix hard-coded libexec_dir in sloccount
sed -i "s|libexec_dir=|&\"${EPREFIX}\"|" sloccount || die
}
-src_compile() {
- emake CC=$(tc-getCC)
+src_configure() {
+ tc-export CC
}
src_test() {
- PATH+=":${S}"
- emake test
+ PATH="${PATH}:${S}" emake test
}
src_install() {
- emake PREFIX="${ED}/usr" DOC_DIR="${ED}/usr/share/doc/${PF}/" install
- dohtml *html
+ emake PREFIX="${ED}"/usr DOC_DIR="${ED}"/usr/share/doc/${PF}/ install
+
+ HTML_DOCS=( *.html )
+ einstalldocs
+
+ # avoid QA warning
+ gunzip "${ED}"/usr/share/man/man1/sloccount.1.gz || die
}
diff --git a/app-text/spellutils/files/spellutils-0.7-nls.patch b/app-text/spellutils/files/spellutils-0.7-nls.patch
index ff36f67a9823..eed9d8dd9d5a 100644
--- a/app-text/spellutils/files/spellutils-0.7-nls.patch
+++ b/app-text/spellutils/files/spellutils-0.7-nls.patch
@@ -1,5 +1,5 @@
---- po/Makefile.in.in.orig 2000-04-16 12:04:50.000000000 +0200
-+++ po/Makefile.in.in 2013-07-24 04:14:20.698869858 +0200
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -119,8 +119,8 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
diff --git a/app-text/spellutils/metadata.xml b/app-text/spellutils/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/spellutils/metadata.xml
+++ b/app-text/spellutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/spellutils/spellutils-0.7.ebuild b/app-text/spellutils/spellutils-0.7.ebuild
index 1c371d0dc919..36331975124e 100644
--- a/app-text/spellutils/spellutils-0.7.ebuild
+++ b/app-text/spellutils/spellutils-0.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)"
HOMEPAGE="http://home.worldonline.dk/byrial/spellutils/"
@@ -10,21 +11,18 @@ SRC_URI="http://home.worldonline.dk/byrial/spellutils/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
IUSE="nls"
-DEPEND="
- nls? ( sys-devel/gettext )
-"
-DEPEND="
- nls? ( virtual/libintl )
-"
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
DOCS=( NEWS README )
-src_prepare() {
- epatch "${FILESDIR}"/${P}-nls.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-nls.patch
+)
src_configure() {
econf $(use_enable nls)
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
deleted file mode 100644
index 6eaa470c5b06..000000000000
--- a/app-text/stardict/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689a44d4e24978ef3535def3c8c45c37f066ea3969d141aef0c34c6040dcdaf6b3f337b178bbffaf52d86f SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae
-DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
-DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
-DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
diff --git a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
deleted file mode 100644
index 49cb284253af..000000000000
--- a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From adb01aafd94b6bd5b5cc49889f4f09d483ee5ac4 Mon Sep 17 00:00:00 2001
-From: Nikolay Korotkiy <sikmir@gmail.com>
-Date: Thu, 1 Sep 2016 14:11:41 +0300
-Subject: [PATCH] tabfile: incorrectly handles whitespace in file name
-
-Signed-off-by: Andrew Savchenko <bircoph@gmail.com>
----
- tools/src/libtabfile.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tools/src/libtabfile.cpp b/tools/src/libtabfile.cpp
-index dda256a..2ee9dfd 100644
---- a/tools/src/libtabfile.cpp
-+++ b/tools/src/libtabfile.cpp
-@@ -22,6 +22,7 @@
- #include <cstring>
- #include <cstdlib>
- #include <string>
-+#include <sstream>
- #include <glib/gstdio.h>
- #include <glib.h>
-
-@@ -228,9 +229,10 @@ static bool write_dictionary(const char *filename, GArray *array)
- g_message("%s wordcount: %d.", get_impl(basefilename), array->len);
-
- #ifndef _WIN32
-- std::string command(std::string("dictzip ") + dicfilename);
-+ std::stringstream command;
-+ command << "dictzip \"" << dicfilename << "\"";
- int result;
-- result = system(command.c_str());
-+ result = system(command.str().c_str());
- if (result == -1) {
- g_print("system() error!\n");
- }
---
-2.10.2
-
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
deleted file mode 100644
index 6f654ddb7429..000000000000
--- a/app-text/stardict/metadata.xml
+++ /dev/null
@@ -1,39 +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>
- <longdescription>
- StarDict is an international dictionary Software. It has powerful features
- such as "Glob-style pattern matching", "Scan selection word," "Fuzzy
- query," etc. Stardict Version3.0 has developed a lot of new functions, such
- as Full-text translation, Net Dict.
- </longdescription>
- <use>
- <flag name="advertisement">Enable stardict advertisements plugin</flag>
- <flag name="cal">Enable calendar support using cal program</flag>
- <flag name="dictdotcn">Enable dict.cn network plugin (for Chinese language)</flag>
- <flag name="espeak">Enable text to speech synthesizer plugin using <pkg>app-accessibility/espeak</pkg> engine</flag>
- <flag name="flite">Enable text to speech synthesizer plugin using <pkg>app-accessibility/flite</pkg> engine</flag>
- <flag name="fortune">Enable plugin to read fortune messages using <pkg>games-misc/fortune-mod</pkg>. You may consider installing <pkg>games-misc/fortune-mod-all</pkg> to get all fortune messages.</flag>
- <flag name="gucharmap">Enable plugin for unicode symbols description using <pkg>gnome-extra/gucharmap</pkg></flag>
- <flag name="htmlparse">Enable plugin to parse dictionaries with html content</flag>
- <flag name="info">Enable plugin to read info pages</flag>
- <flag name="man">Enable plugin to read manual pages</flag>
- <flag name="powerwordparse">Enable plugin to parse powerword dictionaries</flag>
- <flag name="pronounce">Install WyabdcRealPeopleTTS package (it is just many .wav files) to make StarDict pronounce English words</flag>
- <flag name="qqwry">Enable QQWry plugin, which provides information (in Chinese language) about geographical positions, owner, etc. for IP addresses</flag>
- <flag name="tools">Build and install dictionary management tools and converters from various dictionary formats</flag>
- <flag name="updateinfo">Enable plugin to check for stardict updates</flag>
- <flag name="wikiparse">Enable plugin to parse dictionaries in wikimedia format</flag>
- <flag name="wordnet">Enable wordnet plugin to find similar English words using lexical database</flag>
- <flag name="xdxfparse">Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)</flag>
- <flag name="youdaodict">Enable youdao.com network plugin (for Chinese language)</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">stardict-4</remote-id>
- <remote-id type="github">huzheng001/stardict-3</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/stardict/stardict-3.0.6-r3.ebuild b/app-text/stardict/stardict-3.0.6-r3.ebuild
deleted file mode 100644
index 6d913303f558..000000000000
--- a/app-text/stardict/stardict-3.0.6-r3.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict-4.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
- pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE="advertisement debug dictdotcn espeak examples +gucharmap
-+htmlparse man perl +powerwordparse pronounce python qqwry spell
-tools updateinfo +wikiparse +wordnet +xdxfparse"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.16:2
- dev-libs/libsigc++:2=
- sys-libs/zlib:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.20:2
- x11-libs/libX11
- x11-libs/pango
- gucharmap? ( gnome-extra/gucharmap:0= )
- spell? ( >=app-text/enchant-1.2 )
- tools? (
- dev-db/mysql-connector-c
- dev-libs/libpcre:=
- dev-libs/libxml2:=
- python? ( ${PYTHON_DEPS} )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- espeak? ( >=app-accessibility/espeak-1.29 )
- perl? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
-
-# docs are messy, installed manually below
-DOCS=""
-
-src_prepare() {
- # From Fedora
- # Remove unneeded sigc++ header files to make it sure
- # that we are using system-wide libsigc++
- # (and these does not work on gcc43)
- find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
-
- # libsigc++ started to require c++11 support
- append-cxxflags "-std=c++11"
-
- if use python; then
- local f
- # force python shebangs handlable by python_doscript
- for f in tools/src/*.py; do
- [[ $(head -n1 "${f}") =~ ^#! ]] || continue
- sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
- done
- # script contains UTF-8 symbols, but has no ecoding set
- sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
- fi
-
- eapply_user
- gnome2_src_prepare
-}
-
-src_configure() {
- # Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
- # libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
- # give you GNOME 2.x support, that is otherwise considered deprecated
- # because of the deep GNOME 2.x core library dependencies
-
- # Festival plugin crashes, bug 188684. Disable for now.
- gnome2_src_configure \
- --disable-festival \
- --disable-gnome-support \
- --disable-gpe-support \
- --disable-schemas-install \
- --disable-scrollkeeper \
- $(use_enable advertisement) \
- $(use_enable debug) \
- $(use_enable dictdotcn) \
- $(use_enable espeak) \
- $(use_enable gucharmap) \
- $(use_enable htmlparse) \
- $(use_enable man) \
- $(use_enable powerwordparse) \
- $(use_enable qqwry) \
- $(use_enable spell) \
- $(use_enable tools) \
- $(use_enable updateinfo) \
- $(use_enable wikiparse) \
- $(use_enable wordnet) \
- $(use_enable xdxfparse)
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc AUTHORS ChangeLog README
-
- docinto dict
- dodoc dict/{AUTHORS,ChangeLog,README,TODO}
- dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
-
- docinto lib
- dodoc lib/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/dict
- doins dict/doc/stardict-textual-dict*
- fi
-
- if use qqwry; then
- insinto /usr/share/${PN}/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-
- # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
- # and additional scripts from tools dir
- if use tools; then
- local app
- local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
- dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
- xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
- tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
- jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
- ${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
- ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
- xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
- resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
- ${PN}-bin2text ${PN}-repair"
-
- use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
- use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
- makevietdict.py uyghur2dict.py"
-
- for app in ${apps}; do
- if [[ "${app}" =~ ^${PN} ]]; then
- dobin "tools/src/${app}"
- else
- newbin "tools/src/${app}" "${PN}_${app}"
- fi
- done
- use python && python_doscript "${ED}"usr/bin/*.py
-
- docinto tools
- dodoc tools/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/tools
- doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
- fi
- fi
-}
-
-pkg_postinst() {
- elog
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install ${PN} dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog " emerge -s ${PN}-"
- elog
- elog "Additionally you may install any stardict dictionary from the net"
- elog "by unpacking it to:"
- elog " /usr/share/stardict/dic"
- elog
-
- gnome2_pkg_postinst
-}
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
deleted file mode 100644
index 7ef439a91b49..000000000000
--- a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict-4.sourceforge.net/
- https://github.com/huzheng001/stardict-3"
-SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz
- pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="advertisement cal debug dictdotcn espeak examples flite
-fortune gucharmap +htmlparse info man perl +powerwordparse
-pronounce python qqwry spell tools updateinfo +wikiparse +wordnet
-+xdxfparse youdaodict"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- dev-libs/libsigc++:2=
- media-libs/libcanberra[gtk3]
- sys-libs/zlib:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- espeak? ( >=app-accessibility/espeak-1.29 )
- flite? ( app-accessibility/flite )
- gucharmap? ( gnome-extra/gucharmap:2.90= )
- spell? ( >=app-text/enchant-1.2 )
- tools? (
- dev-db/mysql-connector-c
- dev-libs/expat
- dev-libs/libpcre:=
- dev-libs/libxml2:=
- python? ( ${PYTHON_DEPS} )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- info? ( sys-apps/texinfo )
- fortune? ( games-misc/fortune-mod )
- perl? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
-
-# docs are messy, installed manually below
-DOCS=""
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20160518-tabfile.patch" )
-
-src_prepare() {
- # From Fedora
- # Remove unneeded sigc++ header files to make it sure
- # that we are using system-wide libsigc++
- # (and these does not work on gcc43)
- find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
-
- # libsigc++ started to require c++11 support
- append-cxxflags "-std=c++11"
-
- if use python; then
- local f
- # force python shebangs handlable by python_doscript
- for f in tools/src/*.py; do
- [[ $(head -n1 "${f}") =~ ^#! ]] || continue
- sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
- done
- # script contains UTF-8 symbols, but has no ecoding set
- sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
- fi
-
- # bug 604318
- sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
-
- eapply_user
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # Festival plugin crashes, bug 188684. Disable for now.
- # Gnome2 support is disabled due to deprecation request, bug 644346
- gnome2_src_configure \
- --disable-darwin-support \
- --disable-festival \
- --disable-gnome-support \
- --disable-gpe-support \
- --disable-maemo-support \
- --disable-schemas-install \
- --disable-scrollkeeper \
- $(use_enable advertisement) \
- $(use_enable cal) \
- $(use_enable debug) \
- $(use_enable dictdotcn) \
- $(use_enable espeak) \
- $(use_enable flite) \
- $(use_enable fortune) \
- $(use_enable gucharmap) \
- $(use_enable htmlparse) \
- $(use_enable info) \
- $(use_enable man) \
- $(use_enable powerwordparse) \
- $(use_enable qqwry) \
- $(use_enable spell) \
- $(use_enable tools) \
- $(use_enable updateinfo) \
- $(use_enable wikiparse) \
- $(use_enable wordnet) \
- $(use_enable xdxfparse) \
- $(use_enable youdaodict)
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc AUTHORS ChangeLog README
-
- docinto dict
- dodoc dict/{AUTHORS,ChangeLog,README,TODO}
- dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
- dodoc -r dict/doc/wiki
-
- docinto lib
- dodoc lib/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/dict
- doins dict/doc/stardict-textual-dict*
- fi
-
- if use qqwry; then
- insinto /usr/share/${PN}/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-
- # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
- # and additional scripts from tools dir
- if use tools; then
- local app
- local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic
- wquick2dic ec50 directory2treedic treedict2dir jdictionary mova xmlinout
- soothill kanjidic2 powerword kdic 21tech 21shiji buddhist tabfile
- cedict edict duden ${PN}-dict-update degb2utf frgb2utf jpgb2utf gmx2utf
- rucn kingsoft kingsoft2 wikipedia wikipediaImage babylon ${PN}2txt ${PN}-verify
- fest2dict i2e2dict downloadwiki ooo2dict myspell2dic exc2i2e
- dictbuilder tabfile2sql KangXi Unihan xiaoxuetang-ja wubi ydp2dict
- wordnet lingvosound2resdb resdatabase2dir dir2resdatabase ${PN}-index
- sd2foldoc
- ${PN}-text2bin ${PN}-bin2text ${PN}-repair"
-
- use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
- use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
- makevietdict.py uyghur2dict.py"
-
- for app in ${apps}; do
- if [[ "${app}" =~ ^${PN} ]]; then
- dobin "tools/src/${app}"
- else
- newbin "tools/src/${app}" "${PN}_${app}"
- fi
- done
- use python && python_doscript "${ED}"usr/bin/*.py
-
- docinto tools
- dodoc tools/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/tools
- doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
- fi
- fi
-}
-
-pkg_postinst() {
- elog
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install ${PN} dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog " emerge -s ${PN}-"
- elog
- elog "Additionally you may install any stardict dictionary from the net"
- elog "by unpacking it to:"
- elog " /usr/share/stardict/dic"
- elog
-
- gnome2_pkg_postinst
-}
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
deleted file mode 100644
index ff3976de5780..000000000000
--- a/app-text/sword-modules/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>theology@gentoo.org</email>
-</maintainer>
-<longdescription>
-These are some of the more popular modules for the SWORD Project.
-They provide a large number of tools for personal study.
-</longdescription>
-</pkgmetadata>
diff --git a/app-text/sword-modules/sword-modules-1.ebuild b/app-text/sword-modules/sword-modules-1.ebuild
deleted file mode 100644
index 0c3387a34929..000000000000
--- a/app-text/sword-modules/sword-modules-1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="A collection of modules for the SWORD project"
-HOMEPAGE="http://www.crosswire.org/sword/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-dicts/sword-ab
- app-dicts/sword-abbott
- app-dicts/sword-abs_essay_goodsam_swb
- app-dicts/sword-acv
- app-dicts/sword-afr1953
- app-dicts/sword-akjv
- app-dicts/sword-alb
- app-dicts/sword-aleppo
- app-dicts/sword-amtract
- app-dicts/sword-arasvd
- app-dicts/sword-asv
- app-dicts/sword-barnes
- app-dicts/sword-bbe
- app-dicts/sword-br_en
- app-dicts/sword-bulcarigradnt
- app-dicts/sword-bulveren
- app-dicts/sword-bwe
- app-dicts/sword-byz
- app-dicts/sword-cbc
- app-dicts/sword-chamorro
- app-dicts/sword-chincvs
- app-dicts/sword-chincvt
- app-dicts/sword-chiun
- app-dicts/sword-chiuns
- app-dicts/sword-clarke
- app-dicts/sword-common
- app-dicts/sword-cro
- app-dicts/sword-czebkr
- app-dicts/sword-czecep
- app-dicts/sword-czekms
- app-dicts/sword-czenkb
- app-dicts/sword-daily
- app-dicts/sword-dan
- app-dicts/sword-darby
- app-dicts/sword-diaglott
- app-dicts/sword-drc
- app-dicts/sword-dtn
- app-dicts/sword-dutkant
- app-dicts/sword-dutsvv
- app-dicts/sword-easton
- app-dicts/sword-esperanto
- app-dicts/sword-est
- app-dicts/sword-farsiopv
- app-dicts/sword-finbiblia
- app-dicts/sword-finney
- app-dicts/sword-finpr
- app-dicts/sword-frecrl
- app-dicts/sword-frelsg
- app-dicts/sword-geneva1599
- app-dicts/sword-gerelb1871
- app-dicts/sword-gerelb1905
- app-dicts/sword-gerlut1545
- app-dicts/sword-gersch
- app-dicts/sword-greekhebrew
- app-dicts/sword-hebmodern
- app-dicts/sword-hebrewgreek
- app-dicts/sword-heretics
- app-dicts/sword-hitchcock
- app-dicts/sword-hnv
- app-dicts/sword-hunkar
- app-dicts/sword-hunuj
- app-dicts/sword-icelandic
- app-dicts/sword-institutes
- app-dicts/sword-isbe
- app-dicts/sword-isv
- app-dicts/sword-itadio
- app-dicts/sword-itarive
- app-dicts/sword-jfb
- app-dicts/sword-josephus
- app-dicts/sword-jps
- app-dicts/sword-jst
- app-dicts/sword-jubilee2000
- app-dicts/sword-kekchi
- app-dicts/sword-kjv
- app-dicts/sword-kjvd
- app-dicts/sword-klv
- app-dicts/sword-klven_iklingon
- app-dicts/sword-klviklingon_en
- app-dicts/sword-korean
- app-dicts/sword-la_en
- app-dicts/sword-latvian
- app-dicts/sword-lightfoot
- app-dicts/sword-litv
- app-dicts/sword-luther
- app-dicts/sword-mak
- app-dicts/sword-manxgaelic
- app-dicts/sword-maori
- app-dicts/sword-mhc
- app-dicts/sword-mhcc
- app-dicts/sword-mkjv
- app-dicts/sword-montgomery
- app-dicts/sword-murdock
- app-dicts/sword-nave
- app-dicts/sword-norsk
- app-dicts/sword-orthodoxy
- app-dicts/sword-packard
- app-dicts/sword-personal
- app-dicts/sword-peshitta
- app-dicts/sword-pilgrim
- app-dicts/sword-pnt
- app-dicts/sword-practice
- app-dicts/sword-rkjnt
- app-dicts/sword-rnkjv
- app-dicts/sword-robinson
- app-dicts/sword-romcor
- app-dicts/sword-rotherham
- app-dicts/sword-rst
- app-dicts/sword-rusmakarij
- app-dicts/sword-rwebster
- app-dicts/sword-rwp
- app-dicts/sword-saoa
- app-dicts/sword-scofield
- app-dicts/sword-scotsgaelic
- app-dicts/sword-sme
- app-dicts/sword-smith
- app-dicts/sword-sparv
- app-dicts/sword-sparvg2004
- app-dicts/sword-spasev
- app-dicts/sword-spavnt
- app-dicts/sword-spurious
- app-dicts/sword-strongsgreek
- app-dicts/sword-strongshebrew
- app-dicts/sword-swahili
- app-dicts/sword-tagalog
- app-dicts/sword-tcr
- app-dicts/sword-tdavid
- app-dicts/sword-tfg
- app-dicts/sword-tisch
- app-dicts/sword-torrey
- app-dicts/sword-tr
- app-dicts/sword-tsk
- app-dicts/sword-twenty
- app-dicts/sword-tyndale
- app-dicts/sword-ukjv
- app-dicts/sword-ukrainian
- app-dicts/sword-uma
- app-dicts/sword-umgreek
- app-dicts/sword-vulgate
- app-dicts/sword-vulgate_hebps
- app-dicts/sword-web
- app-dicts/sword-webster
- app-dicts/sword-webstersdict
- app-dicts/sword-wesley
- app-dicts/sword-weymouth
- app-dicts/sword-whnu
- app-dicts/sword-wlc
- app-dicts/sword-wulfila
- app-dicts/sword-wycliffe
- app-dicts/sword-xhosa
- app-dicts/sword-ylt"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index ed1a2c41782e..663e7a3de61d 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,2 +1 @@
-DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
-DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
+DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch
deleted file mode 100644
index a098addcd0d2..000000000000
--- a/app-text/sword/files/sword-1.7.4-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -16893,7 +16895,7 @@
- # ---------------------------------------------------------------------
-
- # NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
-+if test "x$with_clucene" != "xno"; then
--with_clucene=no
- if test "x$CLUCENE2_LIBS" != x; then
- echo "clucene 2.x found - lucene searching options available"
- AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
-@@ -16914,6 +16912,11 @@
- echo "lucene searching options not available"
- fi
- fi
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
-+$as_echo "clucene manually disabled - excluding support" >&6; }
-+with_clucene="no"
-+fi
-
- for ac_func in vsnprintf
- do :
diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch b/app-text/sword/files/sword-1.7.4-gcc6.patch
deleted file mode 100644
index 54c79671235e..000000000000
--- a/app-text/sword/files/sword-1.7.4-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- sword-1.7.4/configure.ac.old 2016-09-21 18:04:55.029088352 -0400
-+++ sword-1.7.4/configure.ac 2016-09-21 18:05:37.870349308 -0400
-@@ -197,7 +197,7 @@
- fi
-
-
--AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-+AM_CXXFLAGS="$AM_CXXFLAGS"
-
- if test x$enable_warnings = xyes; then
- AM_CFLAGS="$AM_CFLAGS -Werror"
---- sword-1.7.4/configure.old 2016-09-21 18:05:05.900008373 -0400
-+++ sword-1.7.4/configure 2016-09-21 18:06:03.822112657 -0400
-@@ -16793,7 +16793,7 @@
- fi
-
-
--AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
-+AM_CXXFLAGS="$AM_CXXFLAGS"
-
- if test x$enable_warnings = xyes; then
- AM_CFLAGS="$AM_CFLAGS -Werror"
diff --git a/app-text/sword/files/sword-1.8.1-icu61.diff b/app-text/sword/files/sword-1.8.1-icu61.diff
deleted file mode 100644
index 2129f279ddc6..000000000000
--- a/app-text/sword/files/sword-1.8.1-icu61.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5cbd06a..1d3a2d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,4 @@
--# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
--# limit pkg-config version to >= 0.14, demo, utilities, doc, tests
-+# TODO: limit pkg-config version to >= 0.14, demo, utilities, doc, tests
- # use BUILD_SHARED_LIBS
- # convince perl swig bindings to build properly
- #
-@@ -13,7 +12,7 @@
- # all posterity and eternity, wherever such transfer is possible. Where it is
- # not, then this file is released under the GPLv2 by myself.
- PROJECT(libsword CXX C)
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.7.0)
- SET(SWORD_VERSION 1.8.1)
-
- # Make sure it's an out-of-stream build
-@@ -56,7 +55,8 @@ IF(MSVC)
- ELSE(MSVC)
- FIND_PACKAGE(BZIP2 QUIET)
- FIND_PACKAGE(XZ QUIET)
-- FIND_PACKAGE(ICU QUIET)
-+ FIND_PACKAGE(ICU
-+ COMPONENTS data i18n io uc)
- FIND_PACKAGE(CURL QUIET)
- ENDIF(MSVC)
- FIND_PACKAGE(CLucene QUIET)
-@@ -237,7 +237,11 @@ ENDIF(WITH_CLUCENE)
- IF(WITH_ICU)
- INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
- ADD_DEFINITIONS(${ICU_DEFINITIONS})
-- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-+ MESSAGE(STATUS "ICU Version: ${ICU_VERSION}")
-+ IF("${ICU_VERSION}" VERSION_GREATER "61")
-+ ADD_DEFINITIONS(-DU_USING_ICU_NAMESPACE)
-+ ENDIF("${ICU_VERSION}" VERSION_GREATER "61")
-+ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES})
- ENDIF(WITH_ICU)
- IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
- SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
-diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
-deleted file mode 100644
-index 451c2f3..0000000
---- a/cmake/FindICU.cmake
-+++ /dev/null
-@@ -1,68 +0,0 @@
--# Finds the International Components for Unicode (ICU) Library
--#
--# ICU_FOUND - True if ICU found.
--# ICU_I18N_FOUND - True if ICU's internationalization library found.
--# ICU_INCLUDE_DIRS - Directory to include to get ICU headers
--# Note: always include ICU headers as, e.g.,
--# unicode/utypes.h
--# ICU_LIBRARIES - Libraries to link against for the common ICU
--# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
--# (note: in addition to ICU_LIBRARIES)
--
--# Look for the header file.
--find_path(
-- ICU_INCLUDE_DIR
-- NAMES unicode/utypes.h
-- DOC "Include directory for the ICU library")
--mark_as_advanced(ICU_INCLUDE_DIR)
--
--# Look for the library.
--find_library(
-- ICU_LIBRARY
-- NAMES icuuc cygicuuc cygicuuc32
-- DOC "Libraries to link against for the common parts of ICU")
--mark_as_advanced(ICU_LIBRARY)
--
--# Copy the results to the output variables.
--if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-- set(ICU_FOUND 1)
-- set(ICU_LIBRARIES ${ICU_LIBRARY})
-- set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
--
-- # Look for the ICU internationalization libraries
-- find_library(
-- ICU_I18N_LIBRARY
-- NAMES icuin icui18n cygicuin cygicuin32
-- DOC "Libraries to link against for ICU internationalization")
-- if(MSVC)
-- find_library(ICU_DATA_LIBRARY
-- NAMES icudt
-- DOC "Libraries to link against for ICU data")
-- set(ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_DATA_LIBRARY})
-- endif(MSVC)
-- mark_as_advanced(ICU_I18N_LIBRARY)
-- mark_as_advanced(ICU_DATA_LIBRARY)
-- if (ICU_I18N_LIBRARY)
-- set(ICU_I18N_FOUND 1)
-- set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
-- else (ICU_I18N_LIBRARY)
-- set(ICU_I18N_FOUND 0)
-- set(ICU_I18N_LIBRARIES)
-- endif (ICU_I18N_LIBRARY)
--else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-- set(ICU_FOUND 0)
-- set(ICU_I18N_FOUND 0)
-- set(ICU_LIBRARIES)
-- set(ICU_I18N_LIBRARIES)
-- set(ICU_INCLUDE_DIRS)
--endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
--
--IF(ICU_FOUND)
-- IF(NOT ICU_FIND_QUIETLY)
-- MESSAGE(STATUS "ICU: Yes ${ICU_I18N_LIBRARY}")
-- ENDIF(NOT ICU_FIND_QUIETLY)
--ELSE(ICU_FOUND)
-- IF(ICU_FIND_REQUIRED)
-- MESSAGE(FATAL_ERROR "ICU: No")
-- ENDIF(ICU_FIND_REQUIRED)
--ENDIF(ICU_FOUND)
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 30818a8..08bc573 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -75,10 +75,12 @@ ENDFOREACH(TEST ${test_PROGRAMS})
-
- ########################################################################################
- # The following tests require extra libraries to run
--#
--FOREACH(ICUTEST icutest translittest)
-- TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
--ENDFOREACH(ICUTEST icutest translittest)
-+#
-+IF(WITH_ICU)
-+ FOREACH(ICUTEST icutest translittest)
-+ TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-+ ENDFOREACH(ICUTEST icutest translittest)
-+ENDIF(WITH_ICU)
-
- # Excluded until I know we have the tests working
- ADD_SUBDIRECTORY(testsuite)
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index fb9230654d3a..cc49ea864df8 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>theology@gentoo.org</email>
-</maintainer>
-<longdescription>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <longdescription>
The SWORD Project is the CrossWire Bible Society's free Bible software
project. Its purpose is to create tools that allow programmers and Bible
societies to write new Bible software more quickly and easily.
-</longdescription>
-<use>
- <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
-</use>
+ </longdescription>
+ <use>
+ <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/sword/sword-1.7.4-r1.ebuild b/app-text/sword/sword-1.7.4-r1.ebuild
deleted file mode 100644
index 72b16688cc81..000000000000
--- a/app-text/sword/sword-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
- curl? ( net-misc/curl )
- icu? ( dev-libs/icu:= )
- clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test" #Restricting for now, see bug 313207
-
-src_prepare() {
- sed -i \
- -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
- -e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
- configure || die
-
- sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
- sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
-
- cat <<-EOF > "${T}"/${PN}.conf
- [Install]
- DataPath=${EPREFIX}/usr/share/${PN}/
- EOF
- epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
- epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
- eapply_user
-}
-
-src_configure() {
- # TODO: Why is this here and can we remove it?
- strip-flags
-
- # bug 618776
- append-cxxflags -std=c++14
-
- econf \
- $(use_enable static-libs static) \
- $(use_enable debug) \
- --with-zlib \
- $(use_with icu) \
- --with-conf \
- $(use_with curl) \
- $(use_with clucene)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- if use doc; then
- rm -rf examples/.cvsignore
- rm -rf examples/cmdline/.cvsignore
- rm -rf examples/cmdline/.deps
- cp -R samples examples "${ED}"/usr/share/doc/${PF}/
- fi
-
- insinto /etc
- doins "${T}"/${PN}.conf
-}
-
-pkg_postinst() {
- elog "Check out http://www.crosswire.org/sword/modules/"
- elog "to download modules that you would like to use with SWORD."
- elog "Follow module installation instructions found on"
- elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/app-text/sword/sword-1.8.1-r1.ebuild b/app-text/sword/sword-1.8.1-r1.ebuild
deleted file mode 100644
index 97ffa1634b52..000000000000
--- a/app-text/sword/sword-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic cmake-utils
-
-DESCRIPTION="Library for Bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
-IUSE="clucene curl debug doc icu static-libs"
-
-RDEPEND="sys-libs/zlib
- curl? ( net-misc/curl )
- icu? ( dev-libs/icu:= )
- clucene? ( dev-cpp/clucene )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS CODINGSTYLE ChangeLog README"
-
-RESTRICT="test" #Restricting for now, see bug 313207
-
-src_prepare() {
- sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
- eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
- eapply "${FILESDIR}/${PN}-1.8.1-icu61.diff"
- eapply_user
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # bug 618776
- append-cxxflags -std=c++14
-
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DWITH_CLUCENE=$(usex clucene)
- -DWITH_CURL=$(usex curl)
- -DWITH_ICU=$(usex icu)
- -DWITH_ZLIB=1
- )
- use static-libs && mycmakeargs+=( -DLIBSWORD_LIBRARY_TYPE=Static )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- if use doc; then
- rm -rf examples/.cvsignore
- rm -rf examples/cmdline/.cvsignore
- rm -rf examples/cmdline/.deps
- cp -R samples examples "${ED}"/usr/share/doc/${PF}/
- fi
-
- insinto /etc
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- elog "Check out http://www.crosswire.org/sword/modules/"
- elog "to download modules that you would like to use with SWORD."
- elog "Follow module installation instructions found on"
- elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..13eb01ab413e
--- /dev/null
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="https://www.crosswire.org/sword/"
+SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc ~riscv x86 ~ppc-macos"
+IUSE="clucene curl debug doc icu"
+
+RDEPEND="sys-libs/zlib
+ curl? ( net-misc/curl )
+ icu? ( dev-libs/icu:= )
+ clucene? ( dev-cpp/clucene )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS CODINGSTYLE ChangeLog README )
+
+src_configure() {
+ use doc && DOCS+=( examples/ samples/ )
+
+ # Upstream default is to build both the shared and the static library,
+ # make sure we only build the shared one.
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+ -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+ -DLIBSWORD_LIBRARY_TYPE="Shared"
+ -DWITH_CLUCENE=$(usex clucene)
+ -DWITH_CURL=$(usex curl)
+ -DWITH_ICU=$(usex icu)
+ -DWITH_ZLIB=1
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index e81cbf7ccbdf..be0bcf1f3e44 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,2 +1 @@
-DIST t1utils-1.39.tar.gz 175047 BLAKE2B 346c6a400351e3662cb7ab88183c2f3b3934d4dd124742c06513c0d582d1359803fb32272ebb6744a227e1a862e7c55f195273087c8cc401a8bdf507227b967d SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301
-DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
+DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
deleted file mode 100644
index db6f19549e5e..000000000000
--- a/app-text/t1utils/files/t1utils-1.41-memmem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
-Author: Eddie Kohler <ekohler@gmail.com>
-Date: Wed Aug 16 12:37:34 2017 -0400
-
- Check for memmem declaration; sometimes it is not declared by default.
-
-diff --git a/configure.ac b/configure.ac
-index 5b4e3ff..b4dc4fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,7 @@ dnl strerror()?
- dnl
-
- AC_REPLACE_FUNCS([strerror memmem])
-+AC_CHECK_DECLS([memmem])
-
-
- dnl
-@@ -88,7 +89,7 @@ char* strerror(int errno);
- #endif
-
- /* Prototype memmem if we don't have it. */
--#if !HAVE_MEMMEM
-+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
- void* memmem(const void* haystack, size_t haystack_len,
- const void* needle, size_t needle_len);
- #endif
diff --git a/app-text/t1utils/metadata.xml b/app-text/t1utils/metadata.xml
index 1375a4fcfd29..248f19d5be68 100644
--- a/app-text/t1utils/metadata.xml
+++ b/app-text/t1utils/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>fonts@gentoo.org</email>
<name>Fonts</name>
</maintainer>
diff --git a/app-text/t1utils/t1utils-1.39.ebuild b/app-text/t1utils/t1utils-1.39.ebuild
deleted file mode 100644
index a7af218b8f28..000000000000
--- a/app-text/t1utils/t1utils-1.39.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
-
-IUSE=""
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- !<media-libs/freetype-1.4_pre20080316"
-
-src_install () {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc NEWS README
-}
diff --git a/app-text/t1utils/t1utils-1.41-r1.ebuild b/app-text/t1utils/t1utils-1.41-r1.ebuild
deleted file mode 100644
index 810aff2d6510..000000000000
--- a/app-text/t1utils/t1utils-1.41-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- !<media-libs/freetype-1.4_pre20080316"
-
-DOCS=( NEWS.md README.md )
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index dfc88459ba3a..000000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- !<media-libs/freetype-1.4_pre20080316"
-
-PATCHES=(
- "${FILESDIR}"/${P}-memmem.patch
-)
-DOCS=( NEWS.md README.md )
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild
new file mode 100644
index 000000000000..28e57fb49920
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.42.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Type 1 Font utilities"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#t1utils"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+LICENSE="BSD"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ !<media-libs/freetype-1.4_pre20080316"
+
+DOCS=( NEWS.md README.md )
diff --git a/app-text/tabler/files/tabler-2-fno-common.patch b/app-text/tabler/files/tabler-2-fno-common.patch
new file mode 100644
index 000000000000..b334880e5ec8
--- /dev/null
+++ b/app-text/tabler/files/tabler-2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/util.h
++++ b/util.h
+@@ -35,7 +35,7 @@
+ int digits(int n, int base);
+ char *replace_backslashed(char *string);
+
+-char *_strregtok_previous_end;
++extern char *_strregtok_previous_end;
+ char *strregtok(char *string, const regex_t *seperator);
+
+ #endif /* UTIL_H */
+--- a/util.c
++++ b/util.c
+@@ -32,6 +32,8 @@
+ #include "conf.h"
+ #include "util.h"
+
++char *_strregtok_previous_end;
++
+ /* replace_backslashed
+ *
+ * Replaces, within the given string, certain backslashed characters with the
diff --git a/app-text/tabler/metadata.xml b/app-text/tabler/metadata.xml
index 254ba3093fdb..e50e5251ba48 100644
--- a/app-text/tabler/metadata.xml
+++ b/app-text/tabler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/tabler/tabler-2-r1.ebuild b/app-text/tabler/tabler-2-r1.ebuild
index f727d216278f..e39e7e2835a9 100644
--- a/app-text/tabler/tabler-2-r1.ebuild
+++ b/app-text/tabler/tabler-2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="A utility to create text art tables from delimited input"
HOMEPAGE="https://sourceforge.net/projects/tabler/"
@@ -10,9 +10,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+DOCS=(
+ AUTHORS ChangeLog README
+)
diff --git a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
index cf59574694a6..6d8df6565843 100644
--- a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
+++ b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
@@ -1,8 +1,3 @@
- wrap.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/wrap.c b/wrap.c
-index 7c89dc8..745d1ec 100644
--- a/wrap.c
+++ b/wrap.c
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
diff --git a/app-text/talkfilters/metadata.xml b/app-text/talkfilters/metadata.xml
index feef11aea0b9..bf3a9719199b 100644
--- a/app-text/talkfilters/metadata.xml
+++ b/app-text/talkfilters/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index 791828fabbc1..df98a4f5428d 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit eutils
+EAPI=7
DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped dialect"
HOMEPAGE="http://www.hyperrealm.com/talkfilters/talkfilters.html"
@@ -11,13 +9,17 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
PATCHES=(
"${FILESDIR}"/${P}-format-security.patch
- )
+)
+
+src_configure() {
+ econf --disable-static
+}
-src_prepare() {
- epatch "${PATCHES[@]}"
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 514fd810c716..fac64127da87 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1 +1 @@
-DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
+DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
diff --git a/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch b/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch
deleted file mode 100644
index 5a290f45133b..000000000000
--- a/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-No need to pass CFLAGS twice, esp. if they are used to feed g++
-Bug #338110
-
-Index: TECkit_2_5_1/configure.ac
-===================================================================
---- TECkit_2_5_1.orig/configure.ac
-+++ TECkit_2_5_1/configure.ac
-@@ -76,7 +76,7 @@ noexpat_CFLAGS="$CFLAGS"
- noexpat_LIBS="$LIBS"
- AC_CHECK_LIB(expat, XML_ExpatVersion)
- AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
--expat_CFLAGS="$CFLAGS"
-+expat_CFLAGS=""
- expat_LIBS="$LIBS"
- CFLAGS="$noexpat_CFLAGS"
- LIBS="$noexpat_LIBS"
diff --git a/app-text/teckit/metadata.xml b/app-text/teckit/metadata.xml
index 480b5571f79a..a2d0516d1993 100644
--- a/app-text/teckit/metadata.xml
+++ b/app-text/teckit/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
new file mode 100644
index 000000000000..6147418b0d58
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Text Encoding Conversion toolkit"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
+SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+ dev-libs/expat
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ rm -f configure || die
+
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf --disable-static
+}
+
+src_test() {
+ cd "${S}/test" || die
+ chmod +x dotests.pl || die
+ ./dotests.pl || die "tests failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
deleted file mode 100644
index 045beae1707b..000000000000
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Text Encoding Conversion toolkit"
-HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
-SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/zlib
- dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.5.1-mixcflagscxxflags.patch"
- rm -f configure
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS README NEWS
- find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
- cd "${S}/test"
- chmod +x dotests.pl
- ./dotests.pl || die "tests failed"
-}
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
index 5ba62861f1c4..f2d895595ee5 100644
--- a/app-text/teseq/metadata.xml
+++ b/app-text/teseq/metadata.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="savannah">teseq</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/teseq/teseq-1.1.1.ebuild b/app-text/teseq/teseq-1.1.1.ebuild
index 360d7d34a80d..c27cb9da07be 100644
--- a/app-text/teseq/teseq-1.1.1.ebuild
+++ b/app-text/teseq/teseq-1.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
DESCRIPTION="A tool for analyzing files that contain control characters and sequences"
HOMEPAGE="https://www.gnu.org/software/teseq/"
diff --git a/app-text/tessdata_best/Manifest b/app-text/tessdata_best/Manifest
index 4a72f9405d30..39a2edfc3665 100644
--- a/app-text/tessdata_best/Manifest
+++ b/app-text/tessdata_best/Manifest
@@ -1,124 +1,248 @@
DIST afr.traineddata-tessdata_best-4.0.0 12800552 BLAKE2B 8516c5cd9822dd9726d53c4cddf47db951b081de615461aba58d55ec354741fa499ad1a9d8b3e5fcaed28bec2776501b77c1976a200fc8c71bc0663309157f89 SHA512 e9bce3ef62c25b47513d34997d2c29fdfa575af124deab0fbc90445261b027a20febfbc5a80fb9beb51a121ea22b6a1821d3b4ef89b74781886f6d93a9a75f3f
+DIST afr.traineddata-tessdata_best-4.1.0 12800552 BLAKE2B 8516c5cd9822dd9726d53c4cddf47db951b081de615461aba58d55ec354741fa499ad1a9d8b3e5fcaed28bec2776501b77c1976a200fc8c71bc0663309157f89 SHA512 e9bce3ef62c25b47513d34997d2c29fdfa575af124deab0fbc90445261b027a20febfbc5a80fb9beb51a121ea22b6a1821d3b4ef89b74781886f6d93a9a75f3f
DIST amh.traineddata-tessdata_best-4.0.0 8389639 BLAKE2B 5e4b3502da9f5fe05e502ee6baadf379b5aa5ac88fee647fddeb8f20d69ac3cbded80674767357ff7c032d0f425d4bcd56bed7048fd99340b78d983a117d521d SHA512 23cb84401f682a444f4faad0096b54f378881ceada0b29b9a59a2e24a81a5b5f96aa933fce8e03af9a2f2b1e3703283086a468d600181ed35d3901eb5c7a6d29
+DIST amh.traineddata-tessdata_best-4.1.0 8389639 BLAKE2B 5e4b3502da9f5fe05e502ee6baadf379b5aa5ac88fee647fddeb8f20d69ac3cbded80674767357ff7c032d0f425d4bcd56bed7048fd99340b78d983a117d521d SHA512 23cb84401f682a444f4faad0096b54f378881ceada0b29b9a59a2e24a81a5b5f96aa933fce8e03af9a2f2b1e3703283086a468d600181ed35d3901eb5c7a6d29
DIST ara.traineddata-tessdata_best-4.0.0 12603724 BLAKE2B bf6543011c4d97de98b6054134c8af3c6275629229220e0f30463c4ea2efa7ab5e653f6af9ff973ad63394cc79d0591000fe762f75e27229878067d0f088f30c SHA512 9b1768280a418986c32b490963edafda84ee007d7e6109c4e532cf02717a109d96483cb95967a847e20e26959753d0499245db4eb6fb361ca8ebc6f5eed7af0b
+DIST ara.traineddata-tessdata_best-4.1.0 12603724 BLAKE2B bf6543011c4d97de98b6054134c8af3c6275629229220e0f30463c4ea2efa7ab5e653f6af9ff973ad63394cc79d0591000fe762f75e27229878067d0f088f30c SHA512 9b1768280a418986c32b490963edafda84ee007d7e6109c4e532cf02717a109d96483cb95967a847e20e26959753d0499245db4eb6fb361ca8ebc6f5eed7af0b
DIST asm.traineddata-tessdata_best-4.0.0 11315350 BLAKE2B 26bd54cb1837e897c89ad0e12baa1574caeeb218f6e43bbabf91fab07c769c978a866803b338d2d6be1df51519c6a84f1313b4f709b2009e4a86c0faea667ca3 SHA512 8dd2b8f19f383d1a69420e0d04f3999aa96c08aa1757bc8996624faccba4eb7e717464ff2f2199127ecc7eb4f1b95c8e285abb9244c352297105d3272840a2e4
+DIST asm.traineddata-tessdata_best-4.1.0 11315350 BLAKE2B 26bd54cb1837e897c89ad0e12baa1574caeeb218f6e43bbabf91fab07c769c978a866803b338d2d6be1df51519c6a84f1313b4f709b2009e4a86c0faea667ca3 SHA512 8dd2b8f19f383d1a69420e0d04f3999aa96c08aa1757bc8996624faccba4eb7e717464ff2f2199127ecc7eb4f1b95c8e285abb9244c352297105d3272840a2e4
DIST aze.traineddata-tessdata_best-4.0.0 6281404 BLAKE2B b03b2a04f7368b0980f02720536c030ce866d033873b98fca1e6ce05c0da16a22b86292141aa008b985b5b558bac1d13f25ef52389bfe735ee8837eab6a2b330 SHA512 e0c52f7d39ab6b5a6b71ffa8fd8c4226cd71a670800dbfa463e534b1088481a58b50215dcb277d348e4182c9ccd2c1848c2988bb48f4f4a536fb6e8b9602ef4d
+DIST aze.traineddata-tessdata_best-4.1.0 6281404 BLAKE2B b03b2a04f7368b0980f02720536c030ce866d033873b98fca1e6ce05c0da16a22b86292141aa008b985b5b558bac1d13f25ef52389bfe735ee8837eab6a2b330 SHA512 e0c52f7d39ab6b5a6b71ffa8fd8c4226cd71a670800dbfa463e534b1088481a58b50215dcb277d348e4182c9ccd2c1848c2988bb48f4f4a536fb6e8b9602ef4d
DIST aze_cyrl.traineddata-tessdata_best-4.0.0 4700277 BLAKE2B 9939dc7e79a25558bda5e21489f0a03ce7897d258a560f592954866fb9dea6da6ca2633bb42d9390cca07c791ea51223e80438c296e1c137b85013b717b84f2c SHA512 9b21f8414eac8b1767dcb91d6e8bb0639352f8a90c485699f93ccb2b4665e50b06512ce8ebbedce4ceebceac7d53bdb1087022cd920e60f6162988f0d66f38ff
+DIST aze_cyrl.traineddata-tessdata_best-4.1.0 4700277 BLAKE2B 9939dc7e79a25558bda5e21489f0a03ce7897d258a560f592954866fb9dea6da6ca2633bb42d9390cca07c791ea51223e80438c296e1c137b85013b717b84f2c SHA512 9b21f8414eac8b1767dcb91d6e8bb0639352f8a90c485699f93ccb2b4665e50b06512ce8ebbedce4ceebceac7d53bdb1087022cd920e60f6162988f0d66f38ff
DIST bel.traineddata-tessdata_best-4.0.0 10870278 BLAKE2B 8c278495a70366096ef5b43089edbf623beca8e148a8fe79c403371e8097edd2aece4c7f049a60c8a6a9f7f999c8d757f2695f1db3f5fe8c7a2103a766e9264a SHA512 44b8952b047eccba08947d3a0d2db0052074cd859f5b2092a80ae3e2dd913ccbc454f1dae1160bb83d449f9624cc823f1899f093fa42fbdf6eac85c7ec24b9b5
+DIST bel.traineddata-tessdata_best-4.1.0 10870278 BLAKE2B 8c278495a70366096ef5b43089edbf623beca8e148a8fe79c403371e8097edd2aece4c7f049a60c8a6a9f7f999c8d757f2695f1db3f5fe8c7a2103a766e9264a SHA512 44b8952b047eccba08947d3a0d2db0052074cd859f5b2092a80ae3e2dd913ccbc454f1dae1160bb83d449f9624cc823f1899f093fa42fbdf6eac85c7ec24b9b5
DIST ben.traineddata-tessdata_best-4.0.0 11045427 BLAKE2B 600c56077f2154a6b31d938b0cfda2606e33ae6f8234f0bec3be1c3cf48416f589d6faa8c8184ac06ef6f8dfce3247058638c3e69f4cbf3c652d15fbcaa2615a SHA512 15d3c38afcc49e4fe372fd9db76348faaf555a6e6955d08c10b02360ccac95f47d44dd06f19a1827b7699cd4e5c1f349e5d5b61c3ce86b22c3aae7b837a82079
+DIST ben.traineddata-tessdata_best-4.1.0 11045427 BLAKE2B 600c56077f2154a6b31d938b0cfda2606e33ae6f8234f0bec3be1c3cf48416f589d6faa8c8184ac06ef6f8dfce3247058638c3e69f4cbf3c652d15fbcaa2615a SHA512 15d3c38afcc49e4fe372fd9db76348faaf555a6e6955d08c10b02360ccac95f47d44dd06f19a1827b7699cd4e5c1f349e5d5b61c3ce86b22c3aae7b837a82079
DIST bod.traineddata-tessdata_best-4.0.0 8623846 BLAKE2B de262fd99ba9d24a76778bf946e093f9f277fc9b89d2ac49485f9f0d9b7540297544a41e801c83a5ee79e944224aa36769bb73915dbd10a2b8770cb07538a1a8 SHA512 a0f18a3a3a9ab10092ef02218e521b3b84109bfb6e57dd56cd99e370a4b6f52174443cb48e5e329ece795c4a87c32e63b4c2f2b6ce2a4ab1750697877f8887ba
+DIST bod.traineddata-tessdata_best-4.1.0 8623846 BLAKE2B de262fd99ba9d24a76778bf946e093f9f277fc9b89d2ac49485f9f0d9b7540297544a41e801c83a5ee79e944224aa36769bb73915dbd10a2b8770cb07538a1a8 SHA512 a0f18a3a3a9ab10092ef02218e521b3b84109bfb6e57dd56cd99e370a4b6f52174443cb48e5e329ece795c4a87c32e63b4c2f2b6ce2a4ab1750697877f8887ba
DIST bos.traineddata-tessdata_best-4.0.0 5264248 BLAKE2B b4cf0d6b2c5d54edcdde4550f30ca826fa2380465877bf4cae08b3d9a62da80919b27d5b193521b809a8669164f1c215a2f32d9bc06fc9f521a756669fe4a23e SHA512 9f290e6a7f3d4ac04c96d8aaf8937d6f6f5efbb9aba736fe986bbb755c93f7a7e48e45294fdfb88a6322567502d9928bab90931f244a108d7de226bf09e9662c
+DIST bos.traineddata-tessdata_best-4.1.0 5264248 BLAKE2B b4cf0d6b2c5d54edcdde4550f30ca826fa2380465877bf4cae08b3d9a62da80919b27d5b193521b809a8669164f1c215a2f32d9bc06fc9f521a756669fe4a23e SHA512 9f290e6a7f3d4ac04c96d8aaf8937d6f6f5efbb9aba736fe986bbb755c93f7a7e48e45294fdfb88a6322567502d9928bab90931f244a108d7de226bf09e9662c
DIST bre.traineddata-tessdata_best-4.0.0 15640760 BLAKE2B 048501ad16f9b9743a06d38751847a18b40a5d6279dcb9b335eda80599fdc0b90b19fec096462f0ad2dc22814cf34d7505b5cf57bcc4a690e159a3e43b4a5f2f SHA512 8364b310c4753f2c2a90192f6c269bdcaad03e01862ceb4d6aaf63f2fd253c93c47050502ee771239f6ce9ccde0fcf09b044ada60013af00b9e21aafe2d3372e
+DIST bre.traineddata-tessdata_best-4.1.0 15640760 BLAKE2B 048501ad16f9b9743a06d38751847a18b40a5d6279dcb9b335eda80599fdc0b90b19fec096462f0ad2dc22814cf34d7505b5cf57bcc4a690e159a3e43b4a5f2f SHA512 8364b310c4753f2c2a90192f6c269bdcaad03e01862ceb4d6aaf63f2fd253c93c47050502ee771239f6ce9ccde0fcf09b044ada60013af00b9e21aafe2d3372e
DIST bul.traineddata-tessdata_best-4.0.0 8844613 BLAKE2B 0ada273d26264250ae81b07b4f38a9d6f7babd1fa696f2ef90d42d6b354a3ce3fc2d26df5ad93119ced5c280e0a5cd6e0ff93400024828557b1e2947ac044e1d SHA512 d1c86d739e7cf2f3e2bcfe4956c05b66ce591764c1ddf9ee90bf5a1a5c81e4d360a59e963a0b9b27d071a649bd4b4ca3ed27fd65c67faf5b8575f747b096cefe
+DIST bul.traineddata-tessdata_best-4.1.0 8844613 BLAKE2B 0ada273d26264250ae81b07b4f38a9d6f7babd1fa696f2ef90d42d6b354a3ce3fc2d26df5ad93119ced5c280e0a5cd6e0ff93400024828557b1e2947ac044e1d SHA512 d1c86d739e7cf2f3e2bcfe4956c05b66ce591764c1ddf9ee90bf5a1a5c81e4d360a59e963a0b9b27d071a649bd4b4ca3ed27fd65c67faf5b8575f747b096cefe
DIST cat.traineddata-tessdata_best-4.0.0 3802329 BLAKE2B a3b3db78e27eddb0dc887b166b03925c5af13fde2c77604496d73236a360107f7085d7a0cec910261b4f9cd123a27cf372b90c0369d6c2f66b942a30448263f8 SHA512 096447e78590e3eb791a17e3b27ef8b157d9c99f7b8d0347324244f339065771efe59490889f0de590a814777a401088be24813715fb4e8ca17f7700f399feb3
+DIST cat.traineddata-tessdata_best-4.1.0 3802329 BLAKE2B a3b3db78e27eddb0dc887b166b03925c5af13fde2c77604496d73236a360107f7085d7a0cec910261b4f9cd123a27cf372b90c0369d6c2f66b942a30448263f8 SHA512 096447e78590e3eb791a17e3b27ef8b157d9c99f7b8d0347324244f339065771efe59490889f0de590a814777a401088be24813715fb4e8ca17f7700f399feb3
DIST ceb.traineddata-tessdata_best-4.0.0 3452674 BLAKE2B eff60a3af369f0338cf406ab4d9969332f7f2cdf23e684274a1dd52b6533321bc9aaa76d8326ec237c009c99d922876c77aacc752d8b682cf695ce429c6019ba SHA512 21c5dce8c55569c9781fa81cbfdb3af0a13ff2d4734148e953b7f30f5f1f39e09d4f846f19f58ed327112d265c703ac753e30908178faf98b477bf8e4a2079cc
+DIST ceb.traineddata-tessdata_best-4.1.0 3452674 BLAKE2B eff60a3af369f0338cf406ab4d9969332f7f2cdf23e684274a1dd52b6533321bc9aaa76d8326ec237c009c99d922876c77aacc752d8b682cf695ce429c6019ba SHA512 21c5dce8c55569c9781fa81cbfdb3af0a13ff2d4734148e953b7f30f5f1f39e09d4f846f19f58ed327112d265c703ac753e30908178faf98b477bf8e4a2079cc
DIST ces.traineddata-tessdata_best-4.0.0 10918912 BLAKE2B cc9ebafa23419ecb5e02cd751927db138323db2c95e246ab8a42c574740aa1d9e7b38f4d17d556d8450279e250bcb03119bb7557b62269c7d0afaed067654a71 SHA512 531bb649cd6aa0304d531045862c9472baa2dc595e763d32fdf4bd9f80bf906ea5b50449c88e11ee2a0ceae69f4054ac08b3578cc3e627824794cdb233f1833a
+DIST ces.traineddata-tessdata_best-4.1.0 10918912 BLAKE2B cc9ebafa23419ecb5e02cd751927db138323db2c95e246ab8a42c574740aa1d9e7b38f4d17d556d8450279e250bcb03119bb7557b62269c7d0afaed067654a71 SHA512 531bb649cd6aa0304d531045862c9472baa2dc595e763d32fdf4bd9f80bf906ea5b50449c88e11ee2a0ceae69f4054ac08b3578cc3e627824794cdb233f1833a
DIST chi_sim.traineddata-tessdata_best-4.0.0 13077423 BLAKE2B a3fe3ac979c132d708f767d2609be44f74ae76056fa0e3b4ed1327d7b18906b02b91e3a622265e21bd5ba611a15da46e3308ab1bc89689fd891c7575248d2ddf SHA512 c006516f421ba98b2a9f5cc02bdc6ec0521ae17f8f9fbc978463da6e9d850a1632f52104cc97526cae660548663d25b60f23569f2081ead05624e6cee377d3d8
+DIST chi_sim.traineddata-tessdata_best-4.1.0 13077423 BLAKE2B a3fe3ac979c132d708f767d2609be44f74ae76056fa0e3b4ed1327d7b18906b02b91e3a622265e21bd5ba611a15da46e3308ab1bc89689fd891c7575248d2ddf SHA512 c006516f421ba98b2a9f5cc02bdc6ec0521ae17f8f9fbc978463da6e9d850a1632f52104cc97526cae660548663d25b60f23569f2081ead05624e6cee377d3d8
DIST chi_sim_vert.traineddata-tessdata_best-4.0.0 13077418 BLAKE2B b1249d27047536c2944850f9e612cb2bf42fcb0b0fb3bf40cf625e2ac41ce87406d80cc3e1a5e073c62d6aaa45306f1762174ef892d2a17fe0e327e7b0a0e0ca SHA512 8da7de7a338296718903466f8581c4d8643763ac5ba4c96829e29f476a7a3c35fa38ad4716bbe65ce18343830532febf95c4558dcedbcf786268644941032d8d
+DIST chi_sim_vert.traineddata-tessdata_best-4.1.0 13077507 BLAKE2B 4046f03caf9723bf47641033aae95360b1901dc2e0fbd9fe2613defe8125a367bcbb3b221981d0068fbee8be75981b995136b0b936cf18a1ac552f89bbd417a1 SHA512 16c36f052df4195ad15bf862dd95760b73bcb1c84209bd18b88b8a602cd076d09a60aad143fadbe3de761e87ac8b8b901e8bbe7626b06ff04b7508016ca93686
DIST chi_tra.traineddata-tessdata_best-4.0.0 12985735 BLAKE2B e1665456c32273e16ffeaa43c4f144a23bc13f6621e545e5f94ec10f0ab56eb501f70ec96349086fd3622bc7181708e0aad21c73876ff3f495a1dd37c4b42155 SHA512 3c39744956e74f54096b84a5042dec0ee7e79d0ac718b8e6260499a4081c900a036b80602e914e002a4464787148e1ac09bd9bd14b0b8ff2b482ca1adde0beb0
+DIST chi_tra.traineddata-tessdata_best-4.1.0 12985735 BLAKE2B e1665456c32273e16ffeaa43c4f144a23bc13f6621e545e5f94ec10f0ab56eb501f70ec96349086fd3622bc7181708e0aad21c73876ff3f495a1dd37c4b42155 SHA512 3c39744956e74f54096b84a5042dec0ee7e79d0ac718b8e6260499a4081c900a036b80602e914e002a4464787148e1ac09bd9bd14b0b8ff2b482ca1adde0beb0
DIST chi_tra_vert.traineddata-tessdata_best-4.0.0 12985432 BLAKE2B 0a7dca44efebfd4739c7cde0cf53933b9cfbf31b7b27232730325f2e511107743cbebe30967a764c9f6bd7d4c93014cba967ba75d0b75fc52888ea8e5c1348fd SHA512 fd7b7ba73daafccb1ebfec7c641908198f702cc697d6131764f506f00eded1f8fd65a85d50dd74df2fe096a5a471878713f604f33dc4495281126fdc800fdc95
+DIST chi_tra_vert.traineddata-tessdata_best-4.1.0 12985521 BLAKE2B d1ff4574a0c1389d2ae0bb66a062291523a407ddc1194fc4be526b2484aa72419e4c750ceac6ff56fde634c95aaf55225c3d37cda09f5960e3f559f498fbf91a SHA512 a2b043eba22937d6a77c5840a4af9dcfd2161b9f9cc1b223046aba945374dfb390580c03c2f05e2d496c7c1de17ebb8241429777a3819aeadcc134df52bd9724
DIST chr.traineddata-tessdata_best-4.0.0 2258703 BLAKE2B 62f772f6d5aa3670522d41d4f9427af2334a232219b97ce80323286d7b34c99d0e3d2ab63b15265912a6d312b6895505c72d84a807dc1dacbabe51059d7873c7 SHA512 f18a03c64988bcd6b6a395a04ee825bb638f39aea627e2c74d501b3e673e6a931f67dde6ad6da266d95d061e60cb2d651e862dce358ac4c0164351a8dfc898bb
+DIST chr.traineddata-tessdata_best-4.1.0 2258703 BLAKE2B 62f772f6d5aa3670522d41d4f9427af2334a232219b97ce80323286d7b34c99d0e3d2ab63b15265912a6d312b6895505c72d84a807dc1dacbabe51059d7873c7 SHA512 f18a03c64988bcd6b6a395a04ee825bb638f39aea627e2c74d501b3e673e6a931f67dde6ad6da266d95d061e60cb2d651e862dce358ac4c0164351a8dfc898bb
DIST cos.traineddata-tessdata_best-4.0.0 8830216 BLAKE2B b796c8f6715ec79b303b416b6b20af86f7036619ce2f2c3fc3f470b71363aa0157927ff6d970b6c5dbc026fe9b39afc70688033b069f2eef9db876b2c433799e SHA512 c85d4bbd38f4d2f2795b72367fcf5e924f1f95aa9a136ff5a61f8c4e0a736f9adbc517287a115529c8b314eeb69d93b35f481ec9eb8de732840a681f1f8f1d63
+DIST cos.traineddata-tessdata_best-4.1.0 8830216 BLAKE2B b796c8f6715ec79b303b416b6b20af86f7036619ce2f2c3fc3f470b71363aa0157927ff6d970b6c5dbc026fe9b39afc70688033b069f2eef9db876b2c433799e SHA512 c85d4bbd38f4d2f2795b72367fcf5e924f1f95aa9a136ff5a61f8c4e0a736f9adbc517287a115529c8b314eeb69d93b35f481ec9eb8de732840a681f1f8f1d63
DIST cym.traineddata-tessdata_best-4.0.0 8750784 BLAKE2B e9714cf2a55bbcfeea8167964ca3335d36422f2f53c4dc67ff4f17f66e214dd93bb2ac99f54fdbb592b5b3b39fee3109c5819ba966be1f89bcdb4b6d4c8effb2 SHA512 68d0f9deac6986ebf4b2d4010d03973359b1d263338ce19019539555a233bd25d7584cdc378b026cd2963340a25941f53d1fe37fad47d79e9ee19054928386b3
+DIST cym.traineddata-tessdata_best-4.1.0 8750784 BLAKE2B e9714cf2a55bbcfeea8167964ca3335d36422f2f53c4dc67ff4f17f66e214dd93bb2ac99f54fdbb592b5b3b39fee3109c5819ba966be1f89bcdb4b6d4c8effb2 SHA512 68d0f9deac6986ebf4b2d4010d03973359b1d263338ce19019539555a233bd25d7584cdc378b026cd2963340a25941f53d1fe37fad47d79e9ee19054928386b3
DIST dan.traineddata-tessdata_best-4.0.0 9758142 BLAKE2B 6b472ed80fd2156170e5dab387576d3d4964bc2c278b6c194512c4c888ed9a0b47711d1a916eeb32b059cff22795353f3bf5a2a8bd1f7364f5d8cbd307e35eb4 SHA512 c6e20f8a53cf2854609861388d5dfc248cd3094ffb15050451cd3fd0223a0bba2b5a8d6a5bd787e51668156104d86a6465aa0567dc5812cefc90887129be086b
+DIST dan.traineddata-tessdata_best-4.1.0 9758142 BLAKE2B 6b472ed80fd2156170e5dab387576d3d4964bc2c278b6c194512c4c888ed9a0b47711d1a916eeb32b059cff22795353f3bf5a2a8bd1f7364f5d8cbd307e35eb4 SHA512 c6e20f8a53cf2854609861388d5dfc248cd3094ffb15050451cd3fd0223a0bba2b5a8d6a5bd787e51668156104d86a6465aa0567dc5812cefc90887129be086b
DIST deu.traineddata-tessdata_best-4.0.0 8628461 BLAKE2B f46ecb469ae63d1a933a64933073a8c6100e4f1e5074b3581bccc70097a8eedbd8b2496c40d3201527e11e80070257a5a3694cdfb6fc3137c2ff12e6652e64b2 SHA512 9460fdc12737ba23040fa7a0f450100dc9f9fe65a7318041b50c42a9f6a7bf43f2027de938dcac8edbc8bccc12570766272f870d0e57a378aced8ef254a63724
+DIST deu.traineddata-tessdata_best-4.1.0 8628461 BLAKE2B f46ecb469ae63d1a933a64933073a8c6100e4f1e5074b3581bccc70097a8eedbd8b2496c40d3201527e11e80070257a5a3694cdfb6fc3137c2ff12e6652e64b2 SHA512 9460fdc12737ba23040fa7a0f450100dc9f9fe65a7318041b50c42a9f6a7bf43f2027de938dcac8edbc8bccc12570766272f870d0e57a378aced8ef254a63724
DIST div.traineddata-tessdata_best-4.0.0 4574116 BLAKE2B 402f9c0b234bfa34d9f9450bca87df5ce4e3720cd30c6625b5a03fd4920c0a531f716d2c18fe1dfabbf978050dd4caa2000c84f93ae4ac93a21288c812575c3e SHA512 378c76e0fd6c503e11c9b52f778b9d772d11fcc799c3a17013c504f3d5f385eabac82978e937f4d63316ba8a45df16eb827365b3a8bdf9b5b10f89c5e32c73eb
+DIST div.traineddata-tessdata_best-4.1.0 4574116 BLAKE2B 402f9c0b234bfa34d9f9450bca87df5ce4e3720cd30c6625b5a03fd4920c0a531f716d2c18fe1dfabbf978050dd4caa2000c84f93ae4ac93a21288c812575c3e SHA512 378c76e0fd6c503e11c9b52f778b9d772d11fcc799c3a17013c504f3d5f385eabac82978e937f4d63316ba8a45df16eb827365b3a8bdf9b5b10f89c5e32c73eb
DIST dzo.traineddata-tessdata_best-4.0.0 3243805 BLAKE2B a0c9311f9c1da18ddaf85ab9ba8e81866c8f77799c2e9da9459d87592802f35eb55cc3ebf2246fd58d009efb284cb3668f1efc860de542bf5ed01eff0770c985 SHA512 20fe018e11196cb26cce9c47393ec46fea98672e161f8ede18ae64875542af4c6032cf56195fd5b458f619e475a86155659d540e72e1648857754ca522ce0070
+DIST dzo.traineddata-tessdata_best-4.1.0 3243805 BLAKE2B a0c9311f9c1da18ddaf85ab9ba8e81866c8f77799c2e9da9459d87592802f35eb55cc3ebf2246fd58d009efb284cb3668f1efc860de542bf5ed01eff0770c985 SHA512 20fe018e11196cb26cce9c47393ec46fea98672e161f8ede18ae64875542af4c6032cf56195fd5b458f619e475a86155659d540e72e1648857754ca522ce0070
DIST ell.traineddata-tessdata_best-4.0.0 8945021 BLAKE2B 313c3c1f6a4c9c5ddfb37825d8921722372f81c859dcfc254e27a29aa63d04855ef048a43fbbcee112775061512fbd11eea120e4b83ae1c539c32e82bc00c935 SHA512 dc98885580bc039353d0c6fd22329105c03ad28dd77983a6954742534cfefd3574ffd774e6eafc5050ed432ec2d06432cbe301261ca50328af777fa85f853801
+DIST ell.traineddata-tessdata_best-4.1.0 8945021 BLAKE2B 313c3c1f6a4c9c5ddfb37825d8921722372f81c859dcfc254e27a29aa63d04855ef048a43fbbcee112775061512fbd11eea120e4b83ae1c539c32e82bc00c935 SHA512 dc98885580bc039353d0c6fd22329105c03ad28dd77983a6954742534cfefd3574ffd774e6eafc5050ed432ec2d06432cbe301261ca50328af777fa85f853801
DIST eng.traineddata-tessdata_best-4.0.0 15400601 BLAKE2B bea8595abb58265134361d87209601bfa0b3ab5c2b1a096cc6ac57a7a2bf969a1ecbbe3551838f3bb29bcef10419f53d90e1bbe8dc2ccc683db79477033a56c0 SHA512 f16df1c8288949cb05ec6eb544be15e200cf25e45208cb494df174d2c2f1e0820390d6f096a6e8b879056914a1f1abc8e0acd7dc16743c02a28ca5bfa515a3cd
+DIST eng.traineddata-tessdata_best-4.1.0 15400601 BLAKE2B bea8595abb58265134361d87209601bfa0b3ab5c2b1a096cc6ac57a7a2bf969a1ecbbe3551838f3bb29bcef10419f53d90e1bbe8dc2ccc683db79477033a56c0 SHA512 f16df1c8288949cb05ec6eb544be15e200cf25e45208cb494df174d2c2f1e0820390d6f096a6e8b879056914a1f1abc8e0acd7dc16743c02a28ca5bfa515a3cd
DIST enm.traineddata-tessdata_best-4.0.0 13281564 BLAKE2B b9bd94baec2633dacb212ddbc7743890cc4f2e8e26d5075c9dda988a29a460642acf05e85f58a2bf84f0ea0f2c235c85ac18a65be4c680b06949aeef8a9c5ba2 SHA512 915a03b42abc7d54aff548bcce70de3e574eb3c4a106896cc25fa831da06f9c069e08fd223e550aab13fd253e06ddc44f62e87ed693c2dc6194688c82da1189d
+DIST enm.traineddata-tessdata_best-4.1.0 13281564 BLAKE2B b9bd94baec2633dacb212ddbc7743890cc4f2e8e26d5075c9dda988a29a460642acf05e85f58a2bf84f0ea0f2c235c85ac18a65be4c680b06949aeef8a9c5ba2 SHA512 915a03b42abc7d54aff548bcce70de3e574eb3c4a106896cc25fa831da06f9c069e08fd223e550aab13fd253e06ddc44f62e87ed693c2dc6194688c82da1189d
DIST epo.traineddata-tessdata_best-4.0.0 7402169 BLAKE2B a9825a23e96f226362736ed1b9e22469c218bd280153fe014c70ed9c03f90684f974396051ca7dd59391183650d5636e9031f9ad19308211991e1696ddab1728 SHA512 d6018657262969af254e39ba171f457f325ed549c209b7f35265869a8cb1cf11818acc79cfb089e6bab1cd1bdb381d2687a426884cfee3c016b75be287a8e8ca
+DIST epo.traineddata-tessdata_best-4.1.0 7402169 BLAKE2B a9825a23e96f226362736ed1b9e22469c218bd280153fe014c70ed9c03f90684f974396051ca7dd59391183650d5636e9031f9ad19308211991e1696ddab1728 SHA512 d6018657262969af254e39ba171f457f325ed549c209b7f35265869a8cb1cf11818acc79cfb089e6bab1cd1bdb381d2687a426884cfee3c016b75be287a8e8ca
DIST est.traineddata-tessdata_best-4.0.0 15833749 BLAKE2B 27865c57185888dbf1c0f44c9e6989e2461d58349d03b7fd68ed0334abb6e8a6673434d85584f4962693a8185d33d55d2207113c4384879cf0a117f28ce65a3b SHA512 a64631d732305c6baa4df8e647a8d37981c07f59c1a8a9799ae42c936c224de560983ba637eecda47187fcfce23374b7becaef4eafd7815ef25ee56772e7956f
+DIST est.traineddata-tessdata_best-4.1.0 15833749 BLAKE2B 27865c57185888dbf1c0f44c9e6989e2461d58349d03b7fd68ed0334abb6e8a6673434d85584f4962693a8185d33d55d2207113c4384879cf0a117f28ce65a3b SHA512 a64631d732305c6baa4df8e647a8d37981c07f59c1a8a9799ae42c936c224de560983ba637eecda47187fcfce23374b7becaef4eafd7815ef25ee56772e7956f
DIST eus.traineddata-tessdata_best-4.0.0 7933869 BLAKE2B fade285fb0dbcd142347d9d471e7a46436ae4471d155e3aac5c0128c917e88b7845ec2d20aaa4394dd782e59750062e154180a6824f5439a1d4f3435e2e8e3a6 SHA512 5b7191d550b48a7f6d298843f939a012fbe9ca6b242c9ce71a812a5dd3151088aeaaeb8e03a8b6d536aab839f55c16ccf38af8c406556bc493dd308d4e7b5e6f
+DIST eus.traineddata-tessdata_best-4.1.0 7933869 BLAKE2B fade285fb0dbcd142347d9d471e7a46436ae4471d155e3aac5c0128c917e88b7845ec2d20aaa4394dd782e59750062e154180a6824f5439a1d4f3435e2e8e3a6 SHA512 5b7191d550b48a7f6d298843f939a012fbe9ca6b242c9ce71a812a5dd3151088aeaaeb8e03a8b6d536aab839f55c16ccf38af8c406556bc493dd308d4e7b5e6f
DIST fao.traineddata-tessdata_best-4.0.0 10030003 BLAKE2B 2f928b60806e82786c7d19de78a55268748cc73f985cbb7b815a06a94cd0aa64e7e6dba56124e47b401bea36638554af6d7eaf06e3e9fae8e24ec49d476043db SHA512 9bcc952f6a240ceaf47518dade699d8fe782bcbb838e68e0c125a4180f721d3b9ffbde9a4a69b637b253eea4914e6cc9c3059ebf8513a7252ae004f3e6039563
+DIST fao.traineddata-tessdata_best-4.1.0 10030003 BLAKE2B 2f928b60806e82786c7d19de78a55268748cc73f985cbb7b815a06a94cd0aa64e7e6dba56124e47b401bea36638554af6d7eaf06e3e9fae8e24ec49d476043db SHA512 9bcc952f6a240ceaf47518dade699d8fe782bcbb838e68e0c125a4180f721d3b9ffbde9a4a69b637b253eea4914e6cc9c3059ebf8513a7252ae004f3e6039563
DIST fas.traineddata-tessdata_best-4.0.0 3325955 BLAKE2B 9ad53a6da8bb33e378cd0d3b506e6faa1c3fab0409e872638be0a255c9c9db6add443f16dac2920fd105ea0eb6c4c8be41fd3ab8faaeacf302ae4f877ed8a1ae SHA512 02e5623de080228b4d97fef8b7792628f35592d883151855da17c828b4a96a036188465affc0b9672928868634ca9ced5007d3601b01cccebf8bed8b024ea4a1
+DIST fas.traineddata-tessdata_best-4.1.0 3325955 BLAKE2B 9ad53a6da8bb33e378cd0d3b506e6faa1c3fab0409e872638be0a255c9c9db6add443f16dac2920fd105ea0eb6c4c8be41fd3ab8faaeacf302ae4f877ed8a1ae SHA512 02e5623de080228b4d97fef8b7792628f35592d883151855da17c828b4a96a036188465affc0b9672928868634ca9ced5007d3601b01cccebf8bed8b024ea4a1
DIST fil.traineddata-tessdata_best-4.0.0 8978743 BLAKE2B b5ed3c82b1b71db2e468b3187eeb9b7c1225114e6c964e849ffe3535bc74569ff5d3b479c9fc805966c52af294ce94b7d3835818126cf0ac44a854785180bfab SHA512 85eb1e14dc5897ebf369ccade464f961c9e44ed7498700da0a94452fe0637814bea88edc6cf50d86d48cd6beadfe782d86e0583f8280034c29003432c39fc8a1
+DIST fil.traineddata-tessdata_best-4.1.0 8978743 BLAKE2B b5ed3c82b1b71db2e468b3187eeb9b7c1225114e6c964e849ffe3535bc74569ff5d3b479c9fc805966c52af294ce94b7d3835818126cf0ac44a854785180bfab SHA512 85eb1e14dc5897ebf369ccade464f961c9e44ed7498700da0a94452fe0637814bea88edc6cf50d86d48cd6beadfe782d86e0583f8280034c29003432c39fc8a1
DIST fin.traineddata-tessdata_best-4.0.0 14369979 BLAKE2B 8f6786f9806071586424159ea80105cc5f40f379c2489b435d59d9b803cb483c49d7aba2f3cf9a16e06b53ea3555631cdec543143e83fb8378ca46b3f56ba204 SHA512 21170644a11b47d4b299bc8c5f62c5ed08c84f6caba60684f4391f73060795b969c38f86a5e1828378974229637afac1730da30d25e329e15887f39eb146d8db
+DIST fin.traineddata-tessdata_best-4.1.0 14369979 BLAKE2B 8f6786f9806071586424159ea80105cc5f40f379c2489b435d59d9b803cb483c49d7aba2f3cf9a16e06b53ea3555631cdec543143e83fb8378ca46b3f56ba204 SHA512 21170644a11b47d4b299bc8c5f62c5ed08c84f6caba60684f4391f73060795b969c38f86a5e1828378974229637afac1730da30d25e329e15887f39eb146d8db
DIST fra.traineddata-tessdata_best-4.0.0 3972885 BLAKE2B 83fa9e81f4e825abdbe01a02f9021624c2165280618e1d4a725a197099675183d4cdc513017c5e3df974401b7a9e82416eae772dfa9b9323f2fd5b7f6cc9637b SHA512 d77642b072445a0d69ecc28cf12669417d96aa750f76b99370442ae73c9ba2d595f87416a50a198d2119340a9d59cb5710cd81dbb239a403fd2fc4aa508b1d64
+DIST fra.traineddata-tessdata_best-4.1.0 3972885 BLAKE2B 83fa9e81f4e825abdbe01a02f9021624c2165280618e1d4a725a197099675183d4cdc513017c5e3df974401b7a9e82416eae772dfa9b9323f2fd5b7f6cc9637b SHA512 d77642b072445a0d69ecc28cf12669417d96aa750f76b99370442ae73c9ba2d595f87416a50a198d2119340a9d59cb5710cd81dbb239a403fd2fc4aa508b1d64
DIST frk.traineddata-tessdata_best-4.0.0 12938047 BLAKE2B 5d0ce153f5e5836185f4bd614b62d8d29a899e30a4bbb2d8c92d24f43a84da01852ff254f257dfcfcd4502c2ecd0e678333704c0f7702a44d9e265c7d350d45a SHA512 5ac6de749edb99a9e3fd492b910791d617181da99f3f286415bd4a878b553a3d77cae0cbdbc02cacf9f126f96e40931fcdf53a75278cc43644d9a9d2ec92f1db
+DIST frk.traineddata-tessdata_best-4.1.0 12938047 BLAKE2B 5d0ce153f5e5836185f4bd614b62d8d29a899e30a4bbb2d8c92d24f43a84da01852ff254f257dfcfcd4502c2ecd0e678333704c0f7702a44d9e265c7d350d45a SHA512 5ac6de749edb99a9e3fd492b910791d617181da99f3f286415bd4a878b553a3d77cae0cbdbc02cacf9f126f96e40931fcdf53a75278cc43644d9a9d2ec92f1db
DIST frm.traineddata-tessdata_best-4.0.0 4043005 BLAKE2B caf82bcf29ae6421b95d91dd1c67a7abec164667bb0f9f12b346e99a5b809a7540771377301f7016a9f90f24b605c13e43dccc31f5abc3c7ebd1b2860df000ba SHA512 dbddaffd85766e4d8eb1d39fb268c0d7beacb3bc43bb436fdbd88e5c0dded6a05ea93348a64471a53c45b0a6e3237fa3ec8ff044ba7491dc321a90e4ef555441
+DIST frm.traineddata-tessdata_best-4.1.0 4043005 BLAKE2B caf82bcf29ae6421b95d91dd1c67a7abec164667bb0f9f12b346e99a5b809a7540771377301f7016a9f90f24b605c13e43dccc31f5abc3c7ebd1b2860df000ba SHA512 dbddaffd85766e4d8eb1d39fb268c0d7beacb3bc43bb436fdbd88e5c0dded6a05ea93348a64471a53c45b0a6e3237fa3ec8ff044ba7491dc321a90e4ef555441
DIST fry.traineddata-tessdata_best-4.0.0 8442509 BLAKE2B 780b051b8fb46aa13d0a30c704fbccce10e5819ef5f401e801c0fabd48f9e45bdb67bfaf259c3a507c7b6c708e2498da69d49e7c57e1b2fc72bd9389fafddc3a SHA512 9fff9834bde02aac94e8ff977e989e765fb13bc6f4a8a2bc5e3cbb425161345c01402bf71a4adb9355ea29c597686c8fc9372f381e653159993f4dfb149c581b
+DIST fry.traineddata-tessdata_best-4.1.0 8442509 BLAKE2B 780b051b8fb46aa13d0a30c704fbccce10e5819ef5f401e801c0fabd48f9e45bdb67bfaf259c3a507c7b6c708e2498da69d49e7c57e1b2fc72bd9389fafddc3a SHA512 9fff9834bde02aac94e8ff977e989e765fb13bc6f4a8a2bc5e3cbb425161345c01402bf71a4adb9355ea29c597686c8fc9372f381e653159993f4dfb149c581b
DIST gla.traineddata-tessdata_best-4.0.0 9599424 BLAKE2B 542b614bd0b834521065a8043b661b59f7dff24f0a2aaf24cb29eb6e92e759c0ee81e0f3f31ffdd3017734c5b9fcbe42211b00e1d60df87444ba4a6a9852ff23 SHA512 bdc6a4cc57ffbe864506f05199db6b6721099a3d0d901f55d285aea851866084a712495b5c891a18ae2b4b69cb7ad94f924031e260c66ba7336d6d95b9f88657
+DIST gla.traineddata-tessdata_best-4.1.0 9599424 BLAKE2B 542b614bd0b834521065a8043b661b59f7dff24f0a2aaf24cb29eb6e92e759c0ee81e0f3f31ffdd3017734c5b9fcbe42211b00e1d60df87444ba4a6a9852ff23 SHA512 bdc6a4cc57ffbe864506f05199db6b6721099a3d0d901f55d285aea851866084a712495b5c891a18ae2b4b69cb7ad94f924031e260c66ba7336d6d95b9f88657
DIST gle.traineddata-tessdata_best-4.0.0 3942458 BLAKE2B 0af94df9951cc536d766d2249924890d1e90dd602a3edfeb1017069e217973702b65d8fc090a2faef304119147f4dc81ab761ca3ce9fe67861cffeebc3ab427c SHA512 f2c377288635034b6bd80f858544aa6ed54e8fd520ebc9fe7b7c3f49d675d43fdd9de7aecb35308a14526cb928ce944cd8f194f6ce2f237ee403987f83682df6
+DIST gle.traineddata-tessdata_best-4.1.0 3942458 BLAKE2B 0af94df9951cc536d766d2249924890d1e90dd602a3edfeb1017069e217973702b65d8fc090a2faef304119147f4dc81ab761ca3ce9fe67861cffeebc3ab427c SHA512 f2c377288635034b6bd80f858544aa6ed54e8fd520ebc9fe7b7c3f49d675d43fdd9de7aecb35308a14526cb928ce944cd8f194f6ce2f237ee403987f83682df6
DIST glg.traineddata-tessdata_best-4.0.0 12709487 BLAKE2B 9c8c85a3824f8a02d199a6f3edf1761b771aac27cea59faff6a46ef37adcb403ddac2e343bd8035f0f97a817d01b24e1e8bcf2b2f62619211a460609f65a05f3 SHA512 b4324a59313a7cf52d5f0fe08baaea3b8a9ed3f0d324f7c2da3745cea3ceb821fe630ef5f086c305f2e9f021075d98fd97e6e705cf7cbf15ba723d131fb3a99e
+DIST glg.traineddata-tessdata_best-4.1.0 12709487 BLAKE2B 9c8c85a3824f8a02d199a6f3edf1761b771aac27cea59faff6a46ef37adcb403ddac2e343bd8035f0f97a817d01b24e1e8bcf2b2f62619211a460609f65a05f3 SHA512 b4324a59313a7cf52d5f0fe08baaea3b8a9ed3f0d324f7c2da3745cea3ceb821fe630ef5f086c305f2e9f021075d98fd97e6e705cf7cbf15ba723d131fb3a99e
DIST grc.traineddata-tessdata_best-4.0.0 5168122 BLAKE2B 02edd589fc91b5372903453d0c0c017ea6a57b7e182faa0759870b2dc494ece8e34bdd42a8d49a8b10f0ddf9ac47a7300777f0b6face4637dd48e23c5579d89b SHA512 fbf6fe197e1ba48dc336bcd5a9e75ca1647b82be9626e44e95f55f7d367f84f2e9440dc8bebf80548f64ff7a4c16ad6ef40f4e911924d470ad70f871d22acf77
+DIST grc.traineddata-tessdata_best-4.1.0 5168122 BLAKE2B 02edd589fc91b5372903453d0c0c017ea6a57b7e182faa0759870b2dc494ece8e34bdd42a8d49a8b10f0ddf9ac47a7300777f0b6face4637dd48e23c5579d89b SHA512 fbf6fe197e1ba48dc336bcd5a9e75ca1647b82be9626e44e95f55f7d367f84f2e9440dc8bebf80548f64ff7a4c16ad6ef40f4e911924d470ad70f871d22acf77
DIST guj.traineddata-tessdata_best-4.0.0 8515761 BLAKE2B 5781ee99ed6f2c562cff7ae1c4a135309c2690f067c3bf03efb886830196b02a061220afd66c6053dc6415f70c6b77bc59c5df0dc05ac7b807ba7b0f5d4d1c77 SHA512 5f8558f2d9a398b6c212ffa8228b46484fd216d778e8879a0b9fe0b0c2a6e1cd323771a4904e3df1a523b36ee7d54620896d875536a86f6cfcea4e704f26512e
+DIST guj.traineddata-tessdata_best-4.1.0 8515761 BLAKE2B 5781ee99ed6f2c562cff7ae1c4a135309c2690f067c3bf03efb886830196b02a061220afd66c6053dc6415f70c6b77bc59c5df0dc05ac7b807ba7b0f5d4d1c77 SHA512 5f8558f2d9a398b6c212ffa8228b46484fd216d778e8879a0b9fe0b0c2a6e1cd323771a4904e3df1a523b36ee7d54620896d875536a86f6cfcea4e704f26512e
DIST hat.traineddata-tessdata_best-4.0.0 12128251 BLAKE2B 032b4b6699d7cebbe5630f91d13cff98af7590de352e50e00a6fb87f104eea9e50f4f45396fcee65dd59eb98a74f235bc6dd38a0c120eddca0aa771ee93efc71 SHA512 a1ee40dd1a434acc7e879afcc23683d45c8a38567ba62e60acf8db3a6261571f36706031759c982675a989d2b6676c94acc11e801857c808fddf04f665134745
+DIST hat.traineddata-tessdata_best-4.1.0 12128251 BLAKE2B 032b4b6699d7cebbe5630f91d13cff98af7590de352e50e00a6fb87f104eea9e50f4f45396fcee65dd59eb98a74f235bc6dd38a0c120eddca0aa771ee93efc71 SHA512 a1ee40dd1a434acc7e879afcc23683d45c8a38567ba62e60acf8db3a6261571f36706031759c982675a989d2b6676c94acc11e801857c808fddf04f665134745
DIST heb.traineddata-tessdata_best-4.0.0 3704077 BLAKE2B eb21476cb86984b2693e4ff39067f26642c23403ed53f1ef65e547ab57f3817a71df9833ceae8151f1352487b60019a773253776f3a1341a0a2c5c18c03db7c3 SHA512 5de01f0981480af392c2ae4406a44a56566b513ec58a67435ba9d64cd158581ce98519317e5a2393c794ded05a8058dfdbf2bff63dbd589d2fd085b409f15e4d
+DIST heb.traineddata-tessdata_best-4.1.0 3704077 BLAKE2B eb21476cb86984b2693e4ff39067f26642c23403ed53f1ef65e547ab57f3817a71df9833ceae8151f1352487b60019a773253776f3a1341a0a2c5c18c03db7c3 SHA512 5de01f0981480af392c2ae4406a44a56566b513ec58a67435ba9d64cd158581ce98519317e5a2393c794ded05a8058dfdbf2bff63dbd589d2fd085b409f15e4d
DIST hin.traineddata-tessdata_best-4.0.0 11895564 BLAKE2B ebd9bd3d4fd3a27df4386e1dc94d8290a80d75dfd5ebdeb7b3124a586724031cb9f0b019d97ff25477ee943502ff7916f54b166ae4e7e1f773339b6c423f004e SHA512 3dd7d4d5465a7bd8e10c48d73859e4efe2729d4fda875928a3ee83b682bec09bfdca79e0493f1926e4d23bcf7f6b01e5f6592d7785058b6795924f2e2b4d63a2
+DIST hin.traineddata-tessdata_best-4.1.0 11895564 BLAKE2B ebd9bd3d4fd3a27df4386e1dc94d8290a80d75dfd5ebdeb7b3124a586724031cb9f0b019d97ff25477ee943502ff7916f54b166ae4e7e1f773339b6c423f004e SHA512 3dd7d4d5465a7bd8e10c48d73859e4efe2729d4fda875928a3ee83b682bec09bfdca79e0493f1926e4d23bcf7f6b01e5f6592d7785058b6795924f2e2b4d63a2
DIST hrv.traineddata-tessdata_best-4.0.0 11195424 BLAKE2B 23d99627e833203bf02155ff4ca15192be080e3c23a8ca48eb71ea115786f8baf7514d6e9404b1c817b2f9c0d48c0eb5da4520397b3a38249ccf0478a48decc4 SHA512 06973f4cf0a59d398db2f45e36f94f0ea8e2bdfb2c1b209be1a850e8128642dd760d2aa8ef93c7972eca45c4f163d9b01e68949a173bd6976438b3596f2b2482
+DIST hrv.traineddata-tessdata_best-4.1.0 11195424 BLAKE2B 23d99627e833203bf02155ff4ca15192be080e3c23a8ca48eb71ea115786f8baf7514d6e9404b1c817b2f9c0d48c0eb5da4520397b3a38249ccf0478a48decc4 SHA512 06973f4cf0a59d398db2f45e36f94f0ea8e2bdfb2c1b209be1a850e8128642dd760d2aa8ef93c7972eca45c4f163d9b01e68949a173bd6976438b3596f2b2482
DIST hun.traineddata-tessdata_best-4.0.0 12350405 BLAKE2B c8b92651907c1b7e331757834fabb39422fed2b8bde7d46ba87356d9bf31244618cb8b14c8053addc6633d43fbe7e4e533f4e94797ad6ffd5ad2a420f7835cf7 SHA512 4efb9618102b5daf6b98415609b8a7739da6d3febd69a1ae104fe581cd2d6f67af43ea93d4d358be9360a0a1229f001a1d76807018c74da36b5377e6b621f967
+DIST hun.traineddata-tessdata_best-4.1.0 12350405 BLAKE2B c8b92651907c1b7e331757834fabb39422fed2b8bde7d46ba87356d9bf31244618cb8b14c8053addc6633d43fbe7e4e533f4e94797ad6ffd5ad2a420f7835cf7 SHA512 4efb9618102b5daf6b98415609b8a7739da6d3febd69a1ae104fe581cd2d6f67af43ea93d4d358be9360a0a1229f001a1d76807018c74da36b5377e6b621f967
DIST hye.traineddata-tessdata_best-4.0.0 6372242 BLAKE2B 0b279cfb8cba5b9a3c91ac67ad5dfdcd3680adff1d6775377d3e443389566cfb2bffbacb75b7c6ebbf8e26c7131a4bfd151282206bcdde9560ef3abe3e897067 SHA512 914156bf0dcd6edb6ffc293257008fa4054ae5ec48beafd880a7f023bc79de828426d7ac6a16ef2ce149487f93b505a9a8f953597036b81a8b751200d07b4158
+DIST hye.traineddata-tessdata_best-4.1.0 6372242 BLAKE2B 0b279cfb8cba5b9a3c91ac67ad5dfdcd3680adff1d6775377d3e443389566cfb2bffbacb75b7c6ebbf8e26c7131a4bfd151282206bcdde9560ef3abe3e897067 SHA512 914156bf0dcd6edb6ffc293257008fa4054ae5ec48beafd880a7f023bc79de828426d7ac6a16ef2ce149487f93b505a9a8f953597036b81a8b751200d07b4158
DIST iku.traineddata-tessdata_best-4.0.0 6139484 BLAKE2B 18fb25c82005ef5be4e86c9c735074c83934980ad509a6e2702639188fc673b0b310aed7e261ddbb64d1268e43ccc6c8edd13f8a65cab9d123c1ec0759325af0 SHA512 e29d908b81961d1beb207a86ddde541e30f0de68731b34120beab4236555a9755270e6a7406980fcc4fe2c941a724eccaf026d1b591c8183e1ddee0e64b54e7c
+DIST iku.traineddata-tessdata_best-4.1.0 6139484 BLAKE2B 18fb25c82005ef5be4e86c9c735074c83934980ad509a6e2702639188fc673b0b310aed7e261ddbb64d1268e43ccc6c8edd13f8a65cab9d123c1ec0759325af0 SHA512 e29d908b81961d1beb207a86ddde541e30f0de68731b34120beab4236555a9755270e6a7406980fcc4fe2c941a724eccaf026d1b591c8183e1ddee0e64b54e7c
DIST ind.traineddata-tessdata_best-4.0.0 8253606 BLAKE2B 2776a5ae7c44e0d2551b8952bf5d9cf35b72c4f114ff468d4758410391e315e52b936f68e06999f05dc74803a7d089ae8ff0d859c01154ab1a7987d5abcc4e07 SHA512 7bf08419b2779ba079b4fd11140f24b8faa5afa05aae44c15a484948360515a1a165f31af23bfd8603f4153cb12e5e67d7eb4019180cda763f1a04b515aa8b69
+DIST ind.traineddata-tessdata_best-4.1.0 8253606 BLAKE2B 2776a5ae7c44e0d2551b8952bf5d9cf35b72c4f114ff468d4758410391e315e52b936f68e06999f05dc74803a7d089ae8ff0d859c01154ab1a7987d5abcc4e07 SHA512 7bf08419b2779ba079b4fd11140f24b8faa5afa05aae44c15a484948360515a1a165f31af23bfd8603f4153cb12e5e67d7eb4019180cda763f1a04b515aa8b69
DIST isl.traineddata-tessdata_best-4.0.0 9486436 BLAKE2B a640284660440872f3961deae0806ba014d32b4f8a6525c1367a5b169ec5db7d5556fa258b5b3e08956d7adda0b4d0237307f646a23729bab53a1fec3c2de953 SHA512 adc95fbca6ea87fe91db123218be0227c1fc90b2117672bf82ac369cd1804407d8ac68c8b1551ef4db28ea306761cbeaa91b8e3ecfcb16a538e433f418f53905
+DIST isl.traineddata-tessdata_best-4.1.0 9486436 BLAKE2B a640284660440872f3961deae0806ba014d32b4f8a6525c1367a5b169ec5db7d5556fa258b5b3e08956d7adda0b4d0237307f646a23729bab53a1fec3c2de953 SHA512 adc95fbca6ea87fe91db123218be0227c1fc90b2117672bf82ac369cd1804407d8ac68c8b1551ef4db28ea306761cbeaa91b8e3ecfcb16a538e433f418f53905
DIST ita.traineddata-tessdata_best-4.0.0 8863667 BLAKE2B 6bb2669a54281839816de31b78cedec74f635e889d6e51b8258bd6c5876ab1caf50a69aaaca5b40a5fce49f0521a3d65edf6001f52b1c44897178b304319c3be SHA512 ef13b6cb7843641f8452f8d40aec020f77883394b0ef0af4b5119c42da487e21ebce6e1f450016f077c4f1731cb7be72009b144bef7b54417c468881a834a310
+DIST ita.traineddata-tessdata_best-4.1.0 8863635 BLAKE2B c55ab4e0d3a9869370790352d4acc5e2d85bc4fa3e455ee540251621be5a48fc11bb490a6c0d8be6e5f879828f58e9aa620ff8665e283abee934f7107e4c0b95 SHA512 9430e64e164cbf1fa6f6ab5cc4ebea8ea33cedb6200ffd5b4ab2e5ea985e04f51e9d76274a51124199b767201e4782e6a4aca0810ff696cbfe77a816f5c0e9af
DIST ita_old.traineddata-tessdata_best-4.0.0 9852171 BLAKE2B a1faf32be7eb69f1e2fe655efdb3e3172dbac87169cd1128e5bbefe135fd65187a63cd3e51c384b1416ff4105c1925593896dd4716ebd19d4598a18ccf19c3bf SHA512 b7ad04ab231a5cebd752192a7848862bbc6b690bfc0797bb078fd55eb23d053d5c2fa426ab70cf18ef0ac846eff1b970ec31c57232d70a4b156e1fa33309742e
+DIST ita_old.traineddata-tessdata_best-4.1.0 9852171 BLAKE2B a1faf32be7eb69f1e2fe655efdb3e3172dbac87169cd1128e5bbefe135fd65187a63cd3e51c384b1416ff4105c1925593896dd4716ebd19d4598a18ccf19c3bf SHA512 b7ad04ab231a5cebd752192a7848862bbc6b690bfc0797bb078fd55eb23d053d5c2fa426ab70cf18ef0ac846eff1b970ec31c57232d70a4b156e1fa33309742e
DIST jav.traineddata-tessdata_best-4.0.0 8650382 BLAKE2B 057f692c760422c05510d13dc2d2c18229ab9a593dd76a8959784acabc8aac6556415412b4a113af97cc1422ab5690f0e27dbc7dd38f8e0e974cfb51fcad2152 SHA512 4a0ebe7fe0e7f9ae581f948be08727b95fcb03e4ae4be19daf188c52af2e22cec2923061a542c9c1a314f7d6bb0d04a03b1f5f1b5bd81c9cd06792086f81a1d9
+DIST jav.traineddata-tessdata_best-4.1.0 8650382 BLAKE2B 057f692c760422c05510d13dc2d2c18229ab9a593dd76a8959784acabc8aac6556415412b4a113af97cc1422ab5690f0e27dbc7dd38f8e0e974cfb51fcad2152 SHA512 4a0ebe7fe0e7f9ae581f948be08727b95fcb03e4ae4be19daf188c52af2e22cec2923061a542c9c1a314f7d6bb0d04a03b1f5f1b5bd81c9cd06792086f81a1d9
DIST jpn.traineddata-tessdata_best-4.0.0 14330108 BLAKE2B c0d25e0f08fa1a6d3ccc2e88a114070d110365e7cd08f05ef31abb51ad5c8294845ad197cc9912559d8bbdd1946a483b2dedf0f4ca6ce510a30c362b02d53adb SHA512 d24b82cb668977e60fad9f85919b2918a218da8dd6f3b28f8e546d03c02cdad09eb9016fc31f139c25744685b443962a4bcd4e3902b52c00ff209f13c0251c9f
+DIST jpn.traineddata-tessdata_best-4.1.0 14330109 BLAKE2B cb1c48eb68f7098dd0e8b7fb81fd304acb2253a7b0ae23231add00c5c4280a9b95393341d1c9d383d62facb1b39631c829435270297a50bd5928c91e3ca6da30 SHA512 65ff34b1e839a2da83b4f5738c6369ba989a2b8a7c6dd8565bb0e8b6a1939d4d6f703d742a1bbc2b3e3a8edf38362520b7e39611a032aea9e424a61068fd338e
DIST jpn_vert.traineddata-tessdata_best-4.0.0 14330719 BLAKE2B 26c938b545f6cf56e21d934f7808dc92b48df883e3b8c74ee90f94b5151f8ec137d700f6eb905c033579094fd4c1986bc4afe3294114a7c3bd9ad0ddbf443feb SHA512 cd589afa07afeba90acf2e5eed459aa58fca598be3cdb77c0bb71283033d965f5b8b61a501bde9014d30e7d247c6b9ec4ff63b37b902eabf78f445afe1dabefb
+DIST jpn_vert.traineddata-tessdata_best-4.1.0 14330809 BLAKE2B f2fa3ac9b42d5216880d15b4f9ce2a65bc1f0aead84a82a9b365c56b45118ad4ba4e803dcc7f1cf43ebf56aef195636aa8ab62ffd20f7f42c36c9b06c8775383 SHA512 401d81f3c53dfd2f85a45c6b8e8f678002a3cf4f8187778d2e458b34d2ad4a20acfeb9d963be0363b56037f836588a9cc932c6717568ea92dfe960c4cf1fb7e6
DIST kan.traineddata-tessdata_best-4.0.0 10233763 BLAKE2B d12b51076b136167fd2331bbdd4b0443224ef1dac0f9b3e471b4580e7bb52dc93997eb55f5bc4221226b78a78c8037ad3ff7d32cf199bfb4030e78ef606aa197 SHA512 199b6912d415159e3c05c3dec45e71b52305862863b759abec826dbc17c88b08cdb18793f36f671522317df93c8b29a8abca571043aabbbf0be4bab4f8222ab3
+DIST kan.traineddata-tessdata_best-4.1.0 10233763 BLAKE2B d12b51076b136167fd2331bbdd4b0443224ef1dac0f9b3e471b4580e7bb52dc93997eb55f5bc4221226b78a78c8037ad3ff7d32cf199bfb4030e78ef606aa197 SHA512 199b6912d415159e3c05c3dec45e71b52305862863b759abec826dbc17c88b08cdb18793f36f671522317df93c8b29a8abca571043aabbbf0be4bab4f8222ab3
DIST kat.traineddata-tessdata_best-4.0.0 4487336 BLAKE2B ab056d4f64cf18205bb808e380aebd7941f62d84fff38515b5fcb1062812533f2a4a2b2f0dcde299d6a85302bc2d6cf90f3e02684d2d95b247e7c86f0299b6d5 SHA512 2b1709f8742c5279cf8f26d21a45c1bf1fab26f4e155a74092b21b2325e0af8578c39035665475a4f9b66319512630165425cd76ddf1489e50311fd5727b534f
+DIST kat.traineddata-tessdata_best-4.1.0 4487336 BLAKE2B ab056d4f64cf18205bb808e380aebd7941f62d84fff38515b5fcb1062812533f2a4a2b2f0dcde299d6a85302bc2d6cf90f3e02684d2d95b247e7c86f0299b6d5 SHA512 2b1709f8742c5279cf8f26d21a45c1bf1fab26f4e155a74092b21b2325e0af8578c39035665475a4f9b66319512630165425cd76ddf1489e50311fd5727b534f
DIST kat_old.traineddata-tessdata_best-4.0.0 3174400 BLAKE2B f9903efa618d20868bf978a96a8dbe05f67725355cf3f361155433333f6494a35ad61d7c6497251bc1dc1569ab6107034f101490fe4d23c1f348357b52a5f2e4 SHA512 428dad38bb45bcba2342bf3ca22987e4e5207eafd9655ad04d9cd8c4e85ef74b05127c163c326b34178f6485c56e06fb0104f2281d9e6d95692b5a3845164d7e
+DIST kat_old.traineddata-tessdata_best-4.1.0 3174400 BLAKE2B f9903efa618d20868bf978a96a8dbe05f67725355cf3f361155433333f6494a35ad61d7c6497251bc1dc1569ab6107034f101490fe4d23c1f348357b52a5f2e4 SHA512 428dad38bb45bcba2342bf3ca22987e4e5207eafd9655ad04d9cd8c4e85ef74b05127c163c326b34178f6485c56e06fb0104f2281d9e6d95692b5a3845164d7e
DIST kaz.traineddata-tessdata_best-4.0.0 7528853 BLAKE2B d19ddcca82b735f955c4c02efab6ac7ba9077bddcf831fd1b672a614acd4c46f7d241be6521fe99ee2d9c7cf5c03152e9fdc530f48810f7aaa3c9c421945293c SHA512 ac84426191000767ae3c54285f573ca84e08946c01fa87f63f4415a10091eeb5e65a7152a45291bd42ab57ac27b63464f9adcee976788c7ce1f18119aaceac3e
+DIST kaz.traineddata-tessdata_best-4.1.0 7528853 BLAKE2B d19ddcca82b735f955c4c02efab6ac7ba9077bddcf831fd1b672a614acd4c46f7d241be6521fe99ee2d9c7cf5c03152e9fdc530f48810f7aaa3c9c421945293c SHA512 ac84426191000767ae3c54285f573ca84e08946c01fa87f63f4415a10091eeb5e65a7152a45291bd42ab57ac27b63464f9adcee976788c7ce1f18119aaceac3e
DIST khm.traineddata-tessdata_best-4.0.0 8104332 BLAKE2B 7f80d38ba692b5ae23ca8f92fd3614874705de3d52f7a10e89bb592a403940b67f0f54c4202c9f202023d3c76654588569971eb9b231af9ee17fc1592a0f5cf4 SHA512 dcff174da366c4cfc06b6810f509bb1a0613844cae34b9f154181f8dbe46ef139980c755074533f233028d3b5ae975bdb60633b359ab95b150ad06111f26a834
+DIST khm.traineddata-tessdata_best-4.1.0 8104332 BLAKE2B 7f80d38ba692b5ae23ca8f92fd3614874705de3d52f7a10e89bb592a403940b67f0f54c4202c9f202023d3c76654588569971eb9b231af9ee17fc1592a0f5cf4 SHA512 dcff174da366c4cfc06b6810f509bb1a0613844cae34b9f154181f8dbe46ef139980c755074533f233028d3b5ae975bdb60633b359ab95b150ad06111f26a834
DIST kir.traineddata-tessdata_best-4.0.0 11948344 BLAKE2B 047793238943067971467cffc27ba17ac187e1eb6072a7849319bbc31a11d4c9b6df9e196240bcd2b0bafbd8211b9e79d04f919d8f5b1b1dc7e891380cb9bc7e SHA512 ec8bded96d932e2fee7ec93e58cffbd1cfb8eb83137bcea41e5e3bef7976196b63f292e562b7521ec078088e132e9b7e9cd96ae4e8a1aea38164fa98169cb4a3
+DIST kir.traineddata-tessdata_best-4.1.0 11948344 BLAKE2B 047793238943067971467cffc27ba17ac187e1eb6072a7849319bbc31a11d4c9b6df9e196240bcd2b0bafbd8211b9e79d04f919d8f5b1b1dc7e891380cb9bc7e SHA512 ec8bded96d932e2fee7ec93e58cffbd1cfb8eb83137bcea41e5e3bef7976196b63f292e562b7521ec078088e132e9b7e9cd96ae4e8a1aea38164fa98169cb4a3
DIST kmr.traineddata-tessdata_best-4.0.0 10196464 BLAKE2B 23f9bf2db65b6e4b3a6c8ed15802df343af205e0323fcd6e8c1dcd2c09ceb576ad00023b71d4e650af5f9e0584420908da8b1d1b0d461d3ca9f87a0ef06eec63 SHA512 d74836bf88510378dc8e26e84d6d5c657a96e5fb0c6d20f4ad7ea5f971ad3606480b532d874dd2cbaff135a60002443ecf30b70ae1910e4dd63fa878da533b3e
+DIST kmr.traineddata-tessdata_best-4.1.0 10196464 BLAKE2B 23f9bf2db65b6e4b3a6c8ed15802df343af205e0323fcd6e8c1dcd2c09ceb576ad00023b71d4e650af5f9e0584420908da8b1d1b0d461d3ca9f87a0ef06eec63 SHA512 d74836bf88510378dc8e26e84d6d5c657a96e5fb0c6d20f4ad7ea5f971ad3606480b532d874dd2cbaff135a60002443ecf30b70ae1910e4dd63fa878da533b3e
DIST kor.traineddata-tessdata_best-4.0.0 12528128 BLAKE2B cf2c35881ed56199f340a769aaa8e31b5de2e0323fe4ad5a833356cd3151849dc28008517e75935a7db2115ec32f7ea716b0a34a0b1777e1103ceb4299400bb2 SHA512 4b68eb2990f8ffdbd7c3221c3e68afbcd35e1dfd19bd0246bc1efb8a46a8bfd716a50f8f357f82680c806c08cb9e3c28b2dd691a00a490860f351c5532041e69
+DIST kor.traineddata-tessdata_best-4.1.0 12528128 BLAKE2B cf2c35881ed56199f340a769aaa8e31b5de2e0323fe4ad5a833356cd3151849dc28008517e75935a7db2115ec32f7ea716b0a34a0b1777e1103ceb4299400bb2 SHA512 4b68eb2990f8ffdbd7c3221c3e68afbcd35e1dfd19bd0246bc1efb8a46a8bfd716a50f8f357f82680c806c08cb9e3c28b2dd691a00a490860f351c5532041e69
DIST kor_vert.traineddata-tessdata_best-4.0.0 3964469 BLAKE2B 4cf74c82966cf829193a1ef45577445c4e43917647beb50e85bc7bbe4ce539f28e1bfd012bfb87a27abf995c5b869989cad900b2b2707dbd06578a94c339703f SHA512 2906bea31215b1978f1cba8f1a2f8f91761eeb3cc47fe822cd455df081ec8c095bb92fb61f4d564beab504ab6a1e9ed16b31e80a0803af5a734f917d1f87e046
+DIST kor_vert.traineddata-tessdata_best-4.1.0 3964469 BLAKE2B 4cf74c82966cf829193a1ef45577445c4e43917647beb50e85bc7bbe4ce539f28e1bfd012bfb87a27abf995c5b869989cad900b2b2707dbd06578a94c339703f SHA512 2906bea31215b1978f1cba8f1a2f8f91761eeb3cc47fe822cd455df081ec8c095bb92fb61f4d564beab504ab6a1e9ed16b31e80a0803af5a734f917d1f87e046
DIST lao.traineddata-tessdata_best-4.0.0 13532551 BLAKE2B dd02433df7656feb5e631728a1fec4d095976dfe4f461d0dde64a8dcb6a11546d3da36091bdb8be91c56fd4006378b2e8787097c6c252716465d416f739f2d92 SHA512 2704aab942012055526c00ad98f6bdcdf605c8f07cb34d6b6fc247deaae5f9d57e5ea41ab2f10eaac5730f5da36de4881f52b3458b3e00babe0e86f8737e5c7c
+DIST lao.traineddata-tessdata_best-4.1.0 13532551 BLAKE2B dd02433df7656feb5e631728a1fec4d095976dfe4f461d0dde64a8dcb6a11546d3da36091bdb8be91c56fd4006378b2e8787097c6c252716465d416f739f2d92 SHA512 2704aab942012055526c00ad98f6bdcdf605c8f07cb34d6b6fc247deaae5f9d57e5ea41ab2f10eaac5730f5da36de4881f52b3458b3e00babe0e86f8737e5c7c
DIST lat.traineddata-tessdata_best-4.0.0 9705145 BLAKE2B bbc4f50054e1ebdad18d77bcccb11e3c893526bfb6b71d907feb18871d14067dd006c240da6c9e930423c6ba65bd37071ea44b873a23a49cb6f3427f69535b35 SHA512 48cf8ac868375cc9f7de8ae7e0f9be52291f8876240575fad1ae7132853cada6c0d2b3435ac26b3e435b40d359a72c900146a6f5859c7ffa4d756199c320c85f
+DIST lat.traineddata-tessdata_best-4.1.0 9705145 BLAKE2B bbc4f50054e1ebdad18d77bcccb11e3c893526bfb6b71d907feb18871d14067dd006c240da6c9e930423c6ba65bd37071ea44b873a23a49cb6f3427f69535b35 SHA512 48cf8ac868375cc9f7de8ae7e0f9be52291f8876240575fad1ae7132853cada6c0d2b3435ac26b3e435b40d359a72c900146a6f5859c7ffa4d756199c320c85f
DIST lav.traineddata-tessdata_best-4.0.0 5623473 BLAKE2B 12870708bfe94e9ebc202900542ca25915eab97ec38ff821c01bd2c1b8b6e7c3b05f44ded1695dddd3559351b1b69268a155739d0c10bf69cacd4eba5fc0e1f3 SHA512 83a20272a715862371dce6969cd558f605f0abf0afe83868ad69869429c3d81f1678d9577761760a92e7c5a0148d3688c30acada94a36f1c3ab01637a1eb340a
+DIST lav.traineddata-tessdata_best-4.1.0 5623473 BLAKE2B 12870708bfe94e9ebc202900542ca25915eab97ec38ff821c01bd2c1b8b6e7c3b05f44ded1695dddd3559351b1b69268a155739d0c10bf69cacd4eba5fc0e1f3 SHA512 83a20272a715862371dce6969cd558f605f0abf0afe83868ad69869429c3d81f1678d9577761760a92e7c5a0148d3688c30acada94a36f1c3ab01637a1eb340a
DIST lit.traineddata-tessdata_best-4.0.0 10252680 BLAKE2B 796c2209770ba4872ff815d418322f0939b613b41bc23e41f1f91a78db69f5fe52328cc7ef3d8413b48014e4224d085af5d20ec8168ca158982e85cfa68669ab SHA512 9d90e648dc0c344151c99099474a70f885ac87f1fe1bba0984c2a9914db284965d7cb0c66fed7c33419ec647ece51512633fb5c6173c12f06ce570f28582c9ef
+DIST lit.traineddata-tessdata_best-4.1.0 10252680 BLAKE2B 796c2209770ba4872ff815d418322f0939b613b41bc23e41f1f91a78db69f5fe52328cc7ef3d8413b48014e4224d085af5d20ec8168ca158982e85cfa68669ab SHA512 9d90e648dc0c344151c99099474a70f885ac87f1fe1bba0984c2a9914db284965d7cb0c66fed7c33419ec647ece51512633fb5c6173c12f06ce570f28582c9ef
DIST ltz.traineddata-tessdata_best-4.0.0 12721945 BLAKE2B bde28d2f6babe5699fed2098ebf2fbd360aae76f74cd7a36b40c0ab596f12840ebfb9d952657ffbb1f757c9be3ddc0311180f4554f21a6c40d4f28f187232dcc SHA512 2a5987f73fea783757ab0c6f21a48e513ba8ee8befc7ea2555375bf235c0f56e5b62b75bc4d88a93672e7908b8f74175541983671a23e1fdae709cead0038246
+DIST ltz.traineddata-tessdata_best-4.1.0 12721945 BLAKE2B bde28d2f6babe5699fed2098ebf2fbd360aae76f74cd7a36b40c0ab596f12840ebfb9d952657ffbb1f757c9be3ddc0311180f4554f21a6c40d4f28f187232dcc SHA512 2a5987f73fea783757ab0c6f21a48e513ba8ee8befc7ea2555375bf235c0f56e5b62b75bc4d88a93672e7908b8f74175541983671a23e1fdae709cead0038246
DIST mal.traineddata-tessdata_best-4.0.0 12524967 BLAKE2B e8bb4d88c48377a47bbba99eca21ffcf33de90983246ac1e422a1b7a0131effa64d2857ba2e00ee30bda2264b48fbd653b360d5c2a4dc139ef2e309b9ea87868 SHA512 a8765853f49ca91a3ed9efb3e89e1f873b39df6e6dac5372cfe7d2764e004b14b084d296a8a41b315076240198af7db855c985d5d511f7732b9f77d3b167d651
+DIST mal.traineddata-tessdata_best-4.1.0 12524967 BLAKE2B e8bb4d88c48377a47bbba99eca21ffcf33de90983246ac1e422a1b7a0131effa64d2857ba2e00ee30bda2264b48fbd653b360d5c2a4dc139ef2e309b9ea87868 SHA512 a8765853f49ca91a3ed9efb3e89e1f873b39df6e6dac5372cfe7d2764e004b14b084d296a8a41b315076240198af7db855c985d5d511f7732b9f77d3b167d651
DIST mar.traineddata-tessdata_best-4.0.0 13437670 BLAKE2B 83df37abbc4f375647624ea504d517bcef197e027b040db94803223b64600ece936e66e023348758dc42445e34fd777c813ee695a2d55133a4fe4091f605d040 SHA512 06e071b8310806580a46e8050214f7a1d56fef22007e54b165bd56d614c363f800ce0b8facf8fa3904a14a808b69c768e37bae2414066a8c7e13fdcb1f0f3898
+DIST mar.traineddata-tessdata_best-4.1.0 13437670 BLAKE2B 83df37abbc4f375647624ea504d517bcef197e027b040db94803223b64600ece936e66e023348758dc42445e34fd777c813ee695a2d55133a4fe4091f605d040 SHA512 06e071b8310806580a46e8050214f7a1d56fef22007e54b165bd56d614c363f800ce0b8facf8fa3904a14a808b69c768e37bae2414066a8c7e13fdcb1f0f3898
DIST mkd.traineddata-tessdata_best-4.0.0 3453054 BLAKE2B 193a34a9cff32a78d15b995fd26618de6026e7ca6e1fa544761435e5dba9a0c1abd37299e9037c83f2946032edf30f5c3fa090302a4da8ed6922e7b9c0cc8e53 SHA512 bb0cae6b7487d9817285e2068336e7cc9c3a13c658b0378df2995e9def73da94cd91cfa69f7994e808486cf6ede9b142b1df1f6daf9ae738efe905be14cf4f57
+DIST mkd.traineddata-tessdata_best-4.1.0 3453054 BLAKE2B 193a34a9cff32a78d15b995fd26618de6026e7ca6e1fa544761435e5dba9a0c1abd37299e9037c83f2946032edf30f5c3fa090302a4da8ed6922e7b9c0cc8e53 SHA512 bb0cae6b7487d9817285e2068336e7cc9c3a13c658b0378df2995e9def73da94cd91cfa69f7994e808486cf6ede9b142b1df1f6daf9ae738efe905be14cf4f57
DIST mlt.traineddata-tessdata_best-4.0.0 5060029 BLAKE2B 9b0ac0bd9aa392fb9e5885d8a5afea1a6847f9588aac4a0e9e732b5f28a144b348b694a7a75e376c0492a38c49715e6d8acddd73a9f62bd4d0d1cb6466cffdaf SHA512 7ec86417946d24301018a87a4e58a12b227419d835dbd81a8c523ea9b1a00a576e048c623e9331e75b580124f93137e11548bef1f152e6eeab831e3c47ddfe4d
+DIST mlt.traineddata-tessdata_best-4.1.0 5060029 BLAKE2B 9b0ac0bd9aa392fb9e5885d8a5afea1a6847f9588aac4a0e9e732b5f28a144b348b694a7a75e376c0492a38c49715e6d8acddd73a9f62bd4d0d1cb6466cffdaf SHA512 7ec86417946d24301018a87a4e58a12b227419d835dbd81a8c523ea9b1a00a576e048c623e9331e75b580124f93137e11548bef1f152e6eeab831e3c47ddfe4d
DIST mon.traineddata-tessdata_best-4.0.0 8646663 BLAKE2B c47b10a2c3239f6601c78ce0b4876f9ca6205c8db6d067658ebfa977662aa82c0d01c183887bdc193f2be24c3f0a5b35d87c6f3f1d1096a244dd97d702c61880 SHA512 47d0b3d2ae789a51605f31dfb7ef498f336e7dc4c58e5e38b013c15e31c1cc7d1c307135663e00c01fe26024645384f4b4041a19bd62fde41ea9612f9ed586a4
+DIST mon.traineddata-tessdata_best-4.1.0 8646663 BLAKE2B c47b10a2c3239f6601c78ce0b4876f9ca6205c8db6d067658ebfa977662aa82c0d01c183887bdc193f2be24c3f0a5b35d87c6f3f1d1096a244dd97d702c61880 SHA512 47d0b3d2ae789a51605f31dfb7ef498f336e7dc4c58e5e38b013c15e31c1cc7d1c307135663e00c01fe26024645384f4b4041a19bd62fde41ea9612f9ed586a4
DIST mri.traineddata-tessdata_best-4.0.0 3610177 BLAKE2B ad2289db31a94c56dc40da2922572107071f40c2ab7edf7b755eeb2a05da1b0818e18a937bc4b5af26f46fea9764a01b9092e809104b9dad1154fba06a76cc97 SHA512 1c445a32d3356f3b7db55bd8be0358adcea3bb6c636755609603dc2cb766ec39b9f17e2ec7b07398f454e6b05b15c546603cc1b2084e1197d760d90b6a3892aa
+DIST mri.traineddata-tessdata_best-4.1.0 3610177 BLAKE2B ad2289db31a94c56dc40da2922572107071f40c2ab7edf7b755eeb2a05da1b0818e18a937bc4b5af26f46fea9764a01b9092e809104b9dad1154fba06a76cc97 SHA512 1c445a32d3356f3b7db55bd8be0358adcea3bb6c636755609603dc2cb766ec39b9f17e2ec7b07398f454e6b05b15c546603cc1b2084e1197d760d90b6a3892aa
DIST msa.traineddata-tessdata_best-4.0.0 8230552 BLAKE2B 708ed1b326cdb7bcf4c63355825fd10f9305d749a82b3ce7366207be62751b840cee496de248d0edde6b5ecdf98ab0fd4fb757b55d4e07bb317a088be876f3f0 SHA512 ca5bd3d67068e806c5b695e90afb2f7dd09cbbaa52432c0b8cfacfec95ac435a6486255fed7c0f7f5c4aa3b2dcc957c88318750b29293857e491b4fe00f0126d
+DIST msa.traineddata-tessdata_best-4.1.0 8230552 BLAKE2B 708ed1b326cdb7bcf4c63355825fd10f9305d749a82b3ce7366207be62751b840cee496de248d0edde6b5ecdf98ab0fd4fb757b55d4e07bb317a088be876f3f0 SHA512 ca5bd3d67068e806c5b695e90afb2f7dd09cbbaa52432c0b8cfacfec95ac435a6486255fed7c0f7f5c4aa3b2dcc957c88318750b29293857e491b4fe00f0126d
DIST mya.traineddata-tessdata_best-4.0.0 14971060 BLAKE2B 5bcbf8cb5bf984d4818c97cb48fea8e9b7ce527b84f15e14e8f4e10ee6d32e86653927c3b9820292abf3b2fb3a20146e9bf9a0107dcebf181dd692e1d47ca246 SHA512 6acb78ccf8efe8741ad4c95755db932d7c38717dacac4bde60981329c6406d209767366efe3cfc7048111466696d6b99cb101c6f14428dedcc46affe5d52b538
+DIST mya.traineddata-tessdata_best-4.1.0 14971060 BLAKE2B 5bcbf8cb5bf984d4818c97cb48fea8e9b7ce527b84f15e14e8f4e10ee6d32e86653927c3b9820292abf3b2fb3a20146e9bf9a0107dcebf181dd692e1d47ca246 SHA512 6acb78ccf8efe8741ad4c95755db932d7c38717dacac4bde60981329c6406d209767366efe3cfc7048111466696d6b99cb101c6f14428dedcc46affe5d52b538
DIST nep.traineddata-tessdata_best-4.0.0 12387399 BLAKE2B 1f4551413cba4b637d7f4f842be04266b26069e505fb16c4b3134422fcb7d093deb7446136d19d6b95e652f1ce14642b79f11a0be5f4a0f5c54665e1aeab4754 SHA512 640fbd5cece117a5cceb88bc127fbe67254b70711d1b9005a18332586f733a58b98eb003265246e3dce4add40c037e6296b00cf54951f96e3f9404fe84d41fb1
+DIST nep.traineddata-tessdata_best-4.1.0 12387399 BLAKE2B 1f4551413cba4b637d7f4f842be04266b26069e505fb16c4b3134422fcb7d093deb7446136d19d6b95e652f1ce14642b79f11a0be5f4a0f5c54665e1aeab4754 SHA512 640fbd5cece117a5cceb88bc127fbe67254b70711d1b9005a18332586f733a58b98eb003265246e3dce4add40c037e6296b00cf54951f96e3f9404fe84d41fb1
DIST nld.traineddata-tessdata_best-4.0.0 8903736 BLAKE2B f4eb00820909818215de071601ecd7714cea14ac019fb5cf6e95cb8d2094eedf9f56fc7f8220e4e6f44edbdff8cbf487e254b19fb05ab51432996ffb59745c16 SHA512 d2d04ede13181d10b0f9f21dfd2ff8471ef5a6c93f7b741ab622b98672302c30e65f5db6a3cdc66c5e5e68aec5a3822891d4f752dbd00fe914f758049e9b085a
+DIST nld.traineddata-tessdata_best-4.1.0 8903736 BLAKE2B f4eb00820909818215de071601ecd7714cea14ac019fb5cf6e95cb8d2094eedf9f56fc7f8220e4e6f44edbdff8cbf487e254b19fb05ab51432996ffb59745c16 SHA512 d2d04ede13181d10b0f9f21dfd2ff8471ef5a6c93f7b741ab622b98672302c30e65f5db6a3cdc66c5e5e68aec5a3822891d4f752dbd00fe914f758049e9b085a
DIST nor.traineddata-tessdata_best-4.0.0 14312333 BLAKE2B 0dd82a39efc0b67cfaa38c04fea64022eda06bf5abb785ec0d219faf4d3138359a34232461e0668f03adc4bae121012b6449f9b509a7563203a3681a25b59ba4 SHA512 67e6ee54de53f4699324aab696a2d7b05275e7cdddc6354ce0a4784dafd8b7c9f5c8834b2658fee88e6592b88f6a879d643019e071cdb5241e36da2d57bd9f08
+DIST nor.traineddata-tessdata_best-4.1.0 14312333 BLAKE2B 0dd82a39efc0b67cfaa38c04fea64022eda06bf5abb785ec0d219faf4d3138359a34232461e0668f03adc4bae121012b6449f9b509a7563203a3681a25b59ba4 SHA512 67e6ee54de53f4699324aab696a2d7b05275e7cdddc6354ce0a4784dafd8b7c9f5c8834b2658fee88e6592b88f6a879d643019e071cdb5241e36da2d57bd9f08
DIST oci.traineddata-tessdata_best-4.0.0 12917692 BLAKE2B 3b38645bf2f3b653416f8984e19f016d17ea4e3e9b3541cf76b5529afe9f9c41b0c9f3feaf9413efe429b08146a094dabb464f17aa47a334fd6a4cfdb46d0bd7 SHA512 026111d374b5fe25676d53497b60df5f2cbf81c8458b1a909da7f827c9728a984caf264be8976c2be1c8e8976d2eb352d92e8e70ec97ea958801964a0eeb72c9
+DIST oci.traineddata-tessdata_best-4.1.0 12917692 BLAKE2B 3b38645bf2f3b653416f8984e19f016d17ea4e3e9b3541cf76b5529afe9f9c41b0c9f3feaf9413efe429b08146a094dabb464f17aa47a334fd6a4cfdb46d0bd7 SHA512 026111d374b5fe25676d53497b60df5f2cbf81c8458b1a909da7f827c9728a984caf264be8976c2be1c8e8976d2eb352d92e8e70ec97ea958801964a0eeb72c9
DIST ori.traineddata-tessdata_best-4.0.0 8110602 BLAKE2B f032283fd0923bf940c114879599a1f88a9cdcaced9501d440f6a80b15067f8b136f127d6b95db83eb3de50a28e2a8d0db54e93ae6096b0bbb2badfc02831c2b SHA512 6b9cbb9e5daa207d6a569c9d34c7f852ae97cec1d11baf771aea4f5b9920af4372a0c0474ca0f176bcab3434faabc635786c299ec934ecd21896d80d2412ed89
+DIST ori.traineddata-tessdata_best-4.1.0 8110602 BLAKE2B f032283fd0923bf940c114879599a1f88a9cdcaced9501d440f6a80b15067f8b136f127d6b95db83eb3de50a28e2a8d0db54e93ae6096b0bbb2badfc02831c2b SHA512 6b9cbb9e5daa207d6a569c9d34c7f852ae97cec1d11baf771aea4f5b9920af4372a0c0474ca0f176bcab3434faabc635786c299ec934ecd21896d80d2412ed89
DIST osd.traineddata-tessdata_best-4.0.0 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
+DIST osd.traineddata-tessdata_best-4.1.0 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
DIST pan.traineddata-tessdata_best-4.0.0 11893154 BLAKE2B 47ad07a6ccd4e8b7f10d729dad72681bb378f14254b9dc4aadee2c3ba5f22c6bea88686fed2aa6bcf5f626baafefd3015f3482b4e9c06eb2c69a0dde874688a7 SHA512 5488dc7bdedbe0a66d3433251fa72274b2d1ff8d3cdcfa386c4a337af1a8150291d29eac567eb89e8ea4b5bb143779ea55b75e6caf47a2746d78370add6bfd5a
+DIST pan.traineddata-tessdata_best-4.1.0 11893154 BLAKE2B 47ad07a6ccd4e8b7f10d729dad72681bb378f14254b9dc4aadee2c3ba5f22c6bea88686fed2aa6bcf5f626baafefd3015f3482b4e9c06eb2c69a0dde874688a7 SHA512 5488dc7bdedbe0a66d3433251fa72274b2d1ff8d3cdcfa386c4a337af1a8150291d29eac567eb89e8ea4b5bb143779ea55b75e6caf47a2746d78370add6bfd5a
DIST pol.traineddata-tessdata_best-4.0.0 11978867 BLAKE2B c16752a06705fc4e03af8f7853c52d872fb83deed5d1883257bcc7a359b22be484d38555812796e00600067e05f352151908be76f13d763aae0047dbcf0716c9 SHA512 be6e4e73d3cc348be82779efd78883c63ab5d6e0501364a276b2bf915c180db83510df788424426cff0043e92015e4ddf73d2edb2e4151cd49ec7b73d0b2269e
+DIST pol.traineddata-tessdata_best-4.1.0 11978867 BLAKE2B c16752a06705fc4e03af8f7853c52d872fb83deed5d1883257bcc7a359b22be484d38555812796e00600067e05f352151908be76f13d763aae0047dbcf0716c9 SHA512 be6e4e73d3cc348be82779efd78883c63ab5d6e0501364a276b2bf915c180db83510df788424426cff0043e92015e4ddf73d2edb2e4151cd49ec7b73d0b2269e
DIST por.traineddata-tessdata_best-4.0.0 8159939 BLAKE2B ccb6fe1a816a88eefff3cf1e07c2802ed2bf30a909361d3ad731df7bd1c3b76a9ff86dcde080e099565c71ec2b4d238169bd8cd165af32293d1b89b480a5271f SHA512 8f12db6b6dea2e935f9a97f1e3e1895ca6637dc2efa3b5cff72ea09218c72fb25eec14d724518083fc9da5dc6622b414c65446206592c106e0848fb91df2ca80
+DIST por.traineddata-tessdata_best-4.1.0 8159939 BLAKE2B ccb6fe1a816a88eefff3cf1e07c2802ed2bf30a909361d3ad731df7bd1c3b76a9ff86dcde080e099565c71ec2b4d238169bd8cd165af32293d1b89b480a5271f SHA512 8f12db6b6dea2e935f9a97f1e3e1895ca6637dc2efa3b5cff72ea09218c72fb25eec14d724518083fc9da5dc6622b414c65446206592c106e0848fb91df2ca80
DIST pus.traineddata-tessdata_best-4.0.0 11987930 BLAKE2B 86c202f7c80b04ab431ce4463aebcf7c394175bbff8544e1bb0dba9d0ce4035b166521298b771bfcaa88ba7a7a04e273b9fc0a4759da8108619c1a6845572f42 SHA512 e8a632590ac96cd4fecffb0bdefc228652ebedeb9e6617fab0a8c24749647294d2bbd944894710dad57e47425c9d6e82c2a206773458d28033c856c37e468957
+DIST pus.traineddata-tessdata_best-4.1.0 11987930 BLAKE2B 86c202f7c80b04ab431ce4463aebcf7c394175bbff8544e1bb0dba9d0ce4035b166521298b771bfcaa88ba7a7a04e273b9fc0a4759da8108619c1a6845572f42 SHA512 e8a632590ac96cd4fecffb0bdefc228652ebedeb9e6617fab0a8c24749647294d2bbd944894710dad57e47425c9d6e82c2a206773458d28033c856c37e468957
DIST que.traineddata-tessdata_best-4.0.0 10774587 BLAKE2B 1bc0781cfba6b2ad8d1942fe45fc66827df6fe78be3411fd94397126ac0ab51590c33ced3b99776d4e08e8a2c897e8a05feb496781ca7972377288c129a6adc0 SHA512 339a3eb0ee317e68a019b32cc34d72484159910816257655ec251721ce58c4f3669379ffe536caa0db9c3d75fcda7db3defcb9bd8b2edca93c8ba6f0f88d2ddf
+DIST que.traineddata-tessdata_best-4.1.0 10774587 BLAKE2B 1bc0781cfba6b2ad8d1942fe45fc66827df6fe78be3411fd94397126ac0ab51590c33ced3b99776d4e08e8a2c897e8a05feb496781ca7972377288c129a6adc0 SHA512 339a3eb0ee317e68a019b32cc34d72484159910816257655ec251721ce58c4f3669379ffe536caa0db9c3d75fcda7db3defcb9bd8b2edca93c8ba6f0f88d2ddf
DIST ron.traineddata-tessdata_best-4.0.0 9595755 BLAKE2B 2707507c8f0809d11f9614a8f66f9b1c40836a5aa487b61656016c307351e0eedab97e33842bf9016341f826a304863b7b8d2dec6bb5f6e762a0f3cf8a2b3a79 SHA512 517b0ff6dc8751f17e738db430b8c7cef7d1c424ef83b42a146247c0751641f108619862bca7485c8cc6d5df860926718f0e34efdd6944c1b54a779974c17cbb
+DIST ron.traineddata-tessdata_best-4.1.0 9595755 BLAKE2B 2707507c8f0809d11f9614a8f66f9b1c40836a5aa487b61656016c307351e0eedab97e33842bf9016341f826a304863b7b8d2dec6bb5f6e762a0f3cf8a2b3a79 SHA512 517b0ff6dc8751f17e738db430b8c7cef7d1c424ef83b42a146247c0751641f108619862bca7485c8cc6d5df860926718f0e34efdd6944c1b54a779974c17cbb
DIST rus.traineddata-tessdata_best-4.0.0 15301764 BLAKE2B 316b24890e0da638c6293ff3461cd28d73c19d995c9eadbd9bc10145e09913420a859ddc393c7f6c868826cdbec4348d8f4c9440089f9ca957edb0ef41e2c4a3 SHA512 2c2e6d1a3e7948eff5da71338012033016012307c917fea61fdcb79214c0758e3d043d8899048933ed6b3da2f5c03a258688bb725beeb11ed147542341ddd453
+DIST rus.traineddata-tessdata_best-4.1.0 15301764 BLAKE2B 316b24890e0da638c6293ff3461cd28d73c19d995c9eadbd9bc10145e09913420a859ddc393c7f6c868826cdbec4348d8f4c9440089f9ca957edb0ef41e2c4a3 SHA512 2c2e6d1a3e7948eff5da71338012033016012307c917fea61fdcb79214c0758e3d043d8899048933ed6b3da2f5c03a258688bb725beeb11ed147542341ddd453
DIST san.traineddata-tessdata_best-4.0.0 15136202 BLAKE2B ff51affb476bae8dd71b47c41a213e40c64e26fb0fd3f6b0dabbe10a7cfb04ad34a00fdf4418f5e7edfe61f89201af2043b0f88256b31e407f489a8dc68174d6 SHA512 43920be70343e36bf210ac2dcc42ec22cf96f3790967a0a84a107718298a20668a940ab7257536fe1bcba77e0fb79e71d2e7456fbe59193940f7bfc58ac52b1a
+DIST san.traineddata-tessdata_best-4.1.0 15136202 BLAKE2B ff51affb476bae8dd71b47c41a213e40c64e26fb0fd3f6b0dabbe10a7cfb04ad34a00fdf4418f5e7edfe61f89201af2043b0f88256b31e407f489a8dc68174d6 SHA512 43920be70343e36bf210ac2dcc42ec22cf96f3790967a0a84a107718298a20668a940ab7257536fe1bcba77e0fb79e71d2e7456fbe59193940f7bfc58ac52b1a
DIST sin.traineddata-tessdata_best-4.0.0 8282713 BLAKE2B 5d9e366c6ad18d5966a6ab5d132a14801505405881b9bd7b8e7802bed6418e3f9caee4e4dffb4fb3a1b1db4f1b38e690294969fd01c670b8cba475ad0f4438d7 SHA512 0415737ad20912528e25883aefce20a06230cb1d2023b9f546afffcf5044f3757a792596fec3c3d68e04250b652203c926f89bc576fa8f4c583bb77094d66a5c
+DIST sin.traineddata-tessdata_best-4.1.0 8282713 BLAKE2B 5d9e366c6ad18d5966a6ab5d132a14801505405881b9bd7b8e7802bed6418e3f9caee4e4dffb4fb3a1b1db4f1b38e690294969fd01c670b8cba475ad0f4438d7 SHA512 0415737ad20912528e25883aefce20a06230cb1d2023b9f546afffcf5044f3757a792596fec3c3d68e04250b652203c926f89bc576fa8f4c583bb77094d66a5c
DIST slk.traineddata-tessdata_best-4.0.0 11542252 BLAKE2B 066055ce404546365015f32f3af2f6d3e73a8b28788446129da3f99041e2425feee3d9371d61175b2213560875bf64826c2815f5e80177fc051aefcf2040ce56 SHA512 798fb550068ccaab98fca82633f2d01d384638105391894942eb9d5d0753d5586cb53fbd9da0aaeae569a3385f9fe8c32507163f6450353bccdbc5b32a081d83
+DIST slk.traineddata-tessdata_best-4.1.0 11542252 BLAKE2B 066055ce404546365015f32f3af2f6d3e73a8b28788446129da3f99041e2425feee3d9371d61175b2213560875bf64826c2815f5e80177fc051aefcf2040ce56 SHA512 798fb550068ccaab98fca82633f2d01d384638105391894942eb9d5d0753d5586cb53fbd9da0aaeae569a3385f9fe8c32507163f6450353bccdbc5b32a081d83
DIST slv.traineddata-tessdata_best-4.0.0 5879151 BLAKE2B 7f798b355d2b513f183d3e3f3caa2338051710543e78f2319ba8558244992bbfbdb358ad63a108c65d6e5b1ee4d6924faeac1ad263c82abb8571e739e1955cfe SHA512 b6fff55ef5d017620b30b30e17574aded00562f7011ff8fa630a484267ec1e3030a12e3adb829037bc6b5c247649ae6ce59543875f3bd11976de5cdafaefe2a5
+DIST slv.traineddata-tessdata_best-4.1.0 5879151 BLAKE2B 7f798b355d2b513f183d3e3f3caa2338051710543e78f2319ba8558244992bbfbdb358ad63a108c65d6e5b1ee4d6924faeac1ad263c82abb8571e739e1955cfe SHA512 b6fff55ef5d017620b30b30e17574aded00562f7011ff8fa630a484267ec1e3030a12e3adb829037bc6b5c247649ae6ce59543875f3bd11976de5cdafaefe2a5
DIST snd.traineddata-tessdata_best-4.0.0 11981538 BLAKE2B 38aadb069bad14890e99dff8994f4436e72e931f60e92d0da32b778a2cdb72542fb191c952311e379c59a01ed6f90f2988defab074e2134b298fe4222744d39b SHA512 ce55f53cfb5d7a4c4a7afc9341aaa50c67f6b1d5f83e20a3ffec2a584bc7d044e7fd84aa6d87066f5f05f57033b4dc3a7be1c1e8b0ee880a13d4d6cb3ffff8d1
+DIST snd.traineddata-tessdata_best-4.1.0 11981538 BLAKE2B 38aadb069bad14890e99dff8994f4436e72e931f60e92d0da32b778a2cdb72542fb191c952311e379c59a01ed6f90f2988defab074e2134b298fe4222744d39b SHA512 ce55f53cfb5d7a4c4a7afc9341aaa50c67f6b1d5f83e20a3ffec2a584bc7d044e7fd84aa6d87066f5f05f57033b4dc3a7be1c1e8b0ee880a13d4d6cb3ffff8d1
DIST spa.traineddata-tessdata_best-4.0.0 13570187 BLAKE2B 2e4c0b7ec5e0adaf0fc8b056aabc23a98c89ffd9e00ca3626058c50a69b74fc4c33242855788dafa7baf24eec4eabb2d942347c341d1bc64498167829ece730c SHA512 bf366d88cdbaf35e339af3c61342ae5e697ca29630a258408b50e4030019f7ce93ef35d76b8183be167423d4826f9721f360b6a63fa7291552521d97aaa47c53
+DIST spa.traineddata-tessdata_best-4.1.0 13570187 BLAKE2B 2e4c0b7ec5e0adaf0fc8b056aabc23a98c89ffd9e00ca3626058c50a69b74fc4c33242855788dafa7baf24eec4eabb2d942347c341d1bc64498167829ece730c SHA512 bf366d88cdbaf35e339af3c61342ae5e697ca29630a258408b50e4030019f7ce93ef35d76b8183be167423d4826f9721f360b6a63fa7291552521d97aaa47c53
DIST spa_old.traineddata-tessdata_best-4.0.0 9476925 BLAKE2B 8866d7c3f2574650531578d9dac007c0ff0395f82206f233f6b9acd7c5e704b557df2816cb1b041df68b3b53a2111e3b3f98f0d923f2efa0238fdec84452221b SHA512 8ef994a4afb35cf606adec72c71bf0a900f8ae78ac4c11f2cf7ee6df51f779983fcf2433e878a2544848368f7a3062842ce7418b25d158cb8e708eae4e4420f1
+DIST spa_old.traineddata-tessdata_best-4.1.0 9476925 BLAKE2B 8866d7c3f2574650531578d9dac007c0ff0395f82206f233f6b9acd7c5e704b557df2816cb1b041df68b3b53a2111e3b3f98f0d923f2efa0238fdec84452221b SHA512 8ef994a4afb35cf606adec72c71bf0a900f8ae78ac4c11f2cf7ee6df51f779983fcf2433e878a2544848368f7a3062842ce7418b25d158cb8e708eae4e4420f1
DIST sqi.traineddata-tessdata_best-4.0.0 4631498 BLAKE2B b0febfe66567472574380662584951b4c58520dc3b2cc1147626025e39eb7b9d03e600e5adf007bd84af3fa196d187967176424a75d38c2bc1abbb34a1c1c75f SHA512 0c0e59c56b21ccf682d9acf70d190d6cef077ff4274316b9365e5a0fdf498e09eb9d3364e51fe04bafcf5bdc4b8d3847076a8274b47536c8e90f1b04a26d25ad
+DIST sqi.traineddata-tessdata_best-4.1.0 4631498 BLAKE2B b0febfe66567472574380662584951b4c58520dc3b2cc1147626025e39eb7b9d03e600e5adf007bd84af3fa196d187967176424a75d38c2bc1abbb34a1c1c75f SHA512 0c0e59c56b21ccf682d9acf70d190d6cef077ff4274316b9365e5a0fdf498e09eb9d3364e51fe04bafcf5bdc4b8d3847076a8274b47536c8e90f1b04a26d25ad
DIST srp.traineddata-tessdata_best-4.0.0 9345851 BLAKE2B 00cb3a256624f3185b37db269421ee5af8887bd57f44f262af4b1972bacc5e074414a8c24f034b21174ef5026d99328da826dba4381e45e9d7ca8992115b3208 SHA512 ec8657724a65f719364cd73daf4435c06bc5b8e16d62aa2b5563cb1350ec5e324c296c186a912b19621083d1c85da95ab9dc12b445965ba5aa405b65d89639c4
+DIST srp.traineddata-tessdata_best-4.1.0 9345851 BLAKE2B 00cb3a256624f3185b37db269421ee5af8887bd57f44f262af4b1972bacc5e074414a8c24f034b21174ef5026d99328da826dba4381e45e9d7ca8992115b3208 SHA512 ec8657724a65f719364cd73daf4435c06bc5b8e16d62aa2b5563cb1350ec5e324c296c186a912b19621083d1c85da95ab9dc12b445965ba5aa405b65d89639c4
DIST srp_latn.traineddata-tessdata_best-4.0.0 9831713 BLAKE2B 9cc35896614086a4c4457f5cc473ecb9a747c2e390f3cda41e1234a9388e97b4fc415307b93078a2813f98b4b9cca773a98bc8a9e763d0afcf419d3fc8b1c3da SHA512 fe004effd2b8cfa63a186e02f80bf936c5fd010da6b1c74a118f0fed656b17e0260406d4aaa51247e8e3617f01e21f040c54e0b0c91fda83f5a5550adface6b3
+DIST srp_latn.traineddata-tessdata_best-4.1.0 9831713 BLAKE2B 9cc35896614086a4c4457f5cc473ecb9a747c2e390f3cda41e1234a9388e97b4fc415307b93078a2813f98b4b9cca773a98bc8a9e763d0afcf419d3fc8b1c3da SHA512 fe004effd2b8cfa63a186e02f80bf936c5fd010da6b1c74a118f0fed656b17e0260406d4aaa51247e8e3617f01e21f040c54e0b0c91fda83f5a5550adface6b3
DIST sun.traineddata-tessdata_best-4.0.0 4132820 BLAKE2B fe8360b667f3002c93f70076de31a61a03273603828c105b73a354accf914255376d5efede2588f3c027618ec4fbd253e2a6996eb189db1e49d4993edf58f6e3 SHA512 04813615d4712725a63024e06843b024d88deaf56d7e01e81879f739a962ba21ab0af88a96e69c207d289cbcb66d3001458c8e4fab77fe26411ea6ae6852bfb9
+DIST sun.traineddata-tessdata_best-4.1.0 4132820 BLAKE2B fe8360b667f3002c93f70076de31a61a03273603828c105b73a354accf914255376d5efede2588f3c027618ec4fbd253e2a6996eb189db1e49d4993edf58f6e3 SHA512 04813615d4712725a63024e06843b024d88deaf56d7e01e81879f739a962ba21ab0af88a96e69c207d289cbcb66d3001458c8e4fab77fe26411ea6ae6852bfb9
DIST swa.traineddata-tessdata_best-4.0.0 4914855 BLAKE2B 3a3e56fb2c81b4a7054cbc649a981561ca5c1ca56a197349ef8457e90aa6086db3e841c4f864b46cf756fe0074d3beca22a34d8a4ebe9dee487f62e0b4cd28fd SHA512 2827ed90b79b47eda112ffe5ba3ec2e5f7ad6edf2f37b823551e95f743871490e31ac3519b793e442222fa4f399d1d89a377d03d7cd5f95dd52b3293d9ae8c6c
+DIST swa.traineddata-tessdata_best-4.1.0 4914855 BLAKE2B 3a3e56fb2c81b4a7054cbc649a981561ca5c1ca56a197349ef8457e90aa6086db3e841c4f864b46cf756fe0074d3beca22a34d8a4ebe9dee487f62e0b4cd28fd SHA512 2827ed90b79b47eda112ffe5ba3ec2e5f7ad6edf2f37b823551e95f743871490e31ac3519b793e442222fa4f399d1d89a377d03d7cd5f95dd52b3293d9ae8c6c
DIST swe.traineddata-tessdata_best-4.0.0 14325549 BLAKE2B b89a5b1e572ffe01d1bc9704c0be1b508cba5ef83f595c9d98fa3c2354dfae6ce4f17f726778979e834ca57df7c9c8c611b0027801faf5fcbac3b4b4c259e40d SHA512 b2eea45f2f7d9ef2ad665079a1f9e970e42352e478de1f2d267855193e9e9b6b43b87611a6fd43db6d2853191f1ce7c7964408f8d3ac16873c802f274e5c8f78
+DIST swe.traineddata-tessdata_best-4.1.0 14325549 BLAKE2B b89a5b1e572ffe01d1bc9704c0be1b508cba5ef83f595c9d98fa3c2354dfae6ce4f17f726778979e834ca57df7c9c8c611b0027801faf5fcbac3b4b4c259e40d SHA512 b2eea45f2f7d9ef2ad665079a1f9e970e42352e478de1f2d267855193e9e9b6b43b87611a6fd43db6d2853191f1ce7c7964408f8d3ac16873c802f274e5c8f78
DIST syr.traineddata-tessdata_best-4.0.0 12498294 BLAKE2B 5af569c79bf9a451f9ab478ae41310870cbe52e7b4133c89f8d4feba3d6e6edaa162c2ba6d561d9c85cb6d91d138693e07e2662194b59f06ffaa46533ff416e8 SHA512 886a4d9bdf035e2028371de5f98bc302645a68cdbf992a24c9d744aee3c8919dadf60ea594b8f5ca207bdef6be1c798fe9d942bead082dd02c0b42bb76af3307
+DIST syr.traineddata-tessdata_best-4.1.0 12498294 BLAKE2B 5af569c79bf9a451f9ab478ae41310870cbe52e7b4133c89f8d4feba3d6e6edaa162c2ba6d561d9c85cb6d91d138693e07e2662194b59f06ffaa46533ff416e8 SHA512 886a4d9bdf035e2028371de5f98bc302645a68cdbf992a24c9d744aee3c8919dadf60ea594b8f5ca207bdef6be1c798fe9d942bead082dd02c0b42bb76af3307
DIST tam.traineddata-tessdata_best-4.0.0 6023201 BLAKE2B 85687b4134422e5eace00faa8b27fbb5b2ef910f09d785ce598fe23ceccfc8b79fe3fd271553e7cee95cfa6f99be6125abc4ed03da517629c88d03fd600adb84 SHA512 ff9bd903b0a7a5e6568b0b525a54bb81d166126a75fd993cca17be30f44c3e0fb96622711843e7dc082bc0e3f348191a7185fd91e6e5e90aba4ad0bf133accce
+DIST tam.traineddata-tessdata_best-4.1.0 6023201 BLAKE2B 85687b4134422e5eace00faa8b27fbb5b2ef910f09d785ce598fe23ceccfc8b79fe3fd271553e7cee95cfa6f99be6125abc4ed03da517629c88d03fd600adb84 SHA512 ff9bd903b0a7a5e6568b0b525a54bb81d166126a75fd993cca17be30f44c3e0fb96622711843e7dc082bc0e3f348191a7185fd91e6e5e90aba4ad0bf133accce
DIST tat.traineddata-tessdata_best-4.0.0 7585204 BLAKE2B d828eb6c787e8c3f6ae18b343e2e21c212e758d8599e5b5464862ade3bed3a3c2338eaf1fe1d892f0fc75290998da2b9ef6ecaaf976a6b08b81b4ecb8850ce86 SHA512 dd2f1d6ab9b8b359277886fe5b9eb83675e55de98c197706f85d5d4c07af89a94d873911fa0bd32459e295fe67b3d127b1457a3c02f15a6ec52ce4853705201b
+DIST tat.traineddata-tessdata_best-4.1.0 7585204 BLAKE2B d828eb6c787e8c3f6ae18b343e2e21c212e758d8599e5b5464862ade3bed3a3c2338eaf1fe1d892f0fc75290998da2b9ef6ecaaf976a6b08b81b4ecb8850ce86 SHA512 dd2f1d6ab9b8b359277886fe5b9eb83675e55de98c197706f85d5d4c07af89a94d873911fa0bd32459e295fe67b3d127b1457a3c02f15a6ec52ce4853705201b
DIST tel.traineddata-tessdata_best-4.0.0 9098795 BLAKE2B a618b76b69b0378adbb9fc878057a2086dd076ebbbfe38007b2b9d1463c5cd0b9fbc5b873fb5a30a312cc761a415f48c7e10122435a6d03173e4da119a7ef33b SHA512 c6d7d230ddc19f03eed540f64e317aaa56bd9e3f126850cb0673e5ca90a7db5253a2ec21f6e691f2cf6abcd2211c801fc12cdfc9b960f69dc773e932e93568a3
+DIST tel.traineddata-tessdata_best-4.1.0 9098795 BLAKE2B a618b76b69b0378adbb9fc878057a2086dd076ebbbfe38007b2b9d1463c5cd0b9fbc5b873fb5a30a312cc761a415f48c7e10122435a6d03173e4da119a7ef33b SHA512 c6d7d230ddc19f03eed540f64e317aaa56bd9e3f126850cb0673e5ca90a7db5253a2ec21f6e691f2cf6abcd2211c801fc12cdfc9b960f69dc773e932e93568a3
DIST tgk.traineddata-tessdata_best-4.0.0 4602842 BLAKE2B ae844f15123c4a260aef097f0aa631c149a92880a8d15d40af8253fb3e1c29b3ac726a8c6b9e0a5a31466b8011d36c4a1642b2665c887deb950dff559f3eb6c6 SHA512 6c3f59358b59f74e3cb1d8e4b197264498776efbafe5539b01263dfba118049b35f90daff315352777dffd735c02f0f70db1f147c82c964055d5c56d8e9fb773
+DIST tgk.traineddata-tessdata_best-4.1.0 4602842 BLAKE2B ae844f15123c4a260aef097f0aa631c149a92880a8d15d40af8253fb3e1c29b3ac726a8c6b9e0a5a31466b8011d36c4a1642b2665c887deb950dff559f3eb6c6 SHA512 6c3f59358b59f74e3cb1d8e4b197264498776efbafe5539b01263dfba118049b35f90daff315352777dffd735c02f0f70db1f147c82c964055d5c56d8e9fb773
DIST tha.traineddata-tessdata_best-4.0.0 7614482 BLAKE2B 1622b6b4eff1028a526060ef41e5379951d3435a4f819922ad2ab31920a9c12c6d14fbc19e5135bb080237b2c4d605ef017ed2bceffc02e11b345203bdb43d0b SHA512 0888e634e8fe7dcadaa6f0b25857609b436e59dc2219f694314c71b80cefa8f9c6ee2a6ef273a04922d95f5b181b2a63a13f26886eefd6c99458247d9875e204
+DIST tha.traineddata-tessdata_best-4.1.0 7614571 BLAKE2B 6c9432cd76b08e2afb98727f8d90980f752310cc6ed3f3cadac88a23be692bac76397413476a4da64e2391aa9ca86509081d8a3c20005a88f6de8f27435f353f SHA512 b47cdf3c6b36ae1c2d17a8e7feb6106938e49864fd9b7de8da3f75ad8432a8ce3db9efc5ec0ccf2f35ae469e91c7a83bc22f16ae33bfa3a0dd6c5e4f6a591063
DIST tir.traineddata-tessdata_best-4.0.0 2410256 BLAKE2B 52ab842a1bd1bf4467c58e2bc18de98b17f7d7fc8b6cdd0773a700358893e714a8d35faa2c6776cbf22ff8cca5c8a39e8386f295974001fa8e83d669f4924b7b SHA512 6192b4deb6481299d5f98b0fcd68d68b75883b77b8e6e9386b8535f56111d945d007326ea9befbde3c4e3ba6a8e4973202009ab7d11104ca72a4a85fc96626ea
+DIST tir.traineddata-tessdata_best-4.1.0 2410256 BLAKE2B 52ab842a1bd1bf4467c58e2bc18de98b17f7d7fc8b6cdd0773a700358893e714a8d35faa2c6776cbf22ff8cca5c8a39e8386f295974001fa8e83d669f4924b7b SHA512 6192b4deb6481299d5f98b0fcd68d68b75883b77b8e6e9386b8535f56111d945d007326ea9befbde3c4e3ba6a8e4973202009ab7d11104ca72a4a85fc96626ea
DIST ton.traineddata-tessdata_best-4.0.0 3729371 BLAKE2B 9644697ffa8195b8f8fef0b935d1a7e825b71908606e227dccf039e0bbd77244f9e8dc8f892c136dbe31b6c8265128c0a0988af59fe853d17d29b25db6795bc7 SHA512 11f9dd36c1c280d7e9656a19a321b2065f208b16863c77ac5a9dfd8de60f3ad22274fe67f4cd8855c96a799fdafc79e0c85610daff73d50753833c6b9b0adfbd
+DIST ton.traineddata-tessdata_best-4.1.0 3729371 BLAKE2B 9644697ffa8195b8f8fef0b935d1a7e825b71908606e227dccf039e0bbd77244f9e8dc8f892c136dbe31b6c8265128c0a0988af59fe853d17d29b25db6795bc7 SHA512 11f9dd36c1c280d7e9656a19a321b2065f208b16863c77ac5a9dfd8de60f3ad22274fe67f4cd8855c96a799fdafc79e0c85610daff73d50753833c6b9b0adfbd
DIST tur.traineddata-tessdata_best-4.0.0 7456265 BLAKE2B 8ae355fe0143da9a717758651f9004dade2349b5004aea7e5df6d0ea9b2912c64184ed9c80cb04606ebcadaa4f24d1b1974ced4b7a0f195a88ff465119c269a6 SHA512 c15d154ad8e481aec0f6e31c67a83049a5047920198b037b61b962ec77af7ef3247b2c0c82a7168fdfb5b73fe2895c1471f7cc0219b1660c2eb34413cc6a2684
+DIST tur.traineddata-tessdata_best-4.1.0 7456265 BLAKE2B 8ae355fe0143da9a717758651f9004dade2349b5004aea7e5df6d0ea9b2912c64184ed9c80cb04606ebcadaa4f24d1b1974ced4b7a0f195a88ff465119c269a6 SHA512 c15d154ad8e481aec0f6e31c67a83049a5047920198b037b61b962ec77af7ef3247b2c0c82a7168fdfb5b73fe2895c1471f7cc0219b1660c2eb34413cc6a2684
DIST uig.traineddata-tessdata_best-4.0.0 13074609 BLAKE2B cb83bd2439280b440a0ffbe2aa58ebdd33c986a10244c346e1618ad258c175c09b4519624421351090ea062b681c626b7919c270e4a1cf3136e75652394b26f6 SHA512 705c980b43bed650d3108ad7ae7185f587497067eb2a1a5a6d99c85f75283a6ce371316c284dd2cf6ca5a9bfc171fae94075ce29d4ff45df4d27a2100bcb6df1
+DIST uig.traineddata-tessdata_best-4.1.0 13074609 BLAKE2B cb83bd2439280b440a0ffbe2aa58ebdd33c986a10244c346e1618ad258c175c09b4519624421351090ea062b681c626b7919c270e4a1cf3136e75652394b26f6 SHA512 705c980b43bed650d3108ad7ae7185f587497067eb2a1a5a6d99c85f75283a6ce371316c284dd2cf6ca5a9bfc171fae94075ce29d4ff45df4d27a2100bcb6df1
DIST ukr.traineddata-tessdata_best-4.0.0 10859081 BLAKE2B e6f8f21ce3a32821d1e0717a853da0de7e79be7b0b4c1e1ffd422d02fa2a2bfac203b62f3dc935e572e0e02bb41c3f67081ecb437a075d9f13e15d0e1ffb456a SHA512 466e84f93dccdd9dcb3dcf31ee567e1cc41e8073e056686c1ec64afefe72906baa2c0e6343187a76e3a493a63da38d7fffd48a783b3903f748fd69579a4128af
+DIST ukr.traineddata-tessdata_best-4.1.0 10859081 BLAKE2B e6f8f21ce3a32821d1e0717a853da0de7e79be7b0b4c1e1ffd422d02fa2a2bfac203b62f3dc935e572e0e02bb41c3f67081ecb437a075d9f13e15d0e1ffb456a SHA512 466e84f93dccdd9dcb3dcf31ee567e1cc41e8073e056686c1ec64afefe72906baa2c0e6343187a76e3a493a63da38d7fffd48a783b3903f748fd69579a4128af
DIST urd.traineddata-tessdata_best-4.0.0 7994323 BLAKE2B 4b85b704dbd597bdc3ad70d522257550d502c97a27cc6cccaacf3e4909376ae2165e8e441bbbf1800d63014a542fbefa6d641f1ae59593a673e3035babf922cc SHA512 34ac9d87d6f6fe55b92d33b65f45a91d90c76752bda558f0cafb44fdf0ac9dea171daaa0d6171fb7870fd6d3034694e5e82dd4a7a71ef6a3863a4e7d7acd70fd
+DIST urd.traineddata-tessdata_best-4.1.0 7994323 BLAKE2B 4b85b704dbd597bdc3ad70d522257550d502c97a27cc6cccaacf3e4909376ae2165e8e441bbbf1800d63014a542fbefa6d641f1ae59593a673e3035babf922cc SHA512 34ac9d87d6f6fe55b92d33b65f45a91d90c76752bda558f0cafb44fdf0ac9dea171daaa0d6171fb7870fd6d3034694e5e82dd4a7a71ef6a3863a4e7d7acd70fd
DIST uzb.traineddata-tessdata_best-4.0.0 12953454 BLAKE2B 3f0cec7aea011c184c4071161cd153fcb4e3b0c144352f2ed18933f066037d16ea84aaf623247d581ebe4dc1cb754fafcbcb86d9f286d6d5e47f251bf83c52b9 SHA512 7c00f8ac5806b232f4486317b0c0adda3f0a19a2996839ac744e7f5a806de1ec88efc602399d2f6f513e8f315f10c977b5da57e66f11b704126baaeb07cc526e
+DIST uzb.traineddata-tessdata_best-4.1.0 12953454 BLAKE2B 3f0cec7aea011c184c4071161cd153fcb4e3b0c144352f2ed18933f066037d16ea84aaf623247d581ebe4dc1cb754fafcbcb86d9f286d6d5e47f251bf83c52b9 SHA512 7c00f8ac5806b232f4486317b0c0adda3f0a19a2996839ac744e7f5a806de1ec88efc602399d2f6f513e8f315f10c977b5da57e66f11b704126baaeb07cc526e
DIST uzb_cyrl.traineddata-tessdata_best-4.0.0 4325478 BLAKE2B ca166dc584363364b33875063b0905d5c5a339591fb34d58b5026fa71df4fafd5a2b3e5d04ac2f9b75157c9781492a285f495c8cf1914ac0513edef18eef5e8b SHA512 9141c746b70a80cc662c3c9af6bd80798b9a1197aa925193efdb296169567d809b367f8c732dc73539cb9fc1234e06794e5e7c3f500f03ac2f8e0e1e624c4f44
+DIST uzb_cyrl.traineddata-tessdata_best-4.1.0 4325478 BLAKE2B ca166dc584363364b33875063b0905d5c5a339591fb34d58b5026fa71df4fafd5a2b3e5d04ac2f9b75157c9781492a285f495c8cf1914ac0513edef18eef5e8b SHA512 9141c746b70a80cc662c3c9af6bd80798b9a1197aa925193efdb296169567d809b367f8c732dc73539cb9fc1234e06794e5e7c3f500f03ac2f8e0e1e624c4f44
DIST vie.traineddata-tessdata_best-4.0.0 12435550 BLAKE2B 3d5b029e27c28d851b56fa9c8b69400c40404aee4a10b978eff3c616f402f2db07cee53633765e385eba8fafbd379b64656846c32b2bd04ca9bd5322a96451e8 SHA512 9633fb6dba55a6b2d80724b36d195799ca9f092e6284f6c40fdc8c5748c3f383c6beaa6ca2f46c7862893491dd58d4929297ea469b72698a6e1b0253d7c2a0fe
+DIST vie.traineddata-tessdata_best-4.1.0 12435550 BLAKE2B 3d5b029e27c28d851b56fa9c8b69400c40404aee4a10b978eff3c616f402f2db07cee53633765e385eba8fafbd379b64656846c32b2bd04ca9bd5322a96451e8 SHA512 9633fb6dba55a6b2d80724b36d195799ca9f092e6284f6c40fdc8c5748c3f383c6beaa6ca2f46c7862893491dd58d4929297ea469b72698a6e1b0253d7c2a0fe
DIST yid.traineddata-tessdata_best-4.0.0 3278995 BLAKE2B 52dec464f0cd020d8060e425db2edb40ffc48a0b7efaf1fe5e437ecdf2664739f8cca992000bdf6ddd40e641df9999af40353098bdc19c41c4c3cb4fb15d2cd3 SHA512 17aa0b1ac83245d594bae43b9341f82c97fea5da1a8bd5439c953bbf8b5aa7200353c77e2e43cb1e37432ef559fe27c5708957f14def42a6d3c93753d5e95c78
+DIST yid.traineddata-tessdata_best-4.1.0 3278995 BLAKE2B 52dec464f0cd020d8060e425db2edb40ffc48a0b7efaf1fe5e437ecdf2664739f8cca992000bdf6ddd40e641df9999af40353098bdc19c41c4c3cb4fb15d2cd3 SHA512 17aa0b1ac83245d594bae43b9341f82c97fea5da1a8bd5439c953bbf8b5aa7200353c77e2e43cb1e37432ef559fe27c5708957f14def42a6d3c93753d5e95c78
DIST yor.traineddata-tessdata_best-4.0.0 3736121 BLAKE2B 370679dface083eef9f5c71e6f0c21bfb78dee7720b54c4431d4414468a6fd6c1ea01144eabe6d4fd992930efeb852f3ccfbc3428b7f3f8c6ac81f5e2613f048 SHA512 fd383977a7196f5e7d50bbd9a04c50783c8e5fb1512593c23a9fec6c49c3f756f0ecd78986cdf1381d6947031eece84680c1db51a727981ec905b3ade8829ddc
+DIST yor.traineddata-tessdata_best-4.1.0 3736121 BLAKE2B 370679dface083eef9f5c71e6f0c21bfb78dee7720b54c4431d4414468a6fd6c1ea01144eabe6d4fd992930efeb852f3ccfbc3428b7f3f8c6ac81f5e2613f048 SHA512 fd383977a7196f5e7d50bbd9a04c50783c8e5fb1512593c23a9fec6c49c3f756f0ecd78986cdf1381d6947031eece84680c1db51a727981ec905b3ade8829ddc
diff --git a/app-text/tessdata_best/metadata.xml b/app-text/tessdata_best/metadata.xml
index a4461ee6746f..5cc9e15c3cf7 100644
--- a/app-text/tessdata_best/metadata.xml
+++ b/app-text/tessdata_best/metadata.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
- <longdescription lang="en">Most accurate trained models for app-text/tesseract</longdescription>
<upstream>
<remote-id type="github">tesseract-ocr/tessdata_best</remote-id>
</upstream>
diff --git a/app-text/tessdata_best/tessdata_best-4.1.0.ebuild b/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
new file mode 100644
index 000000000000..580847d36fa1
--- /dev/null
+++ b/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+URI_PREFIX="https://github.com/tesseract-ocr/${PN}/raw/${PV}/"
+
+DESCRIPTION="Most accurate trained models for app-text/tesseract"
+HOMEPAGE="https://github.com/tesseract-ocr/tessdata_best"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
+ osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${P} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+osd"
+
+RDEPEND="!app-text/tessdata_fast
+ !app-text/tessdata_legacy
+ !<app-text/tesseract-4.1.0"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}
+
+# List of supported Gentoo linguas and their upstream mapping
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bg:bul bn:ben bo:bod br:bre bs:bos ca:cat ceb chr co:cos cs:ces cy:cym da:dan de:deu,frk dv:div dz:dzo el:ell,grc en:enm eo:epo es:spa,spa_old et:est eu:eus fa:fas fi:fin fil fo:fao fr:fra,frm fy:fry ga:gle gd:gla gl:glg gu:guj he:heb hi:hin hr:hrv ht:hat hu:hun hy:hye id:ind is:isl it:ita,ita_old iu:iku ja:jpn,jpn_vert jv:jav ka:kat,kat_old kk:kaz km:khm kmr-Latn:kmr kn:kan ko:kor,kor_vert ky:kir la:lat lb:ltz lo:lao lt:lit lv:lav mi:mri mk:mkd ml:mal mn:mon mr:mar ms:msa mt:mlt my:mya ne:nep nl:nld no:nor oc:oci or:ori pa:pan pl:pol ps:pus pt:por qu:que ro:ron ru:rus sa:san sd:snd si:sin sk:slk sl:slv sq:sqi sr:srp,srp_latn su:sun sv:swe sw:swa syc:syr ta:tam te:tel tg:tgk th:tha ti:tir to:ton tr:tur tt:tat ug:uig uk:ukr ur:urd uz:uzb,uzb_cyrl vi:vie yi:yid yo:yor zh:chi_sim,chi_sim_vert,chi_tra,chi_tra_vert"
+# l10n_en provides the additional data:
+# enm - English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+ gentoo_lang=${lang%:*}
+ tess_langs=${lang#*:}
+ for tess_lang in ${tess_langs//,/ }; do
+ SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${P} )"
+ done
+ IUSE+=" l10n_${gentoo_lang}"
+done
+
+src_prepare() {
+ for file in ${A}; do
+ cp "${DISTDIR}/${file}" "${S}/${file/-${P}/}" || die
+ done
+
+ default
+}
+
+src_install() {
+ insinto /usr/share/tessdata
+ doins *.traineddata
+}
diff --git a/app-text/tessdata_fast/Manifest b/app-text/tessdata_fast/Manifest
index 76398b50becf..f3dc3a6f85a6 100644
--- a/app-text/tessdata_fast/Manifest
+++ b/app-text/tessdata_fast/Manifest
@@ -1,124 +1,248 @@
DIST afr.traineddata-tessdata_fast-4.0.0 2652786 BLAKE2B b3d1b1bb64990dd3af9d68ba5071b37cb2c91321dc49208077c76b26919d380f1ceb56ba26310b3c2667bdb44a7ebcc02a13afd0c210af1cb3c9100a69e93c8c SHA512 77f83482d45412896a7020a9e2f20f51b5a4d9b12e5c37f9be14ce73256ff1fb007df3def44110a1eb6d38b8d4601993aa1d851fcb8c48df9746e5a41c190757
+DIST afr.traineddata-tessdata_fast-4.1.0 2652786 BLAKE2B b3d1b1bb64990dd3af9d68ba5071b37cb2c91321dc49208077c76b26919d380f1ceb56ba26310b3c2667bdb44a7ebcc02a13afd0c210af1cb3c9100a69e93c8c SHA512 77f83482d45412896a7020a9e2f20f51b5a4d9b12e5c37f9be14ce73256ff1fb007df3def44110a1eb6d38b8d4601993aa1d851fcb8c48df9746e5a41c190757
DIST amh.traineddata-tessdata_fast-4.0.0 5470094 BLAKE2B 33cf82a06efdc245d333a7a869da42fd9c7bd552deb68090b28696c573dcb02b35ff4ab53bd5862853af7ef3f389c97872b5331f25ea0c3d5fe32ccf8a08070e SHA512 164a6df5e42cba07a167dc3e7f9548de9fc014037c70e5cfd8082408ce28987b3dd03d136752cf4808aca9dd5e4fd2355d5aa2426b86d7909fef92c410a17132
+DIST amh.traineddata-tessdata_fast-4.1.0 5470094 BLAKE2B 33cf82a06efdc245d333a7a869da42fd9c7bd552deb68090b28696c573dcb02b35ff4ab53bd5862853af7ef3f389c97872b5331f25ea0c3d5fe32ccf8a08070e SHA512 164a6df5e42cba07a167dc3e7f9548de9fc014037c70e5cfd8082408ce28987b3dd03d136752cf4808aca9dd5e4fd2355d5aa2426b86d7909fef92c410a17132
DIST ara.traineddata-tessdata_fast-4.0.0 1432056 BLAKE2B ce83f34fee2d5725bec6b8a57555b51b1da29e1021e35c65fac553eb44375b4bc3ae6f1a5af52a9584a8c0aeec115a403767cef31915697e30d7e916a9b15771 SHA512 7641b0b0e888498aa3fe062d0d44eda9e08d34e46e1c5ef48f92e9a49d2477c0c4cda5f989862d5441d0804312abd81733baa18ef9945c22524f9b106fc4f81d
+DIST ara.traineddata-tessdata_fast-4.1.0 1432056 BLAKE2B ce83f34fee2d5725bec6b8a57555b51b1da29e1021e35c65fac553eb44375b4bc3ae6f1a5af52a9584a8c0aeec115a403767cef31915697e30d7e916a9b15771 SHA512 7641b0b0e888498aa3fe062d0d44eda9e08d34e46e1c5ef48f92e9a49d2477c0c4cda5f989862d5441d0804312abd81733baa18ef9945c22524f9b106fc4f81d
DIST asm.traineddata-tessdata_fast-4.0.0 2045427 BLAKE2B 776ddd7cbcac01a5a1f5fed3b0c67dc8537ae30d49980e1417152d68260856075586939ff839dc8d4c09cef48a2b1aaae8b154540c16f49f66eef3b6f56e8a08 SHA512 66b847338ac5c2ce79393e669d8729be4c9b60c2b19648a42583b6a330219d3be4375d54eff36e7b6f0c5c19694971e7ee23be2b5817034fb2d531a0c84edb80
+DIST asm.traineddata-tessdata_fast-4.1.0 2045427 BLAKE2B 776ddd7cbcac01a5a1f5fed3b0c67dc8537ae30d49980e1417152d68260856075586939ff839dc8d4c09cef48a2b1aaae8b154540c16f49f66eef3b6f56e8a08 SHA512 66b847338ac5c2ce79393e669d8729be4c9b60c2b19648a42583b6a330219d3be4375d54eff36e7b6f0c5c19694971e7ee23be2b5817034fb2d531a0c84edb80
DIST aze.traineddata-tessdata_fast-4.0.0 3524799 BLAKE2B d7de3840e8f34c7636a8dd1d99dc5d812bcb2d8e660c36ff59790f4b14dc6bc9c107207af10263d3cf0d56a705fdaf04a57f5ebdd7f1995646e8ab4d6a7899af SHA512 912fa6362e2b320e220f88c7157737e63982f9b3fdd7800a625ae1693034c9b24c7e34d893563491f5cd821abf6286f35947f8ef821ef5cd93575f9187bbd452
+DIST aze.traineddata-tessdata_fast-4.1.0 3524799 BLAKE2B d7de3840e8f34c7636a8dd1d99dc5d812bcb2d8e660c36ff59790f4b14dc6bc9c107207af10263d3cf0d56a705fdaf04a57f5ebdd7f1995646e8ab4d6a7899af SHA512 912fa6362e2b320e220f88c7157737e63982f9b3fdd7800a625ae1693034c9b24c7e34d893563491f5cd821abf6286f35947f8ef821ef5cd93575f9187bbd452
DIST aze_cyrl.traineddata-tessdata_fast-4.0.0 1943672 BLAKE2B 90f20ce0436e49ab8c54c0b6e8f79f3ad83229d0d10b76d85b32a39266edc0b1070f3074e7df9cb56f58de18a2684caab97d07aed642b661698afec89c2b1b9a SHA512 153620a2c1d9c979be5eab5561a91a8dd2da6fbb73f537d54a021268e41c1ae11f579f027a320df1c3e1c8e8eaf4c6165ecbedf8027a0bd2c36e7c8856a874ca
+DIST aze_cyrl.traineddata-tessdata_fast-4.1.0 1943672 BLAKE2B 90f20ce0436e49ab8c54c0b6e8f79f3ad83229d0d10b76d85b32a39266edc0b1070f3074e7df9cb56f58de18a2684caab97d07aed642b661698afec89c2b1b9a SHA512 153620a2c1d9c979be5eab5561a91a8dd2da6fbb73f537d54a021268e41c1ae11f579f027a320df1c3e1c8e8eaf4c6165ecbedf8027a0bd2c36e7c8856a874ca
DIST bel.traineddata-tessdata_fast-4.0.0 3692098 BLAKE2B 62e03c20c02611a5b90faeb31806f2d6995e0eea72f17dfb7534524f44f30ed8f95198f912de44c6331af9ffb155da267b48552931b85c1ecc0461592b6de891 SHA512 87d5ad0c37cc08b483e1b99f8dd354f0bf5a98f0a87596dadb9c0d23ae1442edf330011eca4718ad959c14053b8834fe53b3fc5162d320019ba7d2c16faf2682
+DIST bel.traineddata-tessdata_fast-4.1.0 3692098 BLAKE2B 62e03c20c02611a5b90faeb31806f2d6995e0eea72f17dfb7534524f44f30ed8f95198f912de44c6331af9ffb155da267b48552931b85c1ecc0461592b6de891 SHA512 87d5ad0c37cc08b483e1b99f8dd354f0bf5a98f0a87596dadb9c0d23ae1442edf330011eca4718ad959c14053b8834fe53b3fc5162d320019ba7d2c16faf2682
DIST ben.traineddata-tessdata_fast-4.0.0 855841 BLAKE2B bc665e16fdf0593f5a9f33d8517e957b2b939eed6206a8da964c84a2aff277dc215d82576810a15d1bbaf1f4bcf2427440fdaa8a9da998bd4be7f3d7a191a5f1 SHA512 c282b2922ed741e2ba965e57f6ee81402ab594a1100320baa122b07b6f855e92d5b6ab966ca125de5e53c0a84912f6dbb3fa6783f72c6300ac76cebcb76f0811
+DIST ben.traineddata-tessdata_fast-4.1.0 855841 BLAKE2B bc665e16fdf0593f5a9f33d8517e957b2b939eed6206a8da964c84a2aff277dc215d82576810a15d1bbaf1f4bcf2427440fdaa8a9da998bd4be7f3d7a191a5f1 SHA512 c282b2922ed741e2ba965e57f6ee81402ab594a1100320baa122b07b6f855e92d5b6ab966ca125de5e53c0a84912f6dbb3fa6783f72c6300ac76cebcb76f0811
DIST bod.traineddata-tessdata_fast-4.0.0 1966440 BLAKE2B 5e5b872ee7a421976c11d22e473bd099bcdd91d4ac52ba493e4ba37ce259c5cfe35d09583828a62a2ed9554090b19df5b6b0253b0b8000e02e47b56b11d2cb1f SHA512 47ffef75c99e29653c16ba5c0c6d77644d44aca6ac92845fb46ac746765214155d5793e1c296fb4407d1e0d18d154ccc5626416c236da70fb051c828229c5db3
+DIST bod.traineddata-tessdata_fast-4.1.0 1966440 BLAKE2B 5e5b872ee7a421976c11d22e473bd099bcdd91d4ac52ba493e4ba37ce259c5cfe35d09583828a62a2ed9554090b19df5b6b0253b0b8000e02e47b56b11d2cb1f SHA512 47ffef75c99e29653c16ba5c0c6d77644d44aca6ac92845fb46ac746765214155d5793e1c296fb4407d1e0d18d154ccc5626416c236da70fb051c828229c5db3
DIST bos.traineddata-tessdata_fast-4.0.0 2498242 BLAKE2B 7017b91796d118279ae160263b7bdc974dcfaae7c6f41730c4461c70b764e6d598a79fdb6bfa33c63f1f51183ac7f581e5305710c43154df04735612666e4234 SHA512 64fc18c36b6c5144eb187c1f12af69b36f2bbe0b82c53fd16c58698a87843d053e0b0866771a20fc1543c827bfe25e14f871e20daec9a31983af76a400c48dc5
+DIST bos.traineddata-tessdata_fast-4.1.0 2498242 BLAKE2B 7017b91796d118279ae160263b7bdc974dcfaae7c6f41730c4461c70b764e6d598a79fdb6bfa33c63f1f51183ac7f581e5305710c43154df04735612666e4234 SHA512 64fc18c36b6c5144eb187c1f12af69b36f2bbe0b82c53fd16c58698a87843d053e0b0866771a20fc1543c827bfe25e14f871e20daec9a31983af76a400c48dc5
DIST bre.traineddata-tessdata_fast-4.0.0 6335007 BLAKE2B ef0a779bbce60528fa5af10764e52126e3f8da1f9cdbdb0323408fdd255be57dc3860ed6d2b2958839489a2e867e51e3b0ef4519c9c018f2b68c6c9d57f45254 SHA512 9335e080bd4758b6e9891cc68666278f34667d0f2b2bce3ecd1562fa730e0a6f05c36173238153db1b6499212af28528e5727bd1d0ccde0e44761bab3d52727d
+DIST bre.traineddata-tessdata_fast-4.1.0 6335007 BLAKE2B ef0a779bbce60528fa5af10764e52126e3f8da1f9cdbdb0323408fdd255be57dc3860ed6d2b2958839489a2e867e51e3b0ef4519c9c018f2b68c6c9d57f45254 SHA512 9335e080bd4758b6e9891cc68666278f34667d0f2b2bce3ecd1562fa730e0a6f05c36173238153db1b6499212af28528e5727bd1d0ccde0e44761bab3d52727d
DIST bul.traineddata-tessdata_fast-4.0.0 1675212 BLAKE2B b041a237afa60d75b8344cad3aa40abd51c49c1bf3573c9908f8bb8a6c408d232f18c6278f1d41f520c65ef7f0249dfc9c10e7701cf0a848878684b8531782a8 SHA512 c3abc2282f8808af4686fa5ecbb43d070de747a7645afe2a634ffae4fdb93b42f80023b6a5b86ce8d5270c64cee93c1818a8ddcb6826aae9ac9b54292a968219
+DIST bul.traineddata-tessdata_fast-4.1.0 1675212 BLAKE2B b041a237afa60d75b8344cad3aa40abd51c49c1bf3573c9908f8bb8a6c408d232f18c6278f1d41f520c65ef7f0249dfc9c10e7701cf0a848878684b8531782a8 SHA512 c3abc2282f8808af4686fa5ecbb43d070de747a7645afe2a634ffae4fdb93b42f80023b6a5b86ce8d5270c64cee93c1818a8ddcb6826aae9ac9b54292a968219
DIST cat.traineddata-tessdata_fast-4.0.0 1146012 BLAKE2B 1eb23b29e1c47c020d08c57b725539824cb425dc5dab39c7a3b2b5c741854ff4fa13ff7bec270612cea5f60313af5e9fd64c90ef09a0653a8a52d699959fd461 SHA512 8285ab38ce22c516ead5ce7a7505e7cf125e27b2c784e440a1126005f745dcb33aff2e3d9741e1f7fc4eced0117e71b210b0b4cb801bd3a6bfdc1ad548c0aa3f
+DIST cat.traineddata-tessdata_fast-4.1.0 1146012 BLAKE2B 1eb23b29e1c47c020d08c57b725539824cb425dc5dab39c7a3b2b5c741854ff4fa13ff7bec270612cea5f60313af5e9fd64c90ef09a0653a8a52d699959fd461 SHA512 8285ab38ce22c516ead5ce7a7505e7cf125e27b2c784e440a1126005f745dcb33aff2e3d9741e1f7fc4eced0117e71b210b0b4cb801bd3a6bfdc1ad548c0aa3f
DIST ceb.traineddata-tessdata_fast-4.0.0 716214 BLAKE2B bf41070aa1b22aa6e91a702d0a808938f9933463a3027e23b72952de30ff24f6608abf62d5a0a3580fbe8a9c69de142afe59871eec9977d0af61a18dab8972c7 SHA512 e8c43a221789f78bd042fafd35e05e6b9f6cb00373ce29fab701a3f61c65d77464a3b2ff838b1f03a69ffa048803f640a2efba50dddee4a1b4d878d6ad4a90bf
+DIST ceb.traineddata-tessdata_fast-4.1.0 716214 BLAKE2B bf41070aa1b22aa6e91a702d0a808938f9933463a3027e23b72952de30ff24f6608abf62d5a0a3580fbe8a9c69de142afe59871eec9977d0af61a18dab8972c7 SHA512 e8c43a221789f78bd042fafd35e05e6b9f6cb00373ce29fab701a3f61c65d77464a3b2ff838b1f03a69ffa048803f640a2efba50dddee4a1b4d878d6ad4a90bf
DIST ces.traineddata-tessdata_fast-4.0.0 3795684 BLAKE2B f66c0bba47862fc7bb76a8986ffedd6cc43bc4a8d6fd5cd2185f848437b557d81e70fe5f46ae232b9b751aa7fe81292afd0ed6442a7d5a87afa44e1ab1f07788 SHA512 85134421f9a21d7af0c676082745f7fa520d4298fde4976abcdb500cb245a1b1c79276c533a5b0c796df89f9654868959d2053488d4e43883dc62dd113dee74b
+DIST ces.traineddata-tessdata_fast-4.1.0 3795684 BLAKE2B f66c0bba47862fc7bb76a8986ffedd6cc43bc4a8d6fd5cd2185f848437b557d81e70fe5f46ae232b9b751aa7fe81292afd0ed6442a7d5a87afa44e1ab1f07788 SHA512 85134421f9a21d7af0c676082745f7fa520d4298fde4976abcdb500cb245a1b1c79276c533a5b0c796df89f9654868959d2053488d4e43883dc62dd113dee74b
DIST chi_sim.traineddata-tessdata_fast-4.0.0 2469156 BLAKE2B 8dc9b6ae16b2c59f7c1bcf0134b69c6eb1388384b18e2c5bb1ce972a3074b23486954204563f3a1570fb63615b97237dda7ebe5168d0d2c6f35d68a40d43aad0 SHA512 384895a4c6f6c523437e2f934f9f12c96fb42aa63958ff6473d04c79f6ce919c46412f6c0143c0e061c0198e9c4d9898b6734f7f18cfc30d427b644f0a089397
+DIST chi_sim.traineddata-tessdata_fast-4.1.0 2469156 BLAKE2B 8dc9b6ae16b2c59f7c1bcf0134b69c6eb1388384b18e2c5bb1ce972a3074b23486954204563f3a1570fb63615b97237dda7ebe5168d0d2c6f35d68a40d43aad0 SHA512 384895a4c6f6c523437e2f934f9f12c96fb42aa63958ff6473d04c79f6ce919c46412f6c0143c0e061c0198e9c4d9898b6734f7f18cfc30d427b644f0a089397
DIST chi_sim_vert.traineddata-tessdata_fast-4.0.0 1927902 BLAKE2B cbfacf6ebf7db688c936fe86db5cff028d17b67e8f2244b92d9b48d607bfbaea6abd4748a91873650c2a260cd7923f198e5e16202791923a7dc6c6859ca16318 SHA512 5b88cf5c5e5fcc4aaeea2b9753a24fd71148e4d27d0c39102a0ade28e52b1976e8c519036fb27cff958e0f8200c81aef407991ca2b6aebe82324b9d81025a7eb
+DIST chi_sim_vert.traineddata-tessdata_fast-4.1.0 1927902 BLAKE2B cbfacf6ebf7db688c936fe86db5cff028d17b67e8f2244b92d9b48d607bfbaea6abd4748a91873650c2a260cd7923f198e5e16202791923a7dc6c6859ca16318 SHA512 5b88cf5c5e5fcc4aaeea2b9753a24fd71148e4d27d0c39102a0ade28e52b1976e8c519036fb27cff958e0f8200c81aef407991ca2b6aebe82324b9d81025a7eb
DIST chi_tra.traineddata-tessdata_fast-4.0.0 2366642 BLAKE2B 4c21c8ab7fee9a0e5158b440eb4deb05876a6e61554351eb6bc7753baefb0f29545de2041f4c297a8b918a0f122078a021a56f8925c53a49c2ccf9f760440681 SHA512 363847e2903b1812db73c16a1fb8ef72e69c87f2b27057c636e48ad2e8a9875eb380bdd7950504d397e03610d681084079bc8029d03cdee63433ef0367035ffe
+DIST chi_tra.traineddata-tessdata_fast-4.1.0 2366642 BLAKE2B 4c21c8ab7fee9a0e5158b440eb4deb05876a6e61554351eb6bc7753baefb0f29545de2041f4c297a8b918a0f122078a021a56f8925c53a49c2ccf9f760440681 SHA512 363847e2903b1812db73c16a1fb8ef72e69c87f2b27057c636e48ad2e8a9875eb380bdd7950504d397e03610d681084079bc8029d03cdee63433ef0367035ffe
DIST chi_tra_vert.traineddata-tessdata_fast-4.0.0 1824756 BLAKE2B 735792205ec0ae9e4ad3a2734e1a871e4090423800cfafe250efcf7e933c7f53448c60593d1cf7fc8e69eeec428d7be50b6dc99609706a1ad2b3466248702384 SHA512 b3c16ff72611ffa58a9196742430226399c2265999691932ba5cb548ca4e8b82f83abdd529e9a18637231e011c9a80852d8d652995046d2bf56cdfdeafc43e64
+DIST chi_tra_vert.traineddata-tessdata_fast-4.1.0 1824756 BLAKE2B 735792205ec0ae9e4ad3a2734e1a871e4090423800cfafe250efcf7e933c7f53448c60593d1cf7fc8e69eeec428d7be50b6dc99609706a1ad2b3466248702384 SHA512 b3c16ff72611ffa58a9196742430226399c2265999691932ba5cb548ca4e8b82f83abdd529e9a18637231e011c9a80852d8d652995046d2bf56cdfdeafc43e64
DIST chr.traineddata-tessdata_fast-4.0.0 374944 BLAKE2B bc9e90db116774bca88314fd3de6603b19502bfa452d62bf5cbabc74a8039cfcae9380cd73f37ad9c57b1d2c5e1fc3eb79ad7e11fe06b28df277d08f7740de4a SHA512 a29dc9bb46870bf3e6ee70720781b2ddaf6ca8cbb6879e124b1184d2428b2739405bff6e1644b6a2e6c9089f642b52875782cfbc1dc41893b7fa8028a066535b
+DIST chr.traineddata-tessdata_fast-4.1.0 374944 BLAKE2B bc9e90db116774bca88314fd3de6603b19502bfa452d62bf5cbabc74a8039cfcae9380cd73f37ad9c57b1d2c5e1fc3eb79ad7e11fe06b28df277d08f7740de4a SHA512 a29dc9bb46870bf3e6ee70720781b2ddaf6ca8cbb6879e124b1184d2428b2739405bff6e1644b6a2e6c9089f642b52875782cfbc1dc41893b7fa8028a066535b
DIST cos.traineddata-tessdata_fast-4.0.0 2299099 BLAKE2B 39ed95dd5d8103812c386f188f1df1706630de89c717a538d7391ceddcb380d953b5b7a7b53e67ab43f78fde7bcb1b843bcfc522c521fdde1e81fa29e23db8e9 SHA512 d1bdab82106240859319256e87667c0ef9d562559a29f7a148033b5baeced5970b7cd7a3415ab919a6eed7806c0569ab781386e88b2788a518b647f69c55cc74
+DIST cos.traineddata-tessdata_fast-4.1.0 2299099 BLAKE2B 39ed95dd5d8103812c386f188f1df1706630de89c717a538d7391ceddcb380d953b5b7a7b53e67ab43f78fde7bcb1b843bcfc522c521fdde1e81fa29e23db8e9 SHA512 d1bdab82106240859319256e87667c0ef9d562559a29f7a148033b5baeced5970b7cd7a3415ab919a6eed7806c0569ab781386e88b2788a518b647f69c55cc74
DIST cym.traineddata-tessdata_fast-4.0.0 2208919 BLAKE2B ea325cbb50984ed79e6398f4d4b1a0c627dbac410679126abfd7778e8d800f7ad972d8a919595816ee3bb2dc2969fb84625e931078b41c419cb8f917a2640301 SHA512 2c4092fa858ad2070784c9993744ee0bca1ec77f6261c849363d3643cd3f891af86d88f48150c70e7b115bbd04bf62ffef212e315929a880cb61d4695a8ce844
+DIST cym.traineddata-tessdata_fast-4.1.0 2208919 BLAKE2B ea325cbb50984ed79e6398f4d4b1a0c627dbac410679126abfd7778e8d800f7ad972d8a919595816ee3bb2dc2969fb84625e931078b41c419cb8f917a2640301 SHA512 2c4092fa858ad2070784c9993744ee0bca1ec77f6261c849363d3643cd3f891af86d88f48150c70e7b115bbd04bf62ffef212e315929a880cb61d4695a8ce844
DIST dan.traineddata-tessdata_fast-4.0.0 2580059 BLAKE2B 3f2582285ffa01934fd077a885c62c82040e1a5cb76be968575fa2485a91b8ae958722f1118531021e851964013f2acdd2df1ca659303c4859dfaa141e60b713 SHA512 d37d7ea48660cdd13f3bb7aef4d7dad6259d7690cd76f911537fc5bcee8c010c634e2c5c36a3ef0fc8b8067c68c4f50f8204e28e48966449f6b4e1364541ef78
+DIST dan.traineddata-tessdata_fast-4.1.0 2580059 BLAKE2B 3f2582285ffa01934fd077a885c62c82040e1a5cb76be968575fa2485a91b8ae958722f1118531021e851964013f2acdd2df1ca659303c4859dfaa141e60b713 SHA512 d37d7ea48660cdd13f3bb7aef4d7dad6259d7690cd76f911537fc5bcee8c010c634e2c5c36a3ef0fc8b8067c68c4f50f8204e28e48966449f6b4e1364541ef78
DIST deu.traineddata-tessdata_fast-4.0.0 1525436 BLAKE2B 5de6814e49ac640fe1ebfb5a04611fbafe935d204691458c91597db8ea7b834bcdf4fcbae2367ce7fae32b96524142bcc61b0a856705bde9e0fe2f46323d06e8 SHA512 192f71c0645a4034015997f13b1b6e76d726e74fe227ab528399d3cd4688723f77c2dcd2ff87563ab487c4d97139e8faa7e77e1fbd81d2ff02336bbdcd757b9d
+DIST deu.traineddata-tessdata_fast-4.1.0 1525436 BLAKE2B 5de6814e49ac640fe1ebfb5a04611fbafe935d204691458c91597db8ea7b834bcdf4fcbae2367ce7fae32b96524142bcc61b0a856705bde9e0fe2f46323d06e8 SHA512 192f71c0645a4034015997f13b1b6e76d726e74fe227ab528399d3cd4688723f77c2dcd2ff87563ab487c4d97139e8faa7e77e1fbd81d2ff02336bbdcd757b9d
DIST div.traineddata-tessdata_fast-4.0.0 1774535 BLAKE2B 3cc8ac2271cb19fce7a0aee99b6581cb5bff57867e132640b74c975524633ee1cfb130482f7659ea6c6754f860f2d74ae29c41a61aaa10bafc6fbad0eec99646 SHA512 d276d2b8ba1ecce9fc57a5d8fd28a7a29dfe1d073769b953bb33d97049c643e276a78c3a8f2f797003ecbae30160e90e334090dc1fe63e822440a2827a074300
+DIST div.traineddata-tessdata_fast-4.1.0 1774535 BLAKE2B 3cc8ac2271cb19fce7a0aee99b6581cb5bff57867e132640b74c975524633ee1cfb130482f7659ea6c6754f860f2d74ae29c41a61aaa10bafc6fbad0eec99646 SHA512 d276d2b8ba1ecce9fc57a5d8fd28a7a29dfe1d073769b953bb33d97049c643e276a78c3a8f2f797003ecbae30160e90e334090dc1fe63e822440a2827a074300
DIST dzo.traineddata-tessdata_fast-4.0.0 449596 BLAKE2B 05c2567789f92741a5b28d5097fd6038376dc2837622d0cda23a634ee804bf7bea0a1910db4ea2f8dc45da3cf6d0f5d38e0439a5884b737325fa1895e34c5844 SHA512 b9d43ae331b620c312da09ddc80d7dad13a44057655f382fcc10bf384d75d5abc4026f8782c6be2031d5ce159a063b845da49615a318acb6f1d35f206251324a
+DIST dzo.traineddata-tessdata_fast-4.1.0 449596 BLAKE2B 05c2567789f92741a5b28d5097fd6038376dc2837622d0cda23a634ee804bf7bea0a1910db4ea2f8dc45da3cf6d0f5d38e0439a5884b737325fa1895e34c5844 SHA512 b9d43ae331b620c312da09ddc80d7dad13a44057655f382fcc10bf384d75d5abc4026f8782c6be2031d5ce159a063b845da49615a318acb6f1d35f206251324a
DIST ell.traineddata-tessdata_fast-4.0.0 1419514 BLAKE2B bf001f04d833952d8e501360ebe55aa7320a841cf966622ff5ded426d235d8f816c5cde690b6b33e33091f05268288c4dd428a09ccf29fbac377741d27bb8af7 SHA512 c2d483c117801b277bffdc16237c439f59896e5988b5d642483f351cf249359ad826153c50be8fa25e44cc6a19e8d6d0ba871a889618797e216858725902a143
+DIST ell.traineddata-tessdata_fast-4.1.0 1419514 BLAKE2B bf001f04d833952d8e501360ebe55aa7320a841cf966622ff5ded426d235d8f816c5cde690b6b33e33091f05268288c4dd428a09ccf29fbac377741d27bb8af7 SHA512 c2d483c117801b277bffdc16237c439f59896e5988b5d642483f351cf249359ad826153c50be8fa25e44cc6a19e8d6d0ba871a889618797e216858725902a143
DIST eng.traineddata-tessdata_fast-4.0.0 4113088 BLAKE2B c7b206ddbd3d99cb2684cc5d3d8a438ecaa3aaba9b99bddd546c7fc9e9e096f67e1eed4979ed6836a82cdd2d9579ded736dccd5cdbb34d388c8b68603f00d246 SHA512 90aadb5e0c368781f94add808f6b4dd31d8e244c9fecbe6a233070cac9a4fc071fd23a09e4a7e041db8e26880a6debbdf32a6b701c28687b2ed1cac81f4c1d14
+DIST eng.traineddata-tessdata_fast-4.1.0 4113088 BLAKE2B c7b206ddbd3d99cb2684cc5d3d8a438ecaa3aaba9b99bddd546c7fc9e9e096f67e1eed4979ed6836a82cdd2d9579ded736dccd5cdbb34d388c8b68603f00d246 SHA512 90aadb5e0c368781f94add808f6b4dd31d8e244c9fecbe6a233070cac9a4fc071fd23a09e4a7e041db8e26880a6debbdf32a6b701c28687b2ed1cac81f4c1d14
DIST enm.traineddata-tessdata_fast-4.0.0 3101551 BLAKE2B 5265489398ffa074eba3f517e15453d3087b82d5466dc40f3d80923eecc9f8d0c9c52c0a7af98be34235ab0e9bcbb2b8ac178f6a03a2cd40f69d2e59f4a7387e SHA512 7dd3ca9383bfc9306f9a67dfb3ecd41a9e4fdf5b716e7444170472696afa7e78e02c334082563bc41383e9500035d19614beaf4cce314056368425117e1cd211
+DIST enm.traineddata-tessdata_fast-4.1.0 3101551 BLAKE2B 5265489398ffa074eba3f517e15453d3087b82d5466dc40f3d80923eecc9f8d0c9c52c0a7af98be34235ab0e9bcbb2b8ac178f6a03a2cd40f69d2e59f4a7387e SHA512 7dd3ca9383bfc9306f9a67dfb3ecd41a9e4fdf5b716e7444170472696afa7e78e02c334082563bc41383e9500035d19614beaf4cce314056368425117e1cd211
DIST epo.traineddata-tessdata_fast-4.0.0 4728393 BLAKE2B caa6e5c7ee30a4e7c4982c980cbd2dc7df34fd5fabdecaca4803f683cb7b552de153f85bad1e1d9d368317a5818810ca2299e3f9e118cdac345608f1affd40f1 SHA512 56dfb4b5df1cad13c95882f282f6f153cc7851839801ed3b01890742c9d6ae704e03704372c3742129f8e832ad2c21a17f42065885fa148d1e1f45a1533e377e
+DIST epo.traineddata-tessdata_fast-4.1.0 4728393 BLAKE2B caa6e5c7ee30a4e7c4982c980cbd2dc7df34fd5fabdecaca4803f683cb7b552de153f85bad1e1d9d368317a5818810ca2299e3f9e118cdac345608f1affd40f1 SHA512 56dfb4b5df1cad13c95882f282f6f153cc7851839801ed3b01890742c9d6ae704e03704372c3742129f8e832ad2c21a17f42065885fa148d1e1f45a1533e377e
DIST est.traineddata-tessdata_fast-4.0.0 4458101 BLAKE2B f1b5955b2ccfd1700d6a025288aca510a2f3c41f37c29217a829081909e32ef0210a1a1871e782fbf97a6aabde33a6148afd11197a0bd5521407ba1ad85fa8e1 SHA512 6acf6ab676232950f02c3a321269f74b7c94ad32f385f0d3cdf354520f0cee513d529e6cdffb09847cae0183f052be0e6b4c2ba56a07d754674d56c826237427
+DIST est.traineddata-tessdata_fast-4.1.0 4458101 BLAKE2B f1b5955b2ccfd1700d6a025288aca510a2f3c41f37c29217a829081909e32ef0210a1a1871e782fbf97a6aabde33a6148afd11197a0bd5521407ba1ad85fa8e1 SHA512 6acf6ab676232950f02c3a321269f74b7c94ad32f385f0d3cdf354520f0cee513d529e6cdffb09847cae0183f052be0e6b4c2ba56a07d754674d56c826237427
DIST eus.traineddata-tessdata_fast-4.0.0 5175921 BLAKE2B e40811460d4e081c65a5955e772c5fb9c348b8a8b920e027ba74ad280092637eb5604b2b6b9b88fcc325ad9896bad4fc91a91a722b7cc996bcf3a27618e9fc1f SHA512 48a46e2b55faa91817d89557750e74d7e31ff99bd89c3c3f746ed821108334e942f6d521a810c258a4e0342de3e8d01e82d941f4587662c863385e58a92618a4
+DIST eus.traineddata-tessdata_fast-4.1.0 5175921 BLAKE2B e40811460d4e081c65a5955e772c5fb9c348b8a8b920e027ba74ad280092637eb5604b2b6b9b88fcc325ad9896bad4fc91a91a722b7cc996bcf3a27618e9fc1f SHA512 48a46e2b55faa91817d89557750e74d7e31ff99bd89c3c3f746ed821108334e942f6d521a810c258a4e0342de3e8d01e82d941f4587662c863385e58a92618a4
DIST fao.traineddata-tessdata_fast-4.0.0 3439772 BLAKE2B af3ed3e8ca58463225c351b7098c9dac81e0b2e5b923ee5d85eddc3542c64c132a1d38699b90a51e1ec0d7a3f0429849a113323bf36c27d0ffb9a2934995d5be SHA512 2d9de845e486942045f60048908d771d93dff093d33a6b40c83a59e871f870d4afbfae7bbd5ed0a60e1c6514a5b7ab279b92162bc81f89b53bbdb9e236b3f7fa
+DIST fao.traineddata-tessdata_fast-4.1.0 3439772 BLAKE2B af3ed3e8ca58463225c351b7098c9dac81e0b2e5b923ee5d85eddc3542c64c132a1d38699b90a51e1ec0d7a3f0429849a113323bf36c27d0ffb9a2934995d5be SHA512 2d9de845e486942045f60048908d771d93dff093d33a6b40c83a59e871f870d4afbfae7bbd5ed0a60e1c6514a5b7ab279b92162bc81f89b53bbdb9e236b3f7fa
DIST fas.traineddata-tessdata_fast-4.0.0 431500 BLAKE2B 2f98065bbb68756dd7c69116833477df3a08cd75417e52111a9706241686ed3015526d7e400fbd7334a08f17e58739de7b47d4c7b5c8203c16a63a4db7f000da SHA512 867015ae3218a4fd7de65d83ed526a4cbf40a1c5463b7ae731c391ecae4857e621cddf0d832f53c35a959131598210ea794c67cf1fea502cca98d66895cc7f06
+DIST fas.traineddata-tessdata_fast-4.1.0 431500 BLAKE2B 2f98065bbb68756dd7c69116833477df3a08cd75417e52111a9706241686ed3015526d7e400fbd7334a08f17e58739de7b47d4c7b5c8203c16a63a4db7f000da SHA512 867015ae3218a4fd7de65d83ed526a4cbf40a1c5463b7ae731c391ecae4857e621cddf0d832f53c35a959131598210ea794c67cf1fea502cca98d66895cc7f06
DIST fil.traineddata-tessdata_fast-4.0.0 1841715 BLAKE2B ffa4fb0a6c6e61434aeaed8708057b7a2b90f5c6a0eb9532c36c02da044edd471022de144406bb48d633a0d036ae23babc0204b10b762335eef7e529627d4dba SHA512 05d8710d8f35199e3dcc14768c0fb2c739f5525d671db8bce2996b8d7f00bab1f453f344ec8d5125a3d1d0ae833951bc89017e4d6ca1da023c2373cb7c34c954
+DIST fil.traineddata-tessdata_fast-4.1.0 1841715 BLAKE2B ffa4fb0a6c6e61434aeaed8708057b7a2b90f5c6a0eb9532c36c02da044edd471022de144406bb48d633a0d036ae23babc0204b10b762335eef7e529627d4dba SHA512 05d8710d8f35199e3dcc14768c0fb2c739f5525d671db8bce2996b8d7f00bab1f453f344ec8d5125a3d1d0ae833951bc89017e4d6ca1da023c2373cb7c34c954
DIST fin.traineddata-tessdata_fast-4.0.0 7865732 BLAKE2B 8fbc976ac253490b4fdbee46f3a4124447a421ef468b45da86f5687594157021df92f49ea5193f44952a626eed4d8eebbbb958abcf1de00d1761d070dc2a32b7 SHA512 d894031f33c76462b12ecc58e77d7327158d4abc162c12e820bcf63d5f2fac4f61a036da3972feac9561d8ebed8962c03c9669a64b7bbdad4f7551dddc220877
+DIST fin.traineddata-tessdata_fast-4.1.0 7865732 BLAKE2B 8fbc976ac253490b4fdbee46f3a4124447a421ef468b45da86f5687594157021df92f49ea5193f44952a626eed4d8eebbbb958abcf1de00d1761d070dc2a32b7 SHA512 d894031f33c76462b12ecc58e77d7327158d4abc162c12e820bcf63d5f2fac4f61a036da3972feac9561d8ebed8962c03c9669a64b7bbdad4f7551dddc220877
DIST fra.traineddata-tessdata_fast-4.0.0 1130365 BLAKE2B c7c88f049d5ba836decdf35e154dcf227a1bbeda827651221521198841cea8d1591affaf1aa19b027d62716ff9863076cc38ec88b3ace98096e08483f2988505 SHA512 ad3266d0d010a744c1728562000f3884951cdf00e1bb3cafa46f11156a3fa6ef6bfb1398861e91aa1d9c27634f29910ac3507f4d978f657f86c0061da8ae80fe
+DIST fra.traineddata-tessdata_fast-4.1.0 1130365 BLAKE2B c7c88f049d5ba836decdf35e154dcf227a1bbeda827651221521198841cea8d1591affaf1aa19b027d62716ff9863076cc38ec88b3ace98096e08483f2988505 SHA512 ad3266d0d010a744c1728562000f3884951cdf00e1bb3cafa46f11156a3fa6ef6bfb1398861e91aa1d9c27634f29910ac3507f4d978f657f86c0061da8ae80fe
DIST frk.traineddata-tessdata_fast-4.0.0 6423052 BLAKE2B 11d85620108d40efc54d8e2d12e912311727f7bbc0ef3188eaefebd74b2a24d2a2b8115ef876cb4c570f97b5e2852318cb7165368dbbfeaf53813f03434f14ee SHA512 c21d75128d2e23e3039605d5771c3b23bcde1178fd4baef2557ca2df05d58a003b35f69c410defd66fc1960942b4ed764c096e62c29b51b22ecd6bd498afa3a1
+DIST frk.traineddata-tessdata_fast-4.1.0 6423052 BLAKE2B 11d85620108d40efc54d8e2d12e912311727f7bbc0ef3188eaefebd74b2a24d2a2b8115ef876cb4c570f97b5e2852318cb7165368dbbfeaf53813f03434f14ee SHA512 c21d75128d2e23e3039605d5771c3b23bcde1178fd4baef2557ca2df05d58a003b35f69c410defd66fc1960942b4ed764c096e62c29b51b22ecd6bd498afa3a1
DIST frm.traineddata-tessdata_fast-4.0.0 2024948 BLAKE2B b85819d5392ef2adbf6e6493b880e674764ee6497b5f229b32f928779c2a84f4e368263987ad1e75bb10e116fd74bffe8b7d6812f0005f1fddc0768c6f3ebfa9 SHA512 28311f40d5330a6c16592ddfb1ba42aab6d507808f8d9b5128dd4ab5910a53dfdb0077c69c361bfaf5dc87aa57f3ba6381abb8d101facd1dd394772c9f9a21f8
+DIST frm.traineddata-tessdata_fast-4.1.0 2024948 BLAKE2B b85819d5392ef2adbf6e6493b880e674764ee6497b5f229b32f928779c2a84f4e368263987ad1e75bb10e116fd74bffe8b7d6812f0005f1fddc0768c6f3ebfa9 SHA512 28311f40d5330a6c16592ddfb1ba42aab6d507808f8d9b5128dd4ab5910a53dfdb0077c69c361bfaf5dc87aa57f3ba6381abb8d101facd1dd394772c9f9a21f8
DIST fry.traineddata-tessdata_fast-4.0.0 1906018 BLAKE2B 4931c400aece91dc112284b782e20a86fbf4ac875d32126b038fcdc74c20303b59ebe76ea96ce084140fb001d942eb043771159281ff0fcc2e1c00be42f626fd SHA512 50467465e85a2002204b7866c8ed420f1452f11613b433ba8d93a7e5a34785c5ca4873c2adce224c1af594d1d8667ff2780ba5701ad4b41287482bee0c30a671
+DIST fry.traineddata-tessdata_fast-4.1.0 1906018 BLAKE2B 4931c400aece91dc112284b782e20a86fbf4ac875d32126b038fcdc74c20303b59ebe76ea96ce084140fb001d942eb043771159281ff0fcc2e1c00be42f626fd SHA512 50467465e85a2002204b7866c8ed420f1452f11613b433ba8d93a7e5a34785c5ca4873c2adce224c1af594d1d8667ff2780ba5701ad4b41287482bee0c30a671
DIST gla.traineddata-tessdata_fast-4.0.0 3068307 BLAKE2B e7d7b8050acb1f8e3c83aefed5a277e503b6cfd9777cfbfb74a1602c60bd0b9fd088af878ff6ec26d438b45b5d4cadff4613773738f1e672cdc7095ba5127908 SHA512 ffb26a674357abf3e41e957e951d308509d1089a859721e1686d1e714bb2257893ca7a512b3dcdf86af975f7f8e5f59da969ab51b9c19702b30e7b057054ad94
+DIST gla.traineddata-tessdata_fast-4.1.0 3068307 BLAKE2B e7d7b8050acb1f8e3c83aefed5a277e503b6cfd9777cfbfb74a1602c60bd0b9fd088af878ff6ec26d438b45b5d4cadff4613773738f1e672cdc7095ba5127908 SHA512 ffb26a674357abf3e41e957e951d308509d1089a859721e1686d1e714bb2257893ca7a512b3dcdf86af975f7f8e5f59da969ab51b9c19702b30e7b057054ad94
DIST gle.traineddata-tessdata_fast-4.0.0 1181824 BLAKE2B a17e491ec202e27dfdbf00b092d033c70e578cfa9e540b9ed3ca6d56a448a997fa8fcca6e1be9aacf041294d82a7f5968d10f66a731ac622b60d7224004ea854 SHA512 21450289464b9b1afad0ef4ebb1007fd5b06480f734e6e9610408df1141497534f869ccfb87055bbfb272c2edf568464e86e894f12f9cc3f269ad52cf149a778
+DIST gle.traineddata-tessdata_fast-4.1.0 1181824 BLAKE2B a17e491ec202e27dfdbf00b092d033c70e578cfa9e540b9ed3ca6d56a448a997fa8fcca6e1be9aacf041294d82a7f5968d10f66a731ac622b60d7224004ea854 SHA512 21450289464b9b1afad0ef4ebb1007fd5b06480f734e6e9610408df1141497534f869ccfb87055bbfb272c2edf568464e86e894f12f9cc3f269ad52cf149a778
DIST glg.traineddata-tessdata_fast-4.0.0 2554555 BLAKE2B 458809fb87ff09b8c30c0dac39d2779209b90c24ae1fbbb1dc7fedf5d21b54652cfbeddb47130627ea539bf657f672ef43a8284eb0ce9b04f23492d17077752b SHA512 6abffc2a53692826f90a9141aa4e6ebaf800873c2735ca74781a8ac4b342ddc9b9aaba565ea984dafe53e656e6a62cfa3b5c97301e6f33ed175ff5e0f7f36257
+DIST glg.traineddata-tessdata_fast-4.1.0 2554555 BLAKE2B 458809fb87ff09b8c30c0dac39d2779209b90c24ae1fbbb1dc7fedf5d21b54652cfbeddb47130627ea539bf657f672ef43a8284eb0ce9b04f23492d17077752b SHA512 6abffc2a53692826f90a9141aa4e6ebaf800873c2735ca74781a8ac4b342ddc9b9aaba565ea984dafe53e656e6a62cfa3b5c97301e6f33ed175ff5e0f7f36257
DIST grc.traineddata-tessdata_fast-4.0.0 2246328 BLAKE2B 3c80d1e1d78bf2e98b7249991d29cf2e996ed91ab8cfe50d75714f146762ad923d4f7a63c15ebc275c8dd3f097a7b4c53a161970a339d27d6b5eb205a3c4342f SHA512 af4618180cfc7e51b7febafff8175e1d3eb29131306e892466e6a18156d3c4b762cb944ab01d17f959087959a00c1c241c33456fa1cf1ae34a37593b1ccc407d
+DIST grc.traineddata-tessdata_fast-4.1.0 2246328 BLAKE2B 3c80d1e1d78bf2e98b7249991d29cf2e996ed91ab8cfe50d75714f146762ad923d4f7a63c15ebc275c8dd3f097a7b4c53a161970a339d27d6b5eb205a3c4342f SHA512 af4618180cfc7e51b7febafff8175e1d3eb29131306e892466e6a18156d3c4b762cb944ab01d17f959087959a00c1c241c33456fa1cf1ae34a37593b1ccc407d
DIST guj.traineddata-tessdata_fast-4.0.0 1418394 BLAKE2B 5e71fb762ebbbeadabd8c08db42223d0003cb80a0b9b1534b5ac4c976e3ea23cb83776298e7dd1e9bada48e65d8c5442a4c25177acb86c496258729e61270bc9 SHA512 715fcd16ff70862a8cbdc027233e53b66d1dc0c274abc4835c7e3125649459f6206aed0fd150ef06e30587322015f0a23e263f9cf7a676e001f22d8e396d9541
+DIST guj.traineddata-tessdata_fast-4.1.0 1418394 BLAKE2B 5e71fb762ebbbeadabd8c08db42223d0003cb80a0b9b1534b5ac4c976e3ea23cb83776298e7dd1e9bada48e65d8c5442a4c25177acb86c496258729e61270bc9 SHA512 715fcd16ff70862a8cbdc027233e53b66d1dc0c274abc4835c7e3125649459f6206aed0fd150ef06e30587322015f0a23e263f9cf7a676e001f22d8e396d9541
DIST hat.traineddata-tessdata_fast-4.0.0 1976902 BLAKE2B 0885a56474eeb61ca4b179e23e33094b9f70896109ceb88ac91c23cf712c267ccd25fd62ec9b517e7198ecd06672dca6858abfe9c5f77827e09961057de4cb43 SHA512 0ea89d2b3d65a644b420b7453725b272121a31469d87c39ad44f43ddf8d9532a4a8b44ae7e1ea794ca26cd95f4818f223ea9ec9d70300e850940017ae843a109
+DIST hat.traineddata-tessdata_fast-4.1.0 1976902 BLAKE2B 0885a56474eeb61ca4b179e23e33094b9f70896109ceb88ac91c23cf712c267ccd25fd62ec9b517e7198ecd06672dca6858abfe9c5f77827e09961057de4cb43 SHA512 0ea89d2b3d65a644b420b7453725b272121a31469d87c39ad44f43ddf8d9532a4a8b44ae7e1ea794ca26cd95f4818f223ea9ec9d70300e850940017ae843a109
DIST heb.traineddata-tessdata_fast-4.0.0 961404 BLAKE2B 2fc743a316467b3f6930e606613015c2cffbf055eff3d0fc925fb93040145662ae39a5fb557a2a7e2b5a8ff16a9d7688bdc3af955467283ebdf1a5d5caa6366b SHA512 337dfa44bdd5183af58479fe49423d556ed178424afc898bf957b6c7598ef56c60b075b40e2ea176bf5b92c2c6525fff76f7379e418b50717588a18aea30728d
+DIST heb.traineddata-tessdata_fast-4.1.0 961404 BLAKE2B 2fc743a316467b3f6930e606613015c2cffbf055eff3d0fc925fb93040145662ae39a5fb557a2a7e2b5a8ff16a9d7688bdc3af955467283ebdf1a5d5caa6366b SHA512 337dfa44bdd5183af58479fe49423d556ed178424afc898bf957b6c7598ef56c60b075b40e2ea176bf5b92c2c6525fff76f7379e418b50717588a18aea30728d
DIST hin.traineddata-tessdata_fast-4.0.0 1122751 BLAKE2B 403c52eacfc24937208f8e57383d9f974b88c8f76d4ff791af296c6b3eb793cfacadf33b39c7d770b87aeaa549a50eeda8f57f25c952540a4341152a3050f827 SHA512 7aa080bca73ecbfabc8521dd86a5f4f3130547e78f78e6bfa840a2d670621f74d8c684e7cb76c2eb82e05fd05d8e21239a00f004d7337c9e788d6442d4fbd8ec
+DIST hin.traineddata-tessdata_fast-4.1.0 1122751 BLAKE2B 403c52eacfc24937208f8e57383d9f974b88c8f76d4ff791af296c6b3eb793cfacadf33b39c7d770b87aeaa549a50eeda8f57f25c952540a4341152a3050f827 SHA512 7aa080bca73ecbfabc8521dd86a5f4f3130547e78f78e6bfa840a2d670621f74d8c684e7cb76c2eb82e05fd05d8e21239a00f004d7337c9e788d6442d4fbd8ec
DIST hrv.traineddata-tessdata_fast-4.0.0 4103348 BLAKE2B 6259795ec4a7a3da6d1730dcd7c1cdf79ce2f2056edf01deb03a604630b28951d6d228879d18e0681e9df67f66961c4d31360c61a419609f6c991c4e55aacd1a SHA512 85725aaa67063cc2a8ff45f8f14f4b8c7de73582857e3c460658b667f5fec8477ff87d9607bc073f141c525e0fa35a773d032b15ff165538af1eb038a10969ff
+DIST hrv.traineddata-tessdata_fast-4.1.0 4103348 BLAKE2B 6259795ec4a7a3da6d1730dcd7c1cdf79ce2f2056edf01deb03a604630b28951d6d228879d18e0681e9df67f66961c4d31360c61a419609f6c991c4e55aacd1a SHA512 85725aaa67063cc2a8ff45f8f14f4b8c7de73582857e3c460658b667f5fec8477ff87d9607bc073f141c525e0fa35a773d032b15ff165538af1eb038a10969ff
DIST hun.traineddata-tessdata_fast-4.0.0 5296273 BLAKE2B 8335769bc1172e8a2de38d732be4d448ac66c27ad3fd0d819e387435996cf4b67061e6e61a702f3f04b49a66a85e12371342e14e55ad03bcc7b2649229ad087c SHA512 76b39f5d0947f4b5ba11d5590af42d01f69c28f5ae5e3ba9622a4a8dd8ceec9a8e5e7c770e8a80e1c70dffaed999c0cdd97a85bcbf0c9c2458de647935d4ea93
+DIST hun.traineddata-tessdata_fast-4.1.0 5296273 BLAKE2B 8335769bc1172e8a2de38d732be4d448ac66c27ad3fd0d819e387435996cf4b67061e6e61a702f3f04b49a66a85e12371342e14e55ad03bcc7b2649229ad087c SHA512 76b39f5d0947f4b5ba11d5590af42d01f69c28f5ae5e3ba9622a4a8dd8ceec9a8e5e7c770e8a80e1c70dffaed999c0cdd97a85bcbf0c9c2458de647935d4ea93
DIST hye.traineddata-tessdata_fast-4.0.0 3463717 BLAKE2B b0bb21d341e311314dcef4d791f2285fcd740f214d18c7450c7854dfc15a5f87b337f0979f74be30546009dc7cb40a17cd07adbe75472823909cec6b527cf6a6 SHA512 2b5975c14a0b7cc619376b9f9496f10d2658ecb9dd17b13411114bdd45c9c6192d8832a93dcbaec47d7448fc3031e80452d2aec2eedc5b69c82fd485eb86f4ed
+DIST hye.traineddata-tessdata_fast-4.1.0 3463717 BLAKE2B b0bb21d341e311314dcef4d791f2285fcd740f214d18c7450c7854dfc15a5f87b337f0979f74be30546009dc7cb40a17cd07adbe75472823909cec6b527cf6a6 SHA512 2b5975c14a0b7cc619376b9f9496f10d2658ecb9dd17b13411114bdd45c9c6192d8832a93dcbaec47d7448fc3031e80452d2aec2eedc5b69c82fd485eb86f4ed
DIST iku.traineddata-tessdata_fast-4.0.0 2802266 BLAKE2B 2a2ab57f047b2d6070ba576cd1f24290eaff51a38cba01ba4c0a73a81290aaf3f639628ddc34a7b3cfd4b520bf9c0c4912ab35ee889c6b3d687ff320c0d587e7 SHA512 914e906f05c4ebe2e80dda4ed6084f4019e8abc695fe300424ffe89d89471a9b37ee74e373140408ac1e3d92f8d083de478bbbbe44469d5874f552975db910d3
+DIST iku.traineddata-tessdata_fast-4.1.0 2802266 BLAKE2B 2a2ab57f047b2d6070ba576cd1f24290eaff51a38cba01ba4c0a73a81290aaf3f639628ddc34a7b3cfd4b520bf9c0c4912ab35ee889c6b3d687ff320c0d587e7 SHA512 914e906f05c4ebe2e80dda4ed6084f4019e8abc695fe300424ffe89d89471a9b37ee74e373140408ac1e3d92f8d083de478bbbbe44469d5874f552975db910d3
DIST ind.traineddata-tessdata_fast-4.0.0 1122661 BLAKE2B 291abfa5c950d1a5d624eff64e3ff75c78d4957e3419f6d2de98d3c9078fc3a872cb85d0bd1daedb9c5317de5c1d0f0bcb238f34fe1d1bc0d769fc77e609ddf0 SHA512 0822c54a8e77b851653b64eb0d781fbeb87293774800c03ddb0fe4c8af8c824b171263b31a5fe5c6ad0ede84f1ea163ea4cc28505dfa3fcddaffc5e1c0530db8
+DIST ind.traineddata-tessdata_fast-4.1.0 1122661 BLAKE2B 291abfa5c950d1a5d624eff64e3ff75c78d4957e3419f6d2de98d3c9078fc3a872cb85d0bd1daedb9c5317de5c1d0f0bcb238f34fe1d1bc0d769fc77e609ddf0 SHA512 0822c54a8e77b851653b64eb0d781fbeb87293774800c03ddb0fe4c8af8c824b171263b31a5fe5c6ad0ede84f1ea163ea4cc28505dfa3fcddaffc5e1c0530db8
DIST isl.traineddata-tessdata_fast-4.0.0 2278973 BLAKE2B 79bd2e2400c8d1b6d72a03cb6199a19252c1148bb53cfa1760fbea9a2bc29b02bb974abda121179b40b0766d2564d33d263a8cc66c123bc334093809dfe327e0 SHA512 4e276e7cccb1d202b2d8330e136dd7cea0c9bc299d76362ee5c91ec284f79cf485087fa0bfa148b0ea145c13964b6caf2b0dbc84bba32f9abc1091ddce1ade6b
+DIST isl.traineddata-tessdata_fast-4.1.0 2278973 BLAKE2B 79bd2e2400c8d1b6d72a03cb6199a19252c1148bb53cfa1760fbea9a2bc29b02bb974abda121179b40b0766d2564d33d263a8cc66c123bc334093809dfe327e0 SHA512 4e276e7cccb1d202b2d8330e136dd7cea0c9bc299d76362ee5c91ec284f79cf485087fa0bfa148b0ea145c13964b6caf2b0dbc84bba32f9abc1091ddce1ade6b
DIST ita.traineddata-tessdata_fast-4.0.0 2701314 BLAKE2B bed6a28d3e8f62f98ca22ac53e743f3976834c53e4e55f095c0ed01a47fb074a59ce2ad6380927c943c17acc3c203e5c72cf2e9282e47a996f9254505817b3ba SHA512 40c9e15d4f57f911132169d0e6eb84db32a5a2dcbeefdc3c42247927c669400ba02cc0c9dd8e0a40d61fe833cb1e749e8626395f022b67856013ff5d32258e65
+DIST ita.traineddata-tessdata_fast-4.1.0 2701314 BLAKE2B bed6a28d3e8f62f98ca22ac53e743f3976834c53e4e55f095c0ed01a47fb074a59ce2ad6380927c943c17acc3c203e5c72cf2e9282e47a996f9254505817b3ba SHA512 40c9e15d4f57f911132169d0e6eb84db32a5a2dcbeefdc3c42247927c669400ba02cc0c9dd8e0a40d61fe833cb1e749e8626395f022b67856013ff5d32258e65
DIST ita_old.traineddata-tessdata_fast-4.0.0 3286123 BLAKE2B 4d0e719af193377e0a46f3b1219db22925dc821194aa457500ddd60775a2c146a075a8ca16c4996ad93442c1059c3ef09de7110c37ac7645dda499608d2f5777 SHA512 0d65e0b06ef93dc189deb9f7ff8618a20fb38bc2125e1d49333580f45aafde7562a8ab8453ce9aadffe073f2d3f28a6fded0aa1141eaa3586c54ca7829d8262d
+DIST ita_old.traineddata-tessdata_fast-4.1.0 3286123 BLAKE2B 4d0e719af193377e0a46f3b1219db22925dc821194aa457500ddd60775a2c146a075a8ca16c4996ad93442c1059c3ef09de7110c37ac7645dda499608d2f5777 SHA512 0d65e0b06ef93dc189deb9f7ff8618a20fb38bc2125e1d49333580f45aafde7562a8ab8453ce9aadffe073f2d3f28a6fded0aa1141eaa3586c54ca7829d8262d
DIST jav.traineddata-tessdata_fast-4.0.0 2982741 BLAKE2B 613dda2951f78360a05ef285094f6e569007613ae7fe52a3d3126d752839402c7e3dd2c1a5c8f4b94a468985ef72e3d6b26fd462202d86f889aa5d3d11809ce3 SHA512 3d6a9989eefa2ad5331e1f0fd423c555aa8871acf30ad5e22aad2216db8f0f90603cb0c38d8eeb0051bbe1f6d28001bc134310b6bac877aff5f9a68667482803
+DIST jav.traineddata-tessdata_fast-4.1.0 2982741 BLAKE2B 613dda2951f78360a05ef285094f6e569007613ae7fe52a3d3126d752839402c7e3dd2c1a5c8f4b94a468985ef72e3d6b26fd462202d86f889aa5d3d11809ce3 SHA512 3d6a9989eefa2ad5331e1f0fd423c555aa8871acf30ad5e22aad2216db8f0f90603cb0c38d8eeb0051bbe1f6d28001bc134310b6bac877aff5f9a68667482803
DIST jpn.traineddata-tessdata_fast-4.0.0 2471260 BLAKE2B 20359dc1025cf3b08374c3e3f878b59569db926bd26b323f1f0fd6183ae46a9560ad49e2529ccbf868422aae841e37f47d108f64e928822541b08e77a00c95f9 SHA512 db7f78e17ac2618d2a99cc191a8ce5075f1d30ac2eb2f23760aa5671cf88dbc7e37299a0680756c2f41da0ddb47ee34ff3df70d428c7c2d5da235aa6bdd3fda2
+DIST jpn.traineddata-tessdata_fast-4.1.0 2471260 BLAKE2B 20359dc1025cf3b08374c3e3f878b59569db926bd26b323f1f0fd6183ae46a9560ad49e2529ccbf868422aae841e37f47d108f64e928822541b08e77a00c95f9 SHA512 db7f78e17ac2618d2a99cc191a8ce5075f1d30ac2eb2f23760aa5671cf88dbc7e37299a0680756c2f41da0ddb47ee34ff3df70d428c7c2d5da235aa6bdd3fda2
DIST jpn_vert.traineddata-tessdata_fast-4.0.0 3037480 BLAKE2B 730654349c325be01917f7cacf51e7a6b264844c37785c7c5ec160ab0d1939164ed431a73d3627cb76ea26f1011e5ee00ff2e3a526de8d25490fb353232478af SHA512 9ef76f29f4a763b1bec134c247c2943380bbf7d6ede007590e38af240daf9662c6eee7d7e47306b32009fbfd2b0340a1d39e6becaf4452461cb0791aa8c5defc
+DIST jpn_vert.traineddata-tessdata_fast-4.1.0 3037480 BLAKE2B 730654349c325be01917f7cacf51e7a6b264844c37785c7c5ec160ab0d1939164ed431a73d3627cb76ea26f1011e5ee00ff2e3a526de8d25490fb353232478af SHA512 9ef76f29f4a763b1bec134c247c2943380bbf7d6ede007590e38af240daf9662c6eee7d7e47306b32009fbfd2b0340a1d39e6becaf4452461cb0791aa8c5defc
DIST kan.traineddata-tessdata_fast-4.0.0 3608331 BLAKE2B 27d0f068f6b0cb6e035ab294bbaadb4a74fb18a76a8acb8e34d080580129cd852ad738fd9d0a299bd196dcd46b2256c8e8dcbff0ccd48b10b4502b8128e33486 SHA512 162bd3427f5b8a371570a3ca25f63b01981d0bb738ddf0b24bccf2b6eb4fe8912c301436c381dfcc5e355e5d3d6a59de11f0b9561d8f7d61adf1c7f0115b3ca0
+DIST kan.traineddata-tessdata_fast-4.1.0 3608331 BLAKE2B 27d0f068f6b0cb6e035ab294bbaadb4a74fb18a76a8acb8e34d080580129cd852ad738fd9d0a299bd196dcd46b2256c8e8dcbff0ccd48b10b4502b8128e33486 SHA512 162bd3427f5b8a371570a3ca25f63b01981d0bb738ddf0b24bccf2b6eb4fe8912c301436c381dfcc5e355e5d3d6a59de11f0b9561d8f7d61adf1c7f0115b3ca0
DIST kat.traineddata-tessdata_fast-4.0.0 2524769 BLAKE2B 259e97a041885253b60c316bdbac239b5d3e1bcb61aacab24a8a256c9d7ea2dfc8553892a39fc15bbcd97e4644a35f1044267e1c9ccd8a94325f629df27bc095 SHA512 ba6c0bc91618813a2e96807377a0e13c0eb85a4bc7dc225a1eee96bbb53a109cfbe4e7fb81a4ff4b5ee54e336cf7509e9dd68ffa5ce0349729ff39d982caa583
+DIST kat.traineddata-tessdata_fast-4.1.0 2524769 BLAKE2B 259e97a041885253b60c316bdbac239b5d3e1bcb61aacab24a8a256c9d7ea2dfc8553892a39fc15bbcd97e4644a35f1044267e1c9ccd8a94325f629df27bc095 SHA512 ba6c0bc91618813a2e96807377a0e13c0eb85a4bc7dc225a1eee96bbb53a109cfbe4e7fb81a4ff4b5ee54e336cf7509e9dd68ffa5ce0349729ff39d982caa583
DIST kat_old.traineddata-tessdata_fast-4.0.0 423167 BLAKE2B eb407b48c2b0daa6c986f22338780c14108db034ed2405a4dbc4302e518c0fee6878748f6ad8b62cd44bdf8123ee92d468cee3e3c6ec561751e797f36abd5629 SHA512 2f0d731ce33d926ad67cd0553aa90f0562be7abffde67c689b683e2bd8eb7cbe3a25e36b1ddb26d618e0a46da4323f9cd195522308cf1cf20ab737abc1013c93
+DIST kat_old.traineddata-tessdata_fast-4.1.0 423167 BLAKE2B eb407b48c2b0daa6c986f22338780c14108db034ed2405a4dbc4302e518c0fee6878748f6ad8b62cd44bdf8123ee92d468cee3e3c6ec561751e797f36abd5629 SHA512 2f0d731ce33d926ad67cd0553aa90f0562be7abffde67c689b683e2bd8eb7cbe3a25e36b1ddb26d618e0a46da4323f9cd195522308cf1cf20ab737abc1013c93
DIST kaz.traineddata-tessdata_fast-4.0.0 4734644 BLAKE2B ede0f1b3aac5bc8ace757b87cf73eca89c67dbff2e057632cabf45cf7ff87e36409883e5001853648e5e21456ed3c3b0464f5fe88be504894fbbded86e5613f4 SHA512 36b53fcb93d10f41c7cd36951feed877503e9614b32a8dcc4a3869f8882f449b312d27c021e07409c06e0a1a06e3af76be2a1b95e44a812f8cae6c38de8dad2e
+DIST kaz.traineddata-tessdata_fast-4.1.0 4734644 BLAKE2B ede0f1b3aac5bc8ace757b87cf73eca89c67dbff2e057632cabf45cf7ff87e36409883e5001853648e5e21456ed3c3b0464f5fe88be504894fbbded86e5613f4 SHA512 36b53fcb93d10f41c7cd36951feed877503e9614b32a8dcc4a3869f8882f449b312d27c021e07409c06e0a1a06e3af76be2a1b95e44a812f8cae6c38de8dad2e
DIST khm.traineddata-tessdata_fast-4.0.0 1446926 BLAKE2B a529a692fb7ea211a0f998a007062be2ef8a465ff1a073fe423ba960e80a28fc092259cd4bac1039022205f184e526adbf2f1c582432ed9c7cf2cbb389a888d8 SHA512 4d48b0e87e3d748f8e1ff028da0fdd4037ac202065e9bcb1ae3d3a19cc335fd54701ecfa231b8424d60ed2608cac46abdd0284ff4267894e1f0c13477a13fc41
+DIST khm.traineddata-tessdata_fast-4.1.0 1446926 BLAKE2B a529a692fb7ea211a0f998a007062be2ef8a465ff1a073fe423ba960e80a28fc092259cd4bac1039022205f184e526adbf2f1c582432ed9c7cf2cbb389a888d8 SHA512 4d48b0e87e3d748f8e1ff028da0fdd4037ac202065e9bcb1ae3d3a19cc335fd54701ecfa231b8424d60ed2608cac46abdd0284ff4267894e1f0c13477a13fc41
DIST kir.traineddata-tessdata_fast-4.0.0 9928497 BLAKE2B 49416bb9778e46edfc06e6323df6df7cf36aad0ea3328b136a9bcd294e60dd127c5ae2ffb0bb610891b8020f7f14048738b9ef50adb2c5c2aa2195554a6da76d SHA512 031eaf4f2abcd43234fdd1ba75fb7d5b2d6ca047c9dd4f59135b679bb1ba480001435f4f41fe00c523ea817e17dbf595edbac0576f0244b2445426d4f9e2e689
+DIST kir.traineddata-tessdata_fast-4.1.0 9928497 BLAKE2B 49416bb9778e46edfc06e6323df6df7cf36aad0ea3328b136a9bcd294e60dd127c5ae2ffb0bb610891b8020f7f14048738b9ef50adb2c5c2aa2195554a6da76d SHA512 031eaf4f2abcd43234fdd1ba75fb7d5b2d6ca047c9dd4f59135b679bb1ba480001435f4f41fe00c523ea817e17dbf595edbac0576f0244b2445426d4f9e2e689
DIST kmr.traineddata-tessdata_fast-4.0.0 3568615 BLAKE2B 4078f4d83c308d0294853de2862da1aea195134fcb7964caf7b83100bc17e35e31e1b600f64e42b6672f95a9fe93a64064210f7120ba1807f9fbb4585d0afed0 SHA512 91e8407c1dc2b659ad187d62d8c8db6e67b888866ea2cc3f08fc304ef7ba8db360233c009e35bb2805fb13d893c95132cb4931c93fbf81b25109e9fb8c7624ce
+DIST kmr.traineddata-tessdata_fast-4.1.0 3568615 BLAKE2B 4078f4d83c308d0294853de2862da1aea195134fcb7964caf7b83100bc17e35e31e1b600f64e42b6672f95a9fe93a64064210f7120ba1807f9fbb4585d0afed0 SHA512 91e8407c1dc2b659ad187d62d8c8db6e67b888866ea2cc3f08fc304ef7ba8db360233c009e35bb2805fb13d893c95132cb4931c93fbf81b25109e9fb8c7624ce
DIST kor.traineddata-tessdata_fast-4.0.0 1677415 BLAKE2B ee6ca7884bd6425c38b084ff6c919203ed0aab24e621bc40a7dd5cb7706043d6c8e53df9ee3a32fd18b53992a83f85f983adccf7b8a28e79843dc701ab5e9a7d SHA512 ca22e6229b66c3b614876275823a6582483d4701992975197ea5a29144b0b660dbf662a63552dd41bbd56a1c0e1ce5d50a68d69fdf0cda4948e87c92a0813b51
+DIST kor.traineddata-tessdata_fast-4.1.0 1677415 BLAKE2B ee6ca7884bd6425c38b084ff6c919203ed0aab24e621bc40a7dd5cb7706043d6c8e53df9ee3a32fd18b53992a83f85f983adccf7b8a28e79843dc701ab5e9a7d SHA512 ca22e6229b66c3b614876275823a6582483d4701992975197ea5a29144b0b660dbf662a63552dd41bbd56a1c0e1ce5d50a68d69fdf0cda4948e87c92a0813b51
DIST kor_vert.traineddata-tessdata_fast-4.0.0 1113715 BLAKE2B 9517d038076b1d954374177e5258849a51e5f25cb0b65f48c0a34454f149acddcadfceaebd31aefc69d393037944647fcfbe976afc23a31f45d900868a065e7f SHA512 9e3eaaba5102a4b8243683bae016afb5f7cb22000ab875df3120c22e722e1362704f3600e85a4c977fb5812b948d143a836f1aeeb104b37b61d5dac85b86c99f
+DIST kor_vert.traineddata-tessdata_fast-4.1.0 1113715 BLAKE2B 9517d038076b1d954374177e5258849a51e5f25cb0b65f48c0a34454f149acddcadfceaebd31aefc69d393037944647fcfbe976afc23a31f45d900868a065e7f SHA512 9e3eaaba5102a4b8243683bae016afb5f7cb22000ab875df3120c22e722e1362704f3600e85a4c977fb5812b948d143a836f1aeeb104b37b61d5dac85b86c99f
DIST lao.traineddata-tessdata_fast-4.0.0 6386744 BLAKE2B 437411c7d05abec9b5d8cc53eb9a51aedac6b61152bce2500890bfa10e8ea341a1e3ef4a062afc6abc907edbfa8dd6e0406a13010335c3779555ef9e3387b88f SHA512 938d976d5d1cc0abb9a039598d0d2fa7b324f92ae695a998fa1ce0c50cca1ccd1f204d70823011aa25b3b5facbe86abf20796aa2f0d0f9ebb6bc76e75c7f9427
+DIST lao.traineddata-tessdata_fast-4.1.0 6386744 BLAKE2B 437411c7d05abec9b5d8cc53eb9a51aedac6b61152bce2500890bfa10e8ea341a1e3ef4a062afc6abc907edbfa8dd6e0406a13010335c3779555ef9e3387b88f SHA512 938d976d5d1cc0abb9a039598d0d2fa7b324f92ae695a998fa1ce0c50cca1ccd1f204d70823011aa25b3b5facbe86abf20796aa2f0d0f9ebb6bc76e75c7f9427
DIST lat.traineddata-tessdata_fast-4.0.0 3187463 BLAKE2B 9b1fd6cd47ac041e9069ad747e8ab26b27bcf742e2fa57433fc3336fb1d74d44a4800133095aac9e34b34bb2cb267aba1c9bd5cdc3d69ac83b69114ce5556b00 SHA512 99c79cfddd0e497544cd184e93dff6282bb1d07025020f0076d4131f9f8355431e77e2dc6af676cb90ca39d484bef4b3e6ef37a86d194007f45a019542ab9d94
+DIST lat.traineddata-tessdata_fast-4.1.0 3187463 BLAKE2B 9b1fd6cd47ac041e9069ad747e8ab26b27bcf742e2fa57433fc3336fb1d74d44a4800133095aac9e34b34bb2cb267aba1c9bd5cdc3d69ac83b69114ce5556b00 SHA512 99c79cfddd0e497544cd184e93dff6282bb1d07025020f0076d4131f9f8355431e77e2dc6af676cb90ca39d484bef4b3e6ef37a86d194007f45a019542ab9d94
DIST lav.traineddata-tessdata_fast-4.0.0 2717247 BLAKE2B 11c7d19cff6c273b931ec771b8a445084854dc370d93aaf8edcdd325fc6e7b17df1c51eb9b3a4497bf81b29ae20693d7d933a9306eae28e480caadf374e1f2ca SHA512 cda428ed5a6ac3b4243222ca56f01d95f0b41d12c9b797ea9c1d6718b60206792638707b9c9653fcc5e15bb23244293fa437c036dba122764fe6456f56ead8c3
+DIST lav.traineddata-tessdata_fast-4.1.0 2717247 BLAKE2B 11c7d19cff6c273b931ec771b8a445084854dc370d93aaf8edcdd325fc6e7b17df1c51eb9b3a4497bf81b29ae20693d7d933a9306eae28e480caadf374e1f2ca SHA512 cda428ed5a6ac3b4243222ca56f01d95f0b41d12c9b797ea9c1d6718b60206792638707b9c9653fcc5e15bb23244293fa437c036dba122764fe6456f56ead8c3
DIST lit.traineddata-tessdata_fast-4.0.0 3154896 BLAKE2B 452af5355b4461e74bf371363248b2d1b5804711c6bda707ae1c66feabfab80ff8545954fb220b12d647c9be7d2d1762b82460af8cb5a856bc1099b142f835d6 SHA512 4b20e31086c4f08e424f678ce1b182a24d40deef732d7c355684acb7923e11db6ac3581213d673c970d5b24db2b63f896f7a849f714af6afa2354a65631a8018
+DIST lit.traineddata-tessdata_fast-4.1.0 3154896 BLAKE2B 452af5355b4461e74bf371363248b2d1b5804711c6bda707ae1c66feabfab80ff8545954fb220b12d647c9be7d2d1762b82460af8cb5a856bc1099b142f835d6 SHA512 4b20e31086c4f08e424f678ce1b182a24d40deef732d7c355684acb7923e11db6ac3581213d673c970d5b24db2b63f896f7a849f714af6afa2354a65631a8018
DIST ltz.traineddata-tessdata_fast-4.0.0 2606426 BLAKE2B 7c7f788b63cd6e06859c9e39385004d3b80ec3003b7053ee698525ecb00dc16d9fb13facaf98ac20ee7067a7fd634af690c6982ebffdf0f235574588556ff909 SHA512 30c8da2862c30be8c6c6b13bc9f2f16f2e5477ec6f9128759224ca6078b32904cfd6ed371e50f22567bbbe77e691e22c7487c9e9da55a3a06bd2ac03f0b50e21
+DIST ltz.traineddata-tessdata_fast-4.1.0 2606426 BLAKE2B 7c7f788b63cd6e06859c9e39385004d3b80ec3003b7053ee698525ecb00dc16d9fb13facaf98ac20ee7067a7fd634af690c6982ebffdf0f235574588556ff909 SHA512 30c8da2862c30be8c6c6b13bc9f2f16f2e5477ec6f9128759224ca6078b32904cfd6ed371e50f22567bbbe77e691e22c7487c9e9da55a3a06bd2ac03f0b50e21
DIST mal.traineddata-tessdata_fast-4.0.0 5275996 BLAKE2B 8c4bef2de31709188457f2783ccdc68da35bbc64a4610f4561e2a7ea0d0e4323d42d3862541bf9ef720576d11c09b26200b7434a3541867287b04c9d502cfbec SHA512 66d8396f59b36f1d73ed497d50ef237cfa868707d8c52d6bfbe3f3467417fc971b225f5abf53918a04843e5336423c91254f31bbe2b387863120e08ff99e63b4
+DIST mal.traineddata-tessdata_fast-4.1.0 5275996 BLAKE2B 8c4bef2de31709188457f2783ccdc68da35bbc64a4610f4561e2a7ea0d0e4323d42d3862541bf9ef720576d11c09b26200b7434a3541867287b04c9d502cfbec SHA512 66d8396f59b36f1d73ed497d50ef237cfa868707d8c52d6bfbe3f3467417fc971b225f5abf53918a04843e5336423c91254f31bbe2b387863120e08ff99e63b4
DIST mar.traineddata-tessdata_fast-4.0.0 2118233 BLAKE2B 250a4d9644a09c2e9ba1fe3db5b6353d842af5904fd3aaf0af10785d733cbbf8cd4f44a4d8adce38ec27c8d30a3edf322a39358b1b6ef8b46a1942e733c0e315 SHA512 d7a8f138cfc50d6a43f4cbec1cc807d4d76d40d3a68401b39373a0fe0447c788bb054eed602e58325773cd8c044b3c314bdf896d9c3c5a3a0e14f1132a18e331
+DIST mar.traineddata-tessdata_fast-4.1.0 2118233 BLAKE2B 250a4d9644a09c2e9ba1fe3db5b6353d842af5904fd3aaf0af10785d733cbbf8cd4f44a4d8adce38ec27c8d30a3edf322a39358b1b6ef8b46a1942e733c0e315 SHA512 d7a8f138cfc50d6a43f4cbec1cc807d4d76d40d3a68401b39373a0fe0447c788bb054eed602e58325773cd8c044b3c314bdf896d9c3c5a3a0e14f1132a18e331
DIST mkd.traineddata-tessdata_fast-4.0.0 1600188 BLAKE2B 6a828b56bbdf84b03716577a329a89c40ba44162471322c9fcf08651b526979d3c22b8b7a6f30c9ae8736938df6adc8d583db16279b72041a04ac89c0cdc953a SHA512 1c588acc96cd031c1c445f17f9aa1d63ebd15ac28798dbcd539c5d2ab7b1eaa12115920ebcf5c003cfd5b2b6534f692815c74c8bc0eba8fbef193a97ec1b3150
+DIST mkd.traineddata-tessdata_fast-4.1.0 1600188 BLAKE2B 6a828b56bbdf84b03716577a329a89c40ba44162471322c9fcf08651b526979d3c22b8b7a6f30c9ae8736938df6adc8d583db16279b72041a04ac89c0cdc953a SHA512 1c588acc96cd031c1c445f17f9aa1d63ebd15ac28798dbcd539c5d2ab7b1eaa12115920ebcf5c003cfd5b2b6534f692815c74c8bc0eba8fbef193a97ec1b3150
DIST mlt.traineddata-tessdata_fast-4.0.0 2308796 BLAKE2B 59d9dc5efe3d533885273392dcfae66bfac07987052e434643eadbe16fce3f5b149b8e70617d5485f509dc3976636200984bf1da56201ca886922770913d63a7 SHA512 8cc864c4a2e56863509fd37c995d53e9ef65f25c7fffc3ca767e1b5238c761ec22c5e44a16813b54ce14c08336bdaa93856f694c7cb5616a5c2b011ad061c967
+DIST mlt.traineddata-tessdata_fast-4.1.0 2308796 BLAKE2B 59d9dc5efe3d533885273392dcfae66bfac07987052e434643eadbe16fce3f5b149b8e70617d5485f509dc3976636200984bf1da56201ca886922770913d63a7 SHA512 8cc864c4a2e56863509fd37c995d53e9ef65f25c7fffc3ca767e1b5238c761ec22c5e44a16813b54ce14c08336bdaa93856f694c7cb5616a5c2b011ad061c967
DIST mon.traineddata-tessdata_fast-4.0.0 2137042 BLAKE2B 0ee7f4f2e56527bea8a1f777aebf1f2503ecaa336b2f3c1e4f63c536c5c44fefe668baba3c856857b5a92fd5bc7adca8c77afc8fd163826e6c8f8a7086e7bb99 SHA512 1faad826b8c270a2ccb77b25da707c38a471338f9beb3c37cd1778715dcd6a04a162875df04d44dec832168930e268dcd4479350170b88296ddffada315e14e3
+DIST mon.traineddata-tessdata_fast-4.1.0 2137042 BLAKE2B 0ee7f4f2e56527bea8a1f777aebf1f2503ecaa336b2f3c1e4f63c536c5c44fefe668baba3c856857b5a92fd5bc7adca8c77afc8fd163826e6c8f8a7086e7bb99 SHA512 1faad826b8c270a2ccb77b25da707c38a471338f9beb3c37cd1778715dcd6a04a162875df04d44dec832168930e268dcd4479350170b88296ddffada315e14e3
DIST mri.traineddata-tessdata_fast-4.0.0 862973 BLAKE2B c98d780a03d14bbb06ac42339b4d65692bc25154fcad265e06ea0aec45b79b3ae8edaa4cb8f914c1756348b2d99f68979f68ac6f54d2d301df9f0eacc8f2ec42 SHA512 bcd8ffc0760fe53d94e4b1fc403799ab0507c0886808e37c6d8d8a891f06efc9206e953efb40bdfcc8ea334c85cda23525fc0d22977ab141ee19aae06ec10cf3
+DIST mri.traineddata-tessdata_fast-4.1.0 862973 BLAKE2B c98d780a03d14bbb06ac42339b4d65692bc25154fcad265e06ea0aec45b79b3ae8edaa4cb8f914c1756348b2d99f68979f68ac6f54d2d301df9f0eacc8f2ec42 SHA512 bcd8ffc0760fe53d94e4b1fc403799ab0507c0886808e37c6d8d8a891f06efc9206e953efb40bdfcc8ea334c85cda23525fc0d22977ab141ee19aae06ec10cf3
DIST msa.traineddata-tessdata_fast-4.0.0 1747801 BLAKE2B fddab2c54eee56e41abcb24fc8bf5513759e41493e5e912b368779056b4a6686c00357c277d3f726d25b694430ceaf2ccefc4dad035f499cbd43669bd8debe32 SHA512 dfb23a8a8da2702be188265bf23f4628ab8d407cd57e096d8910ef7ddc90b3877f4c88c1179cb2ede70aa943ceb2934fd69d411cc04d99420d04040b7e1bc0a1
+DIST msa.traineddata-tessdata_fast-4.1.0 1747801 BLAKE2B fddab2c54eee56e41abcb24fc8bf5513759e41493e5e912b368779056b4a6686c00357c277d3f726d25b694430ceaf2ccefc4dad035f499cbd43669bd8debe32 SHA512 dfb23a8a8da2702be188265bf23f4628ab8d407cd57e096d8910ef7ddc90b3877f4c88c1179cb2ede70aa943ceb2934fd69d411cc04d99420d04040b7e1bc0a1
DIST mya.traineddata-tessdata_fast-4.0.0 4640561 BLAKE2B 3c2f46ff0e625e1462222cd2a2f0299571c65e4694a00d7797a86e69bc274871dba2eb3e259371ce419d4b31ae32e316cd3bbe6912ff47ebdaf48041674d45af SHA512 b530e32ba44bd9aa3d9557610a12a8d66b3b0895334e3360e6f1580ed4b3bdca03c148fe79080b23cfe9a700e8fc58480331cb1c04e8e7e5564d65451be5f02d
+DIST mya.traineddata-tessdata_fast-4.1.0 4640561 BLAKE2B 3c2f46ff0e625e1462222cd2a2f0299571c65e4694a00d7797a86e69bc274871dba2eb3e259371ce419d4b31ae32e316cd3bbe6912ff47ebdaf48041674d45af SHA512 b530e32ba44bd9aa3d9557610a12a8d66b3b0895334e3360e6f1580ed4b3bdca03c148fe79080b23cfe9a700e8fc58480331cb1c04e8e7e5564d65451be5f02d
DIST nep.traineddata-tessdata_fast-4.0.0 1002911 BLAKE2B 2b7d81f85eb5f476f60f9ea6470be0b81c030d2126bdd99110de8c4f2190238c7a5e576d0bf79a47221a196b5fcd411f71f42bbb260b781c869f03a648f89f1d SHA512 2f794299e4054ef4b251c44d3b96d8b7db7ddca90a3bae8a566ce6687fd30bc6b7125b06b58322c092ef714b9ab367e2a55234cbf08cbe3cf89078eba4706409
+DIST nep.traineddata-tessdata_fast-4.1.0 1002911 BLAKE2B 2b7d81f85eb5f476f60f9ea6470be0b81c030d2126bdd99110de8c4f2190238c7a5e576d0bf79a47221a196b5fcd411f71f42bbb260b781c869f03a648f89f1d SHA512 2f794299e4054ef4b251c44d3b96d8b7db7ddca90a3bae8a566ce6687fd30bc6b7125b06b58322c092ef714b9ab367e2a55234cbf08cbe3cf89078eba4706409
DIST nld.traineddata-tessdata_fast-4.0.0 6050296 BLAKE2B f5b967f26c5e6f50047470e8c1f1903d505db34d9d0e5fb7450ce9ff39a13d41c16de521224fe68ebe6fd82ccb99ca4584b373e1d2c0684704862601eec1ee5f SHA512 ce1c8ef25bcc5321a65e6612caf2653248c1febb4bd10a18fb327cfc5deba9a59e5618c8316d5e171ca6fc00d1c7b4a898b34671476ed26a49c2e0eea1788409
+DIST nld.traineddata-tessdata_fast-4.1.0 6050296 BLAKE2B f5b967f26c5e6f50047470e8c1f1903d505db34d9d0e5fb7450ce9ff39a13d41c16de521224fe68ebe6fd82ccb99ca4584b373e1d2c0684704862601eec1ee5f SHA512 ce1c8ef25bcc5321a65e6612caf2653248c1febb4bd10a18fb327cfc5deba9a59e5618c8316d5e171ca6fc00d1c7b4a898b34671476ed26a49c2e0eea1788409
DIST nor.traineddata-tessdata_fast-4.0.0 3610079 BLAKE2B 295e547ed4866e47a9135c714479525e4076171870ee171e80bb3281e6eb6db9e1d4e47e4926b1a73bf2818dd4afe27ba7c84fab2a8159bc57ecbac18f0aa09d SHA512 6781645a2a70e259ef18be071b771c6b13849c1ff7aef6b452e8a93ca35e8b8010196731729b8a29e9622eaea2dbede0d1f5d12ce267a43721e8fe83d02efba8
+DIST nor.traineddata-tessdata_fast-4.1.0 3610079 BLAKE2B 295e547ed4866e47a9135c714479525e4076171870ee171e80bb3281e6eb6db9e1d4e47e4926b1a73bf2818dd4afe27ba7c84fab2a8159bc57ecbac18f0aa09d SHA512 6781645a2a70e259ef18be071b771c6b13849c1ff7aef6b452e8a93ca35e8b8010196731729b8a29e9622eaea2dbede0d1f5d12ce267a43721e8fe83d02efba8
DIST oci.traineddata-tessdata_fast-4.0.0 6322087 BLAKE2B 2bde0d3f8ce2661d4984ba4558cdfa4339b7bf8e2108abce38f9777eca2c6a6f00d707c85312cc319172cba11c73faaaa2168f6990e9c2a2fdb53cad8d22fc3d SHA512 e942352dda42905367a5ec2207c08fb7ff0371e8f4fbc7883c77277ace0973602ead0c1a31eb943388e8beb609cec1cb4d7daf6a23c15360a04e59a8e8effeb7
+DIST oci.traineddata-tessdata_fast-4.1.0 6322087 BLAKE2B 2bde0d3f8ce2661d4984ba4558cdfa4339b7bf8e2108abce38f9777eca2c6a6f00d707c85312cc319172cba11c73faaaa2168f6990e9c2a2fdb53cad8d22fc3d SHA512 e942352dda42905367a5ec2207c08fb7ff0371e8f4fbc7883c77277ace0973602ead0c1a31eb943388e8beb609cec1cb4d7daf6a23c15360a04e59a8e8effeb7
DIST ori.traineddata-tessdata_fast-4.0.0 1480066 BLAKE2B 4089720e159c1e41daf49c38b37f013c6c156be84316eccd7b6e26a18a36ac4fb3f00eb0a4498b718535154cf90da0a2344517c39fdb5f4cf66fb29d81054d64 SHA512 e6b152cf56d42aadee4930da7f94766ea69c195ddae86ddb43bc23be21def0dd2d9126dbdf554b09f49c1224e1a9e55818ab43ae647c7398ecdabc008405ef27
+DIST ori.traineddata-tessdata_fast-4.1.0 1480066 BLAKE2B 4089720e159c1e41daf49c38b37f013c6c156be84316eccd7b6e26a18a36ac4fb3f00eb0a4498b718535154cf90da0a2344517c39fdb5f4cf66fb29d81054d64 SHA512 e6b152cf56d42aadee4930da7f94766ea69c195ddae86ddb43bc23be21def0dd2d9126dbdf554b09f49c1224e1a9e55818ab43ae647c7398ecdabc008405ef27
DIST osd.traineddata-tessdata_fast-4.0.0 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
+DIST osd.traineddata-tessdata_fast-4.1.0 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
DIST pan.traineddata-tessdata_fast-4.0.0 497721 BLAKE2B 6a17f91bb316971c937740ba897e226859f12841559e36c2f602de51177e3509575b0e521ddf3f5484b9626057a0b04d20f38c0a5762c09e17b1d51b939e477b SHA512 fa2071a7449fd52c94a0adf87ee0ed96b5750137a7cdba3d3869a987e632b9507b24413e786f870b81fdbb5fec8e4f148a3aa72e384ff0145e486b2fc4ccd654
+DIST pan.traineddata-tessdata_fast-4.1.0 497721 BLAKE2B 6a17f91bb316971c937740ba897e226859f12841559e36c2f602de51177e3509575b0e521ddf3f5484b9626057a0b04d20f38c0a5762c09e17b1d51b939e477b SHA512 fa2071a7449fd52c94a0adf87ee0ed96b5750137a7cdba3d3869a987e632b9507b24413e786f870b81fdbb5fec8e4f148a3aa72e384ff0145e486b2fc4ccd654
DIST pol.traineddata-tessdata_fast-4.0.0 4765518 BLAKE2B 26110b7317ec6d58ceb79f0e8f9484054e2cfedf43398f913c34145cd9a3931507e411d87bc9734f71f321532561900dc8ff6427d00fb246c6842213bc59d5c3 SHA512 bf4295bef318048712ea0c09e199468d136aeb6b7a919053324f628d05efdc132df7ca8439cc501e9a8950b6a5c4de7ba7327db00deb70923d94daf8fb942a43
+DIST pol.traineddata-tessdata_fast-4.1.0 4765518 BLAKE2B 26110b7317ec6d58ceb79f0e8f9484054e2cfedf43398f913c34145cd9a3931507e411d87bc9734f71f321532561900dc8ff6427d00fb246c6842213bc59d5c3 SHA512 bf4295bef318048712ea0c09e199468d136aeb6b7a919053324f628d05efdc132df7ca8439cc501e9a8950b6a5c4de7ba7327db00deb70923d94daf8fb942a43
DIST por.traineddata-tessdata_fast-4.0.0 1982756 BLAKE2B 1297243d455f96fb6d738e2657dc6bed39223519556dae707156ffd208067b0ea56efea00e00c841f8355b534539f510e76ac7157931b9ca7624233563ea89e3 SHA512 b51776a7e20d12e11439a33f591ad41cfa9d25aee36d8503b2189eceb5c1bfbc20cc75af362141ad75bbff3d49b7e60dbb777f9904922d62612cdde30945ebd5
+DIST por.traineddata-tessdata_fast-4.1.0 1982756 BLAKE2B 1297243d455f96fb6d738e2657dc6bed39223519556dae707156ffd208067b0ea56efea00e00c841f8355b534539f510e76ac7157931b9ca7624233563ea89e3 SHA512 b51776a7e20d12e11439a33f591ad41cfa9d25aee36d8503b2189eceb5c1bfbc20cc75af362141ad75bbff3d49b7e60dbb777f9904922d62612cdde30945ebd5
DIST pus.traineddata-tessdata_fast-4.0.0 1772087 BLAKE2B 7d25782bb1c58b6f205227a6f555316b4da823bb388fcc10a87f811220364a38014288830ba2dd2c04a0e2706cd551e1ab9a245cb226300cbff2de08f4f0c0ba SHA512 db1543a0bedd85bdca96289cfe72e4048c42a0913b66a558cd952d8ea47acc5b3c280f57a1c909c57c427c6737162e7d39c19c60ffbfb48fcb0a7bbb4f3d53a6
+DIST pus.traineddata-tessdata_fast-4.1.0 1772087 BLAKE2B 7d25782bb1c58b6f205227a6f555316b4da823bb388fcc10a87f811220364a38014288830ba2dd2c04a0e2706cd551e1ab9a245cb226300cbff2de08f4f0c0ba SHA512 db1543a0bedd85bdca96289cfe72e4048c42a0913b66a558cd952d8ea47acc5b3c280f57a1c909c57c427c6737162e7d39c19c60ffbfb48fcb0a7bbb4f3d53a6
DIST que.traineddata-tessdata_fast-4.0.0 5026336 BLAKE2B 4d7d559e241054d3a91b669b8330d9cb3ee938f45226dcda989143d4a43bd457b79820b6d781a2f40ebb8516af1047d63e8c9a5bf933491e0799a94b94e8ed39 SHA512 18082ce5ce7e55a17c04c2b3d8e701f2382558456107a1678196208d265e43229a66180c2e8529daaaf686c97816f0df09775b483d594de6173e57354814e0d5
+DIST que.traineddata-tessdata_fast-4.1.0 5026336 BLAKE2B 4d7d559e241054d3a91b669b8330d9cb3ee938f45226dcda989143d4a43bd457b79820b6d781a2f40ebb8516af1047d63e8c9a5bf933491e0799a94b94e8ed39 SHA512 18082ce5ce7e55a17c04c2b3d8e701f2382558456107a1678196208d265e43229a66180c2e8529daaaf686c97816f0df09775b483d594de6173e57354814e0d5
DIST ron.traineddata-tessdata_fast-4.0.0 2376323 BLAKE2B 37d629e99487814dab6d8e6f107a188d0821726f75f4ee84387e1038ba61057c9d1c6b4de48574a8f5df541e3c4a09ef94ed5a1bd3a3e5a554305b5462d72cd8 SHA512 36639480ce972f1cbf0a020eb30b3418a6961046d0ff961c70ce953c5023ff4e20df22f43742693f43b98af4634c1f74e910db6643c3bb9898a4481ddbbba360
+DIST ron.traineddata-tessdata_fast-4.1.0 2376323 BLAKE2B 37d629e99487814dab6d8e6f107a188d0821726f75f4ee84387e1038ba61057c9d1c6b4de48574a8f5df541e3c4a09ef94ed5a1bd3a3e5a554305b5462d72cd8 SHA512 36639480ce972f1cbf0a020eb30b3418a6961046d0ff961c70ce953c5023ff4e20df22f43742693f43b98af4634c1f74e910db6643c3bb9898a4481ddbbba360
DIST rus.traineddata-tessdata_fast-4.0.0 3861738 BLAKE2B 0a9ef4e0565a0ebfbac8c5c968db2cc0fbaf49b9c1e0ecf35b17087bb54b519f6710d804569752ab2392582cc8ca8ed070fe5bfb164130ebc9986c3db2a97fb2 SHA512 65254c36df8274cee0a2c32e9632f3c2c3c2c0032314bf0a99a4c23309e862da7c038ed85745d58697a814f44c656f22ef5a7815ae2bec33f80de1de8e1ea9dd
+DIST rus.traineddata-tessdata_fast-4.1.0 3861738 BLAKE2B 0a9ef4e0565a0ebfbac8c5c968db2cc0fbaf49b9c1e0ecf35b17087bb54b519f6710d804569752ab2392582cc8ca8ed070fe5bfb164130ebc9986c3db2a97fb2 SHA512 65254c36df8274cee0a2c32e9632f3c2c3c2c0032314bf0a99a4c23309e862da7c038ed85745d58697a814f44c656f22ef5a7815ae2bec33f80de1de8e1ea9dd
DIST san.traineddata-tessdata_fast-4.0.0 12404677 BLAKE2B 4ae4406fcb2ee01a1914dcba1d54dda37ba8e2fd480f71f15beafe6dcc82fcafa0af3050cc952c36215d7bb8a87b62d7df2872b82c7ffe8eb85710badd59d1f3 SHA512 0e5b48e46e42a88ec63dd9743ecf4e9137912404b1a0cd8c26c43349d7ec7ac471bd986a7c9a4be97f802a80f7b5d18c74f55bb0006a473210b791d543b58707
+DIST san.traineddata-tessdata_fast-4.1.0 12404677 BLAKE2B 4ae4406fcb2ee01a1914dcba1d54dda37ba8e2fd480f71f15beafe6dcc82fcafa0af3050cc952c36215d7bb8a87b62d7df2872b82c7ffe8eb85710badd59d1f3 SHA512 0e5b48e46e42a88ec63dd9743ecf4e9137912404b1a0cd8c26c43349d7ec7ac471bd986a7c9a4be97f802a80f7b5d18c74f55bb0006a473210b791d543b58707
DIST sin.traineddata-tessdata_fast-4.0.0 1727413 BLAKE2B e9906ab16aca38864fbc96d24dcec836d42ee2f6b251af970b78c676718824d9383d41f7f566fc407ac3afb6356f5e7f02496d4628b29f400b5eece7bfd9097d SHA512 17e4d52188c745df7923cd802d2446c2dffbc34af8e6a795e939ab398e0874cf56b9a2f353975d12b4532688174a657c8763158ba182f2a203bc825b8e40b3ff
+DIST sin.traineddata-tessdata_fast-4.1.0 1727413 BLAKE2B e9906ab16aca38864fbc96d24dcec836d42ee2f6b251af970b78c676718824d9383d41f7f566fc407ac3afb6356f5e7f02496d4628b29f400b5eece7bfd9097d SHA512 17e4d52188c745df7923cd802d2446c2dffbc34af8e6a795e939ab398e0874cf56b9a2f353975d12b4532688174a657c8763158ba182f2a203bc825b8e40b3ff
DIST slk.traineddata-tessdata_fast-4.0.0 4427661 BLAKE2B e1e7849d8e823bbd573d5c3756ed1fce6f1e07dfffb1fa7a65f86f88d7cd222f3a648c46bbb6bbf0561aac9c7c5ac62476969b968c136a71926dcd5ab7fa30a0 SHA512 df1daaf259e2868a36f3d1e7edb79330b5d61c3104e1daab13cd8024f826a6181fab05dd18730e6aaa30e67f54555c80b95f8266101cdba03f71a70b93b94d6f
+DIST slk.traineddata-tessdata_fast-4.1.0 4427661 BLAKE2B e1e7849d8e823bbd573d5c3756ed1fce6f1e07dfffb1fa7a65f86f88d7cd222f3a648c46bbb6bbf0561aac9c7c5ac62476969b968c136a71926dcd5ab7fa30a0 SHA512 df1daaf259e2868a36f3d1e7edb79330b5d61c3104e1daab13cd8024f826a6181fab05dd18730e6aaa30e67f54555c80b95f8266101cdba03f71a70b93b94d6f
DIST slv.traineddata-tessdata_fast-4.0.0 3003829 BLAKE2B a8b9f9fb36a2237bb5222122222f56cbad35681d2ea504703b7b7f167adba79bf366e14573e52f8ff1c999cb983ee0014c46d864c9a5cc862ed0041dbad9fd34 SHA512 723a1d1f32a3acc26bfea051856489d94e75bd4e987cac7d2b5de9fca4a233eda49897fc857094b658b77fb91bda7aa315114b4a5af4ba8f7d75baf2a8e06d5e
+DIST slv.traineddata-tessdata_fast-4.1.0 3003829 BLAKE2B a8b9f9fb36a2237bb5222122222f56cbad35681d2ea504703b7b7f167adba79bf366e14573e52f8ff1c999cb983ee0014c46d864c9a5cc862ed0041dbad9fd34 SHA512 723a1d1f32a3acc26bfea051856489d94e75bd4e987cac7d2b5de9fca4a233eda49897fc857094b658b77fb91bda7aa315114b4a5af4ba8f7d75baf2a8e06d5e
DIST snd.traineddata-tessdata_fast-4.0.0 1694035 BLAKE2B 3e6af108b663fa45eb0e1ab0e126ede89f49eec19aea3a60d1d056e33e1afe9448f40071271cc9161cb04cee8c4a7f0c14b852891220034e9269a89c7e3cbf71 SHA512 4a8ffdd98c8ef9a3c7f8022964819818d3e03b2feb155e1d991eae697ac2a41858234cd8e6e73582cfb8c4e2fd6ac4efec115da43162059d35e4c77e2d569ce8
+DIST snd.traineddata-tessdata_fast-4.1.0 1694035 BLAKE2B 3e6af108b663fa45eb0e1ab0e126ede89f49eec19aea3a60d1d056e33e1afe9448f40071271cc9161cb04cee8c4a7f0c14b852891220034e9269a89c7e3cbf71 SHA512 4a8ffdd98c8ef9a3c7f8022964819818d3e03b2feb155e1d991eae697ac2a41858234cd8e6e73582cfb8c4e2fd6ac4efec115da43162059d35e4c77e2d569ce8
DIST spa.traineddata-tessdata_fast-4.0.0 2294433 BLAKE2B c3cf779e0e6d4e6dbe4c170f9dfcb687f3d122fc22bf1cbe047f588ee44b2b1b61ed9df5d016ced47fc86a56708b6d0a1bc582f7e7da99e53e11840f555a96ba SHA512 901e8c0c6dc50f57c723922061d5a98b223f1b499b9af1546b072dd70772c5a3ffa33ddbc76295b115bd586863f3d653602bdb6d1fce28a59a86d296efa24241
+DIST spa.traineddata-tessdata_fast-4.1.0 2294433 BLAKE2B c3cf779e0e6d4e6dbe4c170f9dfcb687f3d122fc22bf1cbe047f588ee44b2b1b61ed9df5d016ced47fc86a56708b6d0a1bc582f7e7da99e53e11840f555a96ba SHA512 901e8c0c6dc50f57c723922061d5a98b223f1b499b9af1546b072dd70772c5a3ffa33ddbc76295b115bd586863f3d653602bdb6d1fce28a59a86d296efa24241
DIST spa_old.traineddata-tessdata_fast-4.0.0 2894755 BLAKE2B 7eb2186d63026f458e693af5fe40d6df826b2ac21629f007171b269d84cae5e84f5d7e5f47c9009a43bdf860ea288af4c958c270db6be1eefad7764bbad1fa3d SHA512 fa9f3f31c48dd30649907f4f624fdb43211c7e05741a32cab6f79ef0cfad7692507c5a059b48ff9cedd5446932231849e19e11c5b45f13c21743073ba951ce5d
+DIST spa_old.traineddata-tessdata_fast-4.1.0 2894755 BLAKE2B 7eb2186d63026f458e693af5fe40d6df826b2ac21629f007171b269d84cae5e84f5d7e5f47c9009a43bdf860ea288af4c958c270db6be1eefad7764bbad1fa3d SHA512 fa9f3f31c48dd30649907f4f624fdb43211c7e05741a32cab6f79ef0cfad7692507c5a059b48ff9cedd5446932231849e19e11c5b45f13c21743073ba951ce5d
DIST sqi.traineddata-tessdata_fast-4.0.0 1874705 BLAKE2B db3745d277bb3ec7f52697c1b70c828d07a11e11cb702ca7899ddab773bcdb532f5779d8fde7c0bf8e926c893d07ad3cb0c65c0ded701f7a4029e8d58d672513 SHA512 b24c41da3ecdfa0b61498273ecfaed437366fd87221e8e007f1aebf1e3882f375ea80f39287082a110c378d999ccf1513e6ecc51e430ab2342f5b57794730755
+DIST sqi.traineddata-tessdata_fast-4.1.0 1874705 BLAKE2B db3745d277bb3ec7f52697c1b70c828d07a11e11cb702ca7899ddab773bcdb532f5779d8fde7c0bf8e926c893d07ad3cb0c65c0ded701f7a4029e8d58d672513 SHA512 b24c41da3ecdfa0b61498273ecfaed437366fd87221e8e007f1aebf1e3882f375ea80f39287082a110c378d999ccf1513e6ecc51e430ab2342f5b57794730755
DIST srp.traineddata-tessdata_fast-4.0.0 2149931 BLAKE2B 8c422cd7b3fdbff165e85a8a3e1037f75a857baffa4f016cdd30393a24d5b3dde45d32217ba874d0449d4419d01a781a297e5154d8eadd5adfdb2516627028fa SHA512 919688e69d2afb36feb870b51534390a12e84b5ec80e934e8b34447cb6a96a9230ca81556bb55d49b56bd14acb90dedc5bdd9661b3d81bb587c31be88a3af9af
+DIST srp.traineddata-tessdata_fast-4.1.0 2149931 BLAKE2B 8c422cd7b3fdbff165e85a8a3e1037f75a857baffa4f016cdd30393a24d5b3dde45d32217ba874d0449d4419d01a781a297e5154d8eadd5adfdb2516627028fa SHA512 919688e69d2afb36feb870b51534390a12e84b5ec80e934e8b34447cb6a96a9230ca81556bb55d49b56bd14acb90dedc5bdd9661b3d81bb587c31be88a3af9af
DIST srp_latn.traineddata-tessdata_fast-4.0.0 3281787 BLAKE2B bc68b208d347ad06e10deee97d1726549faddd1ae2165348bd6cf2364ecbcf0d70a4fedfc7ca875c0248a5ea69b4c04e7a0de8c0d5ed8987d5dc275348899036 SHA512 3b6f64f5797ebd5695c76b9465c33990d5b49ea9ad6f95f9396a9c999c01e867c3f66b16f9122528a9c6232d97b87c3afdbe5b1bf009509edaed321b4d5a37f8
+DIST srp_latn.traineddata-tessdata_fast-4.1.0 3281787 BLAKE2B bc68b208d347ad06e10deee97d1726549faddd1ae2165348bd6cf2364ecbcf0d70a4fedfc7ca875c0248a5ea69b4c04e7a0de8c0d5ed8987d5dc275348899036 SHA512 3b6f64f5797ebd5695c76b9465c33990d5b49ea9ad6f95f9396a9c999c01e867c3f66b16f9122528a9c6232d97b87c3afdbe5b1bf009509edaed321b4d5a37f8
DIST sun.traineddata-tessdata_fast-4.0.0 1369500 BLAKE2B 90729519bc2e9775a0423bc6d3a0dbb0cc540ddf7044e446d69be84bdaf7e18470d754f1e57c3b9c5e24f48ee39a82ad51f452af9e6a4c96285e32948e9589c5 SHA512 b2760af17b99f553d2c81615e2e46778ee6a2193405b8a3d9aa08fb514559676f2a425055a2e62713aaf3b51770bf880cc2c536044de376842413f376a6865c4
+DIST sun.traineddata-tessdata_fast-4.1.0 1369500 BLAKE2B 90729519bc2e9775a0423bc6d3a0dbb0cc540ddf7044e446d69be84bdaf7e18470d754f1e57c3b9c5e24f48ee39a82ad51f452af9e6a4c96285e32948e9589c5 SHA512 b2760af17b99f553d2c81615e2e46778ee6a2193405b8a3d9aa08fb514559676f2a425055a2e62713aaf3b51770bf880cc2c536044de376842413f376a6865c4
DIST swa.traineddata-tessdata_fast-4.0.0 2167651 BLAKE2B 41b66aea58516fe8e4ec2696a17fee68faced7bcadcdbffb468fc75dc5bd3b6b29c7e3c75e01bd929a4ecad2d69859d62ff157e961aaa4f0f0c8a77d066181c9 SHA512 077df824f71b2dade65bb1611623ede7741dd138172bfde94be03e18478c6aa48082a1d09ea69f332f883b2d5294c120c31292ee34050e3f10cb2f5402758465
+DIST swa.traineddata-tessdata_fast-4.1.0 2167651 BLAKE2B 41b66aea58516fe8e4ec2696a17fee68faced7bcadcdbffb468fc75dc5bd3b6b29c7e3c75e01bd929a4ecad2d69859d62ff157e961aaa4f0f0c8a77d066181c9 SHA512 077df824f71b2dade65bb1611623ede7741dd138172bfde94be03e18478c6aa48082a1d09ea69f332f883b2d5294c120c31292ee34050e3f10cb2f5402758465
DIST swe.traineddata-tessdata_fast-4.0.0 4167034 BLAKE2B 71422ab662dd7ce09e96242a03a2b8439a545022278585d9a370c11e770c245feeb297dec8a22a0b893b437d3f43e20b75f73709dbc62e3b7a25c693fba0b08d SHA512 1971bcfe5ec1ef0ad861cb9a0fa8eddac52ea537de1da52def098551795779db5a7ecdadd7546b83695e1f2116551d964e393a3fe8e16895566fa641e9af99a2
+DIST swe.traineddata-tessdata_fast-4.1.0 4167034 BLAKE2B 71422ab662dd7ce09e96242a03a2b8439a545022278585d9a370c11e770c245feeb297dec8a22a0b893b437d3f43e20b75f73709dbc62e3b7a25c693fba0b08d SHA512 1971bcfe5ec1ef0ad861cb9a0fa8eddac52ea537de1da52def098551795779db5a7ecdadd7546b83695e1f2116551d964e393a3fe8e16895566fa641e9af99a2
DIST syr.traineddata-tessdata_fast-4.0.0 2207208 BLAKE2B 58c523b6b0ffc13f11d22c8fb265b0b61b773bf4a685b2b11fcf83065adcf355a8d8884e1a5b60e35aef7bd9266cb6e0d5d40a05c73d1b02decef3afb947ffd1 SHA512 ca4fa16f11cc05b796d60032e98bf2ff6e36d9a7a8985dd08034794e7acd62bf51ff6ecb95427bde146d99721e74a7dd60e5e11c1f15caaa24ecdfe09fbb82fd
+DIST syr.traineddata-tessdata_fast-4.1.0 2207208 BLAKE2B 58c523b6b0ffc13f11d22c8fb265b0b61b773bf4a685b2b11fcf83065adcf355a8d8884e1a5b60e35aef7bd9266cb6e0d5d40a05c73d1b02decef3afb947ffd1 SHA512 ca4fa16f11cc05b796d60032e98bf2ff6e36d9a7a8985dd08034794e7acd62bf51ff6ecb95427bde146d99721e74a7dd60e5e11c1f15caaa24ecdfe09fbb82fd
DIST tam.traineddata-tessdata_fast-4.0.0 3237963 BLAKE2B 6110cf03cd5448f5e677bdf1b05aca92989faf1b33e0acd2a4da5dd94f0e6652e3f5d040fa733bf8a47fa6d05da4a68e6b697d9b8f9fa27c2129b7a7109acbb6 SHA512 e0b12a15736d438698ad95d586fe237d104a8766c349ae79468d88fa2cc712448137088f52ee99bb4d82e79e4521f946eb9eefb8b022957aabc76b9709ccfef9
+DIST tam.traineddata-tessdata_fast-4.1.0 3237963 BLAKE2B 6110cf03cd5448f5e677bdf1b05aca92989faf1b33e0acd2a4da5dd94f0e6652e3f5d040fa733bf8a47fa6d05da4a68e6b697d9b8f9fa27c2129b7a7109acbb6 SHA512 e0b12a15736d438698ad95d586fe237d104a8766c349ae79468d88fa2cc712448137088f52ee99bb4d82e79e4521f946eb9eefb8b022957aabc76b9709ccfef9
DIST tat.traineddata-tessdata_fast-4.0.0 1072896 BLAKE2B cf085fc72d79963f8dcd5b0320c9f60cf7d193fde821cacfd6045c1691d01fe1d9d70b2a2747a4e67f6b2c93a9dde8a6637015e8daa4bec09e90b05b5d478fa3 SHA512 8b6c40afc7bfb86cde14352a93c58b12203173163269f3c8401ee1d2ed1f89831c3726a898cfdfdf76501078009721e1b020a62ceb0b6e9cd621f5cc27f4c2dd
+DIST tat.traineddata-tessdata_fast-4.1.0 1072896 BLAKE2B cf085fc72d79963f8dcd5b0320c9f60cf7d193fde821cacfd6045c1691d01fe1d9d70b2a2747a4e67f6b2c93a9dde8a6637015e8daa4bec09e90b05b5d478fa3 SHA512 8b6c40afc7bfb86cde14352a93c58b12203173163269f3c8401ee1d2ed1f89831c3726a898cfdfdf76501078009721e1b020a62ceb0b6e9cd621f5cc27f4c2dd
DIST tel.traineddata-tessdata_fast-4.0.0 2769654 BLAKE2B fb461715b626c5f977c82b897a4166417c8bbef7dbe331576cfc9897dd4e70a47dca24c0810227aa48cf882383edbc8f4a446fd04e6fdfa7dd635336bad463bb SHA512 89666af74698d21bd49d9fe3b66e4b07a4d5d68e99042edfc0611a2b08a25666b3a03915ca3ead36bfff02a89d40a25a455c534b1efcca32c7ea2a839e44018a
+DIST tel.traineddata-tessdata_fast-4.1.0 2769654 BLAKE2B fb461715b626c5f977c82b897a4166417c8bbef7dbe331576cfc9897dd4e70a47dca24c0810227aa48cf882383edbc8f4a446fd04e6fdfa7dd635336bad463bb SHA512 89666af74698d21bd49d9fe3b66e4b07a4d5d68e99042edfc0611a2b08a25666b3a03915ca3ead36bfff02a89d40a25a455c534b1efcca32c7ea2a839e44018a
DIST tgk.traineddata-tessdata_fast-4.0.0 2602685 BLAKE2B 265d8dc62f4bede659f9fb3be28d8711ec60ff507404758f9b805d081a3fa725e83efb1dbe79b1fbf4a9bc700880126900a9b31083d229ee626b8bfc8c14c292 SHA512 3c9b42b434fecbbce50873396908e910c18c3136b0f7c0a0c1ae77f02bf6fd9584b88a20b8d7cf09e2b6998a8f7df4f6aaeead7649cab68590999374f25c5991
+DIST tgk.traineddata-tessdata_fast-4.1.0 2602685 BLAKE2B 265d8dc62f4bede659f9fb3be28d8711ec60ff507404758f9b805d081a3fa725e83efb1dbe79b1fbf4a9bc700880126900a9b31083d229ee626b8bfc8c14c292 SHA512 3c9b42b434fecbbce50873396908e910c18c3136b0f7c0a0c1ae77f02bf6fd9584b88a20b8d7cf09e2b6998a8f7df4f6aaeead7649cab68590999374f25c5991
DIST tha.traineddata-tessdata_fast-4.0.0 1072600 BLAKE2B af2a4956b247cd9519a992716efa708013fc530a52636d3a62400b10cc309909a9a9dce25cc36651a9fe03d5934ee04e2eee5cadc7f5c6e93426138ad8f4e365 SHA512 942590b071264bc55bd74dcc0db652fe5ab9e70a98b6a17a0add7f5e7f1e26d00111f5e7dd8ba22324b17759309e94d6ac8a6222b33d37fee04397b55072b0e6
+DIST tha.traineddata-tessdata_fast-4.1.0 1072600 BLAKE2B af2a4956b247cd9519a992716efa708013fc530a52636d3a62400b10cc309909a9a9dce25cc36651a9fe03d5934ee04e2eee5cadc7f5c6e93426138ad8f4e365 SHA512 942590b071264bc55bd74dcc0db652fe5ab9e70a98b6a17a0add7f5e7f1e26d00111f5e7dd8ba22324b17759309e94d6ac8a6222b33d37fee04397b55072b0e6
DIST tir.traineddata-tessdata_fast-4.0.0 378822 BLAKE2B 3fc8133472f1753ba742ca5f935ec20370c30bcef74307c88f0c40853f130d591460c175aafbd6bd65fed9366df4a91317d138bacfa77b9d2980d5bfa41edb65 SHA512 2d0c196d0f8b6d11828f41e1ef8e4c132863469e1148b3f77ca569a713af91380a4d53eeadc242c5f82813b40f949cf7279abca96a9cae2d8a8b4c0581b83d64
+DIST tir.traineddata-tessdata_fast-4.1.0 378822 BLAKE2B 3fc8133472f1753ba742ca5f935ec20370c30bcef74307c88f0c40853f130d591460c175aafbd6bd65fed9366df4a91317d138bacfa77b9d2980d5bfa41edb65 SHA512 2d0c196d0f8b6d11828f41e1ef8e4c132863469e1148b3f77ca569a713af91380a4d53eeadc242c5f82813b40f949cf7279abca96a9cae2d8a8b4c0581b83d64
DIST ton.traineddata-tessdata_fast-4.0.0 947249 BLAKE2B e2cd14d26e07b7e5f88feba310c05333c6e1aa396acd7e29bede89c4b98cf94da6d3374818e26a5b967a1606f9cd147b6b56924f6b71d2f007493dc7e92868bb SHA512 b9f4ef0555663892e821cb876d50f3a091983ad83da375a6d17b9e705c1e0c7f08a5664782e44e7d42f357d379ca3094adb72daf01b39b37b4ea2ebd04130437
+DIST ton.traineddata-tessdata_fast-4.1.0 947249 BLAKE2B e2cd14d26e07b7e5f88feba310c05333c6e1aa396acd7e29bede89c4b98cf94da6d3374818e26a5b967a1606f9cd147b6b56924f6b71d2f007493dc7e92868bb SHA512 b9f4ef0555663892e821cb876d50f3a091983ad83da375a6d17b9e705c1e0c7f08a5664782e44e7d42f357d379ca3094adb72daf01b39b37b4ea2ebd04130437
DIST tur.traineddata-tessdata_fast-4.0.0 4550554 BLAKE2B 21cf610a7250be7f1136838b4d65a309c80a7c3c9e2bb3e86e3304947bc2d7a21cce74d46f7191ac84005b45e1b3c12e24d3f47587263793d164081505f5e3f9 SHA512 10470a411a4692aef1cc5a0465793844cd47f8a9079f72e9e7e0176e9556d13afa7e83ff3644d4a8b10a91bcc5698a8d377d4f4ad986ada72a0557a2c5617357
+DIST tur.traineddata-tessdata_fast-4.1.0 4550554 BLAKE2B 21cf610a7250be7f1136838b4d65a309c80a7c3c9e2bb3e86e3304947bc2d7a21cce74d46f7191ac84005b45e1b3c12e24d3f47587263793d164081505f5e3f9 SHA512 10470a411a4692aef1cc5a0465793844cd47f8a9079f72e9e7e0176e9556d13afa7e83ff3644d4a8b10a91bcc5698a8d377d4f4ad986ada72a0557a2c5617357
DIST uig.traineddata-tessdata_fast-4.0.0 2794272 BLAKE2B b3820b7de241e598b3bfb2946bc23656b1abb1d46502f18bc687c55ee6da605880c90d59ed1567f8b6b39ff0c5c5494a1ff8c7c5747353a6dd46f04f738b65f4 SHA512 7ada280945562e828b59ad731d51682dfe3e0996eb30a02c134bd7be156a4604b4b3ea3480cf748fd9f9dc0c55a9b823ecb249b260b1718b2490f5addf89891b
+DIST uig.traineddata-tessdata_fast-4.1.0 2794272 BLAKE2B b3820b7de241e598b3bfb2946bc23656b1abb1d46502f18bc687c55ee6da605880c90d59ed1567f8b6b39ff0c5c5494a1ff8c7c5747353a6dd46f04f738b65f4 SHA512 7ada280945562e828b59ad731d51682dfe3e0996eb30a02c134bd7be156a4604b4b3ea3480cf748fd9f9dc0c55a9b823ecb249b260b1718b2490f5addf89891b
DIST ukr.traineddata-tessdata_fast-4.0.0 3825102 BLAKE2B bf263c354082cb3fdb5f0b63088bd6ab315e11df60c85a424aa534b8bf2be6ddf6e371c2b4ac3e248934e66e6198b0eb39a5b008a1264309ad71d81004f49296 SHA512 67056a9a25206321c0804ed40520a7b6b1b74746bcbf57c1488faf250d014288970de0ee73b7160dfd9fa509bc5fe59f8dcedc5bcbebf879ce87431e3c1fb057
+DIST ukr.traineddata-tessdata_fast-4.1.0 3825102 BLAKE2B bf263c354082cb3fdb5f0b63088bd6ab315e11df60c85a424aa534b8bf2be6ddf6e371c2b4ac3e248934e66e6198b0eb39a5b008a1264309ad71d81004f49296 SHA512 67056a9a25206321c0804ed40520a7b6b1b74746bcbf57c1488faf250d014288970de0ee73b7160dfd9fa509bc5fe59f8dcedc5bcbebf879ce87431e3c1fb057
DIST urd.traineddata-tessdata_fast-4.0.0 1398718 BLAKE2B 51a3f61af80192fd02e8b32462012ef64d03d4435df525cf6ff6ff5a81938e8ab0eb6d93490aeda3e2bc676f96eedef51b07b2c5d5d6fe15bb2f56dfd51b776a SHA512 5f4ee46bd71624caa73aabe1b69d49781d96f49e9374c3edeb69c861f16d36640e3a2b698d75d71bd7b94d17c1aabdd742a3400964487414357b2baae89b582d
+DIST urd.traineddata-tessdata_fast-4.1.0 1398718 BLAKE2B 51a3f61af80192fd02e8b32462012ef64d03d4435df525cf6ff6ff5a81938e8ab0eb6d93490aeda3e2bc676f96eedef51b07b2c5d5d6fe15bb2f56dfd51b776a SHA512 5f4ee46bd71624caa73aabe1b69d49781d96f49e9374c3edeb69c861f16d36640e3a2b698d75d71bd7b94d17c1aabdd742a3400964487414357b2baae89b582d
DIST uzb.traineddata-tessdata_fast-4.0.0 6470703 BLAKE2B da7703c5340b795d202850f96d71f2ff3f69cfd57126ef76053b01246673d6abc7f16ff77b935e132dd193566f0b7772ceccf9402046e38d7664581e4437afab SHA512 f03c9a83572293c40ae8d119c1399953dfbc81503445db3867245fa6f48e0844a6b72b85c24b663e1169829576ed6eabd2c50d48384c2721a4036e040f164478
+DIST uzb.traineddata-tessdata_fast-4.1.0 6470703 BLAKE2B da7703c5340b795d202850f96d71f2ff3f69cfd57126ef76053b01246673d6abc7f16ff77b935e132dd193566f0b7772ceccf9402046e38d7664581e4437afab SHA512 f03c9a83572293c40ae8d119c1399953dfbc81503445db3867245fa6f48e0844a6b72b85c24b663e1169829576ed6eabd2c50d48384c2721a4036e040f164478
DIST uzb_cyrl.traineddata-tessdata_fast-4.0.0 1563501 BLAKE2B 4a57310458de8bcb6dc5ca4b409f2858cdeaa268ff050de28b2c39d83e7fbc49eaa3fa2cc528f9b58d300c76fadee02f8b654456973ee97545734b478d411589 SHA512 ebe9107b7167d52e48030177a8fc301c1978f798282dfd33694dd5544f9970ba24330797a72ec02655f243369490b6ddb78df96bd28f299a1a9d50e69fcad483
+DIST uzb_cyrl.traineddata-tessdata_fast-4.1.0 1563501 BLAKE2B 4a57310458de8bcb6dc5ca4b409f2858cdeaa268ff050de28b2c39d83e7fbc49eaa3fa2cc528f9b58d300c76fadee02f8b654456973ee97545734b478d411589 SHA512 ebe9107b7167d52e48030177a8fc301c1978f798282dfd33694dd5544f9970ba24330797a72ec02655f243369490b6ddb78df96bd28f299a1a9d50e69fcad483
DIST vie.traineddata-tessdata_fast-4.0.0 531275 BLAKE2B 379070086dfd362ef888b8a467ce003d32653c844fb42fd89a5bcf383b58cfb7b9c170328e49c4800b4f43201600e43e26c7745f444e06f5ba7bb93e8fb98e72 SHA512 3a055b7ba07e38ce4a21be85ccbac26b27aab5f4104d4875c866030d0ac6d468e25c793301c2cbb4ab5ff92492bc5c02eefe083d638f6c081cf19ca452a05733
+DIST vie.traineddata-tessdata_fast-4.1.0 531275 BLAKE2B 379070086dfd362ef888b8a467ce003d32653c844fb42fd89a5bcf383b58cfb7b9c170328e49c4800b4f43201600e43e26c7745f444e06f5ba7bb93e8fb98e72 SHA512 3a055b7ba07e38ce4a21be85ccbac26b27aab5f4104d4875c866030d0ac6d468e25c793301c2cbb4ab5ff92492bc5c02eefe083d638f6c081cf19ca452a05733
DIST yid.traineddata-tessdata_fast-4.0.0 545606 BLAKE2B 96d06916e67e5712d708d6c4534b3a618211cf76b3825ea3b48ac04d8158633a5fd0584aecb2574fdf105d0ba8d9ed21861d3cd9e6fa186c273ed950b9382a1d SHA512 4ee1effed6fd9233d6341f62f5dfd0a4dfb25e7388c7152bc3bdc55dff0737198f35264fcff34d81c223e4a8be832417323f9e16c4c33245d0493d44eacbefc5
+DIST yid.traineddata-tessdata_fast-4.1.0 545606 BLAKE2B 96d06916e67e5712d708d6c4534b3a618211cf76b3825ea3b48ac04d8158633a5fd0584aecb2574fdf105d0ba8d9ed21861d3cd9e6fa186c273ed950b9382a1d SHA512 4ee1effed6fd9233d6341f62f5dfd0a4dfb25e7388c7152bc3bdc55dff0737198f35264fcff34d81c223e4a8be832417323f9e16c4c33245d0493d44eacbefc5
DIST yor.traineddata-tessdata_fast-4.0.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
+DIST yor.traineddata-tessdata_fast-4.1.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
diff --git a/app-text/tessdata_fast/metadata.xml b/app-text/tessdata_fast/metadata.xml
index e7a3ff9d1634..acc4e1fe4195 100644
--- a/app-text/tessdata_fast/metadata.xml
+++ b/app-text/tessdata_fast/metadata.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
- <longdescription lang="en">Fast integer versions of trained models for app-text/tesseract</longdescription>
<upstream>
<remote-id type="github">tesseract-ocr/tessdata_fast</remote-id>
</upstream>
diff --git a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
index f87d68977662..33fb4a915793 100644
--- a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
+++ b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86"
IUSE="+osd"
RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
new file mode 100644
index 000000000000..2026d8203407
--- /dev/null
+++ b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+URI_PREFIX="https://github.com/tesseract-ocr/${PN}/raw/${PV}/"
+
+DESCRIPTION="Fast integer versions of trained models for app-text/tesseract"
+HOMEPAGE="https://github.com/tesseract-ocr/tessdata_fast"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
+ osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${P} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+osd"
+
+RDEPEND="!app-text/tessdata_best
+ !app-text/tessdata_legacy
+ !<app-text/tesseract-4.1.0"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}
+
+# List of supported Gentoo linguas and their upstream mapping
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bg:bul bn:ben bo:bod br:bre bs:bos ca:cat ceb chr co:cos cs:ces cy:cym da:dan de:deu,frk dv:div dz:dzo el:ell,grc en:enm eo:epo es:spa,spa_old et:est eu:eus fa:fas fi:fin fil fo:fao fr:fra,frm fy:fry ga:gle gd:gla gl:glg gu:guj he:heb hi:hin hr:hrv ht:hat hu:hun hy:hye id:ind is:isl it:ita,ita_old iu:iku ja:jpn,jpn_vert jv:jav ka:kat,kat_old kk:kaz km:khm kmr-Latn:kmr kn:kan ko:kor,kor_vert ky:kir la:lat lb:ltz lo:lao lt:lit lv:lav mi:mri mk:mkd ml:mal mn:mon mr:mar ms:msa mt:mlt my:mya ne:nep nl:nld no:nor oc:oci or:ori pa:pan pl:pol ps:pus pt:por qu:que ro:ron ru:rus sa:san sd:snd si:sin sk:slk sl:slv sq:sqi sr:srp,srp_latn su:sun sv:swe sw:swa syc:syr ta:tam te:tel tg:tgk th:tha ti:tir to:ton tr:tur tt:tat ug:uig uk:ukr ur:urd uz:uzb,uzb_cyrl vi:vie yi:yid yo:yor zh:chi_sim,chi_sim_vert,chi_tra,chi_tra_vert"
+# l10n_en provides the additional data:
+# enm - English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+ gentoo_lang=${lang%:*}
+ tess_langs=${lang#*:}
+ for tess_lang in ${tess_langs//,/ }; do
+ SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${P} )"
+ done
+ IUSE+=" l10n_${gentoo_lang}"
+done
+
+src_prepare() {
+ for file in ${A}; do
+ cp "${DISTDIR}/${file}" "${S}/${file/-${P}/}" || die
+ done
+
+ default
+}
+
+src_install() {
+ insinto /usr/share/tessdata
+ doins *.traineddata
+}
diff --git a/app-text/tessdata_legacy/Manifest b/app-text/tessdata_legacy/Manifest
index 355facbd3481..e5cb1a86b400 100644
--- a/app-text/tessdata_legacy/Manifest
+++ b/app-text/tessdata_legacy/Manifest
@@ -1,127 +1,253 @@
DIST afr.traineddata-tessdata_legacy-4.0.0 7851157 BLAKE2B 90811d860f65dae25e0cd74855292394532e4f3059fa28dbe101111ee0a47eb5e662602b1ea797897001b839c701394124056d9c7cf360b0483be820ea00ef02 SHA512 8cf2ce289ea892aaa186fe26ffcd50ba4f7433874f1367e55fd337801f63f337d1719ecd3baa41575e6a22f834dbd3ac7b970942ae4e4dd730ea3bdc7a0f1b15
+DIST afr.traineddata-tessdata_legacy-4.1.0 7851157 BLAKE2B 90811d860f65dae25e0cd74855292394532e4f3059fa28dbe101111ee0a47eb5e662602b1ea797897001b839c701394124056d9c7cf360b0483be820ea00ef02 SHA512 8cf2ce289ea892aaa186fe26ffcd50ba4f7433874f1367e55fd337801f63f337d1719ecd3baa41575e6a22f834dbd3ac7b970942ae4e4dd730ea3bdc7a0f1b15
DIST amh.traineddata-tessdata_legacy-4.0.0 8423467 BLAKE2B b4f3643981210e898b791ddb4fdf58287ee8d23c0e5822933e586ad34ed06de497e7e2de6a834c0178347ffc6e12589e85587c7da1d05fba32b36f2c16f7d6fb SHA512 675108f2a2df285a09a95b8a4a2fcbaabbb2123c85b68c2a5daf05e6dfefda6be7178a686ed2ca776e58f2cde58663e717bc9ca0913b41d58575be77166f42ba
+DIST amh.traineddata-tessdata_legacy-4.1.0 8423467 BLAKE2B b4f3643981210e898b791ddb4fdf58287ee8d23c0e5822933e586ad34ed06de497e7e2de6a834c0178347ffc6e12589e85587c7da1d05fba32b36f2c16f7d6fb SHA512 675108f2a2df285a09a95b8a4a2fcbaabbb2123c85b68c2a5daf05e6dfefda6be7178a686ed2ca776e58f2cde58663e717bc9ca0913b41d58575be77166f42ba
DIST ara.traineddata-tessdata_legacy-4.0.0 2494806 BLAKE2B b0297c8cdf13e7d87b1f65c04b55905154fb24c16a9c7e4a0cf76ace6cd8eeba83c1fc81ea098df566a55270735d14d819ba60f6dd5461a473350f4ff1767210 SHA512 333ddb480e60201039b926e8800324d46657ed4b7adf3365fa0b43317dd7c501e149410e3a749243e0fea1319cd152c960cf1ac8ea08e20c1931cd6c1598e1cb
+DIST ara.traineddata-tessdata_legacy-4.1.0 2494806 BLAKE2B b0297c8cdf13e7d87b1f65c04b55905154fb24c16a9c7e4a0cf76ace6cd8eeba83c1fc81ea098df566a55270735d14d819ba60f6dd5461a473350f4ff1767210 SHA512 333ddb480e60201039b926e8800324d46657ed4b7adf3365fa0b43317dd7c501e149410e3a749243e0fea1319cd152c960cf1ac8ea08e20c1931cd6c1598e1cb
DIST asm.traineddata-tessdata_legacy-4.0.0 2045457 BLAKE2B 793a6cf489b5b115086952d424b062dce0baaa40456a5d4d4825ac6041d7d26b6f8b72bb95384aefb6441650d7b0e5793f6eb1f80a5c4a2497797d2e3f350cba SHA512 500b5be7e27d9f657b9eeff83d0c39d3fc85cc801958e92b899bfb8d3b30f5c78c820cd1529932cc4a3f20050cdf425cdd17e76dedf597413e2a16af4a199129
+DIST asm.traineddata-tessdata_legacy-4.1.0 2045457 BLAKE2B 793a6cf489b5b115086952d424b062dce0baaa40456a5d4d4825ac6041d7d26b6f8b72bb95384aefb6441650d7b0e5793f6eb1f80a5c4a2497797d2e3f350cba SHA512 500b5be7e27d9f657b9eeff83d0c39d3fc85cc801958e92b899bfb8d3b30f5c78c820cd1529932cc4a3f20050cdf425cdd17e76dedf597413e2a16af4a199129
DIST aze.traineddata-tessdata_legacy-4.0.0 10139884 BLAKE2B 608c5372ad3901af85505d432178dcd84b3ba68bb446b5169fd6a1e0db840e5ff27d4a4ef624a6316dc9d0c8362930dc575067de07efe7af9b58e2b8aa2d8ec4 SHA512 24cfc52e8d36495bcc2cfcdd41cde539582541e6a98d2e151311189db033a7749ee7f846e21ba504e511037284099f2d4da4d7909b15dae92375638d39adb74c
+DIST aze.traineddata-tessdata_legacy-4.1.0 10139884 BLAKE2B 608c5372ad3901af85505d432178dcd84b3ba68bb446b5169fd6a1e0db840e5ff27d4a4ef624a6316dc9d0c8362930dc575067de07efe7af9b58e2b8aa2d8ec4 SHA512 24cfc52e8d36495bcc2cfcdd41cde539582541e6a98d2e151311189db033a7749ee7f846e21ba504e511037284099f2d4da4d7909b15dae92375638d39adb74c
DIST aze_cyrl.traineddata-tessdata_legacy-4.0.0 4726411 BLAKE2B b0fd32c05f704cbc13c7c5a832d2395b2a8c86922f8781d4d03d7ba177956ff050646db1a833ee80e7a209a119ee1e47a6adc2e8d90b57eb1d5fdddefbd6933d SHA512 160dc9fdb07deae92f00e6a00c23906d891a445ed78bf2046fe93d5779a64ace1ea6d134640f92aa91cfaff11244d9f0aa9f55ef735bcd760ff8d75e9cc9aa1b
+DIST aze_cyrl.traineddata-tessdata_legacy-4.1.0 4726411 BLAKE2B b0fd32c05f704cbc13c7c5a832d2395b2a8c86922f8781d4d03d7ba177956ff050646db1a833ee80e7a209a119ee1e47a6adc2e8d90b57eb1d5fdddefbd6933d SHA512 160dc9fdb07deae92f00e6a00c23906d891a445ed78bf2046fe93d5779a64ace1ea6d134640f92aa91cfaff11244d9f0aa9f55ef735bcd760ff8d75e9cc9aa1b
DIST bel.traineddata-tessdata_legacy-4.0.0 11185811 BLAKE2B 78be505c559865d8c81849a1acdb342fc05ae55f1a9a2a154203b11e13c7aafae08e53e9572760ec43aa24728ac38a0fafdeb458054c3150d399abf25760a617 SHA512 e5df0c9c0470ccf786eb8629ea525e945af0bf8487dc7ea13130d81120145bc1fe7dcac6d24cc3d26cb9992ef61d126c5920e35a22a7bfe5aa05428588c1f57c
+DIST bel.traineddata-tessdata_legacy-4.1.0 11185811 BLAKE2B 78be505c559865d8c81849a1acdb342fc05ae55f1a9a2a154203b11e13c7aafae08e53e9572760ec43aa24728ac38a0fafdeb458054c3150d399abf25760a617 SHA512 e5df0c9c0470ccf786eb8629ea525e945af0bf8487dc7ea13130d81120145bc1fe7dcac6d24cc3d26cb9992ef61d126c5920e35a22a7bfe5aa05428588c1f57c
DIST ben.traineddata-tessdata_legacy-4.0.0 1789439 BLAKE2B 47db7752ff6bf7ed21b96dbce261786917c63cb931a2266000f299a1cd3ac2d8d5c7ceff45bfdda879b4101f5888959fb52a7ed406469865c5623ec433ab13a5 SHA512 e9ee3bd2ce1018d7f100d0c9ce1f504156d260d2c8d0fe14c3c614f058b9b512d8366a55d2919813b97854bebd5c296df90b9292994f35d21d12970360a05973
+DIST ben.traineddata-tessdata_legacy-4.1.0 1789439 BLAKE2B 47db7752ff6bf7ed21b96dbce261786917c63cb931a2266000f299a1cd3ac2d8d5c7ceff45bfdda879b4101f5888959fb52a7ed406469865c5623ec433ab13a5 SHA512 e9ee3bd2ce1018d7f100d0c9ce1f504156d260d2c8d0fe14c3c614f058b9b512d8366a55d2919813b97854bebd5c296df90b9292994f35d21d12970360a05973
DIST bod.traineddata-tessdata_legacy-4.0.0 1966470 BLAKE2B 6aaefbb8bf09a52f471c085eed1c311f05a60fd1e2b655255c7e66736f8004352f25ed187ec1c542070fd82b3650ede3b60179556b635e00ca71bacff0b510f1 SHA512 c6c1f05523a2a1a3f566521ca466c2658d792906a0d3115d3abc328b62f2644175abf0a649b72d6127dee4d665448a0e36532bd38fdcf694145f2ebe3a18bb10
+DIST bod.traineddata-tessdata_legacy-4.1.0 1966470 BLAKE2B 6aaefbb8bf09a52f471c085eed1c311f05a60fd1e2b655255c7e66736f8004352f25ed187ec1c542070fd82b3650ede3b60179556b635e00ca71bacff0b510f1 SHA512 c6c1f05523a2a1a3f566521ca466c2658d792906a0d3115d3abc328b62f2644175abf0a649b72d6127dee4d665448a0e36532bd38fdcf694145f2ebe3a18bb10
DIST bos.traineddata-tessdata_legacy-4.0.0 7930443 BLAKE2B f164434b6559ea68fd509044b418498a062c5e2ec5addd4e9bc73ca3520aafa1af6c49bac75d1b48272b606c5e50199e0b511f32a2feea9b2cbbc63b55f95580 SHA512 d4c76d60f0b56c15076b4ebabab0622a585869149fcc3f3252365adaa89c3b0a6aa0ecbdd59c11bf20cc51056f099b962b0c0e6a6d2ad3f3e9352177e109ee01
+DIST bos.traineddata-tessdata_legacy-4.1.0 7930443 BLAKE2B f164434b6559ea68fd509044b418498a062c5e2ec5addd4e9bc73ca3520aafa1af6c49bac75d1b48272b606c5e50199e0b511f32a2feea9b2cbbc63b55f95580 SHA512 d4c76d60f0b56c15076b4ebabab0622a585869149fcc3f3252365adaa89c3b0a6aa0ecbdd59c11bf20cc51056f099b962b0c0e6a6d2ad3f3e9352177e109ee01
DIST bre.traineddata-tessdata_legacy-4.0.0 6335020 BLAKE2B 5691702fe90ae6d5481fce8c2e59464c4f8301d7dff662de19e16ebfe270fd69fe97b16c831aca7fc1feb6fbdf6d75da37238e18ba94c4427eaf4cfc0ce7d117 SHA512 bab1bc966ed1ac4a4d305564fc99868ff0aa58f719c3b66643cc809acd2205ff8e2e04d02bf6ad60ace1a4ec0ae984df7fef94d1c29488693a49082004beed23
+DIST bre.traineddata-tessdata_legacy-4.1.0 6335020 BLAKE2B 5691702fe90ae6d5481fce8c2e59464c4f8301d7dff662de19e16ebfe270fd69fe97b16c831aca7fc1feb6fbdf6d75da37238e18ba94c4427eaf4cfc0ce7d117 SHA512 bab1bc966ed1ac4a4d305564fc99868ff0aa58f719c3b66643cc809acd2205ff8e2e04d02bf6ad60ace1a4ec0ae984df7fef94d1c29488693a49082004beed23
DIST bul.traineddata-tessdata_legacy-4.0.0 8371797 BLAKE2B 6f3d3861c207df6abce0a502847040fd75355228088fe4c8d864f35883afc300a2ddca077fe1492da0d2c986b9286f1dedaaaecdd5fef441aa49f6040f5299c5 SHA512 c32939ee33af530d65481b5efe6b9edbb7ae272e06a2fbe05142de353634e947887c678aa09e4fc8cc62afadc99d290db9a1b7ccf2551ceb6ec99abf11bd1ace
+DIST bul.traineddata-tessdata_legacy-4.1.0 8371797 BLAKE2B 6f3d3861c207df6abce0a502847040fd75355228088fe4c8d864f35883afc300a2ddca077fe1492da0d2c986b9286f1dedaaaecdd5fef441aa49f6040f5299c5 SHA512 c32939ee33af530d65481b5efe6b9edbb7ae272e06a2fbe05142de353634e947887c678aa09e4fc8cc62afadc99d290db9a1b7ccf2551ceb6ec99abf11bd1ace
DIST cat.traineddata-tessdata_legacy-4.0.0 6502025 BLAKE2B c3c2d8dc074a5fedc7c9b1d69fb23db88801c97371ee666b1dad8153dfd50e387a5af6f995b0b6ed008b344e3400482e9be9783ad8aefe6f0d6b0474ff487a2e SHA512 ea28038ffb6d62a6c5255eaafdc9dbfe6c669e2193279aad300ca112bdce597df6375f26bc19d9dcceeec56641519bbf1595c9c038efcacdf7759f625253591f
+DIST cat.traineddata-tessdata_legacy-4.1.0 6502025 BLAKE2B c3c2d8dc074a5fedc7c9b1d69fb23db88801c97371ee666b1dad8153dfd50e387a5af6f995b0b6ed008b344e3400482e9be9783ad8aefe6f0d6b0474ff487a2e SHA512 ea28038ffb6d62a6c5255eaafdc9dbfe6c669e2193279aad300ca112bdce597df6375f26bc19d9dcceeec56641519bbf1595c9c038efcacdf7759f625253591f
DIST ceb.traineddata-tessdata_legacy-4.0.0 2402839 BLAKE2B 930ca2a957bee72837a2dd312163f53d0894aee0e700c31f75594a220296d2e2feddc41ec80125bfc4dbef478a239bdcfbbf8ba67226b4d15354e160b6bca438 SHA512 17ee20837c77823e43c47627a6fd4d888c346e6f6204b855d45913def1802351fbe6c7973f0633f91ffc1d8a852c372130cd027be25605186d77b0da13e88128
+DIST ceb.traineddata-tessdata_legacy-4.1.0 2402839 BLAKE2B 930ca2a957bee72837a2dd312163f53d0894aee0e700c31f75594a220296d2e2feddc41ec80125bfc4dbef478a239bdcfbbf8ba67226b4d15354e160b6bca438 SHA512 17ee20837c77823e43c47627a6fd4d888c346e6f6204b855d45913def1802351fbe6c7973f0633f91ffc1d8a852c372130cd027be25605186d77b0da13e88128
DIST ces.traineddata-tessdata_legacy-4.0.0 16238266 BLAKE2B 07ea65df7fc5052346d519602bfccbf404cdfc321c2bef90fe0a72042430eecfdc145db34e579495be48b17efc5bebbff289f62c6883fbbfa2c34869ec0a773c SHA512 b1180f4473ac5172f653b4ec957f8e9d7427e1dfdef1ee23c6f6d2fae8f7ddc6a3db40a070b00784647b1eb09e2b14b891e5c33c21c0ca4db4808cf0993e0a0a
+DIST ces.traineddata-tessdata_legacy-4.1.0 16238266 BLAKE2B 07ea65df7fc5052346d519602bfccbf404cdfc321c2bef90fe0a72042430eecfdc145db34e579495be48b17efc5bebbff289f62c6883fbbfa2c34869ec0a773c SHA512 b1180f4473ac5172f653b4ec957f8e9d7427e1dfdef1ee23c6f6d2fae8f7ddc6a3db40a070b00784647b1eb09e2b14b891e5c33c21c0ca4db4808cf0993e0a0a
DIST chi_sim.traineddata-tessdata_legacy-4.0.0 44366093 BLAKE2B 9dda7c1c96020e2e26f9801a5692932ffcc8c023034749b5f5ac35bf75821e7f96a94a42efaf32f983106a79ccf345c683feaaddcd27cf135bd059fb3677850e SHA512 3281d2098c25bd5c34603216183c9d5dd949c2982bc4d357f09c56875328640a4f8f79619baf8872e3f6814cfe2368cbfe13b1f1526439964d087a8b0b675031
+DIST chi_sim.traineddata-tessdata_legacy-4.1.0 44366093 BLAKE2B 9dda7c1c96020e2e26f9801a5692932ffcc8c023034749b5f5ac35bf75821e7f96a94a42efaf32f983106a79ccf345c683feaaddcd27cf135bd059fb3677850e SHA512 3281d2098c25bd5c34603216183c9d5dd949c2982bc4d357f09c56875328640a4f8f79619baf8872e3f6814cfe2368cbfe13b1f1526439964d087a8b0b675031
DIST chi_sim_vert.traineddata-tessdata_legacy-4.0.0 2470991 BLAKE2B 5185759161703c0d48dabe2f0242c2c73521612b309ead0a9aa83edbb5c9d8b071937985d3c1a1fc1d1acfa37d12e998bb3461e0d3e29dc4ee8c4f7e69f48072 SHA512 b802f4cac91d16e6a1129f5cf553657731aaaefd9dfe1da797729515260cb5e76d182ec1d964ca7b780ea8e62bd03974b19f351c653314ce7dbfb00571d68814
+DIST chi_sim_vert.traineddata-tessdata_legacy-4.1.0 2470991 BLAKE2B 5185759161703c0d48dabe2f0242c2c73521612b309ead0a9aa83edbb5c9d8b071937985d3c1a1fc1d1acfa37d12e998bb3461e0d3e29dc4ee8c4f7e69f48072 SHA512 b802f4cac91d16e6a1129f5cf553657731aaaefd9dfe1da797729515260cb5e76d182ec1d964ca7b780ea8e62bd03974b19f351c653314ce7dbfb00571d68814
DIST chi_tra.traineddata-tessdata_legacy-4.0.0 59025073 BLAKE2B 6912a8357b43fa0e626871e838fc7be598478e24dddd3aceb0240360037fd7791ddfc4b2203bb910a7d777579f88d44cfad6e0a5983ec86ec58b6abe3badb1b3 SHA512 2f090ec33d31ad79905796e56c2d6de551e62441e86fbcea93f88c08bbfad6c51b27d92a8f0f45c967e5d25ccccd0e7fb67410f1a88f8774027cba376ca4cc84
+DIST chi_tra.traineddata-tessdata_legacy-4.1.0 59025073 BLAKE2B 6912a8357b43fa0e626871e838fc7be598478e24dddd3aceb0240360037fd7791ddfc4b2203bb910a7d777579f88d44cfad6e0a5983ec86ec58b6abe3badb1b3 SHA512 2f090ec33d31ad79905796e56c2d6de551e62441e86fbcea93f88c08bbfad6c51b27d92a8f0f45c967e5d25ccccd0e7fb67410f1a88f8774027cba376ca4cc84
DIST chi_tra_vert.traineddata-tessdata_legacy-4.0.0 2368306 BLAKE2B 1611f6b986a225478882adf00b3e6108c4aadc1ef456fae2a9798a8af2589b38d772e2c027f0c7e5be73e9730cd38fba7147f3fdd165d4bd767313897a9c66d5 SHA512 b706508c402a898d63d781ae3d9d109996a41b896831cc3277cfce811d7892da5c433d9423e7e377fb114b86a05c1c597412d7e729d3865f6f00467cd866623b
+DIST chi_tra_vert.traineddata-tessdata_legacy-4.1.0 2368306 BLAKE2B 1611f6b986a225478882adf00b3e6108c4aadc1ef456fae2a9798a8af2589b38d772e2c027f0c7e5be73e9730cd38fba7147f3fdd165d4bd767313897a9c66d5 SHA512 b706508c402a898d63d781ae3d9d109996a41b896831cc3277cfce811d7892da5c433d9423e7e377fb114b86a05c1c597412d7e729d3865f6f00467cd866623b
DIST chr.traineddata-tessdata_legacy-4.0.0 1458011 BLAKE2B d30cc84204f92bf270be75ee280374001fa73eef40a1aa1c8c3647365c6be594d5df446c32d84ca7c129d2374c458b4c0d86f08c83b767012dfd266f033f5010 SHA512 67606907a676c1d9b8aada52d341416d5e7001af430edb80b61e37fb78fc4f3854c97a63fc7d3644951f7016ab9aa3f97ac14600e8b18894bff83c44020edbce
+DIST chr.traineddata-tessdata_legacy-4.1.0 1458011 BLAKE2B d30cc84204f92bf270be75ee280374001fa73eef40a1aa1c8c3647365c6be594d5df446c32d84ca7c129d2374c458b4c0d86f08c83b767012dfd266f033f5010 SHA512 67606907a676c1d9b8aada52d341416d5e7001af430edb80b61e37fb78fc4f3854c97a63fc7d3644951f7016ab9aa3f97ac14600e8b18894bff83c44020edbce
DIST cos.traineddata-tessdata_legacy-4.0.0 2299112 BLAKE2B fbcd7c6afcc2549b8d162e0205eb3e3808a83beee427ec682013694de475d905b13d01d2fdf63c6d35352f677dfa2c3565254bec82689ac2a8269bce77cac03e SHA512 f6d363ec553d9f3c52b090b2513f3500c01ef149696f718a39994a0eaeeb32c3bfd3e47ce6d009e010c543073332107fa27c03784f1025bd3efe18ce0b567420
+DIST cos.traineddata-tessdata_legacy-4.1.0 2299112 BLAKE2B fbcd7c6afcc2549b8d162e0205eb3e3808a83beee427ec682013694de475d905b13d01d2fdf63c6d35352f677dfa2c3565254bec82689ac2a8269bce77cac03e SHA512 f6d363ec553d9f3c52b090b2513f3500c01ef149696f718a39994a0eaeeb32c3bfd3e47ce6d009e010c543073332107fa27c03784f1025bd3efe18ce0b567420
DIST cym.traineddata-tessdata_legacy-4.0.0 5998144 BLAKE2B dd085261b3a6e1060beb8bb8bc5dab1be23f5bdff31967ae056972f06e2f791b302010d665849cf165b6be8db02ec2a4d0890a6d889d415c5e65c14a35594d7d SHA512 b30cd745962da1cae6718362048aaa6006b0705e42372a5fea353ba5d600b7c3b4a2a55520418fc3d5ebb87b62d8b3f8bc33573b110899fcf62c5b57f80af3b2
+DIST cym.traineddata-tessdata_legacy-4.1.0 5998144 BLAKE2B dd085261b3a6e1060beb8bb8bc5dab1be23f5bdff31967ae056972f06e2f791b302010d665849cf165b6be8db02ec2a4d0890a6d889d415c5e65c14a35594d7d SHA512 b30cd745962da1cae6718362048aaa6006b0705e42372a5fea353ba5d600b7c3b4a2a55520418fc3d5ebb87b62d8b3f8bc33573b110899fcf62c5b57f80af3b2
DIST dan.traineddata-tessdata_legacy-4.0.0 10578171 BLAKE2B 5221fad713af6c2021558c675f70e7f75057306c6376c4182477b6cb255d5e4f525dcfcb0d4f1d5a9e9235cd9ae70f032517431f7323809df190cc257f41a961 SHA512 97374bee706dedafcdade1eb7b93746acd94e4a5f0287f94987bee03e1dfa1b7bcddded60ba5776d524c8d5e6c33511c6755df4eccbe97c4b4b3a221a6c466fc
+DIST dan.traineddata-tessdata_legacy-4.1.0 10578171 BLAKE2B 5221fad713af6c2021558c675f70e7f75057306c6376c4182477b6cb255d5e4f525dcfcb0d4f1d5a9e9235cd9ae70f032517431f7323809df190cc257f41a961 SHA512 97374bee706dedafcdade1eb7b93746acd94e4a5f0287f94987bee03e1dfa1b7bcddded60ba5776d524c8d5e6c33511c6755df4eccbe97c4b4b3a221a6c466fc
DIST deu.traineddata-tessdata_legacy-4.0.0 15437534 BLAKE2B be973bfae962658d51f602b6b49da3d1dae3f00609360756847236d7110256522195272a163e222c048f5301388892c55ac2e13d2d6cf01fb3515b7821544612 SHA512 3f8396d12291476b37990f5ae54231e2d631b9fbf9cc8a61d2aac89f908ab9a857c53bd6c1fa59ba43db97c68f796057599853a755496b991be25f888970a0d6
+DIST deu.traineddata-tessdata_legacy-4.1.0 15437534 BLAKE2B be973bfae962658d51f602b6b49da3d1dae3f00609360756847236d7110256522195272a163e222c048f5301388892c55ac2e13d2d6cf01fb3515b7821544612 SHA512 3f8396d12291476b37990f5ae54231e2d631b9fbf9cc8a61d2aac89f908ab9a857c53bd6c1fa59ba43db97c68f796057599853a755496b991be25f888970a0d6
DIST div.traineddata-tessdata_legacy-4.0.0 1774548 BLAKE2B a98269d00897c750fee322adf0c5b93acc9f2a61c4eca0d7fb4ddfbaae6b705b15a96bdfa9543f878b533162e1f16b90fdbf5ae576fcf738c0e7135df100f39e SHA512 25730f236bff127454e3e05b61ae3ae81ec2f2a9f308a58729d0e406af5481a4881e8f0f156b08afd09b71c21370150d98997e5c68f1d75069707d08cb798f28
+DIST div.traineddata-tessdata_legacy-4.1.0 1774548 BLAKE2B a98269d00897c750fee322adf0c5b93acc9f2a61c4eca0d7fb4ddfbaae6b705b15a96bdfa9543f878b533162e1f16b90fdbf5ae576fcf738c0e7135df100f39e SHA512 25730f236bff127454e3e05b61ae3ae81ec2f2a9f308a58729d0e406af5481a4881e8f0f156b08afd09b71c21370150d98997e5c68f1d75069707d08cb798f28
DIST dzo.traineddata-tessdata_legacy-4.0.0 449626 BLAKE2B 633a8784d610bf588e6234bd958cbe3725625c08c4cbd745312a7b25b15e65bc6e66a64a4632d5a6eed9c38114ee13a0d1caf58b4df6e7e7890b3c8e060d9a02 SHA512 17d011ef9cd59fe64b618c395cbb6e26dd57127039db23e73c3dc41552b47e218f85d267fca95088e7239bd2475b78e00c66d694f8d6bc6361c406fa60cb0c25
+DIST dzo.traineddata-tessdata_legacy-4.1.0 449626 BLAKE2B 633a8784d610bf588e6234bd958cbe3725625c08c4cbd745312a7b25b15e65bc6e66a64a4632d5a6eed9c38114ee13a0d1caf58b4df6e7e7890b3c8e060d9a02 SHA512 17d011ef9cd59fe64b618c395cbb6e26dd57127039db23e73c3dc41552b47e218f85d267fca95088e7239bd2475b78e00c66d694f8d6bc6361c406fa60cb0c25
DIST ell.traineddata-tessdata_legacy-4.0.0 7543380 BLAKE2B eeeb1f62730bdcc09e007c6055466fdcb7227697801b38c7f059422f29ffaea2d24c121256aca45c17eccb5843731a96144cdcde16e82f3586b5d90780073b53 SHA512 42079b235b8aeffd86aa0a063d922b2018e75ede82a1136c99347bb3cbc7c2638c26feccdfb2cf6d42c3d5f445c14e598d5f0147f6af9e23107af27b3980c59f
+DIST ell.traineddata-tessdata_legacy-4.1.0 7543380 BLAKE2B eeeb1f62730bdcc09e007c6055466fdcb7227697801b38c7f059422f29ffaea2d24c121256aca45c17eccb5843731a96144cdcde16e82f3586b5d90780073b53 SHA512 42079b235b8aeffd86aa0a063d922b2018e75ede82a1136c99347bb3cbc7c2638c26feccdfb2cf6d42c3d5f445c14e598d5f0147f6af9e23107af27b3980c59f
DIST eng.traineddata-tessdata_legacy-4.0.0 23466654 BLAKE2B 4df77ba3f80b0142509839e4d5af5523734930cf211712440cfb09fae6e76849f0a9ba79710cdbb5ebaa7c646fb5ce3c7aa31e09e318719a136fa0797eaad16a SHA512 bf1a730ce314fbafa065547e40703a1ffbe7f080557c59088a1b59944af3b94bd7da51cec0f322558d72ab3bdaec14ae96eb43aac705859ed5422702028a8b77
+DIST eng.traineddata-tessdata_legacy-4.1.0 23466654 BLAKE2B 4df77ba3f80b0142509839e4d5af5523734930cf211712440cfb09fae6e76849f0a9ba79710cdbb5ebaa7c646fb5ce3c7aa31e09e318719a136fa0797eaad16a SHA512 bf1a730ce314fbafa065547e40703a1ffbe7f080557c59088a1b59944af3b94bd7da51cec0f322558d72ab3bdaec14ae96eb43aac705859ed5422702028a8b77
DIST enm.traineddata-tessdata_legacy-4.0.0 5207312 BLAKE2B bd78dfa5d29622165fce0d6f5fb898b57a355046755797fdd1df7e781a6ea3a71b12fec45f746e190479e3ddc00ab51cd851c14bbc8e8737d1c64986d7c81fe3 SHA512 5e54eec9dfec915c427589fe46ea14a74e0c0a86a1be0abd23602cc1136304f34c3aedf4710b49615a1d52ab07a05e5f13f33346ae3fd3ba7cca651a9896def2
+DIST enm.traineddata-tessdata_legacy-4.1.0 5207312 BLAKE2B bd78dfa5d29622165fce0d6f5fb898b57a355046755797fdd1df7e781a6ea3a71b12fec45f746e190479e3ddc00ab51cd851c14bbc8e8737d1c64986d7c81fe3 SHA512 5e54eec9dfec915c427589fe46ea14a74e0c0a86a1be0abd23602cc1136304f34c3aedf4710b49615a1d52ab07a05e5f13f33346ae3fd3ba7cca651a9896def2
DIST epo.traineddata-tessdata_legacy-4.0.0 11330444 BLAKE2B 13c59b70ec450576a711ae8df0f5fbaf570f9546eba4dcefd12e9a1e919ea2df7efe09506959455f82580612a0458aba7282de360f055bb5ea2d5b50aed06e11 SHA512 09ed23595a04fe0d22423cfdc6550a5b784e4bece7257ee175861030db32457631fc612d33227cab355a465622f2ff8d976f5cc8cf1698465f474a8f1105dfde
+DIST epo.traineddata-tessdata_legacy-4.1.0 11330444 BLAKE2B 13c59b70ec450576a711ae8df0f5fbaf570f9546eba4dcefd12e9a1e919ea2df7efe09506959455f82580612a0458aba7282de360f055bb5ea2d5b50aed06e11 SHA512 09ed23595a04fe0d22423cfdc6550a5b784e4bece7257ee175861030db32457631fc612d33227cab355a465622f2ff8d976f5cc8cf1698465f474a8f1105dfde
DIST equ.traineddata-tessdata_legacy-4.0.0 2251950 BLAKE2B fd4d2a15d9a49bd60d429eec947f46a693a2b51bda4bf5aad9a38b2ff48fe323074f48a4103754efde1ce4b4eb48023bd2c24fed52e4815a2a6a2f9e818d085c SHA512 aa95d32330e3ee52cfedd4695246acb5b508f35b7a7e5cd5055f8f4d773cf5cede8d87b6877c4ed4fbe78ade748d45f91a66bcdef2e43c7d7311dd3272ea0cfc
+DIST equ.traineddata-tessdata_legacy-4.1.0 2251950 BLAKE2B fd4d2a15d9a49bd60d429eec947f46a693a2b51bda4bf5aad9a38b2ff48fe323074f48a4103754efde1ce4b4eb48023bd2c24fed52e4815a2a6a2f9e818d085c SHA512 aa95d32330e3ee52cfedd4695246acb5b508f35b7a7e5cd5055f8f4d773cf5cede8d87b6877c4ed4fbe78ade748d45f91a66bcdef2e43c7d7311dd3272ea0cfc
DIST est.traineddata-tessdata_legacy-4.0.0 15301628 BLAKE2B 68a8f656b1f910c3d30ae8be88461d721609a3451e402b1e9ec91a6bb2145d5e35ef7b25f4e04fdcfdc2f786d65820b426dc7772cc45a49c6401f986c0d5a08a SHA512 18abcb2ea4bd85a0083966b8fe9407c2098ab1a195dcf3681ea2f0be20b291a09598604b214e85f5e996983f3b4b15319a024d0cffe72caff9885c292ce2d889
+DIST est.traineddata-tessdata_legacy-4.1.0 15301628 BLAKE2B 68a8f656b1f910c3d30ae8be88461d721609a3451e402b1e9ec91a6bb2145d5e35ef7b25f4e04fdcfdc2f786d65820b426dc7772cc45a49c6401f986c0d5a08a SHA512 18abcb2ea4bd85a0083966b8fe9407c2098ab1a195dcf3681ea2f0be20b291a09598604b214e85f5e996983f3b4b15319a024d0cffe72caff9885c292ce2d889
DIST eus.traineddata-tessdata_legacy-4.0.0 10145441 BLAKE2B e5cf454d86ddc97e9b7135b03996c2884354a6b362bdd8093fdb03d859c812341fc710fdd2ae5ffef9b51ea62645fc62c57a8536a63c95269985ccd05402ebb6 SHA512 e9e748331794808ab556132ef74bc24007148ccf197fdd56d4e3c85bd25cd116bcf1b361e33806f67d23108ff7776fdef55f8711fcfa8287faf92ab7503d5ce5
+DIST eus.traineddata-tessdata_legacy-4.1.0 10145441 BLAKE2B e5cf454d86ddc97e9b7135b03996c2884354a6b362bdd8093fdb03d859c812341fc710fdd2ae5ffef9b51ea62645fc62c57a8536a63c95269985ccd05402ebb6 SHA512 e9e748331794808ab556132ef74bc24007148ccf197fdd56d4e3c85bd25cd116bcf1b361e33806f67d23108ff7776fdef55f8711fcfa8287faf92ab7503d5ce5
DIST fao.traineddata-tessdata_legacy-4.0.0 3439785 BLAKE2B 26ffa4759f0d674c8c93bb9ff892446e422538a233f97762789a07a0604569cefc1705c6c30f9f5805c9662bb69511250d22e41f716e87a78dfe401ef57dc2d9 SHA512 029e9cb1203894de4ac4c9c65ec255dd371682e303b99e29332e8fc2b2842e6f558cd92f285e0df349f158cd6b14e6fd0a780c7d50ff3490704a0817e79ed7a3
+DIST fao.traineddata-tessdata_legacy-4.1.0 3439785 BLAKE2B 26ffa4759f0d674c8c93bb9ff892446e422538a233f97762789a07a0604569cefc1705c6c30f9f5805c9662bb69511250d22e41f716e87a78dfe401ef57dc2d9 SHA512 029e9cb1203894de4ac4c9c65ec255dd371682e303b99e29332e8fc2b2842e6f558cd92f285e0df349f158cd6b14e6fd0a780c7d50ff3490704a0817e79ed7a3
DIST fas.traineddata-tessdata_legacy-4.0.0 561272 BLAKE2B 39e024d95d2c4dc0144129832f49891740eb2d383f51e0a42b134d49ccfe1b88cfd02bf05863ba45e7a5d6521b66218b2403287c253bc67ed673f581610f76c2 SHA512 b1f36737de6d165b12505b88ad5707bec968d4b266f751fa1c0acb0bf2eac5fe4cfb37ca55ff84162f8d000eb32948c681a0cef141d2fb65d2ce2f3c67da83a1
+DIST fas.traineddata-tessdata_legacy-4.1.0 561272 BLAKE2B 39e024d95d2c4dc0144129832f49891740eb2d383f51e0a42b134d49ccfe1b88cfd02bf05863ba45e7a5d6521b66218b2403287c253bc67ed673f581610f76c2 SHA512 b1f36737de6d165b12505b88ad5707bec968d4b266f751fa1c0acb0bf2eac5fe4cfb37ca55ff84162f8d000eb32948c681a0cef141d2fb65d2ce2f3c67da83a1
DIST fil.traineddata-tessdata_legacy-4.0.0 2509440 BLAKE2B 3d6b9c20a5043aca5ed05ca9d29068c64fab27804aa6c1225f0d3b834c0e4f2bcb8d3cc6b6d5582fb2775bdb41e5347831e7784798b77172cb6bd2b21b5cad1b SHA512 47a51bf468fb365c356774f68f14f1f78afa4a044b265e9622d054140121026c035ae475179069aeab7368c6ee050eb1faa8816e4c0559bb59fc174e4a1d98a5
+DIST fil.traineddata-tessdata_legacy-4.1.0 2509440 BLAKE2B 3d6b9c20a5043aca5ed05ca9d29068c64fab27804aa6c1225f0d3b834c0e4f2bcb8d3cc6b6d5582fb2775bdb41e5347831e7784798b77172cb6bd2b21b5cad1b SHA512 47a51bf468fb365c356774f68f14f1f78afa4a044b265e9622d054140121026c035ae475179069aeab7368c6ee050eb1faa8816e4c0559bb59fc174e4a1d98a5
DIST fin.traineddata-tessdata_legacy-4.0.0 21140513 BLAKE2B 66c0370d90aa197780a56c501875aee79c04aed0adfbc86079d9e80cab7888f7866649ebef5180ff5a6fdc8728bb821ee93e0f2e51275fd45775f4883f938077 SHA512 788cf5c2679c8a5143cb579afb406eeda1c08f4760a72aa27512b62e8d2a4a714fe715e02c3463536a5eb466a843f2f9b0c5f66f787a25c1c650dad2dd50d6ed
+DIST fin.traineddata-tessdata_legacy-4.1.0 21140513 BLAKE2B 66c0370d90aa197780a56c501875aee79c04aed0adfbc86079d9e80cab7888f7866649ebef5180ff5a6fdc8728bb821ee93e0f2e51275fd45775f4883f938077 SHA512 788cf5c2679c8a5143cb579afb406eeda1c08f4760a72aa27512b62e8d2a4a714fe715e02c3463536a5eb466a843f2f9b0c5f66f787a25c1c650dad2dd50d6ed
DIST fra.traineddata-tessdata_legacy-4.0.0 14213351 BLAKE2B 6f0eff67f9902704c74fa8bfb534d155ad97353c6c25241ed6d8d7d716db1d764e018344752d724aae9b9e9a326290cb67e8c48a4e0039395f7e7938efb27175 SHA512 abd84d1f0a9436ec4a9089ba288d9d21af8c6bd8897c3fc991c2ffdaa16224c084b6705606b91cd17152cc5e647fe2f781af0c5e392bb10f5693d7ebbda0838b
+DIST fra.traineddata-tessdata_legacy-4.1.0 14213351 BLAKE2B 6f0eff67f9902704c74fa8bfb534d155ad97353c6c25241ed6d8d7d716db1d764e018344752d724aae9b9e9a326290cb67e8c48a4e0039395f7e7938efb27175 SHA512 abd84d1f0a9436ec4a9089ba288d9d21af8c6bd8897c3fc991c2ffdaa16224c084b6705606b91cd17152cc5e647fe2f781af0c5e392bb10f5693d7ebbda0838b
DIST frk.traineddata-tessdata_legacy-4.0.0 22874034 BLAKE2B 9f04aa056191a488635bbe9f45f7a4e1bf1496982a176de4e7ce39dda13af0decb530c43f034a06c1e0f3889f6b03386f702124ddc0d1ed4ebc344aef648f1e9 SHA512 5cc1a97b6b3ad210bfab033bafa8ffaae5195958bc212e735aff6fbbe65509be71c3a790c9873819d1f93d9ce3c32a2bc3e8b5652e69335bbedd7cd5478bcd22
+DIST frk.traineddata-tessdata_legacy-4.1.0 22874034 BLAKE2B 9f04aa056191a488635bbe9f45f7a4e1bf1496982a176de4e7ce39dda13af0decb530c43f034a06c1e0f3889f6b03386f702124ddc0d1ed4ebc344aef648f1e9 SHA512 5cc1a97b6b3ad210bfab033bafa8ffaae5195958bc212e735aff6fbbe65509be71c3a790c9873819d1f93d9ce3c32a2bc3e8b5652e69335bbedd7cd5478bcd22
DIST frm.traineddata-tessdata_legacy-4.0.0 17856636 BLAKE2B 045091157220016da84e5dfbf07e98c697b5f29a6719491f9059fec40216f7806c582e90bb19257f3b7e56ea5ae7c37a49a992ed6420001e5c0224e29426867a SHA512 08a88e0f1488a6ed471c5842cf8f39982e12eef397dcdeb2dbbe0902c9ced6af6e39e4a4142a9d97cfa5a6f75c5b609267bc8e4e4bb8db25d07a3ca922b4733e
+DIST frm.traineddata-tessdata_legacy-4.1.0 17856636 BLAKE2B 045091157220016da84e5dfbf07e98c697b5f29a6719491f9059fec40216f7806c582e90bb19257f3b7e56ea5ae7c37a49a992ed6420001e5c0224e29426867a SHA512 08a88e0f1488a6ed471c5842cf8f39982e12eef397dcdeb2dbbe0902c9ced6af6e39e4a4142a9d97cfa5a6f75c5b609267bc8e4e4bb8db25d07a3ca922b4733e
DIST fry.traineddata-tessdata_legacy-4.0.0 1906031 BLAKE2B 727ac1cba9ac269c091cbe9942161f2e7ef0f546b3164611a6b937c7ee6e18ee037056d2791530e91475e3508e6219f595024d55014679f85a1686be4e87a4b7 SHA512 6ed4797e0b8b01e50fc296ba58b1ff9fb9612cae479945e08e5273af3e9bcd75b52cde895cd026329c91dc0302571c89a6ee48e589a8712f616948c740759afd
+DIST fry.traineddata-tessdata_legacy-4.1.0 1906031 BLAKE2B 727ac1cba9ac269c091cbe9942161f2e7ef0f546b3164611a6b937c7ee6e18ee037056d2791530e91475e3508e6219f595024d55014679f85a1686be4e87a4b7 SHA512 6ed4797e0b8b01e50fc296ba58b1ff9fb9612cae479945e08e5273af3e9bcd75b52cde895cd026329c91dc0302571c89a6ee48e589a8712f616948c740759afd
DIST gla.traineddata-tessdata_legacy-4.0.0 3068320 BLAKE2B fe7abefb18abe8673deda2ccb3a8c80139b4ff89c36385577a1624ad2425e0bdc4ed73af646a488d2ac37711b5e56a8358ff8cf263c65a9723987ec5f4edeec4 SHA512 db445b8c82c723c0b4ac6a5cbb306ca9d1edc6a10ca26992d2de710f710b908ef6fe2ac6c83d068752436fbb3f7721455e213d0ab998207586aaf5581d46c0a7
+DIST gla.traineddata-tessdata_legacy-4.1.0 3068320 BLAKE2B fe7abefb18abe8673deda2ccb3a8c80139b4ff89c36385577a1624ad2425e0bdc4ed73af646a488d2ac37711b5e56a8358ff8cf263c65a9723987ec5f4edeec4 SHA512 db445b8c82c723c0b4ac6a5cbb306ca9d1edc6a10ca26992d2de710f710b908ef6fe2ac6c83d068752436fbb3f7721455e213d0ab998207586aaf5581d46c0a7
DIST gle.traineddata-tessdata_legacy-4.0.0 4664254 BLAKE2B 13f8f2ad88bc72dabf54d3094c9840b8e42a7091040d4862ad4a2f4cc69070a768430c93087e82ff617cb4d1cd7a38fb2d011795a1d623ca2f796aa21f4f9969 SHA512 d535f20606fbe30c08994aadd2de4490c558b4c7cf5b75c069f556b66f5dee5ec306b9fd402f598ba73ba30d046c8410665163df1c0461c979f7f2e374177d0a
+DIST gle.traineddata-tessdata_legacy-4.1.0 4664254 BLAKE2B 13f8f2ad88bc72dabf54d3094c9840b8e42a7091040d4862ad4a2f4cc69070a768430c93087e82ff617cb4d1cd7a38fb2d011795a1d623ca2f796aa21f4f9969 SHA512 d535f20606fbe30c08994aadd2de4490c558b4c7cf5b75c069f556b66f5dee5ec306b9fd402f598ba73ba30d046c8410665163df1c0461c979f7f2e374177d0a
DIST glg.traineddata-tessdata_legacy-4.0.0 8074927 BLAKE2B f334a814b2a016a5736f0ef72a43e78fdd90b9f2aaccf293c8c2d6b4b580497756c205893b7865fa209538a126ffed6040b0eb0fbe63b1afc26287348027f946 SHA512 43599e948012a3476c17fbf6ca836c92065c5b56b9d171e08eebf651c49febfa1af9d39d7cc63f9a1e66d7cd4a1ee8c9cf223384e33e931d0282b4871080ed51
+DIST glg.traineddata-tessdata_legacy-4.1.0 8074927 BLAKE2B f334a814b2a016a5736f0ef72a43e78fdd90b9f2aaccf293c8c2d6b4b580497756c205893b7865fa209538a126ffed6040b0eb0fbe63b1afc26287348027f946 SHA512 43599e948012a3476c17fbf6ca836c92065c5b56b9d171e08eebf651c49febfa1af9d39d7cc63f9a1e66d7cd4a1ee8c9cf223384e33e931d0282b4871080ed51
DIST grc.traineddata-tessdata_legacy-4.0.0 7428728 BLAKE2B cc1716ea2e53ea84b8865e5f50157ca2c448447b72dd21509cc056b38187dc639d777be38b9075f84281f626eb1d4a395f81b0ff945a5fc4aad32d824aa4ae26 SHA512 f8c8d7c5486b3106ff80fa01d9edc580acab589884078e6e816bfc4e965e9e8bab410630a1a9fb27b82e6a7b80d05c1eb788a68267563cb4460d850127ae4ada
+DIST grc.traineddata-tessdata_legacy-4.1.0 7428728 BLAKE2B cc1716ea2e53ea84b8865e5f50157ca2c448447b72dd21509cc056b38187dc639d777be38b9075f84281f626eb1d4a395f81b0ff945a5fc4aad32d824aa4ae26 SHA512 f8c8d7c5486b3106ff80fa01d9edc580acab589884078e6e816bfc4e965e9e8bab410630a1a9fb27b82e6a7b80d05c1eb788a68267563cb4460d850127ae4ada
DIST guj.traineddata-tessdata_legacy-4.0.0 1963128 BLAKE2B 3915831f64becd782bc99883e3fa1dc188d25308fb8a41f7c13948a3a39df3e6821b35df08c0dd5cfc5eb4140df958211a2112acd4a88f757bc5f68082b92b0d SHA512 5b1f977a17b988fa90e9ccf019517ed8564c9644abb7bb7ac489ba42625ae6ae6007d30fd7298503bd1a42c4e93f91f26c6f93efb2fc5ef36964e4eba8d9b812
+DIST guj.traineddata-tessdata_legacy-4.1.0 1963128 BLAKE2B 3915831f64becd782bc99883e3fa1dc188d25308fb8a41f7c13948a3a39df3e6821b35df08c0dd5cfc5eb4140df958211a2112acd4a88f757bc5f68082b92b0d SHA512 5b1f977a17b988fa90e9ccf019517ed8564c9644abb7bb7ac489ba42625ae6ae6007d30fd7298503bd1a42c4e93f91f26c6f93efb2fc5ef36964e4eba8d9b812
DIST hat.traineddata-tessdata_legacy-4.0.0 3326722 BLAKE2B 927e0916425c1e9d1e17a884e4fc413217231c38a38e404360bbcdbc80f410d5bdac4ec752e365dc137fbfb6d48cc8b5d0d3da93c6f885fc8ec8758a58ad4c5e SHA512 bf5b5e80b32679201c1a65b8053473d2bcf987ace1b90297a619133ce58ed955d7b6b9249643092e6638e485ca3377c1918abff7746f3214ee004842167ed73c
+DIST hat.traineddata-tessdata_legacy-4.1.0 3326722 BLAKE2B 927e0916425c1e9d1e17a884e4fc413217231c38a38e404360bbcdbc80f410d5bdac4ec752e365dc137fbfb6d48cc8b5d0d3da93c6f885fc8ec8758a58ad4c5e SHA512 bf5b5e80b32679201c1a65b8053473d2bcf987ace1b90297a619133ce58ed955d7b6b9249643092e6638e485ca3377c1918abff7746f3214ee004842167ed73c
DIST heb.traineddata-tessdata_legacy-4.0.0 5413459 BLAKE2B 4b40eef30c0b81d52f8715541f64d61dd1c4a8e2910d86740c138598f2219768d724a27cb86c9156d4eb54179accba788396e720e75d038e5edd21758c9c90f9 SHA512 787cd3589e981d75941ff6298446cffcdda2e5cf508f8b07d074eca83274d644f7298c6b727a9d503a37ec589d2362e0eed891869c903ac52a28e14115ba1d6e
+DIST heb.traineddata-tessdata_legacy-4.1.0 5413459 BLAKE2B 4b40eef30c0b81d52f8715541f64d61dd1c4a8e2910d86740c138598f2219768d724a27cb86c9156d4eb54179accba788396e720e75d038e5edd21758c9c90f9 SHA512 787cd3589e981d75941ff6298446cffcdda2e5cf508f8b07d074eca83274d644f7298c6b727a9d503a37ec589d2362e0eed891869c903ac52a28e14115ba1d6e
DIST hin.traineddata-tessdata_legacy-4.0.0 1651010 BLAKE2B f0eb5c0c70c2d6d17609537ece87959032910d87f8e5366d863454984dc83d2f518f0604905712d100a924a8e5d8c2d10a186120be207e813054bfcef945de2d SHA512 684fe7c221abcc2094eac2545ff89b78d89fab5ec83564845fb1f039ef21efd42e013732dc1946cd75d03483ac22d263262de8486e6d9e42dba68018bca652a3
+DIST hin.traineddata-tessdata_legacy-4.1.0 1651010 BLAKE2B f0eb5c0c70c2d6d17609537ece87959032910d87f8e5366d863454984dc83d2f518f0604905712d100a924a8e5d8c2d10a186120be207e813054bfcef945de2d SHA512 684fe7c221abcc2094eac2545ff89b78d89fab5ec83564845fb1f039ef21efd42e013732dc1946cd75d03483ac22d263262de8486e6d9e42dba68018bca652a3
DIST hrv.traineddata-tessdata_legacy-4.0.0 13797409 BLAKE2B e330a6ee95fb9fd1a4a8f276ced525a54db481a3dc6c5bcc893e139f3bae2e3b715c10e160d388e44b98bed0b43577fb8a5c52334e78d974cd77c85b7b5a8e1e SHA512 c928c3b6518fcb274e561e07af15fce06ccd23b70d02a9f44cdea4c3ab85b0875ff051c76eabb69ae2ebd7acb11a0545d8bbc83103735a62ddf8d7454dffa91f
+DIST hrv.traineddata-tessdata_legacy-4.1.0 13797409 BLAKE2B e330a6ee95fb9fd1a4a8f276ced525a54db481a3dc6c5bcc893e139f3bae2e3b715c10e160d388e44b98bed0b43577fb8a5c52334e78d974cd77c85b7b5a8e1e SHA512 c928c3b6518fcb274e561e07af15fce06ccd23b70d02a9f44cdea4c3ab85b0875ff051c76eabb69ae2ebd7acb11a0545d8bbc83103735a62ddf8d7454dffa91f
DIST hun.traineddata-tessdata_legacy-4.0.0 18051690 BLAKE2B b057b6cb60c7da9e2e91aeed0bb759053b29f439d3dd324422c4b61f68a9477fc572b45a5addb2b9495cd1e10d5d5cf204fabfd5277853c27fc0e98fd44ba7be SHA512 af9fa2b95a98e87b6ee252db924e9d9d5dd9266270c2a590ada000fb63a3de1bf4c5880e95c8f36179bf59472b56b98ebf84d628e893e13bbb6991cf38bc57f8
+DIST hun.traineddata-tessdata_legacy-4.1.0 18051690 BLAKE2B b057b6cb60c7da9e2e91aeed0bb759053b29f439d3dd324422c4b61f68a9477fc572b45a5addb2b9495cd1e10d5d5cf204fabfd5277853c27fc0e98fd44ba7be SHA512 af9fa2b95a98e87b6ee252db924e9d9d5dd9266270c2a590ada000fb63a3de1bf4c5880e95c8f36179bf59472b56b98ebf84d628e893e13bbb6991cf38bc57f8
DIST hye.traineddata-tessdata_legacy-4.0.0 3594112 BLAKE2B ceebec853e0e0ec60e6d12f14f4e98f785b6ade02f0efd206d97d7ba6a0a0e7b398fbd3c5afb54b7b7d3d49c4c897e950689e2c2a88ab92bf599af0fc3ce49a6 SHA512 76778410a15cf131ad713c18777fef30dcccdd8ede33ecf3b76d00e84f912ec5c304f8140bf04e3c0470f505be6a800ca461af196b131ff827b08e9e4312ea34
+DIST hye.traineddata-tessdata_legacy-4.1.0 3594112 BLAKE2B ceebec853e0e0ec60e6d12f14f4e98f785b6ade02f0efd206d97d7ba6a0a0e7b398fbd3c5afb54b7b7d3d49c4c897e950689e2c2a88ab92bf599af0fc3ce49a6 SHA512 76778410a15cf131ad713c18777fef30dcccdd8ede33ecf3b76d00e84f912ec5c304f8140bf04e3c0470f505be6a800ca461af196b131ff827b08e9e4312ea34
DIST iku.traineddata-tessdata_legacy-4.0.0 3797385 BLAKE2B dbce72842aa93830da73b908d199da998b51d283c719800c76d6faf84d19d2b6dbcc02a15d4d7623d3ed484a5e230fdc0915758956381abc7e01e67482468e24 SHA512 6e5f22a85e6770fbdf95858bc52b57b0a28fe03c7b44bcd5ae44b27779cc7588b32873b9b81dff61740cb552ff58ba9f82230094a3cca52022cf660833e05ffe
+DIST iku.traineddata-tessdata_legacy-4.1.0 3797385 BLAKE2B dbce72842aa93830da73b908d199da998b51d283c719800c76d6faf84d19d2b6dbcc02a15d4d7623d3ed484a5e230fdc0915758956381abc7e01e67482468e24 SHA512 6e5f22a85e6770fbdf95858bc52b57b0a28fe03c7b44bcd5ae44b27779cc7588b32873b9b81dff61740cb552ff58ba9f82230094a3cca52022cf660833e05ffe
DIST ind.traineddata-tessdata_legacy-4.0.0 8279230 BLAKE2B c5472cf5f6cad2ab55dd2d1586b8e628485f3478160d97d5447f8819fcdd07cc38b59d8b5fb19186b2a0cce16ffc266c95d2a86f18bf93cc8d3d827821da4830 SHA512 d206270ea64055b1a59c9c226347ab89b1e3f7504cce398c9b3d3b7a74f435cc072aafc3e7d22c4c11527d5413f0e8d105628bd3fdcb0bf88399ea822b8cf603
+DIST ind.traineddata-tessdata_legacy-4.1.0 8279230 BLAKE2B c5472cf5f6cad2ab55dd2d1586b8e628485f3478160d97d5447f8819fcdd07cc38b59d8b5fb19186b2a0cce16ffc266c95d2a86f18bf93cc8d3d827821da4830 SHA512 d206270ea64055b1a59c9c226347ab89b1e3f7504cce398c9b3d3b7a74f435cc072aafc3e7d22c4c11527d5413f0e8d105628bd3fdcb0bf88399ea822b8cf603
DIST isl.traineddata-tessdata_legacy-4.0.0 9037703 BLAKE2B 02d7687a0db86c06dbc42d0f08b5e9ffee0411c2891edbf25bc2a9be2cf1da28fbddee8e7557c5a28ec44090f2f6f14795f369f6aa615b0e1f4c285ebb2d92a2 SHA512 e0f9cfae50e0b443898dbae7ea5afe763c349a5598e1ba912a999da5457cb857897c3d7e3ecc5b9c384723ebb1fd8fb5fff066c386c0d3fe6d79226c8d5f054f
+DIST isl.traineddata-tessdata_legacy-4.1.0 9037703 BLAKE2B 02d7687a0db86c06dbc42d0f08b5e9ffee0411c2891edbf25bc2a9be2cf1da28fbddee8e7557c5a28ec44090f2f6f14795f369f6aa615b0e1f4c285ebb2d92a2 SHA512 e0f9cfae50e0b443898dbae7ea5afe763c349a5598e1ba912a999da5457cb857897c3d7e3ecc5b9c384723ebb1fd8fb5fff066c386c0d3fe6d79226c8d5f054f
DIST ita.traineddata-tessdata_legacy-4.0.0 15951701 BLAKE2B 92ce0e9b3929954813ad83635bc34f783022e7ed56c1a3ee031742071b7d8a0da437214135124f9d8f7dfc56c7b3937b22daf7956f8ed5fb4edbd1f4a80444fe SHA512 4e7add68461e20407e915169edd327dce36acda31867518c324e90d5f62e0a83c1e7dbaab6b98a1ca6c3140904f3affecd49df04fb8d1a92ace88fc4413881e9
+DIST ita.traineddata-tessdata_legacy-4.1.0 15951669 BLAKE2B e9a9dcd27ab71b11f183ac040cd21498ee5c49331db1af076a7134664f85eaf08cad4bebf52c422b6293a059f5e95110ec74517882adb64b073c396a01844965 SHA512 91699d0b8d775b57961eb31f75696a157658256bb4515c71f64c6bba45dc236455d1dbe08b677d606249eab7630cba0cc4f371c4add353e056af11ed4f4f884c
DIST ita_old.traineddata-tessdata_legacy-4.0.0 17345259 BLAKE2B 1dce88541aaf05a443a432d98880fb3d8ce8e430298eeb8e729e116d3c66cb2f48fee463b546d87a9d48d129fad1dc7493a407f7c294ea550564f097428e2ef5 SHA512 28cb79ff21ac720609953f62adedb927a5f044b7d72d40f5b9cae139b16181eacfc8af796f57df287f3d43cd82b6b9e1470b5509f9a15d4f8226a2bd45ce9af2
+DIST ita_old.traineddata-tessdata_legacy-4.1.0 17345259 BLAKE2B 1dce88541aaf05a443a432d98880fb3d8ce8e430298eeb8e729e116d3c66cb2f48fee463b546d87a9d48d129fad1dc7493a407f7c294ea550564f097428e2ef5 SHA512 28cb79ff21ac720609953f62adedb927a5f044b7d72d40f5b9cae139b16181eacfc8af796f57df287f3d43cd82b6b9e1470b5509f9a15d4f8226a2bd45ce9af2
DIST jav.traineddata-tessdata_legacy-4.0.0 7386965 BLAKE2B cfdb50b0b7bf47b0cfbfd8f19abab4dfa7fa9acc8b7c915d0b9e3726c1ac0555f252e7d63890ac35adad639a9e4d0911f8f48cb3f3272c0292c39784c5a9843a SHA512 9586b74df836a7a2328a34498ad201ce959f1e0481d3f9edad3de7dfe417f691f090e3a96804e216442fe5d69de35a73bda6af37f2c2f9d9a79c3a71b93a63b9
+DIST jav.traineddata-tessdata_legacy-4.1.0 7386965 BLAKE2B cfdb50b0b7bf47b0cfbfd8f19abab4dfa7fa9acc8b7c915d0b9e3726c1ac0555f252e7d63890ac35adad639a9e4d0911f8f48cb3f3272c0292c39784c5a9843a SHA512 9586b74df836a7a2328a34498ad201ce959f1e0481d3f9edad3de7dfe417f691f090e3a96804e216442fe5d69de35a73bda6af37f2c2f9d9a79c3a71b93a63b9
DIST jpn.traineddata-tessdata_legacy-4.0.0 35659159 BLAKE2B 40e47b03cc350ea8c58e2b2c3eab6bfa0d7d5841bf8e5543d4e3d45523e0c5f10892d052341c728918280c469f843a02e4f735b6849a529ffbc891a68f87723b SHA512 6f9e77f0c4183c4bf1f21fc6b2cdd9e2201179d27cf2953f54f841b0b81c52560d7d63cf0a5cac64dbe663307f4428754789bb61d9e5063d07de7f256b34d78a
+DIST jpn.traineddata-tessdata_legacy-4.1.0 35659159 BLAKE2B 40e47b03cc350ea8c58e2b2c3eab6bfa0d7d5841bf8e5543d4e3d45523e0c5f10892d052341c728918280c469f843a02e4f735b6849a529ffbc891a68f87723b SHA512 6f9e77f0c4183c4bf1f21fc6b2cdd9e2201179d27cf2953f54f841b0b81c52560d7d63cf0a5cac64dbe663307f4428754789bb61d9e5063d07de7f256b34d78a
DIST jpn_vert.traineddata-tessdata_legacy-4.0.0 3039939 BLAKE2B 47e6a0cc7514c79802426b0c24502675ece0e4c4ec135bd68ca36a50c55064d0277c353b5b62e66af90b7aa292a02ed76a6d09d22cc4cd669587d3972d2eb011 SHA512 4c90f329895f7e6859a591d7c81fbfae697d66b584d554429f2ea2280860ee604def3e88904285d411c6291c952005d3f69da41c7378abbd081747470083b65e
+DIST jpn_vert.traineddata-tessdata_legacy-4.1.0 3039939 BLAKE2B 47e6a0cc7514c79802426b0c24502675ece0e4c4ec135bd68ca36a50c55064d0277c353b5b62e66af90b7aa292a02ed76a6d09d22cc4cd669587d3972d2eb011 SHA512 4c90f329895f7e6859a591d7c81fbfae697d66b584d554429f2ea2280860ee604def3e88904285d411c6291c952005d3f69da41c7378abbd081747470083b65e
DIST kan.traineddata-tessdata_legacy-4.0.0 3608311 BLAKE2B b0c2d817598bf175c731375f09b276f97ab23375c3b6969debeffea9752c719b8333b0071b3f6605205490b667c09c9c93d99656af938149c4ba6041840c649a SHA512 f6c6ba87e30276112a4e10852ba7c072be4badae35c9f4b65aa5aa6031c9b9faefca6cbd5f7b4bb0d97481a83a1d83ae0dd34effbdba51a8a3b9695c78de2c21
+DIST kan.traineddata-tessdata_legacy-4.1.0 3608311 BLAKE2B b0c2d817598bf175c731375f09b276f97ab23375c3b6969debeffea9752c719b8333b0071b3f6605205490b667c09c9c93d99656af938149c4ba6041840c649a SHA512 f6c6ba87e30276112a4e10852ba7c072be4badae35c9f4b65aa5aa6031c9b9faefca6cbd5f7b4bb0d97481a83a1d83ae0dd34effbdba51a8a3b9695c78de2c21
DIST kat.traineddata-tessdata_legacy-4.0.0 8744377 BLAKE2B fcbf1e5553c01c6600baaa807676475f985a19b03264cf3280d63b665279c1603fc800303bb35e1fbeefe7efdfe41346c25145c1d723ffb23e74cb71522e08f8 SHA512 2f9a041c9b3f94a330379d98374fa319b0ad102db1eba81697740002ca55c49b7f0e560524b89d55e67ce697db37169bc43451fd86e0f3c7eb4cfe4d8a7ddc92
+DIST kat.traineddata-tessdata_legacy-4.1.0 8744377 BLAKE2B fcbf1e5553c01c6600baaa807676475f985a19b03264cf3280d63b665279c1603fc800303bb35e1fbeefe7efdfe41346c25145c1d723ffb23e74cb71522e08f8 SHA512 2f9a041c9b3f94a330379d98374fa319b0ad102db1eba81697740002ca55c49b7f0e560524b89d55e67ce697db37169bc43451fd86e0f3c7eb4cfe4d8a7ddc92
DIST kat_old.traineddata-tessdata_legacy-4.0.0 1082383 BLAKE2B 727514691af5899967fa7b661db09445cc03abd1777e979b00bcbb6e0daf7902ea6f7e2613a04e7a06a23528b37850fef87ad7921dc5efbceacb479427235b9c SHA512 fa7de4dcf4aa91409b98888548b4f77722a7131c70ff47d09e05b9105ea11bb41ad1a2d641daa7a947683c16eeb8274607b4e9770c02f0c220d20e44d6fce653
+DIST kat_old.traineddata-tessdata_legacy-4.1.0 1082383 BLAKE2B 727514691af5899967fa7b661db09445cc03abd1777e979b00bcbb6e0daf7902ea6f7e2613a04e7a06a23528b37850fef87ad7921dc5efbceacb479427235b9c SHA512 fa7de4dcf4aa91409b98888548b4f77722a7131c70ff47d09e05b9105ea11bb41ad1a2d641daa7a947683c16eeb8274607b4e9770c02f0c220d20e44d6fce653
DIST kaz.traineddata-tessdata_legacy-4.0.0 9263539 BLAKE2B 13f28ade72bef4ed8034f333f80600f282a70336a861610d205d52a8fe10fb67cb4abd579a9d309348484805349301ec086ca19b80bfef964e2c4217bbbf5dd7 SHA512 b43c1c9c1c60b6c35aa2d5445c16bf67315421a7a6958afe0d4f6a279431f9227adf856d5045a1468d75510f97e5bb3979c670143cb60734160379c3a8ec5414
+DIST kaz.traineddata-tessdata_legacy-4.1.0 9263539 BLAKE2B 13f28ade72bef4ed8034f333f80600f282a70336a861610d205d52a8fe10fb67cb4abd579a9d309348484805349301ec086ca19b80bfef964e2c4217bbbf5dd7 SHA512 b43c1c9c1c60b6c35aa2d5445c16bf67315421a7a6958afe0d4f6a279431f9227adf856d5045a1468d75510f97e5bb3979c670143cb60734160379c3a8ec5414
DIST khm.traineddata-tessdata_legacy-4.0.0 1446906 BLAKE2B 1553d571b62dcda0cead50aa02bc207f11fa08bcd558f15ee6bfe0c1692386daf05ada9f9fea0da5c2fbc82503cf94836b3281b1ba3d6ea6a90d310bd1dceaa6 SHA512 61c2ef26c980be1233f36ddcf5a02ed470c1b2cc2153fd401f344dde8b61ade2dca20dfacc4ae573f7a870b909ece822efd6f0f97c1b5695df26736d131dc059
+DIST khm.traineddata-tessdata_legacy-4.1.0 1446906 BLAKE2B 1553d571b62dcda0cead50aa02bc207f11fa08bcd558f15ee6bfe0c1692386daf05ada9f9fea0da5c2fbc82503cf94836b3281b1ba3d6ea6a90d310bd1dceaa6 SHA512 61c2ef26c980be1233f36ddcf5a02ed470c1b2cc2153fd401f344dde8b61ade2dca20dfacc4ae573f7a870b909ece822efd6f0f97c1b5695df26736d131dc059
DIST kir.traineddata-tessdata_legacy-4.0.0 15430595 BLAKE2B 8fc0eb32e826f1a35085843b76eee575575a2cbe2639a18979aec937d36fff8001378582da3b8bc1866720a16410353c449207bf3669984c684932a4363de41e SHA512 6fb9789315f164946b2c14a0bc7e8f9d97d1a7312db14ec56eeb0d70dcb0bcce94efcd23ad0e2dba424fe4c78f73ccf5e2a3d8fa523e076f64d1de83cd1668c2
+DIST kir.traineddata-tessdata_legacy-4.1.0 15430595 BLAKE2B 8fc0eb32e826f1a35085843b76eee575575a2cbe2639a18979aec937d36fff8001378582da3b8bc1866720a16410353c449207bf3669984c684932a4363de41e SHA512 6fb9789315f164946b2c14a0bc7e8f9d97d1a7312db14ec56eeb0d70dcb0bcce94efcd23ad0e2dba424fe4c78f73ccf5e2a3d8fa523e076f64d1de83cd1668c2
+DIST kmr.traineddata-tessdata_legacy-4.1.0 3568645 BLAKE2B f127211276c2536d8fdfcc466aa70b65570add52f3f6f27ced06a1e48f5e2d29ddf54767d4e97b49e8991144030914f41b7dce9827480cd481d12c8c4409290a SHA512 5c4f3f28516e6090ba3669ca6fb704d122fcbe62b383dcbfbb66c29ca47c02626414babb1737aaa24b0570ee27590b696ae245f6b7a997053d6ee96d10c9b7f2
DIST kor.traineddata-tessdata_legacy-4.0.0 15317715 BLAKE2B c2142fb12f1417e0567db60595f813aad9a24caf4f9379e50826ea4194afd25d2fb893c7a602c01dee210dc72ddeeb47260284bd49d6999f2a6e8cb504367de5 SHA512 d20ebcd28fea5e97f42631b118708b4885a8a7db3d449a30abdf9f760bc717f8ce3f261041636877b149bddb4608083371e95bd179d99d5e17b72d8d1377c927
+DIST kor.traineddata-tessdata_legacy-4.1.0 15317715 BLAKE2B c2142fb12f1417e0567db60595f813aad9a24caf4f9379e50826ea4194afd25d2fb893c7a602c01dee210dc72ddeeb47260284bd49d6999f2a6e8cb504367de5 SHA512 d20ebcd28fea5e97f42631b118708b4885a8a7db3d449a30abdf9f760bc717f8ce3f261041636877b149bddb4608083371e95bd179d99d5e17b72d8d1377c927
DIST kor_vert.traineddata-tessdata_legacy-4.0.0 1128590 BLAKE2B 4c0dcf6b49c71cfaebed2143c0408621294f575f2baf87149f7e77b6134bae0744378790cdc64baa7d7077f3450120b11df98310d816deac0cd5eedc86b9d236 SHA512 e3ae0d1efa340a82365c32ad0f316a914bd844c3d26cb81774f6e6ca6ca574c1cd78c448de923344146ed8499635877caf56f82709f8570356b0549f672c82be
+DIST kor_vert.traineddata-tessdata_legacy-4.1.0 1128590 BLAKE2B 4c0dcf6b49c71cfaebed2143c0408621294f575f2baf87149f7e77b6134bae0744378790cdc64baa7d7077f3450120b11df98310d816deac0cd5eedc86b9d236 SHA512 e3ae0d1efa340a82365c32ad0f316a914bd844c3d26cb81774f6e6ca6ca574c1cd78c448de923344146ed8499635877caf56f82709f8570356b0549f672c82be
DIST kur.traineddata-tessdata_legacy-4.0.0 2020594 BLAKE2B 6d21baf222e40260bb96be268a93d9e396c59a610ae4cbfe1ec4abf546ab36cb2c6b3c197a054fb3799f4dedc78e4ca3badd80d1b1d2b96ab21ffb83789bd0b6 SHA512 225c395149d9f6a4749283eca94ba644fab8bfb55be1b6388e563e8e810dc4e99b3ff4485f69db24583dac9256e94f66cbbb6ecb32058a3b332e037a92afce9a
DIST kur_ara.traineddata-tessdata_legacy-4.0.0 3568645 BLAKE2B f127211276c2536d8fdfcc466aa70b65570add52f3f6f27ced06a1e48f5e2d29ddf54767d4e97b49e8991144030914f41b7dce9827480cd481d12c8c4409290a SHA512 5c4f3f28516e6090ba3669ca6fb704d122fcbe62b383dcbfbb66c29ca47c02626414babb1737aaa24b0570ee27590b696ae245f6b7a997053d6ee96d10c9b7f2
DIST lao.traineddata-tessdata_legacy-4.0.0 7055204 BLAKE2B 5f17a38bc7117ce7dffc8e2ef3024a48fa0f2c92673d0a9c359e42b56db48d30351b364c3d61ec1ccc16a8018f4a3317efcf22ed41e16af07551a5630d23c1ac SHA512 61ae53fbf76c9ea3ff9017ba60944532ffff2522d17c90b091c0e5d3963d23381320883a31212173253f7649e1efa8502e9f55942782597045245bdde0387105
+DIST lao.traineddata-tessdata_legacy-4.1.0 7055204 BLAKE2B 5f17a38bc7117ce7dffc8e2ef3024a48fa0f2c92673d0a9c359e42b56db48d30351b364c3d61ec1ccc16a8018f4a3317efcf22ed41e16af07551a5630d23c1ac SHA512 61ae53fbf76c9ea3ff9017ba60944532ffff2522d17c90b091c0e5d3963d23381320883a31212173253f7649e1efa8502e9f55942782597045245bdde0387105
DIST lat.traineddata-tessdata_legacy-4.0.0 9215366 BLAKE2B 9f603d9cdcc5cec787cd1c026a7520f78e2a98c5b04d00ae71d338c339e875a453ddf14d98b7fd0d1c5792fc7a485a8294c27f0a63e8dea7f8b33951a2a37d62 SHA512 66336c4ca8fed0f13b289848ae3eeb5e02f558bf79704c7986ca95eff34f169fc3048e439d2775c4709c187f43b4d38ba9ac9ccde1c77afd0fbc9af715ff6fb0
+DIST lat.traineddata-tessdata_legacy-4.1.0 9215366 BLAKE2B 9f603d9cdcc5cec787cd1c026a7520f78e2a98c5b04d00ae71d338c339e875a453ddf14d98b7fd0d1c5792fc7a485a8294c27f0a63e8dea7f8b33951a2a37d62 SHA512 66336c4ca8fed0f13b289848ae3eeb5e02f558bf79704c7986ca95eff34f169fc3048e439d2775c4709c187f43b4d38ba9ac9ccde1c77afd0fbc9af715ff6fb0
DIST lav.traineddata-tessdata_legacy-4.0.0 10635271 BLAKE2B 102fa699465e1c304f947694cd790187d17ba30343fd6fbf071970dd17c38d263fdb084e61cd3ad35c2c3529ed2c2751df276f712c0934e62826dce3b60cb43d SHA512 5b12e36e1deaf826c7e2bc20d6dd1f9f88d60b89c6f1c36738f53e313a116c949c4d734be87cecf0a154653a363e8d917d92760af8d8ce237ae398db6f13aeb0
+DIST lav.traineddata-tessdata_legacy-4.1.0 10635271 BLAKE2B 102fa699465e1c304f947694cd790187d17ba30343fd6fbf071970dd17c38d263fdb084e61cd3ad35c2c3529ed2c2751df276f712c0934e62826dce3b60cb43d SHA512 5b12e36e1deaf826c7e2bc20d6dd1f9f88d60b89c6f1c36738f53e313a116c949c4d734be87cecf0a154653a363e8d917d92760af8d8ce237ae398db6f13aeb0
DIST lit.traineddata-tessdata_legacy-4.0.0 12629538 BLAKE2B 5b0376beaac92db0a594b1859b5b634b8a909c10926c23d4eb2de9d6ae2286ed0740e01dd615e37faf797db198a436e483c179a0eb8cdd0924c2dfe514012f62 SHA512 a7ab5f21398dc3046cd74df5618c7df204fc2ca05750310620d3fceac33f42cc1eedc6a22929e0322d284a78e9cead157012d264cb07f093dbe4ed595397d8d4
+DIST lit.traineddata-tessdata_legacy-4.1.0 12629538 BLAKE2B 5b0376beaac92db0a594b1859b5b634b8a909c10926c23d4eb2de9d6ae2286ed0740e01dd615e37faf797db198a436e483c179a0eb8cdd0924c2dfe514012f62 SHA512 a7ab5f21398dc3046cd74df5618c7df204fc2ca05750310620d3fceac33f42cc1eedc6a22929e0322d284a78e9cead157012d264cb07f093dbe4ed595397d8d4
DIST ltz.traineddata-tessdata_legacy-4.0.0 2606439 BLAKE2B c69b4be54829ea84835ac93b5ce852d96d6e8b13450a9ffcfd3a8b19b0eb59587cd757f24752af0b9ddae4288f130dc770bf098fed971ee373ab25249234f57e SHA512 446278d370ab673a19f740db71ae9f33f44017038e7ab2f0ce4c178e651722523e597aefbf18a01d04fff4c947482543a054a31385501a183756dd0b8ab28a2a
+DIST ltz.traineddata-tessdata_legacy-4.1.0 2606439 BLAKE2B c69b4be54829ea84835ac93b5ce852d96d6e8b13450a9ffcfd3a8b19b0eb59587cd757f24752af0b9ddae4288f130dc770bf098fed971ee373ab25249234f57e SHA512 446278d370ab673a19f740db71ae9f33f44017038e7ab2f0ce4c178e651722523e597aefbf18a01d04fff4c947482543a054a31385501a183756dd0b8ab28a2a
DIST mal.traineddata-tessdata_legacy-4.0.0 5953416 BLAKE2B 4c5e86a846e50bb8cf0dfcdfbf3c75bafcfc61c8f8c1476f815fb22b1bcc59218694f39bf5fc22181d831d5aa51e43feec1fbedc75f53fb48ccf89b644cc36ef SHA512 f209ee7dffd06d648be855a80557d010d7ccae92d954e199c187c686c0723dfe6400cfaf749c2d3858eec979562bbda61098c071d5c54ff351538581f22a75b8
+DIST mal.traineddata-tessdata_legacy-4.1.0 5953416 BLAKE2B 4c5e86a846e50bb8cf0dfcdfbf3c75bafcfc61c8f8c1476f815fb22b1bcc59218694f39bf5fc22181d831d5aa51e43feec1fbedc75f53fb48ccf89b644cc36ef SHA512 f209ee7dffd06d648be855a80557d010d7ccae92d954e199c187c686c0723dfe6400cfaf749c2d3858eec979562bbda61098c071d5c54ff351538581f22a75b8
DIST mar.traineddata-tessdata_legacy-4.0.0 3193116 BLAKE2B 4ad543ccfa930c47554669f2a68c718fb28b7195bcc5a5026e6f09cd702f2e36daf3bf171f99262f18a326ed615db7f057cdeb1adcd4abcaf4260864f03605c2 SHA512 f4d69e3245ba7aa3a7540fab7511f97f4dde543a807499db3eda522c794d5565ff57281e3b577bfdc20f36318fcf1b708511df502824b02ccd6c6e157cabb798
+DIST mar.traineddata-tessdata_legacy-4.1.0 3193116 BLAKE2B 4ad543ccfa930c47554669f2a68c718fb28b7195bcc5a5026e6f09cd702f2e36daf3bf171f99262f18a326ed615db7f057cdeb1adcd4abcaf4260864f03605c2 SHA512 f4d69e3245ba7aa3a7540fab7511f97f4dde543a807499db3eda522c794d5565ff57281e3b577bfdc20f36318fcf1b708511df502824b02ccd6c6e157cabb798
DIST mkd.traineddata-tessdata_legacy-4.0.0 5323418 BLAKE2B 9575e511f7f7dcbffbc2cf9107fc5b3ea9518c2976512cac7838bb4394eb78e552b95651fa877eee6fdda401ca63518e0b8b380ff02d0d26282d15737c80d595 SHA512 967dfcdc6cce687b967487bac6cf555457f60bcf82cb054fe1167b44ad914c0393821b7f0ba20016ddc57319f98fcd397e967b3a176b0a8aa4ec7f38e60db297
+DIST mkd.traineddata-tessdata_legacy-4.1.0 5323418 BLAKE2B 9575e511f7f7dcbffbc2cf9107fc5b3ea9518c2976512cac7838bb4394eb78e552b95651fa877eee6fdda401ca63518e0b8b380ff02d0d26282d15737c80d595 SHA512 967dfcdc6cce687b967487bac6cf555457f60bcf82cb054fe1167b44ad914c0393821b7f0ba20016ddc57319f98fcd397e967b3a176b0a8aa4ec7f38e60db297
DIST mlt.traineddata-tessdata_legacy-4.0.0 7426902 BLAKE2B 6338fa2d4749d2f3f64c82eb2b7d835ebe543f439f05f01feaeaf5788e3da5f86a72778f7dbda786947500fd1fcec1147f6ea9e2ead04ac2212bdbc765112e6c SHA512 4156e21a75d41417a9b9d26fa0147afc5b47e922575da3262e90a178309a6e5000ccc4561bc9b4e259b98cf772134ba421ef6ee06eeb7af9b6beeb722dc0bba0
+DIST mlt.traineddata-tessdata_legacy-4.1.0 7426902 BLAKE2B 6338fa2d4749d2f3f64c82eb2b7d835ebe543f439f05f01feaeaf5788e3da5f86a72778f7dbda786947500fd1fcec1147f6ea9e2ead04ac2212bdbc765112e6c SHA512 4156e21a75d41417a9b9d26fa0147afc5b47e922575da3262e90a178309a6e5000ccc4561bc9b4e259b98cf772134ba421ef6ee06eeb7af9b6beeb722dc0bba0
DIST mon.traineddata-tessdata_legacy-4.0.0 2137055 BLAKE2B c151ac6a1307bf7b539720bcafbf7467623262d3ca30b2a669bd08087506e33fbe9c163598130b2af4a5c3588efd85fef50d19b5106338aa62e30b16aee08abc SHA512 cc582790546ac8bbfbdb5d6f879362c4f8cf3f0fc3b9398e60b67ec2c0807ecdcb92099bd5c971a274191359aa20df5655d9841211787e1bcad1f60a37f97443
+DIST mon.traineddata-tessdata_legacy-4.1.0 2137055 BLAKE2B c151ac6a1307bf7b539720bcafbf7467623262d3ca30b2a669bd08087506e33fbe9c163598130b2af4a5c3588efd85fef50d19b5106338aa62e30b16aee08abc SHA512 cc582790546ac8bbfbdb5d6f879362c4f8cf3f0fc3b9398e60b67ec2c0807ecdcb92099bd5c971a274191359aa20df5655d9841211787e1bcad1f60a37f97443
DIST mri.traineddata-tessdata_legacy-4.0.0 862986 BLAKE2B e8ce893c9ecfb6a4e49928245b055dc9f3feacaa551f349456baa05cea2fcf32b3f37219958d95b6e0bcd34e4d704a988d123a433831c8090f86199056b474b9 SHA512 0e08d4e0788ceebec644c47b6d6b69b4743aa80c261de7804bcea0fdd8e1756129d868b78b3d294878c03e0ef62fc62f8d21404ff82348fd70b95fe4aa00c6d0
+DIST mri.traineddata-tessdata_legacy-4.1.0 862986 BLAKE2B e8ce893c9ecfb6a4e49928245b055dc9f3feacaa551f349456baa05cea2fcf32b3f37219958d95b6e0bcd34e4d704a988d123a433831c8090f86199056b474b9 SHA512 0e08d4e0788ceebec644c47b6d6b69b4743aa80c261de7804bcea0fdd8e1756129d868b78b3d294878c03e0ef62fc62f8d21404ff82348fd70b95fe4aa00c6d0
DIST msa.traineddata-tessdata_legacy-4.0.0 8243366 BLAKE2B b06a668f8515730d3c873dfcb20c1998ef5bfbf5ce4d4753146d47e5d8d1c147c40a8c6a4def8a00a96ac4fe6f9b5b01b26b1da135e5cf0f113bb856b545b600 SHA512 36fff96739a767ccebc741b92fa32866833cff8aff37e00e8a4ec336ae596d4ca65f2adad60435669c6ae50b97b28725b188cb3289acf648f6a914a66e308687
+DIST msa.traineddata-tessdata_legacy-4.1.0 8243366 BLAKE2B b06a668f8515730d3c873dfcb20c1998ef5bfbf5ce4d4753146d47e5d8d1c147c40a8c6a4def8a00a96ac4fe6f9b5b01b26b1da135e5cf0f113bb856b545b600 SHA512 36fff96739a767ccebc741b92fa32866833cff8aff37e00e8a4ec336ae596d4ca65f2adad60435669c6ae50b97b28725b188cb3289acf648f6a914a66e308687
DIST mya.traineddata-tessdata_legacy-4.0.0 4640591 BLAKE2B 24688da81e42197183b6ec1ed8877504b1d065dfad9ecb0b06dcb618d34654031e49bff587d42ff15f0ffb948b7aa67742513c18123248cc1e04c0709edc33c1 SHA512 68160d622a8288237473f73f771c2ce64ff56558fb8a120ea4a4531ac54d127e4a2499fe544a26817d4aaa5df90efec6b0bc2062e5736c629c1cd45fa9c55ce1
+DIST mya.traineddata-tessdata_legacy-4.1.0 4640591 BLAKE2B 24688da81e42197183b6ec1ed8877504b1d065dfad9ecb0b06dcb618d34654031e49bff587d42ff15f0ffb948b7aa67742513c18123248cc1e04c0709edc33c1 SHA512 68160d622a8288237473f73f771c2ce64ff56558fb8a120ea4a4531ac54d127e4a2499fe544a26817d4aaa5df90efec6b0bc2062e5736c629c1cd45fa9c55ce1
DIST nep.traineddata-tessdata_legacy-4.0.0 2189424 BLAKE2B b1ff71f0feade072dcb8f8ee8d0fd1fb5fe1dece972bf36338d68cb283611012ed429df38dd28566d09999ef8ea16f8792e7b4c6440cdef6178c288ec81c6c6e SHA512 7ae822c4dad21f95153b36d37f93303bf3752d7d9e971d40acf909184114db1fd9eb7e4d18c47c21d4dca29687fb72d6fc991452874cc3d1005df70f3292958f
+DIST nep.traineddata-tessdata_legacy-4.1.0 2189424 BLAKE2B b1ff71f0feade072dcb8f8ee8d0fd1fb5fe1dece972bf36338d68cb283611012ed429df38dd28566d09999ef8ea16f8792e7b4c6440cdef6178c288ec81c6c6e SHA512 7ae822c4dad21f95153b36d37f93303bf3752d7d9e971d40acf909184114db1fd9eb7e4d18c47c21d4dca29687fb72d6fc991452874cc3d1005df70f3292958f
DIST nld.traineddata-tessdata_legacy-4.0.0 23163950 BLAKE2B fc0e3db470385e82614161e3c03ac9c4ddbfc81f643ce2776d9d5e57bdb67491ada2a937e8ea98a6095f1e4456e672da4677e44992d64765e07d8b64ab6bd04c SHA512 6ebd2f8a06cb60d480de2658745e2ffb84922ef6f81fa56cb4469ab265bb261c4f3bfd8c459cfbcc5a69ead2bbe7904fba64a74d5984f2b64037fb7e262abbdf
+DIST nld.traineddata-tessdata_legacy-4.1.0 23163950 BLAKE2B fc0e3db470385e82614161e3c03ac9c4ddbfc81f643ce2776d9d5e57bdb67491ada2a937e8ea98a6095f1e4456e672da4677e44992d64765e07d8b64ab6bd04c SHA512 6ebd2f8a06cb60d480de2658745e2ffb84922ef6f81fa56cb4469ab265bb261c4f3bfd8c459cfbcc5a69ead2bbe7904fba64a74d5984f2b64037fb7e262abbdf
DIST nor.traineddata-tessdata_legacy-4.0.0 12397893 BLAKE2B cb8fc93788347ff833e64b057964438478cc9515c644eb1b0759ae246162bec44eff1d29646a4071b56173183dec3b249bf0d3d7dd23f91cd7eaf591e2848d09 SHA512 54a9aaa6a531806cbc938bfb4326873011b052b3abfb29e4feea7c482f48d9f60f4d2726e89c1f3351b0527da07370843863ae9106d63e8bdcc50c5e61637eb0
+DIST nor.traineddata-tessdata_legacy-4.1.0 12397893 BLAKE2B cb8fc93788347ff833e64b057964438478cc9515c644eb1b0759ae246162bec44eff1d29646a4071b56173183dec3b249bf0d3d7dd23f91cd7eaf591e2848d09 SHA512 54a9aaa6a531806cbc938bfb4326873011b052b3abfb29e4feea7c482f48d9f60f4d2726e89c1f3351b0527da07370843863ae9106d63e8bdcc50c5e61637eb0
DIST oci.traineddata-tessdata_legacy-4.0.0 6322100 BLAKE2B 3d5a26be3809be19882f2bf060de87c65772f41a176f0bac2510071a3a3d708683d808cd3a4b0541656d9385b501be39a92d4144d0a588fb7da03fff234f212e SHA512 bae69918c03d678f0aeb66001b550ee708bbdd60cbb8ffbaec897f4854c87e7d730bcdb393590e5ffc5c1e49d53111c17d2423f42c015d806a27a71e0e00e0c0
+DIST oci.traineddata-tessdata_legacy-4.1.0 6322100 BLAKE2B 3d5a26be3809be19882f2bf060de87c65772f41a176f0bac2510071a3a3d708683d808cd3a4b0541656d9385b501be39a92d4144d0a588fb7da03fff234f212e SHA512 bae69918c03d678f0aeb66001b550ee708bbdd60cbb8ffbaec897f4854c87e7d730bcdb393590e5ffc5c1e49d53111c17d2423f42c015d806a27a71e0e00e0c0
DIST ori.traineddata-tessdata_legacy-4.0.0 1480096 BLAKE2B b57e12c5affca922ed1299907b60e1594066d30fa3abb4a5fa06985fc9aa9094cdd7770af05fcc732af538b114db8d0ca51f71574834eb3092365a30a8ef6b8f SHA512 6272aca04b05ef0bdba6625c7842d6b701b0a84083348fc8328eb3142e78523776fc9a02a4c8f4154abf65782322c0efc583aacce0e29cbe44756aa68fc1941f
+DIST ori.traineddata-tessdata_legacy-4.1.0 1480096 BLAKE2B b57e12c5affca922ed1299907b60e1594066d30fa3abb4a5fa06985fc9aa9094cdd7770af05fcc732af538b114db8d0ca51f71574834eb3092365a30a8ef6b8f SHA512 6272aca04b05ef0bdba6625c7842d6b701b0a84083348fc8328eb3142e78523776fc9a02a4c8f4154abf65782322c0efc583aacce0e29cbe44756aa68fc1941f
DIST osd.traineddata-tessdata_legacy-4.0.0 10562874 BLAKE2B 469cb3d9aa62a1755a02e793c35f3c8148c5d7661c866483880d3f5b41e01ddf5621046ed199974a83f9488dafcfb23ff0d56c7f640fcc90dd165bd929d3e73a SHA512 4ac489ba6b1888ef5e5d33e2782b5b7d0638384445859c1e3fea8c149cd482089ca63c70bbdf12b58c2aca6182890ee01043133e6e9ed7183128025663998ac6
+DIST osd.traineddata-tessdata_legacy-4.1.0 10562874 BLAKE2B 469cb3d9aa62a1755a02e793c35f3c8148c5d7661c866483880d3f5b41e01ddf5621046ed199974a83f9488dafcfb23ff0d56c7f640fcc90dd165bd929d3e73a SHA512 4ac489ba6b1888ef5e5d33e2782b5b7d0638384445859c1e3fea8c149cd482089ca63c70bbdf12b58c2aca6182890ee01043133e6e9ed7183128025663998ac6
DIST pan.traineddata-tessdata_legacy-4.0.0 1698789 BLAKE2B f49da1bab026e7cc370011d4188e9a135eaf8d77f6f2e80754a9ca824c3fd6e57cfad7833d033626180d1da7f66b6aea5d1f8355ba63762112c931ce25b77a9b SHA512 b51dbb4f9796c95703d122b9c8bec19265ae329675a48e8189e6f81ed773189e6cf74153e9a13342aa4622e8d0f2022aad5dfcde8ab530254b512ab244027dc7
+DIST pan.traineddata-tessdata_legacy-4.1.0 1698789 BLAKE2B f49da1bab026e7cc370011d4188e9a135eaf8d77f6f2e80754a9ca824c3fd6e57cfad7833d033626180d1da7f66b6aea5d1f8355ba63762112c931ce25b77a9b SHA512 b51dbb4f9796c95703d122b9c8bec19265ae329675a48e8189e6f81ed773189e6cf74153e9a13342aa4622e8d0f2022aad5dfcde8ab530254b512ab244027dc7
DIST pol.traineddata-tessdata_legacy-4.0.0 19344135 BLAKE2B c86bb54ddf85108f30b67216a6714e133036435b6fed4adcd69a0a66a7e285a53885e89d496f54acf3c82d629b3c25da35b2dc37781ad62116697b2a95adcbf5 SHA512 d203c7ad1a15eca2f3a823e167eb4dabc7eed8a6d4780662a2fa9b1b1e7d54cbef2073e35882b793324ba446ab7ee833e24ae94dfe7d8b77c8639a1d45d6cafe
+DIST pol.traineddata-tessdata_legacy-4.1.0 19344135 BLAKE2B c86bb54ddf85108f30b67216a6714e133036435b6fed4adcd69a0a66a7e285a53885e89d496f54acf3c82d629b3c25da35b2dc37781ad62116697b2a95adcbf5 SHA512 d203c7ad1a15eca2f3a823e167eb4dabc7eed8a6d4780662a2fa9b1b1e7d54cbef2073e35882b793324ba446ab7ee833e24ae94dfe7d8b77c8639a1d45d6cafe
DIST por.traineddata-tessdata_legacy-4.0.0 15336931 BLAKE2B cc5a3669f5cd19e7d98597222ac364955532cede8fd9f993abfcd9823bec8a831c97d644305fcf1df34d63304cc9453990ce639ee0cb56cec2608f935a6ba396 SHA512 1a1bd641302c228cc05ff92ce6dc2d3afc5e0ee3f6b2ae2e564d309765b917a87bcdf10e70b7014ce7933705a35b275c2e76061644bdb3288fb46f5d29b918a8
+DIST por.traineddata-tessdata_legacy-4.1.0 15336931 BLAKE2B cc5a3669f5cd19e7d98597222ac364955532cede8fd9f993abfcd9823bec8a831c97d644305fcf1df34d63304cc9453990ce639ee0cb56cec2608f935a6ba396 SHA512 1a1bd641302c228cc05ff92ce6dc2d3afc5e0ee3f6b2ae2e564d309765b917a87bcdf10e70b7014ce7933705a35b275c2e76061644bdb3288fb46f5d29b918a8
DIST pus.traineddata-tessdata_legacy-4.0.0 1772117 BLAKE2B 228aca8c6a7d8aca36b580da25e348549b3f2ed37cc570f76c0dfa9661b2eb3738c1f786a67f904d44a478408d957d43c0626fa9d63ff50d08d0e0d33316549a SHA512 afb0bb86294a8b88ef923370392f136abbd2da55abd36d83a77c23fd1b90b80d9d24d57e23b8a405744d8407ccba6713b1fe78b224f35fa15580c55805fabcf7
+DIST pus.traineddata-tessdata_legacy-4.1.0 1772117 BLAKE2B 228aca8c6a7d8aca36b580da25e348549b3f2ed37cc570f76c0dfa9661b2eb3738c1f786a67f904d44a478408d957d43c0626fa9d63ff50d08d0e0d33316549a SHA512 afb0bb86294a8b88ef923370392f136abbd2da55abd36d83a77c23fd1b90b80d9d24d57e23b8a405744d8407ccba6713b1fe78b224f35fa15580c55805fabcf7
DIST que.traineddata-tessdata_legacy-4.0.0 5026349 BLAKE2B 2020f4fdf5c195ce192f977dd1df4a37ae5f322c6fc4eb5690761b23ba6381189d48de7095652730eabd3e3e468e35989a9882819d78c691e69d512ed8476cc8 SHA512 7565c98b6e04006fa260b48574e48c3f30600ce192752e58371d36e061b7ddda6d1de3b21f45e3e9c2874a85611f8546561436c95116106249e06daaffea7b92
+DIST que.traineddata-tessdata_legacy-4.1.0 5026349 BLAKE2B 2020f4fdf5c195ce192f977dd1df4a37ae5f322c6fc4eb5690761b23ba6381189d48de7095652730eabd3e3e468e35989a9882819d78c691e69d512ed8476cc8 SHA512 7565c98b6e04006fa260b48574e48c3f30600ce192752e58371d36e061b7ddda6d1de3b21f45e3e9c2874a85611f8546561436c95116106249e06daaffea7b92
DIST ron.traineddata-tessdata_legacy-4.0.0 11008634 BLAKE2B 71ea517305b88e55051358ec8a3ebc46b2088c0e55191d23471b752fc8c439c0962cb1d9447c813dd9c1d25c1829b8d8840401cff89f4b50c008b33f9cdbdebb SHA512 c459273275f219dc5e36c85b5cbb00f155d98256c5994c279c10224561eda4195ec405fe890babfcbaadf1b7f142c2ae31647872244227f2229afca759cde8cc
+DIST ron.traineddata-tessdata_legacy-4.1.0 11008634 BLAKE2B 71ea517305b88e55051358ec8a3ebc46b2088c0e55191d23471b752fc8c439c0962cb1d9447c813dd9c1d25c1829b8d8840401cff89f4b50c008b33f9cdbdebb SHA512 c459273275f219dc5e36c85b5cbb00f155d98256c5994c279c10224561eda4195ec405fe890babfcbaadf1b7f142c2ae31647872244227f2229afca759cde8cc
DIST rus.traineddata-tessdata_legacy-4.0.0 19920885 BLAKE2B bf5d559e37c9517816abebe4a5134d4692a1788357e9dc42a65369a4810ef67fa940d54684f5d2e1ea9d7cbec84e00c381bc492f49f36cff799fffcfda869e41 SHA512 94d1ad9535dabf7cd923fa33d26bf05fa17e3d38b47edd521a84bde5467e719ddd497fb49dbf5a5f849c3381390ac9fd34c17e1f52065b5f88556f42371c3a3f
+DIST rus.traineddata-tessdata_legacy-4.1.0 19920885 BLAKE2B bf5d559e37c9517816abebe4a5134d4692a1788357e9dc42a65369a4810ef67fa940d54684f5d2e1ea9d7cbec84e00c381bc492f49f36cff799fffcfda869e41 SHA512 94d1ad9535dabf7cd923fa33d26bf05fa17e3d38b47edd521a84bde5467e719ddd497fb49dbf5a5f849c3381390ac9fd34c17e1f52065b5f88556f42371c3a3f
DIST san.traineddata-tessdata_legacy-4.0.0 12404680 BLAKE2B 4668aa1fa3ce524a7129e270a6a74876c24c7f3c5caa45bd3bd57d41bcc92f8184d55173920ec35176a6b3e9cb294d3ee4ad18fee617c65e347d291a743e0277 SHA512 2fd2a3e378f6b5acc28b5a1508e1868a8e68d6299910396154fe44946f7ce013145d6235cb0e24b03a158fbb5ede561250fe1337931788f37b79af145f739f77
+DIST san.traineddata-tessdata_legacy-4.1.0 12404680 BLAKE2B 4668aa1fa3ce524a7129e270a6a74876c24c7f3c5caa45bd3bd57d41bcc92f8184d55173920ec35176a6b3e9cb294d3ee4ad18fee617c65e347d291a743e0277 SHA512 2fd2a3e378f6b5acc28b5a1508e1868a8e68d6299910396154fe44946f7ce013145d6235cb0e24b03a158fbb5ede561250fe1337931788f37b79af145f739f77
DIST sin.traineddata-tessdata_legacy-4.0.0 1727443 BLAKE2B 2f6eed2afca25e23a54d752509b55d2dfbe2666d13f65b1d64cdd29398257dcddb41b0a429f7c2e77aca87049d4eed9a9da8608d78ef3deebe838f597b20d5c1 SHA512 c478f46123a2e90ec36db753fb1ad37e3cbd26b6c194fbfbf773d61d2d6b47b8d86499f87ceabeaf917cce5623c7b2f49dce3bbd0615a087fc8e6ce07194c81a
+DIST sin.traineddata-tessdata_legacy-4.1.0 1727443 BLAKE2B 2f6eed2afca25e23a54d752509b55d2dfbe2666d13f65b1d64cdd29398257dcddb41b0a429f7c2e77aca87049d4eed9a9da8608d78ef3deebe838f597b20d5c1 SHA512 c478f46123a2e90ec36db753fb1ad37e3cbd26b6c194fbfbf773d61d2d6b47b8d86499f87ceabeaf917cce5623c7b2f49dce3bbd0615a087fc8e6ce07194c81a
DIST slk.traineddata-tessdata_legacy-4.0.0 14100356 BLAKE2B da6f8e93308ff9a22f6ae0f01e16cb61355025528fbebe6334fc36027c4e734b6651f314d68e905d43f09431a71b46e6354f5e9892cb2ce50539c11a1830d8cd SHA512 8a854565efa8f88a13210b6501ccedcc753f838416625db280a38d133f8cb57cb2de6ff11fac408283d2f5b57f72f734e3f5f1d920545aa11b1565f9af8903be
+DIST slk.traineddata-tessdata_legacy-4.1.0 14100356 BLAKE2B da6f8e93308ff9a22f6ae0f01e16cb61355025528fbebe6334fc36027c4e734b6651f314d68e905d43f09431a71b46e6354f5e9892cb2ce50539c11a1830d8cd SHA512 8a854565efa8f88a13210b6501ccedcc753f838416625db280a38d133f8cb57cb2de6ff11fac408283d2f5b57f72f734e3f5f1d920545aa11b1565f9af8903be
DIST slv.traineddata-tessdata_legacy-4.0.0 9942454 BLAKE2B e4b380e24ed03dbf3179fa1281703b6d5bdd113d44e29dd681912609b9aa9f37f981d09f08754598012021c9cdb05813c4ca9c38185b709393c262e061457421 SHA512 e79f489ec396fcd1080d262b795030993bbd1b4a1c9b92df5b583bb32a29d6d657504b7094bbd8a001885d9800488df8425c5368ff569413ad10c450f0784a39
+DIST slv.traineddata-tessdata_legacy-4.1.0 9942454 BLAKE2B e4b380e24ed03dbf3179fa1281703b6d5bdd113d44e29dd681912609b9aa9f37f981d09f08754598012021c9cdb05813c4ca9c38185b709393c262e061457421 SHA512 e79f489ec396fcd1080d262b795030993bbd1b4a1c9b92df5b583bb32a29d6d657504b7094bbd8a001885d9800488df8425c5368ff569413ad10c450f0784a39
DIST snd.traineddata-tessdata_legacy-4.0.0 1694065 BLAKE2B 218f87eb1df28b0c73ee1782de26ff082f5e0ad22193922b07e4cbda00c463d37c00042a43e9f34da065b4c5c4e772993faacae4e682ef47bfeb56e81bab3094 SHA512 6f4f32b7e16ab91502b91e8ebad5eb8b9d1865ac2c11dea41ba79e5a8124a495992a71ef8cb216977a4a6990dfd11388c640a16f98f3d3cce40d06daafb7406a
+DIST snd.traineddata-tessdata_legacy-4.1.0 1694065 BLAKE2B 218f87eb1df28b0c73ee1782de26ff082f5e0ad22193922b07e4cbda00c463d37c00042a43e9f34da065b4c5c4e772993faacae4e682ef47bfeb56e81bab3094 SHA512 6f4f32b7e16ab91502b91e8ebad5eb8b9d1865ac2c11dea41ba79e5a8124a495992a71ef8cb216977a4a6990dfd11388c640a16f98f3d3cce40d06daafb7406a
DIST spa.traineddata-tessdata_legacy-4.0.0 18256019 BLAKE2B 85a8c3fef81d136173af05efe823bfd33de25a859539333e1cf165d41dd5491b5f33a440e22cfdde7502823f132dae6b497a14bdd559d373001b4c7ce4c8eb18 SHA512 12a861a78d38904663e189079083a9f2f7de05f084061e5b3208dddf31d7aca6f7b7e2c6c64d0c4df9e0824891dff5ce9433f49458bf7c239d702ef452f49fec
+DIST spa.traineddata-tessdata_legacy-4.1.0 18256019 BLAKE2B 85a8c3fef81d136173af05efe823bfd33de25a859539333e1cf165d41dd5491b5f33a440e22cfdde7502823f132dae6b497a14bdd559d373001b4c7ce4c8eb18 SHA512 12a861a78d38904663e189079083a9f2f7de05f084061e5b3208dddf31d7aca6f7b7e2c6c64d0c4df9e0824891dff5ce9433f49458bf7c239d702ef452f49fec
DIST spa_old.traineddata-tessdata_legacy-4.0.0 19628379 BLAKE2B e8db08e2ec0b9d6ff81c94ff7ca0f1e54d3c1d21386596f53ec99b3a7e0ec0aea25ea570b603845c0b5001a738312d0d80669028e358c1454737d5add339a1ab SHA512 d0a230718ce4ff350874a0bc14ec268dbf9f0eebeffabfb4174fe958d0e3ac300a91baf2a4e483630402144104263163d651485f394f7c69aad758963bef7833
+DIST spa_old.traineddata-tessdata_legacy-4.1.0 19628379 BLAKE2B e8db08e2ec0b9d6ff81c94ff7ca0f1e54d3c1d21386596f53ec99b3a7e0ec0aea25ea570b603845c0b5001a738312d0d80669028e358c1454737d5add339a1ab SHA512 d0a230718ce4ff350874a0bc14ec268dbf9f0eebeffabfb4174fe958d0e3ac300a91baf2a4e483630402144104263163d651485f394f7c69aad758963bef7833
DIST sqi.traineddata-tessdata_legacy-4.0.0 8575759 BLAKE2B 68765372c506ec6c63884c4bbd85d2fe2fe6f6eacabe359a65a54863c14dec7fee31bd206a79f585b921cc574cb6f4730db011d81c88184eeaaf9a978c8ef49d SHA512 cb02863a64aec599426229075209f2587584610410db03d3c8766c36d16a51b762e14c7a7364c527f47a4bd62053301da4cdcbb2798546e7ccc01bc6849e7a35
+DIST sqi.traineddata-tessdata_legacy-4.1.0 8575759 BLAKE2B 68765372c506ec6c63884c4bbd85d2fe2fe6f6eacabe359a65a54863c14dec7fee31bd206a79f585b921cc574cb6f4730db011d81c88184eeaaf9a978c8ef49d SHA512 cb02863a64aec599426229075209f2587584610410db03d3c8766c36d16a51b762e14c7a7364c527f47a4bd62053301da4cdcbb2798546e7ccc01bc6849e7a35
DIST srp.traineddata-tessdata_legacy-4.0.0 7434267 BLAKE2B 1ec3d721944d55c6aae9fbd8693fe4cd0ceeddfd5ef077bbfd4266980e320d6fe7978b2b46ed50dfe7617b2e4940f7d8ebbdfdeb62ac7b38d70668ee3ce49ed6 SHA512 c93c7c49f39b9a23fe83ab92aef3cbfac3a21b694986dbd4b46d6462fceab8e1670ead8ecd0f8a5e0acc391d65670ea4ad4dad938602decac5731c750336d8a6
+DIST srp.traineddata-tessdata_legacy-4.1.0 7434267 BLAKE2B 1ec3d721944d55c6aae9fbd8693fe4cd0ceeddfd5ef077bbfd4266980e320d6fe7978b2b46ed50dfe7617b2e4940f7d8ebbdfdeb62ac7b38d70668ee3ce49ed6 SHA512 c93c7c49f39b9a23fe83ab92aef3cbfac3a21b694986dbd4b46d6462fceab8e1670ead8ecd0f8a5e0acc391d65670ea4ad4dad938602decac5731c750336d8a6
DIST srp_latn.traineddata-tessdata_legacy-4.0.0 9375025 BLAKE2B dc38a6aad729748f62fd6170eacb39ab0dfbc351a577b4bd080a1958a96347ee11cbb63b0b6b81d86c1c9cd00fc9f54b5b6b0acdd6c8d9614cb511f947b71dba SHA512 6d91089875312a49bc21219ac84d551ca64f05022c03acc0662bb696661e2214c8404ae8edabeaa3dcd08994cf7ce927a5169641b542502a6a2d02480b04a70c
+DIST srp_latn.traineddata-tessdata_legacy-4.1.0 9375025 BLAKE2B dc38a6aad729748f62fd6170eacb39ab0dfbc351a577b4bd080a1958a96347ee11cbb63b0b6b81d86c1c9cd00fc9f54b5b6b0acdd6c8d9614cb511f947b71dba SHA512 6d91089875312a49bc21219ac84d551ca64f05022c03acc0662bb696661e2214c8404ae8edabeaa3dcd08994cf7ce927a5169641b542502a6a2d02480b04a70c
DIST sun.traineddata-tessdata_legacy-4.0.0 1369513 BLAKE2B 6e9d37b08e977ee8e1eb442fbbed7d78db85132fc3e620f9da398fe0802eae29641ff693a21e1f4da1a38d37937cf57ddba40eb456cf4ab4a9011a128ff15e0f SHA512 a081a40722a60bd19fdec24b3a6a8f38921be212735f1c7cdbb268834a205206c55ea22b2e62413ab7486c1da28b8155a4459623780aecf6b0d749db43896ca2
+DIST sun.traineddata-tessdata_legacy-4.1.0 1369513 BLAKE2B 6e9d37b08e977ee8e1eb442fbbed7d78db85132fc3e620f9da398fe0802eae29641ff693a21e1f4da1a38d37937cf57ddba40eb456cf4ab4a9011a128ff15e0f SHA512 a081a40722a60bd19fdec24b3a6a8f38921be212735f1c7cdbb268834a205206c55ea22b2e62413ab7486c1da28b8155a4459623780aecf6b0d749db43896ca2
DIST swa.traineddata-tessdata_legacy-4.0.0 6029030 BLAKE2B a9095202b9a5c4702a844bcb0be9a9bde4f299855e3225bddfda81d347d3f52635af1178af70accacd7b5ad4046723fc2a10007e0170347c9e1a8d54a36a9a08 SHA512 df069547e62adb88e1f05385bd61334a8730053202d90abe248cf618286e018e24211893dfb3229574717b419b0eca5d97877ada885b0800d567163f40190ef0
+DIST swa.traineddata-tessdata_legacy-4.1.0 6029030 BLAKE2B a9095202b9a5c4702a844bcb0be9a9bde4f299855e3225bddfda81d347d3f52635af1178af70accacd7b5ad4046723fc2a10007e0170347c9e1a8d54a36a9a08 SHA512 df069547e62adb88e1f05385bd61334a8730053202d90abe248cf618286e018e24211893dfb3229574717b419b0eca5d97877ada885b0800d567163f40190ef0
DIST swe.traineddata-tessdata_legacy-4.0.0 13627152 BLAKE2B 8701994a84c73c2099463687f22691387e40c64adb2cf0b8c9d87235bff793edc88f28d3be9b820040a7f4706118228d12b812215e582e4cb6f4a1ffc5642f16 SHA512 ea3fff9c1ecbf49bb83f98e809e465418bb81242db34acdc7789f19c706e8fb2ff49a7d8b67f7816cd469c58994139227631a3420b9116222bf55d6164c6b475
+DIST swe.traineddata-tessdata_legacy-4.1.0 13627152 BLAKE2B 8701994a84c73c2099463687f22691387e40c64adb2cf0b8c9d87235bff793edc88f28d3be9b820040a7f4706118228d12b812215e582e4cb6f4a1ffc5642f16 SHA512 ea3fff9c1ecbf49bb83f98e809e465418bb81242db34acdc7789f19c706e8fb2ff49a7d8b67f7816cd469c58994139227631a3420b9116222bf55d6164c6b475
DIST syr.traineddata-tessdata_legacy-4.0.0 2207238 BLAKE2B 07fe387bff87fd8f916e282dfc276eed985f06ae4ea9fc0a74b59f093de247fd7bf1cd3a7819ac44ee0f7e93cec8e567a9b6928f7fe52cb0a9e1f0986d4bc6c8 SHA512 cccf03ef20dc72ecd21dd95df841c3de010b3abb7dc1fbba833f70088ba34d89ffef98f29c0a76709e49ff17d05d16e87cff416f4da92da6fe569e8eb87f95f4
+DIST syr.traineddata-tessdata_legacy-4.1.0 2207238 BLAKE2B 07fe387bff87fd8f916e282dfc276eed985f06ae4ea9fc0a74b59f093de247fd7bf1cd3a7819ac44ee0f7e93cec8e567a9b6928f7fe52cb0a9e1f0986d4bc6c8 SHA512 cccf03ef20dc72ecd21dd95df841c3de010b3abb7dc1fbba833f70088ba34d89ffef98f29c0a76709e49ff17d05d16e87cff416f4da92da6fe569e8eb87f95f4
DIST tam.traineddata-tessdata_legacy-4.0.0 3353079 BLAKE2B db69fcd37a202351db06477967f33f83f2cf3e4350ee7a7999d9dc2b71959ddb26b044e8fdd120ad1ea095e398466a1b729b5a76f85433a67e7bd43f99eca036 SHA512 7bc3546841f5a3f63491d31f13fb764ae6d17ad396f2c13b2a733aaa2c861d8aed637e0b1917443dce6f37998e09cbce587a8d5987a90d6acacbef7a6d6a69fb
+DIST tam.traineddata-tessdata_legacy-4.1.0 3353079 BLAKE2B db69fcd37a202351db06477967f33f83f2cf3e4350ee7a7999d9dc2b71959ddb26b044e8fdd120ad1ea095e398466a1b729b5a76f85433a67e7bd43f99eca036 SHA512 7bc3546841f5a3f63491d31f13fb764ae6d17ad396f2c13b2a733aaa2c861d8aed637e0b1917443dce6f37998e09cbce587a8d5987a90d6acacbef7a6d6a69fb
DIST tat.traineddata-tessdata_legacy-4.0.0 1072909 BLAKE2B e4c20650ac6ac2342918826275e0dadfb90f9d7813f25fe8d0185da719d62eb1f65ca29f66fdb36041cb674a1430d8d0aa934c4bdbaa76852f1e2c359bd86a7d SHA512 d5fddeb73658344e6f3b5acd9c38b773c71622faa326e1c6bd0dc936df14752637fe95d0e7b3024ced0e8cd251de8663805e376f7608fb63ddfe078b47739212
+DIST tat.traineddata-tessdata_legacy-4.1.0 1072909 BLAKE2B e4c20650ac6ac2342918826275e0dadfb90f9d7813f25fe8d0185da719d62eb1f65ca29f66fdb36041cb674a1430d8d0aa934c4bdbaa76852f1e2c359bd86a7d SHA512 d5fddeb73658344e6f3b5acd9c38b773c71622faa326e1c6bd0dc936df14752637fe95d0e7b3024ced0e8cd251de8663805e376f7608fb63ddfe078b47739212
DIST tel.traineddata-tessdata_legacy-4.0.0 3315170 BLAKE2B eccc32de8769e419c698e74cccddb33da0fcda925df77862a06675b60952fcbde2d2ee8f2eee2b84a42539430be9c880ff7856887653132bee30d14388049f39 SHA512 8ff5d43f23187b800e38e73a7321be4b1cb37328c662bb14613e4494f6d555ea0fa57e40a03aa951527fb900d30702978d6e019daca47db26c96e7747bf98d53
+DIST tel.traineddata-tessdata_legacy-4.1.0 3315170 BLAKE2B eccc32de8769e419c698e74cccddb33da0fcda925df77862a06675b60952fcbde2d2ee8f2eee2b84a42539430be9c880ff7856887653132bee30d14388049f39 SHA512 8ff5d43f23187b800e38e73a7321be4b1cb37328c662bb14613e4494f6d555ea0fa57e40a03aa951527fb900d30702978d6e019daca47db26c96e7747bf98d53
DIST tgk.traineddata-tessdata_legacy-4.0.0 3721580 BLAKE2B 23b2f09dbb4e1c298e8db55574bed6f443ae6fa2323a023b6b3fe7c8e4cc6b277496fa2e2d1892fec540be8da4e5efcd486b41cb31827ff0a077ee54074d6a2f SHA512 1a246d672c9e9015eeacc31fabe3e4b325d4625a347a3521aa77b40b7c4afa9257de6078e5705c9cd517b9a012ab34bc8beb372a4836f7b2e85e18e3e07faf34
+DIST tgk.traineddata-tessdata_legacy-4.1.0 3721580 BLAKE2B 23b2f09dbb4e1c298e8db55574bed6f443ae6fa2323a023b6b3fe7c8e4cc6b277496fa2e2d1892fec540be8da4e5efcd486b41cb31827ff0a077ee54074d6a2f SHA512 1a246d672c9e9015eeacc31fabe3e4b325d4625a347a3521aa77b40b7c4afa9257de6078e5705c9cd517b9a012ab34bc8beb372a4836f7b2e85e18e3e07faf34
DIST tgl.traineddata-tessdata_legacy-4.0.0 7321367 BLAKE2B c2db6985f3848dde3b43d5a229c729490de5b4e1f946a2d81d18756b6b8ed4a522041fd3dcaca3786ea719c35e70340fcdb61654b209e11e2f4242ebf3b83b52 SHA512 85e68b7cf449cd26b4bcfd36f81a6555f67143cce29dc86ca8407fb062546cfb89c151c62e13e8d5ebad758f92ff50d454e08111acf63eb904c28aa6a526113f
+DIST tgl.traineddata-tessdata_legacy-4.1.0 7321367 BLAKE2B c2db6985f3848dde3b43d5a229c729490de5b4e1f946a2d81d18756b6b8ed4a522041fd3dcaca3786ea719c35e70340fcdb61654b209e11e2f4242ebf3b83b52 SHA512 85e68b7cf449cd26b4bcfd36f81a6555f67143cce29dc86ca8407fb062546cfb89c151c62e13e8d5ebad758f92ff50d454e08111acf63eb904c28aa6a526113f
DIST tha.traineddata-tessdata_legacy-4.0.0 1072519 BLAKE2B 1df91623565bb5f080162fcc2e53c5bda7824803525e6bd8a5b09414334a268382e59accda57c1286c9732a5862b2c1f5ff683d01c3923972766cbfa8a06c4d9 SHA512 3066aaa2c0844f25bcadda38f3315434ef86c2e0c41537c8e40b0efd63015c7fd4cb65b3bba60d9bfcd35b5d33370b64ef4aa04b5070e3bbc176e5899e698db0
+DIST tha.traineddata-tessdata_legacy-4.1.0 1072519 BLAKE2B 1df91623565bb5f080162fcc2e53c5bda7824803525e6bd8a5b09414334a268382e59accda57c1286c9732a5862b2c1f5ff683d01c3923972766cbfa8a06c4d9 SHA512 3066aaa2c0844f25bcadda38f3315434ef86c2e0c41537c8e40b0efd63015c7fd4cb65b3bba60d9bfcd35b5d33370b64ef4aa04b5070e3bbc176e5899e698db0
DIST tir.traineddata-tessdata_legacy-4.0.0 2184930 BLAKE2B 1efbd7fca5c40a6ce2fc36ce66d3ea69a3e48fe06a9ce7e65ea2254023b95265639a443d9869e1c6b33ef6a765e43046ae3cf7812a95c2ec9079fd6822ff4e3a SHA512 8c250460f18c5925b252f3d3c1e021c4275d034cc409af5a4c0d2014c72f286fbcdbe5f017bca057b7a720767fcdb85589ca4b3c848a539c3361a14d010b78c0
+DIST tir.traineddata-tessdata_legacy-4.1.0 2184930 BLAKE2B 1efbd7fca5c40a6ce2fc36ce66d3ea69a3e48fe06a9ce7e65ea2254023b95265639a443d9869e1c6b33ef6a765e43046ae3cf7812a95c2ec9079fd6822ff4e3a SHA512 8c250460f18c5925b252f3d3c1e021c4275d034cc409af5a4c0d2014c72f286fbcdbe5f017bca057b7a720767fcdb85589ca4b3c848a539c3361a14d010b78c0
DIST ton.traineddata-tessdata_legacy-4.0.0 947262 BLAKE2B 955deb71fd4e8a271d1c668addccbc357bcf02a8dc815b85aa96680c864c7c56144878618026b432edcd06c0f4a0a240a4e8dcc5b1c705da107839b2f2d01a46 SHA512 b5541c9ffb047d8315e66eb5003d364de8d5d82365cfd12af56dd75b3981bf12656be1cbdce6125250efbfc4af309e0daa74e54ca61ce78e3b516c6a30c83f63
+DIST ton.traineddata-tessdata_legacy-4.1.0 947262 BLAKE2B 955deb71fd4e8a271d1c668addccbc357bcf02a8dc815b85aa96680c864c7c56144878618026b432edcd06c0f4a0a240a4e8dcc5b1c705da107839b2f2d01a46 SHA512 b5541c9ffb047d8315e66eb5003d364de8d5d82365cfd12af56dd75b3981bf12656be1cbdce6125250efbfc4af309e0daa74e54ca61ce78e3b516c6a30c83f63
DIST tur.traineddata-tessdata_legacy-4.0.0 18750612 BLAKE2B 48872425cf8cd46fc19462e5f47f631d6094a28276f2f8648eba3a598484fabe8968dde71c732a654a1d11d6bb587ba2b6cb76bbe18cbe0a0a63574d44fc21ea SHA512 4dfe1049ca75034315c29ac57b6c69eb44a8a8265ffdc5eea37595406f41b7262a3acd85a882005946e34816f84523b0f53d43ecfd15b1b4c3db70799ca5a908
+DIST tur.traineddata-tessdata_legacy-4.1.0 18750612 BLAKE2B 48872425cf8cd46fc19462e5f47f631d6094a28276f2f8648eba3a598484fabe8968dde71c732a654a1d11d6bb587ba2b6cb76bbe18cbe0a0a63574d44fc21ea SHA512 4dfe1049ca75034315c29ac57b6c69eb44a8a8265ffdc5eea37595406f41b7262a3acd85a882005946e34816f84523b0f53d43ecfd15b1b4c3db70799ca5a908
DIST uig.traineddata-tessdata_legacy-4.0.0 2794302 BLAKE2B dd8fe55ca1dc19491323095f89543f027797c63e83aa960883327ec5dee16358c3d64ab5824a2d0efaf63d5c97066737fff5690bf8429916a3d6d850badae9f8 SHA512 53adc5566577b77600ae50a74e1ba84b4d8ddcfc3201b6544c20e45f01c9b00ceb6c1503d1c4c32642349eaf0ee5e93480d811caa1b2f60909b19f45890af1ed
+DIST uig.traineddata-tessdata_legacy-4.1.0 2794302 BLAKE2B dd8fe55ca1dc19491323095f89543f027797c63e83aa960883327ec5dee16358c3d64ab5824a2d0efaf63d5c97066737fff5690bf8429916a3d6d850badae9f8 SHA512 53adc5566577b77600ae50a74e1ba84b4d8ddcfc3201b6544c20e45f01c9b00ceb6c1503d1c4c32642349eaf0ee5e93480d811caa1b2f60909b19f45890af1ed
DIST ukr.traineddata-tessdata_legacy-4.0.0 12408644 BLAKE2B 0d0b6772f7cc8331b838852c096ae4514405c0cf3c368c413bec2340772e59e2bb6e08757b953898de76c5a78eb29d6ab63348ed848d90aa0b384a2bd4565c0e SHA512 d9579d2d1ce978a4f87b841b940853fe41f82c68d63e2d16dce3083ffdc3c9ec7794f92f33ba4edb123ff287bea52f12d2ae3784651d1ba73f54794787598c1f
+DIST ukr.traineddata-tessdata_legacy-4.1.0 12408644 BLAKE2B 0d0b6772f7cc8331b838852c096ae4514405c0cf3c368c413bec2340772e59e2bb6e08757b953898de76c5a78eb29d6ab63348ed848d90aa0b384a2bd4565c0e SHA512 d9579d2d1ce978a4f87b841b940853fe41f82c68d63e2d16dce3083ffdc3c9ec7794f92f33ba4edb123ff287bea52f12d2ae3784651d1ba73f54794787598c1f
DIST urd.traineddata-tessdata_legacy-4.0.0 1398748 BLAKE2B 82b252bdfc69ff06bbed7816c4320acc45462dc7a4ddada5b85fb6caea9428465cc1db1d19f41ab006ced5a0a410575b726f8897273655f2baaecc57c8f72540 SHA512 f46ed527d2cc3e6bc4f9365e10018da502c44a7c975b68c072baffa1637c431637aeeeabc27eac76b3a847976f88bdb514ec68878b1b4d2f9eb3239963c542b7
+DIST urd.traineddata-tessdata_legacy-4.1.0 1398748 BLAKE2B 82b252bdfc69ff06bbed7816c4320acc45462dc7a4ddada5b85fb6caea9428465cc1db1d19f41ab006ced5a0a410575b726f8897273655f2baaecc57c8f72540 SHA512 f46ed527d2cc3e6bc4f9365e10018da502c44a7c975b68c072baffa1637c431637aeeeabc27eac76b3a847976f88bdb514ec68878b1b4d2f9eb3239963c542b7
DIST uzb.traineddata-tessdata_legacy-4.0.0 10757098 BLAKE2B fbe49984a1050ff097c70e4ae86a96eac947e0e37513684f68bd4c1d9c3d57de2c0d1fb68dd4e03cbf2a39c7ec8dfcd2a1be891f8e1286bcf066faca645d0db1 SHA512 47f969a9579872883f6dadb388ac4619c934c9af7bb239c5f20e84b82bf74c9316069cdb9a2d5407e675f50d90d404a11b1e3461297048e8abf3ff35ce917814
+DIST uzb.traineddata-tessdata_legacy-4.1.0 10757098 BLAKE2B fbe49984a1050ff097c70e4ae86a96eac947e0e37513684f68bd4c1d9c3d57de2c0d1fb68dd4e03cbf2a39c7ec8dfcd2a1be891f8e1286bcf066faca645d0db1 SHA512 47f969a9579872883f6dadb388ac4619c934c9af7bb239c5f20e84b82bf74c9316069cdb9a2d5407e675f50d90d404a11b1e3461297048e8abf3ff35ce917814
DIST uzb_cyrl.traineddata-tessdata_legacy-4.0.0 4905658 BLAKE2B c4db3337b7ad1c2f927cd92577f58700c55b00889a9a52982216ab1c8837874290919f9144bc1910232cdfda4243217199ce5a7557a8416f3988022d569facb0 SHA512 e79c2a24499f5bedb46c99971858f5401929304b661da2a12dd9443ad95ebf517a27e35fb830b032da477344748f2ecfec5aaf07267b6c68bf44f36f2c104bb5
+DIST uzb_cyrl.traineddata-tessdata_legacy-4.1.0 4905658 BLAKE2B c4db3337b7ad1c2f927cd92577f58700c55b00889a9a52982216ab1c8837874290919f9144bc1910232cdfda4243217199ce5a7557a8416f3988022d569facb0 SHA512 e79c2a24499f5bedb46c99971858f5401929304b661da2a12dd9443ad95ebf517a27e35fb830b032da477344748f2ecfec5aaf07267b6c68bf44f36f2c104bb5
DIST vie.traineddata-tessdata_legacy-4.0.0 7763728 BLAKE2B b1a702f2fb2dbd08a115ac2d8cbef3a0e9cc2aa8b1ffd3e236f180d8faf2fce7c55305a6965a5380b276a454870e901c626954228b8fe5efe0c5199c8b2325fa SHA512 3c31b13c9177a07f2c0e3427bf5f22e7fdb6526905a068b6015a2bf2a8e9dcae5cf5effce3528197c778d2b8a9fb956465619779219d46b0372e24631a944ad2
+DIST vie.traineddata-tessdata_legacy-4.1.0 7763728 BLAKE2B b1a702f2fb2dbd08a115ac2d8cbef3a0e9cc2aa8b1ffd3e236f180d8faf2fce7c55305a6965a5380b276a454870e901c626954228b8fe5efe0c5199c8b2325fa SHA512 3c31b13c9177a07f2c0e3427bf5f22e7fdb6526905a068b6015a2bf2a8e9dcae5cf5effce3528197c778d2b8a9fb956465619779219d46b0372e24631a944ad2
DIST yid.traineddata-tessdata_legacy-4.0.0 4882707 BLAKE2B aec63586bfa9d9f55a48f8f8ac885c4f8df4ec9abfed52a2a8ab58f3747df9a2eb60f872e492ab29a189c21c73cd33c64ac18c6910f10562745441e2e780fc49 SHA512 88986d01ff3bb8523b41b18c885477befd9d6690c5d517a5822fd8a6ef1b45a5790b3a5ff8f06172907dd2ccd3ef07d19d7e35d316d37fedcadb8df713a81749
+DIST yid.traineddata-tessdata_legacy-4.1.0 4882707 BLAKE2B aec63586bfa9d9f55a48f8f8ac885c4f8df4ec9abfed52a2a8ab58f3747df9a2eb60f872e492ab29a189c21c73cd33c64ac18c6910f10562745441e2e780fc49 SHA512 88986d01ff3bb8523b41b18c885477befd9d6690c5d517a5822fd8a6ef1b45a5790b3a5ff8f06172907dd2ccd3ef07d19d7e35d316d37fedcadb8df713a81749
DIST yor.traineddata-tessdata_legacy-4.0.0 963413 BLAKE2B e4d16812ade81cac1f685587837b431c122ea29551bccd52ff1bef5a4aa8b316eb741aee3d0eb790c941d15401ea1c190850e225765a819d8899149e35af278a SHA512 4a04821d7e76feb0e71f31ff2ed794fce5a4e53ed98aeeecc06bd36d2c07301e8a7a86123ec5747b36d9df1d6d8e24d148f31f70093f944e83dfd3f2162661b0
+DIST yor.traineddata-tessdata_legacy-4.1.0 963413 BLAKE2B e4d16812ade81cac1f685587837b431c122ea29551bccd52ff1bef5a4aa8b316eb741aee3d0eb790c941d15401ea1c190850e225765a819d8899149e35af278a SHA512 4a04821d7e76feb0e71f31ff2ed794fce5a4e53ed98aeeecc06bd36d2c07301e8a7a86123ec5747b36d9df1d6d8e24d148f31f70093f944e83dfd3f2162661b0
diff --git a/app-text/tessdata_legacy/metadata.xml b/app-text/tessdata_legacy/metadata.xml
index 79fe4f4ce09d..4d735709aad1 100644
--- a/app-text/tessdata_legacy/metadata.xml
+++ b/app-text/tessdata_legacy/metadata.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
- <longdescription lang="en">Trained models for app-text/tesseract compatible with the legacy engine</longdescription>
<upstream>
<remote-id type="github">tesseract-ocr/tessdata</remote-id>
</upstream>
diff --git a/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild b/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
new file mode 100644
index 000000000000..1af981619221
--- /dev/null
+++ b/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+URI_PREFIX="https://github.com/tesseract-ocr/${PN/_legacy/}/raw/${PV}/"
+
+DESCRIPTION="Trained models for app-text/tesseract compatible with the legacy engine"
+HOMEPAGE="https://github.com/tesseract-ocr/tessdata"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
+ math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${P} )
+ osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${P} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="math osd"
+
+RDEPEND="!app-text/tessdata_best
+ !app-text/tessdata_fast
+ !<app-text/tesseract-4.1.0"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}
+
+# List of supported Gentoo linguas and their upstream mapping
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bg:bul bn:ben bo:bod br:bre bs:bos ca:cat ceb chr co:cos cs:ces cy:cym da:dan de:deu,frk dv:div dz:dzo el:ell,grc en:enm eo:epo es:spa,spa_old et:est eu:eus fa:fas fi:fin fil fo:fao fr:fra,frm fy:fry ga:gle gd:gla gl:glg gu:guj he:heb hi:hin hr:hrv ht:hat hu:hun hy:hye id:ind is:isl it:ita,ita_old iu:iku ja:jpn,jpn_vert jv:jav ka:kat,kat_old kk:kaz km:khm kn:kan ko:kor,kor_vert ku:kmr ky:kir la:lat lb:ltz lo:lao lt:lit lv:lav mi:mri mk:mkd ml:mal mn:mon mr:mar ms:msa mt:mlt my:mya ne:nep nl:nld no:nor oc:oci or:ori pa:pan pl:pol ps:pus pt:por qu:que ro:ron ru:rus sa:san sd:snd si:sin sk:slk sl:slv sq:sqi sr:srp,srp_latn su:sun sv:swe sw:swa syc:syr ta:tam te:tel tg:tgk th:tha ti:tir tl:tgl to:ton tr:tur tt:tat ug:uig uk:ukr ur:urd uz:uzb,uzb_cyrl vi:vie yi:yid yo:yor zh:chi_sim,chi_sim_vert,chi_tra,chi_tra_vert"
+# Fraktur data files (not installed):
+# dan_frak - Danish
+# deu_frak - German
+# slk_frak - Slovak
+# l10n_en provides the additional data:
+# enm - English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+ gentoo_lang=${lang%:*}
+ tess_langs=${lang#*:}
+ for tess_lang in ${tess_langs//,/ }; do
+ SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${P} )"
+ done
+ IUSE+=" l10n_${gentoo_lang}"
+done
+
+src_prepare() {
+ for file in ${A}; do
+ cp "${DISTDIR}/${file}" "${S}/${file/-${P}/}" || die
+ done
+
+ default
+}
+
+src_install() {
+ insinto /usr/share/tessdata
+ doins *.traineddata
+}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 771ad9e7623c..316b6b3f4802 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,141 +1,4 @@
-DIST afr.traineddata-4.00 12213914 BLAKE2B e06516788c09f6a9538ffe3c4378eef4e88eaec0c8e14a7f3ddfd6db0820839a90a27f8519dcf6872dc8c08f47229d4ee8bd6aa41e383cbf51a5584bcda6f7f8 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b
-DIST amh.traineddata-4.00 9771502 BLAKE2B 3a905487136efd099aacd0a979bfda1edcd30c8eb14fe2b304ba1f5355f570520b864c992b63a1fd1f683baa91186de7cd7c89e6057dfebb896f2d6f905b6d6a SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de
-DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
-DIST ara.traineddata-4.00 12537236 BLAKE2B 461b521d70609593f51df2e93d0ad74b289cdf42cc421f1445e70b63b7e56fde31f23ca9ef5b9584683fdb53d98e6057e090be890229a22a315a16863e60174e SHA512 a3dfc8604aba6efccb0cdd39488ea978d324ec953c5e74892cbfb7506f1b4276e5e335cba56301272779d7a0ec69c55187db01bcd01de06a524ecb92820b7348
-DIST asm.traineddata-4.00 23520270 BLAKE2B 81705edbbb1d4d467945b533a1789ed41dd6218a61621713dfba6c41a40545c99f8f7e112ce897de09cab242a06c0a493b46673630749a925111b808fbf02b9d SHA512 9413806ba55d101cf2c88c0c0cf408a8b4010c4a4b4ecfb315f98527865a1ddd052f1590326500f4c583628171d203a2a5530ef406b583a8b9f5451da91bb42a
-DIST aze.traineddata-4.00 15168011 BLAKE2B 65da3a20717a574338c2a371f3832477a0f06d6619042f53987b7932e18d0bd1ee49ae722d6199b9c84543d77f00a398a387c3eb739105d0551670a3670efe97 SHA512 372241fa9f1d060d47a1ffd4830cbca4c9a319a014631545ca8f2c043609afe4427d4342e522d383778f0448ad853fccb632ef3eaa6dc09192ba06f1693102cf
-DIST aze_cyrl.traineddata-4.00 10530787 BLAKE2B 9643274e5d89ec18655d5552a59eb96e2732bb1163e0d1c5a9a49d05e6271b0b4170a566fe5f69f8eea73fa4e8a1890bd4950cd7f65516ef4ff6effe92993a43 SHA512 8cba80fd1201ad89eaaf31bf256924257fb45e192b139abcd9a7cefe43e4e30fd35dd4e08588d593a062b2668f0715804f66566479dd0a0beb688bb2c1ce7291
-DIST bel.traineddata-4.00 16325127 BLAKE2B 8c97ac476fc7baa333b173494a004a134cdedbd3237fb73f2257c4126a0ca964eff6f8504966251a133e0ec1a23f85011fcbb3a2e2e1b690ecf225b72fe78fe8 SHA512 b6c7eccda420fc6c9cb30d3cd2e38b8f2d09766a77f701f3daae38fde198e2314a9a050841f2fec2fe49551e8334d9d5b820303b2d19285a942b423c66a71538
-DIST ben.traineddata-4.00 23447857 BLAKE2B 34c02e9a95706893045fccbc2e6728c89b4e5acf34262a7bea5beac91f1585b02a09192f20efcbfacdf0099ec5f1649edeb651112af98af590a0494c8eae8951 SHA512 6e59864bb499e048d8f8ce575f280f897b14bc626cad1970bb70d267f982be96ce2dacde847d060520288389bcbf2bd4a39d6abd9269a51d3d7970ffa19f4a17
-DIST bod.traineddata-4.00 35497681 BLAKE2B 53486538158ebd3946c49539a3f5bdfe72a1f22aedd84d3fffa3ff4b4676d3a9a2ed8c0da44ffc33e5634218185d963b5fc58f1a0490c5b97182f06a6b81331d SHA512 3b57c9d71b0914f274a6dc34e3d60fdb94f487e67e2fbddc92dafdb3bdc6e90766aa5b780449d367a6ac4d02b2c6634ee43efe74cbe52f71b11358e4d1c74339
-DIST bos.traineddata-4.00 13859186 BLAKE2B 04485ff70535292d3befa748955e831ff0fdc229629280c2469629a45ea34499efc382946edc3303e2f9ab02c2f463efd54353c5bed928a5c5a40fcb9b81cbfa SHA512 21d9c6c4bbc042b1ee473d2f67fbd875cfa6f7fd9652abf914f8a0c526b5833ebb9602ee942f72642b00db4d632647beb531da37db712f0acdb86410024ebb01
-DIST bul.traineddata-3.04.00 6026234 BLAKE2B a39a5757ec6bbb77ed6fe9a263e11b9d83eb64653f62f96dec68c102aa199348eefb8f99642f9824af9e41c537573f06af45f393271145fdcfbfff71bd07e1fd SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c
-DIST bul.traineddata-4.00 13677970 BLAKE2B 8c3e790138bea9def6d21ec26bd7755ea5604acfce3c4f60602fc8ab7145dfcfb29132277d00b8cff6b7497e29bd266dc9a8c84614c0cc2f5c29db5e690f113e SHA512 26a010581fc65673d48b30fdd69308cee47c12531bb260c93a0b22429b2c342e78ee3d7ccae1590e71ea2fb1c9f33110a3bbbaebf8e7c4fbaab207a4bf9cea48
-DIST cat.traineddata-3.04.00 5356190 BLAKE2B 64c7677812342474a7182c4e7907e068231511e09403c7122004e7720ab023f98c2d157ba5d417582d6323d3aa3ce5eb9914ce10506663f70749a1290c553747 SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630
-DIST cat.traineddata-4.00 12704811 BLAKE2B 5a775d9cb85238ee3c1ae965601c0855b497ddfcc665f540569e90f29aab9e819edda1b99344ec048917ebe3228a52961393e55b402af85b6b4220b862e5bfce SHA512 d743b2515081d2121f294ba179c81a96f632b9ffec539777a3f1f1f54516a02d068377fed05ee7008fd6268e754645aec7d338043fda1340a4da432358248db1
-DIST ces.traineddata-3.04.00 11896327 BLAKE2B 253795339231d377d3b033f348cc3413ba3bf9520bae44d318b459271608501db7958dcd216f44deabc7755008cb66c5b20625ad3a00a3ea8fca2258aef3c8af SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d
-DIST ces.traineddata-4.00 22727966 BLAKE2B 51793a4202b0a5a24d0e82e0403f42eeec61fa01efb5cb0376ec9f016911201534ae5133429eaa24d2bb97a4623ddc3b19d9fc4f4163af5cf2f19b7d924febf7 SHA512 48513c3c653aee6c6d7b22cd364331ee4ce5daeae6291b0f3eeac7cbfec8603ada5c64ae10f084ac12151d659ccc8957d040df36e68e605b34c56293491f0d6a
-DIST chi_sim.traineddata-3.04.00 42089623 BLAKE2B d7ac25d5a43ab36fe54035e78c34aa9b7fd4fee06fb32da6ec8173d0c0a40ea727d0c529f0d02ec949642c81c81a4d180c6c68557709d3561d169c9e7c3a29f8 SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673
-DIST chi_sim.traineddata-4.00 52662579 BLAKE2B 96dae9feca0e7cff822d850dbe23f6ff3b5aaba18f7053521f8e7a8adf04c7669879fe602d6f73a933147ac62c6291ef8e3f9960fbd90a23cde23da638f99fd7 SHA512 18c6307c2f1d7f498df58a198b4bd61fb434651a1cdaf2abfea259f01d0064edaad69421c744ef3485134b49868ff3a5c75cb53db87d68bb1b746e29f9356440
-DIST chi_tra.traineddata-3.04.00 56692327 BLAKE2B 83ef6e067107b14cacb208ec5885d3db6a9fc6be85eae90f27eb4c70ae723cec6fa17912068f46078d8a03541a51ee2aa7b1eea007211b5fa9f7282142fd8ffb SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1
-DIST chi_tra.traineddata-4.00 67377986 BLAKE2B cb06673cf33cafbb4eca7ba98a14736925a55f7d7a7badb06cef66a8e91072b631036f455a68fe0a4f5a21e8c9c25691286819d265d859b092fc1e71c456c832 SHA512 a8300b785ae367b94059ea8519512474088c2202410aa74d9621fc5aaeb552125f257daccad1294456f8dd7ae07071e73151847b296b971c8c18d48ae519201f
-DIST chr.traineddata-3.04.00 1083194 BLAKE2B 86a4c64f3df108d92f0b1d68743fb0a7c6e6aef328751c770968d946a476b1123141beb99730d67af8a4a321220be2a82cb3d96920352fd21709bfd15507a284 SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455
-DIST cym.traineddata-4.00 10333739 BLAKE2B 496296881fd98c77cbdcac413ad85ecbfe8c088de8326ef84c3e8d6c492f486a21be0982b9374f07310b85b25ad6bf646ae57a42ceba2be5f5190306cef01e3d SHA512 8f845d557be62195689ecf17b43c229bd33e85cac4cadf90b176e9a6d9f184411465be5b3534344b562bfa14b10cad6b0f47cb7dcece3f3d7192b13db7fd2e23
-DIST dan.traineddata-3.04.00 7340575 BLAKE2B 8437979bd4a01534e7a2c1c82c88232707ba10043c3bb824f71f8c365fed1353ce438dd08205286c1e2053adbe96211f34a5199648679f7c147806083d659a26 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff
-DIST dan.traineddata-4.00 16011554 BLAKE2B b57f7e30f4449f648aff92a6258a109e7f43dd84fa0406f44dd5b81937e7504c786c2aa75f791f47e0565afa6c872b06e4609e3849087a73a5f52bd501f7623b SHA512 3b678b28d4d5c67c4781251974dc36fb8d430440a1409b67e5c7124ee3c04fb39fe545af8a7e8fd0e14a24ccde55a9dc32bae127eb48ad7c8eab16cc374fde48
-DIST dan_frak.traineddata-3.04.00 1622710 BLAKE2B 458935c2176a74ef0090574be0ead1d65a0ede29fee48215a674643bb3a38f7a4fb40c940480e1e490edab8758f49010c6c2304ad9490ea22f60d8a8602317e1 SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01
-DIST deu.traineddata-3.04.00 13367187 BLAKE2B 3ead7f065fc4284f1dbdb83180d5f87e717fe39971d2bcf248f22125b5ac5fa9ed0f53491b955c9e0063a419dfd23a6696841ad0d12d7f6de13411f81254c416 SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995
-DIST deu.traineddata-4.00 20193615 BLAKE2B b554b66edd074844f607700af1855581b73a251693b666a4091105a21093b27adedeedc97540b0bb739af48ee4cd289874b366e64b0c8701cded25a84df6f8d4 SHA512 23326861284f096e40834bac31ef4e9344507b9332c8bbdc10dced0c60743bb2fbeae79d888c80c56e796661a2232998f1f7ba64ff1e0c9bc79ff13bd0a2663c
-DIST deu_frak.traineddata-3.04.00 1978593 BLAKE2B 7a9bf16949baa3167d162f5075a254fac7699cd6ce2766423a1d0ef652daa0174ae6a36c6dd0d0e6f45bf961b4a0d13a7f55a0de3bfa2afe023816dff0f54ed2 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7
-DIST dzo.traineddata-4.00 8771208 BLAKE2B 4651c08d7d7fced6c86dc7c41b14a205b85fdb5a98a5db392be0769ca35868e061ad39947d80aadaff38cf8651da10dcbdfdfb089192672eab9d3ea5e4d3ebcc SHA512 b9801388c1e2e6355846be86ec61b8eb0bdec0c2907b787c5ee5cfd042a3889b8b4a9baea27775088a1e18597c024012263830ee238b4d8f7c58d31c607f47e6
-DIST ell.traineddata-3.04.00 5422512 BLAKE2B cec340bb25a6f60fdf17dff46c06440ee2be62bf4b8dc8055dae1d77ec4a06a43862052399a3ece1c3d860cb1d88a1511a3b58a8b9f61bde3371736b0d686c01 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48
-DIST ell.traineddata-4.00 12594922 BLAKE2B 297198e6e4341123c88ce6d92442618797b0ad2f7b8c4f47051855c8186468d843071567a8b3b26b6693bc09a927f49694995e5f335baafdc7749ad87bf2664b SHA512 ba49067c8eed46992615013a09f58c457bf333afa4f152f3b1f837e934c71d04564bf1e9a1a8d80cd4aeac95639c19124aa586f3043737c556d28e2bc478fbae
-DIST eng.traineddata-3.04.00 21876550 BLAKE2B 983f91e54b334ee533d5689ac8ce768922e348ef89a284c47d93ba91fcad6de8614998c8a5b17c2406c5c30c1228530077aad84929da6d8bc983c89c1d3a2234 SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a
-DIST eng.traineddata-4.00 31873501 BLAKE2B d055774978588376c69fac2c4010971a37480f493ed3d6371236d0ab14c51428f328b1be658606bdc4658e36deebe744a3ddd132c7ba3bcf275c4222cf4b2e62 SHA512 dec017b60c7ee7c8dfe1c4cef562a02c8699c2856d6562641a7077c1a0b5493a26085fa81e7dfff97323054276f24eb51f64833bc2fe7bbe91b1955c6f719618
-DIST enm.traineddata-4.00 10479188 BLAKE2B a6ef01ccd91699b506d02c5c558923040afb65df7612477345d498b2798f5d04d09c6778773adba3fa0999caba6f56aecd54f2cd622434dee830c0f3d22535f7 SHA512 fe78e53eaaedee66e688291d684c221673b787dd3f020736f60ecdf4dd1257f3d2ccfcc10408a6ef50c711b538a4a3933c84d1ebfded82c2adc1685e7a9712ed
-DIST epo.traineddata-4.00 15408492 BLAKE2B 88f7ca7d97f6ce5443819c94eb5c31badfb7e00f7880a4d8167e53a204ca05b548669214a50c2765372f6df6b726797682141332d7dc6fdd964ade92dbac9bd7 SHA512 44230babdbe3ff366c0141f49ee524cc7eb1226be767e865b4ddd5afc1c1f99b67ccdc68ddc1ad0c8b3a368937508d9edbeeef099cb23815b506f1e08910427f
-DIST equ.traineddata-3.04.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST equ.traineddata-4.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST est.traineddata-4.00 21175883 BLAKE2B 82a9927d7d7ff5d79ab7fd6518b12e53a5e24931be17d83e07feacb96ba34d022148c7b20e8651ef05c6e85e1d44dac60b10ecb70d8ec7acf1f392c63fdf58ac SHA512 733200cfb2e963e93d12666b28f7993af4a84737cf4c9a4c68946fa70076d4fc649bde93e68d701d1970fb7ac3adb2c1fcf89f54b0a35dfa56c257f8a30ab6f8
-DIST eus.traineddata-4.00 12542297 BLAKE2B 7dbee88a1813893986bec9b5564d0e5169497734fedc13ccef05ea091d200d2021c2e65533bec2fdb990491767e5a4ca84031b8ad102e3385a1fc979b797675a SHA512 bbdab8f049a42cbe9e84d9695c6d209613ac35549147f000301954f8275b2683bbb2787df772f084e2f7887b2de9c0567fb424e80f0e82f95a14bbdac66c266e
-DIST fas.traineddata-4.00 10579225 BLAKE2B e0d68b0d0713f0042bd18bc52c41bd6af3501b4aec54f16b18229f4f9fba1f115825add6f270e8e020345c25f337c2066ca7d9894119a678257d8ee76511139a SHA512 8423479acc7ed52156a0a4f3c574de4555e51979a98f60a760c86b5726a767bdab7a787069574cbe2f9dd11f9ad9a723b9b9f03b656e2b0e0192cccaeef0c3b8
-DIST fin.traineddata-3.04.00 13274908 BLAKE2B 7fd89de5435619600523106184aea5e7c87720b1d5796508b4953d6d8c19e2e2bee96b7a36c887ab0f456a0322c30f17e37d91e3afaa1e0733c110f3324aa784 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789
-DIST fin.traineddata-4.00 28467692 BLAKE2B 9de412dd406915f2c55b5ecebe1bbbb15620c9d3f84f58d215a20a7cf3103e3e20c05177822f9b7fdb488c67fceee892c50fb3ffcd4f1e73314b8e4670d3688d SHA512 a077a853ab89d2d03d5bd7ccb60af51544c7ef3afd230ab0e12dc616f28130c860701af314f6e73f24ccdca4fd8d4c611126df525fbded4b7f023a135ab3a094
-DIST fra.traineddata-3.04.00 14044118 BLAKE2B 9acb6f5d6710632178aba4b95db27390d0100d9dec6ca3648c518dbc221b2cc03ecaaf33aafa363265863b9032e2ab7a327beafb8a6e29ae1a3345ba80455aed SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561
-DIST fra.traineddata-4.00 20908386 BLAKE2B ef52ff763733c5a957e34aa9cf280c9a90ad70039183ded321750c35321c399e131b03717180e89fbfde8bc121762dacc46dff54c7b0cc69f727053aa392b1e4 SHA512 ecf1ded66b3e5c903161377903b5a693ea8221b155ac61fa88b0e2ba1fdb34cce8d8e6d0270a45ed822baa012d7d24ee15c6032a31b62d9b773106e39bd18603
-DIST frk.traineddata-4.00 29861799 BLAKE2B 13336a3715221fbabde3b6d57ba08802b33faf21aee4c55401099f3667b0173469a051b845667f1d9269387dd7c0433e88c3cf778da3c34d855cdf8cced0e9c3 SHA512 1d70263862960fd55e51bf906dfc2092cb9acbab94e46f57c9dc83180585604a12072c977f820b2bbbe2b7a26bc63ca4e24900ac95d4f8a0e6d45f0a485dc186
-DIST frm.traineddata-4.00 24482384 BLAKE2B f2ee9f87a983b43a2b2513f3c2247558649fabf6561e805fe758f074bb3f22426cefcf9994b3eafaf5fbb83761ed11d0b903579f71958b4fbf427c5d3a6a089b SHA512 946587cbbde6d4fa537312bb9cbb1952f5c30cd404b2cec4f2bc6282e3b190bddc4f2450e0f1904a1b5e8523c5651a5592fa892aaed2d2da7b0f1cc6f35f3e2d
-DIST gle.traineddata-4.00 10190010 BLAKE2B 60a4c16012e61cd2c32010ab4c2f6848c2c493c1e7857ed4391989f7f4e67371018bd8935684f484c4d7e236c6276eb2aacd8ac2fdaf1661c52cf8f3d4d7c415 SHA512 b8ac110cd62185aaf4336080e9e08df83f9bca2418aacb440345c5a00b2b938613ef1b13788dd4484791b3728e9b88fd739ed1cd042b82ca61341f541b4403d3
-DIST glg.traineddata-4.00 12746027 BLAKE2B 06147539764f2f3433df4fbf92807bd5da888faf91c3da51813855c125d67631e85e2215ae135136449817ef8afa1c6fb5bfc74d11e2443689d00dbbe7ba99e6 SHA512 3c0e34d0b2fc50e21bd1d08ec2862fe3839f84206669127b5a902cf9d61ffb38faa25d68154619053677ca2682cc70260d2ca443bc3ea4d319ce0ee4b21e649b
-DIST grc.traineddata-4.00 12838816 BLAKE2B f1cf709876d26a8136cc12b1f1d87771cb9fbe71d58e76dbd524812dd3d2724250104c2861694ab42eeaadcf43df676940119f0cdf429f2929cb69e17ed25056 SHA512 121aa44fd9f6b1841bcc50407c483aa7c94dc63217cedf655c393907e32d24e5dadc34f9c40c044153329f01010128c58a3ae8b6e30b8fa1419c1b66617b9202
-DIST guj.traineddata-4.00 22879598 BLAKE2B a4c062855e68a95c69c7849d2169fd3167a60bd6c473c87c0c16a809b23fbe49d935b242d15295e7d3dc50d9eac752214309998c459d1084b48375ef978d7973 SHA512 47cd56dbd2cce5bc1dd1947440f03ca3879df8526256bd4f8973fc670046f68eb4b5529f13402af9e1580c4af272f976a1a95efae1126d09208f18c7aa9d7b6f
-DIST heb.traineddata-3.04.00 4339016 BLAKE2B cbc22428f18602f7d9af02465e5e8c1088a86db812c37e113ea6a52a914710377d480366c190c852e466b7861172b964b705e328ba9cd3de5364c992e2c6e938 SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727
-DIST heb.traineddata-4.00 10992421 BLAKE2B d7ac5d0863627073c9191d45afaf6cd2c76391309f58ded90231a3fca10e3e50ec81a0c51ce19a0dc0db9b4c395a3f6e49cb1beb20908331f841b53823b6b413 SHA512 b86ae5cc2ba7a1d9b3e178e9eb9153f2de38906de5054f494f0e4d35fb22af0c479ad9400ed8d1e625e648a7769778966eeae8a4064b1c9c85c3b78a7235155c
-DIST hin.traineddata-3.04.00 14152165 BLAKE2B 1efd29d700d9baaf2a6865caebca5b6375fe5e459cf0dc075396062233f54a1ea136787a975e3b0701956200fa79c539de5ff2e615ac83862b229c74b172c85f SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed
-DIST hin.traineddata-4.00 25757980 BLAKE2B 018a1eecfd3ae63afec77678512b2c23a9343be330e3d0e242a2531dde7dd4686450db8598eb8a20f57463350da9fd28cfc16835b0436673d517b93915120094 SHA512 53c55f22b3d52a852e7b1a699eddf4567e1b72897c4f5ca2cb13e0968c1e40d0a9d80ca84986c35e9b478868e1dc2d86b65873960d21f8d3671980a796dae2fc
-DIST hrv.traineddata-4.00 19582927 BLAKE2B 2f8e7662a82f90373a6ef763f3878ca6a35861d91c03ccb72833008f7b430dd839e9e8d1633e2834b251de2f5299ee6fd42ecb1954208b8222b5848d359074b0 SHA512 35bbe4c202993d421a29f63390b2b5e774d348e15c9bfbe88b8e910f949fc84e3c9edee13fe47a3e8629a55384ee880f815d74eabe85fcb775c9d4bdb16e4321
-DIST hun.traineddata-3.04.00 12213770 BLAKE2B 70f39e1e9b370c186cdffc2532810542e4655dd46274ea8e2ba9249383b991be4d82793edbab2edf7ad400eb54e0c7be032a20fa3fe851d5c6e9b5f4be12f139 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e
-DIST hun.traineddata-4.00 21667149 BLAKE2B bd0e3cb3d515eab4e0d22d69d09ca5d3d372ebd65f7e9cc6f81887a208ff932f70df36f491b4288d635cd26bcca7f2947f5e64d8da0d12aa37fba8d5773bdea0 SHA512 f59a5b2291fd5588b4107936bd813209df174e5a6494af6b3101f7f426501c00d78c3c2e02a9e3277f2b802ebd6e1c1b95825f8e08a9bf7eac12bd149d9fa4e5
-DIST ind.traineddata-3.04.00 6503178 BLAKE2B 183221318212ff8c121f07541dc0d2855f12a0f5020b71d9e91a0c03c3938b7908debbcbe55e2df6d9f4f04066d513925d000cf1662aa084691f52532a4ae6a9 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77
-DIST ind.traineddata-4.00 14281790 BLAKE2B 668b8cc8d034a36c0c84a7109c92c547d42ef539103ddec41c996c5de71e71284d88253724d386bb190cbceb82432c0dc6fc25eb6b324e2e4a1d6a2297be2b04 SHA512 1835d1992975214c3a85a436e78cf732c8f8a1464e8c24109f6d1dab65764f4a1b0757e32166620637074ef02d0749eb494e66f4932d1e0af11ecf00fa7bb28d
-DIST isl.traineddata-4.00 14374305 BLAKE2B 46bc653a93095a93da74d73d93decea657c80ba14777bed7efab0d5fa504bd7fb16dc741d3a1bbc9782bfd92e043b8ff0ac9ce967f5f0f0a384bf638a265bc57 SHA512 598e827226edeb843d03848edcf95cf41a8adec2aacb79c2be47411876a2fd5650bffc1e6a252f3eae4b148667dc0a7e02b4130bcea898c6ade9ed99af8e9299
-DIST ita.traineddata-3.04.00 14210569 BLAKE2B 2bfe588757c1f4765d5f6323cd7a72a80ba37c2796dcfd58b8dc00d9a3ad94f1e8710690b75542758be01fbe7b966d29e19054affc27d473e43448be0b2f327c SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef
-DIST ita.traineddata-4.00 23586689 BLAKE2B 288bfe546f3bf0f7183214d08b8f655482c22676fd50ed43556a2772a9ba4c8739011faa2c49f4d06646088dd232c5ea5beb34d5049bf5cecffe39ec3c5dc647 SHA512 0e32802292edb6bde1300a28af43e720e8cd6ea28e236865b01f8f5ff7b2e04b88d5d1ff2c32bf4fe20691c01aee4e524411c4cabb612e881e7573dc836ed0e6
-DIST ita_old.traineddata-4.00 23437150 BLAKE2B 3c949a6f67210f5a5d81240f4530915990ba1f4e5eed7dae32d33b3c7db7a3ca401dab887f5327a86f7dc5b20795f8ebfc0537f894a3a054c35ab5d1b5ab5fd0 SHA512 d0e98445f637422dc24350c7d29c8e3a3403a75b8a28322706b5dc7c8588e9a74796edbc39036ee44bfe68964e7aa60f430682ac2385501a4fd8653c54d01c5f
-DIST jpn.traineddata-3.04.00 33072615 BLAKE2B 39fc312a431c2fa8a82a4fd81cb2ed27bc29b92daba71307db484c34ca0cb616e816ce7404214e562b822251862ba79f256108320ff8fbb1cf942e3facd571f2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567
-DIST jpn.traineddata-4.00 44380238 BLAKE2B 0fd8222725cdecd00f8c70bab75c9634d1dbfe7b8ba11a274d199459d237dc3ab3b0e4a838576ae6522e4d503bc1987a574a98fd4d4610a8e420f8eb630d9a04 SHA512 ff49dd391d718152232b1db45ddd909441c9b6e753d56ce66ff637421db0e3876d7f2e66901bb67f8ca42c34d009d519e6814cb38fbc4403f63791754fe2aaf2
-DIST kan.traineddata-4.00 49079291 BLAKE2B 3d0e8dd6448ae51506a35b724e960d4d8e6a04c58d81ae1af6ba45b12a7ccdcd265812619898bbbf4684c7a7809e884950e55421d7e70ced19cc4d163b9c3334 SHA512 b407ac1d48f7d60d1e2ad67dffc0a7d0756466bf4f687089f62bbac44d787804048c95ddf83565726fcf5638f9986e11fce163c008bce92b51d42b4016444a9f
-DIST kat.traineddata-4.00 15490959 BLAKE2B 0eeda0f9c317d84dcebb9015792de6e01b140144fc718ff9c01780902a5ace770b0b4b1a7361b96e8246fc04adee087e3c46699fab0781f7a2f87f727286a3bb SHA512 9af3cdfcc0be350a9a2952a478bd5f12cae0a688486dfb391b5eae9a44c28b24a05209b08feb36fd7b27dde86a300bde32b569596854370ec5e08bedcb39efa9
-DIST kat_old.traineddata-4.00 5981988 BLAKE2B ecc8044ef090da97e12da3855ecdd5a01972c2d30544a57ce2835e8142e55e73bfb214a56c899916dc5438351d08ae3706f10c40fe4cf493ef3ace3036ff0ed0 SHA512 d98c6ad4a345726b20178eb018fe521c5e811eaeb79f7eb3c6c2abe4e984bc9bd03cb4644942ea24aa88e01a5972c8e1e3df9374b4f0e5e6464c8f5eb131b74b
-DIST kaz.traineddata-4.00 12616561 BLAKE2B db8f8166bbf8bb90be8295b7a80fbd8b4a3ae89cd4a46bd2caaeeb055dc56b41432aef32679d71c09c22384d60f2d34ce0b9b12b94d70ac3494d1587fa04a7ac SHA512 742bfd1ecd6cc06b1f4c89aecd64439b981d5194933fae7a8fc428b3b761b99f9cf54151c3ab2950a9e3630ffd28ce973e82c4cf3fa6b035a1fb60562c038912
-DIST khm.traineddata-4.00 54152200 BLAKE2B 7ca00baff0eb2b1efe749f823a85f74a72b58364de8e2c58bc85105e5911d28910b6778e86ba48ed0ca25c3895120d9c8d7594023284994ad6b94318c7ea4ba0 SHA512 3d9d096880e75ca6df0fc47548fd31f1035b2527edcfcfc6df926f358fdffc9ef8b8347cf7d58bfe76ed1b0bc8906ec02a0e493bdcdca14a78c251aadca56b42
-DIST kir.traineddata-4.00 13994013 BLAKE2B 20a8dd1c73a599e3cd79e0f9e0ecbf824eb465beaa56728cfd7a7583976e9371a247f0ad8083c1f6645166e1a15c625798158ba2d9c6a113614326efeb0a9217 SHA512 399c4f53a1a6ac8c3895231d15fdd2e564e2fc81b900dacbc1d39fde019f2f881be83ed79c2a7637b5ad7a11be0139275929f4cccaab388583ad107666776582
-DIST kor.traineddata-3.04.00 13309831 BLAKE2B 6a2ebbe51f8c1b5dd426a62b982acaa1b1a7c32f1a9282ccdb9561846d36a77660c8911065a72f80fb353d757b34958292b76dcc25656441e30c68f648df5cf8 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee
-DIST kor.traineddata-4.00 19342144 BLAKE2B 3fd755cdfa8d3e73d6c19f4fcc637edf3816f24d36e23ce0a25fa319e85daa4512ce6420a06fadae6e4522f7ab5d57af3a6ca4905bbd0036e92867576a363e25 SHA512 1f932f25b60ec8a1f375bf03b9e51f3457d0259340bb4bed21bcaae44768c5dbfeb3b2dca98b88de89d8b52cc6e38dddee61315d4a286833186e5fdea1e7f773
-DIST kur.traineddata-4.00 2020502 BLAKE2B a2bf3775f976330c9b566ab77d210dbe97b15142ad26883c64d2156cd79322c8cd92368c827f524cecc2732e2b82e45586d161e2f0f9a95efdac5a93e07db835 SHA512 49e0661a2517632543eaeebd8c6468231f811bfca513731c7e5b1b0f6c0f1f1c86e3e8d757bb0cea1af077db46517cbce72cd8d9d71cb006c1ed6a51c9b8d24d
-DIST lao.traineddata-4.00 28962138 BLAKE2B 7c1e71dd68bf206152155a3efabf58e1fda09c8e43131d71d7f004bafd162fb67df433f1647eccbfc6f275271f7ee62c2402c8c3651e48111e4799848b9e6c29 SHA512 75e56e234e544de5c683801be0e0c5b41cec7553f441c302c4ca1936c73afe2a0f467118e5b773d574495d925f54d5607675056674c0908362735c6a1b777a9f
-DIST lat.traineddata-4.00 15241172 BLAKE2B 3711fbc71fb29adfaf5a1037c45550c7fc62a99f281018d20a0a396ae614d58411f6aae15b2de2b2aad44cfa51aec22d0a32be0acc3fe7df2a5ff69a8db0d010 SHA512 fef165eaada48f0c423177674061e05f569a3973e10423a78c2ce8fda21848e421150a9ce47f4185d70a72a344239715b2199d82dc5f609a29681cd85ac53234
-DIST lav.traineddata-3.04.00 7802105 BLAKE2B 40b90aadcab68a1787c77ebc3bceeb120fd4407cad3b7a33ca176cf1741d3b32ce1c4e81b3b793872caff756ec9651bfe7fc99e9721747eca7681024eb4b4726 SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b
-DIST lav.traineddata-4.00 16963807 BLAKE2B 1998b9b2995f81069733292cff42919eba5ef35f61359ede5a339d2667f708038a2ecd3a66e66cab33b07c43e0cabeb00db2b75f87d535f312119954e1e1c084 SHA512 c8ab21a9de64b13fd2e96c8300e77d81bbbc8037ee8cf38cc5ab98f3b81b2cdf969dd4a0b893cb3d545eaa24dd3fface55b3da3cc8350e6e3c8ed71134ae7018
-DIST lit.traineddata-3.04.00 8916163 BLAKE2B 7530938920b957b5affabc2e73deeb5e1c44a1005c5fddb3e5981db3c9b4c42fae45eb5ff88b1b41a9da9fa888ea4679ac2bb36f458c5da81d0251c85874ccc0 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0
-DIST lit.traineddata-4.00 19560399 BLAKE2B 9d7beb73c7552cee0dcc3d9d3f88d1f4f00890d2f0831d310fd0cac7fb02cd5eedcdca625e998f4fd3c113229443a907d0279ab0c9ec33305d1f71fca9125faf SHA512 e8c7f23bfa87b23a80c15929e0697f6a9a2fee62b298555bcae61aed80f9cb4528e54c92733c844a69f656e98e302a2415cbc4ee54f3c5f2743ffd653fa78e37
-DIST mal.traineddata-4.00 21778761 BLAKE2B 8c61958db17d2cd5b688e4978552a8959b14944e972b221fbb9864f73bf2b9d35fab8a090bdaf83ea16fae2da7900dece202accdd34c0156058bcd95ee5e2f35 SHA512 2b0cb5ea506a91206f3e33c5c7db7e48369cca240aad57e78c9a8b642826a3fdde5b0b1f5d83f8745db4d9ee66f96e6ae8d321cd41ae93f6759c83927c235bea
-DIST mar.traineddata-4.00 26199347 BLAKE2B 726dc5dd7370038b9eadaa1facabdbae2ebff0ded6833e461cda004f7a33dfbb5b4deff6eb59332a27929058bf71ebf6dd458a8e3d3e9661171c09e457432883 SHA512 60fb8db91831476a7bdb70d64f16811a1d244286fd92c2db65b7d53e177aa0141149325d8eb87c29a1935a7942d74ecca36e7153c656c47366a2eba4f35c815d
-DIST mkd.traineddata-4.00 10485081 BLAKE2B ef57817f9aeff720af2f10418b3244e8dc83988ca580b726d9b628c45eafd4e9347d7aa68e8aacf9cda1e5ee6c2fa27a8302b01775c88252a7b1838e79975f0d SHA512 2bd8220e6133c7e60980da687fd8fa25ef227de76326bff70f7e285ffa7d30c05bbc0ae57af346fc17dd37f5c1cf408b976d8983be264687517c292056daf75e
-DIST msa.traineddata-4.00 14604064 BLAKE2B 3367afa1e8d9084a767ecdaf36c0441ad35c1437f95ac480e1b186c5e6706fcdd0a580a386d7bcd80dc2109c2e5dbf76b19a7eb144bc04377fd4549a93901210 SHA512 deb9fba173fd967ea6e92b68f79417c126c3b2d25b67eeb4390a6d27d04e585e27761c1c81ae8c03119a223570bb1bddfe31b13cb5450666253cc1a8fe83b9f8
-DIST mya.traineddata-4.00 75085274 BLAKE2B a1334f89300c2189770812e281d7dbf5e8586a5b87f223f85e90c789345ae881ec012fff94a0a15f3786cb99922cb56c5d76b77804cf0069949de1b1cbf6dfc7 SHA512 681d641eefb389636e59ddd9c3bf23153d0bc0aaf4a6bebeb15af4cda6a9069c78f64e1eea75abcb06aa563ff074ba7b3688d54025c71a073c0e88133bc1d7ca
-DIST nep.traineddata-4.00 24248362 BLAKE2B cb033b55609b9bdc18ae96cfee5315de3ac440f4e40240a692e9025f36106dda67c77bad7fe1e70f04ba8a596dd988a0c455112f56c8f6d753b4f2ee73322601 SHA512 f289a240f2d9c442b8c4cb678d849547dd3c8c187ad4d4e5829c98c925fe07e0763679e04c8a2360a4a0a77644dd191ac31728398a807731ead879896e4f5509
-DIST nld.traineddata-3.04.00 17098919 BLAKE2B dcf0641a78f1c8c6493e504229a08e1d4838d6c808446693b354ea822c7e2afc5fd9c9a1a2b970543c92fd7d4b3e9090dd8a6cd2461d6ac91aade1e1cf150aef SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c
-DIST nld.traineddata-4.00 33075399 BLAKE2B 5fee9b7d29184501f98b490085717f26a626a26e00a133fdaa87e7374c17283b8de2c706f40ab43b1aa9278f6c588c33ca894f374514649dcae5903a24b7a0a5 SHA512 248ac4048b8909e325bd3ca4edbe48f9853eb8fdd8ad9d1950a557706fe45832ada8dac9dbbf033d33fe676101fa81f96de1c691465b77ad84e29f1307eb2846
-DIST nor.traineddata-3.04.00 8262167 BLAKE2B 5ee6362a945e0ba56da6da95fd9a7958ff90fbbb20b978975092410f9d8da7f600f8eafd8587f32065b669b8399a228ccea14db94c9e74f32b1c8b683facc36b SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2
-DIST nor.traineddata-4.00 17444731 BLAKE2B 1f8ed7ce296e27226ea12bcca9da0121859ebfded6780222993233d4c1b6346fb9a799efebeb9540ac1bda0ea1cbb80eec49e989005d8d7c81dbdf2199cd6ac3 SHA512 9f439a99e7316796c9d1fe3a562ea056459897d1cb195fe20ede546fe09b46dff9ffcff497b6db1ba1d9e82a914724f7645ef33263fdf9d7a86e5102802ff1f4
-DIST ori.traineddata-4.00 14655225 BLAKE2B f89441e97134a20c6324d07c58b3eabb130228e6fc4e123273b3e496c9862699acc21afd01bab3619d96447329c296d1b545206a72c69210296733f2106ce953 SHA512 532f3b0466675fb15f22888323bdb4bef983204169333b46387820add7f7d9e2d79bda3b65cb7a0825d20da13ca721c1233066592de0145555ccce2da7e0ec6a
-DIST osd.traineddata-3.04.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST osd.traineddata-4.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST pan.traineddata-4.00 20032828 BLAKE2B cc8d3a24e11dca32e183b5decc7fef04ab54b553d21f045a638391598e7f055b2ca4f15bed6dfe4200b567740e7f3e5211d13fc0c1e95e2d77bc4f9898d8ab26 SHA512 c86547b2ae1dedd259237acd59417cc1a181dcb2960791974dea2dc7cfeaf1d7604988c892ae40b5d51b63573d3fcbfc24aa87e2e068f532ecca730cd3395872
-DIST pol.traineddata-3.04.00 13918058 BLAKE2B 5531bcda6cbe2a27655f3448b5093fc1cbd1167e91fe3bb410a260062a7163790667d43954d880b20df23d68d73f2aa2933d425a8651b2c3ca7c8387486b876a SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10
-DIST pol.traineddata-4.00 25941386 BLAKE2B e32f7bd871463ef49804195300dbd5abbe2f0b57b42061b7f5a727087bc452358620a775ef66a6b8f1924ff47382e228b18e18b81a0ca7593e537d61efdb1ae9 SHA512 42442d52aa1afa52274b307994a1470bd643b017ab3effde0a61e44a22463fd17cbc516cfe2bcd3bb9964782315b08a95d1dd7b40d3f31c04fec8109fad224ba
-DIST por.traineddata-3.04.00 12914622 BLAKE2B ed0edc8440ebd3f2e9df7dac9ed399df79ca803d16a1396434cb058424637b123af54b0f970120b54d21c00d8a0b1fd387a12bbd200d5a85ed1d49bfea297026 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03
-DIST por.traineddata-4.00 21457953 BLAKE2B 48968b2680ad161f20a6e51bbd6da47c9b9e60657702250348900e27ddcd39f2a9482bc0bb331570e1db3c5aea9190194287938c4f249025bd73409f54c46009 SHA512 5bc95002bda1fd0cf15d3be6d417fcda952417c5a9e08c46f3bcce859e89be2359ec4bb15199bee0cc72b407251b7b4ee655d67d46f8738bf29bf2b12bf3b29d
-DIST ron.traineddata-3.04.00 7957608 BLAKE2B f17e0e139bb0c5b12de89b82b62fa3014ed6129c60278a751994fd107a4ee310f991ef425296e3f3e3f44387ec8fa22da4e6b29127d7a7f5b31140240b79cc9c SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a
-DIST ron.traineddata-4.00 16545516 BLAKE2B 805a76320f74ba0047c726226115b056ac99334376883a2d5b824ff406d87da5334d9e0fe523aa6c22a04404c45bbfdfd3e250ad6a881b437e35697bb787f260 SHA512 045eb12025bb4e85edd7f82407287e451432411303a17bfe2ae13327a99f568903fa6b105d3fdd6ab066161821106485dbd8d44931b2eb357cd6145adbcd3d65
-DIST rus.traineddata-3.04.00 16152507 BLAKE2B 329619a15cfb48c04d1d4e4bf902e090aac9ffaa1998a26a8861dc24ddb8d9727d473024dae44a43b7ff29f0079cb87dd60dc1a49d2e310249eb05999daea839 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335
-DIST rus.traineddata-4.00 28115168 BLAKE2B 331d490fdd50f77c3c02ed01780af28431e531f6bc4b45ce889e9be2c63a8de02c45d9b503871dbf4a2eabbaedb9d8b448f6a4764bd4601ad2033ef4dc229acc SHA512 4a4524a4759b52e7936518c37aa3e60032537a5a2e11fc8ad5e48bf92a2f8efc54cab3962db5e980b9d894dcbf791ad796c55b875eb95b7f03444eb75c1cedee
-DIST san.traineddata-4.00 44276691 BLAKE2B 0da566cb2b5f576e601610b6532f0661c88efcb2d1570dd754b41a9abb4f5e3ea75bce3f34a8631b13cce6c1369698dbfe79e397d6cd99f1072d81004b60eb5d SHA512 97c266b3dd7b557575004d432ed7ea09ee44cf168d8f00a0dc544ebcc4df736c175a88f9c0b45a600d99eb7b3616bd2ceb96ebd2eae67b43f9d38bc35736d006
-DIST sin.traineddata-4.00 13528944 BLAKE2B a7d7be01e740373946069aaf2d8f8695aa6a9c958c09ca0de7d904d915f6dc803d734702a279fd630cdf3e3f6cc35977938a05fa298f1e2d5cbc7d3a6e3677b9 SHA512 1dc149d2c9e1c394d2945a6c41a9885ba05a82b6b629f87157d8439932066fa54b5316aba0430c4f861703a8aabc3cacc1577992d68869a988b11d4b93c71140
-DIST slk.traineddata-3.04.00 9126966 BLAKE2B fba32bf08f14a2e354b298e01b900f7e7b0aa6082c78214a19b2a11a9b2cc73a0ab9f70453888860b3e1db5b450c1934099375c258d363b32ea497c2833335c6 SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96
-DIST slk.traineddata-4.00 19335882 BLAKE2B 2b7f901a4530c79bf790bc0f5e79671b48cb6e919a87d16ddca29e6229a2b36d7b7b8793e5e13c8affc18f49969b09ac4074a354c56b7b2c78ce04b5d6cb3729 SHA512 f72db1f57ffab113424d872ad97f8b1381c2be1ad2b8f09f6b4a5a75eb59d5f53e3319160b451fd6313ee8cb0606afd089f4051580d4af4dfa7706814d89bf7b
-DIST slk_frak.traineddata-3.04.00 845250 BLAKE2B 623c43315b4fc842811d4f165d19f82b1141c22d78e1ae98ec31b5b05df31f7c05702f30a37043c7bfe6bb29b8f7648f50445e7a2f4b1de666599b211c1de6b6 SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5
-DIST slv.traineddata-3.04.00 6824064 BLAKE2B b9e804194e82b3f7358cb794ca0eea0766e9166e76d0d48f6be57b431c8ea4d88884adb4dc68dda24e07d06ced018992cb9e4690d5778ae192fa9aa533ccd8b2 SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe
-DIST slv.traineddata-4.00 15472904 BLAKE2B e701dc8e30147cf3779414bcf95e30344e661f0eee929a419d9f30892fe7ebd39ed87b5a2be6073f06be06b03cdbe25e74bf987e23290d353d3ad4d6ee2c947d SHA512 975542196c706e98430e5e8fd9673d03ada91a829c0b0744bacb6fbbbe93d22f3fd36de4993766fdbb76f3902e4e7bdcf59a4b51a0c452130b3a368d0e645208
-DIST spa.traineddata-3.04.00 15953087 BLAKE2B 9eba61ca27a8697b4e671d8f0d1626500da4c18f046b51fdd692576e5b9068898a75663d2745cd21345a6f3df5108b358624b7b7a264e3c3d4baa34cf0631771 SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8
-DIST spa.traineddata-4.00 25107848 BLAKE2B 6ac79f12ae4a06b1843e6df713b61abfd4933f17e61e783e57c2049cbb8cbf82962eea6e1280d975004d9efec4be463ffba4be2416204d63587d25321c698f26 SHA512 5d009401faa71d3a8e9c4ff32dd1efc5e38c02b8c4170653ebb33874e6c489f7556c67ce6ca7cee27500496f657cf4361314563576176ff5e545b8079722bb8f
-DIST spa_old.traineddata-4.00 26019934 BLAKE2B f7c7383ea812fef6ea9bc15083a78880df71d19dc9ea092102e78bad9a7cdea4fc88d8a96201d8f403757c366a6368ee0c59b8af0163b9ff33486672a19a24c9 SHA512 b50c9785e6962defd3c9373272581eefd476405e8b0f20d4f692a99137af01319ec92af0c51207d724d4f83852c789c2f5109cc6f47a1a79080d5024926ffc7c
-DIST sqi.traineddata-4.00 14827880 BLAKE2B 6af1b9033aec450f44a4cc37e9df71970a60a60d1b53151182ea39da2c85e7e638a5174b45256fd04aec05c174d13b4dbe7861767c0ae186f787df2c776aff0a SHA512 56a2e2486f05498f6fd136f27406eafc218e2c9328274c60c4bacc5f51289d3b99810c305da76e5ab3ded05ac1c33bc822b367394bb030dc7f2f6bda3092a4fa
-DIST srp.traineddata-3.04.00 4611681 BLAKE2B 08c3814a6463a279fa4111d9c94161ec43c84e6479436734e067ae5aa9b17d09ed02a74ea814ffe389e625253599a757b2bb5b866d1ca0e8991308658f57585a SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a
-DIST srp.traineddata-4.00 12189572 BLAKE2B a3ad3417703807dc4f74b4ba79af8038a96b3dcb1cc56d1370a9c41d1508d6981a146c6dcac833e0d88c690de8a488fc9c2bfaca97035baa048e3c993d9c73b1 SHA512 69f7703d48cc3e6cd1d2d40d1012ead58a3905beba6787cf0276c0268d142f64bc7116ab43c6339eb8704ebb293ec25c2041093b4eca8cc76d64cf432a95f26d
-DIST srp_latn.traineddata-4.00 14395288 BLAKE2B 08fc69718d64df4d785f3943482c7cd1e09345a18312c1de8661a0d1db0e926322854e0b02c3c44e516b00b42e19153268849de6d41de494d5ebd2e715221d4d SHA512 65644d3f7e01cc77038a438d438707f48f5dda1827f729e793fc478a997afe84388d51993e18b31833f5b1a3f37b183112ec1459bdc3184ccce3f6dd361c232b
-DIST swa.traineddata-4.00 10931654 BLAKE2B 6d3861b636c06dd7e03a04c50c48a8b736afc91187ec4bfa44a58563f20207af2472da7832955c02681d53d12384ccac65058f0b2fca6ba5b0a027e99f0cad05 SHA512 bb865197fe1558ea8b63a83d68906a7f2a12aadcdba2904f1f01f15db4576e96d942b8a2c684ee3a049f2cdc3997b9e6ca49faf531b1d885abe7228a50af2d2b
-DIST swe.traineddata-3.04.00 9460295 BLAKE2B 766bcd64e506eea7014975de1ddf6cffcf8610d23e38ddee77ac00125eed6c3db9c434c9f1d111a9fbfa64543b230743e1cce141b19201c7c94c96967bc35141 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167
-DIST swe.traineddata-4.00 19062525 BLAKE2B bcdd4b24e671c47d7c4e2bc88c19c9257651214b8eb4d7714e3c7fe8744ed0949a31a195e2daac6eef6e94439bff9a644bb794c386e7c32eced96b9aa1771694 SHA512 634c75641d27026afa84e4179889673bcc1dd6eb56459894612e0148a3e70862c82e5e92832ea83e066c128cb5646eec90a0b36f3cb4c789128b43cc27117450
-DIST syr.traineddata-4.00 8056121 BLAKE2B bacf6ee42b8a9dac7042ca2608ec72b6db1a760f505e3325105141a24395d7e4e35fed3fe737785e92232bf89584822b46af05e97308f76edad0c7bd28a048e7 SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06
-DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543ccf76d7440e7b1c9c8fe89a3cc4e19359a8695b1410004e202b138b8524c000487fdf2ee26247c0a2d4190b7184ed SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f
-DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
-DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
-DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
-DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
-DIST tesseract-4.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
-DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
-DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
-DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380
-DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad7cac9d60d59189e26fef6c11469da26e86ca867ff97cbf1b83fc501d6e48fee0e729f6e73e7f5a512e7b89998475c2 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a
-DIST tha.traineddata-4.00 22477903 BLAKE2B d7c63754511c3769d12b424b7fd30c700f184d470dc4d1e12a861beca1f2574023f76ac7f308e4c6f1f0d289b3f428d6a677b65cb1d4b3fb1217a348f5ff59e7 SHA512 b4349650ca1f2a5317cd2691a9fa97afde1c22872147829a71b0c49cdffe7b8a732c9aafcb87fe12431e0bc897a82e48204e5d2369e8441a654aa3baa4d41096
-DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
-DIST tur.traineddata-4.00 26503738 BLAKE2B ad1b7eec15dfe5176e0ee607b8eee5dd2e860601b8c838374a7bf85c890bc4013789144508aa78b3f613bdaa534a5c24a1b3b1330fd47c5747aba04a49050ad3 SHA512 03b58b9757a975a2b6101ce62cf12a13ae1b167bb3f8c8fb9384802ae6427af5f2182600972412c942d706a37b624ea49cd7ef3bab7244e7dd7bd765e011a558
-DIST uig.traineddata-4.00 7657636 BLAKE2B c1ff74721c689f5e8db24d3dd68f55c0e3cf4d3650f1764b65596e404a82ff25fd4fbc90b5a8cc504639fae005ba943999a35ab7811b8274777bd40dcba28128 SHA512 fc53338b875bd8d104f196e59b66e070fd789d8a58c54f04cf5b788bb83b4b83c5c9b6f1b1f468619358e833e436e1bd64c2b6b52e8499f5cd6189ebbdee3ddd
-DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
-DIST ukr.traineddata-4.00 17775376 BLAKE2B 9d9b2edcd76e858f041edb3f04c29fb1c630fd9b250f982f6445baab8c256262f9f444eab69226ba50a8e647d2aede24d4478bb44c86c67deaeafaddcd5eb826 SHA512 26f02bd7d4c392beb3ec174041685d6eed0b6a2f0d7102d6dea271e94bfc8bbbbcb4d74bb34e72357cb3de7bd72f7e5da2d7fa576b98374f9a0938b2b52c9c81
-DIST uzb.traineddata-4.00 12505562 BLAKE2B e0fb586d07d70e13c03e2ae0ce7a9749528196ab6348cfc87f9cbb203d6ab1fded029549f6aef014e4d5a171feff4b41bd38190340c7e84582f621f5cff1cd21 SHA512 dd7579e62d5564d22945447d471bc288abceab99b21e224ec9adafc20899cf708e7fecc5c2c0133171f6a6841d56c04743a0b7762ee021e6b5d5f678e4cdc05c
-DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bdf21918b7e7604d83b4e002f248c3ae209326c1cc78541bbdf58a12c96e7e072f5d935c76053bd7b65090191f9b0956af SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7
-DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
-DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4ce4cbd40493d9b56b13ecc42e9e2b9030fd8ad80e44e8c784f344b0eabbdec65373135bffadf36cd79b25f19bd4d SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560
+DIST tesseract-5.3.0.tar.gz 1913678 BLAKE2B 975b3a50dc2c9ec7ded82caaa068d2d9d362ee0bc6d51b41a52c692ac7f51231d4c64a9dda9e7b850297d4c1f13eb40a709e59eebe143df4f5e2a060cfbbfd3a SHA512 fc0cfda980059390b7d6d3d8e475b4ecc9dcfee1abc3b16fc9ffc8904db0a0847a5f6f1b32bd2e1f6f5a714a8c4df0fb3dc7c6aa25ece6162bf52fe86b4d0f34
+DIST tesseract-5.3.2.tar.gz 1916850 BLAKE2B d900f7e21a53a4ca77ab820359cf8b528ac0114816029c257dffa141ae9fdecfe4ddb97160b598d1f144c139f3fbceea080fb050802d6d3fa7ac8bc8e1353d72 SHA512 92db2a513f00b931a0207cc705020bee9fea4ff7fa93c57a6f446b5777713864cce19121b316ef8b78b6bd625ee7e6fd473352515f98c4a2187569cbd0a9713a
+DIST tesseract-5.3.3.tar.gz 1918172 BLAKE2B 84676368e23d5d51462bbdaa5723d582cdcec3958e4224c6147ef35d260c933f0a217f1ddca2f71b37aa3045714d3a9f31980f02b8ff7a85fed5db072e0827cf SHA512 c04ae68ac4ecf85243c54feb4233e282cd420522588fd4b3eaa87619cb236a575052e3667a806c2f56de06dc013b88926c2dbea4cb4ee02f0119c032598169f2
+DIST tesseract-5.3.4.tar.gz 1918319 BLAKE2B f4becd425594be132df2c206847faa91daf9bc58d83eac31096f92cf7d7b6c9234ae224ee94ed1f3099414bde393bb86f94d1f76fdc05b4310b415b0d7eb05af SHA512 a81c98c3754a71093df7b51390ccd43d05f661352b4cb564e403b96d81909664c2ecbf2eb6f37614c4639e6dadbf2329b926d09271dbbdaa302f2d7b6b0d628a
diff --git a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
deleted file mode 100644
index d6250d66c056..000000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4141de7f8ddb5ac3c39fd9c1fc77ed911c768c3d Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
-Date: Fri, 27 Jan 2017 12:02:54 +0100
-Subject: [PATCH] Provide SVSync::StartThread() with GRAPHICS_DISABLED
-
----
- viewer/svutil.cpp | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
-index 34a2286..84a4b94 100644
---- a/viewer/svutil.cpp
-+++ b/viewer/svutil.cpp
-@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
- #endif
- }
-
-+// Create new thread.
-+void SVSync::StartThread(void *(*func)(void*), void* arg) {
-+#ifdef _WIN32
-+ LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-+ DWORD threadid;
-+ HANDLE newthread = CreateThread(
-+ NULL, // default security attributes
-+ 0, // use default stack size
-+ f, // thread function
-+ arg, // argument to thread function
-+ 0, // use default creation flags
-+ &threadid); // returns the thread identifier
-+#else
-+ pthread_t helper;
-+ pthread_attr_t attr;
-+ pthread_attr_init(&attr);
-+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+ pthread_create(&helper, &attr, func, arg);
-+#endif
-+}
-+
- #ifndef GRAPHICS_DISABLED
-
- const int kMaxMsgSize = 4096;
-@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
- #endif
- }
-
--
--// Create new thread.
--
--void SVSync::StartThread(void *(*func)(void*), void* arg) {
--#ifdef _WIN32
-- LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-- DWORD threadid;
-- HANDLE newthread = CreateThread(
-- NULL, // default security attributes
-- 0, // use default stack size
-- f, // thread function
-- arg, // argument to thread function
-- 0, // use default creation flags
-- &threadid); // returns the thread identifier
--#else
-- pthread_t helper;
-- pthread_attr_t attr;
-- pthread_attr_init(&attr);
-- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-- pthread_create(&helper, &attr, func, arg);
--#endif
--}
--
- // Place a message in the message buffer (and flush it).
- void SVNetwork::Send(const char* msg) {
- mutex_send_->Lock();
---
-2.12.0
-
diff --git a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
deleted file mode 100644
index ad1f0f3df208..000000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am 2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am 2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- com/google/scrollview/ScrollView.class
-
- SCROLLVIEW_LIBS = \
-- piccolo2d-core-3.0.jar \
-- piccolo2d-extras-3.0.jar
-+ /usr/share/piccolo2d/lib/piccolo2d.jar
-
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
-
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- $(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
---- tesseract.orig/viewer/Makefile.am 2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/viewer/Makefile.am 2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
-
- libtesseract_viewer_la_SOURCES = \
- scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif
diff --git a/app-text/tesseract/files/tesseract-4.0.0-manpages.patch b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
deleted file mode 100644
index dfa8e9fde340..000000000000
--- a/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 39ed30ad834a43cf403f88158c6db7a96f1bed29 Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Fri, 1 Feb 2019 19:47:46 +0100
-Subject: Fix build rule for manpages
-
-This is similar to commit 2106cba0a98a90451df835f3ab7b2aaf54826442
-which fixed doc/generate_manpages.sh.
-
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
----
- doc/Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index a218aca3..c0eeda84 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -2,9 +2,6 @@
-
- if ASCIIDOC
-
--asciidoc=asciidoc -d manpage
--
--
- man_MANS = \
- combine_lang_model.1 \
- combine_tessdata.1 \
-@@ -29,6 +26,8 @@ man_MANS += \
- unicharset.5
- endif
-
-+man_xslt = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-+
- EXTRA_DIST = $(man_MANS) Doxyfile
-
- .PHONY: html
-@@ -36,7 +35,8 @@ EXTRA_DIST = $(man_MANS) Doxyfile
- html: $(patsubst %,%.html,$(man_MANS))
-
- %: %.asc
-- $(asciidoc) -o $@ $<
-+ asciidoc -b docbook -d manpage -o - $< | \
-+ xsltproc --nonet $(man_xslt) -
-
- %.html: %.asc
- asciidoc -b html5 -o $@ $<
---
-cgit v1.2.1
-
diff --git a/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch
new file mode 100644
index 000000000000..959948aa677c
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-5.3.0-gcc-13.patch
@@ -0,0 +1,25 @@
+https://github.com/tesseract-ocr/tesseract/commit/2025b53de6b3d97285d7c5f80497493007c586c3
+
+From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 30 Jan 2023 11:27:07 -0800
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is
+no longer transitively included [1]. Explicitly include it for
+int32_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/ccutil/params.h
++++ b/src/ccutil/params.h
+@@ -21,6 +21,7 @@
+
+ #include <tesseract/export.h> // for TESS_API
+
++#include <cstdint>
+ #include <cstdio>
+ #include <cstring>
+ #include <string>
+
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index c3f203799bf0..f0a94f168931 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
@@ -16,9 +16,7 @@
<remote-id type="github">tesseract-ocr/tesseract</remote-id>
</upstream>
<use>
- <flag name="math"> Enable support for recognition of equations.</flag>
- <flag name="scrollview"> Install viewer to debug recognition (ScrollView).</flag>
- <flag name="osd"> Enable support orientation and script detection.</flag>
+ <flag name="float32">Support float for model training and text recognition (faster, requires less RAM)</flag>
<flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
<flag name="training">Install training applications to add support for new languages.</flag>
</use>
diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
deleted file mode 100644
index 02784759ea3c..000000000000
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
- math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
- l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
- l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
- l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
- l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
- l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
- l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
- ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
- l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
- ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
- l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
- l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
- l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
- l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
- l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
- l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
- l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
- l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
- l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
- l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
- l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
- l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
- l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
- l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
- l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
- l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
- l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
- l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
- l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
- l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
- ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
- l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
- l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
- l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
- l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
- l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
- l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
- l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
- l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
- l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
- l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
- osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
- scrollview? (
- >=dev-java/piccolo2d-3.0:0
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )
- scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
- scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
- "${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- for file in ${A}; do
- if [[ "${file}" == *traineddata* ]]; then
- cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
- fi
- done
-}
-
-src_prepare() {
- default
- eautoreconf
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable opencl)
- $(use_enable scrollview graphics)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use doc && emake doc
- use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
- use training && emake training
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
- prune_libtool_files
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins testing/eurotext.tif testing/phototest.tif
- fi
-
- insinto /usr/share/tessdata
- doins tessdata/*traineddata* # language files
- use scrollview && doins java/ScrollView.jar # scrollview
-}
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
deleted file mode 100644
index 02784759ea3c..000000000000
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
- math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
- l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
- l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
- l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
- l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
- l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
- l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
- ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
- l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
- ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
- l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
- l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
- l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
- l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
- l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
- l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
- l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
- l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
- l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
- l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
- l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
- l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
- l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
- l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
- l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
- l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
- l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
- l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
- l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
- l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
- ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
- l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
- l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
- l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
- l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
- l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
- l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
- l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
- l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
- l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
- l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
- osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
- scrollview? (
- >=dev-java/piccolo2d-3.0:0
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )
- scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
- scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
- "${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- for file in ${A}; do
- if [[ "${file}" == *traineddata* ]]; then
- cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
- fi
- done
-}
-
-src_prepare() {
- default
- eautoreconf
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable opencl)
- $(use_enable scrollview graphics)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use doc && emake doc
- use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
- use training && emake training
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
- prune_libtool_files
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins testing/eurotext.tif testing/phototest.tif
- fi
-
- insinto /usr/share/tessdata
- doins tessdata/*traineddata* # language files
- use scrollview && doins java/ScrollView.jar # scrollview
-}
diff --git a/app-text/tesseract/tesseract-4.0.0.ebuild b/app-text/tesseract/tesseract-4.0.0.ebuild
deleted file mode 100644
index d4ba59d9b351..000000000000
--- a/app-text/tesseract/tesseract-4.0.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="tesseract-ocr"
-LANGPACKV="4.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
- math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
- osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
-
-# List of supported Gentoo linguas and their upstream mapping
-# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
-# "old" variants were regrouped in the matching modern locale
-LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
-# Missing matches:
-# ceb Cebuano
-# chr Cherokee
-# hat Haitian; Haitian Creole
-# iku Inuktitut
-# jav Javanese
-# mlt Maltese
-# pus Pushto; Pashto
-# tir Tigrinya
-# urd Urdu
-# yid Yiddish
-# l10n_en provides the additional data:
-# enm English, Middle (1100-1500)
-
-for lang in ${LANGUAGES}; do
- gentoo_lang=${lang%:*}
- tess_langs=${lang#*:}
- for tess_lang in ${tess_langs//,/ }; do
- SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
- done
- IUSE+=" l10n_${gentoo_lang}"
-done
-
-# With opencl USE=tiff is necessary in leptonica
-RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
- "${FILESDIR}"/${P}-manpages.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_unpack() {
- unpack ${P}.tar.gz
- for file in ${A}; do
- if [[ "${file}" == *traineddata* ]]; then
- cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
- fi
- done
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # scrollview disabled for now, see bug #686944
- local myeconfargs=(
- --enable-shared
- --disable-graphics
- $(use_enable opencl)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use doc && emake doc
- use training && emake training
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
-
- find "${D}" -name '*.la' -type f -delete || die
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
-
- insinto /usr/share/tessdata
- doins tessdata/*traineddata* # language files
-}
diff --git a/app-text/tesseract/tesseract-4.1.0.ebuild b/app-text/tesseract/tesseract-4.1.0.ebuild
deleted file mode 100644
index c7877cb2d442..000000000000
--- a/app-text/tesseract/tesseract-4.1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
-
-COMMON_DEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-RDEPEND="${COMMON_DEPEND}
- || (
- >=app-text/tessdata_fast-4.0.0
- >=app-text/tessdata_best-4.0.0
- >=app-text/tessdata_legacy-4.0.0
- )"
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # scrollview disabled for now, see bug #686944
- local myeconfargs=(
- --enable-shared
- --disable-graphics
- $(use_enable opencl)
- $(use_enable openmp)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use doc && emake doc
- use training && emake training
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
-
- find "${D}" -name '*.la' -type f -delete || die
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
-}
diff --git a/app-text/tesseract/tesseract-5.3.0.ebuild b/app-text/tesseract/tesseract-5.3.0.ebuild
new file mode 100644
index 000000000000..bca9d3973c0e
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.3.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ media-libs/tiff:=[${MULTILIB_USEDEP}]
+ media-libs/leptonica:=[tiff]
+ )
+ training? (
+ dev-libs/icu:=
+ x11-libs/pango:=
+ x11-libs/cairo:=
+ )"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-text/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-13.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # scrollview disabled for now, see bug #686944
+ local myeconfargs=(
+ --enable-shared
+ --disable-graphics
+ $(use_enable float32)
+ $(use_enable opencl)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
+
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
+ fi
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tesseract/tesseract-5.3.2.ebuild b/app-text/tesseract/tesseract-5.3.2.ebuild
new file mode 100644
index 000000000000..aff1d194ec10
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.3.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ media-libs/tiff:=[${MULTILIB_USEDEP}]
+ media-libs/leptonica:=[tiff]
+ )
+ training? (
+ dev-libs/icu:=
+ x11-libs/pango:=
+ x11-libs/cairo:=
+ )"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-text/doxygen )"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # scrollview disabled for now, see bug #686944
+ local myeconfargs=(
+ --enable-shared
+ --disable-graphics
+ $(use_enable float32)
+ $(use_enable opencl)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
+
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
+ fi
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tesseract/tesseract-5.3.3.ebuild b/app-text/tesseract/tesseract-5.3.3.ebuild
new file mode 100644
index 000000000000..aff1d194ec10
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.3.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ media-libs/tiff:=[${MULTILIB_USEDEP}]
+ media-libs/leptonica:=[tiff]
+ )
+ training? (
+ dev-libs/icu:=
+ x11-libs/pango:=
+ x11-libs/cairo:=
+ )"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-text/doxygen )"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # scrollview disabled for now, see bug #686944
+ local myeconfargs=(
+ --enable-shared
+ --disable-graphics
+ $(use_enable float32)
+ $(use_enable opencl)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
+
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
+ fi
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tesseract/tesseract-5.3.4.ebuild b/app-text/tesseract/tesseract-5.3.4.ebuild
new file mode 100644
index 000000000000..aff1d194ec10
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.3.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ media-libs/tiff:=[${MULTILIB_USEDEP}]
+ media-libs/leptonica:=[tiff]
+ )
+ training? (
+ dev-libs/icu:=
+ x11-libs/pango:=
+ x11-libs/cairo:=
+ )"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-text/doxygen )"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # scrollview disabled for now, see bug #686944
+ local myeconfargs=(
+ --enable-shared
+ --disable-graphics
+ $(use_enable float32)
+ $(use_enable opencl)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
+
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
+ fi
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 6bba4a49da59..4c31653fca31 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,73 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-MY_PN="tesseract-ocr"
-LANGPACKV="4.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+inherit autotools git-r3 multilib-minimal toolchain-funcs
-inherit autotools git-r3 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
- math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
- osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
-EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
-IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
-
-# List of supported Gentoo linguas and their upstream mapping
-# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
-# "old" variants were regrouped in the matching modern locale
-LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
-# Missing matches:
-# ceb Cebuano
-# chr Cherokee
-# hat Haitian; Haitian Creole
-# iku Inuktitut
-# jav Javanese
-# mlt Maltese
-# pus Pushto; Pashto
-# tir Tigrinya
-# urd Urdu
-# yid Yiddish
-# l10n_en provides the additional data:
-# enm English, Middle (1100-1500)
-
-for lang in ${LANGUAGES}; do
- gentoo_lang=${lang%:*}
- tess_langs=${lang#*:}
- for tess_lang in ${tess_langs//,/ }; do
- SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
- done
- IUSE+=" l10n_${gentoo_lang}"
-done
+IUSE="doc float32 jpeg openmp png static-libs tiff training webp"
-# With opencl USE=tiff is necessary in leptonica
-RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
training? (
dev-libs/icu:=
x11-libs/pango:=
x11-libs/cairo:=
)"
-
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
app-text/asciidoc
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
- doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog README.md )
+ doc? ( app-text/doxygen )"
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -77,49 +40,47 @@ pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
-src_unpack() {
- git-r3_src_unpack
- for file in ${A}; do
- if [[ "${file}" == *traineddata* ]]; then
- cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
- fi
- done
-}
-
src_prepare() {
default
eautoreconf
}
-src_configure() {
+multilib_src_configure() {
# scrollview disabled for now, see bug #686944
local myeconfargs=(
--enable-shared
--disable-graphics
- $(use_enable opencl)
+ $(use_enable float32)
$(use_enable openmp)
$(use_enable static-libs static)
)
- econf "${myeconfargs[@]}"
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
-src_compile() {
+multilib_src_compile() {
default
- use doc && emake doc
- use training && emake training
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
}
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
-
- find "${D}" -name '*.la' -type f -delete || die
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
- if use training; then
- emake DESTDIR="${D}" training-install
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
fi
+ emake DESTDIR="${D}" install
+}
- insinto /usr/share/tessdata
- doins tessdata/*traineddata* # language files
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
}
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
index 13170c3184d8..5e7a2226a9ce 100644
--- a/app-text/texi2html/metadata.xml
+++ b/app-text/texi2html/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah-nongnu">texi2html</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index f0c768a3b544..3901e29fb5c1 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit prefix
@@ -11,34 +11,36 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="unicode"
+RESTRICT="test" #411523
-RDEPEND=">=dev-lang/perl-5.10.1
- >=dev-perl/libintl-perl-1.200
+RDEPEND="
+ dev-lang/perl
+ dev-perl/libintl-perl
unicode? (
dev-perl/Text-Unidecode
dev-perl/Unicode-EastAsianWidth
- )"
+ )"
DEPEND="${RDEPEND}"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-RESTRICT="test" #411523
-
src_prepare() {
+ default
+
# On FreeBSD this script is used instead of GNU install but it comes without
# executable pemissions... Fix it!
chmod +x install-sh || die
if use prefix; then
- hprefixify $(find . -name '*.pl' | xargs)
+ local f
+ while IFS="" read -d $'\0' -r f ; do
+ hprefixify "${f}"
+ done < <(find . -name '*.pl' -print0)
fi
}
src_configure() {
- local myconf
- use unicode && myconf='--with-external-Unicode-EastAsianWidth'
+ use unicode && local myconf='--with-external-Unicode-EastAsianWidth'
econf \
--with-external-libintl-perl \
@@ -48,9 +50,9 @@ src_configure() {
src_install() {
default
- rm -f "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README}
+ rm "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README} || die
}
pkg_preinst() {
- rm -f "${EROOT}"/usr/bin/${PN}
+ rm -f "${EROOT}"/usr/bin/${PN} || die
}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 6a168ad36b04..b699c8e6db21 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,319 +1,246 @@
-DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-DIST texlive-core-2017-poppler076.tar.xz 9232 BLAKE2B 945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d SHA512 63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab
-DIST texlive-core-patches-2019-4.tar.xz 11932 BLAKE2B 5e73e2bd3afeb904f2b8898081ffd770c9ab152368ae5a8699d5f63507e3c0584901d7d6f8fece7724b8e744d7816fe31db4b96962c0550491a57a6d51adb296 SHA512 fce31563f8c7e8f1f0bdcba9c5108d9f5d14529c22c110e33f32a6367560f7f255e51a1e86f1d5c8fb275085ff3ba6d0f5f474acd79ff61d67be795dfb330708
-DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
-DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
-DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
-DIST texlive-module-a2ping.doc-2017.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea
-DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512
-DIST texlive-module-adhocfilelist-2017.tar.xz 3568 BLAKE2B c472d7a318d1dc36d1bc4c9fff821c527b6f0dbfe6fd7ee945c209cc48e97c179bbc1ff244845f287df6dd5398640d2ba73415a7e228b5aeea7ef121950800e0 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5
-DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
-DIST texlive-module-adhocfilelist.doc-2017.tar.xz 9876 BLAKE2B 91dd2728d567450d55a6e1503d9f10fa1bde452af9876cfcae164269c0ceeef3aeb834689d4aee2295327ea6244eb15fb96f5d4f5ce05986022fa1e193b8cd78 SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb
-DIST texlive-module-adhocfilelist.doc-2019.tar.xz 9876 BLAKE2B 6f0a079b7aa05335f4cde30cc93bdc0781f6fa9fee39e7e7cb0cee7e66fb27dcd73b64afc51e02b66bd2ae6caed641eec402ee7350505daecec05b4a4dc684c5 SHA512 14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e
-DIST texlive-module-adhocfilelist.source-2017.tar.xz 16408 BLAKE2B f3d72e2c9abbc6594b34eebf2f1ecc18b6adbca55f7c14fd5d87a9da5642665ccd55f61e4204b540f5ddb639e062283462ad4136718a1cf5e2c191b6ab9f431b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0
-DIST texlive-module-adhocfilelist.source-2019.tar.xz 16408 BLAKE2B cb3c8401e40f4b2d922be8ae6fb5381894df8b1a0634f8aaf21d2d4dcc861de0818904ff0342ce9684d1ac956afcc71b6d9e1c1bfcd0523b405444359e8de063 SHA512 15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d
-DIST texlive-module-arara-2017.tar.xz 2333636 BLAKE2B 4422d6171af16f51c67bf6f48c5d981f85d3b45b7a3f051c6272db2525e6d0fadd6a0a276780339d15f9726019dab585eb41a0bbe4978d8dfcab52bc0586a4ec SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21
-DIST texlive-module-arara-2019.tar.xz 4536520 BLAKE2B 8ce431b87dcaa166d6c527d1d9d192ad12770e502ebbb4144d3161811a1527c1832427d868f99d7108c0949576fd496cca1d023c57d06999762984a3f65b53a7 SHA512 9a999610563bbafd4dcf95591d90aac65a0ba2b0e4da7d5f58c694896dd01b1be5c06d2693d9fd69576e3b32e4becaf9bc046ecbd045394a5dc7e2db5c86a02e
-DIST texlive-module-arara.doc-2017.tar.xz 2748360 BLAKE2B cf0233cb8c5bbf3b871889f189092a7334c6a17ed6dfb6dee29997031eecfb2921b389c65dbfa5ad546f18941ef927f96be04de79bcbd200aa415df55bac8560 SHA512 5e917d8f326d1c9dc4568ed9a9c27c9aa31513c5188c66986056138ee4144b79b9fd8111a8638b0c42ae5c0fde62ba89bfa2f98cf9d2238a7ed929ae917625c9
-DIST texlive-module-arara.doc-2019.tar.xz 1677204 BLAKE2B 5a72ca0ee042b73d5fdef7189a0471afe622260fa94c2fe84609743bbe0396595be11a93c31fda2268a293ee66eb0f3bd5d1525717d465b3344adebf6d73e52d SHA512 b4654d62b725c493e175d9d70c459b05be8a365fb389d5f20c2bd920671f03130586305d225676a3524a5835b87066223deed62db6dbe0ff8fea76f2caac5ce3
-DIST texlive-module-arara.source-2017.tar.xz 22508 BLAKE2B 911b0cd932bfc99772de4742b476012cc285d08e8c601c3cfe7468c1e136f16b48e513867c2551ef33073c2aeec13dd4212f538d853fe139e8f7835bef43d0a7 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536
-DIST texlive-module-arara.source-2019.tar.xz 63544 BLAKE2B 1a8ad9e8e7ae8a645a3efe50c5dd7be8bb907a9aa25741367d840aedab1b53cd0ac74df03e378fd68c3a0d96e8359866a09730f593273c516d3d8775288e45c4 SHA512 3ec571f4e1d8f13811aa17a4d95cb5e364e63fce1f5b320414b08abdd8907df28a18af42deac3bdce9964d7af8ddb7825702f88e4b58007d9a005369be8d4e53
-DIST texlive-module-asymptote-2017.tar.xz 277568 BLAKE2B dc7d046c5aaa1f7d51cbe930085a295b913123764064141c6fee171b80516a4ffc64236540248889558c5527e891e882abecb0f4b4cd12bb9396838e21672d3d SHA512 184cdd0ae495ce695309453458b8a6db2e29950e192a45c86f7b553823ce978eacc506e5e9454de1b1b4a2ed4c12450b0b59a006dff954d008311437aefeb3f9
-DIST texlive-module-asymptote-2019.tar.xz 312964 BLAKE2B 1c1ced6f3af846bd6c9512efabb784dea34d3a6fea7ecbdac89e893ca08b8a90c85112073a8afc75c43a5544fda59bdf5e1a53df96033dbc6457f3be477a015f SHA512 e314e473c14c2fd8980d3d0256c6cf6fc7c757a5b4b4dcf90c93cbd15fa70a5e7a0ce453c8382df3f9cfa4aba9c9047b3ee44084e398d9c767bb88ccf3bb47ad
-DIST texlive-module-asymptote.doc-2017.tar.xz 1791956 BLAKE2B de5bc12e4ca274bc7575a6b7184b2c1f602c128c37a389eae2c2aa2580018fcb1408d1543a5dae03fd9fca8a8f47fc9d96a6814afa3868aa5260a8320e282f82 SHA512 50a12a697b9b9c45a4137af23d88d7dbbe2cbfcb091655feed4511418a559863193236ff8a2c0c5730052d6984a03aef3ceddf1d96fc9ff838b57459fc288dca
-DIST texlive-module-asymptote.doc-2019.tar.xz 1810712 BLAKE2B 2aea38bcbb43767b512f8ba9fbc0f7b8027a17bb4766816d0cf57269cd2951fc70a77efaaeb8d10d1b4223d20bdb104b7bf6099c4e56d65e8a96724bfdf5da20 SHA512 7969d7001bf3662ed28f92b07defe67a9262aaf62d8dd2f137a4f36d90fb4ffac034052a6c037882c3bcfbc0fd2b9836fc8815c90c741a26dbc68b59a8879782
-DIST texlive-module-bundledoc-2017.tar.xz 12208 BLAKE2B 54be93937a61573bc64522651dbe23e6e72336dd8170e6c9b226e30f6641d32f47475c7b2f8ccb67f6d13bf45551d45a61e6f908413e8cad53fa3555ac094c84 SHA512 075193471d65e6b7eb61a1cd18b1380054467b346bd66f82a02b060f259e0fd1b49f510ae088579f555360effd40ae3a6e3a35dde0e956b8271845b445507ed1
-DIST texlive-module-bundledoc-2019.tar.xz 12276 BLAKE2B 228fd77fee1c600e7582fb4a30276b54544624b9f67e1b3d76b5e37e8025fd3e9688375577e5081958f709cc62ff7cb342370c1bf2baf7bd0fa3108386f40e45 SHA512 fd342f56a110ed29a4562057910c9bde89a3a70dc619381005dd38610736f9dd43a3c2c25dbdaf557b648e3d126d943418969dacfa26e6627fe8f9f767a9004d
-DIST texlive-module-bundledoc.doc-2017.tar.xz 37392 BLAKE2B 642564e479ee5312a9c38beb70967ae1915659ac5cfa7d00fb2478d90f754ee2fa26c2f8b55f3bfc68c2003ac724b5e0488d90dc713bc3d52c2b2f75a2841621 SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97
-DIST texlive-module-bundledoc.doc-2019.tar.xz 80972 BLAKE2B 0c0061a4808f9cbc97111dc6e59dd191e29c56d7f3449bbe0a677c59eec077a94d8b14d8a83984776cbbeeea8b04accc89abfb722cd03f14ed2c5ee2d5146087 SHA512 384a9519a3aaa328444dfb569e86d037ca283d2d24529057bcbd1dccb41a3ba7bda027c01bc986b0932da77198ca13e9d7c4f4859d898a284577796255baa9c9
-DIST texlive-module-checklistings-2017.tar.xz 6476 BLAKE2B 709a4935942eaacd2cbf694f2c06a7e6ccb9866577e2dc0df8bee3a47e471f0db71b5e47007f02f6c78f26d08f308b5afa3e4e4f06b7bd0d71deb75b5c2041cc SHA512 c58753601d1af48ec2bae629b5671fdf1de8f055058763a9328a1fea9829960a86df836358fef16985747b31f4e1a569d78d4acf167cdece2d34eb57ab738548
-DIST texlive-module-checklistings-2019.tar.xz 6496 BLAKE2B 7ea3bd63da0c718dcc1406507c1c800a62f09ab2c0dee1d043ea73573c0a4e645a01ffb2d2ca2008c230bd14c1ae858638d050d4a24b831b898a98bdd4bdda00 SHA512 599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544
-DIST texlive-module-checklistings.doc-2017.tar.xz 364452 BLAKE2B d9e5855dae2195c2d085277abfd1c6253c2d46c49bdce4548d5720cc0e21104cfff618e8f30a1048d73c7e02d8922cb62280de21f2366f637ae8bbba1d5ae344 SHA512 771246b9ccc70cb337a3f55e0d04e406c338217298f091c9372533bb55c5c98f0947287b2f0340bda049f5f0acbd33d2ab9e706426c5b487e0a31460863d5e40
-DIST texlive-module-checklistings.doc-2019.tar.xz 364456 BLAKE2B f742b41e3b18c1248fb9a8f4cda9a1ff5fff26b4c6eeccd0dc658a95ee690f0dfef9d8384265f0bd6ee5d42d38e3a2d45f3e74536bbda364b4150b494515052e SHA512 3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01
-DIST texlive-module-checklistings.source-2017.tar.xz 10948 BLAKE2B 6ddd87b790a5ecb35382218452f787a0fcc43bfb59455f3660b1b5a2176eed033b72aecd7da0d2f1ad0efd21085f4cb468c1487ae7609eba9f2321e2dc722f92 SHA512 8fd158560f0bbdc7ea996b510ca69cf30dce26decd6c963533ea80a6eba7d6543c72e12175fc568725fbd8e4c8226503cabc607b52d68d51901bc8f32146e818
-DIST texlive-module-checklistings.source-2019.tar.xz 10948 BLAKE2B 08881ceb308803c8e2a6476d72e4446e63ceb714db4893c6fdeb773c46f8ffa39b4cd4a2642e3d90e88c0adc145e421007d5e0614a862cd4ede6af224f0db4d4 SHA512 a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d
-DIST texlive-module-collection-binextra-2017.tar.xz 848 BLAKE2B 2a417424ea3cbd4333d7dd0bc42d8a50a56fa61ac40f276759576d71c2d94969a44806fb57a3d6d795cfd71846fe332f352fc64b47b62fef262ab7569c352fd2 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb
-DIST texlive-module-collection-binextra-2019.tar.xz 900 BLAKE2B f54b161a33b5d3038bebf8976ffa3182bc53068be423e7aea76421ceb199894ec956b916a5ce10a2b961ab9c6ba13c27b2683af4bc09b5abbc0be4828528e504 SHA512 885f7b2009983d71ee4fa4dddc48045fe1fb92841bad8de3009b52cf4157c9bd79d1607b8fa6e55db298d1ce763423d8b1f1273d8faf41708e8bdc391bb76fdd
-DIST texlive-module-ctan_chk-2017.tar.xz 512 BLAKE2B 2757ec920c4c058246157553950036229bd4a685193c19faa9b9d548d09c93ed7348dab350549939b53ee65572c5c93448b59243e855099ab43aa8f3bc672106 SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85
-DIST texlive-module-ctan_chk-2019.tar.xz 512 BLAKE2B 80525a48521023cf7ab0cf3ab19d9fc3fb72dbe3fb3c638803076a0775794f6f30935cef8ec77936574a61d8676e123f4ef7c84beeacc72812fcbb86a4dd0588 SHA512 6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0
-DIST texlive-module-ctan_chk.doc-2017.tar.xz 222000 BLAKE2B a5c92248896a0160e8a81e110bd8e93355769fa264453c7720e7312f94edea56557c1f8d1c23f4afb47e78b6f8d85b5a5f46cd612105aca9098c504c39e7df0d SHA512 cb3c694bb7b2f361b9e05e8dbd8d4594aac84886d1138e55b45dc2cb102620d2ec904f4e061e931d1ed57b410efb3d6b7fb699fc7f714d049337f285e531ab6a
-DIST texlive-module-ctan_chk.doc-2019.tar.xz 221996 BLAKE2B 43def8aec1f47ab26750a3678d68eb846f5a4383c681e1cee66529d877bb636b8867b5ce4a6b330a6b4239f5ad9db9125799c12b6ca5453f872fdfffdcb3fb75 SHA512 c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0
-DIST texlive-module-ctanify-2017.tar.xz 8228 BLAKE2B 73d304f42f0f88cfb15ec6d60f375582276c96a846b061602e5b80fb9ff5b052244db74fb975638d6782ab25baab2cec45fb1a9e1d2b7109130945bf2ae3697d SHA512 335cfca62d46fd278f3c9b80dad62ca7a10310a5101c53fbd3060a4025b388eb962f9f41b4b7dd9bc896f4b7c32e127ac0b901ebd1f7a9e8a16a6ce749cbe92c
-DIST texlive-module-ctanify-2019.tar.xz 8236 BLAKE2B d8b56d748f70530caab43039a73b2263e3ad7178e3fc1e2fb0e8280ca2304e2bad34ce73b4ffdbc6ab4a96bccd36c51e3d30aa5a2bf37f6e16fc653944d19f59 SHA512 6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439
-DIST texlive-module-ctanify.doc-2017.tar.xz 57964 BLAKE2B 973b48b1f35faea3ffea7ad260cfaacbb11e44047aa5eec4671e664da5578d3fd96873ef8524e0fc89b71783ebcac38310ee70c167b41d04650f59ec6f95bc52 SHA512 c845fe36bb7c388e07a254938796181dc19d36a5947cbd9d571ce983ef2148bcad275f6f593386ef18ac26490b743b6db3a337cead46e20cc952946a7f3fb89e
-DIST texlive-module-ctanify.doc-2019.tar.xz 57960 BLAKE2B 87879b04d622f78564ddc1edeb6dfbc8e7da4796f45fe6b441c0c27b5090c2e03226ee4436d7be07e59ed64be7c1a151a76a26b54549e18930049a6a65ee1f8d SHA512 f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac
-DIST texlive-module-ctanupload-2017.tar.xz 5108 BLAKE2B 889704ff7e23c84c31785b0a14c310e35d94d45aae4671efed4495a4667c9ae16aec75869c9e164d4988adf56e38fc607503760290b8c8ee80772c47a17ce3f3 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd
-DIST texlive-module-ctanupload-2019.tar.xz 5104 BLAKE2B 77ad6a6c1d493f9b3d7f7f39d016b391dc4d8d82fab32c1c91838e16ad86a268fde2ee750063315853c2a1825a4331a8e32de7c217df440f53e72c43882f19c4 SHA512 4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72
-DIST texlive-module-ctanupload.doc-2017.tar.xz 174944 BLAKE2B a8a104a280d4dfa84ac35a277501db71dfbed72f15fa9916f057aa896e461d456f491c427d17485fac3136b9677c9b2819ed3b9be75b969d1dcd44e7243c2bd9 SHA512 29f8c0649a249c02f05b153590de221eab0147e093c241e78521d0264045c5de3f9f26a5f008294ba10622f4fe7c7cb00217025282faef22cca2d4d6a87a347e
-DIST texlive-module-ctanupload.doc-2019.tar.xz 174964 BLAKE2B 804ae2c963ec668924d105454416faee356832baee3f452aafcd8489bda55627b6a60d307f58932e2487a4c2e6ab4a533f10369053a7245896da37df3cc5a40c SHA512 9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a
-DIST texlive-module-ctie-2017.tar.xz 408 BLAKE2B 73f6a6343b78fb7b1b6ff2d60e2a6cd39d7549853ceb2ecf33e632d1d4aba72452c97437be06d04ef32587f3e21c8cff74fb50c0c154f929c6e92d2f6636ae91 SHA512 b881e721bebd88dfe7de6163f76c424ef85d480cb09e52d9b2b02c6224578fc2a416e1afd3ef803e5cfb7428fea53879029f1ff5c52d7377149cb4fb9ffa0722
-DIST texlive-module-ctie-2019.tar.xz 408 BLAKE2B 752ee2564532f95c89533d7348235e238f62da84048351c0dc94ced6a1c362de08c1d1eccca7295c0b2481671472c08bfa9613783593b784390a6a256ecf784c SHA512 05fd794d4437c662b77b0662dd0c9169aef35a10140abad2519702577c087177d0a02ee5b6163873fe5b3c83c3f77c342c4774af168ebca2ed875717c7d0c5b0
-DIST texlive-module-ctie.doc-2017.tar.xz 16580 BLAKE2B 2ab872f2b201ad432e60dd81ee3e788d808a2948cc09155766de3a0d721ef27d3b64ff90d18e753a3d85e5a838e1c126aecada33dfa00502b8b569a8154f1a39 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc
-DIST texlive-module-ctie.doc-2019.tar.xz 16456 BLAKE2B ef2aa98bbf2e3c270308f4ded3d18b55aac99b9059d4543abcfdc383b2a4f761a4d24a5f01beb94cd0e1bb1842c9dc6be641e964dd2117258193dfdf56421513 SHA512 83bb53248ce262bc8310faa8c0e057dac72c7c682e295fb9888acff237249a66a69d66b99d79033f5a1d8611ef582dd2121f8c28be9800ebcce775bf3adecf63
-DIST texlive-module-cweb-2017.tar.xz 12900 BLAKE2B 703d65399507ea73329a1f69605ac97c8abd102ed5b57cf1505c48417385d2befa0784fce6c255145f1915fc49adfd75f90c9a058ae4f7710353d5fa437a1514 SHA512 6e8bea28c9e8288d186f46afdd30b864ecd0abc20fd687f0a8a35aaa9b1ceab0d208af6d0bb5eb5fd0d47a57d0d3826610dcaaba5e95c1821590ade62207548a
-DIST texlive-module-cweb-2019.tar.xz 9364 BLAKE2B e43cb0e84e570223523b552fb96ac754888a418a10077f5beadcf29cb8d5b7eef0db17fa543a0c3d930ae1c3882aca0d011072151bb7c0d9c5f9ecd294cfa809 SHA512 274b81a9a12de63e62c72878971c517427fe3dbd9a5ab10d89676326ecf23caefaa961504cb0e9a609224c519a3a6983346212fa67e759dbbf18c2c74de4c61e
-DIST texlive-module-cweb.doc-2017.tar.xz 60908 BLAKE2B 426ae54d4e0d2d46c8e62b7283463d0ef126befcb2e7460cd15c44a5471e93ac8606110e050d2da594950c5b714bff42f3dff20003c3e75c690bfe0b99ec1bda SHA512 10db26820e6d3998fc0be20f73088fe7a2aa06cedde32aff51a539d71ad49e8e7f51a25950e1db578770dff78a8f5a486f28590ffc0a655a72cc04b4072d0221
-DIST texlive-module-cweb.doc-2019.tar.xz 388288 BLAKE2B 6b1a369c86b0f4b01e190e049382d615f9163f928074d9e371d39977d0fa1201ee47a6f0131ee3f235c2a7dbc97584cdd5d5d43dc0b11223c5fea7b9dcb4a13d SHA512 1acb8eb3dfa5d563369baccf3615c06c61f03ae70e18988fe4d4637bc97290f04288a9d15c548d48c65aba0dd3b0b23faa9c1a7f7aa093ed37035fab569c8d4f
-DIST texlive-module-de-macro-2017.tar.xz 7840 BLAKE2B 4d50cb8d5213d652c7eb493e32eaad381310b385a766ee43a27377c39e02c4d8b8338149cbf66883e779f5fd94f097c578e9690d7ad89af50e0977cd843cbc06 SHA512 759f9146b37d485bae92cd6ecfc4291ece42017ce6be601669d989e52229270e04d6e8e26a2a8db46cc9f6f1eed3c5babe57bcf7c080afe828e2320510a3aed3
-DIST texlive-module-de-macro-2019.tar.xz 7848 BLAKE2B fb911180e375163a6339c4d884942f3d20dea41a81a203845c6e87ef8c8712b8460da928995385ece0961bd8e773f589ee59be5384ddacb11f3a19a6cbd1901a SHA512 5ce9beff85d65654173557af668ff15af6989d9fa6d341fe9c26149d0715ed7cf57bf5b2a59b6cf99e8ec14e4ebb6816e9972268516a0b2a78ee13c6423b3599
-DIST texlive-module-de-macro.doc-2017.tar.xz 49764 BLAKE2B 935293c1dd2f509b49320f0f91e61cfee825e3025cdb63e7cbf4cefb7cc8b6f3c30b26f84bd08cb80ad6177e224e37973eaf7da9780365176fb9929211ba3e88 SHA512 00784c0670b5f11ed715f76745acc3ebc098b318ca2b00c294dae3ebf162af0f47b4192d993f7b1f5d443eadf0f7a2644cfc2bfb71956eb680cad2c593a29cee
-DIST texlive-module-de-macro.doc-2019.tar.xz 49764 BLAKE2B c3f60cba4b9a6df10de15e7ca3b5bfb7c16a6e0f82e230ea0b78fe59efeb27fd83e2717262fe36bd6983d62eb5724dc4b6b2bdc3a15d6448b986df4f8625a490 SHA512 05793930357ad58a57e221696d836895f02dec82cc93b9aa7ea302978bee24410d4b382ff72407faa67f4133c75a84fb2454957de446beca05606776c6581ade
-DIST texlive-module-dtl-2017.tar.xz 580 BLAKE2B a69a36d545938321e86fdd20083f0ea3d1fd691115a5a45e4e04c290c3694c27d483a90cae7b082acda1266e03dfc473af69bacdb6f356bce70aab5ac0769f85 SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f
-DIST texlive-module-dtl-2019.tar.xz 580 BLAKE2B b005aa4657527bb58aef3b3f6c30592a7e81177147d9b046a777fc0476778975de675c5393b96223830e16dd85870e11801ea0583587316e231452dfd13c1712 SHA512 796f01b568969124edc40662db5d8699a815b72d9eafea640c9499b7cd907e4cd36ab42c87ade466c51fcb18a47de3363f5c6068f4c678243c7633343705f35d
-DIST texlive-module-dtl.doc-2017.tar.xz 19580 BLAKE2B b4bb591348ddddec9ea975f2ad10fbe5db5fe786c900b236d811490710c0eb92a5804f2347f7bc478780fce54fd3451b81b328269346c24513e197d7a5d764be SHA512 a340bf2a2af68edca51f4c6a7cede18faa8da5fbddb26a134bfc28e4d79dfb33631a8ee562fc1598596453e4030fa6ec343dae588223adadfae5dcc6953b3169
-DIST texlive-module-dtl.doc-2019.tar.xz 52488 BLAKE2B 1296b8fcbf60fbba28fcb161a4362b97c84e9743b9558287d2aca178a0e5ca36def4926d332ac918a992cd4f70dca3e84a734936cebfbaee72da60c7ddbebfcf SHA512 b0e1d2c3728b859bc010efc5d31c50b10c7f9a045530f99278228fd4a4bae5563d58852dc995e9f4430d64512f7b0ec0c868c6f86259127bdf524c6f66bbec86
-DIST texlive-module-dtxgen-2017.tar.xz 5700 BLAKE2B 5dffbe3fa2894984f1d1b6458c7260439497d6a7ea64a2967ddee9fe59c719c11fd2e32c1c0f27c7a37347bc9ea2332dd82f8dac1cdc64110969bc0194e6dd72 SHA512 faaf12b7897a2d9f2d647096770e0f65bc44fd36b84a6587672c9551cb79627c71bd6cbf251bfe3ebc407d7537f9e8d42f5b301df7760afca7269cf2e6699915
-DIST texlive-module-dtxgen-2019.tar.xz 5696 BLAKE2B 70293ebd3e2942cd602aa34e0916622f4c66458341b16cdc8230b8b5e40857ec9c243d93619d52c6788ea6b6ed5f20cc7b5f26eba881740789e187ae783a03a7 SHA512 e4d1bf82d1a64eafb67f3f0ff570b1b7eb8b45e869891482ba5e37ebb33312e2aabd22f433d1401e3f02e12b1ba9814c543899c52f7fbf8d191ac78d4856f2a3
-DIST texlive-module-dtxgen.doc-2017.tar.xz 46204 BLAKE2B 0ec76f5e6713dcbb748ba94b14f753c3e9695eb1f0668444bda605bb55ee72b13482b5e5f1ce2547a84fc37d60f592ed7970233c48dde9c794a64f45249f75ed SHA512 e53316cab21fd5c9902c566dff44d4f16da6d666040185df3962c8119726fa135acdfe1f08b5a011a3e2287d157b3ea98091db46a5dfdea68994edfedc04a90c
-DIST texlive-module-dtxgen.doc-2019.tar.xz 46204 BLAKE2B 249c303629eef5b5af847f8340ad8109e3ff12c8b635d6eb21fe2b5028cfc82464237daed7d3f85b3bc632dc7fa0c7e685fe59ea54afef5193fd8997db75f613 SHA512 a6f57e26b579a34aa61a76ac3e3539c53ee47427a02e39bb39ab4ead1e28135106c0b7a88a9de2211fefc6f5df84a0f1b5b797e3efdcf54d73426eef23cd0a3a
-DIST texlive-module-dvi2tty-2017.tar.xz 472 BLAKE2B 77de3968ff65aa8b98e86487a77e2bf06f886ec476619f8e92324112b6095775603e6f495d5fa3d096b1d59a2315d57c19e0521f20879c0d046611a74cf44ad4 SHA512 21a8e5e9f077ce1fb1e6b5b249d8eed4a75d007bbff65c58edb83fe07932440568d8d8ad19ac714e12e57d0aef56ca2d5e6276e51c249c172498ca404cba55fa
-DIST texlive-module-dvi2tty-2019.tar.xz 504 BLAKE2B bc28b5dba8887d5144f3006c07ad27854bb9c0d2e55c3ff78629c0f29c96aaf5e3c874d61c6d54b453fa83ef380b36fadf1d466958206059fc7569c5dd4832a9 SHA512 41399ea5ec5d9e32cd032caf70009181bef98b28e29ffee84414914ca436a49bb59caa7e5523ae3c76cb8ede89d89ab74af79dd6ecc89cdf9f0d65605668e9c2
-DIST texlive-module-dvi2tty.doc-2017.tar.xz 10964 BLAKE2B 799fff8a088c6614e9cd99bbb4c2590b0a4595490fd4797d9099f1b349fd0d84b6e995f2c2c1049cd3dbb08eb17fc667fbe415b9fdcea29a356718f9dcf3d92e SHA512 5384f60e4b72858c10503f458a50f0d554bcb081cbf3614bbef77aa351855bc70b69a59268b8a3dc1bcc2a26ecfbbe06d424a888806fa7a3d05df1b31c1b1532
-DIST texlive-module-dvi2tty.doc-2019.tar.xz 35892 BLAKE2B 1577b9aec7144caca92df4567a0258faf6012752690a041681e224182637bdac308ae05f2730d9b0c233c2161fa3406c275b4c195b4effe4cb6e678e8ad3c00a SHA512 31cd9e13e873269f27e7e40b681a56022e7c0d776179fedb3c9396bcd9743b9e2b5f3043d6d2858858593aac49e40c16bb27d676f77ded984f4b803dfd9b07eb
-DIST texlive-module-dviasm-2017.tar.xz 9516 BLAKE2B cdcaee4e5fd57e17e39a267190a48f02cf5f96ad5f62fb74d0c608629f3d36d10f992ab9a0941d189126725801753cb368a1cd375cf27125fb0b388a3c63a5eb SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9
-DIST texlive-module-dviasm-2019.tar.xz 9776 BLAKE2B aa2494bb1f86725461a274df15a926cff19fe55a82fd908dd4bfbd4f32d6a479e56b842f6d8b48ff81edf7d7195eed9075f3199093d6c18c8e29d8d9d3e7d6e6 SHA512 f8f24627f416053ed4a53008eb6f4b83a6f7114793e361956c3a968efdfe06c11c233e24e14568ccffec612d1ef63daf8f6644333f68d202b816cafee1da98b2
-DIST texlive-module-dviasm.doc-2017.tar.xz 664 BLAKE2B 26782dff43ab32f90d1d74ca7cb5af8250fd6d7019e3e99762a50177d068f796976308749ff64602b11e86734a90d2e2bb11e976d1c6fb274161bd101987ffae SHA512 13b9b6fe891fe6c0e5c7819c74225b2b943811452562a684c1f71fae7628ba167acb48178187a5a6d56625744ab840aac90cff15010e64e36c3a4eeb1ed84ceb
-DIST texlive-module-dviasm.doc-2019.tar.xz 664 BLAKE2B 8cce538c9bf68d2a245ce53eb15fdc77c921358b060caa1be1fb2c45527c6498e528c542ac268800951eb0a511dd4f09fa464472927b70eb75d5b70497d36c70 SHA512 49d49f53bbba34659a96d587d899af7a1d4eb4841d3b5132ca8647efeb27bf6590f7bbac42bc5d5becca356f7bfcd4fb244f6ce9282539fc9aae4bc99a633ecc
-DIST texlive-module-dvicopy-2017.tar.xz 524 BLAKE2B 088d69167909c33a373c581d01b1dbd7b0312d7cb79438fd95c6657dd3f35af59aa68630ecf5be688f9a03ae899cec346a3d31a43a621d1c45e1fbd4d387454f SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a
-DIST texlive-module-dvicopy-2019.tar.xz 608 BLAKE2B f0e20ab50bc3a9f9eb90f94369b011538e10b813246fc7e4683f1088507facf86d061a48f1b6fd4513e9076060cb4f8cd2d3b144ef668cdb1906aa9a6e7d94d4 SHA512 34e16ff93daa924658b433affc70fdab01bd8d6c1d537cf1787389b8de34e7348aaa91a39ba3f3671d25d216420421a5ca73cff5de254fbf25a8433e20fda322
-DIST texlive-module-dvicopy.doc-2017.tar.xz 3592 BLAKE2B 1f610dd0d92f39b993cc393107aa55e921819fe04930fb8855215f36646e0f30e2d7af6571c7ec5ae72890881cbe5be164ec18bd3390e1a7ddc4457be64bc563 SHA512 c308ffafbdfdf152abd842918c73aa55689a514a1de6cdc53595ea988bc7aebacb022efc77bc5b7eb0469e619f1fb6916e2a3515ba5dfc6e4744a22b64dfaee8
-DIST texlive-module-dvicopy.doc-2019.tar.xz 18264 BLAKE2B bfdfef70d6c7dcd1ea68ccf1306b8bad580dc54638b0feff058cf72ab6f784d1c2e86a4320e4a86e3668190a0915da7a4626ec40b054e84d02917f82fef9a2e6 SHA512 a85e3cf8ee5e500264ffaffddf8ebe6642373f29fcca42c346654f304f34b9389f2e190014eacd215ca0d78debe44859e05696789b9f703fd6eaefc9bebd4ff7
-DIST texlive-module-dvidvi-2017.tar.xz 468 BLAKE2B 0e301f188aca041dac510018e4da638194cfac151b9229f4ab766ce021bbcbc153dfa39558cc2be696859eb153175044ba0a8aae3447ef49d47f0e512c419b02 SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31
-DIST texlive-module-dvidvi-2019.tar.xz 464 BLAKE2B c82c37107c4679d87d240a68d7b394ff78af9e94456490d5977e97e952c4c9bf88dd2c56b5ad4934c2b81e9023703d21646633355d4fcb4ad8ba317dc063aea6 SHA512 0b21ec8ae0741fe0b9cbe53fd97c4ef20cd4330bae769424b2fbd2998293b05419008ebcc7ab74bc17f166a30a66cad980f5692ab32aa1621ad4a771d20d720a
-DIST texlive-module-dvidvi.doc-2017.tar.xz 7880 BLAKE2B 58d04f3df26776118c4684b8d3eab3badf304c7987f006e8c1e9330e949a4bf34f978747dc162147092ac1ee9f588d5055ea11217c55a92b61a102dc6be0ca30 SHA512 72685126bffcdb0adf0aff770d17eabb1da16e999b24a40c4f5a0925e8eee1e168f88abca69a6d803dc91a8871beac954feca4d22b08542e5887d8f4226f7cda
-DIST texlive-module-dvidvi.doc-2019.tar.xz 19336 BLAKE2B bbb9a82346ec68d3d179451dcc142ab32e1cb2d24559314f2ee23579c6e83dd84429dfdbe80240a9abc746c6cc4a868abbe043f5717f3a9e82613e8e0f4ca1fe SHA512 831daec5b770f866c15440a384d1352824ead05faaacb8ae991e2d9bc1b115d599e5260cc9d7db6f0752ca7a16f21b0c52b5fff58ed1b23f30ffbfae59387c13
-DIST texlive-module-dviljk-2017.tar.xz 532 BLAKE2B 692aa25033a35e776a79e829e1d202c8609b1bf6d74a3940568d41e289132c42c4e195b895efed633732896b7fbb8c235840ea4a492ba8244ec8f0e67127b199 SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2
-DIST texlive-module-dviljk-2019.tar.xz 532 BLAKE2B c7bd650dbedb417e8a29b4c3ab7152d4b9ca591e9d5fe60f140c4daf284c074f8d374a91265055c852787d7e73a622f9ea41bc42ba45d5f9117204e178d20421 SHA512 9c94578a0e4a43663cf1d3e05447d51ee84b892bb78ac105321b471e21417dd636bf8746d04c0decce06293f8ae8d8f60e0127b52796310a9c9dfc512158ab4c
-DIST texlive-module-dviljk.doc-2017.tar.xz 42128 BLAKE2B 41d9409a8ea851316f9321a951f2fc84107f3cfefbacb68ab6680f80a3ab024ceeeb4c0afe4d027b453e1caaed59b4bfe371bcc5c04fd072c747f4fe75e25926 SHA512 4140bf5492da8d3e4566d7dcfbb3c45f722fc1b924b429d1b4b8a32acae424b4485d0810390182527c6400ace88c4b45b6da06bb4838141e12142ec5c87f05f0
-DIST texlive-module-dviljk.doc-2019.tar.xz 74944 BLAKE2B ffdde2707be4b30895d107f65cf6ce77b2f9af40fcc2c066664a2dfab355331939ed89a3f3e43bce3241fabc83f22abc16bfbe4ddb9e5b935d85941c6703dfc4 SHA512 fa77f151e69f8baccbd01f8beb29c0143283892d42f5b0213909c7d434688a4e4c5e121ef9b8b73d93ebb211ca03a454ce309efd447a7d351968cbe9066b5ae8
-DIST texlive-module-dvipos-2017.tar.xz 244 BLAKE2B b6ed5118a94f06e170d34150fbe43c96da3ec8d1c1e305092caa06cdda497b662c91b2752eea7049fc37187e031103e84c9ccf305f71cf4b98847a1d4af16ed9 SHA512 ea01dc9fa33eb847010fc4f13b023d8ef0e87a9da1e9cb7b8f15f51ac6c428952ea5d8406184c0807ba4eeec255933637122155ebe08fbcd8fc5d3df5fa1fbd4
-DIST texlive-module-dvipos-2019.tar.xz 296 BLAKE2B cd298e3137e6ef39c1963f70a9f9e592f424bf70871f551aead7669d176de2dc02f71e79bbb0f465806f8af9c6060cb9554298d0b860240efd01056637de2bd3 SHA512 ea771c689b519ab7167a0e363af501db771e7883c0b82fe0ded3661b57fcf31b932cb268b08b7e1f2f4ea3a7f85a7bc1efca83272f7eaf163354166a0b9a5a93
-DIST texlive-module-dvipos.doc-2017.tar.xz 11144 BLAKE2B ca5a8d9f604cee30f57e01b94733599a6c72feccbf20e7ae3d080138a02db87afb0169b7738717dd56cef3f95d8f8882ca6428b7731a6803b861671ab9bc4d2d SHA512 e1720314341e7063baf34dc5ce7086dddf282a82c5723df8b67547b9ac868e336657a88b0243b1dd20762c4371e2b5a8341314af558c55a7462534bb35c2a965
-DIST texlive-module-dvipos.doc-2019.tar.xz 28512 BLAKE2B 6295ba336dbf940fb4ef72e4dfdac982a0f50c47ab91860198cab77087937a7bb16b09c22b507fd8c533f2bf8f1ce27d18a9e6858d1154cc0b66b29c40d18ed0 SHA512 0e4548fc7abe4aa8f54a1b1a17d4582e1cb6e9f0aecd9812a1e2337ab1aa9995b4f3c4e2417f3eed248a9d40a5ba2c314aab273fda3ff5dafda3d9ca23307b77
-DIST texlive-module-findhyph-2017.tar.xz 3904 BLAKE2B 8ed8db21800eaea0afce6ee4c0ec4e61441537c43f79c82506de3ce9558f74e8b29a9067d8d4e453acb88a84a9633165150ba206181302f72999aaf5770042f0 SHA512 f6f117fd97f3c5cc7833da907b49783925704a43580b980d67a6bde4c501ab0d48b6d662bef3c11d1c802559a120ebaf3673c7a69f4d636133fd1e46629fee26
-DIST texlive-module-findhyph-2019.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
-DIST texlive-module-findhyph.doc-2017.tar.xz 12024 BLAKE2B 1036486064c040454e1c4fdd8d1ab95ed28847ddc8811b279529346ad148d2039ea86f24f01fbbd9389358fcf6396624e66cc006f6b3ddb644e21be2682e80b2 SHA512 fe8f33cf13a69b43b80464e3799a090e0a0eb0bbc3420b5b9500ceb490582f79defa4b2ad29d406dccc4b2ddb5d5b83fbf644eaa99ea0565cb258706d1acc0f5
-DIST texlive-module-findhyph.doc-2019.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c36870726826d2e22cdfe852117117831f63f92457fc25ad27714ab7eb110832e3c052ff197f503ae969c941bafb6d5d48d24c SHA512 97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179
-DIST texlive-module-fragmaster-2017.tar.xz 6872 BLAKE2B 574cf41226398f1f0ebe3a46c515449b95ce39c5639d00e21822753c560f3236cb37c1f410a33e1cd52ae59a5fe8ed72fd6c2ba3e7ccdfb1e77ac5148a82c330 SHA512 a7e6fccbd850e7b3ee942a3d5af379e79a946fa9b037ed47d8de50b250eff15d0e6250ce2ddfbf8f7535a1b7c1bf39d80d5a352e1b77fe9bbe0bfd25da434bdc
-DIST texlive-module-fragmaster-2019.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
-DIST texlive-module-fragmaster.doc-2017.tar.xz 80256 BLAKE2B fabb4875633e49d260fbb6dc263ba1412d022fca85a3811183933ad19605c69c8c11a7b2b4b1e32295afeaf43c566c91cd137ac15263176eafb5b34ad7c95f0d SHA512 cab8ac6247875ed48f86f16a67cf3ba8b320aeabd61cf95a6c43a6cabea9ae11ee0cd9e2bee0b577ebbb414216cd4015a36161c83627647371418ef61d28c8b2
-DIST texlive-module-fragmaster.doc-2019.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
-DIST texlive-module-gsftopk-2017.tar.xz 3428 BLAKE2B 348791efea69f8ad6a37480770d1cde59c8e3a0791f16bafbfa94955fb200e8285b086d95ffab90d08d631010f053f5a03ac7509592f0a455a004c0e19dcccf0 SHA512 9f3cf2841b1f275c13991ca07483bb47e9e833bf5d2d137af2660d7e01127f878b26cf0bab98668504edbf0d87e4e17fdeb8c7c654de01048298298771d289ce
-DIST texlive-module-gsftopk-2019.tar.xz 3548 BLAKE2B b4d4c355587e6665ee542c9a58e0d67ed773e3258cba1e8d86a78042d614db5dcd70014cf4b24c96d0aff2fd76bb353ccc16e90ce2802a0f00337b3557bc46d4 SHA512 d05802963d499c4dc0979a58bfb56a1c04e006b25b7eac4cdeb7659ac6f31a0380e476e933586f4169846f88d727742ae5494cdbcb29995439a4cca5be4c7332
-DIST texlive-module-gsftopk.doc-2017.tar.xz 11764 BLAKE2B ef3ae2f15809430ce3db9090ebceb9395a1a66bf31045de689207cf52b9744a1435d29f32787b73dfb77ba951109633ab09972216d3a999960d0d94d97f149b6 SHA512 6114d30883da80d9ca222c7191f57c613d28871d737df506f977442484ece94934c2c72e0c78c8ed619622c4d0a2c4a174d917ea9408f976ee0e14f3db7cd55b
-DIST texlive-module-gsftopk.doc-2019.tar.xz 27536 BLAKE2B 4c84bd07e016fd4b23d7ba30c33f1cfc581c41e9f7354f0f9d3849c5e49264aed35372f22344753f8bb832e285dd8f5bcefecf11b353cc489e86aa1e883c5894 SHA512 7d9fc4dc5c3b4cbc05939332e7286be712a51f74b408df2e6cd9f1c52f81b01104e4f41074c55f74ecd003276f2b9fa2285e875a27c20e16936e78ffedc6a4f5
-DIST texlive-module-hook-pre-commit-pkg-2017.tar.xz 776 BLAKE2B 34892ff70e1b4ad25ab9356f26cae2ae183f403afdc729d9a1e107d161eaab0aa78f22ba2d0c27d7b90f0a30d1e83d29805e1000bb81c50a629888cefc96afa4 SHA512 8db15c4d2347289caf9cbe967e4bc7ee819868d11d6723afbc9ff045247fccf52694e0533f441ad8b69ffbcffcc98e52f17ad901b47a7a9fa2c19cfdcc693dc1
-DIST texlive-module-hook-pre-commit-pkg-2019.tar.xz 808 BLAKE2B 99741f4b4ae417b9e1975fbcaf412416702730bc4c0aea51be2e8324ad539abc2687b690c5541e89ce085d07584b63b24946c7d5beb538476855053ebfaaacfe SHA512 6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3
-DIST texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz 2784 BLAKE2B 290480e643130dedf245b25741141ae910e094ddab5b3a169e9f9999c794afb6f8c1a999a0d2df5b0eafbf414a6c15bc11841a29552a5c9bc2b78aa93b5277d4 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172
-DIST texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz 2788 BLAKE2B e87de5b35b848539f0bb55e82e60e147ada03120a55f3098b1d0b1bdf7926c57882c5c4296dcaaf4da89f2ef46989593642908db22e75a37802aa2b71c905ac2 SHA512 3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d
-DIST texlive-module-hyphen-base-2017.tar.xz 22296 BLAKE2B 8de6b540c4df5a4a51136b96e33fbf9e5fed9a4e63517edeacd0c978a9890abd8721dacf011ee3f49b86252e3112e938b775f627eeb74f3bc868a4f4f7c5e72c SHA512 6a6ccb73d2e56233956460ab6ec1e1585f9ff4d88cf14e91186429f7fee78bdf58c78d96f25e0e8208d8824ab907b49f2d61119e4d7d17c1b79aed2fd2b3e834
-DIST texlive-module-hyphen-base-2019.tar.xz 22420 BLAKE2B 752153e786b90c402f327a2ebd87e80bb5ca2705d55cbdde91f01c11e428a41a50cd8adb1d96cc72d5b85112250b6a1a5af14c855b2bcab73b332942faf7d218 SHA512 e1980b81a98b82da2e590d08ae5873529041f3b048396d9bd1c3e644e6e8a48a8eb2040ce120462a9e844353f8f0c3fa93c38bd7492d35d390525fac69794503
-DIST texlive-module-hyphenex-2017.tar.xz 7512 BLAKE2B 77e2016ad16e11ece80b11cfa803fa74aacb41d1bf54ac98ec7a685e152cf6a98ff071b6134a493648ab333cf4a32235566c1bebdd543fec8ac17b33ddad8fd2 SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22
-DIST texlive-module-hyphenex-2019.tar.xz 7512 BLAKE2B 788a74fcad29a9f80fb23067baa1757a449d0d56e8e0788dd76d9eacde4e95548e96068216d63871107d44ff852648761ddbf11595fbe38d21f4a9117361fe42 SHA512 dfa1f625e736c2c4125209552f084fbd5d64109db5dd5b8f37b5add3fce90984bfa5db855b581396ffad20b1f5a3461cae01e031c086f7db5dc98203bb7bf8d9
-DIST texlive-module-hyphenex.source-2017.tar.xz 183840 BLAKE2B 9123337f2ca79b38b5dca08f9b2a53acea4502ce4a5d4aa702b82efdd1ac2918c80d1f0cb03186173cd60ea3ef25219a4e9e326d55fb1cbb357d86cecaacc9e5 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56
-DIST texlive-module-hyphenex.source-2019.tar.xz 183836 BLAKE2B ef7bdeb8230caf5d1140bc0ea0eff144ca1e747eb8918cf9abcc58cfb20bc7a5783361c557e375fd47325a083133dd3fa227a46cb48b1d8cc45802286208c868 SHA512 cedcf83033a5aaebb44a8270b5e670b9db2fba2b8f65925cddee4684bf50fee5dcadb02921b04288d02c91ca3d003c8da143c7bb1974e7af26b1f392dfd4283f
-DIST texlive-module-installfont-2017.tar.xz 4796 BLAKE2B 05d37b0526c314d3416aa48ce80c843e2bb7b7e6b239931689ed2eb02e413d9ac2d1a3bcae98b865234449e5496e5f5363c75dc87fde7bca7d6d62c6fab54209 SHA512 f15bf4b91feaf5af8466db0492aee40c3570494a9ad503b62badf319b2aa20371eac883f714b60e015fa3ff15d8cddff65da373de653a6780fe2709de8fe8071
-DIST texlive-module-installfont-2019.tar.xz 4840 BLAKE2B f5fdcc51fde58473041db0aebb682b431ceb02476fda93fc7cc59016982d613f0ceebc2a662a6260d51ebd8a96e03ecffa717cd098fa2fcf2d614e3458777624 SHA512 cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae
-DIST texlive-module-installfont.doc-2017.tar.xz 56028 BLAKE2B 91169625c57838433c30f8b4e9830d9a949d9adb13b0dc811f68f4de516e05f9ca119634d769ac5fd630728ffc5ca7ee53c1a363d8699e374ac9bbdac9007eca SHA512 cad711520909fabcb44a551c3d3b4ac12682ffa5ac5986d168fe0e0c0e5ca0cf8135d2a3964f7d4f15f8891ec5d44fc88d0f00a458308b82e31dd1bb52dcdcce
-DIST texlive-module-installfont.doc-2019.tar.xz 56040 BLAKE2B e1b66c235779773678580a4a2730734460c3efa433de30303bdf8731c4d303e3b0b41784bb5643f379d64e53b768941e9ccec124847dcadd8b928bda9a0975d7 SHA512 2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7
-DIST texlive-module-lacheck-2017.tar.xz 464 BLAKE2B 8657aa4ce38ff1d433a1fd37347c362169f12a3af8e2127e462565f8f7444e53d103c0a44acf38c45aa3b222a40ad5699093c6e9556c2f3f254d5728a29cb293 SHA512 16a3bcff6278cbc0b8237590951b6e5c5cb4f13402d2991db8f69ed4ba7c95a4cc2caf6563a2e38a386caeb68af11452d26a3a18a8bab3576255ba88128a8eac
-DIST texlive-module-lacheck-2019.tar.xz 464 BLAKE2B 306cfae738b04113bebe25cb6e57598af61078f587f91503408bff5190362927bfc5d2456b4396fc524eab495ab70c48f70f20afe24b966acf753f4a86d1a435 SHA512 7b8c4c7d15618b7e0d860afce675124372d31bc11b5e89ba169c355401714929c2c192912e7d666a3ca98c805e2f4942bd6173763a5a9265d1f19467a29223d2
-DIST texlive-module-lacheck.doc-2017.tar.xz 7404 BLAKE2B 73eaeb32befa917817aeee5cd5c345654dfc565e82e8276ec19cec4684bea321ce66e63bbf92f80b88866dbec1a6b0e3e2016611bcb104fc459392b2b9d8bda1 SHA512 dccade3cb114fcaed052b8474e6d4e3884023cfffd34ba8e4895452dd84f114270f3cd20a731b52d5443953154d6d0c112b27bbad536ff1cdef463f66f1e9fa2
-DIST texlive-module-lacheck.doc-2019.tar.xz 21132 BLAKE2B c0a0dfce1f35ea67691faa65f8d2d6917eaed9ef5c9ecc7bfb846131139749d9ecac115bc557a2e5e71bd42546f8bf850508e6d814b76995dede37baa25d774c SHA512 59202286440ad95fc96576f6915843adfb2b3f0092509175c759c690069e36c0ce1ae66ef46c1dc1b9c33e42e7819b1f3490b45d3c3933233201d3e86eeb5746
-DIST texlive-module-latex-git-log-2017.tar.xz 4840 BLAKE2B da03a5d25ba505e0f545056c9558abf7a0482bdd783d9cfa7484b07345bbd1781c9c06ac9db8c1ffa9a6981432515857eec74ba3ee590e6b34a4c7bfdda1c626 SHA512 01a823d96ea3cb193617ad26405768231a1ba3f22165b008f0a4898e3db14da424cdcdd12fc353e0c89b42e6cd80e3b1531d772f663ea9487f8fb02c763a1c03
-DIST texlive-module-latex-git-log-2019.tar.xz 4856 BLAKE2B 9cd08c5a9dfffbd71c2e00f1bfa80fe831aecc5ff4b93570d873e98890ad50528532fc906ad6d108283cb8c7ebbd2c93db055f2c88464e2e0d4166bd098e6e43 SHA512 7277bd2160cfbab8daa88144b384cd03647192d516114d692af232906a39ea44ae5721ff0b935e7dd6425ec5514851220787827b819af71ae3f0c57b29d0d924
-DIST texlive-module-latex-git-log.doc-2017.tar.xz 91528 BLAKE2B 1fd46609e1e87d5d55bf61c61141ce7467da6a45d6fd36a350dd74924b9c67619843d7ca7bc11cca3eab62801f444fe0761ba1224db9f2085231cee4514ecc14 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d
-DIST texlive-module-latex-git-log.doc-2019.tar.xz 91528 BLAKE2B 7200b51158e2e6b2e028ad94c54e2de9beca10fb109187e42b6f1eed693394f9990b5c578dbf2cde46c7153420ec8c514c3388d5265c8d6845993ae6b1d94c70 SHA512 34c96eaa3950f9577ddf63fb42aac51080f8e92c55f02b217d2b680353f97b1fa6bcdd59158fa9e81d48dbe63d35859b52285912ceac4b523a8ae34ec894a1ac
-DIST texlive-module-latex-papersize-2017.tar.xz 4608 BLAKE2B 702216f90287e9a05883c7c50dc28c1c12be11dff0d0f97c9a6fd4ba7dbfa0e7b19151af47e25ef4d2c60316db2f634e8feaeaad54c016fce8a082e53ec406de SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5
-DIST texlive-module-latex-papersize-2019.tar.xz 4612 BLAKE2B 8b41ce3b6d519e1167a7f198c7050f393f919c7a3a708aaa5576e2a88acd7ff343b072feeb037fa00feb90ef8f1e27ae75a1c8a38b33cb2c0574c6a57ddd5283 SHA512 cc3c6b563e16f70cab0ec113068d7f870a266c090ef518c06b4e3eced8e8fd9cb7aaa3544ef362ffd4af7f1d033a104daa48d47416061c3a73ba8329cc9a0fbb
-DIST texlive-module-latex-papersize.doc-2017.tar.xz 600 BLAKE2B 5dd6592c5680266f071539d861b4d5acaef86743b2643267b40c8a25dd21454f608a593dc804291ce241000af96b9206ca2bdff5322c88a351fd80459363bf01 SHA512 e3aa2050c9fab9c806f0df66bc2d34b97a8b67e6e1bb41b13e524054731419145003305117ecf515dc47c98ae365c78784a5f09f823145e01ea08aa54ebb024b
-DIST texlive-module-latex-papersize.doc-2019.tar.xz 596 BLAKE2B ddcaeef03ece18b323d153b84b3369f317b5ecceb10f320d98c93f3963d739673a5df9c0e2918caf7424f14197fac79ded05964893595f8efd2d802ff6ce8bea SHA512 662d7a890978bb772a79db7a1d406ce6958970f6cdec352f78347d9ad8df47734ddae444370fa9e93582d4030568cd516ca32125b2d1e0f60aac3ce1c9b930e9
-DIST texlive-module-latex2man-2017.tar.xz 13940 BLAKE2B 1289010000370b5b88ab4baa6d26b299c2f67d385efcee8c5387658b5fbd1b8033463cba4c664365dae9ae0eed84dbf0831559f81286ad46bb6ba08aa5df6a41 SHA512 e3579403dc9e984cb51f8854436968abf69a29ae6984cdbd0fb2fe0141b1ff2af65d2100011fb6355580b7f8a73a3c0bdcd3b225c8f7e13a828c6b2c5ee602af
-DIST texlive-module-latex2man-2019.tar.xz 14088 BLAKE2B e791e164f7d8faf12c30719817cb887eff7706b3b3db97cc0cce773b4c722e62564935a5061804e531a3dbc862a919b3606c9c57796679029b5208473bf7faea SHA512 9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436
-DIST texlive-module-latex2man.doc-2017.tar.xz 344456 BLAKE2B 39e69f1301796e5b3561075496b3f46b7d464296dfe4db2f55e7230cb788efc23dfb399838e6245cf64602dbdb865ecf725ddec214824913974f1c88a6882ac5 SHA512 88f4b0fc6a12355b0defe1c1ee10aba1d06cd498556ddf043ab12d480ed5f1946cbceb58de7beef452afeb24e416261eed8aff8c21c330909f6cc6a8cce9d5c8
-DIST texlive-module-latex2man.doc-2019.tar.xz 369336 BLAKE2B 897023bf06fb5ed6f172251fc21cbb3bef908742ec86e3fe998a080a890b74e029d52332ce7b9c47334bae40648812ea5fc9888e18a9b28ee53f059ceb9be4c3 SHA512 214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a
-DIST texlive-module-latex2nemeth-2017.tar.xz 7082664 BLAKE2B ece6a898180446590b092deeb1f1c8dcd96f3692d2dfaaf24ff8981a25fea8080b10d8fa74dfffb3f0bdc899ec63aab4033a39fa4f672b543ac5c4357828c588 SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403
-DIST texlive-module-latex2nemeth-2019.tar.xz 7113440 BLAKE2B 3220792f23086f9c8dfaaf146f83f72c3329b0ce0d2e891ca9c461fe6540f837798b649887df890caae09afd5d90bc151afa9315e455df012817274c0accc02a SHA512 ee82b11dfd3ede3b926a034ce8a7f46ae2bdd065f648fc0375a62392a8be605e391c64726eea03efc439b7a01fcd3cecfd70106335c72927e45c70ef0c8aa48f
-DIST texlive-module-latex2nemeth.doc-2017.tar.xz 23852 BLAKE2B 6636c3c0fe7628d8ba8c600ae4ff84add3bc9f7702f596fcc3bf2d24f5a2b85e87e9ff8cf301adf5354504033ab0c3ef0d5bbc3ed5c52c6bb9dd36e39e445dd8 SHA512 c55505f0b00e4d600ef9a40461f6e3888f4c820ca1462a2c2edbd5c9f9ca75e08e543cb9fb25ce56313a6eb80747a710134ec5933f71a172e5a675ea9a0d76ee
-DIST texlive-module-latex2nemeth.doc-2019.tar.xz 26732 BLAKE2B 0310a18a972caa58589eafd322d4d767e023d3c3a42a3dc250b673eb24d09c1a5ae86789119f1b21ec9575654a186a47d159cf5da03ffce59ceea9bee239c7fd SHA512 a674eac6b80811890433c613f7ec9c6fc4667791c5b4692606e88d3e38ee59a3b68951e5f19b26d2b9f9de3b79002d17f4c539fdcfce37b82c3dfea5cb811086
-DIST texlive-module-latexfileversion-2017.tar.xz 1652 BLAKE2B 5552ae1828ec81909956d20d68bc35c1d6e09a10b7a7439c633ccc8612553340d4b7afcc7000a8db1e4793d618fe0f31116e993bde0bd907ce644d1e2b929e7e SHA512 7b2c2ef5ae64d2921da0fa553f7fb745dc7c8f9c5675f5c018e29a4745f2333c0f51d00eaeac6474a35a382d9286896b0c9a7a105424ec680f53f8a93faa5b2e
-DIST texlive-module-latexfileversion-2019.tar.xz 1652 BLAKE2B 57a97adc83f9e367c3681f6943bb38ca238e6057ecf9873611751da624013e891f5dc184a46daac80a2464fe32ee7002e53f63343e6d8bc3bf313e5b347c5e50 SHA512 3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9
-DIST texlive-module-latexfileversion.doc-2017.tar.xz 928 BLAKE2B c5654e989d5c5edb203cf77493edaf588cbd125f49eeda6513eb0f335ec1c98d11a53df98c0e5233503e985aa89fd9c6239a250d85e6eb15d26c23082ac6d305 SHA512 46a5495320ead028664b1c02c872147cf350f05f1f9a18291fd47a266a06a66449bbdc0d9d4818cad30f75f29a2ea3611fd6c88379aaf3a703e76e6df9f6b679
-DIST texlive-module-latexfileversion.doc-2019.tar.xz 928 BLAKE2B 3a72c41b0da50e9793ef2ca44653aec32780da76201a43a57e0ee77ffd4ef6225d789f1614b166e2c1b324b97a1515867f4af13d68a5225fafbd444c7ecaf11f SHA512 b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1
-DIST texlive-module-latexindent-2017.tar.xz 38844 BLAKE2B 3ee9541872df5fc37587c563ad6879f7c9d151b19838b71b79c8a17a252c233a581ed7333e0317e4c152b5789e6a67c01de9f3157851c48e14599cb9b55a13d7 SHA512 f8797cf236d783536bd208abfbd7bda3fe05f5101e3ff2cdf546179a526029ab47fc25eadce6f54cd8f0ab29ea155d412163726cc2119395ced80507d8597f69
-DIST texlive-module-latexindent-2019.tar.xz 53160 BLAKE2B 11455103e8e251ac61b7abcf01e638059b89c981e3002b909aec682392dfd5c4fa72837c09d8e773e02f5e5870886f225ce39a6bb248ba29241ac6c55e952760 SHA512 e8f6f5dd0cab6f203014a57d455996794acb84a18e690acad00f1740264b28da6e4a6f8aa0b1525c44fab01c9bd8bb9292a8bf9cacc5cd049a06c11bff57df78
-DIST texlive-module-latexindent.doc-2017.tar.xz 541996 BLAKE2B 7b239ebbbbcd0904a2ed31ba6f092918bf75703cfaa032001aafac18dfb1f10f312ff8edcc919ee389c2242ff6622bf5ac6b1ab859cd4a75f2ec163109bb079d SHA512 53d8e5566272f7dbfca899687a4981e142d9e801d6f9c6c9a33e5fa6adb0bf22828edc130f7320a3719b93001125066ec48a497743490ae5f7872747317b6f2d
-DIST texlive-module-latexindent.doc-2019.tar.xz 755148 BLAKE2B 577c31ff736c40977ab3fd317cf082d85bd195c6f05d2fe67484e48644baad138fbc66e8cbf9c4470a4590e4716d684b06ad9a02b8b7c381ea4e7076de4ca24c SHA512 89d85ccc7faf8890b09c9e4818a07f706c0be9b39b035bbcdaf278016a78222cfaae0292d92b13f27febaf8d4c0d1e5078295bbaf08f3d17219c495c05c1ac69
-DIST texlive-module-latexpand-2017.tar.xz 4664 BLAKE2B 3ab8f981d0b2c6fe62610c84c436738aeb16b05be8a38634ead040050272585593a5a8cb701af329e923e3b6ca1759f7b7dc3d7f37bcdfc88b6f417345ce1e00 SHA512 e74ed2886e781740d77c18303fd98eab17e431812f033b0e7734e4aec966ef3476605ffbdefb960f7be511ac5c2e4e01586f3ba3b3b1708e02b0656a02e4b6d1
-DIST texlive-module-latexpand-2019.tar.xz 5752 BLAKE2B 61a55fa12048faddaa58202e769d46b949a6367980b8d29ef8fe10e7b09693dc009b330944862fae5ec9677a32804f0599545cc6984b9a07c2439083434be63d SHA512 9248c63fa16b9f9ccfb0243bdc6d56bb80b9887e26d8f1cae53092ecef94f046f554d8c5b9ed6cacf7202dd5be212472f8bddf9eb740f4ce54e521c9baaf75dd
-DIST texlive-module-latexpand.doc-2017.tar.xz 3000 BLAKE2B b37e0a3af2f1c77fa3399034966d758374555b87381b614b92eea44ea031f0f3d535adb1f845fbad57b6e8f022e3fe650e656399f171b9ccf95081a52ba3c8e8 SHA512 ab847d512042ea1079621f9492001ee09c278b130a7c61412d883fb3687bb85d52dc53c3133d54acd444c38d21d42d5ad1b95f918ccf38bd9575f9fb19bd6ede
-DIST texlive-module-latexpand.doc-2019.tar.xz 3072 BLAKE2B da7fc2e838df1f2288b8f5d74241f25ac16dba6c9eb69ebfc149599e13fc12fae2a754f8395892b9ab97cff41a25ea9123fad616121a5d2dfaac0d1965a23853 SHA512 faf4b269446a008ba77d37d8f51ab123171a3cc56d59dc6fae9c5274833e97276c24392064f6f95e8e8eb5b88717d1c4433a915208cd81788364d382aae200c5
-DIST texlive-module-listings-ext-2017.tar.xz 4852 BLAKE2B 5cec8bb40972739e36b6f2e18b0d0b85ab0d719e8b752c1184fcd84da3c8bbb7687794b256e4581bc94718e97400ca1c1d2a0abbba171cc85531381dd608a6d4 SHA512 a40ef2786fe5624c233f846995903ebe19fe6fb9525899f23e73818eb8f87dcb296d6bf0c23366741f6a8eb8655c21ae7337a4b80d90949961b007ccdc67f461
-DIST texlive-module-listings-ext-2019.tar.xz 4856 BLAKE2B 0317ca2bd6c6cd1ebdebccb4b924c57bc9b9409d97e9e967a78a16282541655f454dd4c20e6e8cf1613a05755cdf5d88c1c7aee6f030a80d8364807aa8434a2e SHA512 c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c
-DIST texlive-module-listings-ext.doc-2017.tar.xz 103660 BLAKE2B 6160b391e62ab03455f226c7db98518a4735c630b7599bc88a868ac760d602bf07bd05e846d7586791b7ada2c666de73bf860c222e2d1d9b7d4616ea0dc063d3 SHA512 edd67257cb74020f36a11a95e6f53dca80b376d73ccf75a87d689ec606019ba35f5b836f012c1817764da8c3b2947ef47ae707f22c47c4096dd31c4bfa58a327
-DIST texlive-module-listings-ext.doc-2019.tar.xz 103704 BLAKE2B a7367a78ebd5d466b0b4adde5926264d4b5325a635f4db25483a491ddcafe3436d2f97e64d50d4825e5def63439c50543dc893e08504501fab56b3ef7d84e6d3 SHA512 82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5
-DIST texlive-module-listings-ext.source-2017.tar.xz 22640 BLAKE2B ced7c27da8c445870a22c02575adcf3749f6f04fa0db23016e9712fa95087a75ffb8c4129d3eb4bad28c0d780502289ac7f5016a0bfe28db16eb81a1a31f2943 SHA512 4bde1dbcd6c5dcd258682314cbde29ce93c4c765158798b27fa17a23fe77c3e4ef73f86578716da6233039f864bb44a1450206bfa7c12b7500d650c16930784a
-DIST texlive-module-listings-ext.source-2019.tar.xz 22652 BLAKE2B 15f7ecd55bbdd3e34de77c72e710ad7aa5b7be6d31da0e550171f8477627e0cbcc9cac8bb852c2771b639d66992b846a9cd37952f8b6ffe16a7ea9a7fb3e43a1 SHA512 fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228
-DIST texlive-module-ltxfileinfo-2017.tar.xz 5172 BLAKE2B 612f8b21a4ec4c2571cc0fdc9776ab5c5faa5bf865b7946a1b8e2d4354c70a2d7825565016da339c8f89e2899e49dce841460660913fb959fee70d14ff434ed5 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5
-DIST texlive-module-ltxfileinfo-2019.tar.xz 5168 BLAKE2B 65e798fa705b8420a03db389c5990784d9c1f208d23f9e07c615a47c2abe9a560ecd55d0eb589151ae39450738a98b8eb48c949d4a4fe285d6defcbbb81927ee SHA512 ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44
-DIST texlive-module-ltxfileinfo.doc-2017.tar.xz 37604 BLAKE2B d36e08a057af2bfb964901caa20b79ff84013f80fbc9ed19545027c104e007110dbda9ceb62f8d5091f50947624533d45393a9d7cc0bc1b470a768fcb390adb8 SHA512 44e7b6664fd865a78ef23379cfd39c720ddf9040d3ffe63c4ea922e2825a14f49926782e1e3ae4cba347c26b8bbbd15e630d94dfc36c68dbe813fcaaeb11da88
-DIST texlive-module-ltxfileinfo.doc-2019.tar.xz 37612 BLAKE2B b8021ed8cd1d977b18b92ca463046ebb67fae757794d881d8bf65b81dffb41ebdbc9aab960d06bfd7514d55d36c2d780fbe890a76e5fa3b415b53f174ff9e363 SHA512 0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5
-DIST texlive-module-ltximg-2017.tar.xz 10352 BLAKE2B a16c2be4855eaf69e527bf91a152c1e677688340f56c3c31ed4453c4e3700e104df42d03b761bb18a8a65fd1ee9a26c27b202ffe460aa38c76ff129b13ef8e1c SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783
-DIST texlive-module-ltximg-2019.tar.xz 15896 BLAKE2B ce3638279a98f98fa8b2c4d19f40a7e23a545fe563e863d2bc2557532c4696007d9032bb76900de50e2688d8581dcd25dfb5ac61a1b14a3513ee38ba2d845fef SHA512 388b4826e49a57071f5dc8718d02d9f62f1c4f85368ee9e2f3f435fecd80c698cd3acde79d0dc9edcdda46e1cb2386e6efefc12a25b79f6ed73c0b5e5ce1dca6
-DIST texlive-module-ltximg.doc-2017.tar.xz 350876 BLAKE2B d4e2fb1c140120aae6c89d347005a6c385c7c2fce1cc69ab6dd32d5456df90871b8ec3f251e035332e5b3359ba6804924b622257a1b510878412f2337059e8df SHA512 a761b23a9873912e677f042378b7598750480d527c7fd58b5c36be638265138033e4a6aec411e879a9ada801aed85694898b4da9459c52040e9d33408ae485a8
-DIST texlive-module-ltximg.doc-2019.tar.xz 189772 BLAKE2B 3a5909954eb83a4fdda6e4b4e6b3a4fa3c79c4f30b223449ce374f2ea40c71a255c69690a7189b323d64e4574bad9c22fcc3997ca353dbdcb2b39239eec14a43 SHA512 2c5af9f2b1a843f5e27f96759cdca8d92dec87013cdfadceeafacbf77eed00e2db9dc286ecc7316cc6838fb85f59c399457490529426fb2ef7daf02f393fb622
-DIST texlive-module-make4ht-2017.tar.xz 15268 BLAKE2B 8ce45523d313cd72676027b072c2bd19094b5017dcb92eeb35d82ac7973d5d7ec111d7cfccdeb5f254ca3abd82f4db2e696ccbe8b1284790c65a274234d7743a SHA512 06d90bcc80409a9f18024bf730f956d126bb5745f43e30cf159ca8a94487fb0dbc347b1b30b2d954e8e3d79160ee0c13c94f4ffbfefae332bf39f94823da599f
-DIST texlive-module-make4ht-2019.tar.xz 33224 BLAKE2B 5fe5decba37c652d4f6ab837af47ca9e9b72d6b254ad7bf8016ecb42ee633065f264b64051c1f6aa822ea94e16d0b9af1fad39664f769ac108354a4d39e44623 SHA512 ba85b1b4055d997677f5a158513eeca0390e9e07b872250970908151f33f7203a4d0938aaf4dc56c33e36f57b99f797b3a28f999add39d931bf4e78b907ceff3
-DIST texlive-module-make4ht.doc-2017.tar.xz 72112 BLAKE2B 24a227bf3025db627785580ddeb2a4dd894b4e3b41bc95d53e8f98ca0b319cdb1237b93cbf59a0d15398ff31f303800cfe1f68e1c2e9514fb36905b5bc993d25 SHA512 05dceee32a5488df1bc889e2ebd006cc2c901e8445a7f7e3ddde51afa24dab59fabca9b2df963febb7018b4e840f0107f7aded5653ac9046b7625d3a5852fbe9
-DIST texlive-module-make4ht.doc-2019.tar.xz 125828 BLAKE2B dc9daf6639b32dda301fb9070cfe4e6b2b54793bcdf6f4ec53bb6a2c110296b3d16067fda7b95de3ef3bb941294542d77e1672ab103170fbee8be37b55a84dcc SHA512 45637b363c64d0ad91e164d8c8a254506f98c8105d226ef9ce1912c2c4ee50057233f17035e8a5ab995c49875e638bbd14e1a13949867329a3e3cae65b844c55
-DIST texlive-module-match_parens-2017.tar.xz 3328 BLAKE2B 22441bf4709086eb73afc83e46525059825457a0e28ac4a345fa2a20de92563353c5dab5e794b884dda66a596f89ba79a485ade65e1d65f78211c918238093a0 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e
-DIST texlive-module-match_parens-2019.tar.xz 3328 BLAKE2B 3fd79342cb4a1d3de5a60e7364730af1fef0e7de20e45c78c2e7c6aea1457259a7cd53daf6875f9a35f1f5425fb34a67426ceceeab7868a1f781a67a82ab3594 SHA512 1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad
-DIST texlive-module-match_parens.doc-2017.tar.xz 57280 BLAKE2B 0fd6b2c6f7ac7eebe6b7d1bd975181dea960284dfbf98866557dfa45c29202129bffe587c3bdba50217790e0d97aeef98f5467ef7dcb0fd0b0d7084bdfc657da SHA512 d92fa529b9cd6cbdee2d8e6f178fa8395c08540d044d0522d1da2a68c78654666d0f7ec05960c9b9f8b2530b4c54bc695887da13a1ba383d6c3bfcc49ebd64b1
-DIST texlive-module-match_parens.doc-2019.tar.xz 57268 BLAKE2B 3540abdc804c0b062e5a06c570ff9be7aa87514004a780b96d159dc90bc9fdd98847fdb1a5559d944da15908bd6cb8b6a03bb56e8de4f40a13e13557c3e4d3e5 SHA512 60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a
-DIST texlive-module-mflua-2017.tar.xz 27848 BLAKE2B c2f2be68f0072b49a94e535bd7fb948e24d6f6e4e711aa067efc7643ad599c26dd66f9635e3aa9ed4cf876f4bfededd1f8a24b06328db042f06fa11e45212e5a SHA512 83d84e3cb1291c2af4067df2fce91e14bc30d11843c5aae36aefce4e0e1fe5cf6896ecff8791c2888abb16d13933cdcaacec11421d534b71dc3b6cf8c1c02bd6
-DIST texlive-module-mflua-2019.tar.xz 31672 BLAKE2B 89204162fdab8140533133a48ff92a741746839a55c7e3fa9fe91cfd8fa3c842f100ca40e03be80dac08f676d5d84371ab0b3f6fff7be00d59c265c3317b6754 SHA512 a12e8a56228f0e3c49ef08a47c989135028ce6a99db714eee1304feaa31ae10ca5f030291ac56e9a344b54626247a521a909a18a35038333dbdce6553019e31f
-DIST texlive-module-mkjobtexmf-2017.tar.xz 7444 BLAKE2B 20a80de587212d1a89610b378c50ed8802cd8ebfa7c3b80529add90a8f737f7a6b87d3614e77e3a820292bb8145ef369b2c4f393efa41eabfef65336a5bcedce SHA512 b87432ef1fcface11e93e541595fdf74de1539d9f2ce0dbbe3e35c73064230812628745aec782b8026cc60f9797aeaca9057c534ac852b22bf44d24d5cf1b960
-DIST texlive-module-mkjobtexmf-2019.tar.xz 7444 BLAKE2B 624ff2a3059854ad4aec624e43e8bf03286b477c2210ba4d993affe076fa12bf932a9b6376862aa98d06b4f848ab8b49257215658a8c55196f8e59594d64d4aa SHA512 c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3
-DIST texlive-module-mkjobtexmf.doc-2017.tar.xz 80276 BLAKE2B 206017cc2c54a2f1dce32d7b4ff2670a5fc0e3f3afc0c5c013b849aa1309af8ebeeaccc9aafd59ed2336d226b53afd6d07895177bbc5b62329b10754b81592c4 SHA512 4df1df676df7f1a1c1bf0d1c0a51df8e4839558b79fd410446b522ce218f499960420af351c195c61fb66f9eeaea869762f3ca8091f76c662aeec333fcfd0f80
-DIST texlive-module-mkjobtexmf.doc-2019.tar.xz 80276 BLAKE2B ee2373e795425a3c40e1a46af3d1fb7a800aec9db9d808b6a6b32e64de6f449f4421320e429f635eb8b04c03e7768a4ada3f37e8c044d89c903d13ae32ed0f87 SHA512 3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5
-DIST texlive-module-mkjobtexmf.source-2017.tar.xz 19820 BLAKE2B bb68f6151bd777e677ef75ffaef1338a9995e37308cbaf4307378b5d7291c52950be369c66539e322dbde11bb8951b3e0fd6b227e47de9238027081f359cba5f SHA512 2ff63f05ec1d4b09842a20b93a1ecab09245dfdb3cfbd3e37f1e1cd9d25760c161948433c10ef05373d84cc44b56714f86073afb48053a8f965c64490da0b3ed
-DIST texlive-module-mkjobtexmf.source-2019.tar.xz 19828 BLAKE2B 31b3a262ea9c1202d17c542a5a707ca36df035338844ba5973fddcdc6fb96805185bdcbe0de69dddb7f7f3b4a898de540caeb66088fa57abb0d3501c699f6677 SHA512 7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f
-DIST texlive-module-patgen-2017.tar.xz 532 BLAKE2B 21f5b2ba902932c026e6f8d395031510625424341b494063010384aabb4d5c1c4bedad0223e738dcf57a7656e0bf13996e9662ada35933ae328ebcd42ebb70a8 SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e
-DIST texlive-module-patgen-2019.tar.xz 648 BLAKE2B 3bc7cd6eddb45607f2a6858b31dfcb65d2a8252115293ee8a2cac24747d00ba0024b4ff8c60c54b67ad46e50012749ccffcf1dafb5f885b1d5b920d2079cd949 SHA512 524ea5aa09feba7ef5efd47e35d8d94703be4e191bb081d0b13007e853e88729c6029451e58a7237ad5ddf524c4d0798421316c38d1d9374ed7cd05f2744f761
-DIST texlive-module-patgen.doc-2017.tar.xz 10960 BLAKE2B 08b89c5a01af4e9f14bffbb17561e2591753e853395b29476fd98ec3c5fe18120e223ca96fe6a4c7a2f5220bc8a0f07707e4ffe0b7a7fe914ff8246db9231226 SHA512 b1b69e00f32402f3bf2012f25840e63e3e1ebb00a5224efe7c7425d54a4c37945dfa097a1f41e89b360e4d0d769ae003774503fed41e4e1076004d296be27117
-DIST texlive-module-patgen.doc-2019.tar.xz 28652 BLAKE2B 9ec6e794bba001e7a94956d632cf0376a10fa0575fd287b4acf3c36de4ea19021ed117670f236346784e3c1640b2ec91c3c3fcf1f0bd91e1d2637d61a35c3b8e SHA512 136e6c23505593788da8343f4dffccee77ffcf9fa63382871507db47c3ff23d6c25d0cefc985f67e4ee137840aa3af8f1738a5b2dac5272e568e73b18b71a5e2
-DIST texlive-module-pdfbook2-2017.tar.xz 3492 BLAKE2B 8f20b8b924d72575b0685fc9b2f4478e78e99bf8a2cf820188db9f5dcf2c4b761794cbcebd3785a5cd084ba77e39528a422b8290a2c226718c25a97f29e15253 SHA512 62aa520c215830d8145bb0fd7af60915245be4b246bf42eb912124e61c9a388da67f3ca7efad560f98701c5b32be0b87ec9e78078b9900f44f0095c9c069ab1d
-DIST texlive-module-pdfbook2-2019.tar.xz 3500 BLAKE2B 851f722554a74d47696ece850f9381fd470acc75457ab24590cf42375f836fec1e0631c531ec1da3e5491004c33330d59d9a56e2840def598f80cc5178f81ed5 SHA512 ecee1f160c1898110bffda10fd1a329b66b8689d7fb967254eb9dabf8bf7d71ad94399fcf3ec6f01db08309c3b4803789ce768e347ca70bd9a81e2c49a6f1f78
-DIST texlive-module-pdfbook2.doc-2017.tar.xz 7552 BLAKE2B 086bf910bc66166a2a441465094d95d13fa8c39b4840c9ef19d9595ab2aaa14eb4251de5cd2b4ff2589768259ac3048e4057bf3bcd7bbef4b86d6c82b6bc3746 SHA512 7620a797dcae68e7bf093c119b06f377ea2665b228125bedae11ce129d8053df066e771df2053fb8d90473cd7d00a75ec5235a0ac5221b0171605d145a18321d
-DIST texlive-module-pdfbook2.doc-2019.tar.xz 7552 BLAKE2B eae92ede4b9beb7fac91f0baf6a1d2c9edf95b9e665d600c0f1d6c76ec7ab910108272f63b87bd3b2f06ed849b69a2b57f0f9f578a70228ef3ed9b4a6e5d7d11 SHA512 b6b58cce91ec59d43e5aa868d5f1a692e76ef84f57c2399dd0d25b7ad9a94c2e23b376cb49a9d1c33a084362095e018a177c95bb3b752c5ab4840d054b241b51
-DIST texlive-module-pdfcrop-2017.tar.xz 10720 BLAKE2B 0287ee170ff11967df2932d9dd7ba947abbff12045b059c906b9dc399a56596915b9aa06d4c924db84cd9d5b2d04e42637f5ec1291d4657730ad5225de002cc6 SHA512 11d2e8e911e8cfcabd5a4f6555715e08cd6ca51868c1a0dd7d9332fea5fe7fc4b571669058a99ca518f7dbafdf45a517231ea8a654ad39ad9169a789b3346a00
-DIST texlive-module-pdfcrop-2019.tar.xz 10732 BLAKE2B 29c12f811d7e0bd7a5475d35eab2b35549d404e90df4b0c70aa299ebf938b1abdb3eac9eb1ea868d98c297b5cd22e1fab629d2013a475c36157761f4a901b68e SHA512 eba7fd5c529e1b3a29d00ee679c24748050f1a6005391de4bdb6e6fd537cd447b01e6569e0eaa87251d49e14f548dfc80d5e33f037862a4e978905af37e9e186
-DIST texlive-module-pdfcrop.doc-2017.tar.xz 4300 BLAKE2B 7d5a70a0f8ef86b1bd9c60e534a20e95571d0808d6219e0cfb011def705427b843c1492b2021611d2b27b79324c764d249b852499e9dca5fa9e71aee1f7343e5 SHA512 fc9537872e8a7234d80e76709d69ea7c3e17e02321b26477a96186e9b190d6c093a62caef83bebc76d4aa4134273e28e74d456ddaeb9e53fd073f9838ecb6110
-DIST texlive-module-pdfcrop.doc-2019.tar.xz 4300 BLAKE2B 67bddc633e05ab07d56b78be20da628f44beb511b636cbdc8b9b74883e2778ed917a0a96d16bd17355124feee5544c9e5392057362b508273f08e7340c602f36 SHA512 5deb207030892f9e351d511bba20e65e957b5db17df6af60022c3f069cba127be6e9bdc1e94600b6f36af8f35697b041ac5aa529ef7997f57264b1dcbf76ce2e
-DIST texlive-module-pdflatexpicscale-2017.tar.xz 3120 BLAKE2B 9b4630ba97d27258bcdf58f9abbcfb2a3c14f846b575c365462c46775685728443290488108af99161f164b16714a7bca6717ccba0c9d5878cef8ff1baea6ff6 SHA512 2e6c4baababe8b656e12eecdbe73d8410c060c3d4aca5dcfc626728126481a5a86b8b7d031a35c85a26e2cb79ed1e7bba7e143b449b0118b5a11d9bd9bd135b3
-DIST texlive-module-pdflatexpicscale-2019.tar.xz 3124 BLAKE2B 491b0d733a769aa494ce026add50ae710a2257ddfa2737cddd83465d33c564f553edc735f61f3dd09b41c3e92cee095d38d777e52bfd57d77ce5f04e21868cb1 SHA512 d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3
-DIST texlive-module-pdflatexpicscale.doc-2017.tar.xz 86448 BLAKE2B 45de64a373368a72acd8511a46ca37b6a0fe10a2b4c0d3f7c65a32799f1a25fc22b2fa9f22a9a0b0abaaf372a1b29ab26a1dbefc37cfc7a4569a8ca2f43b4ff1 SHA512 6a19f1366879369ccebfb53663ab565e3a635bdde413fa7c1d8d6a58faaab745cf213b35e183ca1bbca4c90dc3a8c60f1ff0e472817d703ce015852d0028122f
-DIST texlive-module-pdflatexpicscale.doc-2019.tar.xz 86376 BLAKE2B 53f8b82efd4f7c4f27edbba3a6ac5a790d40dd9fbb652bcc798973182604166ac8a748dfb4ac3147d206fef6072d178ef5c7ff7a334cc009f3bac0c06b48d7e8 SHA512 64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1
-DIST texlive-module-pdftools-2017.tar.xz 1872 BLAKE2B 57670c928b435abae7bbd86d7a0f9160ca194e8e4dc07ee9a077fb6061b4895da02cb5c71db7011ac90d9c0ddc6f27177769b9f0e39d079dce7191a9a9683050 SHA512 9f6684fa61f3bf757fc970214065b76523e9f0bf324024fe90268034a2322646cbd10f3a005135cc176e7ea17c434fd9e727337d45929ef24f024b0ee7edfb10
-DIST texlive-module-pdftools-2019.tar.xz 1844 BLAKE2B 1e8533512e15a8fbf5bb62f2a4e05e61e2769c1cb68c9e50144696015703442902ff8016ddad1f9c0bd695a0d28fae932e2f8c9231c5f968276533e14497ce5a SHA512 ba9ae7b0bbe512465357405e87f3d523235c2398d4a94e8d0c8191e37db06bfabd6676f3fb9f603397e5682f9dd4f9b1b4cad03fce89448a9f0b254f8a7f2b46
-DIST texlive-module-pdftools.doc-2017.tar.xz 73680 BLAKE2B 039106802e0eb4b7c26c857194a3906f553c038723f42ca4c1f7f575e5e703506c49f731b03b4a8f302d1bc230a6c38140664f9f7be301e35584886be15f9682 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc
-DIST texlive-module-pdftools.doc-2019.tar.xz 64040 BLAKE2B e8194e09bb210f1b09d3b08e0f68f15a3412db38a9300cad6036612551580a0ae82962fc9847b3ec50fa7419349ebfe207fdab8da7afe749879da5e3b4bf13f0 SHA512 3f95883d9405bcec282468f42f8718bf9c510d98c41510aa643ce0b70eb7557f67b75def0dc0e1f862f79d586f0f49959b4c826f8c468ca9460fdd69d3d4ceb5
-DIST texlive-module-pdfxup-2017.tar.xz 7260 BLAKE2B 30bdcb82091edf920b31a0ff9c3b4e4ff16e3c2cb1e91584766319f1ccb9f3211d9d064aca5636f4181b9eac47e3202aee0ab8474e198dabbe63ac63c6503368 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68
-DIST texlive-module-pdfxup-2019.tar.xz 7264 BLAKE2B ae89dab0e28b42bd0c5c18ed813f00d7f61e1569bac172ba662933a12cd0ae8b64bb361805eff7d8e86b4c24de061cbef82f516e3bc30679f141516395553e91 SHA512 4086f58241799139e980c97c1aae786566bb7801932334d78e89dfc5f8e718b6b9fd3eada32ae006b9aeb74d8b2644071a1b1e60db7dda3b4b4942947d727fca
-DIST texlive-module-pdfxup.doc-2017.tar.xz 21260 BLAKE2B 5256bfb3c4439855976f940e5a220372349cbe355fd95cce1c90e60840f71634410fe9551cc476e457c19516627c7099c788ab092d72ad8f365440eeae6fa261 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f
-DIST texlive-module-pdfxup.doc-2019.tar.xz 21260 BLAKE2B 59bd932a68ef363af4de08d8e444a9e796bfad0c250c549bf224e3105ef1825a9bc44bfccd288cdb4af5fb074358bdc9e772726d0dd685f89a619944c963ab83 SHA512 3888fce668affc7efa7e9d88c890f72c94b49dd88ea3c05af956943dc015e89ad930e2de3a67e023c7e1be2cd1c7911e5df29dbc273e3c2b219eb5377c165956
-DIST texlive-module-pfarrei-2017.tar.xz 4640 BLAKE2B 04bf192c53a5f9828f96f6ccced8fe77e562279c99e039a793a2da6a7a346cb7c9ae5439723ab8c50ba95155befccc90d2979543a9d836de23ffd323949a5b10 SHA512 3fd11229796b4958fe8b8a3e2c4a4f0556063328ecb83cd9f4273c9bfa7b0d81dac776fc5d79f5b96b7366e0dd259d27af1747752e1fe4bcf7396519020a6d95
-DIST texlive-module-pfarrei-2019.tar.xz 4632 BLAKE2B 658455eb955f1525dc9f5e00a748ef19d89bf2d65f8168121d1a0539b298fd32a9494d58724706857885364c86f6d46d42c8045e8124716b93726f8aea8aa3e8 SHA512 f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c
-DIST texlive-module-pfarrei.doc-2017.tar.xz 499400 BLAKE2B 4553271b95f9d295ec870681ebfe9431c84d7314fd69cffb96555b132095715738fb101184cf66002ffba91078b97b33b4e88326d73aee77163114f120afb4e2 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324
-DIST texlive-module-pfarrei.doc-2019.tar.xz 499400 BLAKE2B ea640be4e5f113f9c2cf07b7b2dfe6da8889f79eb5a9c6bdf8758b2b587b1f3e4fd5337051b374e330380a6efa941cf10be47d643f2555af99b8847a6904cd1c SHA512 d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4
-DIST texlive-module-pfarrei.source-2017.tar.xz 13448 BLAKE2B 3e01dbdeb61416eb45b83f077452b694b1243b132941f2aa8329c3b544e3c9527008b44d2755ea7e54a113382e00b344c6c393d8a1a5dceb19c232e80ba6fdbb SHA512 2a00bb71000bce7cdba9648d51cc5a7943e2b11ffe1a9bf68dea4d4a320a337f73aef4152b7d5ef10b8a406329b0979eac82e84c21bbeb89421bf0785cb085b0
-DIST texlive-module-pfarrei.source-2019.tar.xz 13448 BLAKE2B d30c95a4970d5674f7b44915d8129d13c7c8ccb43725a8a12129ebf64eb63aa9c17a9e39d6478d57584ffa818aa9542cebf865220de3ba286b18318386bc25da SHA512 1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884
-DIST texlive-module-pkfix-2017.tar.xz 7572 BLAKE2B d4036a5922fb8ff9e4ec2e6644c29f5799dacdfa97195cb21d998f327e6aff8441aa4570e62464f1d36c04019f35f91546c2e26c8e02642eb75fd15bf4b0cc28 SHA512 5ec75f9a8760dc9d159a003738e700938aed4312b76c3b32feeae1e3736bfb7e0ec61bc6627753ba2c035c93a47f21176ed8588f73510e1deb76dd8d159b3691
-DIST texlive-module-pkfix-2019.tar.xz 7572 BLAKE2B 3b655dba7deda0576d7c9f84d8d6d136709b516df18cae7f15a010ef3ab3ec8997032c02b1b0ff027fa611d638648e1e713894c31defe16c0cc671fcd7ae060e SHA512 b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24
-DIST texlive-module-pkfix-helper-2017.tar.xz 16716 BLAKE2B 954f041f4cc1d2b3abb126952000497ed98f49abe4e84304244b828db0ce5d18ed379591ce8d2037d0165996cf055be6f0c82de711e2c76bb4b1cf7c54d5c45f SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086
-DIST texlive-module-pkfix-helper-2019.tar.xz 16716 BLAKE2B 4c178cbeaab6845ac2e7bcd8d8f81d2dd541be4c265413403f8e749290f6efb80ebaf7cc0cd134c8dd0cf1bd29a348ba82416c62d0903a0e43549ec8da63899f SHA512 4828927668f21f465ab672b92e6e3934e81e60bd9b3bc1f28a65b2c4dd26d2ce244258ac1b7d8846c0bfbb653a2fe009875ddfcc0383b34249e775f675497478
-DIST texlive-module-pkfix-helper.doc-2017.tar.xz 640356 BLAKE2B 47f4671dbf99a20a2458073c39ce4aee1257db7c975095fd16132b8af23e3cd3aa25d68e4bd354edf3b9555f0c8619b794d80be377091de602060a53e6e59e6a SHA512 9bd23f5fbad0899936b27d91de75a248b304ace9314e28e9e4278d482545bb7cbc027b7f4933c2f868ce2c19ac3eb74527e176c4f648146613717de36488f7b5
-DIST texlive-module-pkfix-helper.doc-2019.tar.xz 640356 BLAKE2B b2514d1862eeebcc883f5799e46bb5d856f2b100adb6bf83e2f04dc0226c71107270c7a006a3c3f248127dc726e5d50a4e799c9ffd87c97838e6e1f1d60fdf01 SHA512 146bc49beeb779c4815737cffe1bad30c28e7e44409a3e7036ab82c58f6f1b7e0ea3498f1a19cfd312390bcbc31c72d9f61a92501d87690a61cdc7c66c2fd2ae
-DIST texlive-module-pkfix.doc-2017.tar.xz 4376 BLAKE2B a550f55ff869a06be90fed27ffd46dfbb6039736e9fcf87117774ce6706d1d7bd3d615f42e79dbb7bc5d7d0850f4e9d5758fea0bebcd0a9fd8ece64f330126b2 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6
-DIST texlive-module-pkfix.doc-2019.tar.xz 4376 BLAKE2B 7cc25ca096dfcaacce04fb4241dade290ce51fc6bd2791ddf4961d059080d449ecf68ad972e7c6f4cc2564e3faa982e86e128e1227ca3beae02055c160075644 SHA512 c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4
-DIST texlive-module-purifyeps-2017.tar.xz 6212 BLAKE2B cee315c9eb13aecb59eee53c58190aa0775f7e1b5297b02faabee2268b036d9006cdceb704df6e7cbee7da68547227a89b5ac43a9dae50f79f4e9adae0bbe700 SHA512 28561a89dbfb895180d0112fb39920c0da0f52830c6a1389afcc080d381c70ccdb217192b2b154f0f31611c67b16603f33c69eaed9d8e5d0571f3886e1481817
-DIST texlive-module-purifyeps-2019.tar.xz 6212 BLAKE2B 648b7a323d2a1f9e48e5eba4ec9c43e796a50c166af2ce880514679cc5ff04d429fc48e1381e8797bce848e3b4fd5f0428d6825dc3facb6369df3fe1a2d25712 SHA512 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
-DIST texlive-module-purifyeps.doc-2017.tar.xz 15060 BLAKE2B 2d9872bd873b6d149d84a8c9075b1aa4119c1ea54fc17e5d519db5a7ec06493e095e12d308c2b315f18933f492b92fddb4604cf235fdbc91d4ffd305bc7305fc SHA512 666846fdd403a143a1756c271c02561576c1ba314fa02400156914baf694d90d461c621bd2d9eb1491e498bb92a4d68e1d69bc20e35d9aaa7440bdc4b76b9b07
-DIST texlive-module-purifyeps.doc-2019.tar.xz 15056 BLAKE2B 7d6e071fcceabecaef60b58f0f69119e8b0950820075b97adc07651de19f9db92e33a6cab8d860b23c6fe5ed89ffbdcb11cd792f3dd2198d81fcf61c77a91c3c SHA512 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
-DIST texlive-module-pythontex.doc-2017.tar.xz 1525440 BLAKE2B 4dc91d1b2ae4199094af30fbb0718a966eb51be23d4f28986888761d200a4b8f6f83471299587523d58a44db6327a52f33fc52e29aebcd8a2ad6a2a93f0e7888 SHA512 8ddd52bb6fdd93510120343222234a3f8dff4497037a6529017437353c5d409572f122f5b1cf78088d554986f1694d8674cb7d8991d90683c197a4b08c5bb844
-DIST texlive-module-pythontex.doc-2019.tar.xz 1543832 BLAKE2B 71dfdb873479eb2f0e0ef1f48785e97294630fcb6838b4c3c3e241a83fa7714a5347d9ac92c2a717271683ef49cfabeda5a79b635eff6a950976b4c0a3d4d305 SHA512 4a79de9023f8b12a22ff6ab14295e580118ba749a465884fce3f43a2bdfa8c3f7a4e131223f191863f2f3b3049f2b6d83d7c52bfcd3e4b3d90698591c61a8e6c
-DIST texlive-module-pythontex.source-2017.tar.xz 81880 BLAKE2B 59576a4d07721caf2a13b2b25c26c9ebd537e7b5eb119a42ff9038c054cf05ea0b82f9f79c120cea3f1a68afebbc57040e301a76759bde1b7529df2838125e2b SHA512 4e05da64a7dc831a169d891aae6202cd1e9c72812838552a23dd3d43b961fc39f2db30080a61056b950df730c2144ea82526255aea213c8793a4e629c6b4c4fb
-DIST texlive-module-pythontex.source-2019.tar.xz 82424 BLAKE2B 3069ce8f0c51f7535c423765beb3db2a44ba55a506085d159b55d91b790148ff17c85f20c322ab9e6d5863110dbf422048de3c73750b3f029110bfa551fb28d4 SHA512 a1fe4099a2508da8e901de36a302c368ac1ad9990f896e0d36dd5fe911c7bc3de43d2c19ebca5f7ec078ffc03797fb4d600d34501f568fa68fa87d0019584660
-DIST texlive-module-seetexk-2017.tar.xz 644 BLAKE2B 9347aee58780cfd2ca45b4178cef3eb312686cba1239f83c34cbf515bc558b1610410d26569fe5f33483729c296fafa24feba60466637d544b9b7b7cf02255fc SHA512 f18b647cd991c862a1e27a0d172d294918cab89d91a00f6de33858b67f07a2d1279d3b343a711b20a2067b631fbe7908a60b613f22a475e95bcb90c0ef1604b5
-DIST texlive-module-seetexk-2019.tar.xz 644 BLAKE2B 8cf432fd5eaf36fd87e686ba69765421b74012514b4615357cb01d8999a9fa3869c039fbf044e01e8dfaad4b145ef01d661930fcd65d75336d49227fcc6c8262 SHA512 b3dea76f239ec78da4eb15d4bea4dd1171c3193e9d9e82a1ecc5d5ed747e421a7a3dc96e422839772d2f825e862b8a71befbacb7cd816405d707f654c7e5a32c
-DIST texlive-module-seetexk.doc-2017.tar.xz 16780 BLAKE2B 4724e3475aadbc2bc2d1fa70a52ad7a4e57acf1f906852e8e35fd9102811acb3ad10ea14215af6a52bb02a0d1ce7c5bf7ababc6be8450b3311853e610afd0eda SHA512 8d0f79f6d4528d234c264752ce27944f70291d299f6d7e1a254537b0acf1a296894d8f961efb8ddea6130a1faea0e400f99456bf15464e5b08a26a652ec9df94
-DIST texlive-module-seetexk.doc-2019.tar.xz 68816 BLAKE2B e764173c0bfab5979bba3af955da85d03c8f3244f0a84748f46bae4388de8e63cfba0d337f6c8c60451ae66fa45f49d7b286f4f6f248513e3a967e879b942c2b SHA512 39504cee7a077e16d10b2d4d1f393b1b90e7c21c7452f761dde1117f4b8668962b1baeac4b834b71b481fd170059e4e60f2d529e523e40503d26704ff15a7dcf
-DIST texlive-module-srcredact-2017.tar.xz 4236 BLAKE2B 67eb56cdfb84688a69fb5f1bca4e5e5ab67687174736501b72f4d7caed65286fb6f291a216d4192413aae98d6e57cf4a17cf15cbc58c1490579525ec733d9e80 SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b
-DIST texlive-module-srcredact-2019.tar.xz 4240 BLAKE2B 553cde0085a142f679d327b1b3edd4a16a7a74a1d0b5871346964298ad796d9c3c3cfc5a01851f620e9748f47e0e23b7e18bbccfd9d5037d042618a4e0acc11a SHA512 9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d
-DIST texlive-module-srcredact.doc-2017.tar.xz 384372 BLAKE2B 74fcccb38f2a598f6ddd5139f3c903910b3cdbe555f062ee2d5a7043764bd3d56d917cc4ce0d6eb6dfbdc4fd707d30e69a8891f49f0c5b3af027be7c084cab40 SHA512 fbd5c700002f3d7c72bb127b24f13b4017a17b69eba9897e1a84d65fbb5123f36c56c06a8ab35fcdde7e4c13731cc5d92f2f3a92734bf9c4e77fb6af14622a16
-DIST texlive-module-srcredact.doc-2019.tar.xz 384380 BLAKE2B 8ddc8328384950b5feb4b59e29a4af4b69fed9d0072905dea0e2619a3a48490bd6c30e22cd38a16d7413f947339626a57aae11765e982b2ae9632b01ce93f602 SHA512 dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc
-DIST texlive-module-sty2dtx-2017.tar.xz 8672 BLAKE2B a0da05e670dc8b998bb1642a6fbe32940ac5cbc038aefd62db9ff37456691d5d329cf8aecd3f5fd2c0a17c9755d9c8090ea11725c7c0ba578daf19878f0c0f7c SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d
-DIST texlive-module-sty2dtx-2019.tar.xz 8676 BLAKE2B d3f185f31dfbcf3ac4019480546a7b67422a1650795f4b9beb619374cf69305bfd718dde52f4a55395932abb18f07bcfc3f3c98309e0b90b929d557ee64b2318 SHA512 05e17abf8322e70f275308e983a244e178883aa36571640d513962e813a2bfeb88264c0ae9ccab956f9bd016923d1727c14a7a26bb58b257c7d05600a540da1c
-DIST texlive-module-sty2dtx.doc-2017.tar.xz 151552 BLAKE2B 69e10ca9ba5aa92c5bbe575381e966d6c149b4ff391eedebb925be298535396991eb82943b5de681b9bea29b4830c8a9cf8d0719ad66ac3afb5813b9ba2c5eda SHA512 0323a7d039fdd1a3f623418c5294a5e1193da458b5a3d955c0a20551fe8928fa81461d76de1c9b0c1b5020156bc1e56a571439fcb83241e1f5ffeba741988b10
-DIST texlive-module-sty2dtx.doc-2019.tar.xz 151548 BLAKE2B 0e3b78110e1ba71fe8fc9828ffdf389ff9645e40e14555209b4f1e72a471275ef883d773b778865537e7dd2e50003f5be18abb17204bb9ffc7e69e5373837229 SHA512 1abba13831a0cd4b93f9665f242b96d32e764c39ccdb917f655922fe2a4b00385d6a78c77c151e212082eace3b9c9447705681416b5cb2eed9f794d7eb30c905
-DIST texlive-module-synctex-2017.tar.xz 244 BLAKE2B 86c14efc8163ad3f0240cc2680cb21fab85551f91d3f981e2dfafc1ac53c421172b16f9e2dc71af967e95e0317abee3b021165e6bc82f19d7311a95725eefa27 SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8
-DIST texlive-module-synctex-2019.tar.xz 464 BLAKE2B 991a1570f8dcc53e5b4a55eda741de55b846871e51fb588101aed6a5084e88f3fcacd2bc93111ed37f33fef411067765a03e59c65511e72f9e20e4c05639ce25 SHA512 9fb5f8c3729115a91a51efb3645f39809b07ef9eb842d2ded1d64cdfe558c0bfec6234827dd87b38c40bb167225a88c6ff09e3d7bd49b50db7561981105bd6a2
-DIST texlive-module-synctex.doc-2017.tar.xz 21220 BLAKE2B 59aaac4a0b21fe9407aa0b07de94f9ef64dc61aa19ed70b751485fe6c0a9e081cb1587faec7079836dd77feb2f562cc18a523b74d5d8d6fd65275ce073eee998 SHA512 1a2ae03662a4104f1b2923c9ddb5f63c3040f2f646128cf4987865ff72d367852580a15d01b179a14e9dce4efbab946ef78ee7766ca98d99021d0adc7cbc36be
-DIST texlive-module-synctex.doc-2019.tar.xz 41824 BLAKE2B 0d062f02aa107730caa701f42a25d0e628233765cd3a52523cdd8e2b596fae33a5e3703a9113113e001cc0fac6ce25418ea5ea3dcb0489edb0c3044ec8949a32 SHA512 3a61c57a78772d6f8441db824f489c7dbd5b547760b43dce500ba9ec07780a839d0c6db7f90921846985ce4400bccbec2435e6d4d8bc2952fe1dcbeb9a23c91f
-DIST texlive-module-tetex-2017.tar.xz 60072 BLAKE2B 0b46ea74e06218517620aa2a9b13485807f8e1032c30417e32ba712e3728505a2e4e1f1e0ff0e4d437082a1a7887cc96bdcc146b9dfc265a959704999497f3c3 SHA512 22eade74858326f76f6ea22f2eeedcabc313e2e59a36a1a079cfafe7c9351953fb8e381fe9097110336dbbbea9c123a437fbd5e4fb9d7efe395ebdfe0c7d453a
-DIST texlive-module-tetex-2019.tar.xz 71648 BLAKE2B c15666bdf9c178d6e99d9be29091aa7178c0ca094344b7f6fd1467b208715562c3c1dc482a89d24074afea62f0c7ef502d4476be238e0feda0d801a0492d630c SHA512 4c51b762a71c161923e98af99bc9c695bf9ba46bb6f8aef2da1da0aabb65db48836fadbc964f0bd5eb25fc51fbd1e48214eadf63b7b1175683b6bd03a389aae7
-DIST texlive-module-tetex.doc-2017.tar.xz 348764 BLAKE2B ce1f98e48be94453dfee368dd8a90f66bdb83b4595eb04155fd4bc965f1813aee62b5ad18151da7beb14a723761a76764c412e3ef8b9a9ed9cdaed2a996fadc2 SHA512 d0e83b87f9a844c9961bda9875f8812dd507e8edb9664fe0edb19a775f34cfdd3f096295f5d0c209ecd3c7ef4a11416601c61f0d4db4bef0297ee96d9ae430f2
-DIST texlive-module-tetex.doc-2019.tar.xz 525320 BLAKE2B 00ccb37eebaa3c3501292568c10d1144792e3dcd1391ec3b6456350b5f42d3ecc882a87d657fb115b234f761dd7664a75df807a1afd0e465f8d811f962f28283 SHA512 1b049d99c487f66cdf0b05a0371d7cfdeff99e6fef86fc33b20fc31af6c40fe2280a082ea7572a6463498e5bada30d6587134a3fc9026fe9f8a18dee45fbad65
-DIST texlive-module-tex4ebook-2017.tar.xz 13352 BLAKE2B 392661a4b57691baeddc5a1885222256712744d3346011aa33ffd3c948c744fe6895a6a396b76839f30f37a86007038bc57536c23bec33c1b52e757d5d4769fc SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42
-DIST texlive-module-tex4ebook-2019.tar.xz 15776 BLAKE2B 066aa3f462dd91623a4cfb2cfb66e7202bd6602321dd947e822848df969bddf081273edcf694b1f10a49fd6e0f177ff400638453172c4a108606ac721a132fc7 SHA512 946317be3532db3e60b1fcf2c027f616c00526da55562ab3b682c01306277059edaf14138902d1e21eab53cfb9bf293c636598cffddb9f1980b287b2fba081d9
-DIST texlive-module-tex4ebook.doc-2017.tar.xz 72536 BLAKE2B 3109ec747de67cb46ddf6b522e00537ec1239a3c28fb3992827ca0028b33539a25c734d15d1d8df7469256d8f765c5e6df8b64b61bf4f1cd58b00c83893489ac SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8
-DIST texlive-module-tex4ebook.doc-2019.tar.xz 81192 BLAKE2B deab1e660b58e71e2dfc9902198baead1049a1b81087908aa6dac658448ac6a521977b0b4c84089232c137527c54711e330739eaf20742874b250c8019fce925 SHA512 586d3ce7642a0f06e358e0cb3d3dc577396a638d7e7c9f333a118716bf4dee8c18991d1736ac7169ba32c22b9aa10b887a8ae77ae5a4f40c800f2f1aca958abd
-DIST texlive-module-texconfig-2017.tar.xz 12492 BLAKE2B 432779d8f44ce00e5a3551ac9271c510f1575770d99ab8b32d98afa9e36a78c77878ac63075f08a553bcfd94f34f9eb64c56b316e86bebbad03e53a7ea3fcd02 SHA512 5473622487ae5b5f6bd430bc3b75ee7c1fdd646f74442fbcb9d4a943f27e013a21bb05a35a724efe4dd330bca3572dc6024be031072aa2d9ab8c9d4e75ea065c
-DIST texlive-module-texconfig.doc-2017.tar.xz 28132 BLAKE2B 737d716a4be9e86e3805af4d92a94d25b2e9ebcfdcac797dd0bb0f20e4529e6a209afe9820d91406f0a7df76d1723e2e65f8a4e1e15aeb85cae39ef5ab99f5d2 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79
-DIST texlive-module-texcount-2017.tar.xz 33976 BLAKE2B e88e6c3b3173a00e0537642a3b3dbdf381455bbfd51958633502029f4d58e5605e530ebdf1c8772e3b755ba91c553b77addcd90edc8295662fb30ba07b4c1026 SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf
-DIST texlive-module-texcount-2019.tar.xz 35908 BLAKE2B 7c84cc1f4f07d9d9cc3aba2cc2526274b42484ba4fbfd0b4f985bb5d7ddbe8d259cec8f5033f029db2bb30abe15c8941eb2f19fe9b37c5b4679839ef8c19508d SHA512 82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f
-DIST texlive-module-texcount.doc-2017.tar.xz 554756 BLAKE2B fc8aeeedfdeb7a88dba8e23cde6ebfddac01f0ba379d90acd88ffabf6e069039aa88f6402c932eae63076f9d577e08fa0f32f8efe894bdce63f9ed743acb0e85 SHA512 f87c36f1d46552d258156d36764c6d96839576e30510257f72d24b4eddba1c624b12ff4405be3e39e1aa9d3f70c02e272a3affd513f2dc9ca3671568279ed6ca
-DIST texlive-module-texcount.doc-2019.tar.xz 559548 BLAKE2B 9c5acb7caaadd303532206e5ff2aec75be3dab53b6a1fdd1f726e7b2ae54819198b33033ee60d267d59b5a9b3f0efb66489cae55ff69c18ba7e1ddeb2597abfe SHA512 5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94
-DIST texlive-module-texdef-2017.tar.xz 9280 BLAKE2B 736d66b8bddf7315b6891d7b5e17473afe7390f9fc9bfaaea323fefca59e59af8a96f7724aa07e168c1a6fed077f7fcd2011c9fd5e8e9d170a78378a9765845c SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d
-DIST texlive-module-texdef-2019.tar.xz 9408 BLAKE2B 9383a0bebbd66a49babd66da47b4220d71c3afc799d00d523f2d40da287c82275ac3bb6fd53269791561f5c65186c92f228d0fb00b0e9ffc7e9a6dcc390933b2 SHA512 7c5defeb9cf9d5fbe92f8433265543e6d7024e9f7fdc768582ec51a5880745c54cf8576f1b7455e32d51429e2faf122c0775ead117be97510f4b2d8123b04d71
-DIST texlive-module-texdef.doc-2017.tar.xz 249876 BLAKE2B 5752e8cf7f2cc497748267a822c19972e5adc223b54e829e9431a1540ecf73c33e3e1f38d26b5e29ed0bd1c09c7af02e58c7c76f3689a5a270423fbff51e7a63 SHA512 9ad1743eb54c5d32dddda440294595f512b9eb64d45d4041ff2edb44a99cc689df17b5384bb5ef7150202a7d1f5c2cd08cfc81abcc2c1fea5e9098c7ef74877a
-DIST texlive-module-texdef.doc-2019.tar.xz 155444 BLAKE2B 00a24992c6a1bc2a607bb6f6b7348b0331d46b50594972d56f253a0a9f01ef1bf78d6b7bfa4cbda96a0498880ab2ea7c94bdc8e5a455889f91b73a2289639c6d SHA512 a4727d57bb5b56106a9baf4aabbabd16cc8a8ac08358c28263abe9c40b76a6d692d0e819c23c7b8e946e97fd3f7574a498a6f43207c04e7544a0383b3681f54e
-DIST texlive-module-texdef.source-2017.tar.xz 3888 BLAKE2B 1e724963bef41f950df0f86ff25015a5e43e80c84b2de6ea35df36505b075d8cbc90413dd634452edbe0cb0226c7b9507bb1fbc993d9a84f088e499d85c57486 SHA512 41c19aea1b9141542a6b5262decf3aea1d241c41d1aa0225eac028b564facead789c637e9d580b65ed68db7698dbe6d9fc7572b045259571b802860c7b455d68
-DIST texlive-module-texdef.source-2019.tar.xz 4764 BLAKE2B 01537ec90b734610e5e7bed83dd4ee6d07d53cd88bf68b23fac06738c4d919416e376a5361035e07d6027096c1c6efd5c301f4ac5714b467d63ea92ec5f116c2 SHA512 4b57478b06d4cd67ae6b8d2afb059eb52e03e31c4c4066108d471134865a64f3eb3dc99f8bc4330625eaa8e7c660f445365c6bbe510f36d5770b406df99d6c8c
-DIST texlive-module-texdiff-2017.tar.xz 7152 BLAKE2B f35399766adb4c0ec92d1642d3148a10c66d51e350f7e7b9c52117a78155b87dcf54d73d638d15c339839269360b13103ab06223684b08037a0600defe92b13c SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150
-DIST texlive-module-texdiff-2019.tar.xz 7172 BLAKE2B b68d85c65018983ca389a365efa425e1f30b015b376bc64449ad155b2a93ffbcadb1d005155c63f32404eb4b72de786896779a2deb922438f01a3692324b1c0c SHA512 26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a
-DIST texlive-module-texdiff.doc-2017.tar.xz 10300 BLAKE2B a6c11347315fb8035fd73720d0766a1c2843fe36487cb6837cc6adb9b939a50629bd72d596c105fe028a45ffc833ca43c499e581fdd6eee68241a5ff9b753f10 SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1
-DIST texlive-module-texdiff.doc-2019.tar.xz 10296 BLAKE2B e9bf5a7721ad75a86f406efe948df02c7db85a69317a0d12c601d491bf80c62a8fb5d944441d683a0e5125b7c74e7f48ff97298a7e1b5d34f484c19de39e4afe SHA512 d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948
-DIST texlive-module-texdirflatten-2017.tar.xz 3084 BLAKE2B 4f9c3aafc996be5990596850fceacd4b825f6422a3f94d092d342ea27c65294045860ed7e70e1df871128a63bea9f482c605a2c40f250837d50e558b25df044d SHA512 73404f73d3c7ee569ef019ed4ce621512b6cb2d6f6c85bafc362759b1e1bbc4f56048d17e98b481099d7a0c4348594ec5a514752ff8888c153f4239f3e6d2322
-DIST texlive-module-texdirflatten-2019.tar.xz 4848 BLAKE2B 0e98680a98837b46ca20066382215ce6c9ab396b0fd234331c369e6010f64fffc7750bd4830945df32ec59c348f2cfd5327d3e085e33aa501f999858464798bd SHA512 e4f03e9a434e1ab8ea1b69ca0ed2dffe1f8cdb2c853a733e275bee74ed4b17b84b72cd8cc7d1820f595e1c2282a38b9bfc7f7b7a9e003fdace6488390a1b97ba
-DIST texlive-module-texdirflatten.doc-2017.tar.xz 5608 BLAKE2B 13f2c288e526c827c4759ed26938b8203f204415c4e6bd8f0852b4b09e82caf8c370e4db4752ddbb99673734095ff304f3c0a0009a7fa61a29ff00c642c9ab38 SHA512 a3e00dff899ca3bb7033eb8c8608d44cc3319f73afe6fa0d00c25e330ee13827df9556857f75b9000b4716ad1ab9d8b648f20509cc3ea4b10d2991bd6b3f9ea7
-DIST texlive-module-texdirflatten.doc-2019.tar.xz 11016 BLAKE2B a5525f16389a978b0aecfef7de04d5cb302fafb894b5d681c3f0fb3fd9676055c0befee94326dec2b819d7b34d75233f4750e6ea047e2fb13edc0a346c343158 SHA512 972fc69b705b2f6289358199cedc91ec386da9212048f7f7a84e43eeadc943f7f42ade8d7faa9f58d1685d2bb10408e274b2461032927042371feb86b4ef6b43
-DIST texlive-module-texdoc-2017.tar.xz 214216 BLAKE2B 7dc8381f2617b5e03587604fb5cd5c162a35f03b3a28c521349c529e20fe87b2aa33167116c2bde1f0e5fb4437da7dbf79783a75a45561e7b200d75dfd76b892 SHA512 f20124d5e65956d568b96efa1c58214d6ff664477e9525610f07b48898d2a09d55c39276571a7d2954c09bb6732abf5a0067c430d4f0f3ff9355f2d57fab22cd
-DIST texlive-module-texdoc-2019.tar.xz 25736 BLAKE2B 316d26e8f25d0f1dec8e0cbc8fb1949e14a6b47777c2191e113e2fb81ae7786c0b90b6df08907e463821c72e5f008231fa980893d7b937e736edb42dcc0328ff SHA512 2c12bf48d03d456e95d6bc31ad6d46f77c0dfebde73fd8a87e2128c7267327377b8d8d7d9b04ecf7295eaad16eccf1df5bab6f9050df7113c62bfbbffc0d00be
-DIST texlive-module-texdoc.doc-2017.tar.xz 157676 BLAKE2B 5c11d2a3d6a8fae9d6d2c277582366e46601a22a499a447e27291a97246c5a27c6191e2f664f805c5fec118a7a546a3aaa32fe3ac7a6783aa19c8bd91486982b SHA512 52ac9f9406c18856aa1f1570fa52e7ba4dd29b84b10a9c877dd88561248d48b8aa954ac4260d07018e2873dd5a43cf3c02bca02a87db2470d72c6becb115fbe6
-DIST texlive-module-texdoc.doc-2019.tar.xz 124736 BLAKE2B 22ec7dd263b1c525d6119e6cf24505e4844011f3ad0853a743d5e35b25a71da1c29872df4eedf42c1fa16cd582af1cf59ebcdcf543b5d187ff0c49b23573f591 SHA512 133abc048e8cbfa84bd2788fe0942bc48d4d2844bec525c010a3590afa62b22ca77518ebbfd26e78c825152ec0eea0a8e1513d15931332656b8fec702b0b7479
-DIST texlive-module-texfot-2017.tar.xz 6148 BLAKE2B 4631014160a90292d30c1c22af88aed44d3260a4600cf0186676ff0ed8ef27cf67a10bbe674db23c71a37fad248838919ae914c9ce24408414c18ee688e756a9 SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc
-DIST texlive-module-texfot-2019.tar.xz 6204 BLAKE2B edfdd65ebe4b757eba7d79993cd3c850b12bad9fa918055142a114557f42e671b8e252edbc66f859d66d7e9a3cf3dc9156bc144e7087b7e2fbc6ee5a9b73d09b SHA512 19b496131b7d68e77e7370a28cf05ab5edd2540027a927750237be0956c8e0fe9773017db5501f1ed31e213b1978aa217973d22ded0315b59cea453f59519bfe
-DIST texlive-module-texfot.doc-2017.tar.xz 31680 BLAKE2B c93ab467401c57826e4a16878112b5239724036dc96146e24101cd6912b29d8a3d5063cdf85a53c9aa4c500c058ea8ddbeae52745e51386d3a44a01e6f92a92b SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786
-DIST texlive-module-texfot.doc-2019.tar.xz 19076 BLAKE2B 691590c51e6fea5f6c52cdf2d141d0678e2119e3e8389d6fcc1511eb3f648dce90e78b06f16a8d21b044f6d8442218fdc87421632d2b911aab2519ff5d945ddd SHA512 c0645e3061ec11cb0f27840391fd762eb18f407f173dc10da98190bcc33b2c64ecb7aac11fb7c79df7861273ce8710881bacfd976e635b3870f29a662a19caac
-DIST texlive-module-texlive.infra-2017.tar.xz 200472 BLAKE2B 4163baabb72bca39c34a77edf7a56ab6c93b1ed8a128ff71e4efb5309ea4465ae9fe427777e02b42ae685064fd32a7008864fe1a62656d25b5e6e9a12a358eea SHA512 13b73020baaf358a4812a10ac17fc22250fb9383ba1f1d535b7f25f2354e9f4fceb5cd6f479f38c8951d4894ff6315315fa058ef415ab11d4eea03601308ad53
-DIST texlive-module-texlive.infra-2019.tar.xz 220796 BLAKE2B 398d91a7e729c318fc4bb5a5f0100c9091bd878865f5423494170495702cd044a0e71b0fab84dfa467a572dbde00656e04990096edc8fdceabef8f965d6505e9 SHA512 4550aca83dffc9acd90a538671a13f82acfe3270b6f42ab3e3485ce67b45da539521ef075d3212f1dd8a637f2fef597388edb87a2cb1c57c763369b3acae6cba
-DIST texlive-module-texlive.infra.doc-2017.tar.xz 168904 BLAKE2B c78a14af1befd93c18055302d02f2cc51d36acb1e671319f37e5cf5d3bda7775af3dc1f6f3a7891c20d0d3458cb251c9bbd9f9dbe6b55f98111e0fac4ddb1abf SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710
-DIST texlive-module-texlive.infra.doc-2019.tar.xz 180540 BLAKE2B 5945f5b3a1889109e42288684268dc98798b774f88103557bf0fc40bf0712796a8b7a13985eeef5a68e4cf6ff9917d6c0111e57ecb913501b4305c83891c269d SHA512 be27926d824c4ddc48c0b70d03b3e129e9392cc32ed10972aab1ab3e8c16695947f648e6dcea9b6b0aaba11e34ff5c2ef60d6c955d6b3cf28fa4e9e6f84848c6
-DIST texlive-module-texliveonfly-2017.tar.xz 6148 BLAKE2B b96e747db7175367f8d7b21e834b102b4ea83310b26cd502dfff0e75e81bf2bcd14a504f598b56a82529fd3328ad6f87edd76d9cf366d3937f865f8cbf17143a SHA512 dd18460601a387dc43587a81e6e2f1b3282c84340a1c1e89644eb22718f4d911f9fe651707645237cf74b07d9b05b8c5cb54741698141e0f3cffd6d184289612
-DIST texlive-module-texliveonfly-2019.tar.xz 6148 BLAKE2B 5e5bcf0ec5f61718852b2e0d29dd0d868f733051fe9db1fe3b970aa8ebb88eff61fdaeeed454c9508067f26baccc89c854220ff26b5e7daf46f59943d1c340b7 SHA512 e02a1214775f209c0698e62fb7f0ae91c9ad14024c076dd6a5ca73fad4c92ebbf9bbb0f281869cb0c073538c66edae2af23245f1bd0e1f939c80841269625af6
-DIST texlive-module-texliveonfly.doc-2017.tar.xz 700 BLAKE2B c21187393153d4122ae169e79d8c22ced1e8e076e049cdca68f2f637eb67a6fdeb4cb59be1217c90509ee0b16566ba2c04f517f50f3f1e282d7ab1923a5e3a72 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce
-DIST texlive-module-texliveonfly.doc-2019.tar.xz 700 BLAKE2B 7c2f1f682e9b1780176cfed3f141b621234f402eac6fcfd0926dc54db243ac334880684842674a6b3dd42ba38305def0fdfa815c75f2b051635a90ab146ff7d6 SHA512 f89f82a59f726b226101275b1aeaec00b99ea1302ee5ff8c021e4696b4abad39d1a95b544a4bc45483440591e1266cfba4d5c3c3bbc769f193671a46aa7458b2
-DIST texlive-module-texloganalyser-2017.tar.xz 3844 BLAKE2B 965f18c9f1e885df90853cdbb552b75d24673b54d2eb260c22738e3600bfa47982dab68f9cfbb2ba974d75baf3a134b075f557c0fd91fa1cc3a9b3071da8056f SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93
-DIST texlive-module-texloganalyser-2019.tar.xz 3844 BLAKE2B 85c9ae09f242f54cee0d77910ff12a7e0005c2e1785eb923e978858307e5474de4853cdc330c328fc96ab46bdce3e05008146dc50a5e1e5ebd72e5dd7c584979 SHA512 cbc18031b9b9ecfb6088b82b99eb72ad70fce92e4b103230a06ffeda0a50871715405a0aad18a7495ba1b80f16913cbadc4b8d1a7d2ebaa77d5cbd00e1682c93
-DIST texlive-module-texloganalyser.doc-2017.tar.xz 512 BLAKE2B ba1e799f3e68af8b38a74bf1531704385ee23ead7fa83ac1d3514a19497265954a50e59dccafb99824e6a688f14ed5c4fb02e2a728df272e3a020c1db460e3aa SHA512 922b73d9948fb8a0c79d553d7ff96389172fc924ec03f400a9bdccaa288bb59163778b01cec5ac74df700bfafcaba3d961a22bfb9b025f47440ec4b718bd81e6
-DIST texlive-module-texloganalyser.doc-2019.tar.xz 512 BLAKE2B 5743ee9faafe9308ae7eb897cb8e4b94f0331ad14be4b3075728f77e2b22ceed0a9ff27928ffd8ef0af9b8ec16a7ccbcf16cc4ace4c0c6d13bc22d1bd633a846 SHA512 1cccf82314d9afc841044aabbb5f06933f6bbdfcdb46c22909ce18c2736d40c532944405232633f61893f0f56de24233d520edd64d4cc89baeca5c01ffd0f9ea
-DIST texlive-module-texosquery-2017.tar.xz 163988 BLAKE2B 2599645600750ef77ddb3811b7a2ac82ebedca438b9e488a17f281aa047f977ab0922e8a2b94590dc9cdf33cb4f298d15ab0300748efd2cdf479238f7fbd13b5 SHA512 3a34bbdf928908993cdbf0287680b0136ca3a43e4bf7ac245ac4c15cc2f55cfc9f0e80d4e8a443619d8ecea259d7541790ee1cfbcc8dc8094295b22c77dbb8b7
-DIST texlive-module-texosquery-2019.tar.xz 170196 BLAKE2B 6899cef3b0afffbb0d908a015ceff481b271a25e4497a7d767ce823a5eca49bad2616790c2301bd9b83f1371a8da0f9e703eb981ea4d0824db4f46ab6de03237 SHA512 bfe5cbc793a81a9ce3c98ddc94fd217c3b235614394d2f329db4f98ae29ded1757bba5d98997118a2c78cfdf6d774146a7ac6a716b2bce91c876b0387e1aeba2
-DIST texlive-module-texosquery.doc-2017.tar.xz 496380 BLAKE2B e3378dd5b925defd800530270c997154a927fb6ca07aef013c138d333eb88c83b4b9d06d2b0940afb7803d7b129059176fa5aef33b985ba9475fbd0611076a0f SHA512 b57a8c02deed662b5437cc1d739994f69542ed307ea5b37ea6d1f7dec45e441e6d05458e8cacd6837d76598f0a83f6c912152514e62791e82b403a27534cf7d3
-DIST texlive-module-texosquery.doc-2019.tar.xz 502508 BLAKE2B c2396bf194fb0cda0aa89171d0513e96e33839bbbef2004c54eb42c22f12a6d0895362437fd8b6c53d7192da0658a661a2a0b50c8982b7ccc73566dcd6118ff5 SHA512 2b7cf8dad61829b96a2f17f1063baabd21087ea2526c8d8a6408b4c2e63c8f44be3f318be6d1e198661efe683afbff7055c678e7229a13d3b01e200565caea9d
-DIST texlive-module-texosquery.source-2017.tar.xz 69084 BLAKE2B 653a547c1d0221c5744dbd205de5065b495ff6ebd172dd10092b8029bfbdde9d36486a26a3381d07800b8cfc0a1d6ef406f5c57a83aa4a59d166c3318a538f8d SHA512 d16795a95e298913d0bc5a3f41453a523278259b4c211890609635d7445d0a6eb0367d8c842a6e7df4a9ae9cf0b9ba2b9a804aa8b2ce5abd380c59958a60b27a
-DIST texlive-module-texosquery.source-2019.tar.xz 71160 BLAKE2B 827a60a866bb959468fb5699b764ec3cf5447da4110c4532024a8ff05c6ac04acc3300666bd75a6dd1c0d49fc58f6b44376bff950262cf2d3f538c0776806f18 SHA512 c834540e5448887bb0d80dac77770c7f89b8017743bbe4691e46aa5c95c3f59f2bdfde93e0dd72aa8dd94295b1dbcfdd374a8892d4c622c41df7c4a37a68a701
-DIST texlive-module-texware-2017.tar.xz 588 BLAKE2B d41d855b39779785b0ba8b9fa32ba271ac33e8c832077f6e40f773a289762d29557c2e7dbe5ce45c7a088d99132b245e654a28351147329b8e6774bbfd6c6e9b SHA512 b210ba9c3492631bb63fd230b5c719e604724a66064a4fdd1cafbaa6a66e3727aa7634d856bf3c10fd8d49155a62c447d261e0181a46ae7d067ef8ebf39f2a7c
-DIST texlive-module-texware-2019.tar.xz 668 BLAKE2B 6324a93d098bca2e6038f13cff1ff9dd302a6494a8ef0dd0b9594e249eab957a81336991df171cb804aee580c651a1d9257f4fda3f3b7d6a90f3baa8d49c9c63 SHA512 cc66e87d459fb04070b0c43c16f3412ea22e3cf8a2748efb8a87fb0417bf0b9caa32a38147a9dd068d7ad0d25e320dc78ac54d9004cf5adef337ed0a90e52923
-DIST texlive-module-texware.doc-2017.tar.xz 34412 BLAKE2B e0e92cfa8b2e6dfd50fe0a03f62271779c6f9528ec1666686aa2cd44627f83fbb86027f58d44a83055bf819ea9b20322eb9df7ec6f17b38d44d9cdba25b8ab44 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987
-DIST texlive-module-texware.doc-2019.tar.xz 34600 BLAKE2B b6949f864ff00cfdd8f620479ea38ef8eefd739dbaccb6e0e249cadd9bd6b2eb504947c29d78b0df0bc6f2e80829153db9d79cbdc69373b4ce6570b22ae30266 SHA512 a8ef6e6a062140ca6ab3311b7e57f452bbbb0eddebe36d02cd8122141320814508438d764a97d351febf9f65a5539b03774f611e9bfdcb5abdc5fa989fc5a848
-DIST texlive-module-tie-2017.tar.xz 504 BLAKE2B 7ff539b26566f25795a748e3bf76d0fec6611d2f37796c56ce4af587757be0f8ccad6d1ab797dfdeba42cd1894aab628d1052d57bdfe9a62f07b77856b0b1a2e SHA512 91d008e9f9734c4b0eefd7d016395cf095602e3efad281c01ee502790b40ce357673dac432bdc2869f917e7a71e007df871524e993cbcbb581390b85a8287b24
-DIST texlive-module-tie-2019.tar.xz 500 BLAKE2B 6d4c87a35b8bf59f2dbb9ac2437f91dbcf47c7396b4b150dad65229a9d08d86a04ea4c9ac6e8ffa45929040bfdfe7d31eb36c8e64d718a1571327ccf3944901e SHA512 970a855d2d025b3ac30a4e1631986568459bae84727b661ffc8e0982656bc66eb940b59e2b9c3ee6430e3abd5f7d8b0ce4ff828127bd2f9420e0139f1860527b
-DIST texlive-module-tie.doc-2017.tar.xz 14984 BLAKE2B a0b24055c843dd454900b82b821ed3a8114ff7e00d3e529105d0bf47b6d06d6f6c897445492b11bc5420b97cf8caf2f09254988c5ae98e238a901680b7571c50 SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8
-DIST texlive-module-tie.doc-2019.tar.xz 14936 BLAKE2B c300333466ab30ca31413cb23b473e4162f0aed966255522357c04864575f919856637d56abf4760a45b49bb7e56299a59ad8fd6016d88869ac694bbc6e0d4d2 SHA512 24f07d9954fe0385abec8487d4c488df551453e13e8f638e32899722d62dc91b23df9d4494f9bc13662d57fed6e8dfd4d71835ef79832b59f075f9023797e858
-DIST texlive-module-tpic2pdftex-2017.tar.xz 440 BLAKE2B dbe8d3012f351853db1c2019b650f5c1c2d24d4ed9f39e3b891062f8946ecd42315069e833c4500e06b8213c8f5c40a7b58f6edc5e86180f360bd226de74d55b SHA512 ff542fc31ae85d199a72d5f6913c482ee9441b31d95a109a6a9a3dcfeae41aef85e80911b9e755f11cc700765f9b40527406bc36991a2280c4b09ec63d0e9bc5
-DIST texlive-module-tpic2pdftex-2019.tar.xz 440 BLAKE2B a64a6f371b7331b4f963c039c9b42bc8e396bc5bf56931e76bf8b7b73a7a11a67c1defc7e9dcedf23556b65fe7d86b6c437ebb2a4fdace0ddcda6b2a2ced6f67 SHA512 3a0bfba17911731b52960646914da0050a6928b2b433c84140ccbe63835d816f018cea4b16a8513b447c7490fcfd610cbf7a48c8cb0d5dc67ee925c238361b14
-DIST texlive-module-tpic2pdftex.doc-2017.tar.xz 41848 BLAKE2B 2e0cb6a73fdadfbe2cf85c8f241e650905ca1e94520ade6482bbb8e0362c07fa41295e0557b92df4d8b529eccc326f930ee079a47683565ddd9cd6688773d053 SHA512 e08e33a9c04f32bf4dd5d1f3f9be95cd36cec5998c8dc1dba2799ee9ca9ac1e9326550ecc53500c98506c03cea4fb08a766eea88ba85482ed2bd6dc03b306708
-DIST texlive-module-tpic2pdftex.doc-2019.tar.xz 54396 BLAKE2B ea93ec21f96ab67ad58b3baef1f18f1133230805adbb3335d489dbd901ff5eec06ff61911c685764f05291e2a15a029c6e047e4c108306731956539c906e16ea SHA512 b2734d86215332e7898e611ee12880c559b095468881c9ec1f15696a182afaa2f056c46ebdcf4cd69427e9716ed70b1cf50f72384d9f698e644e8b2fe9d3a1a6
-DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f491876917686e83572b57f043000825d0600f3f3329926243e88151ec087c7384e366c244960d96705939eb6afce60f3ff5a56c13d5158 SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb
-DIST texlive-module-typeoutfileinfo-2019.tar.xz 1628 BLAKE2B f934ffec09993f9ccc2958330442c594f45710de2d1f7565f978ab5bed2069a67b06ed289840f190935e16fe25c49b849d4cb12261a429cb6747c175bef59970 SHA512 b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd
-DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
-DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba6815997b46ec9adf1eed4f765a583de7fc5925349ebef150f633d34325ce7831e89fdffdf0c3f64147b0da5b883d9000c6555ea04e16880645abc3 SHA512 143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920
-DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
-DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
-DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
-DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
-DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
+DIST autosp.doc.r58211.tar.xz 282136 BLAKE2B 2e82f41d20f8883cf277527e6e0fdcb9b402520109d94bf76668ad603d15e192970c576fffa17bde092d8f2a6d92db021fbd408e3df2e282bbad738edfed7136 SHA512 2905669b9e2b61749cb7b1eaa02be889c4e8d8adbd78b126e7ee6d894f24f623c888a24abac1d163f3332c5cfa9cd1f64d0de95200350b88a7f47faeacb841a6
+DIST autosp.r58211.tar.xz 696 BLAKE2B 4a533789fc9572e48da68d7fb284df4461e42a717edd0f4578ab83c7e58841bbc1d3c2821e41840a531077ec887203752f5c40f51849129aed8e6f8971c728cf SHA512 67587e8b456257be9b924a5bb8c8f4def22fa9aa9678663975ef74e346dc186ae7848a9dc043733cf1244f254750ef4f34204575f62195d4b966ed8336781bce
+DIST axodraw2.doc.r58155.tar.xz 489832 BLAKE2B d0678cc4eff41ff235dcc8465cc62ad9fb9c52a7eb24487f9ca1766197c0c29111bb11931ca4fba537b8540e242257734c81c15e65ee3713028c78d1edb2385f SHA512 927e42358d543f46ccabb8184e35b6f0a5848783ce9eea09e6c780fc83955d5f37b998254153b1954cf1a59be6cfe573a6c79c2c328ab2a22a6e5f6764a50fa1
+DIST axodraw2.r58155.tar.xz 25592 BLAKE2B aa1cebf422d8eb6257d8baf743b24bddc4b666f968e4f89c77463f9c979412a0e59f3d3a1a1728f1a5f782e4725d85f1d320ae1e8932174526ea1176ab7f9138 SHA512 bc9923a9614ef9d7bece20e682729347dc942470a927b40736d6868f02867408b5fba51b117edd8745f96df23b9c1e93792d321291db13b7fdfdae0ee32bb7fd
+DIST axodraw2.source.r58155.tar.xz 34604 BLAKE2B 44f52a481e6f1610a698fd498689be272450548129ad3d28abbd20773d8d2cd901ffa57391695f7fa19e5ae22948eb2fb77bc17cf107b241439d82d3e21067b5 SHA512 3c2fbbff234836ffe40edb7f38c77c5986cca7fc68b3dd7672bb4f1ce9327a12fa8c51d38461d914cd6466bac8b2b578a151d09d4e84dd903530f7a545d707d9
+DIST chktex.doc.r64797.tar.xz 425796 BLAKE2B 4a0d4456231003362c41ec5360b21721bd5ac28489e8105ef749029d20482b69d49b9674055744fd3cda45fda824e0665b6fa54b6289945d4044211bfe592eb5 SHA512 28df4bed075d66d9f25bcbe332731f1d5f0bb0f7f92bd2f3618c84adf788d0f429bd0c6e75381ebf7bbeac98409d94f85d17ebd752f9e4af707d9e3373d45f97
+DIST chktex.r64797.tar.xz 9920 BLAKE2B cb6c37daae77ed5d4fc50e00249a92cc614ff0086e006e471d1ac4fb5dfacb76856d619248eba15923b34d422884923b4fec6c693133f4d8e2aad52693920902 SHA512 7c28847e87e788d0f50c07c1c3140962a70173d2a36997720f3066755740744060ecd03272662aff563de39102052e91a4582a4bb63e35f918ad8f517dff55e6
+DIST detex.doc.r66186.tar.xz 21900 BLAKE2B 84b515297cf285e37d6de400e0f1e201afc60cca9aab68678adf31a5aaa2e03e68e9d8e13a6b41afa177c4d3e01fbbbefc9900fb6a5120eaa802429abcaf4710 SHA512 3d5a3b371e007bda61441460479a208062fd0d477d1fc9ab9a6764c1969fd383acec9e336e8d0b16aab5606444f5d87335320e010657cf088e9caeb18d6dddf5
+DIST detex.r66186.tar.xz 592 BLAKE2B 48daa6b86bab76f7c58cbb159838d03e7a82990bb1cf3ba382169d9b33b42585c11d7822fcc01d33f58ba8e62dc28a6eb8092ff595f6b07d9716a8311b70685f SHA512 e258d80d1509831132c4f70df81b8e93cfc9d92ee74c5d39e7f35bd4f71a3eb93fe3594afbd5ab0e33cf0b6f45c816506e32ca8f41427f3c3fe661f3086100d1
+DIST dvi2tty.doc.r66186.tar.xz 37148 BLAKE2B 67491285e41c035d2f6d0c69bcae2b98614db421462a3171cc68592ee78345b9651d09efd344268d2130c2fb33c4f3cf777656a984b45d796c9ababa17ee74d3 SHA512 3ee736f5fbf91472008a5c8613c0e629a9f76f61fee4c4491b67045ddaad7aa2f89a22937b172e058b072ae1a013478fdf5a9f68dd2e225e8a8e77c8e3b3a289
+DIST dvi2tty.r66186.tar.xz 480 BLAKE2B 3cfea2173611e643b27bc6828dca68e6fae60a147b347c589ec176974db03c36bb1c97a734cd5010a8979dca9a3b515255dedeb2a0d82513ce2667bffcf698f3 SHA512 1051c3448703fdd6395d78b0d8b7658197da6114fb7455b31502bad5c2eda24fd4eba2ceaba1f65d106f981bbc60caf9f3bd0db29403e898b293514d086bf91d
+DIST dvidvi.doc.r65952.tar.xz 19328 BLAKE2B 7b443d8c60106025209ca693cc810afefdf4c3b389478c32caa70ae1d1d25720a42b687fc27753009dbd07520f8276beecb90877e5f84d2d4ec32aa42283e1f5 SHA512 b571021445b822e9824782ab35a0743ca23f69b809354dea6676c58209a451be5bf595641fbcb461211e6dec15e765bbfaf8164c0ce1ed4204ea72a2073ecb92
+DIST dvidvi.r65952.tar.xz 440 BLAKE2B 2c5e584b38c74ba3e929671b87ab0f9d9b783feab2ab91ef6e62e4aa38548615284ec98686e0d00fdc91549c04e5a2d6bd197e18f4138a0c00d52d3ddec450ac SHA512 81c58f4e1352a8e5133de1ad86b6b37c47f9b0d29307354001693ebc4975c30808e349c73a477283a16df4219fd5702b733ecb5abe2043aff1d1b537b7fa6a3c
+DIST dviljk.doc.r66186.tar.xz 74932 BLAKE2B bbc6fb3ef83ab413582847ada4f562c8d1921b78f45619b7e18867fb9cf94723c699b9d83252e8f8796b5693371770af8b0316818c09bb7632588832ff195a9d SHA512 4b5815d766a41eb74125269e297eb6f7d1626d68b3f2cf9d6c4f8734721e3c71b63e84e729c39fef41320e4f728888796e421bb5c7ea5ffe76cd549400d18d37
+DIST dviljk.r66186.tar.xz 508 BLAKE2B 2c5dab57224abbdd47a77312e1c83da9c9aaa47213925782beb014d7a4963f12169676114fcbf61fdc15fc8daa5ad6d2dc983fc105186bc70804c1f7d84039af SHA512 0d34e837c0f67ac43dd8ef5bfb9a11d2821188ef8259f41b0cf9454bfa6641f956c21d63fe15fbd68dd59f89c1da820cab4ec5c4579fc0255a771c47010821cc
+DIST dvipdfmx.doc.r69127.tar.xz 3125132 BLAKE2B b29cc6a2f1934fdeab678a5246154b1bef498dad8bcc47dcfc5e3a3bd2580ecbbf887aec527095e1542f763919e650d96592c391adb35668e9802491f6c33a32 SHA512 d2fb71e116470d2d629613401f448ad9aa8cfdfa9ada68ed324061e4ac614efc4fd2c4ea2542c8fae32f476b92aafbabe4a5be648f28f16708c43958d7aa99fd
+DIST dvipdfmx.r69127.tar.xz 26704 BLAKE2B 7d2790d9aa6b994ab3619bd96ea6880e9243105001224d7bbadd130b03c7b8335fe751bdcbb90ef5ad92d60d3a80e63f0f152d50725a80cf1c78e45ab5c9245d SHA512 75703f600365c90379c5d009e00d35d2e514a76b2556c96c84fc2a717287441af419a26fc9ef087d111f2e77c7180f6371ca2ec33b66052ab63ca3d11f48e788
+DIST dvipos.doc.r66186.tar.xz 28764 BLAKE2B 7bc90b21109d52375ffdfef601722d0d3bb36932556f8f29ae62cd4f62c2171da2cf08f9bec72f368711dea071cd15b09f3d3661a91013a086c3a6621abc8794 SHA512 254a1db41636608a133e7807a8d4ea8ddd99ac646f35b66a43205ac7fdaf4a15c21eafbb85e23a182506e509895776d1fcbe63b3b8a7f197d577c6405ece5c44
+DIST dvipos.r66186.tar.xz 296 BLAKE2B 1560c5a795df9c095c8115e7f0296ffa3206dd2630a8cf2df9dd76aa2ae1c6b5f044d327c44d026bd94bf80d6bab12cf7da04ef5b7ccb3291762a495d8a4764c SHA512 9e949fb402facda9c30fa2f388b80f2cfc530670b33cbd78559e4449fa6004c5d4082e4fb895ea397a334a333e5d5ae1a4f66fde3885f0a9eb28c9d9ebbecd0a
+DIST gentoo-tex-patches-3.tar.bz2 3860 BLAKE2B 048d1fb59909f0f319f7a77ca424dd48d1f879d7c97be5c683e6c76142d1a878705adfd3cd734e401bbf2cf319c7e539540781bd9ab0fc937b2c93e129e3ceac SHA512 6976ddf60b6b61fb04c04ddae1fcc98372047b7186a34cd531f0a5011b69310b598db89f216265d91e9a465fd4a4e7410920ae1373b378495beeeb537c73a17a
+DIST gsftopk.doc.r52851.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805
+DIST gsftopk.r52851.tar.xz 3548 BLAKE2B 65e455587ba7b014be3f7668225fd0f5b4816406896209929001cab5b61dd6b748120970dca79207117b6a5b07ff7c00f96aab6e540397405d075425f8a79a2b SHA512 cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413
+DIST hyphen-base.r68321.tar.xz 22604 BLAKE2B b11b688304c3622c71ddbb38e9095e550871360418d176ab717bdc59954c0648636e5627f55180980e789efed918dfdbab55c25b1b95c8ab0467398b1b2592c4 SHA512 d3f2749cc6946702ff0d51c1d823531bc92b77c1106aec252c84cc8649aa56048556c90e9792f1b0749bba0b86b7c34aa2b04fe2946d1226315dbc73add36913
+DIST lacheck.doc.r66186.tar.xz 21012 BLAKE2B 3a7fa847b83a105c8a6c0d8210f0bc344642e8503700b32b58a43b66a2a97dfaf4ef08af1005588ef16e688af3c00202a3a5142074cd7f767956900a7182f8e4 SHA512 cf4355d56985f9335270e4280d10602299fadfd01605e83edb4e8b89cf0d91b3e8ca671257a9599d5f5578e7a85140d390edd40c3b109f77bb9fca5ba47ca517
+DIST lacheck.r66186.tar.xz 436 BLAKE2B bd36c4f98235e682a3b40fec649b0eb1e800ad268a69ddf42daa32dd72f670809b15c50b98e717b98b25eef844ea0a0b1a5c962d62fe254d30f2fb7e499e5f49 SHA512 5a27d940fe59c61539d053bc6602bf37df1f538679eaf34d0e8b3ec3aed74ff619e4843ae2769aeafd10074328e9e27255376bc9e809d373d3913995a2a95b87
+DIST m-tx.doc.r64182.tar.xz 739512 BLAKE2B b4c79ffe3272e00caa4b256b118f43752adecc49f726722dc18276ca0092920908859a150915178c3bad460fd172762c1d016c55e886475582b3ac2c99200741 SHA512 316fbc2b37b903cae8da6bb9f44b8afad0e3e577c6fd84664e1724ffe318bbdbf9609dcadd5cde6a14cc5acbc134f69bd7a87dd90d9da7d4442a5f913b8132f5
+DIST m-tx.r64182.tar.xz 4524 BLAKE2B 79addf613831e0c1db995c627dc0557245cefc980e3e058db130db52179bd3bde7bddf23f29c60f062a6313ef51e269e8937e6195813982139ef279d9168d138 SHA512 b56bc4432bcd340f3e92f5043c38bde7f14b5f2d32b9433fa21c73c20f7ebb981714175aa6f4f871636efb62a52cd24aa639e87a320039313b16db1b027ee2f5
+DIST makeindex.doc.r62517.tar.xz 466380 BLAKE2B a192f04417e76a387c9dec21705704911e016e54911d0dc83d7ee511f86f74edd615378aa1e0cf3cc2c10a6cb56244b6c2ccf40e3ae09b17ceb4e0c01d76d39e SHA512 40b9ee1ebf7dba9a4bb4bb3077cdb1e88b07f276a9d0ae9c2817bd76a2f742ec9237d1b6d9658694fc5fc4e8f82591194862637bd83ea8e106c0541591d343ee
+DIST makeindex.r62517.tar.xz 4608 BLAKE2B d86957d1598cdd16025d43cca88547893824ef9bce3f75190874de40949ec0995db039b42d38b4514fd256feb6f3dd4352357de84c0d9a087aa48d0f7d17ca29 SHA512 5967ba4123fd4c708ce841d29211fdb66c28518f4b418903be0ddf2a49964f706af96b250eec814c547e0703460c1273ce72a7acf3ea9fe28cc1c7073af29d3c
+DIST pmx.doc.r65926.tar.xz 636768 BLAKE2B 5b499d950581b5b6ca1e27aa54dbe1e324d4462999f9a8f52c314c9a4827183079dbc0d945542d304621ad94aca3f7f4cfdcb985e40c7be00c7fdff8fb95825a SHA512 dedba4570b68a8628442716dc3a9b1699e5f531aef2737e4b3f47862a91ba69bda91d6fe6692914d2bd7b8fe3188a83fdfce8bdd219ab7c4f238a9c6ec273ffb
+DIST pmx.r65926.tar.xz 10184 BLAKE2B 550140955d4033c258c7793c56846d8a0d235fcb2def0469f9b0ca5189eea4c3ba569fc3e7002bafe57f0bb7fbb9738debd7b1d867cfaf32493b3558f0a3ed97 SHA512 433287732fbb2cb47886c6c78c923d5b6a1b5c1e71e3990084cde9bb288a282fff7fb9134a5165e0fc0908b8e60547e23cb900bc82b99717133d7600fa17dc31
+DIST texdoctk.doc.r62186.tar.xz 30728 BLAKE2B 4878654c60e2fb3a1415f492894a3d956d86cdd6f8ebc337e4ec928a55ccd2b8c202a3c06b3c8687530a505f45e740eb33005e2cd4c2f65aa68ec77e3990ed31 SHA512 fb403dc17ad839ea64bcf6da84e59288a8745b5eb731051d7df8593138aa5d3b6891d56f52bdbe5c9a41e590f1f36db390e7e7a825d9aaf00d4fbc01c8dc16ba
+DIST texdoctk.r62186.tar.xz 26712 BLAKE2B 4076b8b227dc08762cd7880165fd4b1780f3ed34e0ba68b1b04ce542efd47aefc3f893d71da7dbc8122ebb45107480974da0631f16f849d2990a14cd2db74ce6 SHA512 f3300a088f5ecedfe66ca277f793d3565b5b0f111721a0d73a788d65b72f09d0103a11edda13679fb9e919f11ce9ed3662717c18e46be99a83b744a1f7ec88fe
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
+DIST texlive-core-2021-CVE-2023-32700.patch.xz 8824 BLAKE2B 5df988abb12626210b372618cc0a623ed2f6f42cf2f03dca143f94b928fc0fd2e28e53574c9ca23295f55fb56cd908a3e8603161fa3f13c37b9397163479aa9f SHA512 16d34b5b0cc1b85ec412798caa582f71b15c2d57bb486064c5fb48304eea32a13f69677c228c82c88e026ba5885acd201449ec69bc6c7bf9396eebb3d1358717
+DIST texlive-core-patches-2021-1.tar.xz 4820 BLAKE2B 1316cdc65c8f0a7164169fc6a795c50f7fccc99cea7a80290c18189f931b002e47b081de593c47d8da9650498a279f7d0473f115f02b37993859fcd475dbebed SHA512 4267934427265995c2a0c00d837399ec9670ba5c7df5c4599a486a2098de9a05640ff77f29bd7390070f3c973e5cc067356cfdd6b2c9415b7a56b96de789fb82
+DIST texlive-scripts-extra.doc.r62517.tar.xz 197196 BLAKE2B 80d2fd7b53ffbe21f975156cf0d5f52826faebc422d3e66c342c8237d7da27ba58b1ffc56f83a040ae4b4e870c8063c0d53392f9cc7e3bb3da30ebe5a258a40a SHA512 22cf59bf4dafc7ad9425086bc0aaedb2bf5f7d8aa6ea9c65abde2d523be37665b9c9bee4acb399857eae03613e7241ca1d6099f43cab77a95c10eced8813ad80
+DIST texlive-scripts-extra.r62517.tar.xz 23540 BLAKE2B 85762b7a74f5132ec550033e08caef5f6fd145ef367475a1b3ebaccfefdcfb426f2e12e647e45a35daa2a44cf0c2fba8d6ed8afec88ed6fccee0cf7eb52c2c50 SHA512 46ac37826d3c60de6c9260bf83d6275d49a35cbde88fb03481a050f92e87b698e9a94b2e520a74edc0417419f5a2dee53000a529b9c81ea6f6244a83480e56e7
+DIST texlive-scripts.doc.r69754.tar.xz 432212 BLAKE2B a1597fea1443974012eac8b0b060c770e5421ee08b8a8aea8c32c94abf153ae22cac29015e074ffd164e0c5c355034c0fefb673fa917ccf98afebb511492ccc5 SHA512 0a319e6864787c0b62a7f0fb389497a94449c6b420573805a1ba49fb11d0453f5727d2f44a935468cb6c7945d177a5ca828ef4209f717aeb5b21d2b523f21b82
+DIST texlive-scripts.r69754.tar.xz 114048 BLAKE2B cf5151516f46405c0ade2bedf033f58751f5ea2d3e54aaa1227ddf761c86ef3110621ed8bca4647503aa24d628cd77d7ceac927427dcdcb1bf98ce2d98039647 SHA512 18bbec6acc0a6b1686daaef95627acd27975f37c3908584f3fadb2a35c8f632c62b6ad4aa214bb894af2e07b984f7950178924ad4d295b1339fcefdf2c19fa55
+DIST texlive-tlpdb-2021.tar.xz 1335040 BLAKE2B a5608b329666ad55032fb9dbf7fc6da9b8b2c94c03aed838cf8575742a23294f3319ad8e45fd6b4f65cc59f673c78b9d96b4f24e2ad07a8a08aa313822eea137 SHA512 ca9d5f2231246984ec489b4dfffb93c8b9540b8479a521aa91658fba3ce452c814e9e24e28d9ab6a0124d8eaf4cf7c14fefb379e84b3495752a9a2b8a2add3db
+DIST texlive.infra.doc.r69740.tar.xz 203936 BLAKE2B d7628b83989ca3def86fa86ef4056e3ab8dd5e262d45b39d550ab7940c4a387b77156ae14a4dd64ed8fa6610a84559f85236908a83be05a1dae3949ef0a22325 SHA512 fb06ad12bea2d062dd5e2049e74e096064198242f010cd6e04e2d4a92a7fc39ae829003c7ed3f8347f96c99c31e26ec44073b45ed3ebbe9e18fc78e801d00c94
+DIST texlive.infra.r69740.tar.xz 361928 BLAKE2B 233fd046a446c9de00b167aac93ea4a2499b1e23c24eae5f2dd72e2340650d34580fa07640ab3b423fcf91809b247289e91322db72b365681cadbf045ee1d4f5 SHA512 d3ef23150149d240d8b74f5b9f6126de90f44960238deefa94415310586790d5324f9fd83478fa4d726ef6dff516f5382222f56933599b384101521a66d0a248
+DIST tl-a2ping-2021.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
+DIST tl-a2ping.doc-2021.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb
+DIST tl-adhocfilelist-2021.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
+DIST tl-adhocfilelist.doc-2021.tar.xz 9876 BLAKE2B 6f0a079b7aa05335f4cde30cc93bdc0781f6fa9fee39e7e7cb0cee7e66fb27dcd73b64afc51e02b66bd2ae6caed641eec402ee7350505daecec05b4a4dc684c5 SHA512 14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e
+DIST tl-adhocfilelist.source-2021.tar.xz 16408 BLAKE2B cb3c8401e40f4b2d922be8ae6fb5381894df8b1a0634f8aaf21d2d4dcc861de0818904ff0342ce9684d1ac956afcc71b6d9e1c1bfcd0523b405444359e8de063 SHA512 15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d
+DIST tl-arara-2021.tar.xz 14338300 BLAKE2B bcc9e7e36672e1f949842a006fb571159daf6278ff58e2e6b62314b3a489cdb4bf3b23024879034b48402d75b7b58e59c4b16851448683849de688552823de72 SHA512 f30f3a4fec925275d6256f6d2c47581d879924d297baf99224b2fecfd1e54b693379d9d68283062a426fdee0a30a4d93ecf2f1431d3fadff01261cb7d385e6a5
+DIST tl-arara.doc-2021.tar.xz 1722400 BLAKE2B 1177c7bf2dd94b0a8f5ce004e7b58f7bd57a111f5e35576f398b24ac9b7692ce22e59bf6aa24079a80b5333e1d67d972b878ddf5b69e89b84c8e7bbb9c32f741 SHA512 60e85e9f0ace415de61fffcc537157a62435ee032dd8ebdb0eba19217c0722addd692075e2616ff665f9f350d0fe3466616aac3064673e14f3991d9df5011367
+DIST tl-arara.source-2021.tar.xz 102984 BLAKE2B d9c17bf2dae1544bd0092f69a12dc55acf9c765b2e61086e3a6c398ad17c5756efcba9ad323e9fcdae8db06724db35871db6d52d95ade9adac124b08be4b83b9 SHA512 1f673c141eecbd542c5156911e3b1a0a474070edef82598d9413fea66e39396ced6f4d7c01f7deaf244ff721ad8a62f5229185667feb42417084646d8aec6fa2
+DIST tl-asymptote-2021.tar.xz 359668 BLAKE2B 6a5c1de0d850baffd580f6e0ba210fc60f14cb470f1d672442545dd41eff931fc660d9e086c01c9ad1eb6edbf2bce7210ffef9e3875e191f85ca99b1f0f97f59 SHA512 324739a8f85243c55a284e87cdf81b9e27c70ef38b7cc0e836357251232c610afcafeaf4a635db9e7df20666650018cbec1b9e6a7084d61348e25ce47e9824e8
+DIST tl-asymptote.doc-2021.tar.xz 2386944 BLAKE2B 2934699a28307125faba255eea713931252da0deb71f62b6dbb090bfc15e402a45ede09df235cb26d2ab621e2e5d10a3d90bfc4ebe5344bd07dc806823a13061 SHA512 fa71033d9e4c19e06180f1b1e6825c48672a9b17294c6d8d7228d7c0fdb09dc790d57ebc488138047cb57a66b89400fb1a31a4b515c6312b9cf052e93cdfe9c3
+DIST tl-bundledoc-2021.tar.xz 12784 BLAKE2B 6b4d04821568f482cc6b05e0924f1a7833dbfac018e2f3b1402e2e1dc96b41c5cf024ae3615c652ba8095c525ef8cc2cb31f2cf50db0117ba237eaf178fec40d SHA512 07aa1f9dd3cf8bb16fad2a39783a5bd05168e0956840853b6f9a16de753726b0393b8863c6cad985b8bcf7431570137d6fac82588524efc5d7c0032e2dd555c8
+DIST tl-bundledoc.doc-2021.tar.xz 79028 BLAKE2B 39d872c6e19866c1e075c12bbd2a77065278d6fe0a71526906601183302b872031ee993a44b6a9f70a391ff455122b06920fbb5cf42a6462ce7ea871476be81e SHA512 bbd78c948c90f6b4470c792c9e0b99fb5bd8ae73b7eb78343739909c13ed0e0d763dd0b6a4b8d05a77280054afe15f2979c985121916fb8a34dff231b810106b
+DIST tl-checklistings-2021.tar.xz 6496 BLAKE2B 7ea3bd63da0c718dcc1406507c1c800a62f09ab2c0dee1d043ea73573c0a4e645a01ffb2d2ca2008c230bd14c1ae858638d050d4a24b831b898a98bdd4bdda00 SHA512 599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544
+DIST tl-checklistings.doc-2021.tar.xz 364456 BLAKE2B f742b41e3b18c1248fb9a8f4cda9a1ff5fff26b4c6eeccd0dc658a95ee690f0dfef9d8384265f0bd6ee5d42d38e3a2d45f3e74536bbda364b4150b494515052e SHA512 3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01
+DIST tl-checklistings.source-2021.tar.xz 10948 BLAKE2B 08881ceb308803c8e2a6476d72e4446e63ceb714db4893c6fdeb773c46f8ffa39b4cd4a2642e3d90e88c0adc145e421007d5e0614a862cd4ede6af224f0db4d4 SHA512 a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d
+DIST tl-chklref-2021.tar.xz 5084 BLAKE2B 9a40d8fef12b938e6b18c8b8b8eef285364bfedbd4fd75f36533e17e0bc56831c461a625f1b7c3993e11b20d78e4e4a546bff566a671566c95a5898a92c864e4 SHA512 12f5e950ae439d0efd3f625572e8b81d993485a1efd71dc04c078cb1dc9b76650de3c424d7a6c60ebc5ccb5d29f37ed04c477ea1306acf4c5f4fccbd95e18985
+DIST tl-chklref.doc-2021.tar.xz 320916 BLAKE2B 7477fb601375093ab78771ea406badda580be1599d16b370fd37466867f8bff9d24dd26ec030a86a2f8030753e25ad00942a8722f87f606d8a08382e5f7fb765 SHA512 5aeb13824c1781feefe94215f3efce15c212e0d38f9e0d5fb393e96c2159ba43f165c600cd64ee9d8c42c0a4f0db6c2e462ee85a93993965bad0420b6b662ef6
+DIST tl-clojure-pamphlet-2021.tar.xz 3660 BLAKE2B 9c80bc3722d92fa68a56a44481935ca7c61f43849d9d5d072efa58679f6e9d26ee77a77d67783af064c3ac44d35289496f8e886ec083d3d6e970402c29f6a46b SHA512 a420e5548af550ef91103a82c5bf8e43345abfce69bb438d488ed9a3a62db1e6763ea1c17b246ef307cc62d28b5c575b5da07d5857241e21ce7d789e9a2a055d
+DIST tl-clojure-pamphlet.doc-2021.tar.xz 193228 BLAKE2B c94cd5420df5ab4d43058f89486cdba0f7c3658c82f81fbd01cdcb53a44e03c0e342aa748f55cd341e403bf84e023cb256bf4b41187e47c66829a1b7a949aa63 SHA512 23f6cd97dc5d521689555ec95a695db0f9cae8873d28e2bac2969f07e9e8d2f7ca9a6c8105ca127da202d811717b3c1f4219fe15f9af01036800a083f065cd09
+DIST tl-clojure-pamphlet.source-2021.tar.xz 4976 BLAKE2B 1e7a57fd0e9a704a0834a65e5285bcaa77e78e14b27ce5df3d844e6136ef8600414f0a6817f1583521105214f2ecfb7a5c0424634bdd49aa0bb92c7746ec8851 SHA512 32f90dabd0e73206930f589a97e8630c25ce2f95f1657d08ce71cd36241bafd6c2a79c483805f7574ccab29deb478d1ef8837fdf2e922592e6d8f18f43121a14
+DIST tl-cluttex-2021.tar.xz 21376 BLAKE2B 4d12e878d21c2c8b74b53ea01b2345de468bba29ef514016e49252babbfdbceaee6c51b6336a020d6a757549e10e3b36d0cb898099fcadbe51a0132e6a784258 SHA512 e211cd6fc89751628b0ebf0bd599ddffd18e39e24292fa896bd2394bbc1fe60c35d5230662a53fa685f051963db3966f27dd752cc63877585880a62483f6f93d
+DIST tl-cluttex.doc-2021.tar.xz 676332 BLAKE2B 88d37ee1c88684679f74a10dae4fd9b17a8eb3945f97d6b2ac36d8a3cb69d7c20a38bfda175ab78d97f44d9afa4b4c4a9fcbcc36f3e87bebaea2294b846a5bcf SHA512 d26a6fe183999987b2a1d375d1061fadd78d23a1bddb0582d8f70561c5d1bd745d33e0c41e8256adb00e2dc5b9f4904e7de4f2c03a00a6688b6c4a433f1d359c
+DIST tl-collection-binextra-2021.tar.xz 944 BLAKE2B e8b4801e020bb8b4e9e4a58be215cd8a2b1ec1477b703c040eb70c55a19e3188d4dc94609733921a43c18d7e7d09c96eff3a88c963d5344ae138b1417ea9c812 SHA512 6c6b6344f7d294bf74f3601850f036543ae6f8dc78bf01e32867d46d7c20089a388f779c445173c5d54e874278e718b697691eb94a5a2029ef64acdb914461ae
+DIST tl-ctan-o-mat-2021.tar.xz 5968 BLAKE2B aa33d64cb4c3bed1bc1a738a206f4226f333af9f45707d0c4e3385e1952f21c6cb728e3c511b0fbc3507c9eb853306460686f5eae48eddd200f94127d3a01cdb SHA512 a995dfc6d79ba77fe673aa501f28eaf9f057c34501fa032423569317e5a4eed048c3375d806eafacedefec02e91bcb587fa6bfb8c0ff980395bb877b2ce88c4c
+DIST tl-ctan-o-mat.doc-2021.tar.xz 54812 BLAKE2B 5cfff18f58ca2f13b012a49952ffc922412a2d05f5518fb864aab9d6a155efca2c8730bef8959a31340a86b07d9dc5e485428bd2ca08e435279a063d0000e78b SHA512 423efc3f2f850c5a9bcbe787edb8155ef76e56ce5e3a1ba3332bb465b8239616bd1fcff2e8a58db6f5ce9d5191ae3209a5451f746250a3b081fe9b35d024eebd
+DIST tl-ctan_chk-2021.tar.xz 512 BLAKE2B 80525a48521023cf7ab0cf3ab19d9fc3fb72dbe3fb3c638803076a0775794f6f30935cef8ec77936574a61d8676e123f4ef7c84beeacc72812fcbb86a4dd0588 SHA512 6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0
+DIST tl-ctan_chk.doc-2021.tar.xz 221996 BLAKE2B 43def8aec1f47ab26750a3678d68eb846f5a4383c681e1cee66529d877bb636b8867b5ce4a6b330a6b4239f5ad9db9125799c12b6ca5453f872fdfffdcb3fb75 SHA512 c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0
+DIST tl-ctanbib-2021.tar.xz 2588 BLAKE2B 2b335433ea829157b4938acb732c9e0bb886f5dae468136faf2474d5362d9adef0b00d7169343d100e7f5c5d9647bc2dbd12a63ffa79e9d6632bb96a9618e466 SHA512 af03e3079304d24b7cf996158ce7344a15aa2f17efc46378132bedc5e9bb4488f89210c24a8a5ef0c21a293600589aef78b7a8c7a7673ad09ceab2077b0a351d
+DIST tl-ctanbib.doc-2021.tar.xz 52852 BLAKE2B e5cf6c3ec91fd0d2bd8465ff4abc532b61e25947b1b40221f84b642587495ae4dbd80900ecde86e004d997fabcc050412c00dc2f81fdd891747deb1be5a6dd78 SHA512 1a971e49827476b5ae419189f7acff4c17ab41159d60c5627663d435368b28aa7dc4aeeb5fcc2c4a9f34f648ac9f2de229b250660333ca2f32bfd0808f24e732
+DIST tl-ctanify-2021.tar.xz 8236 BLAKE2B d8b56d748f70530caab43039a73b2263e3ad7178e3fc1e2fb0e8280ca2304e2bad34ce73b4ffdbc6ab4a96bccd36c51e3d30aa5a2bf37f6e16fc653944d19f59 SHA512 6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439
+DIST tl-ctanify.doc-2021.tar.xz 57960 BLAKE2B 87879b04d622f78564ddc1edeb6dfbc8e7da4796f45fe6b441c0c27b5090c2e03226ee4436d7be07e59ed64be7c1a151a76a26b54549e18930049a6a65ee1f8d SHA512 f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac
+DIST tl-ctanupload-2021.tar.xz 5104 BLAKE2B 77ad6a6c1d493f9b3d7f7f39d016b391dc4d8d82fab32c1c91838e16ad86a268fde2ee750063315853c2a1825a4331a8e32de7c217df440f53e72c43882f19c4 SHA512 4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72
+DIST tl-ctanupload.doc-2021.tar.xz 174964 BLAKE2B 804ae2c963ec668924d105454416faee356832baee3f452aafcd8489bda55627b6a60d307f58932e2487a4c2e6ab4a533f10369053a7245896da37df3cc5a40c SHA512 9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a
+DIST tl-ctie-2021.tar.xz 384 BLAKE2B cbc54f5aac9e7edfc39607f77b0992c25026ea3287701733fa0e9d8396faf22ee88d5e1563113129da1752df4b185b530a536e43d570f7094a57636cae30c7a9 SHA512 9792cf1c49fd5bb2f8c78c5621330c69031d41da769fc5adf7b3922be5d23e8ef0453b67d6e80617d3af46ba3e7eb84c99031f72b28563d274f6887802b2756c
+DIST tl-ctie.doc-2021.tar.xz 16332 BLAKE2B 70139538efd322cc5d3a368d345ddd9e18e8da5e75a5f745b7bf12fa4e0973e298ef7dc72316bf6c0ed3937a2fb2a504264beb3c51a3efd6e6bed56151557fd8 SHA512 4ab2d29709b509dd129c585d03dfe2f3aae1b3b6e4890a2b82bdf7a0b4b3a81fcd8a9960e6da7c9663ab8b572c29e85637fad93954e79f89846aa17aaba217a0
+DIST tl-cweb-2021.tar.xz 23444 BLAKE2B 5c16d40a9cb20c272b2f46201087d7fe77181ae8a256a319d95846783cbf2bff271ced3b997dbfcdd65ffa401ad0f4236ff0bb11c4fcc07d66ade5a802f8c71e SHA512 c47511355ceba742c1b037b49506a8a4bbdba224892ebce6e4418081866b0a9e3105a7639b061a173cc3efd7aa4cfc6e7a92388ed16ae1587cc3a06ee6385cde
+DIST tl-cweb.doc-2021.tar.xz 428876 BLAKE2B 67d84b83dde91180611f993a21464e6c39a5b5e1b8b46146f87e53e1913c0c1dd7c760acba9739f11075fe8c373b073dcb7e774da6900cbd5f4754707a64602f SHA512 277ab201738c17b0e273ed0c16826a0eb104fe218e88b0ecd23117e03c991984537c563f9cb7ca7e6c59c41a6cce51b5c2e085c5c1d58854c224427ef9b1e2a3
+DIST tl-de-macro-2021.tar.xz 7920 BLAKE2B 26962e8971869c69e9ec6732e1798afefc485d348b918f3d3a55e18f11fc3207089e5732d29d485763e6598c032e16ff1b5dff644c58ae55739bd5be8adb36b0 SHA512 558a55b14822cda4cfaa05511bbd6030049145916669b699795827181462e628d0a84baf087b8d56e3dccb353d17f581af9bc1662506878124e5cfaddbd97b9a
+DIST tl-de-macro.doc-2021.tar.xz 57104 BLAKE2B 840585f45ff498be16061abeea6da6aab5f84ea466f981e89a4d6aa1a77e9db2bd0b7ba109ccce28cc1db80ef6a034d84e8b38361d0118dcba3536262df1e154 SHA512 af0a7a463c7a9623050a3fe73782076965eefb58dec17752c80e35a647b5a7a6b354a1dea89ba03b503eef0faffbd2f134a6e5666f4c68665d322bf3b77922d6
+DIST tl-dtl-2021.tar.xz 580 BLAKE2B 04d741b3c0d7a20e8855f7e4bb19cf5d1e718ebc461ff4a4d150f0636487f972fd5e7ae8b7d320fbb02df322a94a930ae0d283596d96e3d345d86c641207b046 SHA512 866039bb0f76bc6b2f4dbb86133a48869d90ce7dae716df42e35f4d3ac2808fab52a79f77b047267d206ec416bba7dd6282468767b1b1f4fbb1146a1140eb78a
+DIST tl-dtl.doc-2021.tar.xz 52488 BLAKE2B af05536ace1a6ae318fa51fcb0c78167a876d6757c46f6de68be64d2184d596eb84462cd83097a74d57010c591062648ffb3b90e507dc4db33e677b1d7050ff4 SHA512 d624505c9bbcf7140fc264811631f55f8a26fb1e9c4d3b1fbb1be93460aca2d6dbd88192f057e1b17fe807af0b4ddbbef6e2a3ba919e6aed073a903045609d7f
+DIST tl-dtxgen-2021.tar.xz 5768 BLAKE2B 24fe4e6f53b046a075e922a6431f49a471e3c78dfb96604de42b8dc24d39168d1ad8f0c394a357164365de00181db131e94a1e1405cfde28c1bf37bf097a99ba SHA512 b197684c1e941a64b606b472fb9e0f1ed4f5d0b0db2df59202712c0e3f3b3993106b8d493d707c4875e90dacd9dc7d12bba784ef7c8d04984a38708073b1b92d
+DIST tl-dtxgen.doc-2021.tar.xz 56416 BLAKE2B 150a2b1354b70a221c0ce3299910aa4a087bb4b19f6ea94c96dae2cd78eb719bb1e3617ca0fe7109750ea8606a851a048558b35d95b95c7cee6534d34e7bac7e SHA512 f666a2b5d3cb32d43a23cc3edcd92bfb727d500a8c439b4b78bae89ac73c317adac9786e4702e78b5b4861b76489ff7af5cfd115a80b96cd6298c65412d56a50
+DIST tl-dvi2tty-2021.tar.xz 504 BLAKE2B 84b83f11200e2364fb12ccd82a0bbb170e61e247ae53a6ae11f38d392854390e145fda5a897dbde33fce339c0b7b3dac96435282cae7261e10d2dd13338676f5 SHA512 303289e5bef9fcc097c1e3ce3eff923c303f50f71c72f2c3929c55f006149171eeb4b69ff38f8a46b8a5d19ac79ebf6ca28ad1df5f9525a8f1dc6587bfa42d72
+DIST tl-dvi2tty.doc-2021.tar.xz 35876 BLAKE2B 8faa528e611c4e28f9f731433129253af71b8da37f4a0387716b810cd124a1ae17b37e5c70b1f171d65c27b1b6cd8baa898b79d5ef5c0106b502e7ff1ec65aff SHA512 fd8c456f223c78128b5a7c50bdd93068d00f92ffbb096ed2cecf23180b765eba0ba0dcea374f585754ecb28276e668788979e0be131465fbb56967b4ecdad900
+DIST tl-dviasm-2021.tar.xz 10136 BLAKE2B 249651458d30ad1cddb582e3728a8d4ec09c3b13396c207f139e6ad4e4f1c0135aaf0b85d87fcf827ca97783b1e60c833d13669da1b1971ef89e2aab07eaede8 SHA512 9f726816ddf7a52b797cfde03ffb863fa8a1b98068bc75da1ea86f57774bab248b4d4225f936b4cf3388dbb776e775527e4125ff5d49d76088e4f5be7125f4e6
+DIST tl-dviasm.doc-2021.tar.xz 24352 BLAKE2B 9f67340850d530a4e1176e48c744c00ac371f951678f7c772a5a4c01243672065c099fd9552b377b51f7632a11c98ac4ea99acefa1f1c1e25afb208d0cbacb28 SHA512 b2eecfcb0e665059843872426611e4a5c8092a2dfe51a82593803cb84b18147cd28fc18fe2d9575d24fac1b04501f1e90a2f9f3c4094d452bc51b3a4db603f9d
+DIST tl-dvicopy-2021.tar.xz 592 BLAKE2B 4238a64953517f7b8d966db33fb3b8ca92e2b2de478ebbdd7433bb825664e6f8acc5f7eb6a4582302876b6bd864207b0971c50e95ad520af6200878141fdc2ee SHA512 97fb63d376d839a924a54e83015d5bb6c15cad05cb1a29b7dacce0779106e7c3f60e2ba057cb339a35f091e56ad7b7443001e04434928f2f9be87371de45847b
+DIST tl-dvicopy.doc-2021.tar.xz 18256 BLAKE2B 5f33eeacf4ffa40a7cb348bf9bad2d07b793385513b792a46b13e0efb7238eb7b976448d0cc20334548479e54df86ac2c6429e41fb19cfd2dff2ce895b686e6e SHA512 d5b24737bcc8f035180525bc1b950caf0f7af9b8d4156047142777c830f719798eec3e33291c0d813a581c03fd5421df0a38ddf730b80b1664c34d1313e9c762
+DIST tl-dvidvi-2021.tar.xz 468 BLAKE2B 550031143b72bf70f15a1dd2b85e0315774054d73a7a846b8a91ea470b4fcd95c577dc504ceb0d719587ba0a525c8e0359e30eff80224a53930f7aa0ef720193 SHA512 d4589c7c034308547b4970104f6396ef24a15be22e034ac2f4f04a1004915c8d477e64e2c4b61927f43313b90b063602a4bcd45afb1bc33ee395e0b7caef202b
+DIST tl-dvidvi.doc-2021.tar.xz 19324 BLAKE2B 43f24847b7ae494fbb0180e8abfb8e21f5241c8458ec0bd86ba7f9affafec628224a75b599aefdfbf6ac3b76584f47fa51ebcb12acf9849f35ec624de2287744 SHA512 865f4e96bc8ff13005350800014ede4c95671db1c45f35e37b153637c23834d34054e3aac1b6033c6a219f9f123563b1d0cc3093c901f67dba7e33e65ba81646
+DIST tl-dviinfox-2021.tar.xz 3540 BLAKE2B 9ee9e186a15021fadfd400e46efb798c0cf47be0bcda4402311d7a4d4fa0b41b2f12a539f6d80609f91c6db1e6fb6db1d56cdcac3800bd8fa62e9b73785a3bf4 SHA512 33b37192832362c170575d1770b0e8da105ab0f9197ee52ff86a9dedfdac718fd7f3ca87d6f3f2075803fcffbc2f3739b806b1088bd7e2a21beca53292d918f0
+DIST tl-dviinfox.doc-2021.tar.xz 2168 BLAKE2B 373330f7d3cc529680bdfc38ae8bc8f1bdb0676dd06eeeb98a5ac86044a3fe52853d9b05709284294a77de92368904509e22eccc68ea039efa8e326235ec6d9d SHA512 f5f84a2df36ee93ccc0a8acb687fa4fdc6441ee6b0c76fe4330cb28ff2e5106014df5f367d5f2821c10864ff16988837099114ce331afe8a303e0f9102d92193
+DIST tl-dviljk-2021.tar.xz 532 BLAKE2B 81377c745730f1a344e8a5d7715a3bfc8a266a8b21f7f4da80b40f98a253ffefcb6a3b3e103aab28a53c28b0f337cf95905de1109a1e37053458f6e04b234ea3 SHA512 7f0fff6f850f22788981370dfe9759f8d1ac803f75e6355c582eca83ca3940f64e3c32c32881234e25d8bda59e47a4f236751c9464dc41f93c67c16cc55082ef
+DIST tl-dviljk.doc-2021.tar.xz 74976 BLAKE2B fa5c5fc3877e31f13510b5609c53d671a5ee90d53039e958a5a896d66de9ff904059535d4e71ad50cdb87fff806160024fe51e441000245968aa10fd9590b3d7 SHA512 82d28f1adfc368582a5b1d05e2e73ba99bd05d51f9daa972f5ca753905341ee1d61b9e15d402b3017bfdd78bd64c7c222794bbf76073517f96ea1b9d7a58cea6
+DIST tl-dviout-util-2021.tar.xz 248 BLAKE2B 7a8bb04c8fa82ef8a7532170f3bd475ae547e54a6e578f5c38adf49aaabe6de744b6532f9dda66562758992dde8de0b253e960a0f49f875d10aa70b9644e8d31 SHA512 a9445602ac5a3663920f8c7d428e833b0451c3e80203be57cc6fbdda5db5f7c89da75cf58e74d56c4ab9cd817fc9f080a056ebd045828a0d5b034108cda61bc5
+DIST tl-dviout-util.doc-2021.tar.xz 38880 BLAKE2B c5b4c2c2b89a2e26121f7ec388da0b191e3eacbc5b6d633fbb7c6f914d7ae38d83a6ab87b6a04468a465d2fe7e68b0cffb4d948c3418c90d9b5c84df18b4fcf2 SHA512 61f86a23314334d7faa4f1ae0760aea6c5e5f77754a6a9b1d5952f09e3e15d3dead73a9f72ccfe9b9d7a022654f8d2e1e6e3051dc12bff574b6f053cdbc9b598
+DIST tl-dvipos-2021.tar.xz 296 BLAKE2B 876f97c0dc0eb97ebcf7735392d73b2bd33fc52af56afbf36b675f7fcafbd8fc0976dafb1a226cf1ee41d699e8a12fde1b90f2aeef03c54e463866d513302232 SHA512 152cc45942bb1d241008ea0924f1e96e2329d6fd4228be42dc6dcb9eb28081bcb3d80e407e9fdf0560e93d095fd07351cf073f14d4a4c25eb984613fd9189826
+DIST tl-dvipos.doc-2021.tar.xz 28512 BLAKE2B 3ba49d5e3e757bb34830a741f5529835230f0b70ed4b8801f0b855cdebba27621110355025ad517243c48e21e9af111d9495b74fc18d9548671bc67998c2e9fa SHA512 2bf3fd5bbd7b6e1fb8a263dd0e3deef358bead727df5de280342376225fd7366ff470b9c2fca8f763890d1047fe2c7a5b138ade1b5fcab383c8113e10f245199
+DIST tl-findhyph-2021.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
+DIST tl-findhyph.doc-2021.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c36870726826d2e22cdfe852117117831f63f92457fc25ad27714ab7eb110832e3c052ff197f503ae969c941bafb6d5d48d24c SHA512 97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179
+DIST tl-fragmaster-2021.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
+DIST tl-fragmaster.doc-2021.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
+DIST tl-gsftopk-2021.tar.xz 3548 BLAKE2B 65e455587ba7b014be3f7668225fd0f5b4816406896209929001cab5b61dd6b748120970dca79207117b6a5b07ff7c00f96aab6e540397405d075425f8a79a2b SHA512 cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413
+DIST tl-gsftopk.doc-2021.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805
+DIST tl-hook-pre-commit-pkg-2021.tar.xz 808 BLAKE2B 99741f4b4ae417b9e1975fbcaf412416702730bc4c0aea51be2e8324ad539abc2687b690c5541e89ce085d07584b63b24946c7d5beb538476855053ebfaaacfe SHA512 6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3
+DIST tl-hook-pre-commit-pkg.doc-2021.tar.xz 2788 BLAKE2B e87de5b35b848539f0bb55e82e60e147ada03120a55f3098b1d0b1bdf7926c57882c5c4296dcaaf4da89f2ef46989593642908db22e75a37802aa2b71c905ac2 SHA512 3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d
+DIST tl-hyphen-base-2021.tar.xz 22428 BLAKE2B d607e789758222031aa365defa0383eecb2d18b24f8c0027dc7ffa93f15a46f330956da6ad25c7615630d2866d426b177b443968c44be8f7f380ee580e00d3a7 SHA512 d5d606630e052a49bf6f4f9e0ea25863aa7ba358fee932044f588afe97d8325a8ac18e5dbb5f11cc9092f1dde8382398049c4852245f373e75b0da1f3f4174a4
+DIST tl-installfont-2021.tar.xz 4840 BLAKE2B f5fdcc51fde58473041db0aebb682b431ceb02476fda93fc7cc59016982d613f0ceebc2a662a6260d51ebd8a96e03ecffa717cd098fa2fcf2d614e3458777624 SHA512 cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae
+DIST tl-installfont.doc-2021.tar.xz 56040 BLAKE2B e1b66c235779773678580a4a2730734460c3efa433de30303bdf8731c4d303e3b0b41784bb5643f379d64e53b768941e9ccec124847dcadd8b928bda9a0975d7 SHA512 2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7
+DIST tl-ketcindy-2021.tar.xz 2528844 BLAKE2B 8e761edc72ab39a782c68d59299e6c96ab6547bbdc7c7e5ec32972ef09800e1b342d2115215ec3be36d1a9e311c7cf55fa7b68ae77785020bc73009d22db828d SHA512 5096e7b197298532714fc1850d30e93fbef779f3d014b101f6b1bfd519c82a748ac6e340a5d9f53d94a5818f7c07278d7ca0eade97bd0c4567d293dab7d018f3
+DIST tl-ketcindy.doc-2021.tar.xz 14292908 BLAKE2B 92ed291c48708b12ecefb35502a97d3011d89bab09d02a8bd1d967707da211717d37020364fe0086d3125512f7426619a550caf743bc00ef41bcf44c0fb85d25 SHA512 e0afd2ac3cfa351cd3eb5e1c49a7a8cfd87a52ba1a8e8f614578bf6894529e51bc096d5b9ec8b910bdf9d6c30323d31ae5a9b38e167523784c75d334a56386e5
+DIST tl-lacheck-2021.tar.xz 436 BLAKE2B 7801a64fe9789df0c4409e8fc29cad868bebcb0721d1c7dd8e717cc3c1deb241d356c8d706c744a5019fc94fbf799917e3ca8a9627fe4c9bfe5ddde435423d41 SHA512 30241d13ac35054017c6240ad066ae84b11c26757fa895ffdc1444b0825e50a2a89864ca85d710882be4105127c4df203ad4a403504a6c309b796c9b9ee5b589
+DIST tl-lacheck.doc-2021.tar.xz 20964 BLAKE2B 4a70a5c0df0151e5559116ead2e5aa2b8b25700cce5041b90e241916f60c79f7e2a9478c48c1b4df04b21935746cf3ca736592e292d2225aa3701ac9ae4f545c SHA512 a1ef923bfe1c3496651052b4a8b6978665b75f43b7dbeb254fb61657050427aedc8415218f988a7e727849dd0001b67ed023ecd252bac2445b0965a58800187c
+DIST tl-latex-git-log-2021.tar.xz 4880 BLAKE2B 02f82d7b00a8740745272160d1fce1440ab8d50f95e2174a404d8bf2ff189a5c593ea7d63a83b5a4c0769e4cb863b736cdb57dc438a81539244a2c311ee5fc99 SHA512 15994c6eb9ba1b194df270c68a3d74ab3db11974875ce192559182b2dbfa9b308d598056a3145f2cc2f6718865a5b140ccb95dea22a9e23edee527e5b86362ff
+DIST tl-latex-git-log.doc-2021.tar.xz 110280 BLAKE2B e398d22eb09514b4328b5013aeeb90c086d7e075d6dcf93ceeaf34fed694b172f7ea7deddbc2654db830477a54b50d4db585d164127dca2ba858d522f8c47114 SHA512 52bc94324c64caac9a5b25b49c9ea01b8560433d640646ee70830d27637482cf50da95bbb86db93006f2be4ab9f5f79fa144e4b631d62c05f0a11ab45e639cbf
+DIST tl-latex-papersize-2021.tar.xz 4696 BLAKE2B 19972019c74f98abaae8942fd7278a7ee4c1935c9e4bff0d6fef3aaf4160448e87954ef532400a808ddf555417956884b290486ec444b5acd45ef7a894e13b51 SHA512 00010f764235c6d9e4d6667c8c8b9f0ec6ae4b65afb53109f8179e0429d4b3787bd6b0985cd511f770cd74512483d1077e0f42136fe7ce1871984b372f2f2e54
+DIST tl-latex-papersize.doc-2021.tar.xz 596 BLAKE2B a35b17015da1a6cb8527cd3c565a5fe51e29c69e7989eea5f32ee710f4a347ae389d70278bee21c86155ea31afced6652dc49495957211071f719b732984ba33 SHA512 8ebddd884e3e533d06332f2d6f8657ed54c9c376b3de68c7e7652f3b2835ec6601f5326ea70dc830b645440f0bd9ba2281e4f71a847946bb595771c6a950c0a6
+DIST tl-latex2man-2021.tar.xz 14088 BLAKE2B e791e164f7d8faf12c30719817cb887eff7706b3b3db97cc0cce773b4c722e62564935a5061804e531a3dbc862a919b3606c9c57796679029b5208473bf7faea SHA512 9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436
+DIST tl-latex2man.doc-2021.tar.xz 369336 BLAKE2B 897023bf06fb5ed6f172251fc21cbb3bef908742ec86e3fe998a080a890b74e029d52332ce7b9c47334bae40648812ea5fc9888e18a9b28ee53f059ceb9be4c3 SHA512 214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a
+DIST tl-latex2nemeth-2021.tar.xz 7125616 BLAKE2B 927e1617890c682c042ffa513dfcbc622ca83ea1efff6ef30e78dfe3b90cc8aa412640f3aa66e7b68226ad11770c07caf1a55770560082d6aa860636839cefd8 SHA512 37065f9916e6755c1a97f2b8a1f1cfd838008b5da2d2131938626ae4eb6872af30e5b4b767ff3204e271a86b7245b54d9146d9fdd8c807f882ca28e1663d2d14
+DIST tl-latex2nemeth.doc-2021.tar.xz 26836 BLAKE2B 52c8698d50809bd54ab7e0802a76b314ad7b2553b72adb2d0a485a7888566c9d6e2465f6929a89196f4dd9ccbc442b93719ccf0b44ff304eadf670dc3c3c42b2 SHA512 e2ea8084bec4d41a4b694c3b46788e3170043ba1f7ce4096bf029a4de61b76cb504b532d7e0c454943980d44d1c145a78a9e4a7f20a6654aa9cca63d388bdb5a
+DIST tl-latexfileversion-2021.tar.xz 1652 BLAKE2B 57a97adc83f9e367c3681f6943bb38ca238e6057ecf9873611751da624013e891f5dc184a46daac80a2464fe32ee7002e53f63343e6d8bc3bf313e5b347c5e50 SHA512 3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9
+DIST tl-latexfileversion.doc-2021.tar.xz 928 BLAKE2B 3a72c41b0da50e9793ef2ca44653aec32780da76201a43a57e0ee77ffd4ef6225d789f1614b166e2c1b324b97a1515867f4af13d68a5225fafbd444c7ecaf11f SHA512 b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1
+DIST tl-latexindent-2021.tar.xz 60080 BLAKE2B 4c775db4ccf1bf481a73e0c28a8e708b6d0a68dd08a8cce75ac65e497c429fc61267286fe4a8fd95e7bc54ffd27261f602cc50e474d0ff23fab1332eda9d20ff SHA512 2bcb1ed95f7e001d9229f3cc8748ad492578fd62a37013956a322641f27a672f3970d07648944e7edfed962381afc83653c2d792b5c9ee357cda0bc5c451db69
+DIST tl-latexindent.doc-2021.tar.xz 981092 BLAKE2B 93075a6c52f2d2977fb8e75ed1db0a90024b7a43ea1cb0266658e6278b8e3758e9f2dc9dbfe65ed05222b375f72c3ca2b51a203bf64faff85c14501a0030c66f SHA512 99d64a9d84703f362f7587e5cfc2aed0d6a7be2b272f8d435af4ad79ba90f555529fe34ff02a844dbbcbcdf98417c123f55f4e4a073bb8079dca2e7f3cbb9ecd
+DIST tl-latexpand-2021.tar.xz 6692 BLAKE2B 72146f6b82314812184a0e7802f6d675bf15e2a80ef1e74604da2e2ec1b32bbea7089c30ccc239f5eafe809d07d08ecbb0016929ccd3de19f8c45cf28e2ce92a SHA512 ff362aea91f703759157dc810067d39d0d8fbdfd031e993c1a6c019a55d50a3e11745ab72c8abc7bd615f79cbe589cb0bd7bf82c147d12d18d3483ef95dcf4ba
+DIST tl-latexpand.doc-2021.tar.xz 3132 BLAKE2B 41d28cd8288c2db9c186558d5ee143d072b4d11cc6822b166ba8e5a421285cb3c5a2fb474c3d5f4b891f0ea0df78a6cc53e7e3328289b409c675e0c7c7d2cedd SHA512 63181837edaf48a5bcd842039579e3efad999cf2db1cc3da8184b59f359db0ed7f50a9c706a44f32fd0642438020256283434b95a29d64b184ddd5ca27895282
+DIST tl-listings-ext-2021.tar.xz 4856 BLAKE2B 0317ca2bd6c6cd1ebdebccb4b924c57bc9b9409d97e9e967a78a16282541655f454dd4c20e6e8cf1613a05755cdf5d88c1c7aee6f030a80d8364807aa8434a2e SHA512 c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c
+DIST tl-listings-ext.doc-2021.tar.xz 103704 BLAKE2B a7367a78ebd5d466b0b4adde5926264d4b5325a635f4db25483a491ddcafe3436d2f97e64d50d4825e5def63439c50543dc893e08504501fab56b3ef7d84e6d3 SHA512 82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5
+DIST tl-listings-ext.source-2021.tar.xz 22652 BLAKE2B 15f7ecd55bbdd3e34de77c72e710ad7aa5b7be6d31da0e550171f8477627e0cbcc9cac8bb852c2771b639d66992b846a9cd37952f8b6ffe16a7ea9a7fb3e43a1 SHA512 fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228
+DIST tl-ltxfileinfo-2021.tar.xz 5168 BLAKE2B 65e798fa705b8420a03db389c5990784d9c1f208d23f9e07c615a47c2abe9a560ecd55d0eb589151ae39450738a98b8eb48c949d4a4fe285d6defcbbb81927ee SHA512 ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44
+DIST tl-ltxfileinfo.doc-2021.tar.xz 37612 BLAKE2B b8021ed8cd1d977b18b92ca463046ebb67fae757794d881d8bf65b81dffb41ebdbc9aab960d06bfd7514d55d36c2d780fbe890a76e5fa3b415b53f174ff9e363 SHA512 0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5
+DIST tl-ltximg-2021.tar.xz 26344 BLAKE2B bc8833846aba2a6e72d919ac5a3c9c395f1df30bb408536068cb490cb16b09e612d04bd8f3216386a7a1eea7bac2a9b622e4aa3e7f6fa24775c2bf71698b8a60 SHA512 9aa5aacc687d31bc76fd81a2c26cef98fb9328b90c1d97c439f323fe7962184eab2b571431fe208823a6e42fea6c036128414474ca815517421989916a94eeee
+DIST tl-ltximg.doc-2021.tar.xz 242252 BLAKE2B 50ada9868e920984db14fda9adb86135d46497289ccf52cabbfc744cf4fa9927a86c617c81010722e04320661bc9478a2b0089ae4442ea0a6316f599764c48e4 SHA512 5fbf8faf7bfd95b4f35e755ec1507f155647376be9311b97dd7c2924c9958fb0c42351eb43728018bc95e12cdec1b2b8ef89a7a2245e532dc8a49b4c583f54b9
+DIST tl-make4ht-2021.tar.xz 46600 BLAKE2B a6b7a9cf414bd52ea829688762e559e79e862676910e33f7118e854819be16cb17de2a6997ec386a0f26e3ad8ed1c073ca151003a1b8fe7f7b3db04fd297f26e SHA512 4c41fae770844af8280c4883772290e5cf5d42af439ac0dfde777e49d6303b0e0d211c4d3d0b843d4ece36f794f0dc8bbc8e6573031d81d4eb47d9180c3d05d5
+DIST tl-make4ht.doc-2021.tar.xz 158612 BLAKE2B 482f5d4f4abbb0ccd5775a4ced1f134a236ffa668ee428944a94af854147e968736686347f78d6d379e023a45504879eef4b711bea5e12d7df94923218f09796 SHA512 8c347be5e9e0d85850dd3c3974d965e6a9039096a13f22e45e574e9cc0e8c270d013c2b04b44348eea663debc37503b9d696f5e8aa8da594c923713316b2d5a8
+DIST tl-match_parens-2021.tar.xz 3328 BLAKE2B 3fd79342cb4a1d3de5a60e7364730af1fef0e7de20e45c78c2e7c6aea1457259a7cd53daf6875f9a35f1f5425fb34a67426ceceeab7868a1f781a67a82ab3594 SHA512 1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad
+DIST tl-match_parens.doc-2021.tar.xz 57268 BLAKE2B 3540abdc804c0b062e5a06c570ff9be7aa87514004a780b96d159dc90bc9fdd98847fdb1a5559d944da15908bd6cb8b6a03bb56e8de4f40a13e13557c3e4d3e5 SHA512 60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a
+DIST tl-mflua-2021.tar.xz 31672 BLAKE2B 7bb1c83dc227f9d5c40e4166a1077f430bb024ff682d7e819a4fc1d5b75b2fc5647b382bf70f0bcfc4a7c9d5f89ee51b77bd4f837efeeb1eb8a038b125488b86 SHA512 ec89212e9a1518f5502f93114377f07e88af787f15c64fc61f40f22a679384f8825384c694dd365d5a74bc5d9417dcf3932c634279550603374bb43df1a7a0e6
+DIST tl-mkjobtexmf-2021.tar.xz 7444 BLAKE2B 624ff2a3059854ad4aec624e43e8bf03286b477c2210ba4d993affe076fa12bf932a9b6376862aa98d06b4f848ab8b49257215658a8c55196f8e59594d64d4aa SHA512 c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3
+DIST tl-mkjobtexmf.doc-2021.tar.xz 80276 BLAKE2B ee2373e795425a3c40e1a46af3d1fb7a800aec9db9d808b6a6b32e64de6f449f4421320e429f635eb8b04c03e7768a4ada3f37e8c044d89c903d13ae32ed0f87 SHA512 3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5
+DIST tl-mkjobtexmf.source-2021.tar.xz 19828 BLAKE2B 31b3a262ea9c1202d17c542a5a707ca36df035338844ba5973fddcdc6fb96805185bdcbe0de69dddb7f7f3b4a898de540caeb66088fa57abb0d3501c699f6677 SHA512 7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f
+DIST tl-patgen-2021.tar.xz 780 BLAKE2B 65976437fd91e34de023f5d6c57c71a316cfa1757c4014e0704dd63b3dfcba01be6523fad995f5d1c13fa9187ca60743339489d3f78321b645d04da21cc167e9 SHA512 38b99382d97e8c3315d2d5ae713c41445e43c9300a4829dc7a00b8db098a4bad592a18535f1f281aa6fab893247f703f203ae3e3ba8f2f22a56b52163abe80b3
+DIST tl-patgen.doc-2021.tar.xz 28660 BLAKE2B 7f19bd514f0c78bde0b20d304eaea950ee0e8e0b0ae5b35023bdee8ddfaed5b63f9fdf3d31a6c0f89e3e1cf370b9764b04acecfb586241f769ed4648e36ba762 SHA512 41d020627edd29ec233517cd7af725171eb0d679b3b17d3ec2b6425540b9069414b97766a34bf69d92436d6af464fc624f15d903c18a56340e326ebc9de5f91f
+DIST tl-pdfbook2-2021.tar.xz 3548 BLAKE2B 17abb45be8204279f9fc23a0803030c38ecdf6725fcb11561e559c418fbac96aa33a6c74d4535343ffbea4e05dd6a23e619d7022bc9e712fedcb282bc322cd18 SHA512 dd87268e3856eb26b37f025ac62f24cd5e680e92e727588d36878de9df799f49254ef2259c29de15db11d5888ada83110a39aaa3116aa6f6aa290d3e64f1231f
+DIST tl-pdfbook2.doc-2021.tar.xz 21548 BLAKE2B 97a85c875c8d8f7f3e967b26a80e3c9378626d3434a3ccf9b755dd5c6ce441b6d9b26182bd701a6d8a21a3fe73fbc6700f2d52d1b67e4fb5d8c04021d2d8ebbf SHA512 3048de4be891e270e8efe9f9d85524aff948c9483da25f491669a7181967dc281f42b984c9ee46464bc563c42a4f171589066f67818a291a136e1f49d40912ef
+DIST tl-pdfcrop-2021.tar.xz 10888 BLAKE2B 32b31c747879abce2c2030963a60b7b45524ac733db5af51099a74bd6defb65b5d0325c62238173d9cb6735e87e64dca182756f2eeddf418fb8eb64f583e01ab SHA512 ba611ee2a516fb031a7f3c93f563b2aaa2e50d4ef95433a5d83ee46191c2a6001fdd4ef25f33166c0e3f9791e85c200e452684974d54d34e8d651a7254f6652c
+DIST tl-pdfcrop.doc-2021.tar.xz 10228 BLAKE2B 4c246471c755b62adc86d4ad8b3c889bf21d4db25b3148a80701b9c978778eca390ea0989ce4d9b79c1a26c12bf701dffc02dfb1d5bc91a78fba5125901cec76 SHA512 786fe00793f62e09f225ca0decdd53ad3b2ce03a133a2ae4ba20db9d40352863dc6a8728e005aecfcaec06072e8a0ef454d1f7fbe90bfc5997cfc65c6ab97170
+DIST tl-pdfjam-2021.tar.xz 12120 BLAKE2B fbda90897fe9c7c3b4003d77a3cafe1680bd9fb476398a26a4faa42fd09976b28c5932dfa819f011ed221b0d7df2a01e82bc24787c7944b9722797d2577369a7 SHA512 1b1084859a811861e60e27186d67d267d3740152331f50fdbe67ce7226a76b4db24d79b674e6511d2f3de9a711da3369c565d781614f5d0c1a8021bc1ac18827
+DIST tl-pdfjam.doc-2021.tar.xz 110188 BLAKE2B 39b3eb28ed79c503c41e06f0b765dee817e8a02e040d41b4e44067f27f2f042c541ee07984a778e22f31640c4d76ba0b65f4e8fc105dcf6d52e1e5b3fd6a3db0 SHA512 a29c09a2e843188135265aaec690e09cd08fe29076a0378b308ec0e48aa7936ba0edfa7d6ad3ac808ec334bb5c2793a32d8ef625f4ad9b3fea40d4db567cae56
+DIST tl-pdflatexpicscale-2021.tar.xz 3124 BLAKE2B 491b0d733a769aa494ce026add50ae710a2257ddfa2737cddd83465d33c564f553edc735f61f3dd09b41c3e92cee095d38d777e52bfd57d77ce5f04e21868cb1 SHA512 d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3
+DIST tl-pdflatexpicscale.doc-2021.tar.xz 86376 BLAKE2B 53f8b82efd4f7c4f27edbba3a6ac5a790d40dd9fbb652bcc798973182604166ac8a748dfb4ac3147d206fef6072d178ef5c7ff7a334cc009f3bac0c06b48d7e8 SHA512 64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1
+DIST tl-pdftex-quiet-2021.tar.xz 2516 BLAKE2B 0f91e71a04cab4ac27b42f7a514029167cba2260eac5b2643175b27c856a22dfdd7117ffe94233f786d4ad2c562f5141be67af4cc46ea1f0afcffe4462640a60 SHA512 7b33e37a4b33060abee48ccf825cacecdee552d641da48dae47e3615fa0ab91ea9912b52fbd5c5ba6cdaa9c0d2cc7baa7c48a80bebb6d1887e5c633dacb4d104
+DIST tl-pdftex-quiet.doc-2021.tar.xz 12516 BLAKE2B bbb2d47bcf8cf6acc13f086d7249f368e0a06cf2219c931465c7bdf02ec71210f321eb5342cbd2128538ecbf7236ffcc1e68284a5240ff31a5353be0076ebb92 SHA512 e13392cfefaed2c154c086ffcf85e21725e4230ce78d10e07dcb0a1c8b3685bef2572c5f5e249c56120320f2b0167cd5055ade50625a296446a197c0ba4b85cc
+DIST tl-pdftosrc-2021.tar.xz 384 BLAKE2B e01308b273d17fc6ec6f71acb48b80d9afab2add35aa8b589d9d3a42b2c598e6c15a18d2f04497275b3035b4272aad04677082cf95a45e3e65d3785a94ee8343 SHA512 da79e91e793576cfb8ade78669422f9bb2caa2262ca607e1d174f976827d93dcb6d2042d8bf7276e7ae1129cd48198ff2edf2837f029d4d743a9868172af5612
+DIST tl-pdftosrc.doc-2021.tar.xz 23884 BLAKE2B f1e8a6c85489f02cfc848047ae298e46cf57015932326a9b4dfc35a698c819f5d0d5a12086551b7c7a479a571bf3367b9ba2aaf00580159aa2fd31e34d5ce4e6 SHA512 8f201c523d76bc6a706ec8af4cb8578e4e490c192715ce7b76395c955ba4e075dcc2366982f3151f34d73fbf93beea3515e5b91ea1a2f1829dab427ae5bb6856
+DIST tl-pdfxup-2021.tar.xz 13960 BLAKE2B 225fe2bafec30e0a00a139f267226a7dd104a05cf262adfff0ddb303569e7aad6f49cf8df695eec28e29304cb615928d3035f228e1a5447797b52f693dd9dc4f SHA512 c000299a0f21b6fbc60e23ac163c55414e939f5542006a1508e8f5e143fb64cd40b8b57e986c07d99e4bec8e9f1d0d325955b4d34af08ba73a58f77c1a0d442a
+DIST tl-pdfxup.doc-2021.tar.xz 115296 BLAKE2B 34bf2382fd3d04296cbf658f179932d6bdff9d7924a18b075062093b61c0a222d3b4c42a57e35e40657a3a10e648f31c265956bed6c2ee0893386f306dca8985 SHA512 9ffaa67a311531694f67a88cf41266858ba1d92a6d390fec2885a30a734922a48f4afe390eb6b3ea980c7ac79ff67f0d393927f7bdf3ad0bd3d30e64fd098d96
+DIST tl-pfarrei-2021.tar.xz 4632 BLAKE2B 658455eb955f1525dc9f5e00a748ef19d89bf2d65f8168121d1a0539b298fd32a9494d58724706857885364c86f6d46d42c8045e8124716b93726f8aea8aa3e8 SHA512 f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c
+DIST tl-pfarrei.doc-2021.tar.xz 499400 BLAKE2B ea640be4e5f113f9c2cf07b7b2dfe6da8889f79eb5a9c6bdf8758b2b587b1f3e4fd5337051b374e330380a6efa941cf10be47d643f2555af99b8847a6904cd1c SHA512 d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4
+DIST tl-pfarrei.source-2021.tar.xz 13448 BLAKE2B d30c95a4970d5674f7b44915d8129d13c7c8ccb43725a8a12129ebf64eb63aa9c17a9e39d6478d57584ffa818aa9542cebf865220de3ba286b18318386bc25da SHA512 1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884
+DIST tl-pkfix-2021.tar.xz 7572 BLAKE2B 3b655dba7deda0576d7c9f84d8d6d136709b516df18cae7f15a010ef3ab3ec8997032c02b1b0ff027fa611d638648e1e713894c31defe16c0cc671fcd7ae060e SHA512 b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24
+DIST tl-pkfix-helper-2021.tar.xz 20208 BLAKE2B 9049bf09d9a5053139eee892c6e2c48daac318ebd7ee1d78cbf5fd26ef6fa0f4eeec9ad4954e9bb4cee848ee363d19459b6d88ddd027dabbf38fdfb09be87d01 SHA512 e5151d85d2db65f41b69320ad92611adcc8d211719aa06f39488ba75972f6bd4eda3a9ebd9f13e8889eb84451a640bbdbfd8862c95620304917cca3dcff4a194
+DIST tl-pkfix-helper.doc-2021.tar.xz 393612 BLAKE2B d92e801a109b0d07169aa53607b62554238cf9ec4902c97249eb86f6a2e203485b93fbf20c01a8facab76726e4c464c0ce9347d9adfddc702be7a225503f86b1 SHA512 50103799bbfc18a728b6510f9cd3d9aa4cbafaebb1e68f2f3280b3a57efbdbf75ff68f36e72b4442e49bbb04801795250fb3e2d0728968e30c1e70fc5b7d15d0
+DIST tl-pkfix.doc-2021.tar.xz 4376 BLAKE2B 7cc25ca096dfcaacce04fb4241dade290ce51fc6bd2791ddf4961d059080d449ecf68ad972e7c6f4cc2564e3faa982e86e128e1227ca3beae02055c160075644 SHA512 c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4
+DIST tl-purifyeps-2021.tar.xz 6212 BLAKE2B 648b7a323d2a1f9e48e5eba4ec9c43e796a50c166af2ce880514679cc5ff04d429fc48e1381e8797bce848e3b4fd5f0428d6825dc3facb6369df3fe1a2d25712 SHA512 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
+DIST tl-purifyeps.doc-2021.tar.xz 15056 BLAKE2B 7d6e071fcceabecaef60b58f0f69119e8b0950820075b97adc07651de19f9db92e33a6cab8d860b23c6fe5ed89ffbdcb11cd792f3dd2198d81fcf61c77a91c3c SHA512 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
+DIST tl-pythontex.doc-2021.tar.xz 1550244 BLAKE2B 4c23ebfd93c6ff63d64734c2a80959d234d30d8d88befef534659d0d0d656edb394b054b986e20ec5f0865365ed5f958091e7dc2714fa0454ac23177c328eb73 SHA512 cdc5046cef480514417874ef5343a39f9e1c377d0e1f00e9df4ca8746670f2b222636afd58a06ef63086c3479b4d516f9d14074aabc1fa7876b2fb4f6599bef4
+DIST tl-pythontex.source-2021.tar.xz 83716 BLAKE2B 4469fe4dd9a2d66032e03fba3878784bb11dccac593be1c81227a2f9f09abe0645fb8fc7c42866fe17e91d61225a3dcb2bb1529106f4614ac39b2c0348049bbb SHA512 9acadbf5a18d56d24bd1300ff4b713325c43f163d2ac27e190461fbb74bbe023e31b2a3cb0bf3c6ead42c1275bfcbcbc8cc87914f623537e05773e9e641b7b03
+DIST tl-seetexk-2021.tar.xz 644 BLAKE2B 349afae94fbf7c7267fa08c3100da0499a007c37a9080417ea18d71ebd3220430643af79bc152422b809a41f7fdb43e8438cbff622ac26f4c43df15ce32d5293 SHA512 8da27529da3e020f1853b02ce17f9481cfd3c32eeec9fb123d544a9d63a978831869036a1251e6b73bd007e0a5f947c1a7f5e2ae8004866631f1895a51cd14e9
+DIST tl-seetexk.doc-2021.tar.xz 68840 BLAKE2B f7068e88a958049c3ed6d278992f96afd0a5dadfc70fd65a98c28f3b8972b09ba9eee7671a8fe9577b533d65857dd7dbacaaa0e85da35bdeadc1d9983b0896cc SHA512 e450694c39ac2f161cb60b6e8e0d95db29fb6271633dbf3cbd48beb6ebd01946d504cc3282a207738994d42eeefcbad5620aa74edf057a965e4952bbfe914259
+DIST tl-spix-2021.tar.xz 2276 BLAKE2B e600a87436ba83c3ef9598dc8b9edb4e68be774cc30d6e0d74073b03d8de0eddb047decd12d3f6848ab27e730bc657062e5cf5f52103efa37baaf9bc66a02a04 SHA512 c8128bbee3f0dfbc009e74e46427c394a2c354eea63fc1abe6efd426aee8d0c091fefceb14de8ad97556686be702552a3ef5a10d540a57c1e8bcdaae9be8f22b
+DIST tl-spix.doc-2021.tar.xz 1551716 BLAKE2B f075e5b473cca95acc48e761df4e94577dcc8db7efe57fb298223b89f9a123daf79a21f906495b92a59e2aa07ad1afdbb44e22e2fa8766034b235a0bd0ac56c1 SHA512 3a1fc0f7186c0662271a5add51f08f0173c9d0f80cac632a484a30c8774fb3c4385edea2ecf184b2898d20431b7944c0a2e863bc4242ee4270b67eb4d8f3573d
+DIST tl-srcredact-2021.tar.xz 4240 BLAKE2B 553cde0085a142f679d327b1b3edd4a16a7a74a1d0b5871346964298ad796d9c3c3cfc5a01851f620e9748f47e0e23b7e18bbccfd9d5037d042618a4e0acc11a SHA512 9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d
+DIST tl-srcredact.doc-2021.tar.xz 384380 BLAKE2B 8ddc8328384950b5feb4b59e29a4af4b69fed9d0072905dea0e2619a3a48490bd6c30e22cd38a16d7413f947339626a57aae11765e982b2ae9632b01ce93f602 SHA512 dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc
+DIST tl-sty2dtx-2021.tar.xz 8720 BLAKE2B 975f40c9218b723bb9d62407a7be10db1c5583d9386f6a619ac34ffc09f832117aac199b1be0e3f1a227ebaf558cfceb1dc75531978e1c43fe87526a4f86b9d5 SHA512 a7e42340744a348c88bb3cde7e23d428259f4fe7c644093e4bdabf8c49bc7f9c929a2271cd14daed9be233a04f62b60602a9fa778d05b11dba716d886286e8e1
+DIST tl-sty2dtx.doc-2021.tar.xz 151548 BLAKE2B 97d566bc12ff0992ff6ebbd760e31bb9cacfd8d5e37003bf961199b3e22450967b7331c3aa4e522c9257b29ef5e08d975d930cdf1db97b4b3b6beb0864213d1c SHA512 2fb33ea4fcc9b5e940b46cb1b53cb56692528d8926d9bf22d3615958946763a63be101a5cf146a14ade43e2dce11b8fc25866d563d844570863dce54f48472b5
+DIST tl-synctex-2021.tar.xz 464 BLAKE2B c02df55f471eea5af3fd939c07567eb3dcf2a6ab80ba78ce5cf321c6f3a1cf341e5880c4f9e292a15f00d8dbe5ab4dd2809a2e012d83765bc38cb92470df6655 SHA512 1cc1900df90ceebc6865ce7c4a4befc86d1aa5aeb0f19808526a6cb369d7bd2ecf3c4789817da937e84fdf1fa3c921660e64e3e8a8e215d4f6dd97b2371743c5
+DIST tl-synctex.doc-2021.tar.xz 41740 BLAKE2B 73b7e272a8f79147bb5ba043edfa0a58f882d783b81062ef5b36e3cb9eada6013a6c6b318ac89b01457147765606db5732fc2073412b5b010bceaeed8982f7fc SHA512 37b7f0e3b86494715763c0d230a076aeec1f41ad658432099871d26b933cd8d0e8e831064cbe462a31a30260004c6dfe9b6b4d555d281d909615910470a2b1ef
+DIST tl-tex4ebook-2021.tar.xz 16960 BLAKE2B 5c972ee6a759e599f500038ed248aaa0d485434a4875fe16f871e612443d6777f5198c73913725ebf0c05d9f6cb488a84ee1ae1c413a35e2cf4dcda9687fc19d SHA512 9ef3a2b820f1f7015b61b8cff017affbf8cdc07fb1d4c39f629e46e2457a08875dd83252526e75465ec75a42d6580b7ec75b085455e5ba62dd14dd13a898a8f2
+DIST tl-tex4ebook.doc-2021.tar.xz 88140 BLAKE2B e2b6e70792754522125c830dd6ebd6d2a3df6ed580fd91e63e60fbbeb2a23470bb8c3d0354dfe35bdbb3089717d7fb08cab9b5b1eccebcdd10ad492de777920c SHA512 0a01620564aa41d076a998910eff5a1fc45b7a0f2a3b2f606191e1442c49ed6685c8ac51a099834da2765de030d2f099a79fd03d6aebe08f78837f18638bc9d2
+DIST tl-texcount-2021.tar.xz 35908 BLAKE2B 7c84cc1f4f07d9d9cc3aba2cc2526274b42484ba4fbfd0b4f985bb5d7ddbe8d259cec8f5033f029db2bb30abe15c8941eb2f19fe9b37c5b4679839ef8c19508d SHA512 82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f
+DIST tl-texcount.doc-2021.tar.xz 559548 BLAKE2B 9c5acb7caaadd303532206e5ff2aec75be3dab53b6a1fdd1f726e7b2ae54819198b33033ee60d267d59b5a9b3f0efb66489cae55ff69c18ba7e1ddeb2597abfe SHA512 5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94
+DIST tl-texdef-2021.tar.xz 9468 BLAKE2B ce8bc71563f0dd56060b52c15b9e065f5bfa6c6de9e6a0686b888e22a4724393c8b0d189cddb252ef491a43b8d915d8bad1805e3cfaf1bdb5a2d993b51d5437d SHA512 cc85ae5298a72c337c1c4571f2af698b62b182521cc65d0ffa459b89121e9eeae7d6f033456278ec6f61f91cbc2a6feed18005786e5b9943a8b0893111e61017
+DIST tl-texdef.doc-2021.tar.xz 156088 BLAKE2B 8fd34f3809b4ad5da9ea0bb6eec6419584db4ec34af589d70a781d2857d7bcc98170450c7cdc442d75615ed8d85ca9c094947cb382275a9637a0c3e66e7c52dd SHA512 dbb3516132d0779f657a051b0140491d8baf1bd6ddbeef92d94414a791894696d9ce39d49b3cd689dfcea2d387a221e1b27cb486764b011c7068d7a1d352f679
+DIST tl-texdef.source-2021.tar.xz 4884 BLAKE2B 1db15054d97e70e696a01e05f218baa2b87d35bcfef69b85c64e801cacea7a131ef565f0e443d32b19060a36c76703ad5228f43fbe16b96e3502990352322ffd SHA512 ebf0284c4c8fdc35c8b6895f054d5055568a5e4b8edb061c91da4627b017dc7cb033943c11390f3d05923761a617354ea56ef95d3bf1a02cde66e55ecd734e1d
+DIST tl-texdiff-2021.tar.xz 7172 BLAKE2B b68d85c65018983ca389a365efa425e1f30b015b376bc64449ad155b2a93ffbcadb1d005155c63f32404eb4b72de786896779a2deb922438f01a3692324b1c0c SHA512 26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a
+DIST tl-texdiff.doc-2021.tar.xz 10296 BLAKE2B e9bf5a7721ad75a86f406efe948df02c7db85a69317a0d12c601d491bf80c62a8fb5d944441d683a0e5125b7c74e7f48ff97298a7e1b5d34f484c19de39e4afe SHA512 d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948
+DIST tl-texdirflatten-2021.tar.xz 4836 BLAKE2B b3f57b0921471a8c41564129f39c0eb6d4d6f898e9279c96de90d22fc52c5d5d34ad37c0abe14e30dc264e0e6396e4dec0f62e74d45c147cd1eabe0f647c7f4a SHA512 3cd6cf4d9ff3a1a3daef0bd5a998417696f6645cb54679e99e5424ebbe3926c45acad7b999ee4371392a7ba13fe3f2899438ce66efca7829c7aa1eaef84aa6e5
+DIST tl-texdirflatten.doc-2021.tar.xz 11016 BLAKE2B e48d4b9da81e21a574c203ac8cc215e2ec5448150d65ce1a0291bc05135fd1192761318cff45d9ee7b89642836ad3e3ad688a42323206d7b01c0cecb11cd216f SHA512 1114dce13ac47c4352e968f42e89582b62b2702bc25ce3a9a4fd766b3bd63607e11eab52d19bc9f809b2b67cd92153c4f591632cfc72dcaf1c0a1b1cfb416b11
+DIST tl-texdoc-2021.tar.xz 26744 BLAKE2B 9b4080193dfb5b4d2bf8131d1f5a60ecab961433b47f701d49139b032f04896aeeb34de7ee8cba4c4a64d84c4456a7097c98c0f0ba31e6f127970e755a921430 SHA512 dcca9f32cf1e8e7e36520fdad754c4b49655aa14b0edcbe209ac4144e331c95d404869ea18f0ba30fcd39cc2d29a48bbf4ab61473f816f8fa46c5201553b83d7
+DIST tl-texdoc.doc-2021.tar.xz 134128 BLAKE2B c17f7ef2e6360937a6198fed48aa5a8167ef7109ae351f29848b4ce6657aec6264e90a890090ae20e06fc2489f27337d0ffbfa05e6d27e4fe97eb20af32f6512 SHA512 4bd778ff587d845f802c96ec99e41266c957b94ef04f1e63cccea081ef70d5b448f4234bba07b835882a193ce36b9571ec7e5d3cd2422143237c1d8ef3c6c357
+DIST tl-texfot-2021.tar.xz 6244 BLAKE2B 6d3474ba15ef0daa57612d432bc9004f20c31fea1b2b0b33ebe12c7fd6b6cfc452dab1e4ffa10c440398d0488e0d1c90cac975a9935728319bc6159b24862bdc SHA512 9565c8106738793c9c14c8f42c750857bc64c324c190344267f99ee3e383f8052ff5df100298f4d7963ff44953c3af01a58ff8cfeee5237e0f07035ee6066be1
+DIST tl-texfot.doc-2021.tar.xz 30972 BLAKE2B 1f4c9a82351c55e4d3d4b85e96a583d8d192fa2b3e3fad1db1746a65a67c9eab561382c1c54e8be93b002bcaa7c48950df095d9f7d5202c302273ca1f0c0ee45 SHA512 1779cc8d4a6dd35acc591f959500e155b5ce155b75383c7b7478e934d00c508aa84f8acf13b07a2e67f529bcd125c7868d3a30d851f293ea149cf5a56d3cfcb6
+DIST tl-texlive-scripts-2021.tar.xz 132292 BLAKE2B f20e14f742d2e09836d3463c843623f6874eaca47f900890b2b7216878a2892d1b4ae44049bdba09b7b7f5e85752b1bb7a582d23310148ed789edc581b4f0304 SHA512 40b6ca05bc9fff62f4dbf9f2d327a6c6f2e54a276cd659ef0d54f4dd7a98ef1a8540a84e7c35a2a864fd5d3262644987ebc67e69ebcaab5138a0b3d0d192a576
+DIST tl-texlive-scripts-extra-2021.tar.xz 23540 BLAKE2B 3790f45b6e59147f1c4db42d466a488c32e172c8693db6932d8a37db11ebc0d512f4ba32876f4f7588091ed633bff23da2cacc6f9caa72d0fb5041406e4a0098 SHA512 e46691aa10b961d2359359fdf00ebc86a1b881b3d1126c52f3863343d21eba00110cd9500fb03a4a9544a3d8fb443bbdc90aa2f6216b8e62a3edb0acc58e4c75
+DIST tl-texlive-scripts-extra.doc-2021.tar.xz 195144 BLAKE2B 3ae5bc4aeb251fa9bf8e710877d3c1514f0d244b4bd5740ac1d184f0ec8a0a5d2813419a3a71e9fdf3e0b473e8cf3b85b11d3eb0cdeaa1fb3dd0f2a95af7ff2b SHA512 56f9be73e3318ea684c536b90645b572caf437b16339104bcedfb7517c94745a514a8e185033c2338aeccae868a123a5a137b9b07b20d661fa473bde2c28797b
+DIST tl-texlive-scripts.doc-2021.tar.xz 218848 BLAKE2B 3fb4ab6e2c2d6fdd8da3c092f4d66094e9fbd9dd3ad07d22369468c10c631f0675fdf69c3e0ab2aaf50c1a06048e1f555ddecc78afea044472aaf6f3d1a621cb SHA512 2e90a3100c2b1205400bd160bab227914e36df33f6d235bcd2c7ee2ebd82e3210ce7437c44aa23abbde4eb953dfd17012759429eea5edbd89411f451c0a3daa9
+DIST tl-texlive.infra-2021.tar.xz 227904 BLAKE2B d5efc82092d0b56ac2aa2272429e142c22e58e8f8b78691e43230f3890ebf9104fa2279dbaa14a502a29afc88d0619ba05fb1176490a52c28df20472fa15683d SHA512 11cbf324450407dfdcc932e6ffe6c9e31ada5ef151d76b76d16e73de1053236d5da145f58d56892ded8c5ecc5bc89b63bc2a7a9ddd55d3fcc87198c8d859bc05
+DIST tl-texlive.infra.doc-2021.tar.xz 205324 BLAKE2B 7c00cc17fcf15f177372951a0bd25216ceec6ad589b0bcedd70e6cfe139e2ecc23ad0632e17ca02beebb20454f90700ebcfefa3d7b3f736c3fd727ee00459fed SHA512 0b2477f485c7615b131c7dd5f04eec8b454915832d2f9f0453b4a152520672d3691ce2ee11de2e38b8010d785353be022e8404b32f43b787c16b87182f7714b7
+DIST tl-texliveonfly-2021.tar.xz 6132 BLAKE2B 065f77fac4cb7c52a6f8510fdb1307fc4bbd1c0267bc8ec636495cf1fabae0d75b4f2e21644b55d120b3c8ac3d58705a2b13ee26d46e679ec46fde9267101c16 SHA512 63353a768b700ea11982e9552046dfd1dc3d844883f03099833cabe2af5ccddecebd7ef737fbcd256c90304174165a4d283d4912f8311508e61c723d751619a7
+DIST tl-texliveonfly.doc-2021.tar.xz 700 BLAKE2B 7cd2a7e87773157ebee19a01792735176c50e7b965ddc7bdacdd1c740bf7bb10308b956e0f833e9f05f8c7b3eeb28313efc3c7cb926346dbefa2c343a8b5472a SHA512 46d57a6ebd68a56d55ccddc68006693fcbad8ed8f809243a3ffac7adb82da58cbc28239b57556d5d8d6388ea034b6571557588ff9365d4891145d5cc3fabfaea
+DIST tl-texloganalyser-2021.tar.xz 4180 BLAKE2B 8fd8e2becd2a26eeeecf75674581bb16651055ad54856348fc9bc58bb7ebc2d3e254eeb191bc04fd6746ab04714b22bb99c503b1114256c8f4f2f5dcc40c9fb3 SHA512 85f491af4a3867283d56bc2d98ebcf491e622008b3a70bb2cae03b9deb38170e1c73088d109445fac11fcce6e10aac57f42f03066580a79c978dd19af1f74caa
+DIST tl-texloganalyser.doc-2021.tar.xz 760 BLAKE2B 5a039ff79917899f2987e5956a88a8c9f0d07226511689b25547128588526eb27f563e60d67148a9104eec82433751c22c2e1894014a00b401beec08478827f6 SHA512 8eb890f880dc56d37e29e2f0bb3228e36031d45010677097136d40959ba7ec0cdd10b5056169325f481318f137a9de2f180438f1716bfa12705fcf0db315e3cb
+DIST tl-texosquery-2021.tar.xz 170304 BLAKE2B 624e1aec8c907d7e3533983f46757ce1b711b84327874889d0a335240e6889b11604002c2dd9dd0368ba1e6637b1c02c15dfbde736f2cd0e96ba23212994c1f2 SHA512 d454a95139920c24404a501ad3bbde4ae8e809e0f0b6b7c32053d375e0cac31d81087a53d65ab067c9c6dfd988ae90429adbc5d7cd2e1b23f41f46dbf6a25056
+DIST tl-texosquery.doc-2021.tar.xz 503224 BLAKE2B a4e373b5887b9b2eb2a3dc177e58f37f6915aa136103424aa94a58bde0d968837b425216faebdc1838c35e52e286def4a32b648dc495c0d22fe9aeee588e6f79 SHA512 51bc4e5a9f62b4526198b380fa69dd2d79ff69ccf0915aef4269d890fed057c4130ccca65e0c279e58ebfb72347d627b186534138f9c4bc8d395677c73a2a0fc
+DIST tl-texosquery.source-2021.tar.xz 71404 BLAKE2B fe400563e70c2015961e695a115b651e3d21fe82207b34238ad2af84a28fe156c59a6876742bbf0695bac716c86998cd5df1fa54e2d9b4b5b72403c75c98accc SHA512 5ed0dddadb7e8f406635d7a2cc309a030826607a76b4520b1f47a07affb603d96577118ba1fb5b9797322aa49a68616acbbcdde39bc8538c54c5d2fa1aebe510
+DIST tl-texplate-2021.tar.xz 3031472 BLAKE2B 56e70972534507b4201b8a3df1dd6f3a2c517deaec881e897d0da34da78e25bcfb3849baea02479b555cb4c7a2e8c58fc3b962b41ba2be796f355b9b0c126de6 SHA512 dc7f998438ad699af41d1a83214ba5b62399c5390ad1672b40ecaf9bc48fd04ca91bf4ceb1bf75c89351d612d8c9f0acd3bd145b5560673bb864fdb4c18375f2
+DIST tl-texplate.doc-2021.tar.xz 110368 BLAKE2B 675d579633e1f5afb1f43e1d9f5485eb7da8e3bcf0fcb5fd1d4ae7c7dfd9807800cd7a63b78b89400d3e256a1515fe070098535a5478b3636cb259e7daf43def SHA512 620f820e08f000032608280ad4e93d5aabbcf6e42008c1f74d2b876d5fd67724ca1d6ce22d6046184cd4e0ec205f4aad767a24db79d11e6c40269df32b5644b6
+DIST tl-texplate.source-2021.tar.xz 8428 BLAKE2B 2b685cce0cc352e9c279b2a7ac70bc771f2d7946d9633e490c243f7447e79c27a1a076e83e5b7ccfcc9fd73eba82a1dd68a4b270f4911792f3e412402e6ba588 SHA512 e87854021487832cecab1cb8a5585d44c25a80c52ed4d020cebaae9b7c1c938c3ffd43ed51a1910442440131e4d8f6acf2af095b58d2a119ea279e3de78736b6
+DIST tl-texware-2021.tar.xz 636 BLAKE2B 8451f8a9e76728dbbc9cbe5e63b598a07a43175529d0bcdff73d4b1199d023143ff1cf1990ecd0b536181388a9c8d0ea0451c6e8c5e8ef716ad105a7f42d670e SHA512 9dbd7b278d471138f0326d274e127e79ba472063316e24937c203f65eb343892b34d04ca37622984cb0847ff98f143d5bd01853f801d0569b9378a0de8b185b0
+DIST tl-texware.doc-2021.tar.xz 34396 BLAKE2B 06a3fd3f420f22d3ab0ebbec3642c4a521329de4e0acd0f74e01b585a0fedd5b477f3d1b02520ea32c0885f023b1d3c4677a51647a50a5bb757ca9981036d06b SHA512 fefb274a0f1980e70219d1fa625167688e086b40f5cfb4eb2bb81725425524f27832b4ccb2200747fd1a7e1357de9320401295740b65c81920494d71a9ef0290
+DIST tl-tie-2021.tar.xz 476 BLAKE2B 0cae03ad8fd1dbdf268a8c25a7a65e2b72fd695bc61e35a4be7819e9a1b654276c9fb8fba9c36e482dcd287b414ee01d8273a89c70627fd4cc863937614b9aa8 SHA512 1403e6e2e2e7121ac374a337323d1a8ec4f2ccc8c1d1a7b769a0a771afc61266999979f8a2613d00edb8355b13c794ec32a316bd2dd9f37339a8c826764e25ad
+DIST tl-tie.doc-2021.tar.xz 14820 BLAKE2B 863ec74e04beb6a20dbafb455dee77d6c04f2ba38cc3333c9a5a81d0bbdfc4e3c102accb5553a619d8a8176b10aaa65ad9ea6fe593fe761c995c6f3d8cda2a32 SHA512 8210c9c6252a383b7a4c1cbdcbf3ae7fd051d0506f2862249fa595097d25876ce6f0553ff8770507786412f94b50abd069d3f6fcda5e3275b9267100bd37805c
+DIST tl-tlcockpit-2021.tar.xz 71652184 BLAKE2B d329ee73338b4aa10df74cbce575b8bdf0d7a7539e53651d33c67da1bc600f7dae1419eba1161ae0b4e11be98fe82f3d5de7fd84bb0ba4082c4459dea85e2cc7 SHA512 50817d4c68d4e302cf0f4075ff9321bde2fd26336923efd2fb39bf097090b617a2a67ce75d1a14d562939514acb17b2a356bc388f72049dbe52a868ff3d63ffd
+DIST tl-tlcockpit.doc-2021.tar.xz 1023876 BLAKE2B 691c980b923aad8bbf179a562acb0c8389850c5717581fbbc485609b9dd1675ce508599ca769ce9988140cdd3c75a078ee4683ba720a75c7bb28cfd75ca0d2c4 SHA512 d40cec8456db0d9fdd55b76c84b40565a8b16d7639084eaa5dbc61c3bd2ebd73fdde6f40b11007835be242a9103cdc5ecbbecb6082ad650663968db18cc1b04d
+DIST tl-tlcockpit.source-2021.tar.xz 97896 BLAKE2B 7063cb0f1fd294bbaa0b3f4490f92d25417a5c267d3d82ef419a0abb2e1569d8c4a89d517350ab8ac99b262907f65f63c94ed99e7291afad62bd60d4330eb8af SHA512 01a9038bab5226f57922215e6dac5acf69ba2bae866f72df1d2d4a3a6252fef78e18d1e7b2a8baf327bd4b89262abe6750b0dd1166f47868e797e50b205322a2
+DIST tl-tpic2pdftex-2021.tar.xz 444 BLAKE2B 37bb1d8799068bc09fca6fffc5d43ab314f44b564221faa9ca23aecb84b3686b9e279b1aa3ee4664537fd943d944158034943ea4d1f8fcaedd4cdb2acc5dbfaf SHA512 fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226
+DIST tl-tpic2pdftex.doc-2021.tar.xz 54400 BLAKE2B 66f8087a6f8a1337a55bb3b29a9d407a54a5b79dc48eb50144eb0b505d3735ccc3d192669a95ea9e62ffc20927f48f03933c353557f7c49df5edc27c4573a6f1 SHA512 f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547
+DIST tl-typeoutfileinfo-2021.tar.xz 1628 BLAKE2B f934ffec09993f9ccc2958330442c594f45710de2d1f7565f978ab5bed2069a67b06ed289840f190935e16fe25c49b849d4cb12261a429cb6747c175bef59970 SHA512 b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd
+DIST tl-typeoutfileinfo.doc-2021.tar.xz 756 BLAKE2B 00d7c631ba6815997b46ec9adf1eed4f765a583de7fc5925349ebef150f633d34325ce7831e89fdffdf0c3f64147b0da5b883d9000c6555ea04e16880645abc3 SHA512 143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920
+DIST tl-web-2021.tar.xz 496 BLAKE2B b4dcaa7fc84b4cb0f9696fab2fd0f8d39268af55fd57650404ad427e6a235c988b3a738400ae5b1d1bc1b2f3ec240775e3993904a2e3535c4baf5a7d9c0170cb SHA512 a916d755f7eadc4b24aab224fe0544ee567accaa650ef697002e6c2cee20802081ed227a066b231d9cd6309271c6b10ef124b86e38d729f2793aa48c6000f5cd
+DIST tl-web.doc-2021.tar.xz 41492 BLAKE2B c158458c2664449df869ac086ddd8c6b1a80973af15ed5bf58cb2b2ef521af05beb6af4dacef212665f118117673729aaff01c94dd15fb22a3da7cf035fc3409 SHA512 8f82d31082c40bacac61e0bade53a610c232452aba7a3bad3dd62b26f2e50929ed76e929d57ef1c26969769b3aaa003a82d6bf2bf836c6a3a7d44b5a2440e9e9
+DIST tl-xindex-2021.tar.xz 31564 BLAKE2B 89d1a5a35379cf124d3f3b791553a7e7994b7c5ea1b9a30af992f08506553fe401d6ed5e1c22d60617176705a585383b3d8265ae3d6f890bd6edbf6f7002494d SHA512 e8a858e3fe056519eed3f85dc21291881fdbf057ece76d503fd863f66c51331d689fabbb7a1ba3728c3010c45a9f0663fb75db2b609716ee5dd515067bea07a5
+DIST tl-xindex.doc-2021.tar.xz 472592 BLAKE2B 3b322c4358fc719268b01fba1c447999035b9b0c5828a157bf4c3df9788340c772881cf79f1ff68b3d264d5bc6398d8f6c89ff49761bfef19af236757232fc7e SHA512 f755500e75fa45d14110da45bd43d10f4cf170cc907af7743673a38e1c823612fce9131eb16a03e59a1a821b1e4b3580e6a2e6a68e759f53f9daea4f88e4f09e
+DIST tl-xindy-2021.tar.xz 140664 BLAKE2B e433084708433d1a40216a63a31fe64ae0afa0b6d430e849d85f2a81f03c2723cb80c0688e44a2af3d19d783613cdce27a61de0ee333d15bea7a5fd875b2448e SHA512 8a2db7333ee39936892ad83eed0d31de25cdc48533dbbcb297e3a8714fefa6d7973b9e9eb7767a50f11be89afa7eb944bb56064a14b71d23bf8161f7fddf8d7c
+DIST tl-xindy.doc-2021.tar.xz 461176 BLAKE2B 602862a30d0c2fed12df2b2c9e1f12014a7f64f87c82525ca275f82abc2edf4b0e5a77b789d68bd7f56916c16932174c973df7721464b25e9d2ec82962dd5a90 SHA512 4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23
+DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b729308616e749447aacfad4b63254b7c4bbbde79a053c20caaf4abc4636f8276c8e60f5320fd3e5305444d0f5d197 SHA512 fe873bb22b94a26720e37671e283e0085619c2129a4568399544ac0df1e5c443a9476590ca7ef76a21409589eb2416a14165b8a48a6182f3773a3009cb7c1a47
+DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
+DIST tpic2pdftex.doc.r52851.tar.xz 54400 BLAKE2B 66f8087a6f8a1337a55bb3b29a9d407a54a5b79dc48eb50144eb0b505d3735ccc3d192669a95ea9e62ffc20927f48f03933c353557f7c49df5edc27c4573a6f1 SHA512 f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547
+DIST tpic2pdftex.r52851.tar.xz 444 BLAKE2B 37bb1d8799068bc09fca6fffc5d43ab314f44b564221faa9ca23aecb84b3686b9e279b1aa3ee4664537fd943d944158034943ea4d1f8fcaedd4cdb2acc5dbfaf SHA512 fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226
+DIST upmendex.doc.r66381.tar.xz 968624 BLAKE2B 193cadbed3430f4636ef0a3cd86e972d510c113e60ca26f15547b081ae7992195a991bbff8409721ec1bd9a7596d4b29994e1d4b566adcbfa8af693225212c39 SHA512 ec4d1670ff84680fcab88e29ca5f4306f44450ccca9cba06282ad34bd026f74b46d166724a06a313957ca8d798b0c296e848bb248ad416597a99afb16b4b5a0c
+DIST upmendex.r66381.tar.xz 740 BLAKE2B 8eb905b2c6c03ed922580e8e4753e67430de76376ca10b1517bb4f974fabbf428a286876656d210d6ff9c433f79a6fccad9353d08aed73d1b8a3952383361ba1 SHA512 947d733e5b96ee6a621e9686357b8c3f8638c0bc482f4efaac87a72117160f81ad7aa0d34088e61e67982b345b56ec478ef3b6a49865ffb3d5512a7bf18d2b8e
+DIST velthuis.doc.r66186.tar.xz 979936 BLAKE2B e1ac5b3bc747b17c5ab39e89d7f1634ac48cc9cc0b3883ca54ca039cf1f69e4b7f025f4cc0fcdaea85c921147db525e836e3201f387a84413db9c916c40fc268 SHA512 06a9330410b55052759e18efa8720ef65f0f3dc8a2f15d3c0a0c8f70edaf8de65eeef8ec10a9a376b4b285b1c8f619278f68e9a2bd7ba1622da72b6ff488f8f7
+DIST velthuis.r66186.tar.xz 4149432 BLAKE2B 84e6a6c390e5e2f4082229d688761596880f8115531587df7ac637c6eb53090e035e758d0cde60ba30559d856df2108637d19c8282279d5d95a28dd3e950b635 SHA512 b7901813517790a92a921b1202c39a058d53a4159634cae79960ec7ce2da08acb757b307b5066ab1251e4b460234fd9dd98c2e404c05fc6384c656472302e3ec
+DIST vlna.doc.r66186.tar.xz 142752 BLAKE2B 2a7a5aa68e189e8297c0bb714ae80ef33b765de542626f5800dc1ef87dc8e66a613eb055ece652124c340b159ec7a317d2d3a44bb2c8e01187b9b9d5392b5a25 SHA512 921d76535cbe7e940617355c74b82acfc61edb840db8ed9cae1aaf987fe6b83245505048c7c550d59829b204f139ae1cfd44601435e2fff2b0d5230b45a27b77
+DIST vlna.r66186.tar.xz 380 BLAKE2B 91840e28251f06b724eb5860c853d54db9cc0ce0063b911d7c28d24e1b7bc863bec0eaf7f595e666938d8c2a54c2438d52d086fc5c8b70ebf20f3998d0258381 SHA512 6c66717442bca3306e23f5d546e17929240ce9626a562b9e56512446998996d38f83f78fbb39e46bde0b9faf0db7eb0c0218c79e1d66711d6cd3c64a8778edec
+DIST xindy.doc.r65958.tar.xz 461176 BLAKE2B 417d49c0fbc35ea5e24146894284cd2ec9109271570f49aca90352d2d38969ee60b934134babe8107161e2f2975d91787f321b805dded6eae96add1e5ebfa9dc SHA512 d0dacd7cfa169b03b7fa9d0b351133582577c3908323f501d7bca7b0165159b72c34f62abfd73b97065baef8cf179b292e654759f3b3e324112623539e5acfd6
+DIST xindy.r65958.tar.xz 143636 BLAKE2B 72c6f4a78e77d3a348c4666dd8e322b446b7dd6d418c1f9880ea2508e274878d3f2a992e5876fb410ab4c39d7f317a6b236afc65c5486d04dbe0838c0a07eca4 SHA512 9b7fe97c14e3cf30d1e6743c2d7b4460e8bca901ba3ee216001f1518ff4d834fb3d9b67085825a6e152c6acde544c41cf16d56e609016caab89a594305a21599
+DIST xml2pmx.doc.r57972.tar.xz 15512 BLAKE2B dafe9dabe542a746a962a02fd04a483181544afd319b501ea0f4b0c74ce9d049840c65fa5e7e497571ae04c409b8c3cb11815f0dbfff4c8c3ae01a3e639f6ca8 SHA512 973960f65159f5107caa7e9a041dca75f0171fc61f94794c7b7560eb9b6898534974fb8b360a28dfa3a01d422b71618bcaf8aba2ed25ae4d4b9f67d24ab730be
+DIST xml2pmx.r57972.tar.xz 496 BLAKE2B 52d22c6616dc74d3e6600ef18449af31b2c286be9fe0bcacdffa2daa260f409baf8c7af1ce8444486b2fe3e21a05ec22aed280a55f227a1693b27ff3c55eed8b SHA512 9545fb5ca0e95788afab79d8a29336f337619adbcac68472bb5de6af6c54187f19bda655232175223168891c064f6fadc67c4ab8f5a0256e2c55e1a65c5e6f6b
diff --git a/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch b/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch
new file mode 100644
index 000000000000..07ca8933facf
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2021-cairo-strings.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/853121
+https://bugs.gentoo.org/726200
+--- a/libs/cairo/m4/float.m4
++++ b/libs/cairo/m4/float.m4
+@@ -22,23 +22,24 @@ AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
+ # file, the target platform stores float words in big-endian order. If grep
+ # finds "seesnoon", float words are in little-endian order. If neither value
+ # is found, the user is instructed to specify the ordering.
+
+ ax_cv_c_float_words_bigendian=unknown
+-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
++AC_LINK_IFELSE([AC_LANG_SOURCE([[
+
+-double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
++double d __attribute__((used)) = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
++int main() { return 0; }
+
+ ]])], [
+
+ # allow users to override default 'strings' with 'llvm-strings'
+ # or ${CHOST}-strings.
+ AC_CHECK_TOOL([STRINGS], [strings])
+-if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then
++if $STRINGS - conftest | grep noonsees >/dev/null ; then
+ ax_cv_c_float_words_bigendian=yes
+ fi
+-if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then
++if $STRINGS - conftest | grep seesnoon >/dev/null ; then
+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
+ ax_cv_c_float_words_bigendian=no
+ else
+ ax_cv_c_float_words_bigendian=unknown
+ fi
+
diff --git a/app-text/texlive-core/files/texlive-core-2021-clang-16.patch b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
new file mode 100644
index 000000000000..8d5f421544f8
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2021-clang-16.patch
@@ -0,0 +1,221 @@
+https://bugs.gentoo.org/874546
+https://bugs.gentoo.org/882245
+
+https://github.com/TeX-Live/texlive-source/commit/3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a
+https://github.com/TeX-Live/texlive-source/commit/60b60503b21ea43c68d1ffbe214141a79a36190b
+https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7
+
+From 3b1470c8911cd4bc9e4a02bfb5cac0f3bebcab3a Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Sat, 5 Nov 2022 15:43:53 +0000
+Subject: [PATCH] stdlib.h to placate clang16
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@64941 c570f23f-e606-0410-a88d-b1316a301751
+--- a/texk/dvisvgm/configure
++++ b/texk/dvisvgm/configure
+@@ -23415,6 +23415,7 @@ else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdio.h>
++ #include <stdlib.h>
+ #include <ghostscript/iapi.h>
+ int main () {
+ gsapi_revision_t r;
+--- a/texk/dvisvgm/configure.ac
++++ b/texk/dvisvgm/configure.ac
+@@ -94,6 +94,7 @@ else
+ # query Ghostscript version
+ AC_MSG_CHECKING([Ghostscript version])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
++ #include <stdlib.h>
+ #include <ghostscript/iapi.h>
+ int main () {
+ gsapi_revision_t r;
+--- a/texk/kpathsea/configure
++++ b/texk/kpathsea/configure
+@@ -14633,7 +14633,8 @@ then :
+ else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-int fork() { exit(1); }
++#include <stdlib.h>
++ int fork() { exit(1); }
+ int vfork() { exit(1); }
+ extern char *getcwd();
+ char path[100];
+--- a/texk/kpathsea/configure.ac
++++ b/texk/kpathsea/configure.ac
+@@ -45,7 +45,8 @@ if test "x$ac_cv_func_getcwd" = xyes; then
+ # We only need to run this if we have getcwd.
+ AC_CACHE_CHECK([whether getcwd uses fork or vfork],
+ [kb_cv_func_getcwd_forks],
+- [AC_RUN_IFELSE([AC_LANG_PROGRAM([[int fork() { exit(1); }
++ [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
++ int fork() { exit(1); }
+ int vfork() { exit(1); }
+ extern char *getcwd();
+ char path[100];]],
+
+From 60b60503b21ea43c68d1ffbe214141a79a36190b Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Sun, 6 Nov 2022 22:15:26 +0000
+Subject: [PATCH] void main, void args, more clang16 from sam
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@64953 c570f23f-e606-0410-a88d-b1316a301751
+--- /dev/null
++++ b/libs/freetype2/TLpatches/patch-04-void-main
+@@ -0,0 +1,13 @@
++diff --git a/libs/freetype2/freetype-src/builds/unix/freetype2.m4 b/libs/freetype2/freetype-src/builds/unix/freetype2.m4
++index 0cafc8e8c..51843f5fa 100644
++--- a/libs/freetype2/freetype-src/builds/unix/freetype2.m4
+++++ b/libs/freetype2/freetype-src/builds/unix/freetype2.m4
++@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
++ #include <stdlib.h>
++
++ int
++-main()
+++main(void)
++ {
++ FT_Library library;
++ FT_Error error;
+--- a/libs/freetype2/freetype-src/builds/unix/freetype2.m4
++++ b/libs/freetype2/freetype-src/builds/unix/freetype2.m4
+@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
+ #include <stdlib.h>
+
+ int
+-main()
++main(void)
+ {
+ FT_Library library;
+ FT_Error error;
+--- /dev/null
++++ b/libs/gd/TLpatches/patch-03-void-main
+@@ -0,0 +1,13 @@
++diff --git a/libs/gd/libgd-src/tests/xpm/bug00185.c b/libs/gd/libgd-src/tests/xpm/bug00185.c
++index 3056ed950..37659d6a4 100644
++--- a/libs/gd/libgd-src/tests/xpm/bug00185.c
+++++ b/libs/gd/libgd-src/tests/xpm/bug00185.c
++@@ -5,7 +5,7 @@
++
++ /* To check memory leaks, run such as 'valgrind --leak-check=full ./bug00185' */
++ int
++-main()
+++main(void)
++ {
++ gdImagePtr im;
++ char *path;
+--- a/libs/gd/libgd-src/tests/xpm/bug00185.c
++++ b/libs/gd/libgd-src/tests/xpm/bug00185.c
+@@ -5,7 +5,7 @@
+
+ /* To check memory leaks, run such as 'valgrind --leak-check=full ./bug00185' */
+ int
+-main()
++main(void)
+ {
+ gdImagePtr im;
+ char *path;
+--- a/texk/ps2pk/basename.c
++++ b/texk/ps2pk/basename.c
+@@ -6,11 +6,12 @@
+ * AUTHOR: Piet Tutelaers
+ * VERSION: 1.0 (Sept. 1995)
+ */
++#include <stdlib.h> /* exit() */
+ #include <stdio.h> /* printf() */
+ #include "basics.h" /* fatal() */
+ #include "filenames.h" /* basename() */
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ if (argc < 2 || argc > 3)
+ fatal("Usage: basename string [suffix]\n");
+--- a/utils/m-tx/mtx-src/prepmx.c
++++ b/utils/m-tx/mtx-src/prepmx.c
+@@ -769,7 +769,7 @@ Static void topOfPMXfile(void)
+ }
+
+
+-main(int argc, Char *argv[])
++int main(int argc, Char *argv[])
+ { /* ---- Main program ------------------------ */
+ PASCAL_MAIN(argc, argv);
+ strcpy(this_version, version);
+--- /dev/null
++++ b/utils/pmx/TLpatches/patch-01-main-ret
+@@ -0,0 +1,13 @@
++diff --git a/utils/pmx/pmx-src/libf2c/main.c b/utils/pmx/pmx-src/libf2c/main.c
++index 453974904..f485a0cd0 100644
++--- a/utils/pmx/pmx-src/libf2c/main.c
+++++ b/utils/pmx/pmx-src/libf2c/main.c
++@@ -106,7 +106,7 @@ char **xargv;
++ #ifdef KR_headers
++ main(argc, argv) int argc; char **argv;
++ #else
++-main(int argc, char **argv)
+++int main(int argc, char **argv)
++ #endif
++ {
++ xargc = argc;
+--- a/utils/pmx/pmx-src/libf2c/main.c
++++ b/utils/pmx/pmx-src/libf2c/main.c
+@@ -106,7 +106,7 @@ char **xargv;
+ #ifdef KR_headers
+ main(argc, argv) int argc; char **argv;
+ #else
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ #endif
+ {
+ xargc = argc;
+
+From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Thu, 2 Feb 2023 22:57:47 +0000
+Subject: [PATCH] avoid implicit wait and exit declarations for C99
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751
+--- a/texk/xdvik/configure
++++ b/texk/xdvik/configure
+@@ -15455,6 +15455,9 @@ else
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif
+@@ -15476,7 +15479,7 @@ main ()
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ _exit(
+ /* Was there some problem with vforking? */
+ child < 0
+
+--- a/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4
++++ b/texk/xdvik/m4/xdvi-func-setsid-in-fork.m4
+@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif]],
+@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ _exit(
+ /* Was there some problem with vforking? */
+ child < 0
+
diff --git a/app-text/texlive-core/files/texlive-core-2021-slibtool.patch b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
new file mode 100644
index 000000000000..4b026177b686
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
@@ -0,0 +1,98 @@
+https://bugs.gentoo.org/775170
+https://tug.org/svn/texlive?view=revision&revision=61639
+--- a/texk/web2c/web2c/Makefile.in
++++ b/texk/web2c/web2c/Makefile.in
+@@ -127,8 +127,7 @@
+ libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
+ am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
+ fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
+-am__DEPENDENCIES_1 =
+-fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1)
++fixwrites_DEPENDENCIES = $(web2c_LDADD)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -138,11 +137,11 @@
+ makecpool_LDADD = $(LDADD)
+ am_splitup_OBJECTS = splitup.$(OBJEXT)
+ splitup_OBJECTS = $(am_splitup_OBJECTS)
+-splitup_DEPENDENCIES = $(am__DEPENDENCIES_1)
++splitup_DEPENDENCIES = $(web2c_LDADD)
+ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
+ main.$(OBJEXT)
+ web2c_OBJECTS = $(am_web2c_OBJECTS)
+-web2c_DEPENDENCIES =
++web2c_DEPENDENCIES = libweb2c.a
+ SCRIPTS = $(dist_noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -416,7 +415,7 @@
+ main.c \
+ web2c.h
+
+-web2c_LDADD = -L. -lweb2c
++web2c_LDADD = libweb2c.a
+ fixwrites_SOURCES = \
+ fixwrites.c
+
+--- a/texk/web2c/web2c/Makefile.in
++++ b/texk/web2c/web2c/Makefile.in
+@@ -127,7 +127,6 @@
+ libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
+ am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
+ fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
+-fixwrites_DEPENDENCIES = $(web2c_LDADD)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -137,11 +136,9 @@
+ makecpool_LDADD = $(LDADD)
+ am_splitup_OBJECTS = splitup.$(OBJEXT)
+ splitup_OBJECTS = $(am_splitup_OBJECTS)
+-splitup_DEPENDENCIES = $(web2c_LDADD)
+ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
+ main.$(OBJEXT)
+ web2c_OBJECTS = $(am_web2c_OBJECTS)
+-web2c_DEPENDENCIES = libweb2c.a
+ SCRIPTS = $(dist_noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -395,6 +392,7 @@
+ AM_CFLAGS = $(WARNING_CFLAGS)
+ EXTRA_LIBRARIES = libweb2c.a
+ BUILT_SOURCES = w2c/config.h
++#
+ DISTCLEANFILES = w2c/config.h web2c-parser.output
+ noinst_HEADERS = coerce.h
+ dist_noinst_SCRIPTS = convert
+@@ -415,14 +413,17 @@
+ main.c \
+ web2c.h
+
++web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
+ web2c_LDADD = libweb2c.a
+ fixwrites_SOURCES = \
+ fixwrites.c
+
++fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
+ fixwrites_LDADD = $(web2c_LDADD)
+ splitup_SOURCES = \
+ splitup.c
+
++splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
+ splitup_LDADD = $(web2c_LDADD)
+ makecpool_SOURCES = \
+ makecpool.c
+@@ -973,11 +974,8 @@
+ fi
+
+ $(libweb2c_a_OBJECTS): w2c/config.h
+-
+ $(web2c_OBJECTS): web2c-parser.h stamp-lib
+-
+ $(fixwrites_OBJECTS): stamp-lib
+-
+ $(splitup_OBJECTS): stamp-lib
+
+ stamp-lib:
+
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index 9d35168b92c0..692dea1fc9d2 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
@@ -9,11 +9,12 @@
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
- <longdescription lang="en">
- TeXLive core binaries
- </longdescription>
<use>
<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
<flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
+ <flag name="xindy">Add support for Xindy: A general-purpose index processor.</flag>
</use>
+ <upstream>
+ <remote-id type="github">TeX-Live/texlive-source</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
deleted file mode 100644
index 88f58b3afc2f..000000000000
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="70"
-TL_SOURCE_VERSION=20170524
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-POPPLERPATCHES="${P}-poppler076"
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz
- https://dev.gentoo.org/~dilfridge/distfiles/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch.xz
- https://dev.gentoo.org/~asturm/distfiles/${POPPLERPATCHES}.tar.xz
-"
-# mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
- a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
- ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
- dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
- installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
- latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
- match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
- pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
- synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
- texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
- web collection-binextra
- "
-TL_CORE_BINEXTRA_DOC_MODULES="
- a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
- checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
- cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
- dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
- hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
- latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
- latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
- make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
- pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
- pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
- sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
- texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
- texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
- adhocfilelist.source arara.source checklistings.source hyphenex.source
- listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
- texdef.source texosquery.source
-"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
- !app-text/ptex
- !app-text/tetex
- !<app-text/texlive-2007
- !app-text/xetex
- !<dev-texlive/texlive-basic-2014
- !<dev-texlive/texlive-metapost-2011
- !app-text/dvibook
- !dev-tex/luatex
- !app-text/dvipdfm
- !app-text/dvipdfmx
- !app-text/xdvipdfmx
- sys-libs/zlib
- >=media-libs/libpng-1.2.43-r2:0=
- >=app-text/poppler-0.58.0:=
- >=x11-libs/cairo-1.12
- >=x11-libs/pixman-0.18
- dev-libs/zziplib
- app-text/libpaper
- dev-libs/gmp:0
- dev-libs/mpfr:0=
- xetex? (
- >=media-libs/harfbuzz-1.4.5[icu,graphite]
- >=dev-libs/icu-50:=
- >=app-text/teckit-2.5.3
- media-libs/fontconfig
- media-gfx/graphite2
- )
- media-libs/freetype:2
- >=dev-libs/kpathsea-6.2.3
- cjk? ( >=dev-libs/ptexenc-1.3.5 )"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- sys-apps/ed
- sys-devel/flex
- app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
- >=app-text/ps2pkm-1.8_p20170524
- >=app-text/dvipsk-5.997
- >=dev-tex/bibtexu-3.71_p20170524
- virtual/perl-Getopt-Long
- tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
- cd "${WORKDIR}"
- # From texlive-module.eclass.
- grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
- { for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist"
- for i in $(<"${T}/dirlist"); do
- [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
- done
- for i in $(<"${T}/reloclist"); do
- mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
- done
-
- mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
- cd "${B}"
-
- # bug 655052
- epatch "${WORKDIR}/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch"
-
- #EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
- # bug ?
- epatch "${WORKDIR}/${POPPLERPATCHES}/${P}-poppler064.patch"
-
- if has_version ">=app-text/poppler-0.69.0"; then
- epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448
- fi
-
- if has_version ">=app-text/poppler-0.75.0"; then
- epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-pdftexdir-poppler0{75,76}.patch # bugs #681338, 685284
- epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-luatexdir-poppler0{75,76}.patch # bugs #681338, 685284
- fi
-
- sed -i \
- -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
- texk/web2c/configure || die
-
- elibtoolize
-}
-
-src_configure() {
- # It fails on alpha without this
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Required for newest icu, bug #618732
- append-cxxflags '-std=c++11'
-
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #242430
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
- tc-export CC CXX AR RANLIB
- ECONF_SOURCE="${B}" \
- econf -C \
- --bindir="${EPREFIX}"/usr/bin \
- --datadir="${S}" \
- --with-system-freetype2 \
- --with-system-zlib \
- --with-system-libpng \
- --with-system-xpdf \
- --with-system-poppler \
- --with-system-teckit \
- --with-teckit-includes="${EPREFIX}"/usr/include/teckit \
- --with-system-kpathsea \
- --with-kpathsea-includes="${EPREFIX}"/usr/include \
- --with-system-icu \
- --with-system-ptexenc \
- --with-system-harfbuzz \
- --with-system-icu \
- --with-system-graphite2 \
- --with-system-cairo \
- --with-system-pixman \
- --with-system-zziplib \
- --with-system-libpaper \
- --with-system-gmp \
- --with-system-mpfr \
- --without-texinfo \
- --disable-dialog \
- --disable-multiplatform \
- --enable-epsfwin \
- --enable-mftalkwin \
- --enable-regiswin \
- --enable-tektronixwin \
- --enable-unitermwin \
- --with-ps=gs \
- --disable-psutils \
- --disable-t1utils \
- --enable-ipc \
- --disable-biber \
- --disable-bibtex-x \
- --disable-dvipng \
- --disable-dvipsk \
- --disable-chktex \
- --disable-lcdf-typetools \
- --disable-pdfopen \
- --disable-ps2eps \
- --disable-ps2pk \
- --disable-detex \
- --disable-ttf2pk2 \
- --disable-tex4htk \
- --disable-cjkutils \
- --disable-xdvik \
- --disable-xindy \
- --enable-luatex \
- --disable-dvi2tty \
- --disable-dvisvgm \
- --disable-vlna \
- --enable-shared \
- --disable-native-texlive-build \
- --disable-largefile \
- $(use_enable luajittex) \
- $(use_enable luajittex mfluajit) \
- $(use_enable xetex) \
- $(use_enable cjk ptex) \
- $(use_enable cjk eptex) \
- $(use_enable cjk uptex) \
- $(use_enable cjk euptex) \
- $(use_enable cjk mendexk) \
- $(use_enable cjk makejvf) \
- $(use_enable cjk pmp) \
- $(use_enable cjk upmp) \
- $(use_enable tk texdoctk) \
- $(use_with X x)
-}
-
-src_compile() {
- tc-export CC CXX AR RANLIB
- emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
- cd "${B}" || die
- # Mimic updmap --syncwithtrees to enable only fonts installed
- # Code copied from updmap script
- for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
- texlive-common_is_file_present_in_texmf "$i" || echo "$i"
- done > "${T}/updmap_update"
- {
- sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- } > "${T}/updmap_update2"
- sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
- && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
- dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
- emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
- cd "${B}" || die
- dodir /usr/share # just in case
- cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
- cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
- # When X is disabled mf-nowin doesn't exist but some scripts expect it to
- # exist. Instead, it is called mf, so we symlink it to please everything.
- use X || dosym mf /usr/bin/mf-nowin
-
- docinto texk
- cd "${B}/texk"
- dodoc ChangeLog README
-
- docinto dviljk
- cd "${B}/texk/dviljk"
- dodoc ChangeLog README NEWS
-
- docinto makeindexk
- cd "${B}/texk/makeindexk"
- dodoc ChangeLog NOTES README
-
- docinto web2c
- cd "${B}/texk/web2c"
- dodoc ChangeLog NEWS PROJECTS README
-
- use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
- dodir /etc/env.d
- echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
- # populate /etc/texmf
- keepdir /etc/texmf/web2c
-
- # take care of updmap.cfg and language.d files
- keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
- mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
- # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
- # by texmf-update
- rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
- # Remove bundled and invalid updmap.cfg
- rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
- texlive-common_handle_config_files
-
- keepdir /usr/share/texmf-site
-
- # the virtex symlink is not installed
- # The links has to be relative, since the targets
- # is not present at this stage and MacOS doesn't
- # like non-existing targets
- dosym tex /usr/bin/virtex
- dosym pdftex /usr/bin/pdfvirtex
-
- # Rename mpost to leave room for mplib
- mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
- dosym "mpost-${P}" /usr/bin/mpost
-
- # Ditto for pdftex
- mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
- dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
- etexmf-update
-
- einfo "Regenerating TeX formats"
- fmtutil-sys --all &> /dev/null
-
- elog
- elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
- elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
- elog
- ewarn "If you are migrating from an older TeX distribution"
- ewarn "Please make sure you have read:"
- ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
- ewarn "in order to avoid possible problems"
-}
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r4.ebuild
deleted file mode 100644
index 6005340d469e..000000000000
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TL_SOURCE_VERSION=20190410
-
-inherit flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-PATCHLEVEL=4
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.xz
- mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz
- mirror://gentoo/texlive-tlpdb-${PV}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
- a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
- ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
- dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
- installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
- latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
- match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
- pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
- synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
- texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
- web collection-binextra
- "
-TL_CORE_BINEXTRA_DOC_MODULES="
- a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
- checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
- cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
- dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
- hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
- latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
- latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
- make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
- pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
- pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
- sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
- texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
- texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
- adhocfilelist.source arara.source checklistings.source hyphenex.source
- listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
- texdef.source texosquery.source
-"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
- x11-libs/libX11
- x11-libs/libXmu
- )"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
- !dev-tex/luatex
- sys-libs/zlib
- >=media-libs/libpng-1.2.43-r2:0=
- media-libs/gd[png]
- >=app-text/poppler-0.58.0:=
- >=x11-libs/cairo-1.12
- >=x11-libs/pixman-0.18
- dev-libs/zziplib
- app-text/libpaper
- dev-libs/gmp:0
- dev-libs/mpfr:0=
- xetex? (
- >=media-libs/harfbuzz-1.4.5[icu,graphite]
- >=dev-libs/icu-50:=
- >=app-text/teckit-2.5.3
- media-libs/fontconfig
- media-gfx/graphite2
- )
- media-libs/freetype:2
- >=dev-libs/kpathsea-6.2.3
- cjk? ( >=dev-libs/ptexenc-1.3.7 )
- >=app-text/poppler-0.76.1:="
-
-BDEPEND="sys-apps/ed
- sys-devel/flex
- virtual/pkgconfig"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- >=app-text/ps2pkm-1.8_p20170524
- >=app-text/dvipsk-5.997
- >=dev-tex/bibtexu-3.71_p20170524
- virtual/perl-Getopt-Long
- tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
- cd "${WORKDIR}" || die
-
- mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
-
- # From texlive-module.eclass.
- grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
- { for i in $(<"${T}/reloclist"); do dirname $i; done; } | uniq > "${T}/dirlist"
- for i in $(<"${T}/dirlist"); do
- [ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
- done
- for i in $(<"${T}/reloclist"); do
- mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
- done
-
- mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
- cd "${B}" || die
-
- default
-
- eapply "${WORKDIR}"/patches
-
- sed -i \
- -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
- texk/web2c/configure || die
-
- elibtoolize
-}
-
-src_configure() {
- # It fails on alpha without this
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #242430
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
-
- # Disable freetype-config as this is considered obsolete.
- # Also only pkg-config works for prefix as described in bug #690094
- export ac_cv_prog_ac_ct_FT2_CONFIG=no
-
- tc-export CC CXX AR RANLIB
- ECONF_SOURCE="${B}" \
- econf -C \
- --bindir="${EPREFIX}"/usr/bin \
- --datadir="${S}" \
- --with-system-freetype2 \
- --with-system-zlib \
- --with-system-libpng \
- --with-system-xpdf \
- --with-system-poppler \
- --with-system-teckit \
- --with-teckit-includes="${EPREFIX}"/usr/include/teckit \
- --with-system-kpathsea \
- --with-kpathsea-includes="${EPREFIX}"/usr/include \
- --with-system-icu \
- --with-system-ptexenc \
- --with-system-harfbuzz \
- --with-system-icu \
- --with-system-graphite2 \
- --with-system-cairo \
- --with-system-pixman \
- --with-system-zziplib \
- --with-system-libpaper \
- --with-system-gmp \
- --with-system-gd \
- --with-system-mpfr \
- --without-texinfo \
- --disable-dialog \
- --disable-multiplatform \
- --enable-epsfwin \
- --enable-mftalkwin \
- --enable-regiswin \
- --enable-tektronixwin \
- --enable-unitermwin \
- --with-ps=gs \
- --disable-psutils \
- --disable-t1utils \
- --enable-ipc \
- --disable-biber \
- --disable-bibtex-x \
- --disable-dvipng \
- --disable-dvipsk \
- --disable-chktex \
- --disable-lcdf-typetools \
- --disable-pdfopen \
- --disable-ps2eps \
- --disable-ps2pk \
- --disable-detex \
- --disable-ttf2pk2 \
- --disable-tex4htk \
- --disable-cjkutils \
- --disable-xdvik \
- --disable-xindy \
- --enable-luatex \
- --disable-dvi2tty \
- --disable-dvisvgm \
- --disable-vlna \
- --enable-shared \
- --disable-native-texlive-build \
- --disable-largefile \
- --disable-build-in-source-tree \
- --with-banner-add=" Gentoo Linux" \
- $(use_enable luajittex) \
- $(use_enable luajittex mfluajit) \
- $(use_enable xetex) \
- $(use_enable cjk dviout-util) \
- $(use_enable cjk ptex) \
- $(use_enable cjk eptex) \
- $(use_enable cjk uptex) \
- $(use_enable cjk euptex) \
- $(use_enable cjk mendexk) \
- $(use_enable cjk makejvf) \
- $(use_enable cjk pmp) \
- $(use_enable cjk upmp) \
- $(use_enable tk texdoctk) \
- $(use_with X x)
-}
-
-src_compile() {
- tc-export CC CXX AR RANLIB
- emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
- cd "${B}" || die
- # Mimic updmap --syncwithtrees to enable only fonts installed
- # Code copied from updmap script
- for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
- texlive-common_is_file_present_in_texmf "$i" || echo "$i"
- done > "${T}/updmap_update"
- {
- sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- } > "${T}/updmap_update2"
- sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
- && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
- dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
- emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
- cd "${B}" || die
- dodir /usr/share # just in case
- cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
- cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
- # When X is disabled mf-nowin doesn't exist but some scripts expect it to
- # exist. Instead, it is called mf, so we symlink it to please everything.
- use X || dosym mf /usr/bin/mf-nowin
-
- docinto texk
- cd "${B}/texk" || die
- dodoc ChangeLog README
-
- docinto dviljk
- cd "${B}/texk/dviljk" || die
- dodoc ChangeLog README NEWS
-
- docinto makeindexk
- cd "${B}/texk/makeindexk" || die
- dodoc ChangeLog NOTES README
-
- docinto web2c
- cd "${B}/texk/web2c" || die
- dodoc ChangeLog NEWS PROJECTS README
-
- use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
- dodir /etc/env.d
- echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
- # populate /etc/texmf
- keepdir /etc/texmf/web2c
-
- # take care of updmap.cfg and language.d files
- keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
- mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
- # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
- # by texmf-update
- rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
- # Remove bundled and invalid updmap.cfg
- rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
- texlive-common_handle_config_files
-
- keepdir /usr/share/texmf-site
-
- # the virtex symlink is not installed
- # The links has to be relative, since the targets
- # is not present at this stage and MacOS doesn't
- # like non-existing targets
- dosym tex /usr/bin/virtex
- dosym pdftex /usr/bin/pdfvirtex
-
- # Rename mpost to leave room for mplib
- mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
- dosym "mpost-${P}" /usr/bin/mpost
-
- # Ditto for pdftex
- mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
- dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
- etexmf-update
-
- einfo "Regenerating TeX formats"
- fmtutil-sys --all &> /dev/null
-
- elog
- elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
- elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
- elog
- ewarn "If you are migrating from an older TeX distribution"
- ewarn "Please make sure you have read:"
- ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
- ewarn "in order to avoid possible problems"
-}
diff --git a/app-text/texlive-core/texlive-core-2021-r6.ebuild b/app-text/texlive-core/texlive-core-2021-r6.ebuild
new file mode 100644
index 000000000000..7dae7935c65b
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r6.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20210325
+
+# autotools/reautoconf in src_prepare only needed for Cairo patch
+inherit autotools flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=1
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz
+ https://dev.gentoo.org/~sam/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+ https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
+
+# We ship binextra collection alongside
+TL_CORE_BINEXTRA_MODULES="
+ a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
+ clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
+ dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
+ fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
+ latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
+ listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam
+ pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
+ seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
+ texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
+ texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
+ "
+TL_CORE_BINEXTRA_DOC_MODULES="
+ a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+ checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
+ ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
+ dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
+ dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
+ ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
+ latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+ make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc
+ pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
+ pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc
+ sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+ texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
+ texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc
+ typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+ adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
+ listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+ texdef.source texosquery.source texplate.source tlcockpit.source
+"
+# Macros that are not a part of texlive-sources or collection-binextra but still needed
+# for other packages during installation
+TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libXmu
+ )"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+ !app-text/epspdf
+ !app-text/pdfjam
+ sys-libs/zlib
+ >=media-libs/harfbuzz-1.4.5:=[icu,graphite]
+ >=media-libs/libpng-1.2.43-r2:0=
+ media-libs/gd[png]
+ media-gfx/graphite2
+ >=x11-libs/cairo-1.12
+ >=x11-libs/pixman-0.18
+ dev-libs/zziplib:=
+ app-text/libpaper:=
+ dev-libs/gmp:=
+ dev-libs/mpfr:=
+ >=dev-libs/ptexenc-1.3.8
+ xetex? (
+ >=app-text/teckit-2.5.3
+ media-libs/fontconfig
+ )
+ xindy? ( dev-lisp/clisp:= )
+ media-libs/freetype:2
+ >=dev-libs/icu-50:=
+ >=dev-libs/kpathsea-6.3.2:="
+
+BDEPEND="sys-apps/ed
+ app-alternatives/lex
+ virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ >=app-text/ps2pkm-1.8_p20170524
+ >=app-text/dvipsk-5.997
+ >=dev-tex/bibtexu-3.71_p20170524
+ virtual/perl-Getopt-Long
+ dev-perl/File-HomeDir
+ dev-perl/Log-Dispatch
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ tk? (
+ dev-lang/tk
+ dev-perl/Tk
+ )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+
+ mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+ # From texlive-module.eclass.
+ sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+ sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+ sort -u |
+ xargs mkdir -p || die
+ local i
+ while read i; do
+ mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+ done < "${T}/reloclist"
+
+ mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+ cd "${B}" || die
+
+ sed -i \
+ -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+ texk/web2c/configure || die
+
+ eapply "${WORKDIR}"/patches
+ eapply "${FILESDIR}"/${P}-cairo-strings.patch
+ eapply "${FILESDIR}"/${P}-slibtool.patch
+ eapply "${FILESDIR}"/${P}-clang-16.patch
+
+ default
+
+ elibtoolize
+
+ # Drop this on 2022 bump!
+ "${B}"/reautoconf libs/cairo || die
+}
+
+src_configure() {
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Too many regexps use A-Z a-z constructs, what causes problems with locales
+ # that don't have the same alphabetical order than ascii. Bug #242430
+ # So we set LC_ALL to C in order to avoid problems.
+ export LC_ALL=C
+
+ # Disable freetype-config as this is considered obsolete.
+ # Also only pkg-config works for prefix as described in bug #690094
+ export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+ # revisit/upstream once we bupm to 2022, bug #882245
+ append-cppflags -D_GNU_SOURCE
+
+ tc-export CC CXX AR RANLIB
+ ECONF_SOURCE="${B}" \
+ econf -C \
+ --bindir="${EPREFIX}"/usr/bin \
+ --datadir="${S}" \
+ --with-system-freetype2 \
+ --with-system-zlib \
+ --with-system-libpng \
+ --with-system-teckit \
+ --with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+ --with-system-kpathsea \
+ --with-kpathsea-includes="${EPREFIX}"/usr/include \
+ --with-system-icu \
+ --with-system-ptexenc \
+ --with-system-harfbuzz \
+ --with-system-icu \
+ --with-system-graphite2 \
+ --with-system-cairo \
+ --with-system-pixman \
+ --with-system-zziplib \
+ --with-system-libpaper \
+ --with-system-gmp \
+ --with-system-gd \
+ --with-system-mpfr \
+ --without-texinfo \
+ --disable-dialog \
+ --disable-multiplatform \
+ --enable-chktex \
+ --enable-epsfwin \
+ --enable-detex \
+ --enable-dvi2tty \
+ --enable-mftalkwin \
+ --enable-regiswin \
+ --enable-shared \
+ --enable-tektronixwin \
+ --enable-unitermwin \
+ --enable-vlna \
+ --with-ps=gs \
+ --disable-psutils \
+ --disable-t1utils \
+ --enable-ipc \
+ --disable-biber \
+ --disable-bibtex-x \
+ --disable-dvipng \
+ --disable-dvipsk \
+ --disable-lcdf-typetools \
+ --disable-ps2pk \
+ --disable-ttf2pk2 \
+ --disable-tex4htk \
+ --disable-cjkutils \
+ --disable-xdvik \
+ --enable-luatex \
+ --disable-dvisvgm \
+ --disable-ps2eps \
+ --disable-static \
+ --disable-native-texlive-build \
+ --disable-largefile \
+ --disable-build-in-source-tree \
+ --disable-xindy-docs \
+ --disable-xindy-rules \
+ --with-banner-add=" Gentoo Linux" \
+ $(use_enable luajittex) \
+ $(use_enable luajittex luajithbtex) \
+ $(use_enable luajittex mfluajit) \
+ $(use_enable xetex) \
+ $(use_enable cjk dviout-util) \
+ $(use_enable cjk ptex) \
+ $(use_enable cjk eptex) \
+ $(use_enable cjk uptex) \
+ $(use_enable cjk euptex) \
+ $(use_enable cjk mendexk) \
+ $(use_enable cjk makejvf) \
+ $(use_enable cjk pmp) \
+ $(use_enable cjk upmp) \
+ $(use_enable tk texdoctk) \
+ $(use_with X x) \
+ $(use_enable xindy)
+}
+
+src_compile() {
+ tc-export CC CXX AR RANLIB
+
+ emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+ cd "${B}" || die
+ # Mimic updmap --syncwithtrees to enable only fonts installed
+ # Code copied from updmap script
+ for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+ texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+ done > "${T}/updmap_update"
+ {
+ sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ } > "${T}/updmap_update2"
+ sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
+ && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+ dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
+ emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+ cd "${B}" || die
+ dodir /usr/share # just in case
+ cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+ cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+ # When X is disabled mf-nowin doesn't exist but some scripts expect it to
+ # exist. Instead, it is called mf, so we symlink it to please everything.
+ use X || dosym mf /usr/bin/mf-nowin
+
+ docinto texk
+ cd "${B}/texk" || die
+ dodoc ChangeLog README
+
+ docinto dviljk
+ cd "${B}/texk/dviljk" || die
+ dodoc ChangeLog README NEWS
+
+ docinto makeindexk
+ cd "${B}/texk/makeindexk" || die
+ dodoc ChangeLog NOTES README
+
+ docinto web2c
+ cd "${B}/texk/web2c" || die
+ dodoc ChangeLog NEWS PROJECTS README
+
+ use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+ dodir /etc/env.d
+ echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+ # populate /etc/texmf
+ keepdir /etc/texmf/web2c
+
+ # take care of updmap.cfg and language.d files
+ keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+ mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+ # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+ # by texmf-update
+ rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+ # Remove bundled and invalid updmap.cfg
+ rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
+
+ texlive-common_handle_config_files
+
+ keepdir /usr/share/texmf-site
+
+ # the virtex symlink is not installed
+ # The links has to be relative, since the targets
+ # is not present at this stage and MacOS doesn't
+ # like non-existing targets
+ dosym tex /usr/bin/virtex
+ dosym pdftex /usr/bin/pdfvirtex
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ etexmf-update
+
+ einfo "Regenerating TeX formats"
+ fmtutil-sys --all &> /dev/null
+
+ elog
+ elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+ elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+ elog
+
+ local display_migration_hint=false
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local new_texlive_ver=$(ver_cut 1)
+ local replaced_version
+ for replaced_version in ${REPLACING_VERSIONS}; do
+ replaced_version=$(ver_cut 1 ${replaced_version})
+ if (( replaced_version < new_texlive_version )); then
+ display_migration_hint=true
+ break
+ fi
+ done
+ fi
+
+ if ! ${display_migration_hint}; then
+ return
+ fi
+
+ ewarn "If you are migrating from an older TeX distribution"
+ ewarn "Please make sure you have read:"
+ ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+ ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/texlive-core/texlive-core-2021-r7.ebuild b/app-text/texlive-core/texlive-core-2021-r7.ebuild
new file mode 100644
index 000000000000..bd89b0fca8e3
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r7.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20210325
+
+# autotools/reautoconf in src_prepare only needed for Cairo patch
+inherit autotools flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=1
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="
+ https://dev.gentoo.org/~sam/distfiles/texlive/${MY_P}.tar.xz
+ https://dev.gentoo.org/~sam/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+ https://dev.gentoo.org/~sam/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/texlive-core-2021-CVE-2023-32700.patch.xz
+"
+
+# We ship binextra collection alongside
+TL_CORE_BINEXTRA_MODULES="
+ a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
+ clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
+ dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
+ fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
+ latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
+ listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam
+ pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
+ seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
+ texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
+ texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
+ "
+TL_CORE_BINEXTRA_DOC_MODULES="
+ a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+ checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
+ ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
+ dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
+ dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
+ ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
+ latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+ make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc
+ pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
+ pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc
+ sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+ texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
+ texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc
+ typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+ adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
+ listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+ texdef.source texosquery.source texplate.source tlcockpit.source
+"
+# Macros that are not a part of texlive-sources or collection-binextra but still needed
+# for other packages during installation
+TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sam/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libXmu
+ )"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+ !app-text/epspdf
+ !app-text/pdfjam
+ sys-libs/zlib
+ >=media-libs/harfbuzz-1.4.5:=[icu,graphite]
+ >=media-libs/libpng-1.2.43-r2:0=
+ media-libs/gd[png]
+ media-gfx/graphite2
+ >=x11-libs/cairo-1.12
+ >=x11-libs/pixman-0.18
+ dev-libs/zziplib:=
+ app-text/libpaper:=
+ dev-libs/gmp:=
+ dev-libs/mpfr:=
+ >=dev-libs/ptexenc-1.3.8
+ xetex? (
+ >=app-text/teckit-2.5.3
+ media-libs/fontconfig
+ )
+ xindy? ( dev-lisp/clisp:= )
+ media-libs/freetype:2
+ >=dev-libs/icu-50:=
+ >=dev-libs/kpathsea-6.3.2:="
+
+BDEPEND="sys-apps/ed
+ app-alternatives/lex
+ virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+ >=app-text/ps2pkm-1.8_p20170524
+ >=app-text/dvipsk-5.997
+ >=dev-tex/bibtexu-3.71_p20170524
+ virtual/perl-Getopt-Long
+ dev-perl/File-HomeDir
+ dev-perl/Log-Dispatch
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ tk? (
+ dev-lang/tk
+ dev-perl/Tk
+ )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+
+ mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+ # From texlive-module.eclass.
+ sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+ sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+ sort -u |
+ xargs mkdir -p || die
+ local i
+ while read i; do
+ mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+ done < "${T}/reloclist"
+
+ mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+ cd "${B}" || die
+
+ sed -i \
+ -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+ texk/web2c/configure || die
+
+ eapply "${WORKDIR}"/patches
+ eapply "${FILESDIR}"/${P}-cairo-strings.patch
+ eapply "${FILESDIR}"/${P}-slibtool.patch
+ eapply "${FILESDIR}"/${P}-clang-16.patch
+ eapply "${WORKDIR}"/${P}-CVE-2023-32700.patch
+
+ default
+
+ elibtoolize
+
+ # Drop this on 2022 bump!
+ "${B}"/reautoconf libs/cairo || die
+}
+
+src_configure() {
+ # TODO: report upstream
+ # bug #915223
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Too many regexps use A-Z a-z constructs, what causes problems with locales
+ # that don't have the same alphabetical order than ascii. Bug #242430
+ # So we set LC_ALL to C in order to avoid problems.
+ export LC_ALL=C
+
+ # Disable freetype-config as this is considered obsolete.
+ # Also only pkg-config works for prefix as described in bug #690094
+ export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+ # revisit/upstream once we bupm to 2022, bug #882245
+ append-cppflags -D_GNU_SOURCE
+
+ tc-export CC CXX AR RANLIB
+ ECONF_SOURCE="${B}" \
+ econf -C \
+ --bindir="${EPREFIX}"/usr/bin \
+ --datadir="${S}" \
+ --with-system-freetype2 \
+ --with-system-zlib \
+ --with-system-libpng \
+ --with-system-teckit \
+ --with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+ --with-system-kpathsea \
+ --with-kpathsea-includes="${EPREFIX}"/usr/include \
+ --with-system-icu \
+ --with-system-ptexenc \
+ --with-system-harfbuzz \
+ --with-system-icu \
+ --with-system-graphite2 \
+ --with-system-cairo \
+ --with-system-pixman \
+ --with-system-zziplib \
+ --with-system-libpaper \
+ --with-system-gmp \
+ --with-system-gd \
+ --with-system-mpfr \
+ --without-texinfo \
+ --disable-dialog \
+ --disable-multiplatform \
+ --enable-chktex \
+ --enable-epsfwin \
+ --enable-detex \
+ --enable-dvi2tty \
+ --enable-mftalkwin \
+ --enable-regiswin \
+ --enable-shared \
+ --enable-tektronixwin \
+ --enable-unitermwin \
+ --enable-vlna \
+ --with-ps=gs \
+ --disable-psutils \
+ --disable-t1utils \
+ --enable-ipc \
+ --disable-biber \
+ --disable-bibtex-x \
+ --disable-dvipng \
+ --disable-dvipsk \
+ --disable-lcdf-typetools \
+ --disable-ps2pk \
+ --disable-ttf2pk2 \
+ --disable-tex4htk \
+ --disable-cjkutils \
+ --disable-xdvik \
+ --enable-luatex \
+ --disable-dvisvgm \
+ --disable-ps2eps \
+ --disable-static \
+ --disable-native-texlive-build \
+ --disable-largefile \
+ --disable-build-in-source-tree \
+ --disable-xindy-docs \
+ --disable-xindy-rules \
+ --with-banner-add=" Gentoo Linux" \
+ $(use_enable luajittex) \
+ $(use_enable luajittex luajithbtex) \
+ $(use_enable luajittex mfluajit) \
+ $(use_enable xetex) \
+ $(use_enable cjk dviout-util) \
+ $(use_enable cjk ptex) \
+ $(use_enable cjk eptex) \
+ $(use_enable cjk uptex) \
+ $(use_enable cjk euptex) \
+ $(use_enable cjk mendexk) \
+ $(use_enable cjk makejvf) \
+ $(use_enable cjk pmp) \
+ $(use_enable cjk upmp) \
+ $(use_enable tk texdoctk) \
+ $(use_with X x) \
+ $(use_enable xindy)
+}
+
+src_compile() {
+ tc-export CC CXX AR RANLIB
+
+ emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+ cd "${B}" || die
+ # Mimic updmap --syncwithtrees to enable only fonts installed
+ # Code copied from updmap script
+ for i in `grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+ texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+ done > "${T}/updmap_update"
+ {
+ sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ } > "${T}/updmap_update2"
+ sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
+ && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+ dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
+ emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+ cd "${B}" || die
+ dodir /usr/share # just in case
+ cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+ cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+ # When X is disabled mf-nowin doesn't exist but some scripts expect it to
+ # exist. Instead, it is called mf, so we symlink it to please everything.
+ use X || dosym mf /usr/bin/mf-nowin
+
+ docinto texk
+ cd "${B}/texk" || die
+ dodoc ChangeLog README
+
+ docinto dviljk
+ cd "${B}/texk/dviljk" || die
+ dodoc ChangeLog README NEWS
+
+ docinto makeindexk
+ cd "${B}/texk/makeindexk" || die
+ dodoc ChangeLog NOTES README
+
+ docinto web2c
+ cd "${B}/texk/web2c" || die
+ dodoc ChangeLog NEWS PROJECTS README
+
+ use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+ dodir /etc/env.d
+ echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+ # populate /etc/texmf
+ keepdir /etc/texmf/web2c
+
+ # take care of updmap.cfg and language.d files
+ keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+ mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+ # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+ # by texmf-update
+ rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+ # Remove bundled and invalid updmap.cfg
+ rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
+
+ texlive-common_handle_config_files
+
+ keepdir /usr/share/texmf-site
+
+ # the virtex symlink is not installed
+ # The links has to be relative, since the targets
+ # is not present at this stage and MacOS doesn't
+ # like non-existing targets
+ dosym tex /usr/bin/virtex
+ dosym pdftex /usr/bin/pdfvirtex
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ etexmf-update
+
+ einfo "Regenerating TeX formats"
+ fmtutil-sys --all &> /dev/null
+
+ elog
+ elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+ elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+ elog
+
+ local display_migration_hint=false
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local new_texlive_ver=$(ver_cut 1)
+ local replaced_version
+ for replaced_version in ${REPLACING_VERSIONS}; do
+ replaced_version=$(ver_cut 1 ${replaced_version})
+ if (( replaced_version < new_texlive_version )); then
+ display_migration_hint=true
+ break
+ fi
+ done
+ fi
+
+ if ! ${display_migration_hint}; then
+ return
+ fi
+
+ ewarn "If you are migrating from an older TeX distribution"
+ ewarn "Please make sure you have read:"
+ ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+ ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/texlive-core/texlive-core-2023-r1.ebuild b/app-text/texlive-core/texlive-core-2023-r1.ebuild
new file mode 100644
index 000000000000..5132353ada60
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2023-r1.ebuild
@@ -0,0 +1,487 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+TL_SOURCE_VERSION=20230311
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="BSD GPL-1 GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
+GENTOO_TEX_PATCHES_NUM=3
+SRC_URI="
+ https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz
+ https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+ -> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+"
+
+# Macros that are not a part of texlive-sources or or pulled in from collection-binextra
+# but still needed for other packages during installation
+TL_CORE_EXTRA_CONTENTS="
+ autosp.r58211
+ axodraw2.r58155
+ chktex.r64797
+ detex.r66186
+ dvi2tty.r66186
+ dvidvi.r65952
+ dviljk.r66186
+ dvipdfmx.r69127
+ dvipos.r66186
+ gsftopk.r52851
+ hyphen-base.r68321
+ lacheck.r66186
+ m-tx.r64182
+ makeindex.r62517
+ pmx.r65926
+ texlive-scripts.r69754
+ texlive-scripts-extra.r62517
+ texlive.infra.r69740
+ tpic2pdftex.r52851
+ upmendex.r66381
+ velthuis.r66186
+ vlna.r66186
+ xml2pmx.r57972
+"
+TL_CORE_EXTRA_DOC_CONTENTS="
+ autosp.doc.r58211
+ axodraw2.doc.r58155
+ chktex.doc.r64797
+ detex.doc.r66186
+ dvi2tty.doc.r66186
+ dvidvi.doc.r65952
+ dviljk.doc.r66186
+ dvipdfmx.doc.r69127
+ dvipos.doc.r66186
+ gsftopk.doc.r52851
+ lacheck.doc.r66186
+ m-tx.doc.r64182
+ makeindex.doc.r62517
+ pmx.doc.r65926
+ texlive-scripts.doc.r69754
+ texlive-scripts-extra.doc.r62517
+ texlive.infra.doc.r69740
+ tpic2pdftex.doc.r52851
+ upmendex.doc.r66381
+ velthuis.doc.r66186
+ vlna.doc.r66186
+ xml2pmx.doc.r57972
+"
+TL_CORE_EXTRA_SRC_CONTENTS="
+ axodraw2.source.r58155
+"
+
+TEXLIVE_MODULE_BINSCRIPTS="
+ texmf-dist/scripts/m-tx/m-tx.lua
+ texmf-dist/scripts/texlive/fmtutil-sys.sh
+ texmf-dist/scripts/texlive/fmtutil-user.sh
+ texmf-dist/scripts/texlive/fmtutil.pl
+ texmf-dist/scripts/texlive/mktexlsr
+ texmf-dist/scripts/texlive/mktexlsr.pl
+ texmf-dist/scripts/texlive/mktexmf
+ texmf-dist/scripts/texlive/mktexpk
+ texmf-dist/scripts/texlive/mktextfm
+ texmf-dist/scripts/texlive/rungs.lua
+ texmf-dist/scripts/texlive/tlmgr.pl
+ texmf-dist/scripts/texlive/updmap-sys.sh
+ texmf-dist/scripts/texlive/updmap-user.sh
+ texmf-dist/scripts/texlive/updmap.pl
+ texmf-dist/scripts/texlive-extra/allcm.sh
+ texmf-dist/scripts/texlive-extra/allneeded.sh
+ texmf-dist/scripts/texlive-extra/dvi2fax.sh
+ texmf-dist/scripts/texlive-extra/dvired.sh
+ texmf-dist/scripts/texlive-extra/e2pall.pl
+ texmf-dist/scripts/texlive-extra/kpsetool.sh
+ texmf-dist/scripts/texlive-extra/kpsewhere.sh
+ texmf-dist/scripts/texlive-extra/ps2frag.sh
+ texmf-dist/scripts/texlive-extra/pslatex.sh
+ texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+ texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+ texmf-dist/scripts/texlive-extra/texconfig.sh
+ texmf-dist/scripts/texlive-extra/texlinks.sh
+"
+
+TEXLIVE_MODULE_BINLINKS="
+ fmtutil:mktexfmt
+ mktexlsr:texhash
+ allcm:allec
+ kpsetool:kpsexpand
+ kpsetool:kpsepath
+"
+texlive-common_append_to_src_uri TL_CORE_EXTRA_CONTENTS
+
+SRC_URI+=" doc? ( "
+texlive-common_append_to_src_uri TL_CORE_EXTRA_DOC_CONTENTS
+SRC_URI+=" )"
+
+SRC_URI+=" source? ( "
+texlive-common_append_to_src_uri TL_CORE_EXTRA_SRC_CONTENTS
+SRC_URI+=" )"
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+MODULAR_X_DEPEND="
+ X? (
+ x11-libs/libX11
+ x11-libs/libXmu
+ )"
+
+COMMON_DEPEND="
+ ${MODULAR_X_DEPEND}
+ !app-text/epspdf
+ !app-text/pdfjam
+ sys-libs/zlib
+ >=media-libs/harfbuzz-1.4.5:=[icu,graphite]
+ >=media-libs/libpng-1.2.43-r2:0=
+ media-libs/gd[png]
+ media-gfx/graphite2:=
+ media-gfx/potrace:=
+ >=x11-libs/cairo-1.12
+ >=x11-libs/pixman-0.18
+ dev-libs/zziplib:=
+ app-text/libpaper:=
+ dev-libs/gmp:=
+ dev-libs/mpfr:=
+ >=dev-libs/ptexenc-1.4.3
+ xetex? (
+ >=app-text/teckit-2.5.10
+ media-libs/fontconfig
+ )
+ xindy? ( dev-lisp/clisp:= )
+ media-libs/freetype:2
+ >=dev-libs/icu-50:=
+ >=dev-libs/kpathsea-6.3.5:=
+"
+
+BDEPEND="
+ sys-apps/ed
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ virtual/perl-Getopt-Long
+ dev-perl/File-HomeDir
+ dev-perl/Log-Dispatch
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ tk? (
+ dev-lang/tk
+ dev-perl/Tk
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${WORKDIR}/${P}_build"
+
+src_unpack() {
+ default
+
+ mkdir -p "${BUILDDIR}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+
+ # From texlive-module.eclass.
+ sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+ sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+ sort -u |
+ xargs mkdir -p || die
+ local i
+ while read -r i; do
+ mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+ done < "${T}/reloclist"
+ mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files"
+
+ cd "${S}" || die
+
+ sed -i \
+ -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,$(pkg-config kpathsea --variable=includedir)\"," \
+ texk/web2c/configure || die
+
+ local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}"
+ eapply "${patch_dir}"
+
+ default
+
+ elibtoolize
+}
+
+src_configure() {
+ # TODO: report upstream
+ # bug #915223
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Too many regexps use A-Z a-z constructs, what causes problems with locales
+ # that don't have the same alphabetical order than ascii. Bug #242430
+ # So we set LC_ALL to C in order to avoid problems.
+ export LC_ALL=C
+
+ # Disable freetype-config as this is considered obsolete.
+ # Also only pkg-config works for prefix as described in bug #690094
+ export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+ # revisit/upstream once we bump to 2022, bug #882245
+ append-cppflags -D_GNU_SOURCE
+
+ local econf_new_2023=(
+ --enable-ptex=no
+ --enable-uptex=no
+ --enable-autosp=yes
+ --enable-axodraw2=yes
+ --enable-devnag=yes
+ --enable-lacheck=yes
+ --enable-m-tx=yes
+ --enable-pmx=yes
+ --enable-tpic2pdftex=yes
+ --with-clisp-runtime=system
+ --enable-xml2pmx=yes
+ $(use_enable X xpdfopen)
+ --enable-web2c=yes
+ --enable-afm2pl=yes
+ --enable-dvidvi=yes
+ --enable-dviljk=yes
+ $(use_enable cjk dvipdfm-x)
+ --enable-dvipos=yes
+ --enable-gregorio=yes
+ --enable-gsftopk=yes
+ --enable-makeindexk=yes
+ --enable-musixtnt=yes
+ --enable-seetexk=yes
+ --enable-ttfdump=yes
+ --enable-upmendex=yes
+ --enable-texlive=yes
+ --enable-linked-scripts=no
+ # web2c afm2pl chktex dtl dvi2tty dvidvi dviljk dviout-util dvipdfm-x gregorio
+ )
+
+ tc-export CC CXX AR RANLIB
+ cd "${BUILDDIR}" || die
+ ECONF_SOURCE="${S}" \
+ econf -C \
+ --bindir="${EPREFIX}"/usr/bin \
+ --datadir="${BUILDDIR}" \
+ --with-system-freetype2 \
+ --with-system-zlib \
+ --with-system-libpng \
+ --with-system-teckit \
+ --with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+ --with-system-kpathsea \
+ --with-kpathsea-includes="${EPREFIX}"/usr/include \
+ --with-system-icu \
+ --with-system-ptexenc \
+ --with-system-harfbuzz \
+ --with-system-graphite2 \
+ --with-system-cairo \
+ --with-system-pixman \
+ --with-system-zziplib \
+ --with-system-libpaper \
+ --with-system-gmp \
+ --with-system-gd \
+ --with-system-mpfr \
+ --with-system-potrace \
+ --without-texinfo \
+ --disable-dialog \
+ --disable-multiplatform \
+ --enable-chktex \
+ --enable-epsfwin \
+ --enable-detex \
+ --enable-dvi2tty \
+ --enable-mftalkwin \
+ --enable-regiswin \
+ --enable-shared \
+ --enable-tektronixwin \
+ --enable-unitermwin \
+ --enable-vlna \
+ --with-ps=gs \
+ --disable-psutils \
+ --disable-t1utils \
+ --enable-ipc \
+ --disable-biber \
+ --disable-bibtex-x \
+ --disable-dvipng \
+ --disable-dvipsk \
+ --disable-lcdf-typetools \
+ --disable-ps2pk \
+ --disable-ttf2pk2 \
+ --disable-tex4htk \
+ --disable-cjkutils \
+ --disable-xdvik \
+ --enable-luatex \
+ --disable-dvisvgm \
+ --disable-ps2eps \
+ --disable-static \
+ --disable-native-texlive-build \
+ --disable-largefile \
+ --disable-build-in-source-tree \
+ --disable-xindy-docs \
+ --disable-xindy-rules \
+ --with-banner-add=" Gentoo Linux" \
+ $(use_enable luajittex) \
+ $(use_enable luajittex luajithbtex) \
+ $(use_enable luajittex mfluajit) \
+ $(use_enable xetex) \
+ $(use_enable cjk dviout-util) \
+ $(use_enable cjk ptex) \
+ $(use_enable cjk eptex) \
+ $(use_enable cjk uptex) \
+ $(use_enable cjk euptex) \
+ $(use_enable cjk mendexk) \
+ $(use_enable cjk makejvf) \
+ $(use_enable cjk pmp) \
+ $(use_enable cjk upmp) \
+ $(use_enable tk texdoctk) \
+ $(use_with X x) \
+ $(use_enable xindy) \
+ "${econf_new_2023[@]}"
+}
+
+src_compile() {
+ cd "${BUILDDIR}" || die
+ tc-export CC CXX AR RANLIB
+
+ emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+ cd "${S}" || die
+ # Mimic updmap --syncwithtrees to enable only fonts installed
+ # Code copied from updmap script
+ while read -r i; do
+ texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+ done > "${T}/updmap_update" < <(grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@')
+ {
+ sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ } > "${T}/updmap_update2"
+ sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
+ && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+ cd "${BUILDDIR}" || die
+ dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
+ emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+ cd "${S}" || die
+ dodir /usr/share # just in case
+ cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+ cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+ # When X is disabled mf-nowin doesn't exist but some scripts expect it to
+ # exist. Instead, it is called mf, so we symlink it to please everything.
+ use X || dosym mf /usr/bin/mf-nowin
+
+ docinto texk
+ cd "${S}/texk" || die
+ dodoc ChangeLog README
+
+ docinto dviljk
+ cd "${S}/texk/dviljk" || die
+ dodoc ChangeLog README NEWS
+
+ docinto makeindexk
+ cd "${S}/texk/makeindexk" || die
+ dodoc ChangeLog NOTES README
+
+ docinto web2c
+ cd "${S}/texk/web2c" || die
+ dodoc ChangeLog NEWS PROJECTS README
+
+ use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+ dodir /etc/env.d
+ echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+ # populate /etc/texmf
+ keepdir /etc/texmf/web2c
+
+ # take care of updmap.cfg and language.d files
+ keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+ mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+ # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+ # by texmf-update
+ rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+ # Remove bundled and invalid updmap.cfg
+ rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
+
+ rm -f "${ED}/usr/bin/"{,u}ptex
+
+ [[ -n ${TEXLIVE_MODULE_BINSCRIPTS} ]] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
+ if [[ -n ${TEXLIVE_MODULE_BINLINKS} ]] ; then
+ dodir "/usr/bin"
+ for i in ${TEXLIVE_MODULE_BINLINKS} ; do
+ [[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK ${i%:*}. This should not happen. Please file a bug."
+ dosym "${i%:*}" "/usr/bin/${i#*:}"
+ done
+ fi
+
+ texlive-common_handle_config_files
+
+ # the virtex symlink is not installed
+ # The links has to be relative, since the targets
+ # is not present at this stage and MacOS doesn't
+ # like non-existing targets
+ dosym tex /usr/bin/virtex
+ dosym pdftex /usr/bin/pdfvirtex
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ # Note that the etexmf-update and efmtutil-sys use nonfatal. We are
+ # pkg_postinst, so invoking die will merely print an error message
+ # but not abort the installation as it already happened. However,
+ # unlike the texlive modules, we observed fmtutil-sys failures in
+ # texlive-core.
+
+ # TODO: Research the rationale of calling etexmf-update and
+ # eftmutil-sys here and the reasons why it sometimes fails.
+ nonfatal etexmf-update
+ nonfatal efmtutil-sys
+
+ elog
+ elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+ elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+ elog
+
+ local display_migration_hint=false
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local new_texlive_version=$(ver_cut 1)
+ local replaced_version
+ for replaced_version in ${REPLACING_VERSIONS}; do
+ replaced_version=$(ver_cut 1 "${replaced_version}")
+ if ver_test "${replaced_version}" -lt "${new_texlive_version}" ; then
+ display_migration_hint=true
+ break
+ fi
+ done
+ fi
+
+ if ! ${display_migration_hint}; then
+ return
+ fi
+
+ ewarn "If you are migrating from an older TeX distribution"
+ ewarn "Please make sure you have read:"
+ ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+ ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/texlive-core/texlive-core-2023-r6.ebuild b/app-text/texlive-core/texlive-core-2023-r6.ebuild
new file mode 100644
index 000000000000..31dfa7b9c7bf
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2023-r6.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+TL_SOURCE_VERSION=20230311
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="BSD GPL-1 GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
+GENTOO_TEX_PATCHES_NUM=3
+SRC_URI="
+ https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz
+ https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+ -> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+"
+
+# Macros that are not a part of texlive-sources or or pulled in from collection-binextra
+# but still needed for other packages during installation.
+TL_CORE_EXTRA_CONTENTS="
+ autosp.r58211
+ axodraw2.r58155
+ chktex.r64797
+ detex.r66186
+ dvi2tty.r66186
+ dvidvi.r65952
+ dviljk.r66186
+ dvipdfmx.r69127
+ dvipos.r66186
+ gsftopk.r52851
+ hyphen-base.r68321
+ lacheck.r66186
+ m-tx.r64182
+ makeindex.r62517
+ pmx.r65926
+ texdoctk.r62186
+ texlive-scripts.r69754
+ texlive-scripts-extra.r62517
+ texlive.infra.r69740
+ tpic2pdftex.r52851
+ upmendex.r66381
+ velthuis.r66186
+ vlna.r66186
+ xindy.r65958
+ xml2pmx.r57972
+"
+TL_CORE_EXTRA_DOC_CONTENTS="
+ autosp.doc.r58211
+ axodraw2.doc.r58155
+ chktex.doc.r64797
+ detex.doc.r66186
+ dvi2tty.doc.r66186
+ dvidvi.doc.r65952
+ dviljk.doc.r66186
+ dvipdfmx.doc.r69127
+ dvipos.doc.r66186
+ gsftopk.doc.r52851
+ lacheck.doc.r66186
+ m-tx.doc.r64182
+ makeindex.doc.r62517
+ pmx.doc.r65926
+ texdoctk.doc.r62186
+ texlive-scripts.doc.r69754
+ texlive-scripts-extra.doc.r62517
+ texlive.infra.doc.r69740
+ tpic2pdftex.doc.r52851
+ upmendex.doc.r66381
+ velthuis.doc.r66186
+ vlna.doc.r66186
+ xindy.doc.r65958
+ xml2pmx.doc.r57972
+"
+TL_CORE_EXTRA_SRC_CONTENTS="
+ axodraw2.source.r58155
+"
+
+TEXLIVE_MODULE_BINSCRIPTS="
+ texmf-dist/scripts/m-tx/m-tx.lua
+ texmf-dist/scripts/texlive/fmtutil-sys.sh
+ texmf-dist/scripts/texlive/fmtutil-user.sh
+ texmf-dist/scripts/texlive/fmtutil.pl
+ texmf-dist/scripts/texlive/mktexlsr
+ texmf-dist/scripts/texlive/mktexlsr.pl
+ texmf-dist/scripts/texlive/mktexmf
+ texmf-dist/scripts/texlive/mktexpk
+ texmf-dist/scripts/texlive/mktextfm
+ texmf-dist/scripts/texlive/rungs.lua
+ texmf-dist/scripts/texlive/tlmgr.pl
+ texmf-dist/scripts/texlive/updmap-sys.sh
+ texmf-dist/scripts/texlive/updmap-user.sh
+ texmf-dist/scripts/texlive/updmap.pl
+ texmf-dist/scripts/texlive-extra/allcm.sh
+ texmf-dist/scripts/texlive-extra/allneeded.sh
+ texmf-dist/scripts/texlive-extra/dvi2fax.sh
+ texmf-dist/scripts/texlive-extra/dvired.sh
+ texmf-dist/scripts/texlive-extra/e2pall.pl
+ texmf-dist/scripts/texlive-extra/kpsetool.sh
+ texmf-dist/scripts/texlive-extra/kpsewhere.sh
+ texmf-dist/scripts/texlive-extra/ps2frag.sh
+ texmf-dist/scripts/texlive-extra/pslatex.sh
+ texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+ texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+ texmf-dist/scripts/texlive-extra/texconfig.sh
+ texmf-dist/scripts/texlive-extra/texlinks.sh
+"
+
+TEXLIVE_MODULE_BINLINKS="
+ fmtutil:mktexfmt
+ mktexlsr:texhash
+ allcm:allec
+ kpsetool:kpsexpand
+ kpsetool:kpsepath
+"
+texlive-common_append_to_src_uri TL_CORE_EXTRA_CONTENTS
+
+SRC_URI+=" doc? ( "
+texlive-common_append_to_src_uri TL_CORE_EXTRA_DOC_CONTENTS
+SRC_URI+=" )"
+
+SRC_URI+=" source? ( "
+texlive-common_append_to_src_uri TL_CORE_EXTRA_SRC_CONTENTS
+SRC_URI+=" )"
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+MODULAR_X_DEPEND="
+ X? (
+ x11-libs/libX11
+ x11-libs/libXmu
+ )"
+
+COMMON_DEPEND="
+ ${MODULAR_X_DEPEND}
+ !app-text/epspdf
+ !app-text/pdfjam
+ sys-libs/zlib
+ >=media-libs/harfbuzz-1.4.5:=[icu,graphite]
+ >=media-libs/libpng-1.2.43-r2:0=
+ media-libs/gd[png]
+ media-gfx/graphite2:=
+ media-gfx/potrace:=
+ >=x11-libs/cairo-1.12
+ >=x11-libs/pixman-0.18
+ dev-libs/zziplib:=
+ app-text/libpaper:=
+ dev-libs/gmp:=
+ dev-libs/mpfr:=
+ >=dev-libs/ptexenc-1.4.3
+ xetex? (
+ >=app-text/teckit-2.5.10
+ media-libs/fontconfig
+ )
+ xindy? ( dev-lisp/clisp:= )
+ media-libs/freetype:2
+ >=dev-libs/icu-50:=
+ >=dev-libs/kpathsea-6.3.5:=
+"
+
+BDEPEND="
+ sys-apps/ed
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+"
+
+# !<dev-texlive/texlive-langother-2023 see https://bugs.gentoo.org/928307
+RDEPEND="
+ ${COMMON_DEPEND}
+ virtual/perl-Getopt-Long
+ dev-perl/File-HomeDir
+ dev-perl/Log-Dispatch
+ dev-perl/Unicode-LineBreak
+ dev-perl/YAML-Tiny
+ tk? (
+ dev-lang/tk
+ dev-perl/Tk
+ )
+ !<dev-texlive/texlive-basic-2023
+ !<dev-texlive/texlive-mathscience-2023
+ !<dev-texlive/texlive-langother-2023
+ !<dev-texlive/texlive-music-2023
+"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${WORKDIR}/${P}_build"
+
+src_unpack() {
+ default
+
+ mkdir -p "${BUILDDIR}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+
+ # From texlive-module.eclass.
+ sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+ sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+ sort -u |
+ xargs mkdir -p || die
+ local i
+ while read -r i; do
+ mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+ done < "${T}/reloclist"
+ mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files"
+
+ cd "${S}" || die
+
+ TL_KPATHSEA_INCLUDES=$($(tc-getPKG_CONFIG) kpathsea --variable=includedir || die "failed to invoke pkg-config")
+ sed -i \
+ -e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${TL_KPATHSEA_INCLUDES}\"," \
+ texk/web2c/configure || die
+
+ local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}"
+ eapply "${patch_dir}"
+
+ default
+
+ elibtoolize
+
+ # Drop this once cairo's autoconf patches are gone. See
+ # https://bugs.gentoo.org/927714#c4 and https://bugs.gentoo.org/853121.
+ "${S}"/reautoconf libs/cairo || die
+}
+
+src_configure() {
+ # TODO: report upstream
+ # bug #915223
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ # Too many regexps use A-Z a-z constructs, what causes problems with locales
+ # that don't have the same alphabetical order than ascii. Bug #242430
+ # So we set LC_ALL to C in order to avoid problems.
+ export LC_ALL=C
+
+ # Disable freetype-config as this is considered obsolete.
+ # Also only pkg-config works for prefix as described in bug #690094
+ export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+ local my_conf=(
+ --bindir="${EPREFIX}"/usr/bin
+ --datadir="${BUILDDIR}"
+ --with-system-freetype2
+ --with-system-zlib
+ --with-system-libpng
+ --with-system-teckit
+ --with-system-kpathsea
+ --with-kpathsea-includes="${TL_KPATHSEA_INCLUDES}"
+ --with-system-icu
+ --with-system-ptexenc
+ --with-system-harfbuzz
+ --with-system-graphite2
+ --with-system-cairo
+ --with-system-pixman
+ --with-system-zziplib
+ --with-system-libpaper
+ --with-system-gmp
+ --with-system-gd
+ --with-system-mpfr
+ --with-system-potrace
+ --disable-multiplatform
+ --enable-chktex
+ --enable-epsfwin
+ --enable-detex
+ --enable-dvi2tty
+ --enable-mftalkwin
+ --enable-regiswin
+ --enable-shared
+ --enable-tektronixwin
+ --enable-unitermwin
+ --enable-vlna
+ --disable-psutils
+ --disable-t1utils
+ --enable-ipc
+ --disable-bibtex-x
+ --disable-dvipng
+ --disable-dvipsk
+ --disable-lcdf-typetools
+ --disable-ps2pk
+ --disable-ttf2pk2
+ --disable-tex4htk
+ --disable-cjkutils
+ --disable-xdvik
+ --enable-luatex
+ --disable-dvisvgm
+ --disable-ps2eps
+ --disable-static
+ --disable-native-texlive-build
+ --disable-largefile
+ --disable-xindy-docs
+ --disable-xindy-rules
+ --with-banner-add=" Gentoo Linux"
+ $(use_enable luajittex)
+ $(use_enable luajittex luajithbtex)
+ $(use_enable luajittex mfluajit)
+ $(use_enable xetex)
+ $(use_enable cjk dviout-util)
+ $(use_enable cjk ptex)
+ $(use_enable cjk eptex)
+ $(use_enable cjk uptex)
+ $(use_enable cjk euptex)
+ $(use_enable cjk mendexk)
+ $(use_enable cjk makejvf)
+ $(use_enable cjk pmp)
+ $(use_enable cjk upmp)
+ $(use_enable tk texdoctk)
+ $(use_with X x)
+ $(use_enable xindy)
+ --enable-ptex=no
+ --enable-autosp=yes
+ --enable-axodraw2=yes
+ --enable-devnag=yes
+ --enable-lacheck=yes
+ --enable-m-tx=yes
+ --enable-pmx=yes
+ --enable-tpic2pdftex=yes
+ --with-clisp-runtime=system
+ --enable-xml2pmx=yes
+ $(use_enable X xpdfopen)
+ --enable-web2c=yes
+ --enable-afm2pl=yes
+ --enable-dvidvi=yes
+ --enable-dviljk=yes
+ --enable-dvipdfm-x
+ --enable-dvipos=yes
+ --enable-gregorio=yes
+ --enable-gsftopk=yes
+ --enable-makeindexk=yes
+ --enable-musixtnt=yes
+ --enable-seetexk=yes
+ --enable-ttfdump=yes
+ --enable-upmendex=yes
+ --enable-texlive=yes
+ --enable-linked-scripts=no
+ # web2c afm2pl chktex dtl dvi2tty dvidvi dviljk dviout-util dvipdfm-x gregorio
+ )
+
+ # Enable the following on version bumps. While it makes the build
+ # always fail, presumably because texlive passes these configure
+ # options to sub-configures, it still points out dropped
+ # options. See https://bugs.gentoo.org/828591
+ my_conf+=(
+ # --enable-option-checking=fatal
+ )
+
+ tc-export CC CXX AR RANLIB
+ cd "${BUILDDIR}" || die
+ ECONF_SOURCE="${S}" \
+ econf -C "${my_conf[@]}"
+}
+
+src_compile() {
+ cd "${BUILDDIR}" || die
+ tc-export CC CXX AR RANLIB
+
+ emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+ cd "${S}" || die
+ # Mimic updmap --syncwithtrees to enable only fonts installed
+ # Code copied from updmap script
+ while read -r i; do
+ texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+ done > "${T}/updmap_update" < <(grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@')
+ {
+ sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ sed 's@/@\\/@g; s@^@/^KanjiMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+ } > "${T}/updmap_update2"
+ sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" > "${T}/updmap_update3"\
+ && cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+ cd "${BUILDDIR}" || die
+ dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
+ emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+ cd "${S}" || die
+ dodir /usr/share # just in case
+ cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+ cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+ # When X is disabled mf-nowin doesn't exist but some scripts expect it to
+ # exist. Instead, it is called mf, so we symlink it to please everything.
+ use X || dosym mf /usr/bin/mf-nowin
+
+ docinto texk
+ cd "${S}/texk" || die
+ dodoc ChangeLog README
+
+ docinto dviljk
+ cd "${S}/texk/dviljk" || die
+ dodoc ChangeLog README NEWS
+
+ docinto makeindexk
+ cd "${S}/texk/makeindexk" || die
+ dodoc ChangeLog NOTES README
+
+ docinto web2c
+ cd "${S}/texk/web2c" || die
+ dodoc ChangeLog NEWS PROJECTS README
+
+ use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+ dodir /etc/env.d
+ echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+ # populate /etc/texmf
+ keepdir /etc/texmf/web2c
+
+ # take care of updmap.cfg and language.d files
+ keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+ mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+ # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+ # by texmf-update
+ rm "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+
+ if use cjk; then
+ rm "${ED}/usr/bin/"{,u}ptex || die
+ fi
+
+ if ! use xindy; then
+ rm -rf "${ED}{TEXMF_PATH}"/{,scripts,doc}/xindy
+ rm "${ED}"/usr/share/tlpkg/tlpobj/xindy.* || die
+ fi
+
+ dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
+
+ dodir "/usr/bin"
+ for i in ${TEXLIVE_MODULE_BINLINKS} ; do
+ [[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid BINLINK ${i%:*}. This should not happen. Please file a bug."
+
+ dosym "${i%:*}" "/usr/bin/${i#*:}"
+ done
+
+ # https://bugs.gentoo.org/832139
+ rm "${ED}"/usr/bin/tlmgr || die
+
+ texlive-common_handle_config_files
+
+ # the virtex symlink is not installed
+ # The links has to be relative, since the targets
+ # is not present at this stage and MacOS doesn't
+ # like non-existing targets
+ dosym tex /usr/bin/virtex
+ dosym pdftex /usr/bin/pdfvirtex
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ # Note that the etexmf-update and efmtutil-sys use nonfatal. We are
+ # pkg_postinst, so invoking die will merely print an error message
+ # but not abort the installation as it already happened. However,
+ # unlike the texlive modules, we observed fmtutil-sys failures in
+ # texlive-core.
+
+ # TODO: Research the rationale of calling etexmf-update and
+ # eftmutil-sys here and the reasons why it sometimes fails.
+ nonfatal etexmf-update
+ nonfatal efmtutil-sys
+
+ texlive-common_update_tlpdb
+}
+
+pkg_postrm() {
+ texlive-common_update_tlpdb
+}
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index e06f43835505..8c23ee5d3c5a 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
@@ -7,14 +7,10 @@
</maintainer>
<use>
<flag name="context">Add support for the ConTeXt format (<pkg>dev-texlive/texlive-context</pkg>)</flag>
- <flag name="detex">Add support for <pkg>dev-tex/detex</pkg>, a filter program that removes the LaTeX (or TeX) control sequences</flag>
- <flag name="dvi2tty">Add support for <pkg>dev-tex/dvi2tty</pkg> to preview dvi-files on text-only devices</flag>
- <flag name="epspdf">Add support for <pkg>app-text/epspdf</pkg>, a tool for converting [e]ps files to pdf</flag>
<flag name="extra">Add support for extra TeXLive packages</flag>
<flag name="games">Add typesetting support for games (chess, etc.) (<pkg>dev-texlive/texlive-games</pkg>)</flag>
<flag name="graphics">Add support for several graphics packages (pgf, tikz,...)</flag>
<flag name="humanities">Add LaTeX support for the humanities (<pkg>dev-texlive/texlive-humanities</pkg>)</flag>
- <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg> (for processing tex files produced by the TeX backend of Jade)</flag>
<flag name="luatex">Add extra support for luatex</flag>
<flag name="metapost">Add support for metapost: A tool for creating graphics in scalable PostScript</flag>
<flag name="music">Add support for music typesetting (<pkg>dev-texlive/texlive-music</pkg>)</flag>
@@ -25,6 +21,5 @@
<flag name="tex4ht">Add support for <pkg>dev-tex/tex4ht</pkg> (for converting (La)TeX to (X)HTML, XML and OO.org)</flag>
<flag name="texi2html">Add support for <pkg>app-text/texi2html</pkg> which converts texi files to HTML</flag>
<flag name="xetex">Add support for XeTeX macros (<pkg>dev-texlive/texlive-xetex</pkg>)</flag>
- <flag name="xindy">Add support for <pkg>app-text/xindy</pkg>, a flexible indexing system</flag>
</use>
</pkgmetadata>
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
deleted file mode 100644
index e05547b4564a..000000000000
--- a/app-text/texlive/texlive-2017.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xindy xml X"
-
-LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
- hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
- pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
- IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
- app-text/psutils
- >=${TEXLIVE_CAT}/texlive-fontutils-${PV}
- media-gfx/sam2p
- texi2html? ( app-text/texi2html )
- sys-apps/texinfo
- app-text/t1utils
- >=app-text/lcdf-typetools-2.92[kpathsea]
- truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
- detex? ( dev-tex/detex )
- app-text/ps2eps
- dvi2tty? ( dev-tex/dvi2tty )
- png? ( app-text/dvipng )
- X? ( >=app-text/xdvik-22.87 )
- >=${TEXLIVE_CAT}/texlive-basic-${PV}
- >=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
- >=${TEXLIVE_CAT}/texlive-latex-${PV}
- luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
- >=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
- >=dev-tex/xcolor-2.11
- >=dev-tex/latex-beamer-3.36
- metapost? (
- >=${TEXLIVE_CAT}/texlive-metapost-${PV}
- dev-tex/feynmf
- )
- >=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
- pdfannotextractor? ( dev-tex/pdfannotextractor )
- extra? (
- dev-tex/chktex
- app-text/dvisvgm
- dev-tex/latexdiff
- >=dev-tex/latexmk-418
- >=app-text/pdfjam-2.02
- >=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
- >=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
- >=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
- >=${TEXLIVE_CAT}/texlive-latexextra-${PV}
- >=dev-tex/glossaries-2.07
- >=dev-tex/leaflet-20041222
- >=dev-tex/currvita-0.9i-r1
- >=dev-tex/g-brief-4.0.2
- >=dev-tex/envlab-1.2-r1
- >=dev-tex/europecv-20060424-r1
- >=dev-tex/svninfo-0.7.3-r1
- )
- xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
- graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
- dev-tex/dot2texi )
- epspdf? ( app-text/epspdf )
- science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
- publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
- music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
- pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
- context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
- games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
- humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
- tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
- xml? (
- >=dev-tex/xmltex-1.9-r2
- app-text/passivetex
- )
- jadetex? ( >=app-text/jadetex-3.13-r2 )
- l10n_af? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
- l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
- l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
- >=dev-tex/cjk-latex-4.8.4 )
- l10n_hr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_bg? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_br? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_ru? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_uk? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_cs? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
- >=app-text/vlna-1.3 )
- l10n_sk? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
- l10n_da? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_nl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_en? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
- l10n_fi? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_eu? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
- l10n_fr? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
- l10n_de? ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
- l10n_el? ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
- l10n_he? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_hu? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_as? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_bn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_gu? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_hi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_kn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ml? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_mr? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_or? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_pa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_sa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ta? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_te? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_it? ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
- l10n_ja? ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
- l10n_ko? ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
- l10n_la? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_lt? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_lv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_mn? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_nb? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_nn? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_no? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_cy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_eo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_et? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_ga? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_rm? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_hsb? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ia? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_id? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_is? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_lo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ro? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_sq? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_sr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
- >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_sl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_tr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_pl? ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
- l10n_pt? ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
- l10n_ca? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
- l10n_gl? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
- l10n_es? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
- l10n_sco? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_sv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_tk? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_vi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_zh? ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
- xindy? ( app-text/xindy )
-"
diff --git a/app-text/texlive/texlive-2019.ebuild b/app-text/texlive/texlive-2019.ebuild
deleted file mode 100644
index e3f97018b809..000000000000
--- a/app-text/texlive/texlive-2019.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk context detex dvi2tty extra epspdf games graphics
-humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
-science tex4ht texi2html truetype xetex xindy xml X"
-
-LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
- hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
- pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
-
-for X in ${LANGS}; do
- IUSE="${IUSE} l10n_${X}"
-done
-
-TEXLIVE_CAT="dev-texlive"
-
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
- app-text/psutils
- >=${TEXLIVE_CAT}/texlive-fontutils-${PV}
- media-gfx/sam2p
- texi2html? ( app-text/texi2html )
- sys-apps/texinfo
- app-text/t1utils
- >=app-text/lcdf-typetools-2.92[kpathsea]
- truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
- detex? ( dev-tex/detex )
- app-text/ps2eps
- dvi2tty? ( dev-tex/dvi2tty )
- png? ( app-text/dvipng )
- X? ( >=app-text/xdvik-22.87 )
- >=${TEXLIVE_CAT}/texlive-basic-${PV}
- >=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
- >=${TEXLIVE_CAT}/texlive-latex-${PV}
- luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
- >=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
- >=dev-tex/xcolor-2.11
- >=dev-tex/latex-beamer-3.36
- metapost? (
- >=${TEXLIVE_CAT}/texlive-metapost-${PV}
- dev-tex/feynmf
- )
- >=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
- pdfannotextractor? ( dev-tex/pdfannotextractor )
- extra? (
- dev-tex/chktex
- app-text/dvisvgm
- dev-tex/latexdiff
- >=dev-tex/latexmk-418
- >=app-text/pdfjam-2.02
- >=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
- >=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
- >=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
- >=${TEXLIVE_CAT}/texlive-latexextra-${PV}
- >=dev-tex/glossaries-2.07
- >=dev-tex/leaflet-20041222
- >=dev-tex/currvita-0.9i-r1
- >=dev-tex/g-brief-4.0.2
- >=dev-tex/envlab-1.2-r1
- >=dev-tex/europecv-20060424-r1
- >=dev-tex/svninfo-0.7.3-r1
- )
- xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
- graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
- dev-tex/dot2texi )
- epspdf? ( app-text/epspdf )
- science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
- publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
- music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
- pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
- context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
- games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
- humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
- tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
- xml? (
- >=dev-tex/xmltex-1.9-r2
- app-text/passivetex
- )
- jadetex? ( >=app-text/jadetex-3.13-r2 )
- l10n_af? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
- l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
- l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
- >=dev-tex/cjk-latex-4.8.4 )
- l10n_hr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_bg? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_br? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_ru? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_uk? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_cs? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
- >=app-text/vlna-1.3 )
- l10n_sk? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
- l10n_da? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_nl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_en? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
- l10n_fi? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_eu? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
- l10n_fr? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
- l10n_de? ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
- l10n_el? ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
- l10n_he? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_hu? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_as? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_bn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_gu? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_hi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_kn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ml? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_mr? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_or? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_pa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_sa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ta? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_te? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_it? ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
- l10n_ja? ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
- l10n_ko? ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
- l10n_la? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_lt? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_lv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_mn? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_nb? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_nn? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_no? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_cy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_eo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_et? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_ga? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_rm? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_hsb? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ia? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_id? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_is? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_lo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_ro? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_sq? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_sr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
- >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
- l10n_sl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_tr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_pl? ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
- l10n_pt? ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
- l10n_ca? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
- l10n_gl? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
- l10n_es? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
- l10n_sco? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_sv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_tk? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- l10n_vi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
- l10n_zh? ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
- xindy? ( app-text/xindy )
-"
diff --git a/app-text/texlive/texlive-2021-r1.ebuild b/app-text/texlive/texlive-2021-r1.ebuild
new file mode 100644
index 000000000000..446fbb70cc7a
--- /dev/null
+++ b/app-text/texlive/texlive-2021-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+ hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+ pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+ app-text/psutils
+ >=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+ media-gfx/sam2p
+ texi2html? ( app-text/texi2html )
+ sys-apps/texinfo
+ app-text/t1utils
+ >=app-text/lcdf-typetools-2.92[kpathsea]
+ truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
+ app-text/ps2eps
+ png? ( app-text/dvipng )
+ X? ( >=app-text/xdvik-22.87 )
+ >=${TEXLIVE_CAT}/texlive-basic-${PV}
+ >=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+ >=${TEXLIVE_CAT}/texlive-latex-${PV}
+ luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+ >=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+ >=dev-tex/latex-beamer-3.36
+ metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV} )
+ >=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+ pdfannotextractor? ( dev-tex/pdfannotextractor )
+ extra? (
+ app-text/dvisvgm
+ dev-tex/latexdiff
+ dev-tex/latexmk
+ >=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-latexextra-${PV}
+ >=dev-tex/glossaries-2.07
+ )
+ xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+ graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV} )
+ science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+ publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+ music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+ pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+ context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+ games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+ humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+ tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
+ xml? ( >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} )
+ l10n_af? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+ l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+ l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV} )
+ l10n_hr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_bg? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_br? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_ru? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_uk? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_cs? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+ l10n_sk? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+ l10n_da? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_nl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_en? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+ l10n_fi? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_eu? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+ l10n_fr? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+ l10n_de? ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+ l10n_el? ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+ l10n_he? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_hu? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_as? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_bn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_gu? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_hi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_kn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ml? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_mr? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_or? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_pa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_sa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ta? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_te? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_it? ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+ l10n_ja? ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+ l10n_ko? ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+ l10n_la? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_lt? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_lv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_mn? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_nb? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_nn? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_no? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_cy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_eo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_et? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_ga? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_rm? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_hsb? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ia? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_id? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_is? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_lo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ro? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_sq? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_sr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+ >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_sl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_tr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_pl? ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+ l10n_pt? ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+ l10n_ca? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+ l10n_gl? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+ l10n_es? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+ l10n_sco? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_sv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_tk? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_vi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_zh? ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+"
diff --git a/app-text/texlive/texlive-2023.ebuild b/app-text/texlive/texlive-2023.ebuild
new file mode 100644
index 000000000000..71996e8da38f
--- /dev/null
+++ b/app-text/texlive/texlive-2023.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+ hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+ pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+ app-text/psutils
+ >=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+ media-gfx/sam2p
+ texi2html? ( app-text/texi2html )
+ sys-apps/texinfo
+ app-text/t1utils
+ >=app-text/lcdf-typetools-2.92[kpathsea]
+ truetype? ( >=app-text/ttf2pk2-2.0_p20230311 )
+ app-text/ps2eps
+ png? ( app-text/dvipng )
+ X? ( >=app-text/xdvik-22.87 )
+ >=${TEXLIVE_CAT}/texlive-basic-${PV}
+ >=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+ >=${TEXLIVE_CAT}/texlive-latex-${PV}
+ luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+ >=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+ metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV} )
+ >=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+ pdfannotextractor? ( dev-tex/pdfannotextractor )
+ extra? (
+ >=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-binextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+ >=${TEXLIVE_CAT}/texlive-latexextra-${PV}
+ )
+ xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+ graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV} )
+ science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+ publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+ music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+ pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+ context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+ games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+ humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+ tex4ht? ( >=dev-tex/tex4ht-20230311_p69739 )
+ xml? ( >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} )
+ l10n_af? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+ l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+ l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV} )
+ l10n_hr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_bg? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_br? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_ru? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_uk? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_cs? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+ l10n_sk? ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+ l10n_da? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_nl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_en? ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+ l10n_fi? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_eu? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+ l10n_fr? ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+ l10n_de? ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+ l10n_el? ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+ l10n_he? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_hu? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_as? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_bn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_gu? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_hi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_kn? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ml? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_mr? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_or? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_pa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_sa? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ta? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_te? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_it? ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+ l10n_ja? ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+ l10n_ko? ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+ l10n_la? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_lt? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_lv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_mn? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_nb? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_nn? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_no? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_cy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_eo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_et? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_ga? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_rm? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_hsb? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ia? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_id? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_is? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_lo? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_ro? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_sq? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_sr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+ >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+ l10n_sl? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_tr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_pl? ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+ l10n_pt? ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+ l10n_ca? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+ l10n_gl? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+ l10n_es? ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+ l10n_sco? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_sv? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_tk? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+ l10n_vi? ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+ l10n_zh? ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+"
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
deleted file mode 100644
index 32cebdfd03b2..000000000000
--- a/app-text/tidy-html5/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
diff --git a/app-text/tidy-html5/metadata.xml b/app-text/tidy-html5/metadata.xml
deleted file mode 100644
index d15ff3d4d284..000000000000
--- a/app-text/tidy-html5/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>monsieurp@gentoo.org</email>
- <name>Patrice Clement</name>
- </maintainer>
- <upstream>
- <remote-id type="github">nhatminhle/cofoja</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
deleted file mode 100644
index 297866a59a6a..000000000000
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
-HOMEPAGE="http://www.html-tidy.org/"
-SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND="!app-text/htmltidy"
-
-DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="$(get_libdir)"
- )
- cmake-utils_src_configure
-}
diff --git a/app-text/tkinfo/metadata.xml b/app-text/tkinfo/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/tkinfo/metadata.xml
+++ b/app-text/tkinfo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
deleted file mode 100644
index 517f9ae82166..000000000000
--- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Info Browser in TK"
-HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
-SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-LICENSE="freedist"
-SLOT="0"
-
-RDEPEND="dev-lang/tk"
-DEPEND="sys-apps/sed"
-
-DOCS=( README )
-
-src_prepare() {
- default
- sed -i \
- -e "1 s:^.*:#!/usr/bin/wish:" tkinfo || \
- die "sed tkinfo failed"
-}
-
-src_install () {
- dobin "${PN}"
- doman "${PN}.1"
-}
diff --git a/app-text/tkinfo/tkinfo-2.8-r2.ebuild b/app-text/tkinfo/tkinfo-2.8-r2.ebuild
new file mode 100644
index 000000000000..97256a448ef4
--- /dev/null
+++ b/app-text/tkinfo/tkinfo-2.8-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Info Browser in TK"
+HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
+SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
+
+LICENSE="Old-MIT GPL-1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
+
+RDEPEND="dev-lang/tk"
+
+src_prepare() {
+ default
+ sed -e "1 s:^.*:#!/usr/bin/env wish:" \
+ -i tkinfo || die "sed tkinfo failed"
+}
+
+src_install() {
+ dobin tkinfo
+ doman tkinfo.1
+}
diff --git a/app-text/tkman/metadata.xml b/app-text/tkman/metadata.xml
index 1300475e7aa1..cac093375a99 100644
--- a/app-text/tkman/metadata.xml
+++ b/app-text/tkman/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/tkman/tkman-2.2-r1.ebuild b/app-text/tkman/tkman-2.2-r1.ebuild
deleted file mode 100644
index 4e21e88ebb46..000000000000
--- a/app-text/tkman/tkman-2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="TkMan man and info page browser"
-HOMEPAGE="http://tkman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="
- >=app-text/rman-3.1
- >=dev-lang/tcl-8.4:0
- >=dev-lang/tk-8.4:0
- "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.2-gentoo.diff \
- "${FILESDIR}"/${PN}-CVE-2008-5137.diff #bug 247540
-}
-
-src_install() {
- local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman )
- local HTML_DOCS=( manual.html )
-
- dodir /usr/bin
- default
-
- doicon contrib/TkMan.gif
-
- domenu "${FILESDIR}"/tkman.desktop
-}
diff --git a/app-text/tkman/tkman-2.2-r3.ebuild b/app-text/tkman/tkman-2.2-r3.ebuild
new file mode 100644
index 000000000000..dea248e90be4
--- /dev/null
+++ b/app-text/tkman/tkman-2.2-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Graphical, hypertex man and info page browser"
+HOMEPAGE="https://sourceforge.net/projects/tkman/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ppc sparc x86"
+
+DEPEND="
+ >=app-text/rman-3.1
+ >=dev-lang/tcl-8.4:=
+ >=dev-lang/tk-8.4:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2-gentoo.diff \
+ "${FILESDIR}"/${PN}-CVE-2008-5137.diff
+)
+
+src_install() {
+ local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman )
+ local HTML_DOCS=( manual.html )
+
+ dodir /usr/bin
+ default
+
+ doicon contrib/TkMan.gif
+
+ domenu "${FILESDIR}"/tkman.desktop
+}
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
index 36d611cc515a..727570bb4994 100644
--- a/app-text/tofrodos/Manifest
+++ b/app-text/tofrodos/Manifest
@@ -1,2 +1 @@
-DIST tofrodos-1.7.12a.tar.gz 97588 BLAKE2B ca8794df5b58e0e88d23a52287ec3f9c58918baa6590b6e2d571782c4c2ff1625e208648cce8346b2f63b52031da5dd3aff0e66522e670525cdc09bdfd8744b0 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2
DIST tofrodos-1.7.13.tar.gz 99975 BLAKE2B 677b5cf7b1ef061b86a60229e083dc19ddcb7887b1319685ccd5a50493c1f02feb8556db3c2866f3ca1851304d0e97592a8abdd880a5f4e70eb7032f4238445d SHA512 629804caf20ac7bfc6f47637b7bc575766f032e324142df3be14347f050c61d969e023f8fed0ce5c87d8fc57b25c60c4e0214600738c5079d5e731045dae4843
diff --git a/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch b/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
deleted file mode 100644
index 5aa0e8358565..000000000000
--- a/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.original 2009-04-11 22:46:08.000000000 -0600
-+++ Makefile 2009-04-12 14:30:55.000000000 -0600
-@@ -92,14 +92,10 @@
- OBJS = emsg.o \
- init.o \
- tofrodos.o \
- utility.o
-
--# implicit rules
--.c.o:
-- $(CC) $(CFLAGS) $<
--
- # user visible rules
- all: $(FROMDOS) $(TODOS)
-
- clean:
- $(RM) $(OBJS)
diff --git a/app-text/tofrodos/metadata.xml b/app-text/tofrodos/metadata.xml
index a8e3b2aeed3c..ad6c3b11b01e 100644
--- a/app-text/tofrodos/metadata.xml
+++ b/app-text/tofrodos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
diff --git a/app-text/tofrodos/tofrodos-1.7.12a.ebuild b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
deleted file mode 100644
index cc6d10bee44b..000000000000
--- a/app-text/tofrodos/tofrodos-1.7.12a.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility that converts ASCII files between the MSDOS and the Unix format"
-HOMEPAGE="http://tofrodos.sourceforge.net/"
-SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/src"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.7.8-CFLAGS.patch
-}
-
-src_compile() {
- emake DEBUG=1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-src_install() {
- dobin fromdos
- dosym fromdos /usr/bin/todos
- doman fromdos.1
-}
diff --git a/app-text/tokyodystopia/files/fix_ldconfig.patch b/app-text/tokyodystopia/files/fix_ldconfig.patch
index a75da590ee38..e9c28b96bc9d 100644
--- a/app-text/tokyodystopia/files/fix_ldconfig.patch
+++ b/app-text/tokyodystopia/files/fix_ldconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 60b1036..12f02b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,6 @@ install :
diff --git a/app-text/tokyodystopia/files/fix_rpath.patch b/app-text/tokyodystopia/files/fix_rpath.patch
index 68c0b6e03510..12c95a5778c3 100644
--- a/app-text/tokyodystopia/files/fix_rpath.patch
+++ b/app-text/tokyodystopia/files/fix_rpath.patch
@@ -1,6 +1,5 @@
-diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
---- tokyodystopia-0.9.13/Makefile.in 2009-07-05 04:06:06.000000000 +0200
-+++ tokyodystopia-0.9.13-new/Makefile.in 2009-10-20 22:39:18.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
@@ -55,8 +55,8 @@
LDFLAGS = @MYLDFLAGS@
CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -12,9 +11,8 @@ diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
POSTCMD = @MYPOSTCMD@
-diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
---- tokyodystopia-0.9.13/configure.in 2009-06-14 05:44:54.000000000 +0200
-+++ tokyodystopia-0.9.13-new/configure.in 2009-10-20 22:40:00.000000000 +0200
+--- a/configure.in
++++ b/configure.in
@@ -26,31 +26,14 @@
MYPCFILES="tokyodystopia.pc"
@@ -49,9 +47,8 @@ diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
#================================================================
# Options
-diff -ur tokyodystopia-0.9.13/tokyodystopia.pc.in tokyodystopia-0.9.13-new/tokyodystopia.pc.in
---- tokyodystopia-0.9.13/tokyodystopia.pc.in 2008-02-21 10:45:01.000000000 +0100
-+++ tokyodystopia-0.9.13-new/tokyodystopia.pc.in 2009-10-20 22:40:17.000000000 +0200
+--- a/tokyodystopia.pc.in
++++ b/tokyodystopia.pc.in
@@ -10,5 +10,5 @@
Name: Tokyo Dystopia
Description: a full-text search system
diff --git a/app-text/tokyodystopia/files/remove_docinst.patch b/app-text/tokyodystopia/files/remove_docinst.patch
index d513f54b753c..5b8fe1e8acd7 100644
--- a/app-text/tokyodystopia/files/remove_docinst.patch
+++ b/app-text/tokyodystopia/files/remove_docinst.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 8846c38..29ac11e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,8 +117,6 @@ install :
diff --git a/app-text/tokyodystopia/metadata.xml b/app-text/tokyodystopia/metadata.xml
index 40aa45df2b01..2ce0e74f9864 100644
--- a/app-text/tokyodystopia/metadata.xml
+++ b/app-text/tokyodystopia/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 6b5ad2082928..a384bbf797c7 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
HOMEPAGE="https://fallabs.com/tokyodystopia/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="https://fallabs.com/tokyodystopia/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -16,26 +16,26 @@ DEPEND="dev-db/tokyocabinet"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/fix_rpath.patch"
- "${FILESDIR}/fix_ldconfig.patch"
- "${FILESDIR}/remove_docinst.patch"
+ "${FILESDIR}"/fix_rpath.patch
+ "${FILESDIR}"/fix_ldconfig.patch
+ "${FILESDIR}"/remove_docinst.patch
)
src_configure() {
econf --libexecdir="${EPREFIX}"/usr/libexec/${PN}
}
+src_test() {
+ emake -j1 check
+}
+
src_install() {
HTML_DOCS=( doc/. )
default
if use examples; then
- insinto /usr/share/${PF}/example
- doins example/.
+ docinto example
+ dodoc example/.
fi
}
-
-src_test() {
- emake -j1 check
-}
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index c21c96fe2361..9ddc07d64b74 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1 +1 @@
-DIST trang-20151127.tar.gz 13746141 BLAKE2B 8895fefa8be62a524a2bfb603a64bcf641f13cd500dbe51b9efdaed7d5147dd6478963d356aec81c5c5b6af12a59edcb908d203b6b8edaf093fe29f76db80b7c SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26
+DIST trang-20181222.tar.gz 14847113 BLAKE2B 335722853b2d373fd9a6e9d4478b8248ca49d0559d5a8f60566f5550e60d5a004f26338897617acc617f84d1d55546afb9c51da64b7634514fa2ec508fa7a47a SHA512 fa412a5beeff07a620c4aa5723cf5b73bdb6b1cda561e3bf7764a609110f538da5313bcc79aca4d7742f71b3b071d3537681845d17ece46bc871c0964f4e251d
diff --git a/app-text/trang/files/trang-20181222-build-fixes.patch b/app-text/trang/files/trang-20181222-build-fixes.patch
new file mode 100644
index 000000000000..ef7118c650a1
--- /dev/null
+++ b/app-text/trang/files/trang-20181222-build-fixes.patch
@@ -0,0 +1,31 @@
+https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/javacc.dir/
+
+Description: update local Java path
+--- a/build.xml
++++ b/build.xml
+@@ -1,6 +1,6 @@
+ <project name="jing-trang" default="jar">
+
+-<property name="lib.dir" value="lib"/>
++<property name="lib.dir" value="/usr/share/java"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="doc.dir" value="${basedir}/doc"/>
+
+--- a/build.xsl
++++ b/build.xsl
+@@ -23,15 +23,6 @@
+ <target name="dummy"/>
+ <target name="init">
+ <mkdir dir="{$build}"/>
+- <exec executable="git">
+- <arg value="submodule"/>
+- <arg value="update"/>
+- <arg value="--init"/>
+- <arg value="--recursive"/>
+- </exec>
+- <copy todir="{$doc}">
+- <fileset dir="relaxng.org/jclark" includes="**"/>
+- </copy>
+ </target>
+ <xsl:for-each select="modules/module">
+ <xsl:apply-templates select="document(concat('mod/', .,'/mod.xml'), .)/module">
diff --git a/app-text/trang/files/trang-20181222-unicode-data-path.patch b/app-text/trang/files/trang-20181222-unicode-data-path.patch
new file mode 100644
index 000000000000..e1aaf5452f47
--- /dev/null
+++ b/app-text/trang/files/trang-20181222-unicode-data-path.patch
@@ -0,0 +1,15 @@
+Adapted from Debian.
+https://sources.debian.org/patches/jing-trang/20181222+dfsg2-6/unicode.patch/
+
+Description: update unicode path
+--- a/mod/regex/mod.xml
++++ b/mod/regex/mod.xml
+@@ -46,7 +46,7 @@
+ failonerror="yes">
+ <arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/>
+ <arg value="${build.dir}/mod/regex/gensrc/main"/>
+- <arg value="${lib.dir}/UnicodeData-3.1.0.txt"/>
++ <arg value="@GENTOO_PORTAGE_EPREFIX@/usr/share/unicode-data/UnicodeData.txt"/>
+ <classpath>
+ <pathelement location="${build.dir}/mod/regex-gen/classes/main"/>
+ <pathelement location="${build.dir}/mod/util/classes/main"/>
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
index 04751195a354..35e9588fb69b 100644
--- a/app-text/trang/metadata.xml
+++ b/app-text/trang/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
diff --git a/app-text/trang/trang-20151127.ebuild b/app-text/trang/trang-20151127.ebuild
deleted file mode 100644
index fa287c480746..000000000000
--- a/app-text/trang/trang-20151127.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Multi-format schema converter based on RELAX NG"
-HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
-SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-COMMON_DEP="
- dev-java/xerces:2
- dev-java/xml-commons-resolver:0"
-
-RDEPEND="
- >=virtual/jre-1.7
- ${COMMON_DEP}"
-
-DEPEND="
- >=virtual/jdk-1.7
- dev-java/javacc:0
- dev-java/saxon:6.5
- dev-java/testng:0
- ${COMMON_DEP}"
-
-S="${WORKDIR}/jing-${PN}-${COMMIT}"
-
-EANT_ANT_TASKS="testng"
-EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_PKG_BSFIX_NAME="build.xsl"
-
-java_prepare() {
- java-pkg_clean
- echo "<version>${PV}</version>" > version.xml || die
-}
-
-src_configure() {
- java-ant-2_src_configure
-
- # Because this crazy package uses XSLT, we need to escape this.
- sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
-
- EANT_EXTRA_ARGS="-Djavacc.dir=${EROOT}usr/share/javacc/lib"
- export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
-}
-
-src_compile() {
- EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
- EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
-}
-
-src_install() {
- java-pkg_dojar build/${PN}.jar
- java-pkg_dolauncher ${PN} \
- --main com.thaiopensource.relaxng.translate.Driver
-
- docinto html
- dodoc build/*.html
-}
-
-src_test() {
- java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd
- java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd
- java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd
-
- md5sum -c <<EOF || die "Failed to verify md5sum"
-4bcb454ade46c0188f809d2e8ce15315 ${FILESDIR}/test.xml
-d096c1fb462902e10a3440a604a21664 test/test.xsd
-3fb46bdb16dc75a2a1e36e421b13e51d test/test.dtd
-fce355ca962cb063d7baa5d7fd571bcf test/test.dtd.xsd
-EOF
-}
diff --git a/app-text/trang/trang-20181222.ebuild b/app-text/trang/trang-20181222.ebuild
new file mode 100644
index 000000000000..1bd1c56592c4
--- /dev/null
+++ b/app-text/trang/trang-20181222.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2 prefix
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="https://github.com/relaxng/jing-trang/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/jing-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+ dev-java/xerces:2
+ dev-java/xml-commons-resolver:0"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${COMMON_DEP}"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ dev-java/javacc:0
+ dev-java/saxon:6.5
+ dev-java/testng:0
+ ${COMMON_DEP}"
+BDEPEND="app-i18n/unicode-data"
+
+EANT_ANT_TASKS="testng"
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_BSFIX_NAME="build.xsl"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20181222-build-fixes.patch
+ "${FILESDIR}"/${PN}-20181222-unicode-data-path.patch
+)
+
+src_prepare() {
+ default
+
+ eprefixify mod/regex/mod.xml
+
+ java-pkg_clean
+ echo "<version>${PV}</version>" > version.xml || die
+}
+
+src_configure() {
+ java-ant-2_src_configure
+
+ # Because this crazy package uses XSLT, we need to escape this.
+ sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
+
+ EANT_EXTRA_ARGS="-Djavacc.dir=${EPREFIX}/usr/share/javacc/lib"
+ export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
+}
+
+src_compile() {
+ EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
+ EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
+}
+
+src_test() {
+ java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd || die
+ java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd || die
+ java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd || die
+
+ md5sum -c <<EOF || die "Failed to verify md5sum"
+4bcb454ade46c0188f809d2e8ce15315 ${FILESDIR}/test.xml
+d096c1fb462902e10a3440a604a21664 test/test.xsd
+3fb46bdb16dc75a2a1e36e421b13e51d test/test.dtd
+fce355ca962cb063d7baa5d7fd571bcf test/test.dtd.xsd
+EOF
+}
+
+src_install() {
+ java-pkg_dojar build/${PN}.jar
+ java-pkg_dolauncher ${PN} \
+ --main com.thaiopensource.relaxng.translate.Driver
+
+ docinto html
+ dodoc build/*.html
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index e3b2ce843063..f7761a570ad0 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,2 +1,2 @@
-DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
-DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
+DIST unix-tree-2.1.0.tar.bz2 51401 BLAKE2B 89b15df0268c03ba66827c7e6d234d1f5c4f6a5d9788e30bf6859d477b340393acbeec9ad7afc1909fdc7beb81ef7934917206066e0875d9f1662fca170f4127 SHA512 0f3a6ecb450bb3d683804667d4f15aecf9c9765578d47a62e39a8ff69cbe1c2a0a4a922fef3728359060338f4f9cd2de7ab8eb0f992a4c32949278bb47d17edc
+DIST unix-tree-2.1.1.tar.bz2 52550 BLAKE2B 0f20009a6c64b07a0742637bf32366b038f5c9bb025755a0aa45edb8c92741dfbff1486179caeeb73cfa8f10de3ed8678b948c7416ee0463e785cf153e808ff0 SHA512 ed34b1d0df049986295e7f5539491acd6134fbe69050ac2634037d700a878b4937700bed777ef0624e2bb0fc8c2815bb5139272ffe575ecc9362b84e0fafc9c2
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index c30fee716df8..df2247ec43bd 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>jstein@gentoo.org</email>
<name>Jonas Stein</name>
</maintainer>
<upstream>
- <changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog>
+ <changelog>https://gitlab.com/OldManProgrammer/unix-tree/-/blob/master/CHANGES</changelog>
+ <remote-id type="gitlab">OldManProgrammer/unix-tree</remote-id>
+ <remote-id type="github">Old-Man-Programmer/tree</remote-id>
</upstream>
<longdescription>Tree is a recursive directory listing command that
produces a depth indented listing of files, which is colorized ala
diff --git a/app-text/tree/tree-1.7.0-r1.ebuild b/app-text/tree/tree-1.7.0-r1.ebuild
deleted file mode 100644
index 635e68678446..000000000000
--- a/app-text/tree/tree-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!=sci-biology/meme-4.8.1"
-DEPEND=""
-
-src_prepare() {
- sed -i -e 's:LINUX:__linux__:' tree.c || die
- mv doc/tree.1.fr doc/tree.fr.1
- if use !elibc_glibc ; then
- # 433972, also previously done only for elibc_uclibc
- sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
- fi
- default
-}
-
-src_compile() {
- append-lfs-flags
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin tree
- doman doc/tree*.1
- einstalldocs
- newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
deleted file mode 100644
index 403081c551cc..000000000000
--- a/app-text/tree/tree-1.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!=sci-biology/meme-4.8.1"
-DEPEND=""
-
-src_prepare() {
- sed -i -e 's:LINUX:__linux__:' tree.c || die
- mv doc/tree.1.fr doc/tree.fr.1
- if use !elibc_glibc ; then
- # 433972, also previously done only for elibc_uclibc
- sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
- fi
-}
-
-src_compile() {
- append-lfs-flags
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin tree
- doman doc/tree*.1
- dodoc CHANGES README*
- newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
deleted file mode 100644
index 4737aa83e4eb..000000000000
--- a/app-text/tree/tree-1.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
- sed -i -e 's:LINUX:__linux__:' tree.c || die
- mv doc/tree.1.fr doc/tree.fr.1
- if use !elibc_glibc ; then
- # 433972, also previously done only for elibc_uclibc
- sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
- fi
- default
-}
-
-src_compile() {
- append-lfs-flags
- emake \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin tree
- doman doc/tree*.1
- einstalldocs
- newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-2.1.0.ebuild b/app-text/tree/tree-2.1.0.ebuild
new file mode 100644
index 000000000000..dd393b5c6efc
--- /dev/null
+++ b/app-text/tree/tree-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree"
+SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+
+S=${WORKDIR}/unix-${P}
+
+src_compile() {
+ append-lfs-flags
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin tree
+ doman doc/tree*.1
+ einstalldocs
+ newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/tree/tree-2.1.1.ebuild b/app-text/tree/tree-2.1.1.ebuild
new file mode 100644
index 000000000000..dd393b5c6efc
--- /dev/null
+++ b/app-text/tree/tree-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree"
+SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+
+S=${WORKDIR}/unix-${P}
+
+src_compile() {
+ append-lfs-flags
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin tree
+ doman doc/tree*.1
+ einstalldocs
+ newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 2eec26130dcd..6bba4f271f42 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,4 +1,2 @@
-DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
-DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+DIST texlive-20230311-source.tar.xz 68359984 BLAKE2B 6263e8d3e066db96f071138f2442b1ed7e1f3db7e6d261cdeb9a7e6e636c6e6ed45305c6bda3ab6f9a439c92eabf32a79bf6e371d16b747eebbc05ee47b85035 SHA512 93ac43f3055fee0103a6cfceea18d39ece63984914f3af9ad76da218f2d568852d9b987d1c9647c1497b985e4ffa297ef97dc2d50d3e90f62b03ad685af31d96
diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch
deleted file mode 100644
index 6387b28c8ba2..000000000000
--- a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100
-+++ b/m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100
-@@ -21,17 +21,10 @@
-
- # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
- # -------------------------------------
--AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
-+AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
-
- # KPSE_FREETYPE2_SYSTEM_FLAGS
- # ---------------------------
- AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
--AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
--AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
--fi
--]) # KPSE_FREETYPE2_SYSTEM_FLAGS
-+_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
-+
diff --git a/app-text/ttf2pk2/metadata.xml b/app-text/ttf2pk2/metadata.xml
index 13170c3184d8..edfe97231997 100644
--- a/app-text/ttf2pk2/metadata.xml
+++ b/app-text/ttf2pk2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
deleted file mode 100644
index c9c06857c63c..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
- media-libs/freetype:2
- sys-libs/zlib
- !media-libs/freetype:1
- !=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- econf --with-system-kpathsea \
- --with-system-freetype2 \
- --with-system-zlib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
deleted file mode 100644
index 11ba85c82e21..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
- media-libs/freetype:2
- sys-libs/zlib
- !media-libs/freetype:1
- !=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
- econf --with-system-kpathsea \
- --with-system-freetype2 \
- --with-system-zlib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild
deleted file mode 100644
index 5a5ec2a0e649..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
- media-libs/freetype:2
- sys-libs/zlib
- !media-libs/freetype:1
- !=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_prepare () {
- # Bug 654770
- cd "${WORKDIR}/texlive-${PV#*_p}-source"
- eapply "${FILESDIR}"/ttf2pk2-2.0_p20170524-freetype2-config.patch
- cd "${S}"
- eautoreconf
- eapply_user
-}
-
-src_configure() {
- econf --with-system-kpathsea \
- --with-system-freetype2 \
- --with-system-zlib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
deleted file mode 100644
index ddd5274a4986..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
- media-libs/freetype:2
- sys-libs/zlib
- !media-libs/freetype:1
- !=dev-texlive/texlive-langcjk-2011*[source]"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
- econf --with-system-kpathsea \
- --with-system-freetype2 \
- --with-system-zlib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc BUGS README TODO ChangeLog
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
deleted file mode 100644
index 5fe37002fddb..000000000000
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note about blockers: it is a freetype2 based replacement for ttf2pk and
-# ttf2tfm from freetype1, so block freetype1.
-# It installs some data that collides with
-# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
-# meanwhile we can start dropping freetype1.
-RDEPEND=">=dev-libs/kpathsea-6.2.1
- media-libs/freetype:2
- sys-libs/zlib
- !media-libs/freetype:1"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_configure() {
- econf --with-system-kpathsea \
- --with-system-freetype2 \
- --with-system-zlib
-}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
new file mode 100644
index 000000000000..a6a15aa046a2
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="https://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~sam/texlive/texlive-${PV#*_p}-source.tar.xz"
+S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+ media-libs/freetype:2
+ sys-libs/zlib
+ !media-libs/freetype:1"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ econf --with-system-kpathsea \
+ --with-system-freetype2 \
+ --with-system-zlib
+}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild
new file mode 100644
index 000000000000..c15767ae7644
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20230311.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="https://tug.org/texlive/"
+SRC_URI="https://mirrors.ctan.org/systems/texlive/Source/texlive-${PV#*_p}-source.tar.xz"
+S="${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND="
+ >=dev-libs/kpathsea-6.2.1
+ media-libs/freetype:2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --with-system-kpathsea \
+ --with-system-freetype2 \
+ --with-system-zlib
+}
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
index 2d301244272c..cd8fc2c69b39 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
@@ -1,6 +1,5 @@
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
---- ttf2pt1-3.4.0.orig/ttf2pt1.1 2001-11-25 00:58:11.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1.1 2006-08-15 19:15:37.129672839 +0000
+--- a/ttf2pt1.1
++++ b/ttf2pt1.1
@@ -109,7 +109,8 @@
..
.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
@@ -11,9 +10,8 @@ diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
. \" fudge factors for nroff and troff
.if n \{\
. ds #H 0
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
---- ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 2001-11-25 00:58:13.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1_convert.1 2006-08-15 19:16:14.369517359 +0000
+--- a/ttf2pt1_convert.1
++++ b/ttf2pt1_convert.1
@@ -109,7 +109,8 @@
..
.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
@@ -24,9 +22,8 @@ diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
. \" fudge factors for nroff and troff
.if n \{\
. ds #H 0
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 ttf2pt1-3.4.0/ttf2pt1_x2gs.1
---- ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 2001-11-25 00:58:13.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1_x2gs.1 2006-08-15 19:16:30.770568473 +0000
+--- a/ttf2pt1_x2gs.1
++++ b/ttf2pt1_x2gs.1
@@ -109,7 +109,8 @@
..
.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
index 3d03e03e14ca..0bb7b570595b 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 2616d46..cf72cba 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
index 6c760f43dd21..8224c168c1a3 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
---- ttf2pt1-3.4.4-orig/Makefile 2007-07-15 20:06:50.000000000 -0600
-+++ ttf2pt1-3.4.4/Makefile 2007-07-15 20:12:40.000000000 -0600
+--- a/Makefile
++++ b/Makefile
@@ -9,7 +9,7 @@
#
# Use GNU C even if it's not the default compiler
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch
new file mode 100644
index 000000000000..cb54195872e9
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-clang16.patch
@@ -0,0 +1,61 @@
+https://sourceforge.net/p/ttf2pt1/mailman/message/37804025/
+https://bugs.gentoo.org/881321
+
+Avoid implicit ints and implicit function declarations, and build
+failures with future compilers which do not support this pre-C99
+features by default.
+
+--- a/other/bmpfont.h
++++ b/other/bmpfont.h
+@@ -2,7 +2,9 @@
+ * see COPYRIGHT
+ */
+
++#include <stdlib.h>
+
++void
+ fchkneg(file, line, rc, cmd)
+ char *file;
+ int line;
+@@ -17,6 +19,7 @@ fchkneg(file, line, rc, cmd)
+ }
+ }
+
++void
+ fchknull(file, line, rc, cmd)
+ char *file;
+ int line;
+--- a/other/cmpf.c
++++ b/other/cmpf.c
+@@ -14,7 +14,7 @@
+
+ #include "bmpfont.h"
+
+-
++int
+ main(ac, av)
+ int ac;
+ char **av;
+--- a/other/dmpf.c
++++ b/other/dmpf.c
+@@ -14,7 +14,7 @@
+
+ #include "bmpfont.h"
+
+-
++int
+ main(ac, av)
+ int ac;
+ char **av;
+--- a/t1asm.c
++++ b/t1asm.c
+@@ -59,6 +59,8 @@ static char portnotice[] =
+ # define WINDOWS_FUNCTIONS
+ # include "windows.h"
+ # endif
++#else
++# include <unistd.h>
+ #endif
+
+ /* int32 must be at least 32-bit and uint16 must be at least 16-bit */
+
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
index 8257742ebe59..a4c4e7b98716 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
@@ -1,6 +1,5 @@
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4-orig/ft.c 2007-07-15 20:23:43.000000000 -0600
-+++ ttf2pt1-3.4.4/ft.c 2007-07-15 20:24:02.000000000 -0600
+--- a/ft.c
++++ b/ft.c
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <ctype.h>
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
index 7c608c9e66b9..6cfdfa2235b1 100644
--- a/app-text/ttf2pt1/metadata.xml
+++ b/app-text/ttf2pt1/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>fonts@gentoo.org</email>
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
deleted file mode 100644
index ed543c6808a4..000000000000
--- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="True Type Font to Postscript Type 1 Converter"
-HOMEPAGE="http://ttf2pt1.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz"
-
-LICENSE="ttf2pt1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=media-libs/freetype-2.5.1:2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-Makefile.patch
- epatch "${FILESDIR}"/${P}-LDFLAGS.patch
- epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
- epatch "${FILESDIR}"/${P}-freetype.patch
-
- sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
- sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile
- sed -i -e "/^LIBS_FT=/ { s:-L/usr/lib:-L/usr/$(get_libdir): }" Makefile
- sed -i -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" Makefile
-}
-
-src_install() {
- emake INSTDIR="${D}"/usr install
- dodir /usr/share/doc/${PF}
- pushd "${D}"/usr/share/ttf2pt1 > /dev/null
- rm -r app other
- mv [A-Z]* ../doc/${PF}
- popd > /dev/null
-}
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild
new file mode 100644
index 000000000000..22fd1fdfaa2b
--- /dev/null
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="True Type Font to Postscript Type 1 Converter"
+HOMEPAGE="https://ttf2pt1.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz"
+
+LICENSE="ttf2pt1"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+DEPEND=">=media-libs/freetype-2.5.1:2"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+ "${FILESDIR}"/${P}-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
+ "${FILESDIR}"/${P}-freetype.patch
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "/^CC=/ { s:gcc:$(tc-getCC): }" \
+ -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" \
+ -e "/^LIBS_FT=/ { s:-L/usr/lib:-L${ESYSROOT}/usr/$(get_libdir): }" \
+ -e "s:-I/usr/include/freetype2 -I/usr/include:$($(tc-getPKG_CONFIG) --cflags freetype2):" \
+ -e "s:-L/usr/lib -lfreetype:$($(tc-getPKG_CONFIG) --libs freetype2):" \
+ -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" \
+ -e "/chown/d" \
+ -e "/chgrp/d" \
+ -e "/chmod/d" \
+ Makefile || die
+}
+
+src_install() {
+ emake INSTDIR="${ED}"/usr install
+ dodir /usr/share/doc/${PF}
+
+ pushd "${ED}"/usr/share/ttf2pt1 > /dev/null || die
+ rm -r app other || die
+ mv [A-Z]* ../doc/${PF} || die
+ popd > /dev/null || die
+}
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 5a00d5fd43c6..5090477b91dd 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,2 +1 @@
-DIST txt2man-1.5.6.tar.gz 16293 BLAKE2B f62836aae1d7c1539ca896ce10a404965ba1794bbf06448693b2f138a28e74c69912cd1e693fa1e6cf9402f703decdd6b76cffd8d63276ce313d075a26cb3fb3 SHA512 dd1cb5a6385d75b459fb61c49e0b73e5cafa5af8b11d9b89e5c206a9c5b65e4daac4d0e768c28963aacde772b715cb11ed0e843e42397b2df894a1f68c70ca65
-DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
+DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
diff --git a/app-text/txt2man/metadata.xml b/app-text/txt2man/metadata.xml
index 68e9a0a0461c..9e061696f43f 100644
--- a/app-text/txt2man/metadata.xml
+++ b/app-text/txt2man/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
- <longdescription lang="en">
- Simple shell script that creates a manpage starting from a simple
- structured text file.
- </longdescription>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">mvertes/txt2man</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/txt2man/txt2man-1.5.6.ebuild b/app-text/txt2man/txt2man-1.5.6.ebuild
deleted file mode 100644
index 5f29e5cbf37f..000000000000
--- a/app-text/txt2man/txt2man-1.5.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Scripts to convert regular ASCII text to man pages"
-HOMEPAGE="http://mvertes.free.fr/"
-SRC_URI="http://mvertes.free.fr/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="app-shells/bash
- sys-apps/gawk"
-
-src_compile() { :; }
-
-src_install() {
- dobin bookman src2man txt2man
- doman *.1
- dodoc Changelog README
-}
diff --git a/app-text/txt2man/txt2man-1.6.0.ebuild b/app-text/txt2man/txt2man-1.6.0.ebuild
deleted file mode 100644
index 52ff0bcf6dc6..000000000000
--- a/app-text/txt2man/txt2man-1.6.0.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"
-
-DESCRIPTION="Scripts to convert regular ASCII text to man pages"
-HOMEPAGE="https://github.com/mvertes/txt2man"
-SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="app-shells/bash
- sys-apps/gawk"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() { :; }
-
-src_install() {
- dobin bookman src2man txt2man
- doman *.1
- dodoc Changelog README
-}
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
new file mode 100644
index 000000000000..e076255aaeeb
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="https://github.com/mvertes/txt2man"
+SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="app-shells/bash
+ sys-apps/gawk"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=( Changelog README )
+
+src_install() {
+ emake prefix="${ED}/usr" install
+ einstalldocs
+}
diff --git a/app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch b/app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch
new file mode 100644
index 000000000000..777d0e0e130e
--- /dev/null
+++ b/app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch
@@ -0,0 +1,10 @@
+--- a/txt2pdbdoc.c
++++ b/txt2pdbdoc.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+
+ /* local */
+ #include "palm.h"
diff --git a/app-text/txt2pdbdoc/metadata.xml b/app-text/txt2pdbdoc/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/txt2pdbdoc/metadata.xml
+++ b/app-text/txt2pdbdoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
index 5b2215cf8c73..a40e3f9e28c1 100644
--- a/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
+++ b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit autotools
@@ -12,14 +12,21 @@ SRC_URI="http://homepage.mac.com/pauljlucas/software/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS README ChangeLog )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.4-implicit-decl-getopt.patch
+)
+
src_prepare() {
- sed -i -e "/^CFLAGS/d" configure.in
+ default
+
+ sed -i -e "/^CFLAGS/d" configure.in || die
+ mv configure.{in,ac} || die
+
eautoreconf
}
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 8d003cb19cec..3b4bb7d6b4b4 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1 +1 @@
-DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
+DIST txt2tags-3.9.tar.gz 252334 BLAKE2B 2052af87989b636cc3ed99b3fa8f884abbb175a19af709396b96ede9f10afca4d6764651b3c35ce60e52dad687b8f9b7b7b31f6d01a23a58c7c328a084067f7b SHA512 f2a1b0a671049595f12a05ca68acd860002bde9b8510eb9379ad9bdf94026b30522d670d39f2beffafa50104b44b2a3394aa090297ef92b46837c9a8e7e728ea
diff --git a/app-text/txt2tags/files/51txt2tags-gentoo.el b/app-text/txt2tags/files/51txt2tags-gentoo.el
deleted file mode 100644
index 0b98bd66b8b2..000000000000
--- a/app-text/txt2tags/files/51txt2tags-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; txt2tags site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 't2t-mode "txt2tags-mode" "Major mode for editing Txt2Tags files" t)
-(add-to-list 'auto-mode-alist '("\\.t2t\\'" . t2t-mode))
diff --git a/app-text/txt2tags/metadata.xml b/app-text/txt2tags/metadata.xml
index f96fe67ab4db..adc2a73b4e28 100644
--- a/app-text/txt2tags/metadata.xml
+++ b/app-text/txt2tags/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
+ <email>ceamac@gentoo.org</email>
+ <name>Viorel Munteanu</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
+ <remote-id type="github">txt2tags/txt2tags</remote-id>
<remote-id type="google-code">txt2tags</remote-id>
+ <remote-id type="pypi">txt2tags</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
deleted file mode 100644
index 701f24a7853a..000000000000
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit eutils elisp-common python-single-r1
-
-DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
-HOMEPAGE="https://txt2tags.org"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="emacs tk vim-syntax"
-
-DEPEND="${PYTHON_DEPS}
- tk? ( dev-lang/tk )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-SITEFILE="51${PN}-gentoo.el"
-
-src_compile() {
- if use emacs; then
- elisp-compile extras/txt2tags-mode.el || die "elisp-compile failed"
- fi
-}
-
-src_install() {
- dobin txt2tags
-
- dodoc README ChangeLog*
- dodoc doc/*.{pdf,t2t}
- dodoc -r samples extras
- newman doc/manpage.man txt2tags.1
-
- # make .po files
- for pofile in "${S}"/po/*.po; do
- msgfmt -o ${pofile%%.po}.mo ${pofile}
- done
- domo po/*.mo
-
- # emacs support
- if use emacs; then
- elisp-install ${PN} extras/txt2tags-mode.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax/
- doins extras/txt2tags.vim || die
-
- echo 'au BufNewFile,BufRead *.t2t set ft=txt2tags' > "${T}/${PN}.vim"
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}/${PN}.vim" || die
- fi
-
- python_fix_shebang "${D}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/app-text/txt2tags/txt2tags-3.9.ebuild b/app-text/txt2tags/txt2tags-3.9.ebuild
new file mode 100644
index 000000000000..a493a4969d04
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-3.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1
+
+DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
+HOMEPAGE="https://txt2tags.org"
+SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+python_test() {
+ cd test || die
+ "${EPYTHON}" run.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
index 3de906698921..8988b9399383 100644
--- a/app-text/u2ps/Manifest
+++ b/app-text/u2ps/Manifest
@@ -1 +1 @@
-DIST u2ps-full-0.8.4.tar.gz 5496922 BLAKE2B 416a206b768328cf1a268b4706578610e6bed45ee7475d52de515e112e51bbfcc777b2f21603826d52da42b9c6a3bd10dd4e95920e77c14e957ad4a6d0888984 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e
+DIST u2ps-1.2.tar.gz 110917 BLAKE2B 223aec319d36191032e45a73d9053a970ef76c780c9260e3d6a3799c24f80eb0bddd645de87806570844c3e4e763a2eb1929d44bf122daeaebcefd711d61d35d SHA512 3c5c12b50b6d2d50c67a1051375aeb4cfb32a2c8c898837313ac7ff4a11f30c4625f71f77203f7b1367b1ccdb9143a1106b99deaef8f964af3d08336ce686198
diff --git a/app-text/u2ps/files/u2ps-1.1-nostrip.patch b/app-text/u2ps/files/u2ps-1.1-nostrip.patch
new file mode 100644
index 000000000000..33ac79c4909e
--- /dev/null
+++ b/app-text/u2ps/files/u2ps-1.1-nostrip.patch
@@ -0,0 +1,14 @@
+diff -ruN u2ps-1.1.orig/Makefile u2ps-1.1/Makefile
+--- u2ps-1.1.orig/Makefile 2019-02-17 20:01:48.000000000 +0100
++++ u2ps-1.1/Makefile 2019-12-22 20:43:17.667058496 +0100
+@@ -18,8 +18,8 @@
+
+ install:
+ install -dm 0755 $(DESTDIR)$(bindir)
+- install -sm 0755 u2ps $(DESTDIR)$(bindir)/u2ps
+- install -sm 0755 psfrem $(DESTDIR)$(bindir)/psfrem
++ install -m 0755 u2ps $(DESTDIR)$(bindir)/u2ps
++ install -m 0755 psfrem $(DESTDIR)$(bindir)/psfrem
+ install -dm 0755 $(DESTDIR)$(basedir)
+ install -dm 0755 $(DESTDIR)$(basedir)/ProcSet
+ install -m 0644 res/*.ps $(DESTDIR)$(basedir)
diff --git a/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch b/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch
new file mode 100644
index 000000000000..a9d4ac5e1ebf
--- /dev/null
+++ b/app-text/u2ps/files/u2ps-1.2-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 8a526f0..88b90b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ u2ps: u2ps.o u2ps_opts.o u2ps_data.o u2ps_file.o u2ps_page.o u2ps_pswr.o \
+ ttf2pt42: ttf2pt42.o warn.o
+
+ %: %.o
+- $(CC) -o $@ $(filter %.o,$^)
++ $(CC) -o $@ $(filter %.o,$^) ${LDFLAGS}
+
+ .c.o:
+ $(CC) $(CFLAGS) -o $@ -c $<
diff --git a/app-text/u2ps/metadata.xml b/app-text/u2ps/metadata.xml
index ae74331bddb6..3f66d443492f 100644
--- a/app-text/u2ps/metadata.xml
+++ b/app-text/u2ps/metadata.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
+ <remote-id type="github">arsv/u2ps</remote-id>
<remote-id type="sourceforge">u2ps.berlios</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/u2ps/u2ps-0.8.4.ebuild b/app-text/u2ps/u2ps-0.8.4.ebuild
deleted file mode 100644
index 9ba7a301cae0..000000000000
--- a/app-text/u2ps/u2ps-0.8.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
-HOMEPAGE="https://sourceforge.net/projects/u2ps.berlios/"
-SRC_URI="mirror://sourceforge/project/${PN}.berlios/${PN}-full-${PV}.tar.gz"
-
-LICENSE="GPL-3 GPL-3-with-font-exception free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-lang/perl-5.6
- dev-perl/Text-CharWidth
- app-text/ghostscript-gpl
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}-full-${PV}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- --datadir=/usr/share \
- --mandir=/usr/share/man \
- --with-perl=/usr/bin/perl \
- --with-gs=/usr/bin/gs \
- || die 'configure failed'
-}
-
-src_compile() {
- emake
- emake man
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc README DESIGN
- doman man/u2ps.1
-}
diff --git a/app-text/u2ps/u2ps-1.2.ebuild b/app-text/u2ps/u2ps-1.2.ebuild
new file mode 100644
index 000000000000..71ad11c5557b
--- /dev/null
+++ b/app-text/u2ps/u2ps-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="https://github.com/arsv/u2ps"
+SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.2-respect-ldflags.patch"
+)
+
+src_configure() {
+ # this isnt autoconf, so econf fails...
+ tc-export CC
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --datadir="${EPREFIX}"/usr/share \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --with-gs="${EPREFIX}"/usr/bin/gs \
+ || die 'configure failed'
+}
diff --git a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
index ca1d50274da6..a006c4fbd787 100644
--- a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
+++ b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
@@ -1,8 +1,7 @@
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556379
-diff -r fd7eb0d70970 unac-1.8.0/unac.c
---- a/unac-1.8.0/unac.c Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unac.c Fri Sep 17 10:36:07 2010 +0200
+--- a/unac.c
++++ b/unac.c
@@ -13873,9 +13873,9 @@
*out_lengthp = 0;
} else {
@@ -15,9 +14,8 @@ diff -r fd7eb0d70970 unac-1.8.0/unac.c
if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
return -1;
-diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
---- a/unac-1.8.0/unaccent.c Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unaccent.c Fri Sep 17 10:40:34 2010 +0200
+--- a/unaccent.c
++++ b/unaccent.c
@@ -90,7 +90,7 @@
const char* charset = argv[optind++];
diff --git a/app-text/unac/metadata.xml b/app-text/unac/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/unac/metadata.xml
+++ b/app-text/unac/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index f5dfcb76a2fb..7915104bafe9 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit autotools eutils
+inherit autotools
DESCRIPTION="Library and command-line tool for removing accents from characters"
HOMEPAGE="http://www.nongnu.org/unac/"
@@ -11,8 +11,9 @@ SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="virtual/libiconv"
DEPEND="${RDEPEND}
@@ -20,29 +21,26 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}.orig"
+PATCHES=(
+ "${FILESDIR}"/${P}-debian-gcc-4.4-bug-556379.patch
+ "${FILESDIR}"/${P}-automake-1.13.1.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}/${P}-debian-gcc-4.4-bug-556379.patch"
- epatch "${FILESDIR}/${P}-automake-1.13.1.patch"
+ default
+ rm README.Debian || die
# otherwise automake will fail
touch config.rpath
eautoreconf
}
src_configure() {
- econf $(use_enable static-libs static)
+ econf --disable-static
}
src_install() {
- DOCS="AUTHORS ChangeLog NEWS README THANKS"
default
- prune_libtool_files
-}
-pkg_postinst() {
- einfo "Examples of using unaccent from the command line:"
- einfo "unaccent utf8 été"
- einfo "echo -e '\\\\0303\\\\0251t\\\\0303\\\\0251' | unaccent utf8"
- einfo "unaccent ISO-8859-1 < myfile > myfile.unaccent"
- einfo
- einfo "See man unaccent and man unac for more information."
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 17c2bd98c4ee..371e03985fd8 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1 +1 @@
-DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
+DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
index 384639eac55a..e62ed22a3e73 100644
--- a/app-text/unpaper/metadata.xml
+++ b/app-text/unpaper/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
- <upstream>
- <remote-id type="github">Flameeyes/unpaper</remote-id>
- <bugs-to>https://github.com/Flameeyes/unpaper/issues</bugs-to>
- </upstream>
+ <!--maintainer-needed-->
+ <upstream>
+ <remote-id type="github">unpaper/unpaper</remote-id>
+ <bugs-to>https://github.com/unpaper/unpaper/issues</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
deleted file mode 100644
index e2d4212348de..000000000000
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]]; then
- EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
- inherit git-r3 autotools
-else
- SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Post-processor for scanned and photocopied book pages"
-HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="libav test"
-
-RDEPEND="
- libav? ( >=media-video/libav-10:0=[encode] )
- !libav? ( >=media-video/ffmpeg-2:0=[encode] )"
-DEPEND="dev-libs/libxslt
- app-text/docbook-xsl-ns-stylesheets
- virtual/pkgconfig
- ${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-src_prepare() {
- default
- [[ ${PV} == *9999 ]] && eautoreconf
-}
diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
new file mode 100644
index 000000000000..77d0a4fbc40a
--- /dev/null
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
+ KEYWORDS="amd64 ~arm64 x86"
+fi
+
+DESCRIPTION="Post-processor for scanned and photocopied book pages"
+HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/docbook-xsl-ns-stylesheets
+ dev-libs/libxslt
+ dev-python/sphinx
+ test? ( dev-python/pytest )
+"
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index e2d4212348de..a26b83763386 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
+inherit meson
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
- inherit git-r3 autotools
+ inherit git-r3
else
SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DESCRIPTION="Post-processor for scanned and photocopied book pages"
@@ -16,21 +18,14 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
LICENSE="GPL-2"
SLOT="0"
-IUSE="libav test"
+IUSE="test"
+RESTRICT="!test? ( test )"
-RDEPEND="
- libav? ( >=media-video/libav-10:0=[encode] )
- !libav? ( >=media-video/ffmpeg-2:0=[encode] )"
-DEPEND="dev-libs/libxslt
+RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/docbook-xsl-ns-stylesheets
- virtual/pkgconfig
- ${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-src_prepare() {
- default
- [[ ${PV} == *9999 ]] && eautoreconf
-}
+ dev-libs/libxslt
+ dev-python/sphinx
+ test? ( dev-python/pytest )
+"
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index ced6ba671573..defa72bf5347 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,2 +1 @@
DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
-DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
diff --git a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch b/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
deleted file mode 100644
index fdfb52a4637b..000000000000
--- a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- unrtf-0.21.8/charmaps/Makefile.am
-+++ unrtf-0.21.8/charmaps/Makefile.am
-@@ -1,2 +1,2 @@
--outputsdir = ${libdir}/${PACKAGE}
-+outputsdir = ${pkgdatadir}
- dist_outputs_DATA = SYMBOL.charmap
diff --git a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch b/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
deleted file mode 100644
index d5bb142ce558..000000000000
--- a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- unrtf-0.21.8/configure.ac
-+++ unrtf-0.21.8/configure.ac
-@@ -46,6 +46,7 @@
- *-*-cygwin*) AC_SUBST(LIBS, ["-liconv"]);;
- *aix*) AC_SUBST(LIBS, ["-liconv"]);;
- *-*-darwin*) AC_SUBST(LIBS, ["-liconv"]);;
-+ *-*-solaris*) AC_SUBST(LIBS, ["-liconv"]);;
- esac
-
- AC_CONFIG_FILES([Makefile
diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml
index 79d462e85571..a85206b18af2 100644
--- a/app-text/unrtf/metadata.xml
+++ b/app-text/unrtf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>robbat2@gentoo.org</email>
-</maintainer>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">unrtf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
index 82d08af27342..0429ec9a2cec 100644
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE=""
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
deleted file mode 100644
index 39b505eb8e6d..000000000000
--- a/app-text/unrtf/unrtf-0.21.9.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
-
-inherit autotools eutils
-
-DESCRIPTION="Converts RTF files to various formats"
-HOMEPAGE="https://www.gnu.org/software/unrtf/unrtf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-src_prepare() {
- # eautoreconf fails when automake-1.14* is installed. Please check with
- # next version bump if we still need this workaround.
- rm aclocal.m4 || die
-
- epatch "${FILESDIR}"/unrtf-0.21.8-automake-fix.patch
- epatch "${FILESDIR}"/${PN}-0.21.8-iconv-detection.patch
- eautoreconf
-}
diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch b/app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch
new file mode 100644
index 000000000000..3dfecc18cb91
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-fix-append_signature.patch
@@ -0,0 +1,36 @@
+From 3bd5dee4226142df3645b8a027ef9142277257cf Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sat, 1 May 2021 17:51:47 +0200
+Subject: [PATCH] Make append_signature() void.
+
+If the type specifier is missing, it defaults to int. From the looks of
+it, the function is meant to be void.
+---
+ inews/inews.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/inews/inews.c b/inews/inews.c
+index 5fa309d..d1c1ee8 100644
+--- a/inews/inews.c
++++ b/inews/inews.c
+@@ -143,7 +143,7 @@ char *argv[];
+ fprintf(ser_wr_fp, "%s\r\n", s);
+ }
+
+- append_signature();
++ void append_signature();
+
+ fprintf(ser_wr_fp, ".\r\n");
+ (void) fflush(ser_wr_fp);
+@@ -181,7 +181,7 @@ char *argv[];
+ * The rn-style DOTDIR environmental variable is used if present.
+ */
+
+-append_signature()
++void append_signature()
+ {
+ char line[256], sigfile[256];
+ char *cp;
+--
+2.26.3
+
diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch b/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch
new file mode 100644
index 000000000000..2ed3dd572be0
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-fix-function-definitions-clang16.patch
@@ -0,0 +1,134 @@
+Clang16 will not allow implicit function declaration, implicit int etc. by default.
+This patch overhauls the source code to build with clan16 defaults.
+
+Bug: https://bugs.gentoo.org/874960
+
+Original patch by Pascal Jäger <pascal.jaeger@leimstift.de>,
+minor adjustments by Hanno Böck.
+
+diff -Naurp a/inews/clientlib.c b/inews/clientlib.c
+--- a/inews/clientlib.c 1996-06-06 21:41:07.000000000 +0200
++++ b/inews/clientlib.c 2022-11-26 18:32:09.383423565 +0100
+@@ -14,6 +14,7 @@ static char *sccsid = "@(#)clientlib.c 1
+ #include "../config.h"
+ #endif
+
++#include <arpa/inet.h>
+ #include <stdio.h>
+ #ifndef FOR_NN
+ #include <sys/types.h>
+@@ -52,6 +53,7 @@ static char *sccsid = "@(#)clientlib.c 1
+ #endif
+
+ #include "nntp.h"
++#include "clientlib.h"
+
+ FILE *ser_rd_fp = NULL;
+ FILE *ser_wr_fp = NULL;
+@@ -133,7 +135,7 @@ char *file;
+ * for reading and writing to server.
+ */
+
+-server_init(machine)
++int server_init(machine)
+ char *machine;
+ {
+ int sockt_rd, sockt_wr;
+@@ -194,7 +196,7 @@ char *machine;
+ * Errors: Printed via perror.
+ */
+
+-get_tcp_socket(machine)
++int get_tcp_socket(machine)
+ char *machine;
+ {
+ int s;
+@@ -218,7 +220,6 @@ char *machine;
+ * fails.
+ */
+ if( (hp = gethostbyname( machine ) ) == NULL ) {
+- unsigned long inet_addr();
+ static struct hostent def;
+ static struct in_addr defaddr;
+ static char *alist[1];
+@@ -344,7 +345,7 @@ char *machine;
+ * Errors: Printed via nerror.
+ */
+
+-get_dnet_socket(machine)
++int get_dnet_socket(machine)
+ char *machine;
+ {
+ int s, area, node;
+@@ -427,7 +428,7 @@ char *machine;
+ * Side effects: None.
+ */
+
+-handle_server_response(response, server)
++int handle_server_response(response, server)
+ int response;
+ char *server;
+ {
+@@ -502,7 +503,7 @@ char *string;
+ * Side effects: Talks to server, changes contents of "string".
+ */
+
+-get_server(string, size)
++int get_server(string, size)
+ char *string;
+ int size;
+ {
+diff -Naurp a/inews/clientlib.h b/inews/clientlib.h
+--- a/inews/clientlib.h 1996-06-06 21:41:07.000000000 +0200
++++ b/inews/clientlib.h 2022-11-26 18:27:59.711248861 +0100
+@@ -9,3 +9,7 @@ extern int server_init();
+ extern void put_server();
+ extern int get_server();
+ extern void close_server();
++
++extern int get_tcp_socket(char *machine);
++extern int get_server(char *string, int size);
++extern int handle_server_response(int response, char *server);
+diff -Naurp a/inews/inews.c b/inews/inews.c
+--- a/inews/inews.c 2004-01-29 03:14:19.000000000 +0100
++++ b/inews/inews.c 2022-11-26 18:32:26.200435328 +0100
+@@ -39,15 +39,20 @@ static char *sccsid = "@(#)inews.c 1.16
+
+ #include "conf.h"
+ #include "nntp.h"
++#include "clientlib.h"
+
+
+ #define MAX_SIGNATURE 6
+
++int strneql(char *a, char *b, int n);
++void gen_frompath(void);
++int valid_header(register char *h);
++
+ extern FILE *ser_wr_fp;
+
+ char host_name[256];
+
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[];
+ {
+@@ -254,7 +259,7 @@ append_signature()
+ * a From: line in it.
+ */
+
+-gen_frompath()
++void gen_frompath()
+ {
+ char *full_name;
+ char *cp;
+@@ -330,7 +335,7 @@ gen_frompath()
+ * Side effects: None.
+ */
+
+-strneql(a, b, n)
++int strneql(a, b, n)
+ register char *a, *b;
+ int n;
+ {
diff --git a/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff b/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff
new file mode 100644
index 000000000000..30b900d4509b
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-fix-implicit.diff
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+index 4ea5965..49100ff 100644
+--- a/configure.in
++++ b/configure.in
+@@ -518,6 +518,7 @@ AC_CHECK_FUNC([mkstemp],,[AC_MSG_ERROR([needs mkstemp])])
+ #
+ AC_MSG_CHECKING([for strerror])
+ AC_TRY_LINK([
++#include <string.h>
+ char *blubb() { return (char *) strerror (42); }
+ ],[
+ (void) blubb();
diff --git a/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch b/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch
new file mode 100644
index 000000000000..de53717a3cbe
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-format-string-warning-inews.patch
@@ -0,0 +1,11 @@
+--- a/inews/inews.c 2022-11-26 18:44:03.788039229 +0100
++++ b/inews/inews.c 2022-11-26 18:44:47.376080190 +0100
+@@ -303,7 +303,7 @@
+ putc(*cp, ser_wr_fp);
+ else { /* Stupid & hack. God damn it. */
+ putc(toupper(passwd->pw_name[0]), ser_wr_fp);
+- fprintf(ser_wr_fp, passwd->pw_name+1);
++ fprintf(ser_wr_fp, "%s", passwd->pw_name+1);
+ }
+
+ fprintf(ser_wr_fp, ")\r\n");
diff --git a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
index ed3cdf66374a..a2366851f467 100644
--- a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
+++ b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2015-11-18 13:52:44.173432349 +0300
-+++ Makefile.in 2015-11-18 13:53:39.244429093 +0300
+--- a/Makefile.in
++++ b/Makefile.in
@@ -183,22 +183,22 @@
install: $(DOINST)
diff --git a/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch b/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch
new file mode 100644
index 000000000000..7cbc584f5b47
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-string_format_issue.patch
@@ -0,0 +1,24 @@
+Description: Fix potential security issue (arbitrary string being passed
+ as a format string to fprintf).
+Author: Andrew Shadura <andrewsh@debian.org>
+
+--- a/unix/uuenview.c
++++ b/unix/uuenview.c
+@@ -310,7 +310,7 @@ SendMkCommand (char **rcptlist, char *to
+ }
+
+ if ((*rcptlist = (char *) malloc (strlen (towhom) + 16)) == NULL) {
+- fprintf (stderr, "error: Out of memory allocating %d bytes\n",
++ fprintf (stderr, "error: Out of memory allocating %zd bytes\n",
+ strlen (towhom)+16);
+ _FP_free (command);
+ return NULL;
+@@ -483,7 +483,7 @@ AttachFiles (char *towhom, char *subject
+ if (_FP_stristr (input, "multipart") != NULL) {
+ /* it is already a multipart posting. grab the boundary */
+ if ((ptr = _FP_stristr (input, "boundary=")) != NULL) {
+- fprintf(thepipe, input);
++ fprintf(thepipe, "%s", input);
+ strcpy (boundary, ParseValue (ptr));
+ hadmulti = 1;
+ }
diff --git a/app-text/uudeview/metadata.xml b/app-text/uudeview/metadata.xml
index 6f49eba8f496..4da67a4f4b42 100644
--- a/app-text/uudeview/metadata.xml
+++ b/app-text/uudeview/metadata.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>hanno@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index 6331df769ce0..6e3b8d57277d 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit eutils autotools
+inherit autotools toolchain-funcs
DESCRIPTION="uu, xx, base64, binhex decoder"
HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
@@ -11,29 +11,25 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( HISTORY INSTALL README )
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
PATCHES=(
- "${FILESDIR}/${P}-bugfixes.patch"
- "${FILESDIR}/${P}-CVE-2004-2265.patch"
- "${FILESDIR}/${P}-CVE-2008-2266.patch"
- "${FILESDIR}/${P}-man.patch"
- "${FILESDIR}/${P}-rename.patch"
- "${FILESDIR}/${P}-makefile.patch"
+ "${FILESDIR}"/${P}-bugfixes.patch
+ "${FILESDIR}"/${P}-CVE-2004-2265.patch
+ "${FILESDIR}"/${P}-CVE-2008-2266.patch
+ "${FILESDIR}"/${P}-man.patch
+ "${FILESDIR}"/${P}-rename.patch
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-fix-append_signature.patch
)
-src_prepare() {
- epatch "${PATCHES[@]}"
+DOCS=( HISTORY INSTALL README )
- mv configure.in configure.ac || die
+src_prepare() {
+ sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die
- epatch_user
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
diff --git a/app-text/uudeview/uudeview-0.5.20-r3.ebuild b/app-text/uudeview/uudeview-0.5.20-r3.ebuild
new file mode 100644
index 000000000000..903bd6b43754
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="uu, xx, base64, binhex decoder"
+HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
+SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-bugfixes.patch
+ "${FILESDIR}"/${P}-CVE-2004-2265.patch
+ "${FILESDIR}"/${P}-CVE-2008-2266.patch
+ "${FILESDIR}"/${P}-man.patch
+ "${FILESDIR}"/${P}-rename.patch
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-fix-append_signature.patch
+ "${FILESDIR}"/${P}-string_format_issue.patch
+ "${FILESDIR}"/${P}-format-string-warning-inews.patch
+ "${FILESDIR}"/${P}-fix-function-definitions-clang16.patch
+)
+
+DOCS=( HISTORY INSTALL README )
+
+src_prepare() {
+ sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die
+
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-tcl \
+ --disable-tk
+}
diff --git a/app-text/uudeview/uudeview-0.5.20-r4.ebuild b/app-text/uudeview/uudeview-0.5.20-r4.ebuild
new file mode 100644
index 000000000000..798e5b521e49
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="uu, xx, base64, binhex decoder"
+HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
+SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-bugfixes.patch
+ "${FILESDIR}"/${P}-CVE-2004-2265.patch
+ "${FILESDIR}"/${P}-CVE-2008-2266.patch
+ "${FILESDIR}"/${P}-man.patch
+ "${FILESDIR}"/${P}-rename.patch
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-fix-append_signature.patch
+ "${FILESDIR}"/${P}-string_format_issue.patch
+ "${FILESDIR}"/${P}-format-string-warning-inews.patch
+ "${FILESDIR}"/${P}-fix-function-definitions-clang16.patch
+ "${FILESDIR}"/${P}-fix-implicit.diff
+)
+
+DOCS=( HISTORY INSTALL README )
+
+src_prepare() {
+ sed -i "s:^\tar r:\t$(tc-getAR) r:" uulib/Makefile.in || die
+
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-tcl \
+ --disable-tk
+}
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
new file mode 100644
index 000000000000..dfc67e995979
--- /dev/null
+++ b/app-text/vgrep/Manifest
@@ -0,0 +1,2 @@
+DIST vgrep-2.6.0.tar.gz 1589155 BLAKE2B 847954ccf020c2b7f54360aab2fd9e3fc897dfd3ceab7d9ecd79f378c18196048649b37f4f9b62dc8f2af46f874a8433c8a20e5e025ca9e0f08b8f6859b0dd40 SHA512 712ca1ab4318a69fbb9f0e60343c188b292c59c52ca488adb1db546937822b0e49a49541e2b9e69cec6b721003198518f530521f4c726988516bcd64e7247846
+DIST vgrep-2.7.0.tar.gz 1998937 BLAKE2B 8f5bf53814604ff3bdf7492ec8ad96811a62c9accc0664d07db86039e117686f551c6aaba40e5af4e1b646289a0e996b4f1cade9fc1a197778504e5c8d114830 SHA512 5cc9e866c6de9b024d29dc9aeeb87d6eea23becde63968b2a9266412bbe44920fa13d5e7dda47bb46135301ff7f5fd79e02ec2da8a9a694183d9e63aad64478d
diff --git a/app-text/vgrep/metadata.xml b/app-text/vgrep/metadata.xml
new file mode 100644
index 000000000000..afe9da646958
--- /dev/null
+++ b/app-text/vgrep/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <bugs-to>https://github.com/vrothberg/vgrep/issues</bugs-to>
+ <remote-id type="github">vrothberg/vgrep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/vgrep/vgrep-2.6.0.ebuild b/app-text/vgrep/vgrep-2.6.0.ebuild
new file mode 100644
index 000000000000..1b3329afca49
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD GPL-3 MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+# golangci-lint is required to run tests which is not yet packaged
+RESTRICT="strip test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ emake PREFIX="${D}/usr" install
+ einstalldocs
+}
diff --git a/app-text/vgrep/vgrep-2.7.0.ebuild b/app-text/vgrep/vgrep-2.7.0.ebuild
new file mode 100644
index 000000000000..eac568a4d663
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests just run golangci-lint
+RESTRICT="test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+src_prepare() {
+ default
+ sed -e '/-ldflags/s/-s //' -i Makefile || die # bug 795345
+}
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" install
+ einstalldocs
+}
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index 485ac7c4b75f..ff042089a352 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1 +1 @@
-DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
+DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
deleted file mode 100644
index 395d03a7456f..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Many clients seem to use blockquote tags to flag quotes these days, so
-write them out as quotes, so they remain readable.
-
---- vilistextum-2.6.9/src/html_tag.c
-+++ vilistextum-2.6.9/src/html_tag.c
-@@ -87,8 +87,8 @@
-
- else if CMP("P", str) { start_p(); }
- else if CMP("/P", str) { paragraphen_ende(); }
-- else if CMP("BLOCKQUOTE", str) { start_p(); }
-- else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); }
-+ else if CMP("BLOCKQUOTE", str) { start_p(); quote++; }
-+ else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); if (quote>0) quote--;}
- else if CMP("Q", str) { wort_plus_ch('"'); }
- else if CMP("/Q", str) { wort_plus_ch('"'); }
-
---- vilistextum-2.6.9/src/multibyte.h
-+++ vilistextum-2.6.9/src/multibyte.h
-@@ -16,6 +16,7 @@
- #define ATOI(n) wcstoi(n)
-
- #define ONESPACE L" "
-+ #define QUOTE L">"
- #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
-
- #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
-@@ -40,6 +41,7 @@
- #define ATOI(n) atoi(n)
-
- #define ONESPACE " "
-+ #define QUOTE ">"
- #define WORT_PLUS_STRING(str) wort_plus_string(str)
-
- #define STRSTR(haystack, needle) strstr(haystack, needle)
---- vilistextum-2.6.9/src/text.h
-+++ vilistextum-2.6.9/src/text.h
-@@ -26,6 +26,7 @@
-
- int tab;
- int spaces;
-+int quote;
-
- void print_zeile();
- int is_zeile_empty();
---- vilistextum-2.6.9/src/text.c
-+++ vilistextum-2.6.9/src/text.c
-@@ -28,6 +28,7 @@
- int breite=76,
- hr_breite=76,
- paragraph=0,
-+ quote=0,
-
- tab=4, /* tabulator */
- spaces=0, /* spaces at beginning of line */
-@@ -325,6 +326,12 @@
- printf(" z0: zeilen_pos: %d\n",zeilen_pos);
- #endif
- print_zeile();
-+ if (quote > 0)
-+ {
-+ i=0;
-+ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+ zeile_plus_wort(ONESPACE,1,1);
-+ }
- i=0;
- while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
-@@ -345,6 +352,12 @@
- printf(" z2: zeilen_len: %d\n",zeilen_len);
- printf(" z2: zeilen_pos: %d\n",zeilen_pos);
- #endif
-+ if (quote > 0)
-+ {
-+ i=0;
-+ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
-+ zeile_plus_wort(ONESPACE,1,1);
-+ }
- i=0;
- while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
- if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
---- vilistextum-2.6.9/tests/check_utf8
-+++ vilistextum-2.6.9/tests/check_utf8
-@@ -9,5 +9,6 @@
- rm -f utf-8-sampler.output.test
- ../src/vilistextum utf-8-sampler.html utf-8-sampler.output.test
-
--diff >/dev/null utf-8-sampler.output utf-8-sampler.output.test
-+sed 's/^> //' utf-8-sampler.output.test | \
-+diff >/dev/null utf-8-sampler.output -
-
---- vilistextum-2.6.9/tests/utf-8-sampler.output
-+++ vilistextum-2.6.9/tests/utf-8-sampler.output
-@@ -100,8 +100,8 @@
- ვეპხის ტყáƒáƒáƒ¡áƒáƒœáƒ˜ შáƒáƒ—რრუსთáƒáƒ•áƒ”ლი
-
- ღმერთსი შემვედრე, ნუთუ კვლრდáƒáƒ›áƒ®áƒ¡áƒœáƒáƒ¡ სáƒáƒ¤áƒšáƒ˜áƒ¡áƒ შრáƒáƒ›áƒáƒ¡áƒ, ცეცხლს, წყáƒáƒšáƒ¡áƒ დáƒ
--მიწáƒáƒ¡áƒ, ჰáƒáƒ”რთრთáƒáƒœáƒ მრáƒáƒ›áƒáƒ¡áƒ; მáƒáƒ›áƒªáƒœáƒ”ს ფრთენი დრáƒáƒ¦áƒ•áƒ¤áƒ áƒ˜áƒœáƒ“ე, მივჰხვდე მáƒáƒ¡ ჩემსáƒ
--ნდáƒáƒ›áƒáƒ¡áƒ, დღისით დრღáƒáƒ›áƒ˜áƒ— ვჰხედვიდე მზისრელვáƒáƒ—რკრთáƒáƒ›áƒáƒáƒ¡áƒ.
-+მიწáƒáƒ¡áƒ, ჰáƒáƒ”რთრთáƒáƒœáƒ მრáƒáƒ›áƒáƒ¡áƒ; მáƒáƒ›áƒªáƒœáƒ”ს ფრთენი დრáƒáƒ¦áƒ•áƒ¤áƒ áƒ˜áƒœáƒ“ე, მივჰხვდე მáƒáƒ¡
-+ჩემსრნდáƒáƒ›áƒáƒ¡áƒ, დღისით დრღáƒáƒ›áƒ˜áƒ— ვჰხედვიდე მზისრელვáƒáƒ—რკრთáƒáƒ›áƒáƒáƒ¡áƒ.
-
- Tamil poetry of Cupiramaniya Paarathiyar: சà¯à®ªà¯à®°à®®à®£à®¿à®¯ பாரதியார௠(1882-1921)
-
-@@ -446,7 +446,8 @@
- д, п, and/or т:
-
- Bulgarian:   [ бгдпт ]   [ бгдпт ]   Мога да Ñм Ñтъкло и не ме боли.
-- Russian: [ бгдпт ]   [ бгдпт ]   Я могу еÑÑ‚ÑŒ Ñтекло, Ñто мне не вредит.
-+ Russian: [ бгдпт ]   [ бгдпт ]   Я могу еÑÑ‚ÑŒ Ñтекло, Ñто мне не
-+вредит.
- Serbian: [ бгдпт ]   [ бгдпт ]   Могу јеÑти Ñтакло а да ми не шкоди.
-
- ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch b/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch
deleted file mode 100644
index bda9f5d39c3e..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-OSX Lion has wcscasecmp, but is not GNU
-
---- configure.in
-+++ configure.in
-@@ -67,6 +67,7 @@
- dnl Checks for library functions.
- AC_CHECK_FUNCS(strstr)
- AC_CHECK_FUNCS(strcasecmp)
-+AC_CHECK_FUNCS(wcscasecmp)
-
- dnl create testsuite
- dnl AC_CONFIG_TESTDIR([tests])
---- src/html.c
-+++ src/html.c
-@@ -40,7 +40,7 @@
- link_inline[DEF_STR_LEN]; /* Link of a HTML-Tag */
-
- /* ------------------------------------------------ */
--#if defined(MULTIBYTE) && ! defined(__GNU_LIBRARY__)
-+#if defined(MULTIBYTE) && ! defined(HAVE_WCSCASECMP)
- #include <wchar.h>
- static int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
- {
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff b/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff
deleted file mode 100644
index 42db519b080a..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur vilistextum-2.6.9/src/Makefile.am vilistextum-2.6.9.new/src/Makefile.am
---- vilistextum-2.6.9/src/Makefile.am 2006-10-24 01:48:54.000000000 +0700
-+++ vilistextum-2.6.9.new/src/Makefile.am 2006-11-20 09:51:24.000000000 +0700
-@@ -6,7 +6,7 @@
- main.c main.h util.c util.h \
- multibyte.h unicode_entities.c unicode_entities.h
-
--AM_CFLAGS = -Wall -O2 -ansi
-+AM_CFLAGS = -Wall -ansi
- AM_LDFLAGS = $(STATIC)
-
- EXTRA_DIST = kilistextum.kaptn
-diff -ur vilistextum-2.6.9/tests/Makefile.am vilistextum-2.6.9.new/tests/Makefile.am
---- vilistextum-2.6.9/tests/Makefile.am 2004-07-06 19:06:20.000000000 +0700
-+++ vilistextum-2.6.9.new/tests/Makefile.am 2006-11-20 09:51:05.000000000 +0700
-@@ -16,5 +16,5 @@
-
- test: check
-
--all: check
-+all:
-
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch b/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
deleted file mode 100644
index 1ff76250db13..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-* don't look in /usr/local
-* try to hack around not being able to use AM_ICONV
-
---- configure.in.orig 2006-10-23 22:20:19 +0200
-+++ configure.in 2010-03-18 19:32:13 +0100
-@@ -21,10 +21,6 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(getopt.h)
-
--dnl add /usr/local
--CFLAGS="$CFLAGS -I/usr/local/include"
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--
- dnl checking for options
- AC_MSG_CHECKING(if --enable-multibyte specified)
- AC_ARG_ENABLE(multibyte,
-@@ -41,7 +37,9 @@
- AC_CHECK_HEADERS(iconv.h,,
- AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
-
--AC_CHECK_LIB(iconv, iconv,,
-+dnl iconv_open_into is implemented only in GNU libiconv and not in other
-+dnl iconv implementations
-+AC_CHECK_LIB(iconv, libiconv_open_into,,
- AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
-
- dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
new file mode 100644
index 000000000000..e5cb3ba2a18a
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h)
+
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
new file mode 100644
index 000000000000..a9c8a96a7522
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
@@ -0,0 +1,12 @@
+towlower is defined by wctype.h
+
+--- a/src/multibyte.h
++++ b/src/multibyte.h
+@@ -2,6 +2,7 @@
+
+ #ifdef MULTIBYTE
+ #include <wchar.h>
++#include <wctype.h>
+ #define CHAR wchar_t
+ #define STRLEN(s) wcslen(s)
+ #define CPYSS(dest, src) wcscpy(dest, src) /* copy str to str */
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch
new file mode 100644
index 000000000000..c8a7da2c212e
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch
@@ -0,0 +1,120 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- a/src/html_tags.c 2019-10-23 16:25:27.000000000 +0200
++++ b/src/html_tags.c 2020-02-05 20:11:57.308596941 +0100
+@@ -261,6 +261,7 @@
+ line_break();
+ } else {
+ start_p();
++ quote++;
+ }
+ } /* html_pre */
+
+@@ -271,6 +272,7 @@
+ line_break();
+ } else {
+ paragraphen_ende();
++ quote -= quote != 0;
+ }
+ } /* html_pre_end */
+
+--- a/src/multibyte.h 2020-02-05 20:08:43.863715764 +0100
++++ b/src/multibyte.h 2020-02-05 20:12:34.401382354 +0100
+@@ -18,6 +18,7 @@
+ #define ATOI(n) wcstoi(n)
+
+ #define ONESPACE L" "
++ #define QUOTE L">"
+ #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+
+ #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -43,6 +44,7 @@
+ #define ATOI(n) atoi(n)
+
+ #define ONESPACE " "
++ #define QUOTE ">"
+ #define WORT_PLUS_STRING(str) wort_plus_string(str)
+
+ #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- a/src/text.c 2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.c 2020-02-05 20:16:04.852164539 +0100
+@@ -28,6 +28,7 @@
+ int breite=76,
+ hr_breite=76,
+ paragraph=0,
++ quote=0,
+
+ tab=4, /* tabulator */
+ spaces=0, /* spaces at beginning of line */
+@@ -378,6 +379,12 @@
+ printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+ print_zeile();
++ if (quote > 0)
++ {
++ i=0;
++ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++ zeile_plus_wort(ONESPACE,1,1);
++ }
+ i=0;
+ while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -398,6 +405,12 @@
+ printf(" z2: zeilen_len: %d\n",zeilen_len);
+ printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++ if (quote > 0)
++ {
++ i=0;
++ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++ zeile_plus_wort(ONESPACE,1,1);
++ }
+ i=0;
+ while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- a/src/text.h 2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.h 2020-02-05 20:18:40.792261818 +0100
+@@ -26,6 +26,7 @@
+
+ extern int tab;
+ extern int spaces;
++extern int quote;
+
+ void print_zeile();
+ int is_zeile_empty();
+--- a/tests/test_functions
++++ b/tests/test_functions
+@@ -12,6 +12,9 @@
+ rm -f testcases/$prefix.output.test
+ ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test
+
++ # remove (block)quotes
++ sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test
++
+ diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test
+ retval=$?
+ if [ $retval -ne 0 ]; then
+--- a/tests/testcases/utf-8-sampler.output
++++ b/tests/testcases/utf-8-sampler.output.test
+@@ -100,8 +100,8 @@
+ ვეპხის ტყáƒáƒáƒ¡áƒáƒœáƒ˜ შáƒáƒ—რრუსთáƒáƒ•áƒ”ლი
+
+ ღმერთსი შემვედრე, ნუთუ კვლრდáƒáƒ›áƒ®áƒ¡áƒœáƒáƒ¡ სáƒáƒ¤áƒšáƒ˜áƒ¡áƒ შრáƒáƒ›áƒáƒ¡áƒ, ცეცხლს, წყáƒáƒšáƒ¡áƒ დáƒ
+-მიწáƒáƒ¡áƒ, ჰáƒáƒ”რთრთáƒáƒœáƒ მრáƒáƒ›áƒáƒ¡áƒ; მáƒáƒ›áƒªáƒœáƒ”ს ფრთენი დრáƒáƒ¦áƒ•áƒ¤áƒ áƒ˜áƒœáƒ“ე, მივჰხვდე მáƒáƒ¡ ჩემსáƒ
+-ნდáƒáƒ›áƒáƒ¡áƒ, დღისით დრღáƒáƒ›áƒ˜áƒ— ვჰხედვიდე მზისრელვáƒáƒ—რკრთáƒáƒ›áƒáƒáƒ¡áƒ.
++მიწáƒáƒ¡áƒ, ჰáƒáƒ”რთრთáƒáƒœáƒ მრáƒáƒ›áƒáƒ¡áƒ; მáƒáƒ›áƒªáƒœáƒ”ს ფრთენი დრáƒáƒ¦áƒ•áƒ¤áƒ áƒ˜áƒœáƒ“ე, მივჰხვდე მáƒáƒ¡
++ჩემსრნდáƒáƒ›áƒáƒ¡áƒ, დღისით დრღáƒáƒ›áƒ˜áƒ— ვჰხედვიდე მზისრელვáƒáƒ—რკრთáƒáƒ›áƒáƒáƒ¡áƒ.
+
+ Tamil poetry of Cupiramaniya Paarathiyar: சà¯à®ªà¯à®°à®®à®£à®¿à®¯ பாரதியார௠(1882-1921)
+
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+
+ Bulgarian:   [ бгдпт ]   [ бгдпт ]   Мога да Ñм Ñтъкло и не ме боли.
+- Russian: [ бгдпт ]   [ бгдпт ]   Я могу еÑÑ‚ÑŒ Ñтекло, Ñто мне не вредит.
++ Russian: [ бгдпт ]   [ бгдпт ]   Я могу еÑÑ‚ÑŒ Ñтекло, Ñто мне не
++вредит.
+ Serbian: [ бгдпт ]   [ бгдпт ]   Могу јеÑти Ñтакло а да ми не шкоди.
+
+ ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch
new file mode 100644
index 000000000000..65541b7a74f0
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch
@@ -0,0 +1,43 @@
+--- a/src/lists.c
++++ b/src/lists.c
+@@ -74,6 +74,7 @@
+ }
+
+ spaces += tab;
++ orderedlist++;
+ #ifdef proc_debug
+ printf("start_uls() ende\n");
+ #endif
+@@ -82,6 +83,7 @@
+ void end_uls()
+ {
+ spaces -= tab;
++ orderedlist--;
+ line_break();
+
+ if (bullet_style=='%') { bullet_style='$'; }
+--- a/src/text.c
++++ b/src/text.c
+@@ -387,7 +387,11 @@
+ }
+ i=0;
+ while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+- if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
++ if (orderedlist>0)
++ {
++ i=(spaces%tab) + 1;
++ while (i>0) { zeile_plus_wort(ONESPACE,1,1); i--; }
++ }
+ zeile_plus_wort(wort, wort_len, wort_pos);
+ }
+ else if (zeilen_len != 0)
+--- a/src/text.h
++++ b/src/text.h
+@@ -27,6 +27,7 @@
+ extern int tab;
+ extern int spaces;
+ extern int quote;
++extern int orderedlist;
+
+ void print_zeile();
+ int is_zeile_empty();
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch
new file mode 100644
index 000000000000..4f96862216b2
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-static.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/752051
+--- a/src/html.c
++++ b/src/html.c
+@@ -47,7 +47,7 @@ CHAR attr_name[DEF_STR_LEN], /* Attribut name of a HTML-Tag */
+ /* ------------------------------------------------ */
+ #if defined(MULTIBYTE) && !defined(HAVE_WCSCASECMP)
+ #include <wchar.h>
+-static int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
++extern int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
+ {
+ size_t i;
+ wint_t c1, c2;
diff --git a/app-text/vilistextum/metadata.xml b/app-text/vilistextum/metadata.xml
index 3e927f8d7480..df1ea8d84522 100644
--- a/app-text/vilistextum/metadata.xml
+++ b/app-text/vilistextum/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
deleted file mode 100644
index 0f4ac8e6f2e0..000000000000
--- a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Html to ascii converter specifically programmed to handle incorrect html"
-HOMEPAGE="http://bhaak.dyndns.org/vilistextum/"
-SRC_URI="http://bhaak.dyndns.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-#IUSE="unicode kde"
-IUSE="unicode"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-# KDE support will be available once a version of kaptain in stable
-# kde? ( kde-misc/kaptain )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-gentoo.diff" \
- "${FILESDIR}/${P}-prefix.patch" \
- "${FILESDIR}/${P}-darwin11.patch" \
- "${FILESDIR}/${P}-blockquote.patch"
- eautoreconf
-}
-
-get_locale() {
- locale -a | grep -i "$1\.utf.*8\$"
-}
-
-find_locale() {
- local l t
-
- # we basically prefer to find en_US.UTF-8, but it may not always be
- # available, in which case it is better not to hardcode to use it
- l=$(get_locale en_US)
- if [[ -z ${l} ]] ; then
- for t in "en_GB" "en_.*" ".*" ; do
- l=$(get_locale ${t})
- if [[ -n ${l} ]] ; then
- l=${l%%$'\n'*}
- break;
- fi
- done
- fi
- [[ -z ${l} ]] && die "Failed to find a unicode locale"
- echo "${l}"
-}
-
-src_configure() {
- # need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
- # isn't always returning the most sensical (and working) locale
- econf \
- $(use_enable unicode multibyte) \
- $(use_with unicode unicode-locale $(find_locale))
-}
-
-src_test() {
- if $(locale -a | grep -iq "en_US\.utf.*8"); then
- emake -j1 check
- else
- ewarn "If you like to run the test,"
- ewarn "please make sure en_US.UTF-8 is installed."
- die "en_US.UTF-8 locale is missing"
- fi
-}
-
-src_install() {
- default
- dohtml doc/*.html
-}
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
new file mode 100644
index 000000000000..35607e1283a8
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+GITID="06cc8a637efd9097af4f138b1b7c755120ffaa88"
+DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
+HOMEPAGE="https://bhaak.net/vilistextum/"
+SRC_URI="https://github.com/bhaak/vilistextum/archive/${GITID}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITID}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="unicode"
+
+# Known test failures nobody cares about
+RESTRICT="test"
+
+DEPEND="virtual/libiconv"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.8.0-prefix.patch
+ "${FILESDIR}"/${PN}-2.8.0.20200411-blockquote.patch
+ "${FILESDIR}"/${PN}-2.8.0-towlower.patch
+ "${FILESDIR}"/${PN}-2.8.0.20200411-list-alignment.patch
+ "${FILESDIR}"/${P}-static.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+
+ # wcscasecmp needs extensions, which aren't enabled
+ export ac_cv_func_wcscasecmp=no
+}
+
+get_locale() {
+ locale -a | grep -i "$1\.utf.*8\$"
+}
+
+find_locale() {
+ local l t
+
+ # we basically prefer to find en_US.UTF-8, but it may not always be
+ # available, in which case it is better not to hardcode to use it
+ l=$(get_locale en_US)
+ if [[ -z ${l} ]] ; then
+ for t in "en_GB" "en_.*" ".*" ; do
+ l=$(get_locale ${t})
+ if [[ -n ${l} ]] ; then
+ l=${l%%$'\n'*}
+ break;
+ fi
+ done
+ fi
+ [[ -z ${l} ]] && die "Failed to find a unicode locale"
+ echo "${l}"
+}
+
+src_configure() {
+ # need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
+ # isn't always returning the most sensical (and working) locale
+ econf \
+ $(use_enable unicode multibyte) \
+ $(use_with unicode unicode-locale $(find_locale))
+}
+
+src_test() {
+ if $(locale -a | grep -iq "en_US\.utf.*8"); then
+ emake -j1 check
+ else
+ ewarn "If you like to run the test,"
+ ewarn "please make sure en_US.UTF-8 is installed."
+ die "en_US.UTF-8 locale is missing"
+ fi
+}
+
+src_install() {
+ default
+ doman doc/${PN}.1
+ dodoc doc/changes.xhtml doc/htmlmail.xhtml
+}
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
deleted file mode 100644
index c07390e15e01..000000000000
--- a/app-text/vlna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vlna-1.5.tar.gz 146670 BLAKE2B a72cae3b276bb0673dca940d15df4ec0af8c292bb08b0a0ed55680d6893a3fbf80de9588bad4698c8c12f056a9a66650a63c100ea3021d7809f57cd2b9b09d19 SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2
diff --git a/app-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-text/vlna/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>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
deleted file mode 100644
index 1d3fe39b4857..000000000000
--- a/app-text/vlna/vlna-1.5.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="Add nonbreakable spaces after some prepositions in Czech texts"
-HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
-SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc README README.en ChangeLog vlna.txt || die
- insinto /usr/share/doc/${PF}
- doins vlna.dvi || die
-}
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index 640511937e2f..988be0d02805 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
@@ -8,4 +8,7 @@
<use>
<flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
</use>
+ <upstream>
+ <remote-id type="savannah">wdiff</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
deleted file mode 100644
index e5340d3ca4e0..000000000000
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Create a diff disregarding formatting"
-HOMEPAGE="https://www.gnu.org/software/wdiff/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="experimental test"
-
-RDEPEND="
- sys-apps/diffutils
- sys-apps/less
- sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
- sys-apps/texinfo
- test? ( app-misc/screen )"
-
-src_configure() {
- econf \
- $(use_enable experimental)
-}
-
-src_test() {
- # The test suite hangs in the '3: use pager' test
- # when an incompatible screenrc is found
- touch tests/screenrc || die
- export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
- default
-}
diff --git a/app-text/wdiff/wdiff-1.2.2-r2.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..66179b426012
--- /dev/null
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Create a diff disregarding formatting"
+HOMEPAGE="https://www.gnu.org/software/wdiff/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="experimental test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ sys-apps/diffutils
+ sys-apps/less
+ sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-apps/texinfo
+ test? ( app-misc/screen )
+"
+
+src_configure() {
+ econf $(use_enable experimental)
+}
+
+src_test() {
+ # The test suite hangs in the '3: use pager' test
+ # when an incompatible screenrc is found
+ touch tests/screenrc || die
+ export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
+ default
+}
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
deleted file mode 100644
index f423a37982c4..000000000000
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Create a diff disregarding formatting"
-HOMEPAGE="https://www.gnu.org/software/wdiff/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="experimental test"
-
-RDEPEND="
- sys-apps/diffutils
- sys-apps/less
- sys-libs/ncurses"
-DEPEND="${RDEPEND}
- test? ( app-misc/screen )"
-
-src_configure() {
- econf \
- $(use_enable experimental)
-}
-
-src_test() {
- # The test suite hangs in the '3: use pager' test
- # when an incompatible screenrc is found
- touch tests/screenrc || die
- export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
- default
-}
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 8f80999ed534..2b0b1f67a3c7 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1 +1,2 @@
-DIST webgen-1.5.2.gem 200704 BLAKE2B 55749d515223b46c7063596d1424de107f43af022fc54ba431e83ffa4dbe3ab5651e6c61e48f66710a1e958c2f6d09a64ea05c9186dd0c73add5351fbc419806 SHA512 83557bc7a3cafb5e885bd4c50f7083a7576a5c930458075d91ffd58b4fa3c4e406f342dd23988788afb22e9a03ffbff0dfb02d23ebfdef7d2275638c102839b4
+DIST webgen-1.7.2.gem 201728 BLAKE2B abd3a8a9accfbc1a1e0070b7cbd4d0cc24796540ce1c8c0cfd3dc50882bf953b1e794971a90e2a429b3ecd64b1cb009b16c96ce1e6cfa05516ce48c10e39cd95 SHA512 806303f56319b6f55d8457b0b68438a9732bc1adc95ea50a955ad02b184814d0b878d618fc0547831cac53292208f1d0837d190b078ebb2ba42641dbaa5ffd93
+DIST webgen-1.7.3.gem 201728 BLAKE2B fc3c63d12b547c14e7900dfe881c95150de2f4783bfcbdd3f9a0bff6cd88d8278f1f2b0d7281394b35c3032e0cec639e01911807ddcc8b8114890bb4e404e2a4 SHA512 7e5738f66a2095fbfde922cf6711735273109bd10ebf12e2ebbbf4aa72cd54a8d4d50057d5aba8a428c154654000b718850e8c23391736123ea38f2f3b75cf50
diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
index 352da8e8c75e..d5f698f7f2d7 100644
--- a/app-text/webgen/metadata.xml
+++ b/app-text/webgen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ruby@gentoo.org</email>
@@ -10,4 +10,7 @@
<flag name="highlight">Enable syntax highlighting for certain plugins</flag>
<flag name="markdown">Markdown support</flag>
</use>
+ <upstream>
+ <remote-id type="github">gettalong/webgen</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/webgen/webgen-1.5.2.ebuild b/app-text/webgen/webgen-1.5.2.ebuild
deleted file mode 100644
index 61d236872c81..000000000000
--- a/app-text/webgen/webgen-1.5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
-RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template-based static website generator"
-HOMEPAGE="https://webgen.gettalong.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="builder highlight markdown"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
- test? (
- <dev-ruby/rdoc-6
- dev-ruby/kramdown
- dev-ruby/minitest:5
- dev-ruby/rdiscount
- >=dev-ruby/sass-3.2:* )"
-
-ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
- >=dev-ruby/systemu-2.5
- >=dev-ruby/kramdown-1.3
- builder? ( >=dev-ruby/builder-2.1.0:* )
- highlight? ( >=dev-ruby/coderay-1.0 )
- markdown? ( dev-ruby/maruku )"
-
-all_ruby_prepare() {
- # Avoid a test fragile for sass version differences
- sed -i -e '/test_static_call/,/^ end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
-
- # Avoid tests for unpackaged dependencies
- rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/man1/webgen.1
-}
diff --git a/app-text/webgen/webgen-1.7.2.ebuild b/app-text/webgen/webgen-1.7.2.ebuild
new file mode 100644
index 000000000000..f6e1b0bec434
--- /dev/null
+++ b/app-text/webgen/webgen-1.7.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="task"
+RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder doc highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+ test? (
+ dev-ruby/minitest:5
+ dev-ruby/rdiscount
+ >=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+ >=dev-ruby/systemu-2.5 =dev-ruby/systemu-2*
+ >=dev-ruby/kramdown-2.3:2
+ builder? ( >=dev-ruby/builder-2.1.0:* )
+ highlight? ( >=dev-ruby/coderay-1.0 )
+ markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+ # Avoid a test fragile for sass version differences
+ sed -i -e '/test_static_call/,/^ end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+ # Avoid a test with fragile whitespace tests
+ rm -f test/webgen/content_processor/test_haml.rb || die
+
+ # Avoid tests for rdoc since that requires an obsolete version
+ sed -i -e '/def test_create_nodes/askip' test/webgen/path_handler/test_api.rb || die
+
+ # Avoid tests for unpackaged dependencies
+ rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
+
+ # Avoid tests failing with newer Psych versions
+ rm -f test/test_documentation.rb || die
+
+ # Fix minitest deprecation
+ sed -i -e 's/MiniTest/Minitest/' $(find test -type f -print) || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/man1/webgen.1
+}
diff --git a/app-text/webgen/webgen-1.7.3.ebuild b/app-text/webgen/webgen-1.7.3.ebuild
new file mode 100644
index 000000000000..c630a650eedd
--- /dev/null
+++ b/app-text/webgen/webgen-1.7.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="task"
+RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder doc highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+ test? (
+ dev-ruby/minitest:5
+ dev-ruby/rdiscount
+ >=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+ >=dev-ruby/systemu-2.5 =dev-ruby/systemu-2*
+ >=dev-ruby/kramdown-2.3:2
+ >=dev-ruby/psych-5.1:5
+ builder? ( >=dev-ruby/builder-2.1.0:* )
+ highlight? ( >=dev-ruby/coderay-1.0 )
+ markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+ # Avoid a test fragile for sass version differences
+ sed -i -e '/test_static_call/,/^ end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+ # Avoid a test with fragile whitespace tests
+ rm -f test/webgen/content_processor/test_haml.rb || die
+
+ # Avoid tests for rdoc since that requires an obsolete version
+ sed -i -e '/def test_create_nodes/askip' test/webgen/path_handler/test_api.rb || die
+
+ # Avoid tests for unpackaged dependencies
+ rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
+
+ # Avoid tests failing with newer Psych versions
+ rm -f test/test_documentation.rb || die
+
+ # Fix minitest deprecation
+ sed -i -e 's/MiniTest/Minitest/' $(find test -type f -print) || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ doman man/man1/webgen.1
+}
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 1fd17fb5070b..e957693da79a 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,2 +1,2 @@
-DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
-DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
+DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab
+DIST wgetpaste-2.34.tar.xz 16640 BLAKE2B 6bc71d74945b88774f866a8c1bb693d52b3d5d680a04e45ec29acfb6dd9d9de16433ed9d675db1d63705dac356e44c89d7af0e7b18a71089778bfa92833d95d3 SHA512 9f334299d0314e821d989c785aaae9e8e9c0e4972ced9330039f7e2ca1867528a2d4f090dd754ec72e8a9d7005d8f5154266cd0769627b1023d1199893cf4f8c
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch b/app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch
new file mode 100644
index 000000000000..e55c8192dac7
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-add-A-ansi.patch
@@ -0,0 +1,39 @@
+From 9614658e6a31bf1b318972008fd9fd1301e9d92f Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 13 Aug 2023 14:32:34 -0500
+Subject: [PATCH 2/3] Add -A/--ansi
+
+Don't strip ANSI codes.
+---
+See also: https://github.com/zlin/wgetpaste/pull/46
+- Oskari
+
+ wgetpaste | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/wgetpaste b/wgetpaste
+index 5f4152d..1e3ae35 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -556,6 +556,8 @@ Options:
+ -X, --xpaste write resulting url to the X primary selection buffer (requires x11-misc/xclip)
+ -C, --xclippaste write resulting url to the X clipboard selection buffer (requires x11-misc/xclip)
+ -N, --no-ansi strip ANSI codes such as colors before pasting (requires app-text/ansifilter)
++ -A, --ansi don't strip ANSI codes
++ (useful for undoing NOANSI specified in a config file)
+
+ -r, --raw show url for the raw paste (no syntax highlighting or html)
+ -t, --tee use tee to show what is being pasted
+@@ -789,6 +791,9 @@ while [[ -n $1 ]]; do
+ -- )
+ shift && getfilenames "$@" && break
+ ;;
++ -A | --ansi )
++ NOANSI=
++ ;;
+ -c | --command )
+ requiredarg "$@"
+ SOURCE="command"
+--
+2.41.0
+
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch b/app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch
new file mode 100644
index 000000000000..5b9fcc5f4618
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-add-paste-gentoo-zip.patch
@@ -0,0 +1,69 @@
+From cc41231b0ea2ec5cc0a8353fd4a9b6b71301f819 Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Sat, 14 Oct 2023 21:48:39 -0400
+Subject: [PATCH] Add new service - paste.gentoo.zip
+
+Specified in the code with `pgz` and in the cli for usage and brevity.
+---
+See also: https://github.com/zlin/wgetpaste/pull/48
+- Oskari
+
+ wgetpaste | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index b3a537b..fc0b559 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -41,7 +41,7 @@ POST_generic() {
+ }
+
+ ### services
+-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets"
++SERVICES="0x0 bpaste codepad dpaste gists ix_io pgz snippets"
+ # 0x0
+ ENGINE_0x0=0x0
+ URL_0x0="http://0x0.st"
+@@ -68,6 +68,10 @@ URL_gists="https://api.github.com/gists"
+ ENGINE_ix_io=ix_io
+ URL_ix_io="http://ix.io"
+ SIZE_ix_io="1000000 1%MB"
++# paste.gentoo.zip
++ENGINE_pgz=pgz
++URL_pgz="https://paste.gentoo.zip"
++SIZE_pgz="2000000 2%MB"
+ # snippets
+ ENGINE_snippets=snippets
+ URL_snippets="https://gitlab.com/api/v4/snippets"
+@@ -139,7 +143,6 @@ POST_dpaste() {
+ }
+ REGEX_RAW_dpaste='s|^http.*|\0.txt|'
+ REGEX_URL_dpaste='s|^http.*|\0|p'
+-
+ # gists
+ LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly
+ Augeas AutoHotkey Batchfile Befunge BlitzMax Boo Brainfuck Bro C C# C++
+@@ -230,6 +233,20 @@ POST_lodgeit() {
+ POST_generic "submit=Paste! % % language % % code" "$1" "$2" "$3" "$4" "$5" "$6"
+ }
+ REGEX_RAW_lodgeit='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
++# paste.gentoo.zip
++escape_input_pgz() { echo "$*"; }
++POST_pgz() {
++ local content="${6}"
++ local boundary="WGETPASTE-3d8dfd9bff2b12a7410328d2ec1ed145"
++ echo "--${boundary}"
++ echo "Content-Disposition: form-data; name=\"file\""
++ echo ""
++ echo "${content}"
++ echo "--${boundary}--"
++ ADDITIONAL_HEADERS_pgz=("Content-Type: multipart/form-data; boundary=${boundary}")
++}
++REGEX_RAW_pgz='s|^http.*|\0|'
++REGEX_URL_pgz='s|^http.*|\0|p'
+ # pinnwand
+ LANGUAGES_pinnwand="ABAP ActionScript%3 ActionScript Ada ANTLR ANTLR%With%ActionScript%Target \
+ ANTLR%With%CPP%Target ANTLR%With%C#%Target ANTLR%With%Java%Target ANTLR%With%ObjectiveC%Target \
+--
+2.41.0
+
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch b/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch
new file mode 100644
index 000000000000..b56322430364
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-added-quiet-flag.patch
@@ -0,0 +1,61 @@
+From fa0bd6dd8b7bc21b292e4f94eaa4fbf71d5240f1 Mon Sep 17 00:00:00 2001
+From: Richard-Rogalski <rrogalski@tutanota.com>
+Date: Mon, 6 Nov 2023 14:00:02 -0600
+Subject: [PATCH] Added --quiet flag
+
+Signed-off-by: Richard Rogalski <rrogalski@firemail.cc>
+Closes: #19
+---
+See also: https://github.com/zlin/wgetpaste/pull/51
+- Oskari
+
+ _wgetpaste | 1 +
+ wgetpaste | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/_wgetpaste b/_wgetpaste
+index c4703e5..63696ad 100644
+--- a/_wgetpaste
++++ b/_wgetpaste
+@@ -50,6 +50,7 @@ _arguments -s : \
+ '(--xclippaste -C)'{--xclippaste,-C}'[write resulting url to the X clipboard selection buffer]' \
+ '(--raw -r)'{--raw,-r}'[show url for the raw paste]' \
+ '(--tee -t)'{--tee,-t}'[use tee to show what is being pasted]' \
++ '(--quiet -q)'{--quiet,-q}'[show the url only]' \
+ '(--verbose -v)'{--verbose,-v}'[show wget stderr output if no url is received]' \
+ '--debug[be very verbose]' \
+ '(--help -h)'{--help,-h}'[show help and exit]' \
+diff --git a/wgetpaste b/wgetpaste
+index 1e3ae35..e38f9e5 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -561,6 +561,7 @@ Options:
+
+ -r, --raw show url for the raw paste (no syntax highlighting or html)
+ -t, --tee use tee to show what is being pasted
++ -q, --quiet show the url only
+ -v, --verbose show wget stderr output if no url is received
+ --completions emit output suitable for shell completions (only affects --list-*)
+ --debug be *very* verbose (implies -v)
+@@ -659,7 +660,7 @@ showexpirations() {
+ }
+
+ showurl() {
+- echo -n "Your ${2}paste can be seen here: " >&2
++ [[ $QUIET ]] || echo -n "Your ${2}paste can be seen here: " >&2
+ echo "$1"
+ [[ $XPASTE ]] && x_paste "$1" primary
+ [[ $XCLIPPASTE ]] && x_paste "$1" clipboard
+@@ -841,6 +842,9 @@ while [[ -n $1 ]]; do
+ -N | --no-ansi )
+ NOANSI=0
+ ;;
++ -q | --quiet)
++ QUIET=0
++ ;;
+ -r | --raw )
+ RAW=0
+ ;;
+--
+2.41.0
+
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch b/app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch
new file mode 100644
index 000000000000..144d622f1243
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-change-arg-parsing-priority.patch
@@ -0,0 +1,95 @@
+From cfe7dcd8a0e40b8c18556aad0b657f431c90505a Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 13 Aug 2023 14:25:35 -0500
+Subject: [PATCH 1/3] Change arg parsing priority
+
+Read config files before parsing CLI args. Allows all options to be set
+via config and overridden on the CLI.
+---
+See also: https://github.com/zlin/wgetpaste/pull/46
+- Oskari
+
+ wgetpaste | 53 ++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 28 insertions(+), 25 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index fc0b559..5f4152d 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -720,7 +720,32 @@ geturl() {
+ fi | tail -n1
+ }
+
+-### read cli options
++# read the config files
++load_configs() {
++ if [[ ! $IGNORECONFIGS ]]; then
++ # compatibility code
++ local f deprecated=
++ for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
++ if [[ -f $f ]]; then
++ if [[ -z $deprecated ]]; then
++ echo "The config files for wgetpaste have changed to *.conf.$N" >&2
++ deprecated=0
++ fi
++ echo "Please move ${f} to ${f%.bash}.conf" >&2
++ source "$f" || die "Failed to source $f"
++ fi
++ done
++ [[ -n $deprecated ]] && echo >&2
++ # new locations override old ones in case they collide
++ for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do
++ if [[ -f $f ]]; then
++ source "$f" || die "Failed to source $f"
++ fi
++ done
++ fi
++}
++
++### get runtime options
+
+ # separate groups of short options. replace --foo=bar with --foo bar
+ while [[ -n $1 ]]; do
+@@ -756,6 +781,8 @@ done
+ # set the separated options as input options.
+ set -- "${ARGS[@]}"
+
++load_configs
++
+ while [[ -n $1 ]]; do
+ ((args=1))
+ case "$1" in
+@@ -859,30 +886,6 @@ if [[ $NOANSI ]]; then
+ fi
+
+ ### defaults
+-load_configs() {
+- if [[ ! $IGNORECONFIGS ]]; then
+- # compatibility code
+- local f deprecated=
+- for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
+- if [[ -f $f ]]; then
+- if [[ -z $deprecated ]]; then
+- echo "The config files for wgetpaste have changed to *.conf.$N" >&2
+- deprecated=0
+- fi
+- echo "Please move ${f} to ${f%.bash}.conf" >&2
+- source "$f" || die "Failed to source $f"
+- fi
+- done
+- [[ -n $deprecated ]] && echo >&2
+- # new locations override old ones in case they collide
+- for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do
+- if [[ -f $f ]]; then
+- source "$f" || die "Failed to source $f"
+- fi
+- done
+- fi
+-}
+-load_configs
+ [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
+ DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
+ DEFAULT_SERVICE=${DEFAULT_SERVICE:-bpaste}
+--
+2.41.0
+
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch
new file mode 100644
index 000000000000..8c6a523ac5cd
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch
@@ -0,0 +1,31 @@
+https://github.com/zlin/wgetpaste/pull/45
+
+From ab4632ca9cd54c9e7478f37eee821113c0135c37 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Fri, 28 Jul 2023 18:55:10 -0500
+Subject: [PATCH] Disable sprunge
+
+Sprunge seems to have recently died. Disable it by removing it from the
+service list, but keep the core bits in case it decides to come back.
+
+RIP ;(
+---
+ wgetpaste | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 864d5ef..b3a537b 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -41,7 +41,7 @@ POST_generic() {
+ }
+
+ ### services
+-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets sprunge"
++SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets"
+ # 0x0
+ ENGINE_0x0=0x0
+ URL_0x0="http://0x0.st"
+--
+2.41.0
+
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch b/app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch
new file mode 100644
index 000000000000..14e8f2f6482a
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-test_ansi-add-A-to-the-tests.patch
@@ -0,0 +1,171 @@
+From a1c0782e828bc5f0fc8b79d0131f1847c5e7b359 Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Sun, 13 Aug 2023 14:52:20 -0500
+Subject: [PATCH 3/3] test_ansi: add -A to the tests
+
+---
+See also: https://github.com/zlin/wgetpaste/pull/46
+- Oskari
+
+ test/test_ansi.sh | 92 +++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 81 insertions(+), 11 deletions(-)
+
+diff --git a/test/test_ansi.sh b/test/test_ansi.sh
+index 23b27a8..e1e95f0 100755
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -94,8 +94,8 @@ fi
+
+ # Paste stuff. Use a short timeout between requests (we're friendly after all!)
+ sleep 1
+-echo -n "Pasting command output (cat): "
+-ERROR_LOG="$DL_DIR/command-error.log"
++echo -n "Pasting command output with ANSI stripping (cat): "
++ERROR_LOG="$DL_DIR/command-noansi-error.log"
+ URL="$("$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v -c "cat $ANSI_FILE" 2>"$ERROR_LOG")"
+ if [ $? -ne 0 ]; then
+ echo "FAILED!"
+@@ -104,7 +104,7 @@ else
+ echo "SUCCESS!"
+
+ echo -n "Downloading: "
+- if ! (wget -q "$URL" -O "$DL_DIR/command.txt" 2>>"$ERROR_LOG"); then
++ if ! (wget -q "$URL" -O "$DL_DIR/command-noansi.txt" 2>>"$ERROR_LOG"); then
+ echo "FAILED!"
+ FAILED_PASTE=$((FAILED_PASTE + 1))
+ else
+@@ -112,13 +112,35 @@ else
+ rm "$ERROR_LOG"
+
+ echo "Removing 'command run' header"
+- sed -i -e '1d' "$DL_DIR/command.txt"
++ sed -i -e '1d' "$DL_DIR/command-noansi.txt"
++ fi
++fi
++sleep 1
++echo -n "Pasting command output without ANSI stripping (cat): "
++ERROR_LOG="$DL_DIR/command-ansi-error.log"
++URL="$("$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v -c "cat $ANSI_FILE" 2>"$ERROR_LOG")"
++if [ $? -ne 0 ]; then
++ echo "FAILED!"
++ FAILED_PASTE=$((FAILED_PASTE + 1))
++else
++ echo "SUCCESS!"
++
++ echo -n "Downloading: "
++ if ! (wget -q "$URL" -O "$DL_DIR/command-ansi.txt" 2>>"$ERROR_LOG"); then
++ echo "FAILED!"
++ FAILED_PASTE=$((FAILED_PASTE + 1))
++ else
++ echo "SUCCESS"
++ rm "$ERROR_LOG"
++
++ echo "Removing 'command run' header"
++ sed -i -e '1d' "$DL_DIR/command-ansi.txt"
+ fi
+ fi
+
+ sleep 1
+-echo -n "Pasting stdin (cat | wgetpaste): "
+-ERROR_LOG="$DL_DIR/stdin-error.log"
++echo -n "Pasting stdin with ANSI stripping (cat | wgetpaste): "
++ERROR_LOG="$DL_DIR/stdin-noansi-error.log"
+ URL="$(cat "$ANSI_FILE" | "$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v 2>"$ERROR_LOG")"
+ if [ $? -ne 0 ]; then
+ echo "FAILED!"
+@@ -127,7 +149,26 @@ else
+ echo "SUCCESS!"
+
+ echo -n "Downloading: "
+- if ! (wget -q "$URL" -O "$DL_DIR/stdin.txt" 2>>"$ERROR_LOG"); then
++ if ! (wget -q "$URL" -O "$DL_DIR/stdin-noansi.txt" 2>>"$ERROR_LOG"); then
++ echo "FAILED!"
++ FAILED_PASTE=$((FAILED_PASTE + 1))
++ else
++ echo "SUCCESS!"
++ rm "$ERROR_LOG"
++ fi
++fi
++sleep 1
++echo -n "Pasting stdin without ANSI stripping (cat | wgetpaste): "
++ERROR_LOG="$DL_DIR/stdin-ansi-error.log"
++URL="$(cat "$ANSI_FILE" | "$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v 2>"$ERROR_LOG")"
++if [ $? -ne 0 ]; then
++ echo "FAILED!"
++ FAILED_PASTE=$((FAILED_PASTE + 1))
++else
++ echo "SUCCESS!"
++
++ echo -n "Downloading: "
++ if ! (wget -q "$URL" -O "$DL_DIR/stdin-ansi.txt" 2>>"$ERROR_LOG"); then
+ echo "FAILED!"
+ FAILED_PASTE=$((FAILED_PASTE + 1))
+ else
+@@ -137,8 +178,8 @@ else
+ fi
+
+ sleep 1
+-echo -n "Pasting a file: "
+-ERROR_LOG="$DL_DIR/file-error.log"
++echo -n "Pasting a file with ANSI stripping: "
++ERROR_LOG="$DL_DIR/file-noansi-error.log"
+ URL="$("$TEST_DIR"/../wgetpaste -N -r -s "$WORKING" -v "$ANSI_FILE" 2>"$ERROR_LOG")"
+ if [ $? -ne 0 ]; then
+ echo "FAILED!"
+@@ -147,7 +188,26 @@ else
+ echo "SUCCESS!"
+
+ echo -n "Downloading: "
+- if ! (wget -q "$URL" -O "$DL_DIR/file.txt" 2>>"$ERROR_LOG"); then
++ if ! (wget -q "$URL" -O "$DL_DIR/file-noansi.txt" 2>>"$ERROR_LOG"); then
++ echo "FAILED!"
++ FAILED_PASTE=$((FAILED_PASTE + 1))
++ else
++ echo "SUCCESS!"
++ rm "$ERROR_LOG"
++ fi
++fi
++sleep 1
++echo -n "Pasting a file without ANSI stripping: "
++ERROR_LOG="$DL_DIR/file-ansi-error.log"
++URL="$("$TEST_DIR"/../wgetpaste -A -r -s "$WORKING" -v "$ANSI_FILE" 2>"$ERROR_LOG")"
++if [ $? -ne 0 ]; then
++ echo "FAILED!"
++ FAILED_PASTE=$((FAILED_PASTE + 1))
++else
++ echo "SUCCESS!"
++
++ echo -n "Downloading: "
++ if ! (wget -q "$URL" -O "$DL_DIR/file-ansi.txt" 2>>"$ERROR_LOG"); then
+ echo "FAILED!"
+ FAILED_PASTE=$((FAILED_PASTE + 1))
+ else
+@@ -157,7 +217,7 @@ else
+ fi
+
+ # Compare downloaded files
+-for dl_file in "$DL_DIR"/*.txt; do
++for dl_file in "$DL_DIR"/*-noansi.txt; do
+ echo -n "Testing file $dl_file: "
+ # Ignore missing trailing newline and extra empty lines in downloaded file
+ if (diff -q -Z -B "$NOANSI_FILE" "$dl_file" &>/dev/null); then
+@@ -167,6 +227,16 @@ for dl_file in "$DL_DIR"/*.txt; do
+ DL_MISMATCH=$((DL_MISMATCH + 1))
+ fi
+ done
++for dl_file in "$DL_DIR"/*-ansi.txt; do
++ echo -n "Testing file $dl_file: "
++ # Ignore missing trailing newline and extra empty lines in downloaded file
++ if (diff -q -Z -B "$ANSI_FILE" "$dl_file" &>/dev/null); then
++ echo "SUCCESS!"
++ else
++ echo "FAILED!"
++ DL_MISMATCH=$((DL_MISMATCH + 1))
++ fi
++done
+
+ echo "Total failed pastes: $FAILED_PASTE"
+ echo "Total mismatches: $DL_MISMATCH"
+--
+2.41.0
+
diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-tests.patch b/app-text/wgetpaste/files/wgetpaste-2.33-tests.patch
new file mode 100644
index 000000000000..41d0bece7962
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.33-tests.patch
@@ -0,0 +1,83 @@
+https://github.com/zlin/wgetpaste/pull/38
+
+From 3470bbe651c2264a7f985f3b86f67a6ff6d0c587 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 22 Nov 2022 01:29:16 +0000
+Subject: [PATCH 1/3] test: respect TMPDIR in mktemp (pass --tmpdir)
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -7,7 +7,7 @@
+ # Don't assume the test is being run from the same directory as the script
+ TEST_DIR="$(dirname "$0")"
+ TEST_FILE="$TEST_DIR/test.txt"
+-DL_DIR="$(mktemp -q -d /tmp/wgetpaste_test.XXXXX)"
++DL_DIR="$(mktemp -q --tmpdir -d wgetpaste_test.XXXXX)"
+ # Services to hard skip
+ # Pre-declare as map to maintain type even if empty
+ # key -> value := service -> reason
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -9,7 +9,7 @@
+ TEST_DIR="$(dirname "$0")"
+ ANSI_FILE="$TEST_DIR/red.txt"
+ NOANSI_FILE="$TEST_DIR/red_no_ansi.txt"
+-DL_DIR="$(mktemp -q -d /tmp/wgetpaste_test_ansi.XXXXX)"
++DL_DIR="$(mktemp -q --tmpdir -d wgetpaste_test_ansi.XXXXX)"
+ # Services to hard skip
+ # Pre-declare as map to maintain type even if empty
+ # key -> value := service -> reason
+
+From 0c3cc1a5286c95a5bcd6408035f6c230350c1565 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 22 Nov 2022 01:29:40 +0000
+Subject: [PATCH 2/3] test: use portable bash shebang
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/usr/bin/env bash
+
+ # wgetpaste test script
+ # Exit code: number of mismatched downloads or 1 for general failure
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/usr/bin/env bash
+
+ # wgetpaste test script (stripping ANSI codes)
+ # Based on test/test.sh
+
+From 8d1cf7a8d0ce9ff21a8e1dc66169b04e4f8fc852 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 22 Nov 2022 01:29:55 +0000
+Subject: [PATCH 3/3] test: normalise copyright header
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/test.sh
++++ b/test/test.sh
+@@ -2,7 +2,7 @@
+
+ # wgetpaste test script
+ # Exit code: number of mismatched downloads or 1 for general failure
+-# Copyright (C) 2021 xxc3nsoredxx
++# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+
+ # Don't assume the test is being run from the same directory as the script
+ TEST_DIR="$(dirname "$0")"
+--- a/test/test_ansi.sh
++++ b/test/test_ansi.sh
+@@ -3,7 +3,7 @@
+ # wgetpaste test script (stripping ANSI codes)
+ # Based on test/test.sh
+ # Exit code: number of mismatched downloads or 1 for general failure
+-# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com>
++# Copyright (C) 2022 Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+
+ # Don't assume the test is being run from the same directory as the script
+ TEST_DIR="$(dirname "$0")"
+
diff --git a/app-text/wgetpaste/files/wgetpaste-remove-dead.patch b/app-text/wgetpaste/files/wgetpaste-remove-dead.patch
deleted file mode 100644
index 038d5349a7c6..000000000000
--- a/app-text/wgetpaste/files/wgetpaste-remove-dead.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 166ec045945eff08ca27129b38d2f5395710e8fb Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Sat, 23 Feb 2019 21:14:08 +0300
-Subject: [PATCH] fix wgetpaste services
-
-Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
----
- wgetpaste | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/wgetpaste b/wgetpaste
-index 2c198e0..def51de 100755
---- a/wgetpaste
-+++ b/wgetpaste
-@@ -14,7 +14,7 @@ E=$'\e'
- N=$'\n'
-
- ### services
--SERVICES="codepad bpaste dpaste gists poundpython"
-+SERVICES="codepad bpaste dpaste gists"
- # bpaste
- ENGINE_bpaste=pinnwand
- URL_bpaste="https://bpaste.net/"
-@@ -722,7 +722,7 @@ load_configs() {
- load_configs
- [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
- DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
--DEFAULT_SERVICE=${DEFAULT_SERVICE:-poundpython}
-+DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste}
- DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
- DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
- SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
---
-2.19.2
-
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 23d91c3c4034..0ecaea5e3d91 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>maksbotan@gentoo.org</email>
- <name>Maxim Koltsov</name>
+ <maintainer type="person" proxied="yes">
+ <email>xxc3ncoredxx@gmail.com</email>
+ <name>Oskari Pirhonen</name>
</maintainer>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">zlin/wgetpaste</remote-id>
+ <bugs-to>https://github.com/zlin/wgetpaste/issues</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
deleted file mode 100644
index 8cad5c7d054b..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+ssl"
-
-DEPEND=""
-RDEPEND="net-misc/wget[ssl?]"
-
-PATCHES=( "${FILESDIR}"/${PN}-remove-dead.patch )
-
-src_prepare() {
- sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
- default
-}
-
-src_install() {
- dobin ${PN}
- insinto /usr/share/zsh/site-functions
- doins _wgetpaste
-}
diff --git a/app-text/wgetpaste/wgetpaste-2.29.ebuild b/app-text/wgetpaste/wgetpaste-2.29.ebuild
deleted file mode 100644
index ff53674f0697..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.29.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+ssl"
-
-DEPEND=""
-RDEPEND="net-misc/wget[ssl?]"
-
-src_prepare() {
- sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
- default
-}
-
-src_install() {
- dobin ${PN}
- insinto /usr/share/zsh/site-functions
- doins _wgetpaste
-}
diff --git a/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild
new file mode 100644
index 000000000000..89f63061351c
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.33-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="https://github.com/zlin/wgetpaste"
+SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ssl"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.33-tests.patch
+ "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch
+ "${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_test() {
+ test/test.sh || die
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/zsh/site-functions
+ doins _wgetpaste
+}
+
+pkg_postinst() {
+ optfeature "ANSI (color code) stripping support" app-text/ansifilter
+ optfeature "xclip support" x11-misc/xclip
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local old
+
+ for old in ${REPLACING_VERSIONS}; do
+ if ver_test ${old} -lt '2.33-r2'; then
+ ewarn
+ ewarn "Sprunge is dead and the service has been dropped from the code. Remove or"
+ ewarn "replace sprunge as the default service in the system or user wgetpaste"
+ ewarn "config if applicable."
+ ewarn
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild
new file mode 100644
index 000000000000..6c78bad4e65a
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.33-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="https://github.com/zlin/wgetpaste"
+SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ssl"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.33-tests.patch
+ "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch
+ "${FILESDIR}"/${PN}-2.33-add-paste-gentoo-zip.patch
+ "${FILESDIR}"/${PN}-2.33-change-arg-parsing-priority.patch
+ "${FILESDIR}"/${PN}-2.33-add-A-ansi.patch
+ "${FILESDIR}"/${PN}-2.33-test_ansi-add-A-to-the-tests.patch
+ "${FILESDIR}"/${PN}-2.33-added-quiet-flag.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_test() {
+ test/test.sh || die
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/zsh/site-functions
+ doins _wgetpaste
+}
+
+pkg_postinst() {
+ optfeature "ANSI (color code) stripping support" app-text/ansifilter
+ optfeature "xclip support" x11-misc/xclip
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local old
+
+ for old in ${REPLACING_VERSIONS}; do
+ if ver_test ${old} -lt '2.33-r2'; then
+ ewarn
+ ewarn "Sprunge is dead and the service has been dropped from the code. Remove or"
+ ewarn "replace sprunge as the default service in the system or user wgetpaste"
+ ewarn "config if applicable."
+ ewarn
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-text/wgetpaste/wgetpaste-2.34.ebuild b/app-text/wgetpaste/wgetpaste-2.34.ebuild
new file mode 100644
index 000000000000..9eb248cf9574
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.34.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="https://github.com/zlin/wgetpaste"
+SRC_URI="https://github.com/zlin/wgetpaste/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ssl"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="net-misc/wget[ssl?]"
+
+src_prepare() {
+ default
+
+ sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_test() {
+ test/test.sh || die
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/zsh/site-functions
+ doins _wgetpaste
+}
+
+pkg_postinst() {
+ optfeature "ANSI (color code) stripping support" app-text/ansifilter
+ optfeature "xclip support" x11-misc/xclip
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ local old
+
+ for old in ${REPLACING_VERSIONS}; do
+ if ver_test ${old} -lt '2.33-r2'; then
+ ewarn
+ ewarn "Sprunge is dead and the service has been dropped from the code. Remove or"
+ ewarn "replace sprunge as the default service in the system or user wgetpaste"
+ ewarn "config if applicable."
+ ewarn
+ break
+ fi
+ done
+ fi
+}
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 6c5bb28f704b..ee3827d84457 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -1,2 +1 @@
-DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
DIST wiki2beamer-v0.10.0.tar.gz 164911 BLAKE2B 0a532669915f0db5f1bb8755297bcd36e4175bc57d3b5f14df01566ac74e425c999447ff3f2bd20f2bcd50671bd65accfcf8049476a1656439fc46bab2becafd SHA512 712c719bcdd97f48c65aff1919f2e6a838a0beba1d2e5569063fd1f84bf68eda3137ac20e5dc463dff64c8b4656ce0bf02a0acea090b9a30262374cbee5db433
diff --git a/app-text/wiki2beamer/metadata.xml b/app-text/wiki2beamer/metadata.xml
index 2d21a5ac6b1c..4a0c808679e4 100644
--- a/app-text/wiki2beamer/metadata.xml
+++ b/app-text/wiki2beamer/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
<upstream>
+ <remote-id type="github">wiki2beamer/wiki2beamer</remote-id>
<remote-id type="sourceforge">wiki2beamer</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0-r2.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..7534224bd844
--- /dev/null
+++ b/app-text/wiki2beamer/wiki2beamer-0.10.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-single-r1
+
+DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
+
+MY_P=wiki2beamer-v${PV}
+HOMEPAGE="https://wiki2beamer.github.io/"
+SRC_URI="https://github.com/wiki2beamer/wiki2beamer/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ doc? ( dev-ruby/asciidoctor )"
+
+S="${WORKDIR}/wiki2beamer-${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-doc-examples-makefile.patch
+ "${FILESDIR}"/${P}-doc-man-makefile.patch
+)
+
+src_compile() {
+ use doc && emake -C doc/man/ wiki2beamer.1
+}
+
+src_install() {
+ use examples && dodoc -r doc/examples
+
+ use doc && doman doc/man/${PN}.1
+ dodoc ChangeLog README.md
+
+ python_doscript code/${PN}
+}
diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild
new file mode 100644
index 000000000000..577ba3e01b4c
--- /dev/null
+++ b/app-text/wiki2beamer/wiki2beamer-0.10.0-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit python-single-r1
+
+DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
+
+MY_P=wiki2beamer-v${PV}
+HOMEPAGE="https://wiki2beamer.github.io/"
+SRC_URI="https://github.com/wiki2beamer/wiki2beamer/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ doc? ( dev-ruby/asciidoctor )"
+
+S="${WORKDIR}/wiki2beamer-${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-doc-examples-makefile.patch
+ "${FILESDIR}"/${P}-doc-man-makefile.patch
+)
+
+src_compile() {
+ use doc && emake -C doc/man/ wiki2beamer.1
+}
+
+src_install() {
+ use examples && dodoc -r doc/examples
+
+ use doc && doman doc/man/${PN}.1
+ dodoc ChangeLog README.md
+
+ python_doscript code/${PN}
+}
diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
deleted file mode 100644
index 6afe4808c6af..000000000000
--- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
-
-MY_P=wiki2beamer-v${PV}
-HOMEPAGE="https://wiki2beamer.github.io/"
-SRC_URI="https://github.com/wiki2beamer/wiki2beamer/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-arch/unzip
- doc? ( dev-ruby/asciidoctor )"
-
-S="${WORKDIR}/wiki2beamer-${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-doc-examples-makefile.patch
- "${FILESDIR}"/${P}-doc-man-makefile.patch
-)
-
-src_compile() {
- use doc && emake -C doc/man/ wiki2beamer.1
-}
-
-src_install() {
- use examples && dodoc -r doc/examples
-
- use doc && doman doc/man/${PN}.1
- dodoc ChangeLog README.md
-
- python_doscript code/${PN}
-}
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
deleted file mode 100644
index 1d2c951c2453..000000000000
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
-
-HOMEPAGE="http://wiki2beamer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="|| ( GPL-2 GPL-3 ) FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-src_install() {
- if use examples; then
- # Patch example Makefile
- sed -e 's|../../code/wiki2beamer|wiki2beamer|' \
- -i doc/example/Makefile \
- || die
-
- dodoc -r doc/example
- fi
-
- doman doc/man/${PN}.1
- dodoc ChangeLog README
-
- python_doscript code/${PN}
-}
diff --git a/app-text/winefish/Manifest b/app-text/winefish/Manifest
deleted file mode 100644
index 56a1dbce70fa..000000000000
--- a/app-text/winefish/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST winefish-1.3.3.tar.gz 485772 BLAKE2B 344059c9bc15ec693e66d5d901d2e620ff223dd48de64d32b385cc1e06f6782dc2a2ec965ab8f5ce26bbf518df8edc60a1640b7ed7b576939bf45bbc424f7900 SHA512 216196694979093f5152eb7e3ccaa1e342b44bde4a054c2b6a72c38451d08cd03c3209f5becab8ce3f3c8aace089253a60dff8d8c2f679bb297b34d0fa1ff19c
diff --git a/app-text/winefish/files/winefish-1.3.3-desktop.patch b/app-text/winefish/files/winefish-1.3.3-desktop.patch
deleted file mode 100644
index eaa66eca7dd0..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/data/winefish.desktop.in
-+++ b/data/winefish.desktop.in
-@@ -7,7 +7,7 @@
- Icon=ICONDIR/winefish-icon.png
- Terminal=false
- Type=Application
--Categories=GTK;GNOME;Application;Editors;Office;Development;
-+Categories=GTK;GNOME;TextEditor;Office;Development;
- Encoding=UTF-8
- StartupNotify=true
- MimeType=text/x-tex;application/winefish-project;text/xml;
diff --git a/app-text/winefish/files/winefish-1.3.3-doc.patch b/app-text/winefish/files/winefish-1.3.3-doc.patch
deleted file mode 100644
index 9e02510e35a8..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -89,8 +89,8 @@
- $(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DATA) images/winefish_splash.png $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DIR) $(DESTDIR)$(docdir)
-- $(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
--# $(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
-+# $(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
-+ $(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
- @cd icons/ && $(MAKE) install
- @cd src/ && $(MAKE) install
- @cd data/ && $(MAKE) install
diff --git a/app-text/winefish/files/winefish-1.3.3-memset.patch b/app-text/winefish/files/winefish-1.3.3-memset.patch
deleted file mode 100644
index 7390642bb690..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/highlight.c
-+++ b/src/highlight.c
-@@ -731,7 +731,7 @@
- GList *tmplist = g_list_first(level);
- while (tmplist) {
- Tpattern * pat = (Tpattern *)tmplist->data;
-- memset(pat->ovector,0,sizeof(pat->ovector));
-+ memset(pat->ovector,0,sizeof(&pat->ovector));
- pat->is_match = FALSE;
- patmatch_init_run(pat->childs);
- tmplist = g_list_next(tmplist);
diff --git a/app-text/winefish/files/winefish-1.3.3-nostrip.patch b/app-text/winefish/files/winefish-1.3.3-nostrip.patch
deleted file mode 100644
index 24f21e49d307..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -37,7 +37,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- INSTALL = @INSTALL@
- INSTALL_DIR = $(INSTALL) -d -m 755
--INSTALL_PROGRAM = $(INSTALL) -s -m 755
-+INSTALL_PROGRAM = $(INSTALL) -m 755
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
- -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DPKGDATADIR=\"$(pkgdatadir)\" @DEFS@
-
diff --git a/app-text/winefish/files/winefish-1.3.3-version.patch b/app-text/winefish/files/winefish-1.3.3-version.patch
deleted file mode 100644
index a586608719d9..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@
- AC_CONFIG_HEADER(src/config.h)
-
- PACKAGE=winefish
--VERSION=1.3.2
-+VERSION=1.3.3
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/app-text/winefish/metadata.xml b/app-text/winefish/metadata.xml
deleted file mode 100644
index bb345a547d2f..000000000000
--- a/app-text/winefish/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>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">viettug/winefish</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/winefish/winefish-1.3.3-r2.ebuild b/app-text/winefish/winefish-1.3.3-r2.ebuild
deleted file mode 100644
index 2c873d65af7f..000000000000
--- a/app-text/winefish/winefish-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils xdg-utils
-
-MY_PV=${PV/%[[:alpha:]]/}
-
-DESCRIPTION="LaTeX editor based on Bluefish"
-HOMEPAGE="https://github.com/viettug/winefish"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="spell"
-
-RDEPEND="
- >=dev-libs/libpcre-6.3
- >=x11-libs/gtk+-2.4:2
- spell? ( app-text/aspell )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-desktop.patch
- "${FILESDIR}"/${P}-doc.patch
- "${FILESDIR}"/${P}-memset.patch
- "${FILESDIR}"/${P}-nostrip.patch
- "${FILESDIR}"/${P}-version.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --disable-update-databases
-}
-
-src_install() {
- emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html
- dodoc AUTHORS CHANGES README ROADMAP THANKS TODO
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
deleted file mode 100644
index a0065346f730..000000000000
--- a/app-text/wklej/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wklej-0.2.1.tar.gz 4370 BLAKE2B 616126936c37f8f727167745eecca27b7f1ba844b7396bbd2c205c804c90c2632dddb1b74bd9d66cd040c7eaa9a8e179281372b96eeb6d3d8f09ae27250563c7 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c
diff --git a/app-text/wklej/metadata.xml b/app-text/wklej/metadata.xml
deleted file mode 100644
index a6ba9840e60b..000000000000
--- a/app-text/wklej/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>aidecoe@gentoo.org</email>
- <name>Amadeusz Żołnowski</name>
-</maintainer>
-<use>
- <flag name="vim">Install the vim plugin allowing to paste
- through ':Wklej'.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-text/wklej/wklej-0.2.1-r1.ebuild b/app-text/wklej/wklej-0.2.1-r1.ebuild
deleted file mode 100644
index 01df0f62ca1d..000000000000
--- a/app-text/wklej/wklej-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
-
-inherit python-single-r1
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="+vim"
-# the vim script is python2-only...
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- vim? ( ^^ ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- vim? ( app-editors/vim[python,$(python_gen_usedep 'python2*')] )"
-
-S=${WORKDIR}
-
-src_install() {
- if use vim; then
- insinto /usr/share/vim/vimfiles/plugin
- doins ${PN}.vim
- fi
-
- python_doscript ${PN}
- dodoc README wklejrc
-}
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
index 14c2a0236a37..af150e94b57c 100644
--- a/app-text/writerperfect/metadata.xml
+++ b/app-text/writerperfect/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/writerperfect/writerperfect-0.9.6.ebuild b/app-text/writerperfect/writerperfect-0.9.6.ebuild
index a9f43a1e673e..78fb4670ddca 100644
--- a/app-text/writerperfect/writerperfect-0.9.6.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~riscv x86 ~x86-linux"
IUSE="abiword +cdr debug ebook epub freehand gsf keynote +mspub +mwaw pagemaker qxp +visio +wpd +wpg +wps zmf"
# configure fails if no import library is selected...
diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
index d5f156b045c3..1c5a4ea70c90 100644
--- a/app-text/wscr/metadata.xml
+++ b/app-text/wscr/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">WSCR is a program to solve word jumbles, print all
-permutations of a string, and print pseudo-anagrams. It will use /usr/dict/words
-or a user-specified wordlist file</longdescription>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ WSCR is a program to solve word jumbles, print all permutations of a
+ string, and print pseudo-anagrams. It will use /usr/dict/words or a
+ user-specified wordlist file
+ </longdescription>
</pkgmetadata>
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
deleted file mode 100644
index 70eae73fb6be..000000000000
--- a/app-text/wscr/wscr-1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-RDEPEND="sys-apps/miscfiles"
-
-src_prepare() {
- sed -i 's#"/usr/dict/words";#"/usr/share/dict/words";#' wscr.h || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
- dobin wscr
- doman wscr.6
- dodoc README
-}
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
new file mode 100644
index 000000000000..b035e8ba14fa
--- /dev/null
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A Lightweight and Fast Anagram Solver"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+
+KEYWORDS="amd64 ~mips ppc x86"
+RDEPEND="sys-apps/miscfiles"
+
+src_prepare() {
+ default
+ sed -i 's#"/usr/dict/words";#"/usr/share/dict/words";#' wscr.h || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+ dobin wscr
+ doman wscr.6
+ dodoc README
+}
diff --git a/app-text/wv/files/wv-1.2.9-C99-decls.patch b/app-text/wv/files/wv-1.2.9-C99-decls.patch
new file mode 100644
index 000000000000..b200055cf5b8
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-C99-decls.patch
@@ -0,0 +1,101 @@
+--- a/field.c
++++ b/field.c
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <string.h>
++#include <strings.h>
+ #include <time.h>
+
+ #include "wv.h"
+--- a/md5.c
++++ b/md5.c
+@@ -57,7 +57,7 @@
+ #include "md5.h"
+
+ /* forward declaration */
+-static void Transform ();
++static void Transform (UINT4 *buf, UINT4 *in);
+
+ static unsigned char PADDING[64] = {
+ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+@@ -103,8 +103,7 @@
+ }
+
+ void
+-wvMD5Init (mdContext)
+- wvMD5_CTX *mdContext;
++wvMD5Init (wvMD5_CTX *mdContext)
+ {
+ mdContext->i[0] = mdContext->i[1] = (UINT4) 0;
+
+@@ -117,10 +116,7 @@
+ }
+
+ void
+-wvMD5Update (mdContext, inBuf, inLen)
+- wvMD5_CTX *mdContext;
+- unsigned char *inBuf;
+- unsigned int inLen;
++wvMD5Update (wvMD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+ {
+ UINT4 in[16];
+ int mdi;
+@@ -155,8 +151,7 @@
+ }
+
+ void
+-wvMD5Final (mdContext)
+- wvMD5_CTX *mdContext;
++wvMD5Final (wvMD5_CTX *mdContext)
+ {
+ UINT4 in[16];
+ int mdi;
+@@ -198,9 +193,7 @@
+ /* Basic MD5 step. Transform buf based on in.
+ */
+ static void
+-Transform (buf, in)
+- UINT4 *buf;
+- UINT4 *in;
++Transform (UINT4 *buf, UINT4 *in)
+ {
+ UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+--- a/md5.h
++++ b/md5.h
+@@ -48,9 +48,9 @@
+ unsigned char digest[16]; /* actual digest after MD5Final call */
+ } wvMD5_CTX;
+
+-void wvMD5Init ();
+-void wvMD5Update ();
+-void wvMD5Final ();
++void wvMD5Init (wvMD5_CTX *mdContext);
++void wvMD5Update (wvMD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
++void wvMD5Final (wvMD5_CTX *mdContext);
+
+ /*
+ **********************************************************************
+--- a/wvConfig.c
++++ b/wvConfig.c
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <strings.h>
+ #include <math.h>
+ #include <ctype.h>
+ #include "wv.h"
+--- a/wvparse.c
++++ b/wvparse.c
+@@ -35,6 +35,9 @@
+ #include <gsf/gsf-input-stdio.h>
+ #include <gsf/gsf-utils.h>
+
++int wvOLEDecode_gsf (wvParseStruct * ps, GsfInput *path, wvStream ** mainfd, wvStream ** tablefd0,
++ wvStream ** tablefd1, wvStream ** data, wvStream ** summary);
++
+ int
+ wvInit (void)
+ {
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
index cd50be096520..197cdb242511 100644
--- a/app-text/wv/metadata.xml
+++ b/app-text/wv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
deleted file mode 100644
index e80da09ffb16..000000000000
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils autotools
-
-DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
-SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://wvware.sourceforge.net/"
-
-IUSE="tools wmf"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
- >=dev-libs/glib-2:2
- >=gnome-extra/libgsf-1.13:=
- sys-libs/zlib
- media-libs/libpng:0=
- dev-libs/libxml2:2
- tools? ( app-text/texlive-core
- dev-texlive/texlive-latex )
- wmf? ( >=media-libs/libwmf-0.2.2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
-
-src_prepare() {
- default
-
- if ! use tools; then
- sed -i -e '/bin_/d' GNUmakefile.am || die
- sed -i -e '/SUBDIRS/d' GNUmakefile.am || die
- sed -i -e '/\/GNUmakefile/d' configure.ac || die
- sed -i -e '/wv[[:upper:]]/d' configure.ac || die
-
- # automake-1.13 fix, bug #467620
- sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
-
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_with wmf libwmf)
-}
-
-src_install () {
- default
- prune_libtool_files
-
- rm -f "${ED}"/usr/share/man/man1/wvConvert.1
- if use tools; then
- dosym /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1 || die
- fi
-}
diff --git a/app-text/wv/wv-1.2.9-r3.ebuild b/app-text/wv/wv-1.2.9-r3.ebuild
new file mode 100644
index 000000000000..c2a286d095f4
--- /dev/null
+++ b/app-text/wv/wv-1.2.9-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="tools wmf"
+
+RDEPEND="
+ >=dev-libs/glib-2:2
+ >=gnome-extra/libgsf-1.13:=
+ sys-libs/zlib
+ media-libs/libpng:0=
+ dev-libs/libxml2:2
+ tools? (
+ app-text/texlive-core
+ dev-texlive/texlive-latex
+ )
+ wmf? ( >=media-libs/libwmf-0.2.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-C99-decls.patch
+)
+
+src_prepare() {
+ default
+
+ # remove -ansi flag, since it disables POSIX
+ # function declarations (bug #874396)
+ sed -i -e 's/-ansi//' configure || die
+
+ if ! use tools; then
+ sed -i -e '/bin_/d' GNUmakefile.am || die
+ sed -i -e '/SUBDIRS/d' GNUmakefile.am || die
+ sed -i -e '/\/GNUmakefile/d' configure.ac || die
+ sed -i -e '/wv[[:upper:]]/d' configure.ac || die
+ sed -i -e 's/-ansi//' configure.ac || die
+
+ # automake-1.13 fix, bug #467620
+ sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf $(use_with wmf libwmf)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ rm -f "${ED}"/usr/share/man/man1/wvConvert.1 || die
+ use tools && dosym wvWare.1 /usr/share/man/man1/wvConvert.1
+}
diff --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
index f7ff6e99633e..95c9b6583b4a 100644
--- a/app-text/wv2/metadata.xml
+++ b/app-text/wv2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
deleted file mode 100644
index 5f5d76cee7ef..000000000000
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
-HOMEPAGE="http://wvware.sourceforge.net"
-SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="zlib"
-
-RDEPEND="
- dev-libs/glib
- >=gnome-extra/libgsf-1.8:=
- virtual/libiconv
- zlib? ( sys-libs/zlib )"
-DEPEND="
- ${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-glib.patch
- "${FILESDIR}"/${P}-libgsf.patch
-)
-DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
-
-src_configure() {
- # due to ICU 59 requiring C++11 now
- append-cxxflags -std=c++11
-
- local mycmakeargs=(
- -DWITH_ZLIB=$(usex zlib)
- )
- cmake-utils_src_configure
-}
diff --git a/app-text/wv2/wv2-0.4.2-r3.ebuild b/app-text/wv2/wv2-0.4.2-r3.ebuild
new file mode 100644
index 000000000000..779ef5584fea
--- /dev/null
+++ b/app-text/wv2/wv2-0.4.2-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
+HOMEPAGE="https://wvware.sourceforge.net"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="zlib"
+
+RDEPEND="dev-libs/glib
+ >=gnome-extra/libgsf-1.8:=
+ virtual/libiconv
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-glib.patch
+ "${FILESDIR}"/${P}-libgsf.patch
+)
+
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
+
+src_configure() {
+ # Due to ICU 59 requiring C++11 now
+ append-cxxflags -std=c++11
+
+ local mycmakeargs=(
+ -DWITH_ZLIB=$(usex zlib)
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 637134e56540..a8381dc78764 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1 +1,2 @@
-DIST xapers-0.8.2.tar.gz 160938 BLAKE2B cb21d04146f0cca39f1a706641e4cd2a83a796cbf4eb096379367203d91811c20798638a27215e9fdd9ffb32de908a389b0af57200f19bf4d2c8477a9c82ca93 SHA512 cdf1d4791dd48f579f9ee019492c26d10c9855c1ceef2c15bdc81dfdab0f1d74f54db453bb60a9d297a155a55d73cd26ff192875b4ee2b80d8f9f5d35a4bbcc9
+DIST xapers-0.9.0.tar.gz 159928 BLAKE2B d202a3835ccbcb1adfc2123ee40f6e1992e0c10f84cf57fc38eaae27134d649c94b5c625bf3a11ef2f4d119093fb1dcd99a923a9585d8e6b6b37ed9db7c15247 SHA512 0b2e32d215c64842a2d586c776d6cdfd2b77cd3081929c37dde9682fb61e8c58e374773ef33e1123087e8dcf655e12fd19db371005aaf31875492607d6494dd7
+DIST xapers-0.9.2.tar.bz2 155239 BLAKE2B 918ce421b154291deeb636b50c0dd0db2e523405d66105e3799a7abb054411b15b02cc5fa55e9667fb7c8fe98664778fb90e7c77aaa716b66c0f4dc4d463aae7 SHA512 73604490278bcdb228333dc677be12f6110cc11ab96a8a0d3c4590c5e6383d0869db2e82fbed88e4bf82fd997025ca831b6412bb00a54a7ab8ba3309b755d84b
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
index b2b0bbc66d70..4e0bcb47f23f 100644
--- a/app-text/xapers/metadata.xml
+++ b/app-text/xapers/metadata.xml
@@ -1,21 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>william@ewpettersson.se</email>
<name>William Pettersson</name>
</maintainer>
- <maintainer type="project">
+ <maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy maintainers</name>
</maintainer>
- <longdescription>
- Xapers is a personal document indexing system, geared towards academic journal articles.
- </longdescription>
<upstream>
- <maintainer status="active">
- <name>Jameson Graef Rollins</name>
- <email>jrollins@finestructure.net</email>
- </maintainer>
+ <remote-id type="gitlab">wpettersson/xapers</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/xapers/xapers-0.8.2.ebuild b/app-text/xapers/xapers-0.8.2.ebuild
deleted file mode 100644
index d835d91dec96..000000000000
--- a/app-text/xapers/xapers-0.8.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Personal document indexing system"
-HOMEPAGE="https://finestructure.net/xapers/"
-SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-text/poppler[utils]
- dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
- dev-python/bibtexparser[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/urwid[${PYTHON_USEDEP}]
- x11-misc/xclip
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-text/xapers/xapers-0.9.0.ebuild b/app-text/xapers/xapers-0.9.0.ebuild
new file mode 100644
index 000000000000..f2d6b0f70140
--- /dev/null
+++ b/app-text/xapers/xapers-0.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Personal document indexing system"
+HOMEPAGE="https://finestructure.net/xapers/ https://gitlab.com/jrollins/xapers/"
+SRC_URI="https://gitlab.com/jrollins/${PN}/-/archive/${PV}/${P}.tar.gz"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/poppler[utils]
+ dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
+ dev-python/pybtex[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xdg-utils"
+
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+ cd test || die
+ ./all || die
+}
diff --git a/app-text/xapers/xapers-0.9.2.ebuild b/app-text/xapers/xapers-0.9.2.ebuild
new file mode 100644
index 000000000000..cee8778f4ad9
--- /dev/null
+++ b/app-text/xapers/xapers-0.9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Personal document indexing system"
+HOMEPAGE="https://gitlab.com/wpettersson/xapers/"
+SRC_URI="https://gitlab.com/wpettersson/${PN}/-/archive/${PV}/${P}.tar.bz2"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/poppler[utils]
+ dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
+ dev-python/pybtex[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xdg-utils"
+
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND} )"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+ cd test || die
+ ./all || die
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index afa43435d85b..9baffa3dacb6 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,8 +1,4 @@
-DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
-DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
-DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
-DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
-DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
-DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
-DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
-DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
+DIST xapian-omega-1.4.22.tar.xz 570476 BLAKE2B 05bd5c8135870b3a2058bcd032da9609cac7d0b1a07b31cb84f8fdf175bb87d22acd9beb392f93ebf1f23e4ebf4d23fbe12b70063628d318012b71246d14f26b SHA512 460120fa2c76ad99f818f4183c4ded92eaa7f01a9dd782af1e93faf11caf2479053f45a9e9f0a602bf31631dba8be2d2c18bba28340c578126e8658ad4937c19
+DIST xapian-omega-1.4.23.tar.xz 571596 BLAKE2B fee64cf73a7bc8e6951c3555f1139bec8c94102b00ccf3a0a69c5037002f122f0d1688a798967f997f85d6c21bd69d72758168408d95159a7442bc46050fe915 SHA512 2137972cebb10315f35024c8a5e179ce082eab777e4fd795ba6700eeab0d77ec49b6e06d104222e77824898c25c1717d346564d59e5f349360fec89476e3ee4f
+DIST xapian-omega-1.4.24.tar.xz 580736 BLAKE2B bdefb4a28185e5966c8f7ec7056562bdca39d02b5fb92d57b3b4ab051107fb80d198c5f2d460d067fa085ebad99276476b6ec0cb53636ae4dd3fb62f6a546f0e SHA512 d3a5c5c4de9a13ed2e55ab46915aaea1ba51120b5716a4e7cab9fb628ef2c979c83e17a44d3354045459d08a6d7041322182d9c81bdbb54eb6bd53431d147a9c
+DIST xapian-omega-1.4.25.tar.xz 578904 BLAKE2B d0bb62741f7c58d1398a4dc8bca3de2b385094fb8126a4e36f424cb09964ac350709bf6dabc38d8d7ebf5f3fcd213d2a444d8e5e5cc52c6353f1c72fc7eebd72 SHA512 2b0d855baaaabbf6da1b86d61f0d3e85d5fb62d1b7d04738a7e15758d0042b9e22f80f0aa273b9a9a21b04dff579c561280e44f2a69a0c0d4f270cb0fbcef169
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
index d920e3ba3e56..115e9d64a669 100644
--- a/app-text/xapian-omega/metadata.xml
+++ b/app-text/xapian-omega/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
deleted file mode 100644
index 75dbc3f2d608..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.2.22
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.10.ebuild b/app-text/xapian-omega/xapian-omega-1.4.10.ebuild
deleted file mode 100644
index 4a7e3ffd806d..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild b/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
deleted file mode 100644
index 4a7e3ffd806d..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
deleted file mode 100644
index 4a7e3ffd806d..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.22.ebuild b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
new file mode 100644
index 000000000000..3dbebdbb01ed
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HOMEPAGE="https://xapian.org/"
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+
+DEPEND="
+ dev-lang/perl
+ dev-libs/libpcre2:=
+ ~dev-libs/xapian-${PV}:0/30
+ sys-apps/file
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+ # Protect /etc/omega.conf
+ echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+ doenvd "${T}"/20xapian-omega
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+ # Directory containing Xapian databases:
+ keepdir /var/lib/omega/data
+
+ # Directory containing OmegaScript templates:
+ keepdir /var/lib/omega/templates
+ mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+ # Directory to write Omega logs to:
+ keepdir /var/log/omega
+
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+ keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.23.ebuild b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild
new file mode 100644
index 000000000000..a9a75d694991
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.23.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+HOMEPAGE="https://xapian.org/"
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ dev-lang/perl
+ dev-libs/libpcre2:=
+ ~dev-libs/xapian-${PV}:0/30
+ sys-apps/file
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+ # Protect /etc/omega.conf
+ echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+ doenvd "${T}"/20xapian-omega
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+ # Directory containing Xapian databases:
+ keepdir /var/lib/omega/data
+
+ # Directory containing OmegaScript templates:
+ keepdir /var/lib/omega/templates
+ mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+ # Directory to write Omega logs to:
+ keepdir /var/log/omega
+
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+ keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.24.ebuild b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild
new file mode 100644
index 000000000000..1e0983f89c26
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.24.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+HOMEPAGE="https://xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ dev-lang/perl
+ dev-libs/libpcre2:=
+ ~dev-libs/xapian-${PV}:0/30
+ sys-apps/file
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+ # Protect /etc/omega.conf
+ echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+ doenvd "${T}"/20xapian-omega
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+ # Directory containing Xapian databases:
+ keepdir /var/lib/omega/data
+
+ # Directory containing OmegaScript templates:
+ keepdir /var/lib/omega/templates
+ mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+ # Directory to write Omega logs to:
+ keepdir /var/log/omega
+
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+ keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.25.ebuild b/app-text/xapian-omega/xapian-omega-1.4.25.ebuild
new file mode 100644
index 000000000000..1e0983f89c26
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.25.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+HOMEPAGE="https://xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+ dev-lang/perl
+ dev-libs/libpcre2:=
+ ~dev-libs/xapian-${PV}:0/30
+ sys-apps/file
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+ # Protect /etc/omega.conf
+ echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega || die
+ doenvd "${T}"/20xapian-omega
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+ # Directory containing Xapian databases:
+ keepdir /var/lib/omega/data
+
+ # Directory containing OmegaScript templates:
+ keepdir /var/lib/omega/templates
+ mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+ # Directory to write Omega logs to:
+ keepdir /var/log/omega
+
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+ keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
deleted file mode 100644
index eb4d381967b4..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.5.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"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
deleted file mode 100644
index 7ebcd2a0435d..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.8.ebuild b/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
deleted file mode 100644
index 2790bf5b9f0e..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
deleted file mode 100644
index 2790bf5b9f0e..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 4efdabefd7ac..925b44be4da5 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,3 +1 @@
-DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
-DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
-DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5
+DIST xchm-1.36.tar.gz 882212 BLAKE2B 8f11457664748fa3effb23102b23ee59c3184a408f6defa3bc7d7bf90c97357a74d33f5da6b7098011a1c23a9f3dd9a523076e367aa9547c9d72f25296b6c787 SHA512 0b7397cd188e47cf9e39c21081428356d858d7ff7e82dd928ef728f32d962ecd485ef2b44ff0c063bde67a605d7a4610f1f5100d1c30d691e6546434c615da65
diff --git a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
deleted file mode 100644
index a9545cf5b568..000000000000
--- a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fix code to compile with wxwidgets 3.0
- Drops support for wx < 2.7, which is just not relevant now. And in fact
- configure.ac checks for at least 2.8.0.
-Author: Olly Betts <olly@survex.com>
-Last-Update: 2014-03-07
-
---- xchm-1.23.orig/src/chmframe.cpp
-+++ xchm-1.23/src/chmframe.cpp
-@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
- enu.EnumerateFacenames();
- _normalFonts = new wxArrayString;
-
--#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
- *_normalFonts = enu.GetFacenames();
--#else
-- *_normalFonts = *enu.GetFacenames();
--#endif
- _normalFonts->Sort();
- }
-
-@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
- enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
- _fixedFonts = new wxArrayString;
-
--#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
- *_fixedFonts = enu.GetFacenames();
--#else
-- *_fixedFonts = *enu.GetFacenames();
--#endif
- _fixedFonts->Sort();
- }
-
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
index e0b21d3488e8..40a9febafabe 100644
--- a/app-text/xchm/metadata.xml
+++ b/app-text/xchm/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">xchm</remote-id>
+ <remote-id type="github">rzvncj/xCHM</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild
deleted file mode 100644
index 26b4e3e15f86..000000000000
--- a/app-text/xchm/xchm-1.23-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER="3.0"
-
-inherit eutils flag-o-matic wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="http://xchm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-DEPEND=">=dev-libs/chmlib-0.36
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-wx3.0-compat.patch
-
- append-flags -Wno-unused-local-typedefs
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS README ChangeLog
-
- cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
- rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
- rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
-
- domenu "${FILESDIR}"/xchm.desktop
- insinto /usr/share/mime/packages
- doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.29.ebuild b/app-text/xchm/xchm-1.29.ebuild
deleted file mode 100644
index 8a1516c32201..000000000000
--- a/app-text/xchm/xchm-1.29.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-inherit autotools wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="
- >=dev-libs/chmlib-0.36
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- nls? ( virtual/libintl )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- setup-wxwidgets
- default
- eautoreconf # Still needed on the next release?
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc AUTHORS README ChangeLog
-
- cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
- rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
- rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
-
- domenu "${FILESDIR}"/xchm.desktop
- insinto /usr/share/mime/packages
- doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.30.ebuild b/app-text/xchm/xchm-1.30.ebuild
deleted file mode 100644
index 2784ed8aac1c..000000000000
--- a/app-text/xchm/xchm-1.30.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-inherit wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="
- >=dev-libs/chmlib-0.36
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- nls? ( virtual/libintl )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- setup-wxwidgets
- default
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- default
-
- dodoc AUTHORS README ChangeLog
-
- domenu "${FILESDIR}"/xchm.desktop
- insinto /usr/share/mime/packages
- doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.36.ebuild b/app-text/xchm/xchm-1.36.ebuild
new file mode 100644
index 000000000000..4abfca557e5d
--- /dev/null
+++ b/app-text/xchm/xchm-1.36.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit desktop wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~riscv x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/chmlib-0.36
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_configure() {
+ setup-wxwidgets
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+
+ domenu "${FILESDIR}"/xchm.desktop
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
deleted file mode 100644
index b291398e22f6..000000000000
--- a/app-text/xchm/xchm-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0-gtk3"
-inherit autotools git-r3 wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-EGIT_REPO_URI="${HOMEPAGE}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls"
-
-RDEPEND="
- >=dev-libs/chmlib-0.36
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- nls? ( virtual/libintl )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- setup-wxwidgets
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_install() {
- default
-
- dodoc AUTHORS README ChangeLog
-
- domenu "${FILESDIR}"/xchm.desktop
- insinto /usr/share/mime/packages
- doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 5f476a71daf7..b17947255f53 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1 +1,2 @@
-DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
+DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f
+DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d
diff --git a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch b/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
deleted file mode 100644
index 6387b28c8ba2..000000000000
--- a/app-text/xdvik/files/xdvik-22.87.03-freetype2-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100
-+++ b/m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100
-@@ -21,17 +21,10 @@
-
- # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
- # -------------------------------------
--AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
-+AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
-
- # KPSE_FREETYPE2_SYSTEM_FLAGS
- # ---------------------------
- AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
--AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
--AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
-- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
--fi
--]) # KPSE_FREETYPE2_SYSTEM_FLAGS
-+_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
-+
diff --git a/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch
new file mode 100644
index 000000000000..d22c473f42d3
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.06-c99-fix.patch
@@ -0,0 +1,40 @@
+From 6d1fbe75ed92a7e1aea9d74e601dace6d24f721b Mon Sep 17 00:00:00 2001
+From: Christopher Fore <csfore@posteo.net>
+Date: Thu, 15 Feb 2024 15:20:34 -0500
+Subject: [PATCH] xdvik/gui: Fix compilation on GCC 14
+
+Starting in GCC 14, what used to be warnings from incompatible pointer
+types are now errors.
+
+https://www.gnu.org/software/gcc/gcc-14/porting_to.html
+
+Error message:
+gui/pagesel.c:541:41: error: passing argument 2 of `XawListChange' from
+incompatible pointer type [-Wincompatible-pointer-types]
+ 541 | XawListChange(LIST_WIDGET, page_info.page_labels, 0,
+ | ~~~~~~~~~^~~~~~~~~~~~
+ | |
+ | char **
+
+This mismatch is simply from XawListChange taking in a const whilst the
+argument given was not a const.
+
+Gentoo bug: https://bugs.gentoo.org/919069
+Signed-off-by: Christopher Fore <csfore@posteo.net>
+---
+ texk/xdvik/gui/pagesel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gui/pagesel.c b/gui/pagesel.c
+index 945ae760fa..913db11264 100644
+--- a/gui/pagesel.c
++++ b/gui/pagesel.c
+@@ -538,7 +538,7 @@ xaw_update_list(void)
+ button_width = get_panel_width() - 2 * (resource.btn_side_spacing + resource.btn_border_width);
+ /* delete and re-create list */
+ ASSERT(total_pages <= (int)page_info.index_size, "");
+- XawListChange(LIST_WIDGET, page_info.page_labels, 0,
++ XawListChange(LIST_WIDGET, (_Xconst char**) page_info.page_labels, 0,
+ MAX(button_width, pagelist_width), False);
+ /* restore selected item */
+ if (idx != XAW_LIST_NONE) {
diff --git a/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch b/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch
new file mode 100644
index 000000000000..c3b3f0b98bdb
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87.06-configure-clang16.patch
@@ -0,0 +1,51 @@
+https://github.com/TeX-Live/texlive-source/commit/bb307f8bd91c5ea4f191b9c788056470626893b7
+
+From bb307f8bd91c5ea4f191b9c788056470626893b7 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Thu, 2 Feb 2023 22:57:47 +0000
+Subject: [PATCH] avoid implicit wait and exit declarations for C99
+
+git-svn-id: svn://tug.org/texlive/trunk/Build/source@65717 c570f23f-e606-0410-a88d-b1316a301751
+--- a/configure
++++ b/configure
+@@ -16406,6 +16406,9 @@ else $as_nop
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif
+@@ -16427,7 +16430,7 @@ main (void)
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ _exit(
+ /* Was there some problem with vforking? */
+ child < 0
+
+--- a/m4/xdvi-func-setsid-in-fork.m4
++++ b/m4/xdvi-func-setsid-in-fork.m4
+@@ -22,6 +22,9 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
+ #ifdef HAVE_VFORK_H
+ #include <vfork.h>
+ #endif]],
+@@ -40,7 +43,7 @@ AC_DEFUN([XDVI_FUNC_SETSID_IN_VFORK],
+
+ while (wait(&status) != child)
+ ;
+- exit(
++ _exit(
+ /* Was there some problem with vforking? */
+ child < 0
+
+
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index c04b182d3bd8..4aef98d6734f 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
deleted file mode 100644
index dc814d5d0db8..000000000000
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-RDEPEND="media-libs/freetype:2
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- emacs? ( virtual/emacs )
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- neXt? ( x11-libs/neXtaw )
- !neXt? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
- )
- )
- dev-libs/kpathsea"
-DEPEND="sys-devel/flex
- virtual/yacc
- virtual/pkgconfig
- ${RDEPEND}"
-RDEPEND="${RDEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
- local i
- # Make sure system kpathsea headers are used
- cd "${WORKDIR}/${P}/texk/kpathsea"
- for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
- local toolkit
-
- if use motif ; then
- toolkit="motif"
- use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
- elif use neXt ; then
- toolkit="neXtaw"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
- elif use Xaw3d ; then
- toolkit="xaw3d"
- else
- toolkit="xaw"
- fi
-
- econf \
- --with-system-freetype2 \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
- --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- dodir /usr/share/texmf-dist/dvips/config
-
- emake DESTDIR="${D}" install
-
- dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
- dodoc BUGS FAQ README.*
-
- use emacs && elisp-install tex-utils *.el *.elc
-
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
- echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if use emacs; then
- elog "Add"
- elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
- elog " (require 'xdvi-search)"
- elog "to your ~/.emacs file"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
deleted file mode 100644
index 34a4d9669b4e..000000000000
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
-
-DESCRIPTION="DVI previewer for X Window System"
-HOMEPAGE="http://xdvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="motif neXt Xaw3d emacs"
-
-CDEPEND=">=media-libs/freetype-2.9.1-r2:2
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- emacs? ( virtual/emacs )
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- neXt? ( x11-libs/neXtaw )
- !neXt? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( x11-libs/libXaw )
- )
- )
- dev-libs/kpathsea"
-DEPEND="sys-devel/flex
- virtual/yacc
- virtual/pkgconfig
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- virtual/latex-base
- !<app-text/texlive-2007"
-S=${WORKDIR}/${P}/texk/xdvik
-
-src_prepare() {
- local i
- # Make sure system kpathsea headers are used
- cd "${WORKDIR}/${P}/texk/kpathsea"
- for i in *.h ; do echo "#include_next \"$i\"" > $i; done
-
- cd "${WORKDIR}/${P}"
- eapply "${FILESDIR}"/${P}-freetype2-config.patch
- cd "${S}"
- eautoreconf
-
- eapply_user
-}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-
- local toolkit
-
- if use motif ; then
- toolkit="motif"
- use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
- elif use neXt ; then
- toolkit="neXtaw"
- use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
- elif use Xaw3d ; then
- toolkit="xaw3d"
- else
- toolkit="xaw"
- fi
-
- econf \
- --with-system-freetype2 \
- --with-system-kpathsea \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
- --with-xdvi-x-toolkit="${toolkit}" \
- --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
- --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
- emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
- use emacs && elisp-compile xdvi-search.el
-}
-
-src_install() {
- dodir /usr/share/texmf-dist/dvips/config
-
- emake DESTDIR="${D}" install
-
- dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
-
- dodoc BUGS FAQ README.*
-
- use emacs && elisp-install tex-utils *.el *.elc
-
- doicon "${FILESDIR}"/${PN}.xpm
- make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
- echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if use emacs; then
- elog "Add"
- elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
- elog " (require 'xdvi-search)"
- elog "to your ~/.emacs file"
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
new file mode 100644
index 000000000000..4e52dfa0e6d1
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="DVI viewer for X Window System"
+HOMEPAGE="https://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
+ https://dev.gentoo.org/~pacho/${PN}/${PN}_192.png"
+S="${WORKDIR}"/${P}/texk/xdvik
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="motif neXt Xaw3d emacs"
+
+DEPEND=">=media-libs/freetype-2.9.1-r2:2
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt
+ emacs? ( >=app-editors/emacs-23.1:* )
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ neXt? ( x11-libs/neXtaw )
+ !neXt? (
+ Xaw3d? ( x11-libs/libXaw3d )
+ !Xaw3d? ( x11-libs/libXaw )
+ )
+ )
+ dev-libs/kpathsea:="
+RDEPEND="${DEPEND}
+ virtual/latex-base
+"
+BDEPEND="app-alternatives/lex
+ app-alternatives/yacc
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-22.87.06-configure-clang16.patch
+ "${FILESDIR}"/${PN}-22.87.06-c99-fix.patch
+)
+
+src_prepare() {
+ default
+
+ # Make sure system kpathsea headers are used
+ cd "${WORKDIR}/${P}/texk/kpathsea" || die
+ local i
+ for i in *.h ; do
+ echo "#include_next \"$i\"" > ${i} || die
+ done
+
+ cd "${WORKDIR}/${P}" || die
+ cd "${S}" || die
+ eautoreconf
+}
+
+src_configure() {
+ has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+ local toolkit
+ if use motif ; then
+ toolkit="motif"
+ use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
+ use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
+ elif use neXt ; then
+ toolkit="neXtaw"
+ use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
+ elif use Xaw3d ; then
+ toolkit="xaw3d"
+ else
+ toolkit="xaw"
+ fi
+
+ econf \
+ --with-system-freetype2 \
+ --with-system-kpathsea \
+ --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+ --with-xdvi-x-toolkit="${toolkit}" \
+ --x-includes="${ESYSROOT}"/usr/include \
+ --x-libraries="${ESYSROOT}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ emake kpathsea_dir="${EPREFIX}"/usr/include/kpathsea
+
+ use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+ dodir /usr/share/texmf-dist/dvips/config
+
+ emake DESTDIR="${D}" install
+
+ dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
+
+ dodoc BUGS FAQ README.*
+
+ use emacs && elisp-install tex-utils *.el *.elc
+
+ doicon "${FILESDIR}"/${PN}.xpm
+ newicon -s 192 "${DISTDIR}"/${PN}_192.png ${PN}.png
+ make_desktop_entry "xdvi %f" "XDvi" xdvik "Graphics;Viewer" "MimeType=application/x-dvi;"
+ # Our desktop file is more complete
+ rm "${ED}/usr/share/applications/xdvi.desktop" || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if use emacs; then
+ elog "Add"
+ elog " (add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
+ elog " (require 'xdvi-search)"
+ elog "to your ~/.emacs file"
+ fi
+}
diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
index 6f49eba8f496..076793e3f54b 100644
--- a/app-text/xhtml1/metadata.xml
+++ b/app-text/xhtml1/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
deleted file mode 100644
index 8fb45b9a9a67..000000000000
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit sgml-catalog eutils
-
-DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
-HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
-LICENSE="W3C"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="app-text/sgml-common
- dev-libs/libxml2"
-RDEPEND=""
-
-xml_catalog_setup() {
- CATALOG="${EROOT}etc/xml/catalog"
- XMLTOOL="${EROOT}usr/bin/xmlcatalog"
- DTDDIR="${EROOT}usr/share/sgml/${PN}"
-
- [ -x "${XMLTOOL}" ] || return 1
-
- return 0
-}
-
-src_prepare() {
- sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
- "/usr/share/sgml/${PN}/xhtml.soc"
-
- epatch "${FILESDIR}"/${PN}-catalog.patch
-}
-
-src_install() {
- insinto /usr/share/sgml/${PN}
- doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
- insinto /etc/sgml
- dodoc *.pdf *.ps
- dohtml *.html *.png *.css
-}
-
-pkg_postinst() {
- sgml-catalog_pkg_postinst
- xml_catalog_setup || return
-
- einfo "Installing xhtml1 in the global XML catalog"
-
- $XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
- ${DTDDIR}/xhtml1-strict.dtd $CATALOG
- $XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
- ${DTDDIR}/xhtml1-transitional.dtd $CATALOG
- $XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
- ${DTDDIR}/xhtml1-frameset.dtd $CATALOG
- $XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
- ${DTDDIR} $CATALOG
- $XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
- ${DTDDIR} $CATALOG
-}
-
-pkg_postrm() {
- sgml-catalog_pkg_postrm
- xml_catalog_setup || return
-
- if [ -d "$DTDDIR" ]; then
- einfo "The xhtml1 data directory still exists."
- einfo "No entries will be removed from the XML catalog."
- return
- fi
-
- einfo "Removing xhtml1 from the global XML catalog"
-
- $XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
- $XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
- $XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
- $XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
-}
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
new file mode 100644
index 000000000000..a1c78ebba9a1
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="https://www.w3.org/TR/xhtml1/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+ dev-libs/libxml2"
+
+PATCHES=( "${FILESDIR}"/${PN}-catalog.patch )
+
+xml_catalog_setup() {
+ CATALOG="${EROOT}/etc/xml/catalog"
+ XMLTOOL="${BROOT}/usr/bin/xmlcatalog"
+ DTDDIR="${EROOT}/usr/share/sgml/${PN}"
+
+ [[ -x ${XMLTOOL} ]]
+}
+
+src_install() {
+ insinto /usr/share/sgml/${PN}
+ doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
+
+ insinto /etc/sgml
+ newins - xhtml1.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/xhtml1/xhtml.soc"
+ EOF
+
+ dodoc *.pdf *.ps
+ docinto html
+ dodoc *.html *.png *.css
+}
+
+pkg_preinst() {
+ # work-around old revision removing it
+ cp "${ED}"/etc/sgml/xhtml1.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/xhtml1.cat
+ local real=${EROOT}/etc/sgml/xhtml1.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+ sgml-catalog-r1_pkg_postinst
+
+ xml_catalog_setup || return
+ einfo "Installing xhtml1 in the global XML catalog"
+ "${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
+ "${DTDDIR}"/xhtml1-strict.dtd "${CATALOG}"
+ "${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
+ "${DTDDIR}"/xhtml1-transitional.dtd "${CATALOG}"
+ "${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
+ "${DTDDIR}"/xhtml1-frameset.dtd "${CATALOG}"
+ "${XMLTOOL}" --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
+ "${DTDDIR}" "${CATALOG}"
+ "${XMLTOOL}" --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
+ "${DTDDIR}" "${CATALOG}"
+}
+
+pkg_postrm() {
+ sgml-catalog-r1_pkg_postrm
+
+ [[ -n ${REPLACED_BY_VERSION} ]] && return
+ xml_catalog_setup || return
+ einfo "Removing xhtml1 from the global XML catalog"
+ "${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' "${CATALOG}"
+ "${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' "${CATALOG}"
+ "${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' "${CATALOG}"
+ "${XMLTOOL}" --noout --del 'http://www.w3.org/TR/xhtml1/DTD' "${CATALOG}"
+}
diff --git a/app-text/xhtml11/Manifest b/app-text/xhtml11/Manifest
new file mode 100644
index 000000000000..04a975499124
--- /dev/null
+++ b/app-text/xhtml11/Manifest
@@ -0,0 +1 @@
+DIST xhtml11-20101123.tar.gz 236494 BLAKE2B 06a4e43354c16d583a0d60c450cb9dc6e088bde3be3958da70b2c5ea2e85e137666032c8a25848d9acba459d829d7ba82da414483d8f855ac3c893a7ac7f5931 SHA512 8a38a61d44809459f1f8b02992a623836df1b4b7fb6b5e844ca039264d4c99e80170c84d8b90dede7142f5972e9668f4ff71c9e0ded82887e5b4116cf56a8506
diff --git a/app-text/xhtml11/metadata.xml b/app-text/xhtml11/metadata.xml
new file mode 100644
index 000000000000..076793e3f54b
--- /dev/null
+++ b/app-text/xhtml11/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-text/xhtml11/xhtml11-20101123.ebuild b/app-text/xhtml11/xhtml11-20101123.ebuild
new file mode 100644
index 000000000000..7dd8687465b0
--- /dev/null
+++ b/app-text/xhtml11/xhtml11-20101123.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="https://www.w3.org/TR/xhtml11/"
+SRC_URI="https://www.w3.org/TR/xhtml11/xhtml11.tgz -> ${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+ dev-libs/libxml2"
+
+xml_catalog_setup() {
+ CATALOG="${EROOT}/etc/xml/catalog"
+ XMLTOOL="${BROOT}/usr/bin/xmlcatalog"
+ DTDDIR="${EROOT}/usr/share/sgml/${PN}"
+
+ [[ -x ${XMLTOOL} ]]
+}
+
+src_install() {
+ insinto /usr/share/sgml/${PN}
+ doins DTD/*.{cat,dcl,dtd,mod}
+
+ insinto /etc/sgml
+ newins - xhtml11.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/sgml/xhtml11/xhtml11.cat"
+ EOF
+
+ dodoc *.pdf *.ps
+ docinto html
+ dodoc *.html *.gif *.css
+}
+
+pkg_postinst() {
+ sgml-catalog-r1_pkg_postinst
+
+ xml_catalog_setup || return
+ einfo "Installing xhtml11 in the global XML catalog"
+ "${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.1//EN' \
+ "${DTDDIR}"/xhtml11-flat.dtd "${CATALOG}"
+ "${XMLTOOL}" --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml11/DTD' \
+ "${DTDDIR}" "${CATALOG}"
+ "${XMLTOOL}" --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml11/DTD' \
+ "${DTDDIR}" "${CATALOG}"
+}
+
+pkg_postrm() {
+ sgml-catalog-r1_pkg_postrm
+
+ [[ -n ${REPLACED_BY_VERSION} ]] && return
+ xml_catalog_setup || return
+ einfo "Removing xhtml1 from the global XML catalog"
+ "${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.1//EN' "${CATALOG}"
+ "${XMLTOOL}" --noout --del 'http://www.w3.org/TR/xhtml11/DTD' "${CATALOG}"
+}
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
deleted file mode 100644
index bb5e218f36ce..000000000000
--- a/app-text/xindy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
diff --git a/app-text/xindy/files/xindy-2.4-configure.patch b/app-text/xindy/files/xindy-2.4-configure.patch
deleted file mode 100644
index b76341f1f759..000000000000
--- a/app-text/xindy/files/xindy-2.4-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xindy-2.4/configure.ac.orig 2010-05-10 16:12:10.000000000 -0700
-+++ xindy-2.4/configure.ac 2010-09-28 23:43:39.591495118 -0700
-@@ -42,12 +42,16 @@
-
- # Test for building make-rules
- AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules ],[build and install make-rules package (default is YES)]),[BUILDRULES=$enableval],[BUILDRULES=yes])
--test "$BUILDRULES" = "yes" && AC_PROG_LATEX
-+if test "x$BUILDRULES" = "xyes"; then
-+ AC_PROG_LATEX
-+fi
- AM_CONDITIONAL(BUILDRULES, test "$BUILDRULES" = "yes")
-
- # Test for building Documentation
- AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs ],[build and install documentation (default is YES)]),[BUILDDOCS=$enableval],[BUILDDOCS=yes])
--test "$BUILDDOCS" = "yes" && AC_PROG_PDFLATEX
-+if test "x$BUILDDOCS" = "xyes"; then
-+ AC_PROG_PDFLATEX
-+fi
- AM_CONDITIONAL(BUILDDOCS, test "$BUILDDOCS" = "yes")
-
- # Checks for programs:
diff --git a/app-text/xindy/files/xindy-2.4-locale.patch b/app-text/xindy/files/xindy-2.4-locale.patch
deleted file mode 100644
index c2edccc4bef6..000000000000
--- a/app-text/xindy/files/xindy-2.4-locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xindy-2.4.orig/src/Makefile.am
-+++ xindy-2.4/src/Makefile.am
-@@ -41,7 +41,7 @@
- DEFAULTS = defaults.xdy
- DUMP_XINDY = dump-xindy.lsp
- MEMFILE = xindy.mem
--CLISP = @CLISP@ -q -E iso-8859-1
-+CLISP = @CLISP@ -q
-
- xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
- rm -f $(MEMFILE)
---- xindy-2.4.orig/user-commands/xindy.in
-+++ xindy-2.4/user-commands/xindy.in
-@@ -777,7 +777,7 @@
- sub call_xindy ( $$ ) {
- my ($mem_file, $xindy_exp) = @_;
-
-- my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
-+ my @command = ($clisp, '-M', $mem_file);
- if ( $interactive ) {
- print "Proposed xindy expression:\n\n$xindy_exp\n" unless $quiet;
- } else {
diff --git a/app-text/xindy/files/xindy-2.4-nogrep.patch b/app-text/xindy/files/xindy-2.4-nogrep.patch
deleted file mode 100644
index 41f1b3a03609..000000000000
--- a/app-text/xindy/files/xindy-2.4-nogrep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/573794
-
---- xindy-2.4-orig/make-rules/inputenc/Makefile.am
-+++ xindy-2.4/make-rules/inputenc/Makefile.am
-@@ -43,7 +43,7 @@
- latin.xdy : latin1.xdy latin2.xdy latin3.xdy
- echo ';; Generated from latin?.xdy' >latin.xdy
- echo >>latin.xdy
-- sort -u latin?.xdy | grep -v '^;' >>latin.xdy
-+ sort -u latin?.xdy | sed '/^;/d' >>latin.xdy
-
- %.xdy %.idx :
- $(PERL) $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
diff --git a/app-text/xindy/files/xindy-2.4-perl5.26.patch b/app-text/xindy/files/xindy-2.4-perl5.26.patch
deleted file mode 100644
index 657b5e94c362..000000000000
--- a/app-text/xindy/files/xindy-2.4-perl5.26.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xindy-2.4/make-rules/inputenc/make-inp-rules.pl
-+++ xindy-2.4/make-rules/inputenc/make-inp-rules.pl
-@@ -8,7 +8,7 @@
-
-
- while (<STDIN>) {
-- if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
-+ if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
- if (!($1 =~ /inputenc Error/)) {
- $i = hex($2);
- $macro = $1;
diff --git a/app-text/xindy/metadata.xml b/app-text/xindy/metadata.xml
deleted file mode 100644
index 8916aa9cb8ad..000000000000
--- a/app-text/xindy/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>tex@gentoo.org</email>
- <name>Gentoo TeX Project</name>
- </maintainer>
- <maintainer type="project">
- <email>common-lisp@gentoo.org</email>
- <name>Gentoo Common Lisp Project</name>
- </maintainer>
- <longdescription lang="en">
- xindy is an index processor that can be used to generate book-like indexes
- for arbitrary document-preparation systems. This includes systems such as
- TeX and LaTeX, the roff-family, SGML/XML-based systems (e.g., HTML) that
- process some kind of text and generate indexing information. The kernel
- system is not fixed to any specific system, but can be configured to work
- together with such systems.
-
- In comparison to other index processors xindy has several powerful features
- that make it an ideal framework for describing and generating complex
- indices, addressing especially international indexing. Have a look at
- xindy's Overview that describes its most important features!
- </longdescription>
-</pkgmetadata>
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
deleted file mode 100644
index fbfb484e1482..000000000000
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A Flexible Indexing System"
-HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
-SRC_URI="http://www.xindy.org/${P}.tar.gz"
-
-# The latest development is now on the TeXlive SVN.
-# The author jschrod backports it from time to time to his github repo.
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86"
-IUSE="doc"
-
-RDEPEND="virtual/latex-base
- dev-texlive/texlive-fontsrecommended
- >=dev-lisp/clisp-2.44.1-r1
- dev-texlive/texlive-langcyrillic"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex"
-
-PATCHES=("${FILESDIR}"/${P}-configure.patch
- "${FILESDIR}"/${P}-locale.patch
- "${FILESDIR}"/${P}-nogrep.patch
- "${FILESDIR}"/${P}-perl5.26.patch)
-DOCS=(AUTHORS ChangeLog.Gour NEWS README)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable doc docs)
-}
-
-src_compile() {
- VARTEXFONTS="${T}/fonts" emake
-}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 3bb3026e0888..fb4e42013ccf 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,2 +1,2 @@
-DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
-DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
+DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
+DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
diff --git a/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch b/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch
new file mode 100644
index 000000000000..fddfd2eca957
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch
@@ -0,0 +1,11 @@
+--- a/desktop/CMakeLists.txt
++++ b/desktop/CMakeLists.txt
+@@ -96,7 +96,7 @@
+ )
+ # install file
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.appdata.xml
+- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
+ COMPONENT data
+ )
+
diff --git a/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch b/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch
new file mode 100644
index 000000000000..10bca560fb03
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch
@@ -0,0 +1,10 @@
+--- a/cmake/config.h.cmake.in
++++ b/cmake/config.h.cmake.in
+@@ -63,5 +63,7 @@
+ // strcasestr
+ #cmakedefine HAVE_STRCASESTR 1
+
++// glib-2.68.0+ compatibility
++#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26)
+
+ #endif
diff --git a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
new file mode 100644
index 000000000000..8de40e28c64e
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
@@ -0,0 +1,20 @@
+--- a/cmake/XiphosDependencies.cmake
++++ b/cmake/XiphosDependencies.cmake
+@@ -84,7 +84,7 @@
+ "gdk-pixbuf-2.0"
+ "gio-2.0"
+ "gobject-2.0"
+- "libsoup-2.4"
++ "libsoup-3.0"
+ "pango"
+ "minizip"
+ "zlib"
+@@ -144,7 +144,7 @@
+ # Gtk+-3.0 + Webkit2 + GtkHtml-editor
+ pkg_check_modules(Gtk REQUIRED IMPORTED_TARGET
+ "gtk+-3.0"
+- "webkit2gtk-4.0"
++ "webkit2gtk-4.1"
+ )
+ endif()
+ endif (GTK2)
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 139d2b70ed62..e8dbfb149a17 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>theology@gentoo.org</email>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">gnomesword</remote-id>
+ <remote-id type="github">crosswire/xiphos</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
deleted file mode 100644
index c131ac2b16a7..000000000000
--- a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20170820"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-text/sword-1.7.4
- dev-libs/glib:2
- dev-libs/libxml2:2[${PYTHON_USEDEP}]
- gnome-base/gconf[${PYTHON_USEDEP}]
- gnome-extra/gtkhtml:4.0
- >=gnome-extra/libgsf-1.14
- net-libs/webkit-gtk:4
- x11-libs/gtk+:3
- dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
- app-text/docbook2X
- app-text/gnome-doc-utils[${PYTHON_USEDEP}]
- app-text/rarian
- dev-libs/libxslt[${PYTHON_USEDEP}]
- dev-util/intltool
- dev-util/glib-utils
- >=net-libs/biblesync-1.1.2-r1[-static]
- virtual/pkgconfig
- sys-devel/gettext
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed -i \
- -e '/FLAGS_DEBUG/s:-g:-Wall:' \
- -e '/FLAGS_RELEASE/s:-O2:-Wall:' \
- wscript || die
- default
-}
-
-src_configure() {
- append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
- tc-export AR CC CPP CXX RANLIB
-
- CCFLAGS="${CFLAGS}" \
- LINKFLAGS="${LDFLAGS}" \
- SGML2MAN="$(type -P docbook2man.pl)" \
- ./waf -v \
- --prefix=/usr \
- --gtk=3 \
- --enable-webkit2 \
- --debug-level=$(use debug && echo debug || echo release) \
- $(use dbus || echo --disable-dbus) \
- configure || die
-}
-
-src_compile() {
- ./waf -v build || die
-}
-
-src_install() {
- ./waf -v --destdir="${D}" install || die
-
- doman ${PN}.1
- dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
-
- dodoc Xiphos.ogg
- docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
- rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.1.0-r1.ebuild b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
deleted file mode 100644
index 355ed3f118cb..000000000000
--- a/app-text/xiphos/xiphos-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-text/sword-1.8.0
- dev-libs/glib:2
- dev-libs/libxml2:2[${PYTHON_USEDEP}]
- gnome-base/gconf[${PYTHON_USEDEP}]
- gnome-extra/gtkhtml:4.0
- >=gnome-extra/libgsf-1.14
- net-libs/webkit-gtk:4
- x11-libs/gtk+:3
- dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
- app-text/docbook2X
- app-text/gnome-doc-utils[${PYTHON_USEDEP}]
- app-text/rarian
- dev-libs/libxslt[${PYTHON_USEDEP}]
- dev-util/glib-utils
- dev-util/intltool
- >=net-libs/biblesync-1.1.2-r1[-static]
- virtual/pkgconfig
- sys-devel/gettext
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed -i \
- -e '/FLAGS_DEBUG/s:-g:-Wall:' \
- -e '/FLAGS_RELEASE/s:-O2:-Wall:' \
- wscript || die
- default
-}
-
-src_configure() {
- append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
- tc-export AR CC CPP CXX RANLIB
-
- CCFLAGS="${CFLAGS}" \
- LINKFLAGS="${LDFLAGS}" \
- SGML2MAN="$(type -P docbook2man.pl)" \
- ./waf -v \
- --prefix=/usr \
- --gtk=3 \
- --enable-webkit2 \
- --debug-level=$(use debug && echo debug || echo release) \
- $(use dbus || echo --disable-dbus) \
- configure || die
-}
-
-src_compile() {
- ./waf -v build || die
-}
-
-src_install() {
- ./waf -v --destdir="${D}" install || die
-
- doman ${PN}.1
- dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
-
- dodoc Xiphos.ogg
- docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
- rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..b7ac40476986
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="dbus debug"
+
+COMMON="sys-apps/util-linux
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dbus? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON}
+ >=app-text/sword-1.8.1
+ dev-libs/glib:2
+ dev-libs/icu
+ >=net-libs/biblesync-1.2.0
+ net-libs/webkit-gtk:4.1
+ sys-libs/zlib[minizip]
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="${COMMON}
+ app-arch/zip
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ dev-util/desktop-file-utils
+ dev-util/glib-utils
+ dev-util/itstool
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
+ "${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+ "${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
+ "${FILESDIR}"/${PN}-4.2.1-webkit41.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DDBUS=$(usex dbus)
+ -DDEBUG=$(usex debug)
+ -DPOSTINST=off
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS}; do
+ if ver_test "${rver}" -le "4.2.1"; then
+ ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+ ewarn "Studypad and the personal commentary will no longer work."
+ break
+ fi
+ done
+ fi
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch b/app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch
new file mode 100644
index 000000000000..6e286e89961b
--- /dev/null
+++ b/app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@ AM_CONFIG_HEADER(config.h)
+
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_ISC_POSIX
+
+ AC_CHECK_HEADERS(malloc.h)
diff --git a/app-text/xlhtml/metadata.xml b/app-text/xlhtml/metadata.xml
index 093eecf6e488..a29058ff024e 100644
--- a/app-text/xlhtml/metadata.xml
+++ b/app-text/xlhtml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
index eb983af44ba3..329c139ce265 100644
--- a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
+++ b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit autotools eutils
+inherit autotools vcs-clean
MY_PV=${PV/_p*/}
DEB_PR=${PV/*_p/}
@@ -13,17 +13,21 @@ HOMEPAGE="http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch
SRC_URI="
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_PR}.diff.gz"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-S=${WORKDIR}/${PN}
+PATCHES=(
+ "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PR}.diff
+ "${FILESDIR}"/${PN}-0.5.1_p6-respect-AR.patch
+)
src_prepare() {
+ default
+
ecvs_clean
- epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PR}.diff
mv configure.{in,ac} || die
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index b0b073036996..739966069752 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,2 +1 @@
-DIST xlsx2csv-0.7.3.tar.gz 201482 BLAKE2B a2268e584097777d28f2565a19d0f271cb694066e1abffffd7578ecf0271efd420af63932eaea4389c062e050da257fa2f7164c9de7cdfa4ab3fd416692e7968 SHA512 855fcce9ae6ec51c46673e085a456d2862912d0da5130fdac34d88e5612c64d2bc0674c13b3bfb6cd6b7017e513fe0924dbb594db543020842705a82b6006e8e
-DIST xlsx2csv-0.7.4.tar.gz 212472 BLAKE2B de77f4d199bd5fbb43fb4aa775aed9b36aea4c956846be42e9387b79bf76727ba457a0c54db3b4803376b82af12923f21786aa34d21542e2d6ab354be33ad3f3 SHA512 771af30dce63b64272fc8d4dccbcab2106f60a2c9d33370b4d4034a21606e5726c84d963d59e88e2aa124c60f62fd57831ca5fb442d7540474ff1d688da9aaf6
+DIST xlsx2csv-0.8.2.tar.gz 227107 BLAKE2B a140cf748d36a59e354620a8c44533acf6c9f4f0840f5e733c37a0ec4e83d4e9a8db1b0d776d4d3858038bc2871361db312d5137c52fcbe0587bf9ac921886c3 SHA512 73b034a12d96f956d3604b64de226b37d9b63e551d35d021e3cc50292fed5c84d1d5ab2bcb2fe92010d81aaa4631d9080a5f92209adae88cf6f2e072eaf0561e
diff --git a/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch b/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch
new file mode 100644
index 000000000000..f692a4931522
--- /dev/null
+++ b/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/test/run b/test/run
+index 990421c..081729d 100755
+--- a/test/run
++++ b/test/run
+@@ -5,7 +5,7 @@ import sys
+ import subprocess
+ from io import open
+
+-PYTHON_VERSIONS = ["2", "3"]
++PYTHON_VERSIONS = ["3"]
+
+ """
+ This test uses sys.stdout.
diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml
index 4b2ed89ad35a..b8a934ca23f5 100644
--- a/app-text/xlsx2csv/metadata.xml
+++ b/app-text/xlsx2csv/metadata.xml
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">xlsx2csv</remote-id>
- <remote-id type="github">dilshod/xlsx2csv</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>github@fischl-online.de</email>
+ <name>Anton Fischl</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="pypi">xlsx2csv</remote-id>
+ <remote-id type="github">dilshod/xlsx2csv</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
deleted file mode 100644
index 59143bd10f79..000000000000
--- a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Convert MS Office xlsx files to CSV"
-HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-
-python_compile_all() {
- emake -C man
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/${PN}.1
-}
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
deleted file mode 100644
index cb66033d17d4..000000000000
--- a/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-DESCRIPTION="Convert MS Office xlsx files to CSV"
-HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-
-python_compile_all() {
- emake -C man
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/${PN}.1
-}
diff --git a/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild b/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild
new file mode 100644
index 000000000000..fdd7d94e35ef
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Convert MS Office xlsx files to CSV"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=( "${FILESDIR}"/"${PN}-0.7.8-tests.patch" )
+
+python_compile_all() {
+ emake -C man
+}
+
+python_test() {
+ "${EPYTHON}" test/run || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman "man/${PN}.1"
+}
diff --git a/app-text/xml2/metadata.xml b/app-text/xml2/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/xml2/metadata.xml
+++ b/app-text/xml2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/xml2/xml2-0.5.ebuild b/app-text/xml2/xml2-0.5.ebuild
index 45dbd05bc02b..7afcc12352ec 100644
--- a/app-text/xml2/xml2-0.5.ebuild
+++ b/app-text/xml2/xml2-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format"
HOMEPAGE="http://dan.egnor.name/xml2"
@@ -10,8 +10,7 @@ SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch b/app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch
new file mode 100644
index 000000000000..17965c946abe
--- /dev/null
+++ b/app-text/xml2doc/files/xml2doc-20030510-gcc10-no-common.patch
@@ -0,0 +1,18 @@
+--- a/src/defs.h
++++ b/src/defs.h
+@@ -18,13 +18,13 @@
+
+ /* Global vars */
+
+-enum
++enum align
+ {
+ ALIGN_RIGHT,
+ ALIGN_LEFT,
+ ALIGN_JUSTIFY,
+ ALIGN_CENTER
+-} align;
++};
+
+ typedef struct
+ {
diff --git a/app-text/xml2doc/files/xml2doc-20030510-makefile.patch b/app-text/xml2doc/files/xml2doc-20030510-makefile.patch
new file mode 100644
index 000000000000..1023352d0a77
--- /dev/null
+++ b/app-text/xml2doc/files/xml2doc-20030510-makefile.patch
@@ -0,0 +1,100 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -9,19 +9,16 @@
+ DEBUG=@DEBUG@
+ PREFIX=@PREFIX@
+
+-CC=gcc
+ OBJ=main.o defs.o parse.o parse_include.o parse_info.o parse_img.o parse_t.o parse_page.o parse_default.o parse_bookmark.o parse_add.o parse_list.o parse_sep.o output_t.o output_doc.o output_img.o output_info.o output_page.o output_sep.o output_list.o parm.o
+ IPATH=-I/usr/pkg/include/libxml2 -I/usr/include/libxml2 -I. -I/usr/pkg/include -I/usr/local/include
+ LPATH=-L/usr/pkg/lib -L/usr/local/lib
+ CFLAGS+=-Wall -c $(IPATH) $(I_PDF)\
+ -DVERSION=\"$(VERSION)\" $(DEBUG)\
+- -fno-asm -funroll-all-loops -fstrength-reduce -frerun-loop-opt \
+ -x c -fshort-enums
+ LFLAGS=-lxml2 $(L_PDF) $(LPATH)
+ BIN=xml2doc
+
+-all:
+- @printf "\e[32mUse make in the parent directory :)\e[0m\n"
++all: build
+
+ install: build
+ @printf "\e[32mInstalling binaries...\e[0m\n"
+@@ -34,75 +31,49 @@
+
+ build: $(OBJ)
+ @printf "\n\e[32mLinking objects...\e[0m\n"
+- $(CC) $(LFLAGS) $(OBJ) -o $(BIN)
+- @if ( test -z "$(DEBUG)" ); then \
+- echo "Stripping symbols..."; \
+- strip -s $(BIN); \
+- fi
+- @printf "\n\n\e[32mCompilation process done.\e[0m\n"
++ $(CC) $(LDFLAGS) $(L_PDF) $^ -lxml2 -o $(BIN)
+
+ main.o: main.c main.h
+- $(CC) $(CFLAGS) main.c
+
+ parm.o: parm.c parm.h
+- $(CC) $(CFLAGS) parm.c
+
+ output_doc.o: output_doc.c output.h
+- $(CC) $(CFLAGS) output_doc.c
+
+ output_img.o: output_img.c output.h
+- $(CC) $(CFLAGS) output_img.c
+
+ output_info.o: output_info.c output.h
+- $(CC) $(CFLAGS) output_info.c
+
+ output_page.o: output_page.c output.h
+- $(CC) $(CFLAGS) output_page.c
+
+ output_sep.o: output_sep.c output.h
+- $(CC) $(CFLAGS) output_sep.c
+
+ output_list.o: output_list.c output.h
+- $(CC) $(CFLAGS) output_list.c
+
+ output_t.o: output_t.c output.h
+- $(CC) $(CFLAGS) output_t.c
+
+ parse_add.o: parse_add.c defs.h
+- $(CC) $(CFLAGS) parse_add.c
+
+ parse_sep.o: parse_sep.c defs.h
+- $(CC) $(CFLAGS) parse_sep.c
+
+ defs.o: defs.c defs.h
+- $(CC) $(CFLAGS) defs.c
+
+ parse.o: parse.c defs.h
+- $(CC) $(CFLAGS) parse.c
+
+ parse_include.o: parse_include.c defs.h
+- $(CC) $(CFLAGS) parse_include.c
+
+ parse_info.o: parse_info.c defs.h
+- $(CC) $(CFLAGS) parse_info.c
+
+ parse_img.o: parse_img.c defs.h
+- $(CC) $(CFLAGS) parse_img.c
+
+ parse_t.o: parse_t.c defs.h
+- $(CC) $(CFLAGS) parse_t.c
+
+ parse_page.o: parse_page.c defs.h
+- $(CC) $(CFLAGS) parse_page.c
+
+ parse_default.o: parse_default.c defs.h
+- $(CC) $(CFLAGS) parse_default.c
+
+ parse_bookmark.o: parse_bookmark.c defs.h
+- $(CC) $(CFLAGS) parse_bookmark.c
+
+ parse_list.o: parse_list.c defs.h
+- $(CC) $(CFLAGS) parse_list.c
+
+ clean:
+ rm -rf $(OBJ) $(BIN) *.o a.out *~ DEADJOE .*.swp *.txt *.pdf *.html *.xml
diff --git a/app-text/xml2doc/metadata.xml b/app-text/xml2doc/metadata.xml
index 6109befef74c..61aee6082a38 100644
--- a/app-text/xml2doc/metadata.xml
+++ b/app-text/xml2doc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
deleted file mode 100644
index ee66dcf4fb06..000000000000
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
-
-HOMEPAGE="http://xml2doc.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=dev-libs/libxml2-2.5"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- # Fix pointer-related bug detected by a QA notice.
- epatch "${FILESDIR}/${PN}-pointer_fix.patch"
-
- # Don't strip symbols from binary (bug #152266)
- sed -i -e '/^\s*strip/d' \
- -e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \
- -e '/^\t$(CC) $(CFLAGS) /d' \
- src/Makefile.in
-}
-
-src_configure() {
- econf --disable-pdf
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-
- cd "${S}/doc"
- "${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
-}
-
-src_install() {
- # xml2doc's make install is unfortunately broken
-
- # binary
- dobin src/xml2doc || die
-
- # documentation
- dodoc BUGS README TODO || die
- docinto examples
- dodoc examples/*.{xml,png} || die
-
- # manpage
- doman doc/xml2doc.1 || die
-}
diff --git a/app-text/xml2doc/xml2doc-20030510-r2.ebuild b/app-text/xml2doc/xml2doc-20030510-r2.ebuild
new file mode 100644
index 000000000000..471710170ee3
--- /dev/null
+++ b/app-text/xml2doc/xml2doc-20030510-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
+HOMEPAGE="http://xml2doc.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+
+DEPEND="dev-libs/libxml2:2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # Fix pointer-related bug detected by a QA notice
+ "${FILESDIR}"/${PN}-pointer_fix.patch
+ # Don't strip symbols from binary (bug #152266)
+ "${FILESDIR}"/${P}-makefile.patch
+ # Fix GCC 10 -fno-common change
+ "${FILESDIR}"/${P}-gcc10-no-common.patch
+)
+
+src_prepare() {
+ default
+
+ # Clang 16, bug #900539
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+ econf --disable-pdf
+}
+
+src_compile() {
+ default
+
+ cd doc || die
+ "${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
+}
+
+src_install() {
+ dobin src/xml2doc
+
+ einstalldocs
+ docinto examples
+ dodoc examples/*.{xml,png}
+
+ doman doc/xml2doc.1
+}
diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest
new file mode 100644
index 000000000000..33223c01b4c9
--- /dev/null
+++ b/app-text/xml2rfc/Manifest
@@ -0,0 +1,2 @@
+DIST xml2rfc-3.17.4.gh.tar.gz 2858770 BLAKE2B b29b8a102668a5aa943a32b28a9d1669e2a6b0af03085a550c21a08e5bfb5ff3ee8979b03a3d7ae8e820ac8bf60455682914fd06a882e17183ca51aaf1dedf86 SHA512 3fc620eed12fc2a7f6015df8b6a5b1aa422cd8c26807e01d75498aee9257faad1bca68606f77598fb040a8dae074e35ffa0e2994a1ae8d59ee27d25fc6a755e5
+DIST xml2rfc-3.18.0.gh.tar.gz 2856552 BLAKE2B b2397d10c770694e8eb354220803f89525e64638fd1043c2672ce0849be72a397ab6f2bff03f689721f00e63ac034ec7b7aec20cf93b759f42a415ab66293908 SHA512 afd88bad84c6f5b734dd091e34ec41bff63fcf38f3bfab777818954dec31363300e13dd745b602e2c145fbe0df0be4e69918ddc71aac276bf0833ad4563c19f1
diff --git a/app-text/xml2rfc/metadata.xml b/app-text/xml2rfc/metadata.xml
new file mode 100644
index 000000000000..53c1b948fa53
--- /dev/null
+++ b/app-text/xml2rfc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">xml2rfc</remote-id>
+ <remote-id type="github">ietf-tools/xml2rfc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/xml2rfc/xml2rfc-3.17.4.ebuild b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild
new file mode 100644
index 000000000000..4e0aa2aed4e5
--- /dev/null
+++ b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generates RFCs and IETF drafts from document source in XML"
+HOMEPAGE="https://ietf-tools.github.io/xml2rfc/ https://github.com/ietf-tools/xml2rfc"
+SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="
+ test? (
+ >=dev-python/pypdf-3.2.1[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/dict2xml[${PYTHON_USEDEP}]
+ dev-python/weasyprint[${PYTHON_USEDEP}]
+ media-fonts/noto[cjk]
+ )
+"
+
+RDEPEND="
+ >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}]
+ dev-python/ConfigArgParse[${PYTHON_USEDEP}]
+ dev-python/intervaltree[${PYTHON_USEDEP}]
+ >=dev-python/google-i18n-address-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ default
+ # Disable broken PdfWriterTests.
+ sed -i 's/ PdfWriterTests(unittest.TestCase):/ PdfWriterTests:/' test.py || die
+}
diff --git a/app-text/xml2rfc/xml2rfc-3.18.0.ebuild b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild
new file mode 100644
index 000000000000..4e0aa2aed4e5
--- /dev/null
+++ b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generates RFCs and IETF drafts from document source in XML"
+HOMEPAGE="https://ietf-tools.github.io/xml2rfc/ https://github.com/ietf-tools/xml2rfc"
+SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="
+ test? (
+ >=dev-python/pypdf-3.2.1[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/dict2xml[${PYTHON_USEDEP}]
+ dev-python/weasyprint[${PYTHON_USEDEP}]
+ media-fonts/noto[cjk]
+ )
+"
+
+RDEPEND="
+ >=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}]
+ dev-python/ConfigArgParse[${PYTHON_USEDEP}]
+ dev-python/intervaltree[${PYTHON_USEDEP}]
+ >=dev-python/google-i18n-address-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ default
+ # Disable broken PdfWriterTests.
+ sed -i 's/ PdfWriterTests(unittest.TestCase):/ PdfWriterTests:/' test.py || die
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index efbfe9d10446..8913a6b305b1 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,2 +1,2 @@
-DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
-DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
+DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
+DIST xmldiff-2.6.3.tar.gz 86132 BLAKE2B 9e5777f498677bf12a603d6636833d4942fb1af2c461e9a60e2dccf89c3776f72018407928991c8a9f53abe8c704ca9a736a4f0f81ce3ca23e1657a896d43804 SHA512 ba25b8cc9866c66bc829a82d1f20108c17a09e2f46735763317f7fd6f60c3920ba6d3114454ead1461de4a59c177065291bb71bebb7ee9c4a03f3584452a9e33
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index 14c1b6f3de84..ca7003827fef 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
A python tool that figures out the differences between two
similar XML files, in the same way the diff utility does.
- Xmldiff was initially developed for the Narval project and could also be
- used as a library or as a command line tool. It can work either with XML
- files or DOM trees.
+ Xmldiff was initially developed for the Narval project and can
+ be used as a library or as a command line tool. It can work either
+ with XML files or DOM trees.
</longdescription>
<upstream>
+ <doc>https://xmldiff.readthedocs.io</doc>
<remote-id type="github">Shoobx/xmldiff</remote-id>
+ <remote-id type="pypi">xmldiff</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
deleted file mode 100644
index 7f33b19bd77d..000000000000
--- a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
-SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE=""
-
-DOCS=( ChangeLog README README.xmlrev TODO )
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
deleted file mode 100644
index c0248ef5c884..000000000000
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
-SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/future
- dev-python/lxml
- dev-python/six"
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst TODO.rst )
diff --git a/app-text/xmldiff/xmldiff-2.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild
new file mode 100644
index 000000000000..8b5eb94577e0
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="https://github.com/Shoobx/xmldiff"
+SRC_URI="https://github.com/Shoobx/xmldiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+DOCS=( CHANGES.rst README.rst )
diff --git a/app-text/xmldiff/xmldiff-2.6.3.ebuild b/app-text/xmldiff/xmldiff-2.6.3.ebuild
new file mode 100644
index 000000000000..9814f09052d0
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-2.6.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="
+ https://github.com/Shoobx/xmldiff
+ https://pypi.org/project/xmldiff/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
+
+RDEPEND="
+ >=dev-python/lxml-3.1.0[${PYTHON_USEDEP}]
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
diff --git a/app-text/xmlformat/metadata.xml b/app-text/xmlformat/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-text/xmlformat/metadata.xml
+++ b/app-text/xmlformat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild
index b91035f55bd4..6abdd5883fc8 100644
--- a/app-text/xmlformat/xmlformat-1.04.ebuild
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -1,30 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit ruby-single
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+inherit edo ruby-single
DESCRIPTION="Reformat XML documents to your custom style"
SRC_URI="http://www.kitebird.com/software/${PN}/${P}.tar.gz"
HOMEPAGE="http://www.kitebird.com/software/xmlformat/"
-SLOT="0"
LICENSE="xmlformat"
+SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc ruby"
-DEPEND="ruby? ( ${RUBY_DEPS} )
- !ruby? ( dev-lang/perl )"
-RDEPEND=${DEPEND}
-IUSE="ruby doc"
+DEPEND="
+ dev-lang/perl
+ ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ # Perl is always installed, so we may as well always test both.
+ if use ruby; then
+ nonfatal edo ./runtest all || die "runtest for ruby failed"
+ fi
+
+ nonfatal edo ./runtest -p all || die "runtest for perl failed"
+}
src_install() {
dobin xmlformat.pl
- if use ruby
- then
+ if use ruby; then
dobin xmlformat.rb
dosym xmlformat.rb /usr/bin/xmlformat
else
@@ -33,19 +42,8 @@ src_install() {
dodoc BUGS ChangeLog README TODO
- if use doc
- then
+ if use doc; then
# APIs
- insinto /usr/share/doc/${PF}
- doins -r docs/*
- fi
-}
-
-src_test() {
- if use ruby
- then
- ./runtest all || die "runtest for ruby failed."
- else
- ./runtest -p all || die "runtest for perl failed."
+ dodoc -r docs/*
fi
}
diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch
new file mode 100644
index 000000000000..fda631611216
--- /dev/null
+++ b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang16.patch
@@ -0,0 +1,32 @@
+From d01c3e8a488282bc8bc2fae5bd21efc6c3931a32 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 18 Jan 2023 14:50:08 -0800
+Subject: [PATCH] Fix hash_key_put() signature
+
+Fixes
+
+../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types]
+ xmlHashScan(uniq, hash_key_put, &lines);
+ ^~~~~~~~~~~~
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/xml_elem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xml_elem.c b/src/xml_elem.c
+index 024e62a..a73038a 100644
+--- a/src/xml_elem.c
++++ b/src/xml_elem.c
+@@ -186,7 +186,7 @@ typedef struct {
+ * put @name into @data->array[@data->offset]
+ */
+ static void
+-hash_key_put(void *payload, void *data, xmlChar *name)
++hash_key_put(void *payload, void *data, const xmlChar *name)
+ {
+ ArrayDest *dest = data;
+ dest->array[dest->offset++] = name;
+--
+2.40.1
+
diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch
new file mode 100644
index 000000000000..9269349726d5
--- /dev/null
+++ b/app-text/xmlstarlet/files/xmlstarlet-1.6.1-clang17.patch
@@ -0,0 +1,59 @@
+From e1da090da24f5620784daf853eb1353aa164583f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 27 Mar 2024 23:25:39 +0100
+Subject: [PATCH] Address -Wincompatible-function-pointer-types for Clang 17
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Also showed with -Werror=incompatible-pointer-types with GCC.
+
+Bug: https://bugs.gentoo.org/927838
+
+Symptom with GCC was:
+> src/xml.c: In function ‘main’:
+> src/xml.c:300:43: error: passing argument 2 of ‘xmlSetStructuredErrorFunc’ from incompatible pointer type [-Werror=incompatible-pointer-types]
+> 300 | xmlSetStructuredErrorFunc(&errorInfo, reportError);
+> | ^~~~~~~~~~~
+> | |
+> | void (*)(void *, xmlError *) {aka void (*)(void *, struct _xmlError *)}
+> In file included from /usr/include/libxml2/libxml/valid.h:15,
+> from /usr/include/libxml2/libxml/parser.h:19,
+> from /usr/include/libxml2/libxml/tree.h:17,
+> from /usr/include/libxslt/xslt.h:13,
+> from src/xml.c:37:
+> /usr/include/libxml2/libxml/xmlerror.h:898:57: note: expected ‘xmlStructuredErrorFunc’ {aka ‘void (*)(void *, const struct _xmlError *)’} but argument is of type ‘void (*)(void *, xmlError *)’ {aka ‘void (*)(void *, struct _xmlError *)’}
+---
+ src/xml.c | 2 +-
+ src/xmlstar.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xml.c b/src/xml.c
+index cf47cc2..e6f19c1 100644
+--- a/src/xml.c
++++ b/src/xml.c
+@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) {
+ /* by default all errors are reported */
+ static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE };
+
+-void reportError(void *ptr, xmlErrorPtr error)
++void reportError(void *ptr, const xmlError *error)
+ {
+ ErrorInfo *errorInfo = (ErrorInfo*) ptr;
+ assert(errorInfo);
+diff --git a/src/xmlstar.h b/src/xmlstar.h
+index 3e1eed3..e8d7177 100644
+--- a/src/xmlstar.h
++++ b/src/xmlstar.h
+@@ -32,7 +32,7 @@ typedef struct _errorInfo {
+ ErrorStop stop;
+ } ErrorInfo;
+
+-void reportError(void *ptr, xmlErrorPtr error);
++void reportError(void *ptr, const xmlError *error);
+ void suppressErrors(void);
+
+ typedef struct _gOptions {
+--
+2.44.0
+
diff --git a/app-text/xmlstarlet/metadata.xml b/app-text/xmlstarlet/metadata.xml
index 191767272026..0d4da1d9219d 100644
--- a/app-text/xmlstarlet/metadata.xml
+++ b/app-text/xmlstarlet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..a508a3ef094f
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
+HOMEPAGE="https://xmlstar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/libgcrypt:0=
+ virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ # We need to patch use of /usr/lib because it is a problem with
+ # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
+ # The grep sandwich acts as a regression test so that a future
+ # version bump cannot break patching without noticing.
+ if [[ $(get_libdir) != lib ]]; then
+ grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+ sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+ grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
+
+ # NOTE: Fully built documentation is already shipped with the tarball:
+ # - doc/xmlstarlet-ug.{pdf,ps,html}
+ # - doc/xmlstarlet.txt
+ # - doc/xmlstarlet.1
+ econf \
+ --disable-build-docs \
+ --disable-static-libs
+}
+
+src_install() {
+ default
+ dosym xml /usr/bin/xmlstarlet
+}
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..8d84085ae390
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
+HOMEPAGE="https://xmlstar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/libgcrypt:0=
+ virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-clang16.patch
+ "${FILESDIR}"/${PN}-1.6.1-clang17.patch
+)
+
+src_prepare() {
+ default
+
+ # We need to patch use of /usr/lib because it is a problem with
+ # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
+ # The grep sandwich acts as a regression test so that a future
+ # version bump cannot break patching without noticing.
+ if [[ $(get_libdir) != lib ]]; then
+ grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+ sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+ grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
+
+ # NOTE: Fully built documentation is already shipped with the tarball:
+ # - doc/xmlstarlet-ug.{pdf,ps,html}
+ # - doc/xmlstarlet.txt
+ # - doc/xmlstarlet.1
+ econf \
+ --disable-build-docs \
+ --disable-static-libs
+}
+
+src_install() {
+ default
+ dosym xml /usr/bin/xmlstarlet
+}
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 96f6d174f1ce..38978c303d6c 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,39 +1,55 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
-HOMEPAGE="http://xmlstar.sourceforge.net/"
+HOMEPAGE="https://xmlstar.sourceforge.net/"
SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-RDEPEND=">=dev-libs/libxml2-2.6.27
- >=dev-libs/libxslt-1.1.9
- dev-libs/libgcrypt:0
+RDEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/libgcrypt:0=
virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
-DEPEND="${RDEPEND}
- sys-apps/sed"
+ # We need to patch use of /usr/lib because it is a problem with
+ # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
+ # The grep sandwich acts as a regression test so that a future
+ # version bump cannot break patching without noticing.
+ if [[ $(get_libdir) != lib ]]; then
+ grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+ sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+ grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+ fi
+
+ eautoreconf
+}
src_configure() {
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
+
# NOTE: Fully built documentation is already shipped with the tarball:
# - doc/xmlstarlet-ug.{pdf,ps,html}
# - doc/xmlstarlet.txt
# - doc/xmlstarlet.1
econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
--disable-build-docs \
- --disable-static-libs \
- --disable-silent-rules
+ --disable-static-libs
}
src_install() {
default
-
dosym xml /usr/bin/xmlstarlet
}
diff --git a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
new file mode 100644
index 000000000000..b35b492d9120
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/679626
+Thanks-to: dolphinling
+--- a/configure.in
++++ b/configure.in
+@@ -100,8 +100,8 @@ dnl
+ AC_ARG_VAR([LYNX], [Name and path of the `lynx' browser.])
+ AC_PATH_PROG([LYNX], [lynx], [lynx])
+
+-AC_ARG_VAR([LINKS], [Name and path of the `elinks' browser.])
+-AC_PATH_PROG([LINKS], [elinks], [elinks])
++AC_ARG_VAR([LINKS], [Name and path of the `links/elinks' browser.])
++AC_PATH_PROGS([LINKS], [links elinks], [links])
+
+ AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.])
+ AC_PATH_PROG([W3M], [w3m], [w3m])
diff --git a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
new file mode 100644
index 000000000000..7137966b27d2
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch
@@ -0,0 +1,37 @@
+(See https://bugs.gentoo.org/828520 too)
+
+From: Sam James <sam@gentoo.org>
+Date: Wed, 10 Nov 2021 04:53:33 +0000
+Subject: [PATCH] Don't hardcode paths to utilities
+
+The path to e.g. links at build time is not necessarily
+the same as the path at runtime.
+
+TODO: Could chop out the checks from configure but
+this package is fragile enough. Leaving it for now.
+--- a/xmlto.in
++++ b/xmlto.in
+@@ -272,13 +272,13 @@ then
+ USE_BACKEND=DEFAULT
+ fi
+
+-LINKS_PATH=@LINKS@
+-W3M_PATH=@W3M@
+-LYNX_PATH=@LYNX@
+-GCP_PATH=@GCP@
+-SED_PATH=@SED@
+-GREP_PATH=@GREP@
+-ZIP_PATH=@ZIP@
++LINKS_PATH=$(command -v elinks || command -v links)
++W3M_PATH=$(command -v w3m)
++LYNX_PATH=$(command -v lynx)
++GCP_PATH=$(command -v cp)
++SED_PATH=$(command -v sed)
++GREP_PATH=$(command -v grep)
++ZIP_PATH=$(command -v zip)
+
+ # Process any options
+ ARGS=$(${GETOPT} \
+--
+2.33.1
+
diff --git a/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch b/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch
new file mode 100644
index 000000000000..b90eea1f42df
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch
@@ -0,0 +1,116 @@
+https://bugs.gentoo.org/869080
+
+https://pagure.io/xmlto/c/1375e2df75530cd198bd16ac3de38e2b0d126276?branch=master
+https://pagure.io/xmlto/c/412f97cdc00d2bbf7e8121012b49fc07b3fe3d2b?branch=master
+https://pagure.io/xmlto/c/8e34f087bf410bcc5fe445933d6ad9bae54f24b5?branch=master
+https://pagure.io/xmlto/c/6fa6a0e07644f20abf2596f78a60112713e11cbe?branch=master
+
+From 1375e2df75530cd198bd16ac3de38e2b0d126276 Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 20:45:45 +0000
+Subject: fix -Wimplicit-int for ifsense
+
+
+fixes:
+xmlif/xmlif.l:46:8: warning: type defaults to ‘int’ in declaration of ‘ifsense’ [-Wimplicit-int]
+ 46 | static ifsense; /* sense of last `if' or unless seen */
+ | ^~~~~~~
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -43,7 +43,7 @@
+
+ static char **selections; /* selection tokens */
+ static int nselections; /* number of selections */
+-static ifsense; /* sense of last `if' or unless seen */
++static int ifsense; /* sense of last `if' or unless seen */
+ static char *attribute; /* last attribute scanned */
+
+ struct stack_t {
+
+
+From 412f97cdc00d2bbf7e8121012b49fc07b3fe3d2b Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 20:45:59 +0000
+Subject: fix extra ‘;’ outside of a function
+
+
+Fixes:
+xmlif/xmlif.l:240:24: warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]
+ 240 | int yywrap() {exit(0);};
+ | ^
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -237,7 +237,7 @@ WS [ \t\n]*
+
+ #include "config.h"
+
+-int yywrap() {exit(0);};
++int yywrap() {exit(0);}
+
+ main(int argc, char *argv[])
+ {
+
+
+From 8e34f087bf410bcc5fe445933d6ad9bae54f24b5 Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 20:56:00 +0000
+Subject: Fix return type of main function
+
+
+Fixes:
+xmlif/xmlif.l:242:1: warning: return type defaults to ‘int’ [-Wimplicit-int]
+ 242 | main(int argc, char *argv[])
+ | ^~~~
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -239,7 +239,7 @@ WS [ \t\n]*
+
+ int yywrap() {exit(0);}
+
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+ int i;
+
+@@ -265,7 +265,7 @@ main(int argc, char *argv[])
+ exit(1);
+ }
+
+- yylex();
++ return yylex();
+ }
+
+ /*
+
+From 6fa6a0e07644f20abf2596f78a60112713e11cbe Mon Sep 17 00:00:00 2001
+From: Thomas Kuehne <thomas@kuehne.cn>
+Date: Dec 11 2021 21:03:42 +0000
+Subject: add strings.h import
+
+
+Fixes:
+xmlif/xmlif.l:162:13: warning: implicit declaration of function ‘strncasecmp’; did you mean ‘strncmp’? [-Wimplicit-function-declaration]
+ 162 | if (strncasecmp(selections[i], attr, eqoffset) == 0)
+ | ^~~~~~~~~~~
+
+Signed-off-by: Thomas Kuehne <thomas@kuehne.cn>
+
+--- a/xmlif/xmlif.l
++++ b/xmlif/xmlif.l
+@@ -37,6 +37,7 @@
+ */
+ #include <string.h>
+ #include <stdlib.h>
++#include <strings.h>
+
+ #define TRUE 1
+ #define FALSE 0
diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
index a6f3fe89fa47..b1da74ae66b7 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="text">Support conversion from XML to plain text</flag>
-</use>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <use>
+ <flag name="text">Support conversion from XML to plain text</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
deleted file mode 100644
index 84a3540260aa..000000000000
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="latex text"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
- app-text/docbook-xml-dtd:4.2
- app-shells/bash:0
- dev-libs/libxslt
- sys-apps/sed
- || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
- || ( sys-apps/util-linux app-misc/getopt )
- || ( sys-apps/which sys-freebsd/freebsd-ubin )
- text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) )
- latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
-# We only depend on flex when we patch the imput lexer.
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-
- # fix symbol clash on Solaris
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
- fi
-}
-
-src_configure() {
- # We don't want the script to detect /bin/sh if it is bash.
- export ac_cv_path_BASH=${BASH}
- has_version sys-apps/util-linux || export GETOPT=getopt-long
- econf
-}
diff --git a/app-text/xmlto/xmlto-0.0.28-r11.ebuild b/app-text/xmlto/xmlto-0.0.28-r11.ebuild
new file mode 100644
index 000000000000..bf44cdb5d846
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="latex text"
+
+RDEPEND="
+ app-shells/bash:0
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ || ( sys-apps/util-linux app-misc/getopt )
+ text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
+ latex? ( dev-texlive/texlive-formatsextra )
+"
+DEPEND="${RDEPEND}"
+# We only depend on lex when we patch the input lexer.
+# We touch it in fix-warnings.patch.
+BDEPEND="app-alternatives/lex"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+ "${FILESDIR}"/${PN}-0.0.28-allow-links.patch
+ "${FILESDIR}"/${P}-dont-hardcode-paths.patch
+ "${FILESDIR}"/${P}-fix-warnings.patch
+)
+
+src_prepare() {
+ default
+
+ # fix symbol clash on Solaris
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ has_version sys-apps/util-linux || export GETOPT=getopt-long
+
+ local args=(
+ # Ensure we always get a #!/bin/bash shebang in xmlto, bug 912286
+ BASH="${EPREFIX}/bin/bash"
+ )
+
+ econf "${args[@]}"
+}
diff --git a/app-text/xmltoman/Manifest b/app-text/xmltoman/Manifest
new file mode 100644
index 000000000000..cc8d650c97d7
--- /dev/null
+++ b/app-text/xmltoman/Manifest
@@ -0,0 +1,2 @@
+DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
+DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d
diff --git a/app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch b/app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch
new file mode 100644
index 000000000000..a902ddd07b84
--- /dev/null
+++ b/app-text/xmltoman/files/xmltoman-0.6-generate-man-pages.patch
@@ -0,0 +1,55 @@
+From 39553c816cb8a18d798a6f947d2901f7a3228439 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 29 Oct 2022 18:02:25 +0100
+Subject: [PATCH] Generate man pages
+
+Generate the man pages so that the tool doesn't have to run itself
+during installation. It's a hack to workaround Perl upgrade problems.
+--- /dev/null
++++ b/xmlmantohtml.1
+@@ -0,0 +1,18 @@
++.TH xmlmantohtml 1 User Manuals
++.SH NAME
++xmlmantohtml \- xml to html converter
++.SH SYNOPSIS
++\fBxmlmantohtml \fIfile.1.xml\fB > file.1.html
++\f1
++.SH DESCRIPTION
++xmlmantohtml is a small script to convert XML/MAN(GROFF) to HTML.
++
++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate HTML using \fBxsltproc(1)\f1.
++.SH AUTHOR
++xmltoman was written by Oliver Kurth <oku@masqmail.cx>
++.SH MAINTAINER
++xmltoman is currently maintained by Adam Bilbrough
++.SH SEE ALSO
++\fBxmlmantohtml(1)\f1
++.SH COMMENTS
++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer.
+--- /dev/null
++++ b/xmltoman.1
+@@ -0,0 +1,24 @@
++.TH xmltoman 1 User Manuals
++.SH NAME
++xmltoman \- xml to man converter
++.SH SYNOPSIS
++\fBxmltoman \fIfile.1.xml\fB > file.1
++\f1
++.SH DESCRIPTION
++xmltoman is a small script to convert XML to a MAN page in GROFF format. It features the usual man page items such a description, options, see also etc. The XML format also supports converting to HTML pages.
++
++You will find the DTD in \fI/usr/share/xmltoman/\f1 on a Debian GNU/Linux system. There is also an XSL file to generate html using \fBxsltproc(1)\f1.
++.SH FILES
++\fI/usr/share/xmltoman/xmltoman.dtd\f1 the DTD file.
++
++\fI/usr/share/xmltoman/xmltoman.xsl\f1 XSLT stylesheet to generate HTML.
++
++\fI/usr/share/xmltoman/xmltoman.css\f1 stylesheet to be used for HTML.
++.SH AUTHOR
++xmltoman was written by Oliver Kurth <oku@masqmail.cx>
++.SH MAINTAINER
++xmltoman is currently maintained by Adam Bilbrough
++.SH SEE ALSO
++\fBxmlmantohtml(1)\f1
++.SH COMMENTS
++This man page was written using \fBxmltoman(1)\f1 by the same author and / or maintainer.
diff --git a/app-text/xmltoman/metadata.xml b/app-text/xmltoman/metadata.xml
new file mode 100644
index 000000000000..cdc9d054966e
--- /dev/null
+++ b/app-text/xmltoman/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="sourceforge">xmltoman</remote-id>
+ <remote-id type="github">atsb/xmltoman</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/xmltoman/xmltoman-0.4-r2.ebuild b/app-text/xmltoman/xmltoman-0.4-r2.ebuild
new file mode 100644
index 000000000000..2364778f118c
--- /dev/null
+++ b/app-text/xmltoman/xmltoman-0.4-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple scripts for converting xml to groff or html"
+HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+ dev-lang/perl
+ dev-perl/XML-Parser"
+BDEPEND="${RDEPEND}"
+
+src_install() {
+ # 'make install' requires GNU install, upstream is dead and carrying
+ # a patch is more space than redoing it here
+ dobin xmltoman xmlmantohtml
+
+ insinto /usr/share/xmltoman
+ doins xmltoman.{css,dtd,xsl}
+
+ dodoc README
+ doman xmltoman.1 xmlmantohtml.1
+}
diff --git a/app-text/xmltoman/xmltoman-0.6.ebuild b/app-text/xmltoman/xmltoman-0.6.ebuild
new file mode 100644
index 000000000000..2ae15fdeec2d
--- /dev/null
+++ b/app-text/xmltoman/xmltoman-0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Simple scripts for converting xml to groff or html"
+HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
+SRC_URI="https://github.com/atsb/xmltoman/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+ dev-lang/perl
+ dev-perl/XML-Parser
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-generate-man-pages.patch
+)
+
+src_install() {
+ # 'make install' requires GNU install, upstream is dead and carrying
+ # a patch is more space than redoing it here
+ dobin xmltoman xmlmantohtml
+
+ insinto /usr/share/xmltoman
+ doins xmltoman.{css,dtd,xsl}
+
+ dodoc README
+ doman xmltoman.1 xmlmantohtml.1
+}
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 7614a521a7a8..344abfe8cf11 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,2 +1 @@
DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
-DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
diff --git a/app-text/xournal/files/xournal-0.4.8-c99-fix.patch b/app-text/xournal/files/xournal-0.4.8-c99-fix.patch
new file mode 100644
index 000000000000..ee3689cddd70
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.8-c99-fix.patch
@@ -0,0 +1,89 @@
+Bug: https://bugs.gentoo.org/875158
+
+Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-1.patch
+Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-2.patch
+Author: Denis Auroux <auroux@users.sourceforge.net>
+Date: Sun Jan 24 15:48:16 2021 -0500
+
+ Fix implicit function declarations by including config.h in ttsubset/*.c
+
+--- a/src/ttsubset/list.c
++++ b/src/ttsubset/list.c
+@@ -33,7 +33,7 @@
+ *
+ */
+
+-/* $Id$ */
++/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */
+ /* @(#)list.c 1.7 03/02/06 SMI */
+
+ /*
+@@ -44,6 +44,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <stdlib.h>
+ #include <assert.h>
+ #ifdef MALLOC_TRACE
+--- a/src/ttsubset/sft.c
++++ b/src/ttsubset/sft.c
+@@ -33,7 +33,7 @@
+ *
+ */
+
+-/* $Id$ */
++/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */
+ /* @(#)sft.c 1.17 03/01/08 SMI */
+
+ /*
+@@ -43,6 +43,10 @@
+ * @version 1.0
+ */
+
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/ttsubset/ttcr.c
++++ b/src/ttsubset/ttcr.c
+@@ -33,7 +33,7 @@
+ *
+ */
+
+-/* $Id$ */
++/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */
+ /* @(#)ttcr.c 1.7 03/01/08 SMI */
+
+ /*
+@@ -44,6 +44,10 @@
+ *
+ */
+
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+
+Add missing include directives for make_dashed, set_cursor_busy.
+
+--- a/src/xo-image.c
++++ b/src/xo-image.c
+@@ -25,6 +25,8 @@
+ #include "xo-support.h"
+ #include "xo-image.h"
+ #include "xo-misc.h"
++#include "xo-selection.h"
++#include "xo-paint.h"
+
+ // create pixbuf from buffer, or return NULL on failure
+ GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen)
diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml
index 125eb5b19afe..d7d5af0839e1 100644
--- a/app-text/xournal/metadata.xml
+++ b/app-text/xournal/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
deleted file mode 100644
index 69d6ceebd250..000000000000
--- a/app-text/xournal/xournal-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG=no
-
-[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
-
-inherit gnome2
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
- unset SRC_URI
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+pdf vanilla"
-
-COMMONDEPEND="
- app-text/poppler[cairo]
- dev-libs/atk
- dev-libs/glib
- gnome-base/libgnomecanvas
- media-libs/freetype
- media-libs/fontconfig
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/pango
-"
-RDEPEND="${COMMONDEPEND}
- pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- default_src_prepare
- if ! use vanilla; then
- epatch "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" desktop-install
-
- dodoc ChangeLog AUTHORS README
- dohtml -r html-doc/*
-}
diff --git a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild
new file mode 100644
index 000000000000..74e8cde97c95
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
+inherit gnome2
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+ unset SRC_URI
+else
+ KEYWORDS="amd64 ~ppc64 ~x86"
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pdf vanilla"
+
+DEPEND="
+ app-text/poppler[cairo]
+ dev-libs/atk
+ dev-libs/glib
+ gnome-base/libgnomecanvas
+ media-libs/freetype
+ media-libs/fontconfig
+ sys-libs/zlib
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango
+"
+RDEPEND="
+ ${DEPEND}
+ pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-0.4.8-c99-fix.patch
+)
+
+src_prepare() {
+ default
+
+ if ! use vanilla; then
+ eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install desktop-install
+
+ dodoc ChangeLog AUTHORS README
+ dodoc -r html-doc/*
+}
diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild
deleted file mode 100644
index 50477f8a4537..000000000000
--- a/app-text/xournal/xournal-0.4.8.2016.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
-
-inherit gnome2
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
- unset SRC_URI
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+pdf vanilla"
-
-COMMONDEPEND="
- app-text/poppler[cairo]
- dev-libs/atk
- dev-libs/glib
- gnome-base/libgnomecanvas
- media-libs/freetype
- media-libs/fontconfig
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/pango
-"
-RDEPEND="${COMMONDEPEND}
- pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- default_src_prepare
- if ! use vanilla; then
- eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" desktop-install
-
- dodoc ChangeLog AUTHORS README
- dodoc -r html-doc/*
-}
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
deleted file mode 100644
index 1e879f6a6f85..000000000000
--- a/app-text/xournal/xournal-0.4.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG=no
-
-[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
-
-inherit gnome2
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
- unset SRC_URI
-else
- KEYWORDS="amd64 x86"
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
-HOMEPAGE="http://xournal.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+pdf"
-
-COMMONDEPEND="
- app-text/poppler[cairo]
- dev-libs/atk
- dev-libs/glib
- gnome-base/libgnomecanvas
- media-libs/freetype
- media-libs/fontconfig
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/pango
-"
-RDEPEND="${COMMONDEPEND}
- pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
-"
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" desktop-install
-
- dodoc ChangeLog AUTHORS README
- dohtml -r html-doc/*
-}
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
index 5afafb130f7e..d7fc7a1b87ab 100644
--- a/app-text/xournal/xournal-9999.ebuild
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
unset SRC_URI
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
fi
@@ -21,9 +21,9 @@ HOMEPAGE="http://xournal.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+pdf"
+IUSE="+pdf vanilla"
-COMMONDEPEND="
+DEPEND="
app-text/poppler[cairo]
dev-libs/atk
dev-libs/glib
@@ -36,16 +36,23 @@ COMMONDEPEND="
x11-libs/gtk+:2
x11-libs/pango
"
-RDEPEND="${COMMONDEPEND}
+RDEPEND="
+ ${DEPEND}
pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
-src_install() {
+src_prepare() {
default
- emake DESTDIR="${D}" desktop-install
+ if ! use vanilla; then
+ eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install desktop-install
+
+ dodoc ChangeLog AUTHORS README
dodoc -r html-doc/*
}
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
new file mode 100644
index 000000000000..5a40251ff5b3
--- /dev/null
+++ b/app-text/xournalpp/Manifest
@@ -0,0 +1,2 @@
+DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d
+DIST xournalpp-1.2.3.tgz 16708613 BLAKE2B f631ec686846e3c00428f050c5ff5d72ebb51b5bfbb1e81b22bcf9416bedb8507c887d6f68d6031945ff107bbd82dfca6c5d4c2430943c17b1c0e9d55d288f73 SHA512 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
new file mode 100644
index 000000000000..dc3ecca1bad0
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
@@ -0,0 +1,53 @@
+From 91319980ebddf80f797118fd67bf95b509b31725 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:05:39 +0100
+Subject: [PATCH 2/2] Do not compress manpages, this is done by the package
+ manager
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ man/CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 499d9297..974aea4b 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -9,27 +9,23 @@ mark_as_advanced(HELP2MAN)
+ if (HELP2MAN)
+ set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff")
+ set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1")
+- set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz")
+
+ add_custom_command(
+- OUTPUT ${MAN_FILE}
++ OUTPUT ${MAN_PAGE}
+ COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/src/xournalpp
+- COMMAND gzip -n -f -9 ${MAN_PAGE}
+ DEPENDS ${CMAKE_BINARY_DIR}/src/xournalpp
+ )
+
+ set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1")
+- set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz")
+
+ add_custom_command(
+- OUTPUT ${MAN_FILE_THUMBNAILER}
++ OUTPUT ${MAN_PAGE_THUMBNAILER}
+ COMMAND ${HELP2MAN} --no-info --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+- COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER}
+ DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+ )
+
+- add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER})
+- install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1")
++ add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER})
++ install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1")
+ else(HELP2MAN)
+ message("help2man is missing; no man pages will be generated")
+ endif(HELP2MAN)
+--
+2.34.1
+
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
new file mode 100644
index 000000000000..0698bc443fda
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
@@ -0,0 +1,31 @@
+From 9686113b760cf5838a63ba6bee438ec3b7ab99e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:01:17 +0100
+Subject: [PATCH 1/2] Do not explicitly strip the thumbnailer (why?)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ src/xoj-preview-extractor/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
+index 50d1b410..b653d983 100644
+--- a/src/xoj-preview-extractor/CMakeLists.txt
++++ b/src/xoj-preview-extractor/CMakeLists.txt
+@@ -41,10 +41,6 @@ target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS
+
+ set (THUMBNAILER_BIN "xournalpp-thumbnailer")
+
+-add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD
+- COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+-)
+-
+ ## Install ##
+
+ install (TARGETS xournalpp-thumbnailer
+--
+2.34.1
+
diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch
new file mode 100644
index 000000000000..97f7fbc0d7f2
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/894720
+https://bugs.gentoo.org/895536
+--- a/src/view/background/BackgroundConfig.h
++++ b/src/view/background/BackgroundConfig.h
+@@ -11,6 +11,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <map>
+ #include <string>
+
diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch
new file mode 100644
index 000000000000..c53b63588c43
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -148,9 +148,9 @@ if (ENABLE_CPPUNIT)
+ endif (ENABLE_CPPUNIT)
+
+ # Plugins / scripting
+-find_package (Lua 5.3 EXACT)
++find_package (Lua ${LUA_VERSION} EXACT)
+ if (NOT Lua_FOUND)
+- find_package (Lua 5.3) # Lua 5.4 is only supported with cmake >=3.18
++ find_package (Lua ${LUA_VERSION}) # Lua 5.4 is only supported with cmake >=3.18
+ endif()
+
+ if (Lua_FOUND)
diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch
new file mode 100644
index 000000000000..89784b96354f
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 453695c0..900c6cc3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,7 +146,7 @@ find_package(ZLIB REQUIRED)
+ find_package(Threads REQUIRED)
+
+ option(ENABLE_PLUGINS "Compile with plugin support" ON)
+-find_package(Lua) # Lua 5.4 is only supported with cmake >=3.18
++find_package(Lua ${LUA_VERSION} EXACT) # Lua 5.4 is only supported with cmake >=3.18
+ message(STATUS "Found Lua: ${Lua_FOUND}")
+ if (Lua_FOUND AND ENABLE_PLUGINS)
+ # currently not fully supported by cmake
diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch
new file mode 100644
index 000000000000..df77cc00f745
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch
@@ -0,0 +1,36 @@
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 1cb6bb5b..af069dca 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -12,27 +12,23 @@ mark_as_advanced(HELP2MAN)
+ if (HELP2MAN)
+ set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff")
+ set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1")
+- set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz")
+
+ add_custom_command(
+- OUTPUT ${MAN_FILE}
++ OUTPUT ${MAN_PAGE}
+ COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/xournalpp
+- COMMAND gzip -n -f -9 ${MAN_PAGE}
+ DEPENDS ${CMAKE_BINARY_DIR}/xournalpp
+ )
+
+ set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1")
+- set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz")
+
+ add_custom_command(
+- OUTPUT ${MAN_FILE_THUMBNAILER}
++ OUTPUT ${MAN_PAGE_THUMBNAILER}
+ COMMAND ${HELP2MAN} --no-info --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+- COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER}
+ DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+ )
+
+- add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER})
+- install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1")
++ add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER})
++ install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1")
+ else(HELP2MAN)
+ message("help2man is missing; no man pages will be generated")
+ endif(HELP2MAN)
diff --git a/app-text/xournalpp/metadata.xml b/app-text/xournalpp/metadata.xml
new file mode 100644
index 000000000000..cece50a82eb0
--- /dev/null
+++ b/app-text/xournalpp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dilfridge@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xournalpp/xournalpp</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..77d1e2514686
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 lua5-4 )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+else
+ SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+ KEYWORDS="amd64 ~ppc64"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
+ app-text/poppler[cairo]
+ dev-libs/glib
+ dev-libs/libxml2
+ dev-libs/libzip:=
+ gnome-base/librsvg
+ media-libs/portaudio[cxx]
+ media-libs/libsndfile
+ sys-libs/zlib:=
+ x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ sys-apps/lsb-release
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+ "${FILESDIR}/${PN}-1.1.3-lua-5-4.patch"
+ "${FILESDIR}/${PN}-1.1.3-gcc13.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DLUA_VERSION="$(lua_get_version)"
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/xournalpp/xournalpp-1.2.3.ebuild b/app-text/xournalpp/xournalpp-1.2.3.ebuild
new file mode 100644
index 000000000000..df7aa6c945ea
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.2.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 lua5-4 )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+else
+ SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+ KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
+ app-text/poppler[cairo]
+ >=dev-libs/glib-2.32.0
+ dev-libs/libxml2
+ >=dev-libs/libzip-1.0.1:=
+ >=gnome-base/librsvg-2.40
+ >=media-libs/portaudio-12[cxx]
+ >=media-libs/libsndfile-1.0.25
+ sys-libs/zlib:=
+ >=x11-libs/gtk+-3.18.9:3
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ sys-apps/lsb-release
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.2.3-nocompress.patch"
+ "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DLUA_VERSION="$(lua_get_version)"
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
new file mode 100644
index 000000000000..df7aa6c945ea
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 lua5-4 )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+else
+ SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+ KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
+ app-text/poppler[cairo]
+ >=dev-libs/glib-2.32.0
+ dev-libs/libxml2
+ >=dev-libs/libzip-1.0.1:=
+ >=gnome-base/librsvg-2.40
+ >=media-libs/portaudio-12[cxx]
+ >=media-libs/libsndfile-1.0.25
+ sys-libs/zlib:=
+ >=x11-libs/gtk+-3.18.9:3
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ sys-apps/lsb-release
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.2.3-nocompress.patch"
+ "${FILESDIR}/${PN}-1.2.3-lua-5-4.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DLUA_VERSION="$(lua_get_version)"
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 00c30eaac706..5f89e2aa56cf 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,12 +1,13 @@
-DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6 SHA512 e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
+DIST xpdf-4.04.tar.gz 969535 BLAKE2B 981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8 SHA512 a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
+DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab SHA512 4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925
DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
-DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34 SHA512 1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
-DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc SHA512 6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1 SHA512 91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
+DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75 SHA512 c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e
DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e SHA512 ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
DIST xpdf-greek.tar.gz 1259 BLAKE2B f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f SHA512 2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
DIST xpdf-hebrew.tar.gz 1317 BLAKE2B bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000 SHA512 0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
-DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70 SHA512 0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
-DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444 SHA512 871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-japanese-20201222.tar.gz 1012686 BLAKE2B 14d59d2dd73dc9be913fb7557bce4844d2babbb88a573f9b962e7cc39e55268bb1a93c69c59585dc6b8aea8e6d771571e0105d1b9ee008ff07c80ae606125ed4 SHA512 f4e33525038f89c7b6ffb06b5b49726ab66ad1d61f5d0b813054ccefc035871e50996f31f3f67e6079eccf4c00619f582bdb2e1059df70e0101731a1e067d950
+DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 3c3a4397f25ae74ed8bd68d0736144b9f644f79757ce48f435030cc675650aaa919ee95e8ad7a8b039777f3505c78fdf335cfefbf780957b7c5442a25c5e10c4 SHA512 1b829f276f9fbf0ab637cef345f1343faa582af2db95f68003c01d1ec96ca0d9ab38093502ac666ad7b4ce55120a9103bd492a9fea1e8287983227d45ebc378f
DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
diff --git a/app-text/xpdf/files/xpdf-4.04-font-paths.patch b/app-text/xpdf/files/xpdf-4.04-font-paths.patch
new file mode 100644
index 000000000000..04c4994f4667
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-font-paths.patch
@@ -0,0 +1,48 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=1509862
+https://bugs.gentoo.org/916446
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -84,20 +84,20 @@
+ const char *obliqueFont; // name of font to oblique
+ double obliqueFactor; // oblique sheer factor
+ } displayFontTab[] = {
+- {"Courier", "n022003l.pfb", "cour.ttf", "Courier", "Courier", NULL, 0},
+- {"Courier-Bold", "n022004l.pfb", "courbd.ttf", "Courier", "Courier Bold", NULL, 0},
+- {"Courier-BoldOblique", "n022024l.pfb", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557},
+- {"Courier-Oblique", "n022023l.pfb", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557},
+- {"Helvetica", "n019003l.pfb", "arial.ttf", "Helvetica", "Helvetica", NULL, 0},
+- {"Helvetica-Bold", "n019004l.pfb", "arialbd.ttf", "Helvetica", "Helvetica Bold", NULL, 0},
+- {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
+- {"Helvetica-Oblique", "n019023l.pfb", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557},
+- {"Symbol", "s050000l.pfb", NULL, "Symbol", "Symbol", NULL, 0},
+- {"Times-Bold", "n021004l.pfb", "timesbd.ttf", "Times", "Times Bold", NULL, 0},
+- {"Times-BoldItalic", "n021024l.pfb", "timesbi.ttf", "Times", "Times Bold Italic", NULL, 0},
+- {"Times-Italic", "n021023l.pfb", "timesi.ttf", "Times", "Times Italic", NULL, 0},
+- {"Times-Roman", "n021003l.pfb", "times.ttf", "Times", "Times Roman", NULL, 0},
+- {"ZapfDingbats", "d050000l.pfb", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0},
++ {"Courier", "NimbusMonoPS-Regular.t1", "cour.ttf", "Courier", "Courier", NULL, 0},
++ {"Courier-Bold", "NimbusMonoPS-Bold.t1", "courbd.ttf", "Courier", "Courier Bold", NULL, 0},
++ {"Courier-BoldOblique", "NimbusMonoPS-BoldItalic.t1", "courbi.ttf", "Courier", "Courier Bold Oblique", "Courier-Bold", 0.212557},
++ {"Courier-Oblique", "NimbusMonoPS-Italic.t1", "couri.ttf", "Courier", "Courier Oblique", "Courier", 0.212557},
++ {"Helvetica", "NimbusSans-Regular.t1", "arial.ttf", "Helvetica", "Helvetica", NULL, 0},
++ {"Helvetica-Bold", "NimbusSans-Bold.t1", "arialbd.ttf", "Helvetica", "Helvetica Bold", NULL, 0},
++ {"Helvetica-BoldOblique", "NimbusSans-BoldItalic.t1", "arialbi.ttf", "Helvetica", "Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
++ {"Helvetica-Oblique", "NimbusSans-Italic.t1", "ariali.ttf", "Helvetica", "Helvetica Oblique", "Helvetica", 0.212557},
++ {"Symbol", "StandardSymbolsPS.t1", NULL, "Symbol", "Symbol", NULL, 0},
++ {"Times-Bold", "NimbusRoman-Bold.t1", "timesbd.ttf", "Times", "Times Bold", NULL, 0},
++ {"Times-BoldItalic", "NimbusRoman-BoldItalic.t1", "timesbi.ttf", "Times", "Times Bold Italic", NULL, 0},
++ {"Times-Italic", "NimbusRoman-Italic.t1", "timesi.ttf", "Times", "Times Italic", NULL, 0},
++ {"Times-Roman", "NimbusRoman-Regular.t1", "times.ttf", "Times", "Times Roman", NULL, 0},
++ {"ZapfDingbats", "D050000L.t1", NULL, "ZapfDingbats", "Zapf Dingbats", NULL, 0},
+ {NULL}
+ };
+
+@@ -109,6 +109,7 @@
+ };
+ #else
+ static const char *displayFontDirs[] = {
++ "/usr/share/fonts/urw-fonts",
+ "/usr/share/ghostscript/fonts",
+ "/usr/local/share/ghostscript/fonts",
+ "/usr/share/fonts/default/Type1",
+
diff --git a/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
new file mode 100644
index 000000000000..d6f3df150baf
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/870217
+https://forum.xpdfreader.com/viewtopic.php?t=42367
+https://github.com/rrthomas/libpaper/issues/29
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -655,7 +655,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
+ base14SysFonts = new GHash(gTrue);
+ sysFonts = new SysFontList();
+ #if HAVE_PAPER_H
+- char *paperName;
++ const char *paperName;
+ const struct paper *paperType;
+ paperinit();
+ if ((paperName = systempapername())) {
diff --git a/app-text/xpdf/files/xpdf.desktop b/app-text/xpdf/files/xpdf.desktop
new file mode 100644
index 000000000000..d22edbe76d9f
--- /dev/null
+++ b/app-text/xpdf/files/xpdf.desktop
@@ -0,0 +1,104 @@
+[Desktop Entry]
+Name=XPDF
+Name[bn]=à¦à¦•à§à¦¸ পি-ডি-à¦à¦«
+Name[de]=X-PDF
+Name[eo]=XPDF
+Name[es]=PDF para X
+Name[fr]=XPDF
+Name[hi]=à¤à¤•à¥à¤¸ पीडीà¤à¤«
+Name[ko]=Xìš© PDF
+Name[mn]=X-PDF
+Name[nds]=X-PDF
+Name[te]=à°Žà°•à±à°¸à± పిడిఎఫà±
+Comment=PDF Viewer
+Comment[af]=Pdf Aansig
+Comment[ar]=عارض الملÙات PDF
+Comment[az]=PDF Nümayişçisi
+Comment[be]=ПраглÑдальнік PDF
+Comment[bg]=Преглед на PDF документи
+Comment[bn]=পি-ডি-à¦à¦« পà§à¦°à¦¦à¦°à§à¦¶à¦•
+Comment[br]=Gweler PDF
+Comment[bs]=Preglednik PDF dokumenata
+Comment[ca]=Visor PDF
+Comment[cs]=ProhlížeÄ PDF souborů
+Comment[csb]=Przezérnik PDF
+Comment[cy]=Gwelydd PDF
+Comment[da]=PDF-fremviser
+Comment[de]=PDF-Betrachter
+Comment[el]=ΠÏοβολέας PDF
+Comment[eo]=PDF-rigardilo
+Comment[es]=Visor de documentos PDF
+Comment[et]=PDF failide vaatamine
+Comment[eu]=PDF ikustailua
+Comment[fa]=مشاهده‌گر PDF
+Comment[fi]=PDF-näytin
+Comment[fo]=PDF-vísari
+Comment[fr]=Afficheur PDF
+Comment[fy]=PDF-werjefteprogramma
+Comment[ga]=Amharcán PDF
+Comment[gl]=Visualizador de PDF
+Comment[he]=מציג קבצי PDF
+Comment[hi]=पीडीà¤à¤« पà¥à¤°à¤¦à¤°à¥à¤¶à¤•
+Comment[hr]=Preglednik PDF dokumenata
+Comment[hu]=PDF-nézegető
+Comment[id]=Viewer PDF
+Comment[is]=PDF-sjá
+Comment[it]=Visualizzatore PDF
+Comment[ja]=PDF ビューア
+Comment[kk]=PDF қарау құралы
+Comment[km]=កម្មវិធី​មើល PDF
+Comment[ko]=PDF 보기
+Comment[lo]=ສະà»àº”ງຜົນPDF
+Comment[lt]=PDF Žiūriklis
+Comment[lv]=PDF SkatÄ«tÄjs
+Comment[mk]=Прегледувач на PDF
+Comment[mn]=PDF-Харагч
+Comment[ms]=Pemapar PDF
+Comment[mt]=Werrej PDF
+Comment[nb]=PDF-leser
+Comment[nds]=Kieker för PDF-Dateien
+Comment[ne]=PDF दरà¥à¤¶à¤•
+Comment[nl]=PDF-weergaveprogramma
+Comment[nn]=PDF-lesar
+Comment[nso]=Molebeledi wa PDF
+Comment[oc]=Visualisor PDF
+Comment[pa]=PDF ਦਰਸ਼ਕ
+Comment[pl]=Przeglądarka plików PDF
+Comment[pt]=Visualizador de PDFs
+Comment[pt_BR]=Visualizador de arquivos PDF
+Comment[ro]=Vizualizor de documente PDF
+Comment[ru]=ПроÑмотр PDF
+Comment[rw]=Mugaragaza PDF
+Comment[se]=PDF-logan
+Comment[sk]=PrehliadaÄ PDF súborov
+Comment[sl]=Pregledovalnik datotek PDF
+Comment[sr]=PDF приказивач
+Comment[sr@Latn]=PDF prikazivaÄ
+Comment[ss]=Sibuki se PDF
+Comment[sv]=PDF-visare
+Comment[ta]=PDF காடà¯à®šà®¿
+Comment[tg]=Ðамоишгари PDF
+Comment[th]=ตัวà¹à¸ªà¸”งผล PDF
+Comment[tr]=PDF Görüntüleyici
+Comment[tt]=PDF Kürsätkeç
+Comment[uk]=ПереглÑдач PDF
+Comment[uz]=PDF кўрувчи
+Comment[ven]=Tshivhoni tsha PDF
+Comment[vi]=Trình xem PDF
+Comment[wa]=HÃ¥yneu di documints PDF
+Comment[zh_CN]=PDF 查看器
+Comment[zh_TW]=PDF 檢視程å¼
+Comment[zu]=Umbukisi we-PDF
+Keywords=pdf;document;presentation;viewer;
+Keywords[de]=pdf;Dokument;Präsentation;Betrachter;
+Keywords[ru]=pdf;документ;презентациÑ;проÑмотр;
+Keywords[uk]=pdf;документ;презентаціÑ;переглÑд;
+Keywords[ja]=pdf;ドキュメント;プレゼンテーション;ビューアー;
+
+Exec=xpdf
+Icon=xpdf
+Type=Application
+Terminal=false
+StartupNotify=false
+MimeType=application/pdf;
+Categories=Office;Viewer;Graphics;2DGraphics;VectorGraphics;
diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml
index aab31e840b14..bd29776a71c3 100644
--- a/app-text/xpdf/metadata.xml
+++ b/app-text/xpdf/metadata.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="cmyk">Include support for CMYK rasterization</flag>
<flag name="i18n">Enable support non-UTF8 national charsets</flag>
+ <flag name="icons">Generate desktop PNG icons using <pkg>media-gfx/inkscape</pkg></flag>
<flag name="libpaper">Use <pkg>app-text/libpaper</pkg> to get paper preferences</flag>
<flag name="metric">Use A4 instead of US Letter paper size by default for PostScript output. This option has effect only if libpaper USE flag is disabled</flag>
<flag name="opi">Include support for OPI (Open Prepress Interface) comments</flag>
diff --git a/app-text/xpdf/xpdf-4.01.01.ebuild b/app-text/xpdf/xpdf-4.01.01.ebuild
deleted file mode 100644
index 272214724007..000000000000
--- a/app-text/xpdf/xpdf-4.01.01.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
- i18n? (
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
- )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
-
-DEPEND="
- cups? (
- dev-qt/qtprintsupport:5
- net-print/cups
- )
- libpaper? ( app-text/libpaper )
- utils? ( png? ( media-libs/libpng:0 ) )
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-libs/freetype
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}
- media-fonts/urw-fonts
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-automagic.patch
- "${FILESDIR}"/${PN}-visibility.patch
- "${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-src_prepare() {
- sed -i \
- "s|/usr/local/etc|${EPREFIX}/etc|;
- s|/usr/local|${EPREFIX}/usr|" \
- doc/sample-xpdfrc || die
-
- if use i18n; then
- sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DA4_PAPER=$(usex metric)
- -DNO_TEXT_SELECT=$(usex textselect off on)
- -DOPI_SUPPORT=$(usex opi)
- -DSPLASH_CMYK=$(usex cmyk)
- -DWITH_LIBPAPER=$(usex libpaper)
- -DWITH_LIBPNG=$(usex png)
- -DXPDFWIDGET_PRINTING=$(usex cups)
- -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- insinto /etc
- newins doc/sample-xpdfrc xpdfrc
-
- local d i
- if use utils; then
- for d in "bin" "share/man/man1"; do
- pushd "${ED}/usr/${d}" || die
- for i in pdf*; do
- mv "${i}" "x${i}" || die
- done
- popd || die
- done
-
- einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
- einfo "with other packages"
- else
- rm -rf "${ED}"/usr/bin/pdf* \
- "${ED}"/usr/share/man/man1/pdf* \
- "${ED}"/usr/$(get_libdir) || die
- fi
-
- if use i18n; then
- for i in arabic chinese-simplified chinese-traditional cyrillic greek \
- hebrew japanese korean latin2 thai turkish; do
- insinto "/usr/share/xpdf/${i}"
- doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
- ! -name README ! -name add-to-xpdfrc || die)
-
- cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
- done
- fi
-}
diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
new file mode 100644
index 000000000000..cf95468f9077
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc
+inherit cmake desktop verify-sig xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com"
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+ i18n? (
+ https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+ https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+ https://dl.xpdfreader.com/xpdf-greek.tar.gz
+ https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+ https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+ https://dl.xpdfreader.com/xpdf-thai.tar.gz
+ https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+ )
+ verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
+
+BDEPEND="
+ icons? ( gnome-base/librsvg )
+ verify-sig? ( sec-keys/openpgp-keys-xpdf )
+"
+DEPEND="
+ cups? (
+ dev-qt/qtprintsupport:5[cups]
+ net-print/cups
+ )
+ fontconfig? ( media-libs/fontconfig )
+ libpaper? ( app-text/libpaper:= )
+ utils? ( png? ( media-libs/libpng:0 ) )
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-libs/freetype
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtsvg:5
+ media-fonts/urw-fonts
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-automagic.patch
+ "${FILESDIR}"/${PN}-visibility.patch
+ "${FILESDIR}"/${PN}-shared-libs.patch
+ "${FILESDIR}"/${PN}-4.04-libpaper-2.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+ fi
+ default
+}
+
+src_prepare() {
+ sed -i \
+ "s|/usr/local/etc|${EPREFIX}/etc|;
+ s|/usr/local|${EPREFIX}/usr|" \
+ doc/sample-xpdfrc || die
+
+ if use i18n; then
+ sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
+ fi
+
+ xdg_environment_reset
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DA4_PAPER=$(usex metric)
+ -DNO_FONTCONFIG=$(usex fontconfig off on)
+ -DNO_TEXT_SELECT=$(usex textselect off on)
+ -DOPI_SUPPORT=$(usex opi)
+ -DSPLASH_CMYK=$(usex cmyk)
+ -DWITH_LIBPAPER=$(usex libpaper)
+ -DWITH_LIBPNG=$(usex png)
+ -DXPDFWIDGET_PRINTING=$(usex cups)
+ -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+ # Bug 910166
+ # https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
+ # Likely fixed in 4.05
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use icons; then
+ sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+ cd xpdf-qt
+ mkdir $sizes
+ local i
+ for i in $sizes; do
+ rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ domenu "${FILESDIR}/xpdf.desktop"
+ newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
+ if use icons; then
+ local i
+ for i in $sizes; do
+ doicon -s $i xpdf-qt/$i/xpdf.png
+ done
+ unset sizes
+ fi
+
+ insinto /etc
+ newins doc/sample-xpdfrc xpdfrc
+
+ local d i
+ if use utils; then
+ for d in "bin" "share/man/man1"; do
+ pushd "${ED}/usr/${d}" || die
+ for i in pdf*; do
+ mv "${i}" "x${i}" || die
+ done
+ popd || die
+ done
+
+ einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
+ einfo "with other packages"
+ else
+ rm -rf "${ED}"/usr/bin/pdf* \
+ "${ED}"/usr/share/man/man1/pdf* \
+ "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ if use i18n; then
+ for i in arabic chinese-simplified chinese-traditional cyrillic greek \
+ hebrew japanese korean latin2 thai turkish; do
+ insinto "/usr/share/xpdf/${i}"
+ doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
+ ! -name README ! -name add-to-xpdfrc || die)
+
+ cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
+ done
+ fi
+}
diff --git a/app-text/xpdf/xpdf-4.04-r2.ebuild b/app-text/xpdf/xpdf-4.04-r2.ebuild
new file mode 100644
index 000000000000..11c66d17c05a
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.04-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc
+inherit cmake desktop verify-sig xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com"
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+ i18n? (
+ https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+ https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+ https://dl.xpdfreader.com/xpdf-greek.tar.gz
+ https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+ https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
+ https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+ https://dl.xpdfreader.com/xpdf-thai.tar.gz
+ https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+ )
+ verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
+
+BDEPEND="
+ icons? ( gnome-base/librsvg )
+ verify-sig? ( sec-keys/openpgp-keys-xpdf )
+"
+DEPEND="
+ cups? (
+ dev-qt/qtprintsupport:5[cups]
+ net-print/cups
+ )
+ fontconfig? ( media-libs/fontconfig )
+ libpaper? ( app-text/libpaper:= )
+ utils? ( png? ( media-libs/libpng:0 ) )
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-libs/freetype
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtsvg:5
+ media-fonts/urw-fonts
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-automagic.patch
+ "${FILESDIR}"/${PN}-visibility.patch
+ "${FILESDIR}"/${PN}-shared-libs.patch
+ "${FILESDIR}"/${PN}-4.04-libpaper-2.patch
+ "${FILESDIR}"/${PN}-4.04-font-paths.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+ fi
+ default
+}
+
+src_prepare() {
+ sed -i \
+ "s|/usr/local/etc|${EPREFIX}/etc|;
+ s|/usr/local|${EPREFIX}/usr|" \
+ doc/sample-xpdfrc || die
+
+ if use i18n; then
+ sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
+ fi
+
+ xdg_environment_reset
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DA4_PAPER=$(usex metric)
+ -DNO_FONTCONFIG=$(usex fontconfig off on)
+ -DNO_TEXT_SELECT=$(usex textselect off on)
+ -DOPI_SUPPORT=$(usex opi)
+ -DSPLASH_CMYK=$(usex cmyk)
+ -DWITH_LIBPAPER=$(usex libpaper)
+ -DWITH_LIBPNG=$(usex png)
+ -DXPDFWIDGET_PRINTING=$(usex cups)
+ -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+ # Bug 910166
+ # https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
+ # Likely fixed in 4.05
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use icons; then
+ sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+ cd xpdf-qt
+ mkdir $sizes
+ local i
+ for i in $sizes; do
+ rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ domenu "${FILESDIR}/xpdf.desktop"
+ newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
+ if use icons; then
+ local i
+ for i in $sizes; do
+ doicon -s $i xpdf-qt/$i/xpdf.png
+ done
+ unset sizes
+ fi
+
+ insinto /etc
+ newins doc/sample-xpdfrc xpdfrc
+
+ local d i
+ if use utils; then
+ for d in "bin" "share/man/man1"; do
+ pushd "${ED}/usr/${d}" || die
+ for i in pdf*; do
+ mv "${i}" "x${i}" || die
+ done
+ popd || die
+ done
+
+ einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
+ einfo "with other packages"
+ else
+ rm -rf "${ED}"/usr/bin/pdf* \
+ "${ED}"/usr/share/man/man1/pdf* \
+ "${ED}"/usr/$(get_libdir) || die
+ fi
+
+ if use i18n; then
+ for i in arabic chinese-simplified chinese-traditional cyrillic greek \
+ hebrew japanese korean latin2 thai turkish; do
+ insinto "/usr/share/xpdf/${i}"
+ doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
+ ! -name README ! -name add-to-xpdfrc || die)
+
+ cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
+ done
+ fi
+}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 18a781ba1d73..971ba10c714b 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,2 +1 @@
-DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
-DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
+DIST yelp-tools-42.1.tar.xz 38936 BLAKE2B 9c068fb6c41fc6a9f22b1ffd632eeb648685b7bd09cad498910ddfa56696218ebaf643c17a6951756c88978bdae82c0622068c43e4f57ff57a96fa6d6b86a95f SHA512 e05a61d18179a9816ec38d1a2335091a3846cf74bb1ecec5374c9a13cc8962d14416208e04eec92f4ee43ec90e1992cc4a263bc4c267caac5d154a15f10d3006
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
index 39980802b1da..ff91c5812f07 100644
--- a/app-text/yelp-tools/metadata.xml
+++ b/app-text/yelp-tools/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/yelp-tools</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
deleted file mode 100644
index fa0c5f05052e..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/libxml2-2.6.12
- >=dev-libs/libxslt-1.1.8
- dev-util/itstool
- >=gnome-extra/yelp-xsl-3.17.3
- virtual/awk
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
deleted file mode 100644
index ed2cb1c720de..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/libxml2-2.6.12
- >=dev-libs/libxslt-1.1.8
- dev-util/itstool
- >=gnome-extra/yelp-xsl-3.17.3
- virtual/awk
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-42.1.ebuild b/app-text/yelp-tools/yelp-tools-42.1.ebuild
new file mode 100644
index 000000000000..2f882d1a7ee2
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-42.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ >=dev-libs/libxml2-2.6.12
+ >=dev-libs/libxslt-1.1.8
+ dev-util/itstool
+ >=gnome-extra/yelp-xsl-3.38
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
+}
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index fea328b3ed94..dd9c75cf172d 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,3 +1 @@
-DIST yodl-4.01.00.tar.gz 288932 BLAKE2B 71491eaedae9cf0b6bc65f1da3065bc2a90e9ff5f527cbac66a714c761e679600635f7f10b0f20b7e1a15413c1930ee6e64e5ec083226058b6c8822e4a445437 SHA512 f195dec8e03b83561b47f9bd00fbb0fe711bbc254c32413d748587d8bf3848e050b90a2140977bec5a335021b2ef49ec5a6b0ca89f1649def495d81c3e7b437f
-DIST yodl-4.02.00.tar.gz 308567 BLAKE2B bf64ff7248ddcdc17dec23fe4407c28edf604b76746f13e97dfbb470421c15ca6235747c9ef349925a0293f8503d319a637a11352a2987f161fb2bcab60ddf7e SHA512 ca3a2490bf54a0ce4e800a62a3de9a5cf37df96f0f553de89623ef6d36f07b65b7c09168e77d267d7fb79d900a8e8a6c6d3c17c4b733345001213f5450c02b13
-DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
+DIST yodl-4.03.00.tar.gz 309212 BLAKE2B 9a89dfda5f4138f466bc2f871724087ff2c0084d06d81c32e1e865744e1c133b1073becac30e817f2f997c351b8f8192e942616174acb644dcab40d5d64c9d36 SHA512 ec5edaf932d94e9272a08867322e8fbfec65f612447fa412a7c19412569a6d811bbe5badd0af692837086a9ee8cdf8bb8f0c10a3e8333ef6096513b263c8d831
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
index dbb763b1ee5a..ad9519f39929 100644
--- a/app-text/yodl/metadata.xml
+++ b/app-text/yodl/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="gitlab">fbb-git/yodl</remote-id>
</upstream>
diff --git a/app-text/yodl/yodl-4.01.00.ebuild b/app-text/yodl/yodl-4.01.00.ebuild
deleted file mode 100644
index 8c697af720a1..000000000000
--- a/app-text/yodl/yodl-4.01.00.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
- sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
- -e "/COMPILER =/s/gcc/$(tc-getCC)/" \
- -e "/CXX =/s/g++/$(tc-getCXX)/" \
- -i INSTALL.im || die
-
- sed -e "s/ar r /$(tc-getAR) r /" \
- -e "s/ranlib/$(tc-getRANLIB)/" \
- -i icmake/stdcompile || die
-
- default
-}
-
-src_compile() {
- ./build programs || die
- ./build macros || die
- ./build man || die
- use doc && { ./build manual || die ; }
-}
-
-src_install() {
- ./build install programs "${ED}" || die
- ./build install macros "${ED}" || die
- ./build install man "${ED}" || die
- ./build install docs "${ED}" || die
- use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-4.02.00.ebuild b/app-text/yodl/yodl-4.02.00.ebuild
deleted file mode 100644
index b49b2b6193d4..000000000000
--- a/app-text/yodl/yodl-4.02.00.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
-SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
- sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
- -e "/COMPILER =/s/gcc/$(tc-getCC)/" \
- -e "/CXX =/s/g++/$(tc-getCXX)/" \
- -i INSTALL.im || die
- sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
-
- sed -e "s/ar r /$(tc-getAR) r /" \
- -e "s/ranlib/$(tc-getRANLIB)/" \
- -i icmake/stdcompile || die
-
- default
-}
-
-src_compile() {
- ./build programs || die
- ./build macros || die
- ./build man || die
- use doc && { ./build manual || die ; }
-}
-
-src_install() {
- ./build install programs "${ED}" || die
- ./build install macros "${ED}" || die
- ./build install man "${ED}" || die
- ./build install docs "${ED}" || die
- use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-4.02.01.ebuild b/app-text/yodl/yodl-4.02.01.ebuild
deleted file mode 100644
index 3ea825807fc1..000000000000
--- a/app-text/yodl/yodl-4.02.01.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
-HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-util/icmake-8.00.00"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
- sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
- -e "/COMPILER =/s/gcc/$(tc-getCC)/" \
- -e "/CXX =/s/g++/$(tc-getCXX)/" \
- -i INSTALL.im || die
- sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
-
- sed -e "s/ar r /$(tc-getAR) r /" \
- -e "s/ranlib/$(tc-getRANLIB)/" \
- -i icmake/stdcompile || die
-
- default
-}
-
-src_compile() {
- ./build programs || die
- ./build macros || die
- ./build man || die
- use doc && { ./build manual || die ; }
-}
-
-src_install() {
- ./build install programs "${ED}" || die
- ./build install macros "${ED}" || die
- ./build install man "${ED}" || die
- ./build install docs "${ED}" || die
- use doc && { ./build install manual "${ED}" || die ; }
-}
diff --git a/app-text/yodl/yodl-4.03.00.ebuild b/app-text/yodl/yodl-4.03.00.ebuild
new file mode 100644
index 000000000000..2ff151fc083a
--- /dev/null
+++ b/app-text/yodl/yodl-4.03.00.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
+SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+BDEPEND="
+ >=dev-build/icmake-8.00.00
+ doc? (
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-plaingeneric
+ )
+"
+
+src_prepare() {
+ sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+ -e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+ -e "/CXX =/s/g++/$(tc-getCXX)/" \
+ -i INSTALL.im || die
+
+ sed -e "s/g++/$(tc-getCXX)/" \
+ -e "s:#define CLS://\0:" \
+ -i verbinsert/icmconf || die
+
+ sed -e "s/ar r /$(tc-getAR) r /" \
+ -e "s/ranlib/$(tc-getRANLIB)/" \
+ -i icmake/stdcompile || die
+
+ sed -e '/strip/s|"-s"|""|g' \
+ -i icmake/program || die
+
+ # required for std::filesystem usage
+ append-cxxflags -std=c++17
+
+ default
+}
+
+src_compile() {
+ local target
+ for target in programs macros man $(usex doc manual ''); do
+ ./build ${target} || die "${target} failed"
+ done
+}
+
+src_install() {
+ ./build install programs "${ED}" || die
+ ./build install macros "${ED}" || die
+ ./build install man "${ED}" || die
+ ./build install docs "${ED}" || die
+ use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index e8c6f8c0893a..3524725f2335 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1 +1,2 @@
-DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
+DIST zathura-cb-0.1.10.tar.xz 6300 BLAKE2B d541fb78f5ee52a22e58bb885103560bd544a9725cfe210f6b343e97429163a90dd0e9533e6c807134386e6f347bdd17cfc506ffe16642819eae4d1fd27c3b6e SHA512 b85894d052fda45933582299e8c3406413bcb47ed451d81f5906d7bfef94b169c59a57db8b37273c838381ffc7ba55205d714d2e2ec3b597371578a77e131029
+DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index 9e0907fe1628..2905913bb5c1 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
+ <maintainer type="person" proxied="yes">
+ <email>nrk@disroot.org</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<upstream>
<maintainer status="active">
diff --git a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild
new file mode 100644
index 000000000000..c38af1169e7e
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm ~riscv x86"
+ SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+RDEPEND="app-arch/libarchive:=
+ >=app-text/zathura-0.3.9
+ dev-libs/girara
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2[jpeg]
+ x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
deleted file mode 100644
index 2fad557959ce..000000000000
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
- EGIT_BRANCH="develop"
-else
- KEYWORDS="amd64 arm x86"
- SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND=">=app-text/zathura-0.3.9
- dev-libs/girara
- dev-libs/glib:2
- x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
new file mode 100644
index 000000000000..a20b5eca3b9d
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils optfeature
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm ~riscv x86"
+ SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-arch/libarchive:=
+ >=app-text/zathura-0.3.9
+ dev-libs/girara
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 5e59ea0d4e25..fa6f6f40d74b 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit meson
+inherit meson xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
- SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
fi
DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
@@ -20,11 +20,15 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
LICENSE="ZLIB"
SLOT="0"
-DEPEND=">=app-text/zathura-0.3.9
+RDEPEND="app-arch/libarchive:=
+ >=app-text/zathura-0.3.9
dev-libs/girara
dev-libs/glib:2
- x11-libs/cairo"
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2[jpeg]
+ x11-libs/gtk+:3"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index f36d3e78071b..f491cc889022 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1 +1 @@
-DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
+DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index 9e0907fe1628..c6b72890006f 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<maintainer status="active">
- <email>mlq@pwmt.org</email>
- <name>Moritz Lipp</name>
- </maintainer>
- <maintainer status="active">
- <email>sebastian+dev@ramacher.at</email>
- <name>Sebastian Ramacher</name>
- </maintainer>
- <changelog>http://pwmt.org/projects/zathura/download/</changelog>
- <doc lang="en">http://pwmt.org/projects/zathura/</doc>
- <bugs-to>http://bugs.pwmt.org/</bugs-to>
+ <email>mlq@pwmt.org</email>
+ <name>Moritz Lipp</name>
+ </maintainer>
+ <maintainer status="active">
+ <email>sebastian+dev@ramacher.at</email>
+ <name>Sebastian Ramacher</name>
+ </maintainer>
+ <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+ <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+ <bugs-to>http://bugs.pwmt.org/</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
deleted file mode 100644
index 2a891acd222b..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
- EGIT_BRANCH="develop"
-else
- KEYWORDS="amd64 arm x86"
- SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-RDEPEND="app-text/djvu
- >=app-text/zathura-0.3.9
- dev-libs/girara
- dev-libs/glib:2
- x11-libs/cairo"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
new file mode 100644
index 000000000000..392cfe24b681
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm ~riscv x86"
+ SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+RDEPEND="app-text/djvu
+ >=app-text/zathura-0.3.9
+ dev-libs/girara
+ dev-libs/glib:2
+ x11-libs/cairo"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 71046574478c..8b3af5827a64 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit gnome2-utils meson xdg-utils
+inherit meson xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
fi
@@ -28,13 +28,3 @@ RDEPEND="app-text/djvu
DEPEND="${RDEPEND}
virtual/pkgconfig"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml
index c80ab57c7e6d..b3facb939612 100644
--- a/app-text/zathura-meta/metadata.xml
+++ b/app-text/zathura-meta/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index d135b15ea1f6..5de3781f22b8 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1 +1,2 @@
-DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
+DIST zathura-pdf-mupdf-0.4.0.tar.gz 9323 BLAKE2B e633e2d52080dc017cd59be184fc52f52b21f9bfa1cecb48c83b4383366226f8e65fcd92503493e8df568847f84a39f2f7d8e4a87df44c66ec121c246557e10a SHA512 44a8d72f54adf29cc853c636f2387edb52e253522c82175533a2f80a6afc45ca88a785785bb840bf81e368ef8f35e31f5e9bf7648ee6a13d394eb4133585c060
+DIST zathura-pdf-mupdf-0.4.1.tar.gz 9346 BLAKE2B f1998acf00696fd40577f6e53b597258e519d3862c5b6b29bec292aaa732acf0b7a80ddf1b2f62d95d9462fe811a73cd912009106394bf1aadfa76be9c6d1adc SHA512 bf3360cdf6195af3cace4c769536a49f1cf2167c70a65b560410db1a0098119d726e73baeea98ca7100653c17248056c484fc436558e52a8dc12e7b83ce789b1
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
new file mode 100644
index 000000000000..caa0da05e37c
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.4.0-meson-mupdfthird.patch
@@ -0,0 +1,39 @@
+--- a/meson.build
++++ b/meson.build
+@@ -20,7 +20,6 @@ girara = dependency('girara-gtk3')
+ glib = dependency('glib-2.0')
+ cairo = dependency('cairo')
+ mupdf = dependency('mupdf', required: false)
+-mupdfthird = cc.find_library('mupdf-third')
+
+ build_dependencies = [
+ zathura,
+@@ -32,17 +31,15 @@ build_dependencies = [
+ if not mupdf.found()
+ # normal build of mupdf
+ mupdf = cc.find_library('mupdf')
+- build_dependencies += [mupdf, mupdfthird]
++ build_dependencies += [mupdf]
+ else
+ # build from Debian's libmupdf-dev
+- build_dependencies += [mupdf, mupdfthird]
++ build_dependencies += [mupdf]
+
+ libjpeg = dependency('libjpeg')
+ libjbig2dec = cc.find_library('jbig2dec')
+ libopenjp2 = dependency('libopenjp2')
+ gumbo = dependency('gumbo')
+- tesseract = dependency('tesseract')
+- leptonica = dependency('lept')
+ mujs = dependency('mujs')
+
+ build_dependencies += [
+@@ -50,8 +47,6 @@ else
+ libjbig2dec,
+ libopenjp2,
+ gumbo,
+- tesseract,
+- leptonica,
+ mujs
+ ]
+ endif
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index a4adf124756a..348798600314 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
+ <maintainer type="person" proxied="yes">
+ <email>rndxelement@protonmail.com</email>
+ <name>Philipp Rösner</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<upstream>
<maintainer status="active">
@@ -14,8 +18,7 @@
<email>sebastian+dev@ramacher.at</email>
<name>Sebastian Ramacher</name>
</maintainer>
- <changelog>http://pwmt.org/projects/zathura/download/</changelog>
- <doc lang="en">http://pwmt.org/projects/zathura/</doc>
- <bugs-to>http://bugs.pwmt.org/</bugs-to>
+ <doc lang="en">https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/blob/master/README.md</doc>
+ <bugs-to>https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
deleted file mode 100644
index 33b1f2deedb7..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
- EGIT_BRANCH="develop"
-else
- KEYWORDS="amd64 arm x86"
- SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/mupdf
- >=app-text/zathura-0.3.9
- dev-libs/girara
- dev-libs/glib:2
- media-libs/jbig2dec:=
- media-libs/openjpeg:2=
- virtual/jpeg:0
- x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
- default
-}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
new file mode 100644
index 000000000000..80d004c0aeca
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm x86"
+ SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+javascript"
+
+DEPEND="
+ >=app-text/mupdf-1.20.0:=[javascript?]
+ >=app-text/zathura-0.5.2:=
+ dev-libs/girara
+ dev-libs/glib:2
+ x11-libs/cairo
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-meson-mupdfthird.patch"
+)
+
+src_prepare() (
+ default
+
+ if ! use javascript ; then
+ sed -i -e '/mujs/d' meson.build || die
+ fi
+)
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild
new file mode 100644
index 000000000000..94db4774090d
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm x86"
+ SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+javascript"
+
+DEPEND="
+ >=app-text/mupdf-1.20.0:=[javascript?]
+ >=app-text/zathura-0.5.2:=
+ dev-libs/girara
+ dev-libs/glib:2
+ x11-libs/cairo
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
+)
+
+src_prepare() (
+ default
+
+ if ! use javascript ; then
+ sed -i -e '/mujs/d' meson.build || die
+ fi
+)
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 07030bc38d87..53bd172f9007 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit meson
+inherit meson xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
@@ -11,29 +11,36 @@ if [[ ${PV} == *9999 ]]; then
EGIT_BRANCH="develop"
else
KEYWORDS="~amd64 ~arm ~x86"
- SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
+ SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
fi
DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
LICENSE="ZLIB"
SLOT="0"
+IUSE="+javascript"
-DEPEND="app-text/mupdf
- >=app-text/zathura-0.3.9
+DEPEND="
+ >=app-text/mupdf-1.20.0:=[javascript?]
+ >=app-text/zathura-0.5.2:=
dev-libs/girara
dev-libs/glib:2
- media-libs/jbig2dec:=
- media-libs/openjpeg:2=
- virtual/jpeg:0
- x11-libs/cairo"
+ x11-libs/cairo
+"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
-src_prepare() {
- sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.4.0-meson-mupdfthird.patch"
+)
+
+src_prepare() (
default
-}
+
+ if ! use javascript ; then
+ sed -i -e '/mujs/d' meson.build || die
+ fi
+)
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index e8d000e5b527..0436d6b968a0 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1 +1,2 @@
-DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
+DIST zathura-pdf-poppler-0.3.1.tar.gz 9259 BLAKE2B c1131d2acc0cf69bf9266969839f6fb4e043664a0a4648d033f9338b1219d75e34576a03380daf54bc8fe52cc8bd2244a93394e15f8ff0bbb980fb903749affc SHA512 a6ea7d61f05cfbc6229ec81580c539841916b44085aeb168668cfabd41aca2e5321e88605f092caaa3efc30bec25a2bb319c687920a22b1f7f53e4b1e470ec34
+DIST zathura-pdf-poppler-0.3.2.tar.gz 10623 BLAKE2B 985ce9664b74d798c6a5c858a79e9e3a6e82d837818f52e4115e622395ee39e765c356740c099a7f376517c3af81fb9335188950719930b9a902542fccd475e7 SHA512 5e6d748f9dfcc9e318ee7947d3a4d9acbbb30d6b45810a7c2fd2d0572d98872f5d594add8683b6579791fb82846a3d7854e84239ac5167c0541e700518a31043
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index 39371e1e7ba9..35a79df28eb8 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<maintainer status="active">
- <email>mlq@pwmt.org</email>
- <name>Moritz Lipp</name>
+ <email>mlq@pwmt.org</email>
+ <name>Moritz Lipp</name>
</maintainer>
- <maintainer status="active">
- <email>sebastian+dev@ramacher.at</email>
- <name>Sebastian Ramacher</name>
- </maintainer>
- <changelog>http://pwmt.org/projects/zathura/download/</changelog>
- <doc lang="en">http://pwmt.org/projects/zathura/</doc>
- <bugs-to>http://bugs.pwmt.org/</bugs-to>
+ <maintainer status="active">
+ <email>sebastian+dev@ramacher.at</email>
+ <name>Sebastian Ramacher</name>
+ </maintainer>
+ <changelog>https://pwmt.org/projects/zathura/download/</changelog>
+ <bugs-to>https://git.pwmt.org/groups/pwmt/-/issues</bugs-to>
+ <doc lang="en">https://pwmt.org/projects/zathura/</doc>
+ <remote-id type="github">pwmt/zathura-pdf-poppler</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
deleted file mode 100644
index ebbe11bcdbf3..000000000000
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
- EGIT_BRANCH="develop"
-else
- KEYWORDS="amd64 arm x86"
- SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/poppler[cairo]
- >=app-text/zathura-0.3.9
- dev-libs/girara
- dev-libs/glib:2"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..285a4b6a6533
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm ~riscv x86"
+ SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/poppler[cairo]
+ >=app-text/zathura-0.5.2:=
+ dev-libs/girara
+ dev-libs/glib:2"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild
new file mode 100644
index 000000000000..4c9b1c46bdfe
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND=">=app-text/poppler-21.12.0:=[cairo]
+ >=app-text/zathura-0.5.3:=
+ dev-libs/girara
+ dev-libs/glib:2"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 5b4915a8a871..cb0233ebcd83 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit meson xdg-utils
@@ -10,8 +10,8 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
- SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
DESCRIPTION="PDF plug-in for zathura"
@@ -20,8 +20,8 @@ HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
LICENSE="ZLIB"
SLOT="0"
-DEPEND="app-text/poppler[cairo]
- >=app-text/zathura-0.3.9
+DEPEND=">=app-text/poppler-21.12.0:=[cairo]
+ >=app-text/zathura-0.5.3:=
dev-libs/girara
dev-libs/glib:2"
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index eba030e6d419..70c1e626dabc 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1 +1 @@
-DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
+DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index 9e0907fe1628..e0e23d23393f 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<maintainer status="active">
<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
deleted file mode 100644
index 94dab249fb7a..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
- EGIT_BRANCH="develop"
-else
- KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
- SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/libspectre
- >=app-text/zathura-0.3.9
- dev-libs/girara
- dev-libs/glib:2
- x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
new file mode 100644
index 000000000000..8ccbde58f647
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/libspectre
+ >=app-text/zathura-0.3.9
+ dev-libs/girara
+ dev-libs/glib:2
+ x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 16e0d2d5ba33..52b16b0f9b8d 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit meson
+inherit meson xdg-utils
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
- SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
fi
DESCRIPTION="PostScript plug-in for zathura"
@@ -29,3 +29,11 @@ DEPEND="app-text/libspectre
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 169644870235..97caafbb2f92 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1 +1,4 @@
-DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
+DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c
+DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
+DIST zathura-0.5.4-manpages.tar.xz 10060 BLAKE2B 103d2b5ed4ab71bc096305e70addbf94f11539cc989fc867766a1366ec18ca30379ce8f5b9f2b4a4a67507f79bbf6c6136c46f47161d1b74457c04488aa3dcea SHA512 a8251740a8e24e1c37093bec58b0169f04bd318878d743c72f07505a722c58da4f84a2dad5d46ded7789e1b4c5f2a7bab9cc6d023cd0935e49fe4388c9c28bd9
+DIST zathura-0.5.4.tar.gz 216719 BLAKE2B 94219e1feb22dc5cf3c072ed7d53b984c58e1f5c2d86b7e2b9e67c2d1cde92e9972aa18583930d3af3bc7d9c2afe367221ed3c2141fee682cc7ea54aae603ec4 SHA512 16f7291c3742cffe9ba5c6a3137781b2dd0b0bfcd61747e45a3c4b14df97781b49d526a298d2be9f564c84e616f1adef2ff4f5442d539fd42ab5e862baa00922
diff --git a/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch
new file mode 100644
index 000000000000..7658f3f6f417
--- /dev/null
+++ b/app-text/zathura/files/zathura-0.5.4-disable-seccomp-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index 1b2e81a..b2b7565 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -45,17 +45,5 @@ if check.found()
+ args: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', session],
+ timeout: 60*60
+ )
+-
+- if seccomp.found()
+- sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
+- dependencies: build_dependencies + test_dependencies,
+- include_directories: include_directories,
+- c_args: defines + flags
+- )
+- test('sandbox', xvfb,
+- args: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', sandbox],
+- timeout: 60*60
+- )
+- endif
+ endif
+ endif
diff --git a/app-text/zathura/files/zathura-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-disable-seccomp-tests.patch
new file mode 100644
index 000000000000..f3d88a2746d2
--- /dev/null
+++ b/app-text/zathura/files/zathura-disable-seccomp-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index ac7edb8..68216f3 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -25,17 +25,6 @@ if check.found()
+ timeout: 60*60
+ )
+
+- if seccomp.found()
+- sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
+- dependencies: build_dependencies + test_dependencies,
+- include_directories: include_directories,
+- c_args: defines + flags
+- )
+- test('sandbox', sandbox,
+- timeout: 60*60
+- )
+- endif
+-
+ utils = executable('test_utils', ['test_utils.c', 'tests.c'],
+ dependencies: build_dependencies + test_dependencies,
+ include_directories: include_directories,
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index 9e879333ac21..2619e14a2244 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <name>Mikle Kolyada</name>
- <email>zlogene@gentoo.org</email>
+ <maintainer type="person" proxied="yes">
+ <email>turret@turret.cyou</email>
+ <name>Mason Rocha</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
@@ -17,8 +21,8 @@
<email>sebastian+dev@ramacher.at</email>
<name>Sebastian Ramacher</name>
</maintainer>
- <changelog>http://pwmt.org/projects/zathura/download/</changelog>
- <doc lang="en">http://pwmt.org/projects/zathura/</doc>
- <bugs-to>http://bugs.pwmt.org/</bugs-to>
+ <changelog>https://pwmt.org/projects/zathura/download/</changelog>
+ <doc lang="en">https://pwmt.org/projects/zathura/</doc>
+ <remote-id type="github">pwmt/zathura</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
deleted file mode 100644
index 26887b29c3f2..000000000000
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
- EGIT_BRANCH="develop"
-else
- SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
- KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.2
- >=dev-libs/glib-2.50:2
- >=sys-devel/gettext-0.19.8
- x11-libs/cairo[X]
- >=x11-libs/gtk+-3.22:3
- magic? ( sys-apps/file )
- seccomp? ( sys-libs/libseccomp )
- sqlite? ( >=dev-db/sqlite-3.5.9:3 )
- synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/sphinx )
- test? ( dev-libs/appstream-glib
- dev-libs/check )
- virtual/pkgconfig"
-
-src_configure() {
- local emesonargs=(
- -Dconvert-icon=disabled
- -Dmagic=$(usex magic enabled disabled)
- -Dmanpages=$(usex doc enabled disabled)
- -Dseccomp=$(usex seccomp enabled disabled)
- -Dsqlite=$(usex sqlite enabled disabled)
- -Dsynctex=$(usex synctex enabled disabled)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/app-text/zathura/zathura-0.5.2-r4.ebuild b/app-text/zathura/zathura-0.5.2-r4.ebuild
new file mode 100644
index 000000000000..bf8c8261af3f
--- /dev/null
+++ b/app-text/zathura/zathura-0.5.2-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ SRC_URI="
+ https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://cdn.turret.cyou/~turret/distfiles/${PN}/${P}-manpages.tar.xz
+ "
+ KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.7
+ >=dev-libs/glib-2.50:2
+ >=sys-devel/gettext-0.19.8
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.22:3
+ sys-apps/file
+ seccomp? ( sys-libs/libseccomp )
+ sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+ synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ test? ( dev-libs/appstream-glib
+ dev-libs/check )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/zathura-disable-seccomp-tests.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -Dconvert-icon=disabled
+ -Dmanpages=disabled
+ -Dseccomp=$(usex seccomp enabled disabled)
+ -Dsqlite=$(usex sqlite enabled disabled)
+ -Dsynctex=$(usex synctex enabled disabled)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ doman "${WORKDIR}"/man/zathura*
+}
+
+src_test() {
+ virtx meson_src_test
+}
diff --git a/app-text/zathura/zathura-0.5.2-r5.ebuild b/app-text/zathura/zathura-0.5.2-r5.ebuild
new file mode 100644
index 000000000000..1ad4fe4776d4
--- /dev/null
+++ b/app-text/zathura/zathura-0.5.2-r5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ SRC_URI="
+ https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://cdn.turret.cyou/354c6d33bfd3bbc67c0047af1328498978eef352/${P}-manpages.tar.xz
+ "
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ >=dev-libs/girara-0.3.7
+ >=dev-libs/glib-2.50:2
+ sys-apps/file
+ >=sys-devel/gettext-0.19.8
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.22:3
+ seccomp? ( sys-libs/libseccomp )
+ sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+ synctex? ( app-text/texlive-core )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ test? (
+ dev-libs/appstream-glib
+ dev-libs/check
+ x11-base/xorg-server[xvfb]
+ )
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/zathura-disable-seccomp-tests.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -Dconvert-icon=disabled
+ -Dmanpages=disabled
+ -Dseccomp=$(usex seccomp enabled disabled)
+ -Dsqlite=$(usex sqlite enabled disabled)
+ -Dsynctex=$(usex synctex enabled disabled)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+ [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura*
+}
diff --git a/app-text/zathura/zathura-0.5.4.ebuild b/app-text/zathura/zathura-0.5.4.ebuild
new file mode 100644
index 000000000000..9e1fb2b8e42f
--- /dev/null
+++ b/app-text/zathura/zathura-0.5.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ SRC_URI="
+ https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://cdn.turret.cyou/~turret/distfiles/${PN}/${P}-manpages.tar.xz
+ "
+ KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0/5.6"
+IUSE="seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/girara-0.4.1
+ >=dev-libs/glib-2.50:2
+ dev-libs/json-glib
+ sys-apps/file
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.22:3
+ seccomp? ( sys-libs/libseccomp )
+ sqlite? ( >=dev-db/sqlite-3.6.23:3 )
+ synctex? ( app-text/texlive-core )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-libs/check
+ >=x11-libs/gtk+-3.22:3[X]
+ )
+"
+BDEPEND="
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-disable-seccomp-tests.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ -Dconvert-icon=disabled
+ -Dmanpages=disabled
+ -Dseccomp=$(usex seccomp enabled disabled)
+ -Dsqlite=$(usex sqlite enabled disabled)
+ -Dsynctex=$(usex synctex enabled disabled)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+ [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura*
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index fcb0645c0898..3cf03fc8f6e7 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,48 +1,65 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit gnome2-utils meson virtualx xdg-utils
+inherit meson virtualx xdg
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
EGIT_BRANCH="develop"
else
- SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+ SRC_URI="
+ https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://cdn.turret.cyou/e28b2f940d1a19a74ecbfd80ea4477c5ea9ac627/${P}-manpages.tar.xz
+ "
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic seccomp sqlite synctex test"
+SLOT="0/5.6"
+IUSE="seccomp sqlite synctex test"
-RDEPEND=">=dev-libs/girara-0.3.1
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/girara-0.4.1
>=dev-libs/glib-2.50:2
- dev-python/sphinx
- >=sys-devel/gettext-0.19.8
+ dev-libs/json-glib
+ sys-apps/file
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
- magic? ( sys-apps/file )
seccomp? ( sys-libs/libseccomp )
- sqlite? ( >=dev-db/sqlite-3.5.9:3 )
- synctex? ( app-text/texlive-core )"
-
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )"
+ sqlite? ( >=dev-db/sqlite-3.6.23:3 )
+ synctex? ( app-text/texlive-core )
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-libs/check
+ >=x11-libs/gtk+-3.22:3[X]
+ )
+"
+BDEPEND="
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
-BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/zathura-0.5.4-disable-seccomp-tests.patch"
+)
src_configure() {
local emesonargs=(
- -Denable-magic=$(usex magic true false)
- -Denable-seccomp=$(usex seccomp true false)
- -Denable-sqlite=$(usex sqlite true false)
- -Denable-synctex=$(usex synctex true false)
+ -Dconvert-icon=disabled
+ -Dmanpages=disabled
+ -Dseccomp=$(usex seccomp enabled disabled)
+ -Dsqlite=$(usex sqlite enabled disabled)
+ -Dsynctex=$(usex synctex enabled disabled)
)
meson_src_configure
}
@@ -51,12 +68,7 @@ src_test() {
virtx meson_src_test
}
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
+src_install() {
+ meson_src_install
+ [[ ${PV} != *9999 ]] && doman "${WORKDIR}"/man/zathura*
}
diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest
new file mode 100644
index 000000000000..ff4a3054c4af
--- /dev/null
+++ b/app-text/zeal/Manifest
@@ -0,0 +1 @@
+DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d
diff --git a/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch b/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch
new file mode 100644
index 000000000000..977412c47339
--- /dev/null
+++ b/app-text/zeal/files/0002-settings-disable-checking-for-updates-by-default.patch
@@ -0,0 +1,26 @@
+From 3d499c8391e36b7fb1780815d04e533f26333145 Mon Sep 17 00:00:00 2001
+From: Henning Schild <henning@hennsch.de>
+Date: Sat, 9 Mar 2019 10:29:54 +0100
+Subject: [PATCH 2/2] settings: disable checking for updates by default
+
+Signed-off-by: Henning Schild <henning@hennsch.de>
+---
+ src/libs/core/settings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp
+index 8922bc4..549ddff 100644
+--- a/src/libs/core/settings.cpp
++++ b/src/libs/core/settings.cpp
+@@ -72,7 +72,7 @@ void Settings::load()
+
+ // TODO: Put everything in groups
+ startMinimized = settings->value(QStringLiteral("start_minimized"), false).toBool();
+- checkForUpdate = settings->value(QStringLiteral("check_for_update"), true).toBool();
++ checkForUpdate = settings->value(QStringLiteral("check_for_update"), false).toBool();
+
+ showSystrayIcon = settings->value(QStringLiteral("show_systray_icon"), true).toBool();
+ minimizeToSystray = settings->value(QStringLiteral("minimize_to_systray"), false).toBool();
+--
+2.19.2
+
diff --git a/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch b/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch
new file mode 100644
index 000000000000..0a5a8f69be2d
--- /dev/null
+++ b/app-text/zeal/files/zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch
@@ -0,0 +1,25 @@
+From b48ee895ce7fc1db1dce20dac5115ec4c60f75fa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 18 Aug 2020 15:03:59 +0200
+Subject: [PATCH] sidebar: Add missing STATIC keyword (similar to #1085)
+
+Fixes unresolved soname dependency after install.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/libs/sidebar/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libs/sidebar/CMakeLists.txt b/src/libs/sidebar/CMakeLists.txt
+index 4332b8f..dc6be0e 100644
+--- a/src/libs/sidebar/CMakeLists.txt
++++ b/src/libs/sidebar/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(Sidebar
++add_library(Sidebar STATIC
+ container.cpp
+ proxyview.cpp
+ view.cpp
+--
+2.28.0
+
diff --git a/app-text/zeal/metadata.xml b/app-text/zeal/metadata.xml
new file mode 100644
index 000000000000..af3ff4b585c0
--- /dev/null
+++ b/app-text/zeal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!--maintainer-needed-->
+ <upstream>
+ <remote-id type="github">zealdocs/zeal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild b/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild
new file mode 100644
index 000000000000..674a37e1858e
--- /dev/null
+++ b/app-text/zeal/zeal-0.6.1_p20200815-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=994cc5f6b6bfffddd5faaaafdb4fed483c38188f
+inherit cmake xdg-utils
+
+DESCRIPTION="Offline documentation browser inspired by Dash"
+HOMEPAGE="https://zealdocs.org/"
+SRC_URI="https://github.com/zealdocs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ app-arch/libarchive:=
+ dev-db/sqlite:3
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libxcb:=
+ >=x11-libs/xcb-util-keysyms-0.3.9
+"
+RDEPEND="${DEPEND}
+ x11-themes/hicolor-icon-theme
+"
+BDEPEND="kde-frameworks/extra-cmake-modules:0"
+
+PATCHES=(
+ "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch"
+ "${FILESDIR}/${P}-fix-sidebar-static-lib.patch"
+)
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
new file mode 100644
index 000000000000..c0fb797ec0bf
--- /dev/null
+++ b/app-text/zotero-bin/Manifest
@@ -0,0 +1,6 @@
+DIST zotero-bin-6.0.27-amd64.tar.bz2 69342785 BLAKE2B 0c324253d0f6b4385c54979f6806ee964fe4e349cbd18d5b67d93a68e6b4b0214ac52e29a2a30a3a301f300023fb980dc2386d827cec6d0aca2de08f0fd50d37 SHA512 558154c0458a6d820af62dbedd70dba99150a7e4a612685579c03efffe41338fe9606099ddffcc33ce29141754621b6ef547de470fdbfc8ebcffc179c7f11a40
+DIST zotero-bin-6.0.27-x86.tar.bz2 71001470 BLAKE2B b79488085f4ec646a94b8083c7556a7b8086d7e0f8a76349640f857b1df0ef6ad8856b5b614fdadfef04f3f66eedbe93095e2b49545abd8f62cb32139a7dc9b1 SHA512 7ee3d746d08980638402391f275094be545e7aaf6e5713d9dee4dddd921aace177cd29ee4e2965d39805d5ddcfbb3d68c025fae4a612fa23337104429dec467d
+DIST zotero-bin-6.0.30-amd64.tar.bz2 69463179 BLAKE2B e853e51ca11ef1a0f026819010773753030198f15b67ea1247ea5d8329442118e53d4ab4a213f32fd1fc9f6c4c94ea0f9aaff4fcaec1005c493b64b890b5ca38 SHA512 3ad9757a038b433221c26d3a27b4a5f3ece7e481c021ca936187ea491426b3e7e4a57b17b5ea712d3e453c244e62fa1eecc6de70ac9e1d54847637642f695ddf
+DIST zotero-bin-6.0.30-x86.tar.bz2 71098560 BLAKE2B bc0914c3bddc171207d27b94c35dcc031b85dcd2d177fe63c4415f372366674f1cbc9136721402db3fd4a74954c63ee41b4a77009b2260b8ecbf0bd145a80706 SHA512 2148ef94e1bb64c83b05212f19e3ee230a57c9298f4d05bc09dd34979c4b607fb49831e391aea247a32aae7673278204ef5eefbef9fe26d8a6beed7c98532a72
+DIST zotero-bin-6.0.35-amd64.tar.bz2 69475661 BLAKE2B d66ab95e8cfc954da76e74acf8936785460f8de0a4e204c761b0c32ca42fe1d71051f509f68fe0609751c670c598f74f4567c097b2ce89f0a3ebf3663833bc02 SHA512 f74574ecddba45c15f4cb61015969af0bdbc594e8f7f7707d6e5d6f6f74dca839b1f71cada2f5c66b530da28719a832ed0cc93c0684e948e17591a46fde50297
+DIST zotero-bin-6.0.35-x86.tar.bz2 71115051 BLAKE2B fb756681f6eca8dc45fb9eb44b5a1f0ca69138984cc4c8900d5b03ab4d637bea4d6e63bd6804d83e2aeef0209c4304202c1a0f2cc08c6f94dfcc62ca7152fa53 SHA512 93b11b8357dbb969e859938c604d109ae14b2a10d2bbe5d8096c0bd0cd3a89c65a64cc00d2b9fbff0339e8d2e0d4920701884965baae5bf29e9742049fb4703d
diff --git a/app-text/zotero-bin/metadata.xml b/app-text/zotero-bin/metadata.xml
new file mode 100644
index 000000000000..922dd08e5b72
--- /dev/null
+++ b/app-text/zotero-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>andrewammerlaan@gentoo.org</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">zotero/zotero</remote-id>
+ <bugs-to>https://github.com/zotero/zotero/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/zotero-bin/zotero-bin-6.0.27.ebuild b/app-text/zotero-bin/zotero-bin-6.0.27.ebuild
new file mode 100644
index 000000000000..07c557e6c051
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.27.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="
+ amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
+ x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+ app-accessibility/at-spi2-core
+ dev-libs/dbus-glib
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+ if use amd64; then
+ cd Zotero_linux-x86_64 || die
+ elif use x86; then
+ cd Zotero_linux-i686 || die
+ fi
+
+ # disable auto-update
+ sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+ # disable default oo installation questions - manual installation is still possible
+ sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+ extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+ # fix desktop-file
+ sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
+ sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+ default
+}
+
+src_install() {
+ if use amd64; then
+ cd Zotero_linux-x86_64 || die
+ elif use x86; then
+ cd Zotero_linux-i686 || die
+ fi
+
+ dodir opt/zotero
+ cp -a * "${ED}/opt/zotero" || die
+
+ dosym ../../opt/zotero/zotero usr/bin/zotero
+
+ domenu zotero.desktop
+
+ for size in 16 32 48 256; do
+ newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+ done
+}
diff --git a/app-text/zotero-bin/zotero-bin-6.0.30.ebuild b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild
new file mode 100644
index 000000000000..07c557e6c051
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.30.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="
+ amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
+ x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+ app-accessibility/at-spi2-core
+ dev-libs/dbus-glib
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+ if use amd64; then
+ cd Zotero_linux-x86_64 || die
+ elif use x86; then
+ cd Zotero_linux-i686 || die
+ fi
+
+ # disable auto-update
+ sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+ # disable default oo installation questions - manual installation is still possible
+ sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+ extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+ # fix desktop-file
+ sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
+ sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+ default
+}
+
+src_install() {
+ if use amd64; then
+ cd Zotero_linux-x86_64 || die
+ elif use x86; then
+ cd Zotero_linux-i686 || die
+ fi
+
+ dodir opt/zotero
+ cp -a * "${ED}/opt/zotero" || die
+
+ dosym ../../opt/zotero/zotero usr/bin/zotero
+
+ domenu zotero.desktop
+
+ for size in 16 32 48 256; do
+ newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+ done
+}
diff --git a/app-text/zotero-bin/zotero-bin-6.0.35.ebuild b/app-text/zotero-bin/zotero-bin-6.0.35.ebuild
new file mode 100644
index 000000000000..85c6ac8300be
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.35.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="
+ amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
+ x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+ app-accessibility/at-spi2-core
+ dev-libs/dbus-glib
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+ if use amd64; then
+ cd Zotero_linux-x86_64 || die
+ elif use x86; then
+ cd Zotero_linux-i686 || die
+ fi
+
+ # disable auto-update
+ sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+ # disable default oo installation questions - manual installation is still possible
+ sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+ extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+ # fix desktop-file
+ sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
+ sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+ default
+}
+
+src_install() {
+ if use amd64; then
+ cd Zotero_linux-x86_64 || die
+ elif use x86; then
+ cd Zotero_linux-i686 || die
+ fi
+
+ dodir opt/zotero
+ cp -a * "${ED}/opt/zotero" || die
+
+ dosym ../../opt/zotero/zotero usr/bin/zotero
+
+ domenu zotero.desktop
+
+ for size in 16 32 48 256; do
+ newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+ done
+}