summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/a2ps/a2ps-4.14-r7.ebuild (renamed from app-text/a2ps/a2ps-4.14-r6.ebuild)2
-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/ansifilter/metadata.xml3
-rw-r--r--app-text/apvlv/apvlv-0.4.0-r1.ebuild (renamed from app-text/apvlv/apvlv-0.4.0.ebuild)2
-rw-r--r--app-text/asciidoc/metadata.xml9
-rw-r--r--app-text/atril/Manifest1
-rw-r--r--app-text/atril/atril-1.24.0-r3.ebuild (renamed from app-text/atril/atril-1.24.0-r2.ebuild)7
-rw-r--r--app-text/atril/atril-1.24.1-r1.ebuild (renamed from app-text/atril/atril-1.24.1.ebuild)5
-rw-r--r--app-text/atril/atril-1.26.0-r2.ebuild119
-rw-r--r--app-text/bibletime/bibletime-3.0.3-r2.ebuild (renamed from app-text/bibletime/bibletime-3.0.3.ebuild)6
-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/binfind/binfind-0.0.3.ebuild17
-rw-r--r--app-text/binfind/files/binfind-0.0.3-clang16.patch9
-rw-r--r--app-text/cb2bib/cb2bib-2.0.0-r1.ebuild8
-rw-r--r--app-text/cherrytree/Manifest1
-rw-r--r--app-text/cherrytree/cherrytree-0.99.48.ebuild91
-rw-r--r--app-text/convertlit/convertlit-1.8-r4.ebuild (renamed from app-text/convertlit/convertlit-1.8-r3.ebuild)32
-rw-r--r--app-text/convertlit/files/convertlit-1.8-clang16.patch49
-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.ebuild4
-rw-r--r--app-text/convmv/convmv-2.05.ebuild33
-rw-r--r--app-text/convmv/metadata.xml5
-rw-r--r--app-text/dblatex/dblatex-0.3.12.ebuild4
-rw-r--r--app-text/dblatex/metadata.xml2
-rw-r--r--app-text/diff-pdf/Manifest1
-rw-r--r--app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild45
-rw-r--r--app-text/diff-pdf/diff-pdf-0.5.ebuild2
-rw-r--r--app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch24
-rw-r--r--app-text/ding/Manifest1
-rw-r--r--app-text/ding/ding-1.8.1.ebuild27
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild4
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild4
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild4
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild4
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild70
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild2
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild4
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild4
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild4
-rw-r--r--app-text/dos2unix/Manifest1
-rw-r--r--app-text/dos2unix/dos2unix-7.4.2.ebuild90
-rw-r--r--app-text/dos2unix/dos2unix-7.4.3.ebuild2
-rw-r--r--app-text/dvisvgm/Manifest1
-rw-r--r--app-text/dvisvgm/dvisvgm-2.14.ebuild55
-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-ghostscript.patch226
-rw-r--r--app-text/enscript/enscript-1.6.6-r1.ebuild (renamed from app-text/enscript/enscript-1.6.6.ebuild)3
-rw-r--r--app-text/enscript/files/enscript-1.6.2-implicit-function-decl.patch20
-rw-r--r--app-text/evince/Manifest2
-rw-r--r--app-text/evince/evince-42.3.ebuild2
-rw-r--r--app-text/evince/evince-43.0.ebuild (renamed from app-text/evince/evince-42.2.ebuild)4
-rw-r--r--app-text/expander/expander-2.05-r3.ebuild (renamed from app-text/expander/expander-2.0.5-r2.ebuild)16
-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/fbreader/fbreader-0.99.4-r6.ebuild4
-rw-r--r--app-text/ghostscript-gpl/Manifest2
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r1.ebuild187
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r2.ebuild (renamed from app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild)2
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild (renamed from app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild)5
-rw-r--r--app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild2
-rw-r--r--app-text/grip/grip-4.6.1.ebuild2
-rw-r--r--app-text/groonga/metadata.xml35
-rw-r--r--app-text/gspell/Manifest2
-rw-r--r--app-text/gspell/gspell-1.11.1.ebuild2
-rw-r--r--app-text/gspell/gspell-1.12.0.ebuild (renamed from app-text/gspell/gspell-1.10.0.ebuild)4
-rw-r--r--app-text/gv/Manifest1
-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.90-r1.ebuild (renamed from app-text/gv/gv-3.7.3.90.ebuild)4
-rw-r--r--app-text/gv/gv-3.7.4.ebuild62
-rw-r--r--app-text/html-xml-utils/Manifest1
-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-7.8.ebuild36
-rw-r--r--app-text/html2text/html2text-2.1.1.ebuild2
-rw-r--r--app-text/html401/html401-19991224-r4.ebuild4
-rw-r--r--app-text/htmlmin/htmlmin-0.1.12-r1.ebuild2
-rw-r--r--app-text/htmlmin/htmlmin-0.1.12.ebuild28
-rw-r--r--app-text/htmltidy/htmltidy-5.8.0-r1.ebuild2
-rw-r--r--app-text/hunspell/Manifest1
-rw-r--r--app-text/hunspell/hunspell-1.7.1.ebuild82
-rw-r--r--app-text/hyperestraier/files/hyperestraier-java-11.patch78
-rw-r--r--app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild (renamed from app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild)7
-rw-r--r--app-text/iso-codes/Manifest2
-rw-r--r--app-text/iso-codes/iso-codes-4.10.0.ebuild2
-rw-r--r--app-text/iso-codes/iso-codes-4.11.0.ebuild (renamed from app-text/iso-codes/iso-codes-4.9.0.ebuild)4
-rw-r--r--app-text/jo/Manifest1
-rw-r--r--app-text/jo/jo-1.6.ebuild (renamed from app-text/jo/jo-99999.ebuild)18
-rw-r--r--app-text/jo/jo-9999.ebuild36
-rw-r--r--app-text/jo/metadata.xml8
-rw-r--r--app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch47
-rw-r--r--app-text/kjots/kjots-5.1.0-r2.ebuild1
-rw-r--r--app-text/kramdown-rfc/Manifest2
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild2
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.13.ebuild (renamed from app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild)7
-rw-r--r--app-text/krop/krop-0.6.0-r1.ebuild2
-rw-r--r--app-text/krop/krop-9999.ebuild2
-rw-r--r--app-text/lesspipe/Manifest1
-rw-r--r--app-text/lesspipe/lesspipe-2.05-r1.ebuild (renamed from app-text/lesspipe/lesspipe-2.05.ebuild)2
-rw-r--r--app-text/lesspipe/lesspipe-2.06.ebuild52
-rw-r--r--app-text/letterize/files/letterize-1.4-clang16.patch8
-rw-r--r--app-text/letterize/letterize-1.4.ebuild6
-rw-r--r--app-text/libabw/libabw-0.1.3.ebuild4
-rw-r--r--app-text/libebook/libebook-0.1.3-r2.ebuild2
-rw-r--r--app-text/libepubgen/libepubgen-0.1.1-r1.ebuild2
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10-r1.ebuild2
-rw-r--r--app-text/libetonyek/libetonyek-9999.ebuild2
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.6.ebuild4
-rw-r--r--app-text/libgepub/Manifest1
-rw-r--r--app-text/libgepub/libgepub-0.7.0.ebuild40
-rw-r--r--app-text/libgepub/metadata.xml3
-rw-r--r--app-text/liblangtag/Manifest1
-rw-r--r--app-text/liblangtag/liblangtag-0.6.4.ebuild55
-rw-r--r--app-text/libmspub/libmspub-0.1.4.ebuild2
-rw-r--r--app-text/libmspub/libmspub-9999.ebuild2
-rw-r--r--app-text/libmwaw/libmwaw-0.3.21.ebuild2
-rw-r--r--app-text/libmwaw/libmwaw-9999.ebuild4
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.10.ebuild2
-rw-r--r--app-text/libodfgen/libodfgen-0.1.8.ebuild4
-rw-r--r--app-text/libodfgen/libodfgen-9999.ebuild4
-rw-r--r--app-text/libpaper/Manifest1
-rw-r--r--app-text/libpaper/libpaper-2.0.0.ebuild40
-rw-r--r--app-text/libpaper/metadata.xml11
-rw-r--r--app-text/libqxp/libqxp-0.0.2.ebuild2
-rw-r--r--app-text/libstaroffice/libstaroffice-0.0.7.ebuild4
-rw-r--r--app-text/libstaroffice/libstaroffice-9999.ebuild4
-rw-r--r--app-text/libwpd/libwpd-0.10.3.ebuild4
-rw-r--r--app-text/libwpg/libwpg-0.3.3.ebuild4
-rw-r--r--app-text/libwps/libwps-0.4.12.ebuild4
-rw-r--r--app-text/lv/lv-4.51-r4.ebuild49
-rw-r--r--app-text/lv/lv-4.51-r5.ebuild4
-rw-r--r--app-text/mandoc/mandoc-1.14.6.ebuild2
-rw-r--r--app-text/mdbook/Manifest40
-rw-r--r--app-text/mdbook/mdbook-0.4.21.ebuild (renamed from app-text/mdbook/mdbook-0.4.18.ebuild)40
-rw-r--r--app-text/mecab/mecab-0.996-r1.ebuild1
-rw-r--r--app-text/multitail/metadata.xml2
-rw-r--r--app-text/mupdf/Manifest3
-rw-r--r--app-text/mupdf/files/mupdf-1.20.0-lcms2.patch69
-rw-r--r--app-text/mupdf/mupdf-1.18.0-r4.ebuild156
-rw-r--r--app-text/mupdf/mupdf-1.20.0.ebuild8
-rw-r--r--app-text/mupdf/mupdf-1.20.3.ebuild (renamed from app-text/mupdf/mupdf-1.19.0.ebuild)15
-rw-r--r--app-text/mythes/Manifest1
-rw-r--r--app-text/mythes/mythes-1.2.4-r1.ebuild2
-rw-r--r--app-text/mythes/mythes-1.2.5.ebuild28
-rw-r--r--app-text/nuspell/Manifest2
-rw-r--r--app-text/nuspell/nuspell-5.1.1.ebuild51
-rw-r--r--app-text/nuspell/nuspell-5.1.2.ebuild51
-rw-r--r--app-text/pandoc-bin/Manifest8
-rw-r--r--app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild45
-rw-r--r--app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild (renamed from app-text/pandoc-bin/pandoc-bin-2.18.ebuild)2
-rw-r--r--app-text/pandoc-bin/pandoc-bin-2.19.ebuild44
-rw-r--r--app-text/pandoc/Manifest4
-rw-r--r--app-text/pandoc/files/pandoc-2.13-trypandoc.patch12
-rw-r--r--app-text/pandoc/files/pandoc-2.18-tests.patch79
-rw-r--r--app-text/pandoc/metadata.xml1
-rw-r--r--app-text/pandoc/pandoc-2.11.3.1.ebuild114
-rw-r--r--app-text/pandoc/pandoc-2.18-r2.ebuild (renamed from app-text/pandoc/pandoc-2.13.ebuild)95
-rw-r--r--app-text/pandoc/pandoc-2.9.2.1.ebuild112
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild4
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild (renamed from app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild)30
-rw-r--r--app-text/paperwork/paperwork-2.1.1-r1.ebuild (renamed from app-text/paperwork/paperwork-2.1.1.ebuild)7
-rw-r--r--app-text/pastebinit/files/pastebinit-1.5.1-distro.patch13
-rw-r--r--app-text/pastebinit/pastebinit-1.5.1-r1.ebuild74
-rw-r--r--app-text/pastebinit/pastebinit-1.5.1.ebuild6
-rw-r--r--app-text/pdfarranger/Manifest1
-rw-r--r--app-text/pdfarranger/pdfarranger-1.9.1.ebuild42
-rw-r--r--app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild5
-rw-r--r--app-text/pdftk/Manifest2
-rw-r--r--app-text/pdftk/pdftk-3.3.2-r1.ebuild80
-rw-r--r--app-text/pdftk/pdftk-3.3.3.ebuild82
-rw-r--r--app-text/pelican/Manifest1
-rw-r--r--app-text/pelican/pelican-4.8.0.ebuild (renamed from app-text/pelican/pelican-9999.ebuild)42
-rw-r--r--app-text/pep/files/pep-2.8-Fix-Wimplicit-int.patch18
-rw-r--r--app-text/pep/pep-2.8-r2.ebuild9
-rw-r--r--app-text/po4a/Manifest5
-rw-r--r--app-text/po4a/files/po4a-0.66-man.patch18
-rw-r--r--app-text/po4a/files/po4a-man.patch16
-rw-r--r--app-text/po4a/po4a-0.63-r1.ebuild52
-rw-r--r--app-text/po4a/po4a-0.66.ebuild4
-rw-r--r--app-text/po4a/po4a-0.67.ebuild (renamed from app-text/po4a/po4a-0.65.ebuild)5
-rw-r--r--app-text/po4a/po4a-0.68.ebuild (renamed from app-text/po4a/po4a-0.64.ebuild)4
-rw-r--r--app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild4
-rw-r--r--app-text/podofo/podofo-0.9.7.ebuild2
-rw-r--r--app-text/poppler-data/Manifest2
-rw-r--r--app-text/poppler-data/poppler-data-0.4.10.ebuild22
-rw-r--r--app-text/poppler-data/poppler-data-0.4.11-r2.ebuild27
-rw-r--r--app-text/poppler/Manifest9
-rw-r--r--app-text/poppler/files/poppler-22.05.0-missing-include.patch18
-rw-r--r--app-text/poppler/poppler-22.07.0.ebuild (renamed from app-text/poppler/poppler-22.05.0.ebuild)17
-rw-r--r--app-text/poppler/poppler-22.09.0.ebuild134
-rw-r--r--app-text/poppler/poppler-22.10.0.ebuild (renamed from app-text/poppler/poppler-22.06.0.ebuild)8
-rw-r--r--app-text/poppler/poppler-9999.ebuild10
-rw-r--r--app-text/pstotext/pstotext-1.9-r4.ebuild3
-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/metadata.xml11
-rw-r--r--app-text/psutils/psutils-1.17-r5.ebuild1
-rw-r--r--app-text/psutils/psutils-2.09.ebuild20
-rw-r--r--app-text/qpdf/Manifest16
-rw-r--r--app-text/qpdf/qpdf-10.3.2.ebuild56
-rw-r--r--app-text/qpdf/qpdf-10.4.0.ebuild56
-rw-r--r--app-text/qpdf/qpdf-10.5.0.ebuild88
-rw-r--r--app-text/qpdf/qpdf-10.6.1.ebuild88
-rw-r--r--app-text/qpdf/qpdf-10.6.2.ebuild89
-rw-r--r--app-text/qpdf/qpdf-11.0.0.ebuild (renamed from app-text/qpdf/qpdf-10.6.3-r100.ebuild)29
-rw-r--r--app-text/qpdf/qpdf-11.1.0-r2.ebuild77
-rw-r--r--app-text/qpdf/qpdf-11.1.1.ebuild77
-rw-r--r--app-text/rarian/Manifest2
-rw-r--r--app-text/rarian/rarian-0.8.1-r4.ebuild (renamed from app-text/rarian/rarian-0.8.1-r3.ebuild)24
-rw-r--r--app-text/recode/recode-3.7.11.ebuild2
-rw-r--r--app-text/recode/recode-3.7.12.ebuild8
-rw-r--r--app-text/recode/recode-3.7.9.ebuild2
-rw-r--r--app-text/rnv/metadata.xml5
-rw-r--r--app-text/rnv/rnv-1.7.11-r1.ebuild8
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild52
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild2
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1.ebuild41
-rw-r--r--app-text/scdoc/Manifest2
-rw-r--r--app-text/scdoc/metadata.xml7
-rw-r--r--app-text/scdoc/scdoc-1.11.0.ebuild44
-rw-r--r--app-text/scdoc/scdoc-1.11.1.ebuild44
-rw-r--r--app-text/scdoc/scdoc-1.11.2-r1.ebuild2
-rw-r--r--app-text/scdoc/scdoc-9999.ebuild2
-rw-r--r--app-text/sigil/Manifest4
-rw-r--r--app-text/sigil/sigil-1.9.10.ebuild (renamed from app-text/sigil/sigil-1.8.0.ebuild)13
-rw-r--r--app-text/sigil/sigil-1.9.20.ebuild (renamed from app-text/sigil/sigil-1.9.2-r1.ebuild)0
-rw-r--r--app-text/t1utils/Manifest1
-rw-r--r--app-text/t1utils/files/t1utils-1.41-memmem.patch27
-rw-r--r--app-text/t1utils/t1utils-1.41-r2.ebuild28
-rw-r--r--app-text/tesseract/Manifest1
-rw-r--r--app-text/tesseract/tesseract-5.2.0.ebuild92
-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-slibtool.patch98
-rw-r--r--app-text/texlive-core/texlive-core-2021-r2.ebuild (renamed from app-text/texlive-core/texlive-core-2021-r1.ebuild)6
-rw-r--r--app-text/texlive-core/texlive-core-2021-r3.ebuild361
-rw-r--r--app-text/texlive-core/texlive-core-2021-r4.ebuild366
-rw-r--r--app-text/tree/Manifest1
-rw-r--r--app-text/tree/metadata.xml2
-rw-r--r--app-text/tree/tree-2.0.1.ebuild2
-rw-r--r--app-text/tree/tree-2.0.2.ebuild41
-rw-r--r--app-text/unpaper/Manifest2
-rw-r--r--app-text/unpaper/metadata.xml10
-rw-r--r--app-text/unpaper/unpaper-7.0.0.ebuild (renamed from app-text/unpaper/unpaper-6.1-r1.ebuild)25
-rw-r--r--app-text/unpaper/unpaper-9999.ebuild29
-rw-r--r--app-text/wdiff/wdiff-1.2.2-r2.ebuild (renamed from app-text/wdiff/wdiff-1.2.2-r1.ebuild)15
-rw-r--r--app-text/wv/files/wv-1.2.9-C99-decls.patch101
-rw-r--r--app-text/wv/wv-1.2.9-r3.ebuild10
-rw-r--r--app-text/xapian-omega/Manifest2
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.19.ebuild2
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.20.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.21.ebuild42
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r3.ebuild117
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r4.ebuild2
-rw-r--r--app-text/xhtml1/xhtml1-20020801-r6.ebuild2
-rw-r--r--app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild4
-rw-r--r--app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild8
-rw-r--r--app-text/xmlto/files/xmlto-0.0.28-fix-warnings.patch116
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r9.ebuild56
-rw-r--r--app-text/xournalpp/xournalpp-1.1.1-r2.ebuild49
-rw-r--r--app-text/xournalpp/xournalpp-9999.ebuild23
-rw-r--r--app-text/xpdf/Manifest1
-rw-r--r--app-text/xpdf/xpdf-4.03.ebuild146
-rw-r--r--app-text/xpdf/xpdf-4.04-r1.ebuild (renamed from app-text/xpdf/xpdf-4.04.ebuild)11
-rw-r--r--app-text/zathura-pdf-mupdf/Manifest2
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild (renamed from app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild)24
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild2
-rw-r--r--app-text/zotero-bin/Manifest5
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.14.ebuild (renamed from app-text/zotero-bin/zotero-bin-6.0.8.ebuild)23
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.15.ebuild87
279 files changed, 5042 insertions, 2352 deletions
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r7.ebuild
index 614a0ba87c5..5beff0baee3 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r7.ebuild
@@ -17,7 +17,7 @@ IUSE="cjk emacs latex nls static-libs vanilla"
RESTRICT=test
RDEPEND="app-text/ghostscript-gpl
- app-text/libpaper
+ app-text/libpaper:=
>=app-text/psutils-1.17
app-text/wdiff
>=sys-apps/coreutils-6.10-r1
diff --git a/app-text/aha/Manifest b/app-text/aha/Manifest
new file mode 100644
index 00000000000..35f1276e19c
--- /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 00000000000..f8096fd528c
--- /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 ~ppc64 ~riscv"
+
+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 00000000000..6ec2ca9cae1
--- /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 00000000000..16118a3d4fa
--- /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/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 4c0df79c263..c27cd0454f6 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -5,4 +5,7 @@
<email>kensington@gentoo.org</email>
<name>Michael Palimaka</name>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">saalen/ansifilter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/apvlv/apvlv-0.4.0.ebuild b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
index 50ce18678ec..b18584848d2 100644
--- a/app-text/apvlv/apvlv-0.4.0.ebuild
+++ b/app-text/apvlv/apvlv-0.4.0-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
>=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
dev-libs/glib:2
dev-libs/libxml2
- net-libs/webkit-gtk:=
+ net-libs/webkit-gtk:4=
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 47206531efe..fe643142c87 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <name>Thamognya Kodi</name>
- <email>contact@thamognya.com</email>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">asciidoc</remote-id>
<remote-id type="github">asciidoc-py/asciidoc-py</remote-id>
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index c435e33d217..f581395865b 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,2 +1,3 @@
DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
DIST atril-1.24.1.tar.xz 2043552 BLAKE2B 01e41e53a38684c237fadef200614cf8d70cb84410a00bb9d28b200fcac43a2bf45cd81c4c7f19ab1351891f179ee64cd880bca1aa38cf68727bcf1da3e06c8d SHA512 94a55e7699bdfc9368e20986664bd411c12f50f466874ebf20210df3de6ddb499866b505e157c56b58a8065aad2c24284b96afa8c547a6cd259eef413096a91a
+DIST atril-1.26.0.tar.xz 1986160 BLAKE2B 40de33749113144c49341cf8249bd20de37c3d64f3daa865dfe2bcad117e1c2b5aae2aef3b4e0199fd2656b17af236e2a863ef97933decc5072e3419219154e4 SHA512 9c4e8b1c45959136c8fc4c5db47117e45e8afca8be2294418e6c1a0f8098c162ccaa4a60e5baea34db91d45d345a3953afe95281782986e7046b87a34c8f7dbd
diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r3.ebuild
index 55de51ce62b..f5307411c13 100644
--- a/app-text/atril/atril-1.24.0-r2.ebuild
+++ b/app-text/atril/atril-1.24.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,10 @@ REQUIRED_USE="t1lib? ( dvi )"
COMMON_DEPEND="
>=app-text/poppler-0.22[cairo]
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
>=dev-libs/glib-2.62:2
>=dev-libs/libxml2-2.5:2
sys-libs/zlib
diff --git a/app-text/atril/atril-1.24.1.ebuild b/app-text/atril/atril-1.24.1-r1.ebuild
index 3d098e7a9f2..77196d6dd8b 100644
--- a/app-text/atril/atril-1.24.1.ebuild
+++ b/app-text/atril/atril-1.24.1-r1.ebuild
@@ -23,7 +23,10 @@ REQUIRED_USE="t1lib? ( dvi )"
COMMON_DEPEND="
>=app-text/poppler-0.22[cairo]
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
>=dev-libs/glib-2.62:2
>=dev-libs/libxml2-2.5:2
sys-libs/zlib
diff --git a/app-text/atril/atril-1.26.0-r2.ebuild b/app-text/atril/atril-1.26.0-r2.ebuild
new file mode 100644
index 00000000000..a11d6f7ba6d
--- /dev/null
+++ b/app-text/atril/atril-1.26.0-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 gnome-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
+ >=net-libs/webkit-gtk-2.6.0:4
+ )
+ gnome-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:0 )
+ 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-util/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 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 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/bibletime/bibletime-3.0.3.ebuild b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
index 08049be9d0a..8ab6bbf45a4 100644
--- a/app-text/bibletime/bibletime-3.0.3.ebuild
+++ b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
RDEPEND=">=app-text/sword-1.8.1
dev-cpp/clucene
@@ -25,11 +25,11 @@ RDEPEND=">=app-text/sword-1.8.1
dev-qt/qtxml:5"
DEPEND="${RDEPEND}
dev-libs/boost
- dev-libs/icu:=
- dev-qt/linguist-tools:5
+ dev-libs/icu
dev-qt/qttest:5
net-misc/curl
sys-libs/zlib"
+BDEPEND="dev-qt/linguist-tools:5"
DOCS=( ChangeLog README.md )
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 00000000000..955de2fe311
--- /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 00000000000..87a129c9d80
--- /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/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index 98b9511f637..fce82cc6b67 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit autotools
DESCRIPTION="Search files for a byte sequence specified on the command line"
HOMEPAGE="https://www.lith.at/binfind/"
@@ -10,4 +12,13 @@ SRC_URI="https://www.lith.at/binfind/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ 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 00000000000..12a7174ec0e
--- /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/cb2bib/cb2bib-2.0.0-r1.ebuild b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
index 746edabdcd5..a46e68c271d 100644
--- a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -51,6 +51,8 @@ src_install() {
}
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"
@@ -62,10 +64,6 @@ pkg_postinst() {
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/cherrytree/Manifest b/app-text/cherrytree/Manifest
index b18ed8916d6..8337beb3344 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,3 @@
DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742 SHA512 2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
+DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865 SHA512 eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
diff --git a/app-text/cherrytree/cherrytree-0.99.48.ebuild b/app-text/cherrytree/cherrytree-0.99.48.ebuild
new file mode 100644
index 00000000000..7787d4048a9
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.48.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
+ S="${WORKDIR}/${P}/future"
+else
+ SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+ #SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${P/-/_}
+
+ KEYWORDS="~amd64 ~x86"
+ # S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# 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/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ dev-libs/fribidi
+ dev-libs/spdlog
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig
+ nls? (
+ sys-devel/gettext
+ )
+ test? ( dev-util/cpputest )"
+
+python_check_deps() {
+ has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ # disable compress man pages
+ sed -i -e \
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+ CMakeLists.txt || die
+
+ if [[ ${PV} != *9999 ]]; then
+ sed -i \
+ -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+ CMakeLists.txt || die
+ fi
+
+ # 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/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r4.ebuild
index 840c6a5c1e1..552a931c519 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -10,35 +10,31 @@ 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"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
RDEPEND=">=dev-libs/libtommath-0.36-r1"
-
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S="${WORKDIR}"
+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}-respectflags-r1.patch
+ "${FILESDIR}"/fix-Wformat-security-warnings.patch
+ "${FILESDIR}"/support-ar-variable.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_compile() {
- tc-export CC
+ tc-export AR 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
+ emake -C lib
+ emake -C ${MY_P}
}
src_install() {
+ dobin ${MY_P}/clit
einstalldocs
- dobin "${MY_P}/clit"
}
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 00000000000..13d5786c13f
--- /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/convmv/Manifest b/app-text/convmv/Manifest
index 2b209844456..0fa5c9d870b 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 2ab22aafa42..00000000000
--- a/app-text/convmv/convmv-2.04.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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
index 12ab21e7e29..5d0c25ddedf 100644
--- a/app-text/convmv/convmv-2.05-r1.ebuild
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 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="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/convmv/convmv-2.05.ebuild b/app-text/convmv/convmv-2.05.ebuild
deleted file mode 100644
index 59f68eebfee..00000000000
--- 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/metadata.xml b/app-text/convmv/metadata.xml
index bef24d2c233..ec151f29d1b 100644
--- a/app-text/convmv/metadata.xml
+++ b/app-text/convmv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index 122c894d418..067205a95c9 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -58,3 +58,7 @@ 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/metadata.xml b/app-text/dblatex/metadata.xml
index 84b40f0ce16..104575f56ef 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -10,7 +10,7 @@
<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/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index 0af00322a81..9486bceaf45 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,2 +1 @@
-DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
DIST diff-pdf-0.5.tar.gz 135755 BLAKE2B e4b9599b4f443171473ef483fe868c58e0a0c9f23838895aa08f1bd662c4df920fdb50277d2d0a5b28d5bb66054e700012a98be636a12d34ec919ad85d332cc0 SHA512 62a868118fc807b433e504edfefdc6a9598a8197aaf5cd4e46451b67d5d73fcf9234bd6efbe6307ed7c3821aabef8edea81cbb0bbe5f4d34365c5f8d6dd9a51d
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
deleted file mode 100644
index ec808cb9bab..00000000000
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit autotools wxwidgets
-
-DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://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}"
-
-PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- setup-wxwidgets
- default
-}
diff --git a/app-text/diff-pdf/diff-pdf-0.5.ebuild b/app-text/diff-pdf/diff-pdf-0.5.ebuild
index 20cd79c4323..2ec1dc0bd7d 100644
--- a/app-text/diff-pdf/diff-pdf-0.5.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
# version 2.16.5 of GTK+, which is licensed LGPL-2+.
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
# The build system checks for "poppler-glib", which is provided only
diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
deleted file mode 100644
index ecef020a998..00000000000
--- a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001
-From: FX Coudert <fxcoudert@gmail.com>
-Date: Sat, 12 Dec 2020 16:18:59 +0100
-Subject: [PATCH] Remove legacy poppler-cairo dependency (#69)
-
-poppler-glib already depended on it, so this is non-breaking,
-and it is removed in poppler 0.18.1.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 382e220..2e9b6e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,7 +41,7 @@ AC_LANG(C++)
- dnl === Library checks ===
-
- PKG_CHECK_MODULES(POPPLER,
-- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf])
-+ [poppler-glib >= 0.10 cairo-pdf])
-
- AM_OPTIONS_WXCONFIG
- AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])
diff --git a/app-text/ding/Manifest b/app-text/ding/Manifest
index 309a55a3e1c..6081e827bc0 100644
--- a/app-text/ding/Manifest
+++ b/app-text/ding/Manifest
@@ -1,2 +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 fee3c2f2be2..00000000000
--- a/app-text/ding/ding-1.8.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-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"
-
-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/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
index dfb1003e7ab..e22f103cf28 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
BDEPEND=">=app-arch/unzip-5.41"
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
index dfb1003e7ab..e22f103cf28 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
BDEPEND=">=app-arch/unzip-5.41"
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
index ef1ddb6b081..1224a947fd1 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
BDEPEND=">=app-arch/unzip-5.41"
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
index 3391332678f..cf1e1f19c87 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
deleted file mode 100644
index 344496f27da..00000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 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 ~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/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
- sys-apps/which
- 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>
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${MY_P}-elinks.patch
- eapply "${FILESDIR}"/${P}-grep-2.7.patch
- 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/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
index 70b3d5d7866..43f3d58d7e5 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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
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
index 4650a13e7f0..cc284bad92d 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
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
index ebc3aba11d4..22309833e00 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
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
index 5e77faad079..2b4ddeebe06 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index a7860f08787..6a9a84a0371 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,2 +1 @@
-DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
DIST dos2unix-7.4.3.tar.gz 788278 BLAKE2B da959b06e583bbf27a2cb2ce5b1f1a41380722aa09ac75b3d31260e92fd6f1203d87266d3a12201b036a69796b4aa4f23718741036e20fe686801bb368fbde22 SHA512 1c6d81348de8aca451174794141d0802685487cf6847fa91f7de745d89bcf2af864fc2ec549b9af72031891d4efcb9731fe823ce05da36d1f9e9890ff2cb60fb
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
deleted file mode 100644
index 47f57b19bcd..00000000000
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR 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="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"
-[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-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 )"
-
-S="${WORKDIR}/${P/_/-}"
-
-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.4.3.ebuild b/app-text/dos2unix/dos2unix-7.4.3.ebuild
index 65a98455645..bc7cc8179d7 100644
--- a/app-text/dos2unix/dos2unix-7.4.3.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/-}"
LICENSE="BSD-2"
SLOT="0"
[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index cb823daaa58..fc6aa6c9597 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,2 +1,3 @@
DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008
DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795acb75063f35bf2b6b15b6bacc8ddc60d9622d8554c80f7c2ab44c85c78a120d4e18fd7a0c902eabb70b6060fc SHA512 264643f9d9dcfa7e1d20df31c3514108ed45c88e0bd0f1ce88c37af22ae57447d624537720e902c5e5e799906d567999c9449fea411f755e75e4c4158e37de30
+DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6
diff --git a/app-text/dvisvgm/dvisvgm-2.14.ebuild b/app-text/dvisvgm/dvisvgm-2.14.ebuild
new file mode 100644
index 00000000000..7a3027f6d6e
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.14.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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}"/${PN}-2.14-Add-missing-cstdint-includes-for-GCC-13.patch
+)
+
+src_configure() {
+ local myargs=(
+ --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 00000000000..cad403e34fc
--- /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-ghostscript.patch b/app-text/dvisvgm/files/dvisvgm-2.14-ghostscript.patch
new file mode 100644
index 00000000000..88b3dcfde3f
--- /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/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6-r1.ebuild
index bb889e8b0db..f7a75d380af 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,6 +26,7 @@ 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() {
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 00000000000..90868d18202
--- /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/evince/Manifest b/app-text/evince/Manifest
index 5160942a156..60881c51826 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,2 +1,2 @@
-DIST evince-42.2.tar.xz 2854836 BLAKE2B ed8b9e6117d2d456e59d5fd4aac664b73fb450589a04b04b3ada7f1606781001c5ab75a98d425fdf00409e2f4abad59f6a140f39df4ca6bd82a641caaf944062 SHA512 81e93eb5575169ed1a31fdd321a1d7080b4391ddf1ebf13ce49df5ede8bb5f578094b55b2e1075f0a418ef21e8b73f02b259c2bda44b317ea9f551372ee3b860
DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e
+DIST evince-43.0.tar.xz 2908508 BLAKE2B 5f1a9a697693a64c2b54ae5d5499ae8993b02f2df0b1706d0335770037285bb13e2af5254d7ff65ae4abb5a0c8ed6e338c61306f47e121de8c6546407c8968d5 SHA512 dd50ba45c4eb56f8af1df38f7a12c3c13747a1053bb97c8600d85cbc398e340d7bc5db73f441b68cfb8294ab985be361e48605cdc5e3dccb051d917869a12ba9
diff --git a/app-text/evince/evince-42.3.ebuild b/app-text/evince/evince-42.3.ebuild
index c8e4f7b1747..b299f33dce2 100644
--- a/app-text/evince/evince-42.3.ebuild
+++ b/app-text/evince/evince-42.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
diff --git a/app-text/evince/evince-42.2.ebuild b/app-text/evince/evince-43.0.ebuild
index b299f33dce2..0dc935d74b7 100644
--- a/app-text/evince/evince-42.2.ebuild
+++ b/app-text/evince/evince-43.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
@@ -40,7 +40,7 @@ DEPEND="
gnome? ( gnome-base/gnome-desktop:3= )
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
introspection? ( >=dev-libs/gobject-introspection-1:= )
- nautilus? ( >=gnome-base/nautilus-3.28.0 )
+ 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:0= )
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.05-r3.ebuild
index 6684a72038d..ee8a110a01e 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.05-r3.ebuild
@@ -1,21 +1,23 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+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_2.05.tar.gz"
+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"
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-clang15.patch
+)
src_compile() {
emake -C src CC="$(tc-getCC)"
@@ -35,7 +37,7 @@ src_install() {
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 "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 00000000000..a7ae9bed3dd
--- /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 460a8164cee..460a8164cee 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/fbreader/fbreader-0.99.4-r6.ebuild b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
index 5ab017db26e..7b1a9042d69 100644
--- a/app-text/fbreader/fbreader-0.99.4-r6.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,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/fbreader-0.99.4-combined.patch"
+ https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-combined.patch"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 31c9cc0c5b7..7851a6b7552 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,6 @@
+DIST ghostscript-10.0.0.tar.xz 62749144 BLAKE2B 10b962d358994506b69aba34827ea9d6a86c61e5093d7371b8350ff29a74b1db4816d0a62ff64f5d0e5a652fcd0304224c6236d33e717299789dfb2c9f350e24 SHA512 660252841e9b24c411bc92d0eb104de464686131e70051f60108db1a6ecfe2ada2ccacbeed8f2ac84bf69338ad75c850e814c9ac4e0351943f9989d66b3b082d
DIST ghostscript-9.55.0.tar.xz 67417724 BLAKE2B 87827856aa60c2c4a4ed209bc4203a837107df0404af036a48e5baa23fccfc945a97fe328a80b15c7357fc71acb82721d4b96e5f726d8c9d836fee031916aef7 SHA512 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
DIST ghostscript-9.56.1.tar.xz 62589232 BLAKE2B c0457c98e3f13047d9015d9d1415e2935e142d172aa8c560e68250a4110ccb52167988af70e63d86fc3f462a5d521ac45f7b758cb8d1492670930d9b2dc2e196 SHA512 fe5a5103c081dd87cf8b3e0bbbd0df004c0e4e04e41bded7c70372916e6e26249a0e8fa434b561292964c5f3820ee6c60ef1557827a6efb5676012ccb73ded85
+DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
DIST ghostscript-gpl-9.56.1-patchset-01.tar.xz 2960 BLAKE2B c43f00dce6d1aada40c8e628a1032afe1bf9789b3ad69d9dac2ae94ba040a380c01884173f0ec05ba59240421dc5a53cae45adbbb13dccc9c366b1a6dea7794f SHA512 a444c687ab0f2c3f945f6854991799c2aeca3c410eba4bc53ad7bcc68b0ba8d187c09baebabb6581144781d35b4f2d4e29ff625ca55b0f640a033ba27e993f30
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r1.ebuild
new file mode 100644
index 00000000000..6a6286bd995
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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}"
+
+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() {
+ 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
+
+ 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 \
+ --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
+
+ if ! use l10n_de; then
+ rm -r "${ED}"/usr/share/man/de || die
+ fi
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r2.ebuild
index 2af192b34ec..41532fc442b 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r2.ebuild
@@ -32,7 +32,7 @@ for X in ${LANGS} ; do
done
DEPEND="
- app-text/libpaper
+ app-text/libpaper:=
media-libs/fontconfig
>=media-libs/freetype-2.4.9:2=
>=media-libs/jbig2dec-0.19:=
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
index 7a14da73aa0..e98a9f07ffc 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
@@ -32,7 +32,7 @@ for X in ${LANGS} ; do
IUSE="${IUSE} l10n_${X}"
done
-DEPEND="app-text/libpaper
+DEPEND="app-text/libpaper:=
media-libs/fontconfig
>=media-libs/freetype-2.4.9:2=
>=media-libs/jbig2dec-0.19:=
@@ -48,8 +48,9 @@ DEPEND="app-text/libpaper
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
+ >=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 )
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index a7233894758..748e7a382e7 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/grip/grip-4.6.1.ebuild b/app-text/grip/grip-4.6.1.ebuild
index 224d3078f62..94f4ad0ba80 100644
--- a/app-text/grip/grip-4.6.1.ebuild
+++ b/app-text/grip/grip-4.6.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit distutils-r1
DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 8d14952aa04..e44ae2d43a9 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- 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>
+ <!-- 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/gspell/Manifest b/app-text/gspell/Manifest
index 1a928a69544..c1d6d5fe0aa 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,2 +1,2 @@
-DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
DIST gspell-1.11.1.tar.xz 432216 BLAKE2B aa6e6873fcb9cc7d3e7e05fe0abdd3b2e271c0483b7dc4d1c28179b87cea66b0fef86aa6ca94b7a571447ab70ac4ec55ac04b4b1f78415bea2db6c4f8fbc69ce SHA512 df13ef76340b3f644b517f05941c4a11f90212511229a4644cda0d605af428222bf7dd15dbdf51da80e07b7689249728f5739020349226b78d1990707f9706d9
+DIST gspell-1.12.0.tar.xz 433068 BLAKE2B 5726f40b07ee1d23a5a2e22ed012b52d6090a645b3141ecaf6a92cc850442be605ff2481a28ec87ee0d5b727b792fe2812a3e32ffd05978ed984d92b593910ec SHA512 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
diff --git a/app-text/gspell/gspell-1.11.1.ebuild b/app-text/gspell/gspell-1.11.1.ebuild
index 41d559da553..d342cb38335 100644
--- a/app-text/gspell/gspell-1.11.1.ebuild
+++ b/app-text/gspell/gspell-1.11.1.ebuild
@@ -10,7 +10,7 @@ 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gspell/gspell-1.10.0.ebuild b/app-text/gspell/gspell-1.12.0.ebuild
index 43f8285f788..41d559da553 100644
--- a/app-text/gspell/gspell-1.10.0.ebuild
+++ b/app-text/gspell/gspell-1.12.0.ebuild
@@ -6,11 +6,11 @@ EAPI=8
inherit gnome2 vala virtualx
DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+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 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index bdd011b0171..b22dca3b813 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1 +1,2 @@
DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
+DIST gv-3.7.4.tar.gz 759287 BLAKE2B 2f18309d16a3c11dc0da0fa507f43c8128a4cabff8c1675895fac011702db677ef51989d2536bcbc7d3b4aa3e3cdf470a2a3e4699109b501141caffeb7e532a8 SHA512 f6dc072b6b72b6c543733501c719aa38c81a2e2fc63fbf1459b8a3a50a1a70eca9fc9def2fbeb51cb7bb81cfc3b20f136732d935740693bf541d7135975df648
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 00000000000..b55ddbd4a3e
--- /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 00000000000..d50f67c79cb
--- /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 00000000000..94808a8b8ea
--- /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 00000000000..aeaea246d02
--- /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 00000000000..05cbda055f6
--- /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 00000000000..540d590e452
--- /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 00000000000..15c39e3cbda
--- /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.90.ebuild b/app-text/gv/gv-3.7.3.90-r1.ebuild
index 697602c649e..31c99c911a5 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- >=x11-libs/libXaw3d-1.6-r1[unicode]
+ >=x11-libs/libXaw3d-1.6-r1[unicode(+)]
x11-libs/libXext
x11-libs/libXmu
x11-libs/libXpm
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 00000000000..5e5666d70fd
--- /dev/null
+++ b/app-text/gv/gv-3.7.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 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/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 86852ff8c87..723b01a4aa1 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,2 +1 @@
-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
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 52e4be4a403..00000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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"
-
-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 00000000000..40dab6ff640
--- /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-7.8.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
deleted file mode 100644
index 6859458d15d..00000000000
--- a/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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"
-
-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/html2text/html2text-2.1.1.ebuild b/app-text/html2text/html2text-2.1.1.ebuild
index eb8aef7abf0..ee93a794aec 100644
--- a/app-text/html2text/html2text-2.1.1.ebuild
+++ b/app-text/html2text/html2text-2.1.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="HTML to text converter"
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
index 8b2044b8789..65a3e66ba88 100644
--- a/app-text/html401/html401-19991224-r4.ebuild
+++ b/app-text/html401/html401-19991224-r4.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
@@ -6,7 +6,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-19991224/html40.tgz"
+SRC_URI="https://www.w3.org/TR/1999/REC-html401-${PV}/html40.tgz"
LICENSE="W3C"
SLOT="0"
diff --git a/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
index 6bc38c00903..ec36bdcb2d0 100644
--- a/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
distutils_enable_tests setup.py
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 6cdeeaa6b4c..00000000000
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~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/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 3259929cc1d..b69b369a2d1 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
RUBY_OPTIONAL="yes"
inherit cmake ruby-ng
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index eeaae2baf2d..221793b182b 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1 +1,2 @@
DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
+DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
diff --git a/app-text/hunspell/hunspell-1.7.1.ebuild b/app-text/hunspell/hunspell-1.7.1.ebuild
new file mode 100644
index 00000000000..fa4279305dc
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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 ~sparc-solaris ~x64-solaris ~x86-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}/${PN}-1.7.0-renameexes.patch"
+
+ "${FILESDIR}/${PN}-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/hyperestraier/files/hyperestraier-java-11.patch b/app-text/hyperestraier/files/hyperestraier-java-11.patch
new file mode 100644
index 00000000000..fa143fb2387
--- /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-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
index 28d438f7c84..c6658e72af5 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+EAPI="8"
+USE_RUBY="ruby27 ruby30 ruby31"
RUBY_OPTIONAL="yes"
inherit autotools java-pkg-opt-2 perl-functions ruby-ng
@@ -31,6 +31,7 @@ S="${WORKDIR}/all/${P}"
PATCHES=(
"${FILESDIR}"/${PN}-configure.patch
+ "${FILESDIR}"/${PN}-java-11.patch
"${FILESDIR}"/${PN}-perl.patch
"${FILESDIR}"/${PN}-ruby19.patch
)
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index ec5964c75c9..a5c9683a4bf 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,2 +1,2 @@
DIST iso-codes-v4.10.0.tar.gz 14624397 BLAKE2B a797db4cad381ae92bdeebf2b771059b5033a763dd1dc4ec85ac9eb81448482b20fc2c7293605816ad59ca6f5559221c72e22b6c0cd2c167af77b4f40dece4e3 SHA512 f77568fd803c32d8f28fc123c64c3122859f51c4c8f2f9cc4dc857e51d6fd6d1dfa42a4531f699b1f4b4b89adecb541a56e2cce0aac81ebf83f9c063dd79c86e
-DIST iso-codes-v4.9.0.tar.gz 14483789 BLAKE2B 683921fede69149cf196b70dded975763746d943f470d21e517334890c4c45b11b551c0746e3907341e55870ac733d1f14f74ea5cf723e3f4df164f56531b7da SHA512 0e14101b6a1480c463d83b32a40715485ad5494e799bf0cb6b7ed927b69dff0454512bbccbcc23de8741bf7dce139feb7490c4edf75b4a0af8473fe5ad9c567c
+DIST iso-codes-v4.11.0.tar.gz 14756251 BLAKE2B dd3bc5bae4def6338527a9c7c41f0ef9603eb2a2a7e4e2a95399bc4891a0d66fa323bb1f960263662cd6b4a42902defede64ad732f4a894d3073a7a68b5b9f80 SHA512 524be572c2505b0b2d55a7a0dd8d6bdff68edbc89c569652b11070cc6412881c98ea66a001193f1540153d44d6b41d921444a1d1a2bde6929bbe445eb369ea3e
diff --git a/app-text/iso-codes/iso-codes-4.10.0.ebuild b/app-text/iso-codes/iso-codes-4.10.0.ebuild
index f8827b975f2..ea78d3608c3 100644
--- a/app-text/iso-codes/iso-codes-4.10.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}
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 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
BDEPEND="${PYTHON_DEPS}
sys-devel/gettext
diff --git a/app-text/iso-codes/iso-codes-4.9.0.ebuild b/app-text/iso-codes/iso-codes-4.11.0.ebuild
index ea78d3608c3..9b99e0d3bc5 100644
--- a/app-text/iso-codes/iso-codes-4.9.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.11.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
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 mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro 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
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 51d13aea303..d415981d974 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1 +1,2 @@
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/jo-99999.ebuild b/app-text/jo/jo-1.6.ebuild
index 098a68881de..162d12aebd8 100644
--- a/app-text/jo/jo-99999.ebuild
+++ b/app-text/jo/jo-1.6.ebuild
@@ -1,16 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools bash-completion-r1 git-r3
+EAPI=8
+
+inherit autotools bash-completion-r1
DESCRIPTION="JSON output from a shell"
HOMEPAGE="https://github.com/jpmens/jo"
-EGIT_REPO_URI="https://github.com/jpmens/${PN}"
+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"
-KEYWORDS=""
+
+BDEPEND="virtual/pkgconfig"
src_prepare() {
default
diff --git a/app-text/jo/jo-9999.ebuild b/app-text/jo/jo-9999.ebuild
new file mode 100644
index 00000000000..162d12aebd8
--- /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 6aaa98d22ea..b063edbe677 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,8 +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">jpmens/jo</remote-id>
- </upstream>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">jpmens/jo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch
new file mode 100644
index 00000000000..fc5240105b0
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.08.0.patch
@@ -0,0 +1,47 @@
+From 85121754c862417e872048ae2f85e9b9fe2ddc7a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 14 Jul 2022 14:27:55 +0200
+Subject: [PATCH] Adapt to new KontactInterface::Plugin ctor
+
+---
+ src/kontact_plugin/kjots_plugin.cpp | 5 +++++
+ src/kontact_plugin/kjots_plugin.h | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp
+index 1146ab3..c75faac 100644
+--- a/src/kontact_plugin/kjots_plugin.cpp
++++ b/src/kontact_plugin/kjots_plugin.cpp
+@@ -40,8 +40,13 @@
+
+ EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json")
+
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41)
++KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &/*args*/)
++ : KontactInterface::Plugin(core, core, md, "kjots")
++#else
+ KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &/*args*/)
+ : KontactInterface::Plugin(core, core, "kjots")
++#endif
+ {
+ setComponentName(QStringLiteral("kjots"), i18n("KJots"));
+
+diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h
+index 28a793b..03ff500 100644
+--- a/src/kontact_plugin/kjots_plugin.h
++++ b/src/kontact_plugin/kjots_plugin.h
+@@ -34,7 +34,11 @@ class KJotsPlugin : public KontactInterface::Plugin
+ Q_OBJECT
+
+ public:
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41)
++ KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData &md, const QVariantList &);
++#else
+ KJotsPlugin(KontactInterface::Core *core, const QVariantList &);
++#endif
+
+ int weight() const override
+ {
+--
+GitLab
+
diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
index 7ef5fe96825..ade68829883 100644
--- a/app-text/kjots/kjots-5.1.0-r2.ebuild
+++ b/app-text/kjots/kjots-5.1.0-r2.ebuild
@@ -52,4 +52,5 @@ PATCHES=(
"${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580
"${FILESDIR}/${P}-speech-optional.patch" # bug 835128
"${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272
+ "${FILESDIR}/${P}-akonadi-22.08.0.patch" # bug 867082
)
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index 038aa01a0f6..77987b95710 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1,2 +1,2 @@
-DIST kramdown-rfc-1.6.5.gem 4608 BLAKE2B fb62c69a186f80da15555937209b59af370a5c9dd742d5a704e4af73931728fb7337162848af02dab7d7ee520c7883a82b00adcc0e4b5ab97020f9fc530ee42a SHA512 0bd9f24bf793e9a92f7a479a75a739cea4bfd8cdd20ee9c4bd52b8de5c7fe71db777ac0826412e132b2c227dfcf9c4b333f3bfb648f4598599919a64a21bce69
DIST kramdown-rfc2629-1.6.11.gem 55296 BLAKE2B ed2f60e4ad5c4d35acbcfeb0b7d57928a2b9c5d7676379ce5cfee11de21a7d02593218b9728ce11b828cb28055f1580c474a176f751d7239315b8857893a3733 SHA512 da97a25df4efb4e618fc3b35cdc7fd7343d670758e2af4aefe16212054063f3d682ba59ad961eed54594ce76e45e5f7f90e1237b96ca31808e06c757c0c284d7
+DIST kramdown-rfc2629-1.6.13.gem 55296 BLAKE2B c880e114567739ca99af76457cbca5b13bb5554c2016fac1a3233eb8e32db0ecfbb2e91d42109f53c34e284bffa9d501ce65b037dfc468b173c6ffa83ecf0a88 SHA512 8c1f9cf69d83c02b5b2b2793d35add9ca5207a5e412dfcf674c2f0f9f835f8b1a2c0afa96c77b5771e8cd116d63ab1bee9a0f507dc03535fe3566da2d2bc759e
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild
index c39dcb1683d..3156d56315c 100644
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/cabo/kramdown-rfc"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
ruby_add_rdepend "
>=dev-ruby/certified-1.0.0
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.13.ebuild
index ea795b2d7ef..3156d56315c 100644
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.13.ebuild
@@ -5,6 +5,9 @@ EAPI=8
USE_RUBY="ruby26 ruby27"
+# 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"
@@ -16,12 +19,12 @@ HOMEPAGE="https://github.com/cabo/kramdown-rfc"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
ruby_add_rdepend "
>=dev-ruby/certified-1.0.0
>=dev-ruby/json-2.0.0
- >=dev-ruby/kramdown-2.3.0
+ >=dev-ruby/kramdown-2.4.0
>=dev-ruby/kramdown-parser-gfm-1.1.0
"
diff --git a/app-text/krop/krop-0.6.0-r1.ebuild b/app-text/krop/krop-0.6.0-r1.ebuild
index 6085c6264fb..9ba6a12603e 100644
--- a/app-text/krop/krop-0.6.0-r1.ebuild
+++ b/app-text/krop/krop-0.6.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit desktop distutils-r1 xdg-utils
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 71df1f4d3c2..8495b133a7c 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit desktop distutils-r1 xdg-utils
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index ffb4af80882..8cfe33b34fa 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1 +1,2 @@
DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
+DIST lesspipe-2.06.tar.gz 168100 BLAKE2B a7447efa85cd422343f9dbb06001e85fa7b33c92db752f8248e4b4a0d9ecce4ef0241240d6993c5a71157c44da2f4ffc3efd41ac5e0a31e89ed5b80ac99f71fe SHA512 b2411c5e6b287fb67e1ea9b6d10377fe19b58e8c0f54587f825d1ee4c1a85f9a8ed3244a7cf339bcba960094e95821d9a56929951d862eb697f1d12fe55ef20d
diff --git a/app-text/lesspipe/lesspipe-2.05.ebuild b/app-text/lesspipe/lesspipe-2.05-r1.ebuild
index cee412a1d9f..a795a3880db 100644
--- a/app-text/lesspipe/lesspipe-2.05.ebuild
+++ b/app-text/lesspipe/lesspipe-2.05-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
RESTRICT="test"
BDEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
src_configure() {
# Not an autoconf script.
diff --git a/app-text/lesspipe/lesspipe-2.06.ebuild b/app-text/lesspipe/lesspipe-2.06.ebuild
new file mode 100644
index 00000000000..6ed6c94558a
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.06.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="A 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 )
+"
+
+src_configure() {
+ # Not an autoconf script.
+ ./configure --fixed || die
+}
+
+src_compile() {
+ # Nothing to build (avoids the "all" target)
+ :
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+ einstalldocs
+
+ rm -r "${ED}"/etc/bashcompletion.d || die
+ newbashcomp less_completion less
+}
+
+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/letterize/files/letterize-1.4-clang16.patch b/app-text/letterize/files/letterize-1.4-clang16.patch
new file mode 100644
index 00000000000..82a1258a60d
--- /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.4.ebuild b/app-text/letterize/letterize-1.4.ebuild
index 91dbcfff516..d28a490c672 100644
--- a/app-text/letterize/letterize-1.4.ebuild
+++ b/app-text/letterize/letterize-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,6 +13,10 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+)
+
src_configure() {
tc-export CC
default
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
index a62943210fa..0ba96d0d749 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="doc static-libs"
BDEPEND="
@@ -24,7 +24,7 @@ RDEPEND="
sys-libs/zlib
"
DEPEND="${RDEPEND}
- >=dev-libs/boost-1.46
+ dev-libs/boost
sys-devel/libtool
"
diff --git a/app-text/libebook/libebook-0.1.3-r2.ebuild b/app-text/libebook/libebook-0.1.3-r2.ebuild
index af3d44da21e..017194d774f 100644
--- a/app-text/libebook/libebook-0.1.3-r2.ebuild
+++ b/app-text/libebook/libebook-0.1.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
index 69c7f96f801..55726e6a867 100644
--- a/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="debug doc test"
RESTRICT="!test? ( test )"
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
index 0a06b6adefe..a9dcc430864 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
else
MDDS_VER="2.0"
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 85eb33c3055..ff236d229cc 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild b/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
index a172edef94d..f39780be7b8 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
src_configure() {
econf \
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index beb1de92287..fa0089c1597 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1 +1,2 @@
DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
+DIST libgepub-0.7.0.tar.xz 28536 BLAKE2B beeab3d3911353cb0cac78207cc9e18e3341afce94213757c8d246a2d01c42aa0eb37618cc066307ce2ec8f21dbb89982271f25a9552d6872d5e86a4345407c6 SHA512 2ab661a6379899ff818313205d818ef1239654afde9ebcc22fa55b5d961aee20dd9c8295a58ff1d1fb1ea281ddb6ee8644942a860b3ee9f6a4ba9d7447efc517
diff --git a/app-text/libgepub/libgepub-0.7.0.ebuild b/app-text/libgepub/libgepub-0.7.0.ebuild
new file mode 100644
index 00000000000..fb682339abe
--- /dev/null
+++ b/app-text/libgepub/libgepub-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 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 ~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 c6e394b17a2..8d4a44e6f8d 100644
--- a/app-text/libgepub/metadata.xml
+++ b/app-text/libgepub/metadata.xml
@@ -5,4 +5,7 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+ <use>
+ <flag name="webkit">Build with GepubWidget based on Webkit</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 23a73ff0574..807aa173a3e 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1 +1,2 @@
DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
+DIST liblangtag-0.6.4.tar.bz2 764946 BLAKE2B 1d94f341359f880acb8a0a0526da625cb39d85b33665b861c0fbd94064228a3d5328f3a3b7d62bffd29c6ff8161fa499b6565010ba3065c90f87b5902969e81f SHA512 6c6dd3e6b0fc8d6f10cafd74112cbaf2a2342a88a908ad2f7ae759b3f5fb0cf6d788504c1de072e9ef019f2f5a284daeb2d2393036b6b402c5bc87f32b55f271
diff --git a/app-text/liblangtag/liblangtag-0.6.4.ebuild b/app-text/liblangtag/liblangtag-0.6.4.ebuild
new file mode 100644
index 00000000000..93ee89300fa
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.6.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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
+ sys-devel/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/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 71840443972..a38d69537cb 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ 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"
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index 93a7036a4d2..529a9929ca5 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ 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"
diff --git a/app-text/libmwaw/libmwaw-0.3.21.ebuild b/app-text/libmwaw/libmwaw-0.3.21.ebuild
index 3c35ea5b1c4..c576261ecb7 100644
--- a/app-text/libmwaw/libmwaw-0.3.21.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.21.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index 4c609720e0d..52053156b9a 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
index 33ff29c4d14..41fa8cf1cda 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
IUSE=""
src_configure() {
diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild
index 72cf673a399..f494e1c1568 100644
--- a/app-text/libodfgen/libodfgen-0.1.8.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv 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"
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 6c33ab30007..d3f5e575b85 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
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 ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 282dc63f733..c674e98ddf2 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1 +1,2 @@
+DIST libpaper-2.0.0.tar.gz 1221217 BLAKE2B ef2c08ff7dc537734d080a29560a711b196b05a3b0c4b375c8dc73d4dd9588156d325d233e27940fac96a18dfa6bf523128b53eb4c7098e561aa6054efb88408 SHA512 ca5c79969a8c5d56322a6993917d5aa47089bb396a144edd0d9040b0bdde78c8fb59468a3d4063ae1fb323a1b23fb28169616d153de65f9085351b9c9d47f8c0
DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
diff --git a/app-text/libpaper/libpaper-2.0.0.ebuild b/app-text/libpaper/libpaper-2.0.0.ebuild
new file mode 100644
index 00000000000..4891072cc56
--- /dev/null
+++ b/app-text/libpaper/libpaper-2.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 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"
+
+# paperspecs is public-domain
+LICENSE="LGPL-3+ public-domain"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+ sys-apps/help2man
+"
+
+# False positive (runs within a conditional)
+QA_AM_MAINTAINER_MODE=".*help2man.*"
+
+src_configure() {
+ econf --enable-relocatable
+}
+
+src_install() {
+ default
+
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ dodir /etc
+ (paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
+ || die "papersize config failed"
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
+ fi
+}
diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml
index e2fedda90ee..51e48c3b98f 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 "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 1b88010e8ba..24521e60096 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="debug doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
index 09a586e63ec..2be8e63e70d 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
fi
DESCRIPTION="Import filter for old StarOffice documents"
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
index 22578cbcb77..3c514f0b343 100644
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3 autotools
else
SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
fi
DESCRIPTION="Import filter for old StarOffice documents"
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index 7031422c057..82b7e9e0241 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-2021 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/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
IUSE="doc +tools"
RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
index c2c69bbccd1..8939b8e743b 100644
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 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/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
index 01e24de2504..c1516565292 100644
--- a/app-text/libwps/libwps-0.4.12.ebuild
+++ b/app-text/libwps/libwps-0.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 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/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="debug doc tools"
BDEPEND="
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 065e2cd8201..00000000000
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 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 sparc x86 ~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
index b67db19482e..58fee6c0a2b 100644
--- a/app-text/lv/lv-4.51-r5.ebuild
+++ b/app-text/lv/lv-4.51-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="!app-editors/levee
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
index 5def3a36754..5bc3b9b9942 100644
--- a/app-text/mandoc/mandoc-1.14.6.ebuild
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="cgi system-man"
RDEPEND="sys-libs/zlib
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index b84995708b5..5c522679151 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -1,6 +1,6 @@
DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
DIST ammonia-3.1.2.crate 39704 BLAKE2B 78c4df1a201b1899331a1e9c4861bb792b0a0da4573881608591dd661373063d7c9b91255f22e998ac19b6e5f78ba1318fab066bf18c2d2792059c991ec127ea SHA512 eec32f6367740d78bfe17c3c83adbc34d6143b01b64e19a0821726155206883229884464893048b235164c21e0c122a5b3e530ccd8d80ad78ab19243bcdcae97
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
DIST assert_cmd-1.0.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -23,14 +23,14 @@ DIST clap-3.0.10.crate 190580 BLAKE2B 0286717f1bf5315ee97809d0fd7dc860b6b82b83b6
DIST clap_complete-3.0.4.crate 22317 BLAKE2B 2f69d411c6c41a8ef584cb58014310e0d1431134ff0721972d71ab0e2c9c97b8fb35c3145fd1e43375c69a174ee5f327cead3331107ef31d65ef216bb3c72b58 SHA512 87c8ba56350f0e1a7dc7a453b93e8ade77186cbe123dfbf01bb5b04995f1c3d960b564f8ea1127eb54f19e511a7a586836b2d3e2365892f156e684972359a307
DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST elasticlunr-rs-2.3.13.crate 93039 BLAKE2B e414342dd7a0b69022d57a853ef523cb5d480f7c2f284ad955b2e217f44432e7271c8642fd3a1500f63122e0c399337cc82fa7b0e241669ea3d8a194b923567a SHA512 5a4bf14fea7bbe55d33f2cf69cd989b93169b57ef317badc48815381eaf2534e2a02ca0a0ca7ccc16f9df3cfbcca729ddb879050ae2788a68904895b540a34ad
-DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST elasticlunr-rs-3.0.0.crate 100054 BLAKE2B 35830306706b651f7e427e7a9a14c509997abcce8d76c79e6720b095bfb09166b9fabf56b5613cba5d2404ae27b057d6450d1e2ce490b3fc457c7c65b3517e5a SHA512 bc6e99d86545f64372abdd84f681de3a873fe0d09031e89db401601773c40fb6eb1f1a9cb141b58b85b92265427113487b6b2106b037290e5d8c1844de9ae42d
+DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
@@ -41,12 +41,10 @@ DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d1
DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
DIST futf-0.1.4.crate 11341 BLAKE2B 804cdb89803ecba0371ba045d3af3f4c4cf219e31f0cfff3ab96720ef39cbde14418ae8031601c211b279682781b1d3e6d2ce31c2d212d21afda7fc1da64d8cd SHA512 4cd5ecbb8c180c9b390a6884edf65bfc3aff53ffe7b930cf2b432ff9c46a8c5a06001f3f412f99c41a60def52207e709ffa07a4b432ada488e77067fb5e1b3bf
-DIST futures-0.3.16.crate 46410 BLAKE2B 30fab6c72c09c030ebfa8d4deaf35cf5d5efc2b14a8cc7c3eea83109e1588f6042daab3ddf2e660daa643d26cd227229e2f3d780e24b7686dde1ca04e24c7d08 SHA512 57a58ede8599cc61fcbe555c84df312aa890ea993ba956759ec8effb71982fad668f024c536dbd20856388d6ceb93841de6c063e5321affcd41e96fddf7a9a0a
-DIST futures-channel-0.3.16.crate 31765 BLAKE2B eaef9d4daa760dde5811355230659ee5ec1e8ad784fd935667664cb3db65bed30c4e342bbb4ec4687ed2ab299c7e733d30c017055b18e307296dc8e7797cbc5c SHA512 84baf9a5b74693448ba3cdc402957d0882da6ad0becd3588fb61107d0ed9912a6ddfe599ecc4751713c81f4c962cfa283f0b3bf6472ca17383ab7c5ea5821e65
-DIST futures-core-0.3.16.crate 14486 BLAKE2B eb6afd63cea682e3b3252e956a213d9a6a7135ee3631eb10482af03e3bd717e1c69b49c6956aa3390cb4c9961a50b33cf7e7a356e6a511d98de9893d93f2f9c3 SHA512 cc3aa3794a0fc6005c88134943552dd426dcdbe0d117a2ab3269fc6b5b7ae637e0441c28f5b25bc544585c8830ceebde252241a0502fe832f64476c4b4774bb4
-DIST futures-io-0.3.16.crate 9050 BLAKE2B 60bcaca9e006adbc0d97af5cd9a5a7c3b50a94f017a130c21d7132f7f121e1e74f5ab538362afaffe44d4ad1bdb67f89dc8c7fa28ea69ee30dde84019ebe4c70 SHA512 cb9edb5224741f249f1936b3444e6bfd4ea4eee1d3964971d242ae1f80bb191067b1e3f0b36045e3234ea7f35738037c863fec204b952a40f84c5f46026c9ac9
+DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
+DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
DIST futures-macro-0.3.16.crate 10779 BLAKE2B 94d23ff28c5211f27faf1e9f3444b00a226dd1b43594edc8016dbe425b07ba59d335c1fb93ddce63d1ca1ca2c9ccdf3a56dfd6d8088391d62fadc71fd2cbea97 SHA512 ca36a9499937d0afcfaa9fe9f3e29fbed1ae8fb83e7e6cd267c67fdc3c723098788aa25a941ba8571fb9a5f9e40431a1024c647cd719ca57b847659b926cc515
-DIST futures-sink-0.3.16.crate 7663 BLAKE2B 355c7372524be71fbd6405f5bbd173765eb191008c725deb790f183eedae194a8b5c09c512a8e4641a903c409c2a903fc6a2095372ee52dc15f9e10527abeb98 SHA512 32d42751026ea88aa169c0e8f69b80aaa4ad582d852492f7056da35859ec3299d4ff57f508a5fa2da18c5931e97c924d88ec72341cdb342ff79f50f7dba1f87a
+DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f96d4f0df0cb035ce964b91e97f88c7a1a4942ec4010cb4da5f4a3552487eac048a6bfcef637bf1f83398d7f38758e SHA512 9bc0198495b5a1b3ed25fcf7b053a235bba0a43a4226bf085d9027537a57add1686ef61179bf2a2d4189945cb5a05a8d64ba6e6e647c56245666d51e138d113f
DIST futures-task-0.3.16.crate 11712 BLAKE2B 88c095b45590e6b4d645413fdfb82b3be178fbfb44c6e36c31a6e78f97cf4a7f53d896ae57b0e34da4195678a49c68a684b3af2f3182435352884a7562d30426 SHA512 7c95d177e9cca05ca8982886957010c4defa9c5dcd3b425738b68f750515277e27fd331148168e866d55da4b2389aeb8f0a7af0174553914c55095654666b6ec
DIST futures-util-0.3.16.crate 144642 BLAKE2B 0ce9ebcd85868d6e64622ab498962d8450f7fdb3d15357b77d94409640f6d09803f4ddf6423a118a87231799f0dd495f59ec431e4bd3e823f0decb035f5b43f4 SHA512 21815551e0e22d9fdfbb7ad36daeb3b01bd01c58e85091d0fe08a677141338f68f8754012c9e7b78e031e3baa345927fd05851f20de29fe6155e532bebb19b26
DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
@@ -60,20 +58,18 @@ DIST handlebars-4.1.2.crate 89046 BLAKE2B 0b3442309632a3826ddfdbe0b6c51a15d40188
DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
DIST headers-0.3.4.crate 67384 BLAKE2B 4e5b2767fe120911b15f72605f4be957cb0ad7d2d87bb521f9c960fd0fbf56f7d761a69516c708dc1c5c7c0f4d44f2086e43537d689a15f484bc17b04eac17e2 SHA512 b19f4058f2a69dc9bd3b20294962beb9e02d7fa82630740a7eff19720ebab2e8332f11b129d9932eec34a03070d6b807f72979060a4ef582860996a13b88dcc0
DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
-DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
DIST html5ever-0.25.1.crate 73165 BLAKE2B 70bee0c77337b2fee3fedda6fc475969b5e9a20342bf6890819fa9a69be8cac66e0dfc0a608f5cd6ba789a780f403ee736dbde1af52cb800a599b0113801dc99 SHA512 2b946224a0c5859436a57a507a89601adeffc12092376fe47429c5c5a61bd1d00b3271f0be7dea82ba1dce93a1cb820f72df8ba4c90fd13bd1ec408cff6ca660
DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
DIST http-body-0.4.3.crate 7660 BLAKE2B ef56f26e844f1f234a5fd96f29aed91897617ce126e6f143ee29fda2183858b3439570ee980469fd092ae8d7fab00ce7d4300e0f2506a9348876df766d80ed50 SHA512 2d72e11cbb072dde536c5187f22d88dd9aca0768e7b0191003e463900d50ba73e01ec6dd8c98d348c0fc5651ec022b859daedb5194c71fd787af4f2dfb97650c
DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
-DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
DIST hyper-0.14.11.crate 169467 BLAKE2B d4640bf1619711c15c155777a84cad1c5d9220d6d029ec808d953f46ec409b14664e8a5ffb489250874790ee512c4a30d1c298d974d9da83c40a88690c6dfeeb SHA512 c04875f2e3c1732ed29c4f73de24fc197486d157325fa8304aa29e6948984a01d91ae7e9455f56337d3cff2c270694cdec0dad950f1b4bc3f8b3c7964fc079af
DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
DIST inotify-0.7.1.crate 24637 BLAKE2B 7089e15c76ab1585850cc17d1c7d5094f6c229d2009dd90648df78d08a5b82567ccfbc116547e4d78df5b4821f4d3fdd7b46b22e0d1b8cd1569cf22c4877b4da SHA512 e98e041efbfaa932f0eb2e21f1831776280ec3873ecba8815dc3af716a37ec19c863a909d9f10a49347e964eae0aba33290a892dc0f0e178f6ccc0a4fdcf2c6f
DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST input_buffer-0.4.0.crate 7771 BLAKE2B e23b89b67f70decf77b91d3a370d07f430d7119ba5fbfeabaa8f669ada225ea9c37a40e80457f112b3519369b7dae0f886bdb0e03314421486167c3d071343fb SHA512 85ac0716580a3d2121d35d9d2f721b282f3424ff78947c31ac203f4ea85cbcd9fd86efd3f41341551da15beb51171a5a8f8aa09ea081715236f23b5c5234cf2b
DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
@@ -87,7 +83,7 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce12bb776d22e4409ad388678a92965834acb9b1b2fa51e6472ee2c0db156e4a75e5b6db5f6b6d4220159ab93b056d0418c SHA512 7c21836fcdd45bfdef7305327255291c92d75d3329798d31abab26297de8c381e41b4419fb7ac631310835d590b63751a63bdd87e2697ea3dfdd6599033433c7
DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST mdbook-0.4.18.tar.gz 1510868 BLAKE2B 4b47b41fc03fb923891b419098bf553dbbfb0066b1d51bfd58e3cc69e1e686f7bdb5210b6b4cb19f09c35cd6e926ede3378e49debd5a54d838c2028d44186aaa SHA512 f209d8882ff317deb3356a5de0d39c71fe0c51cf80874f0edc56c7ddf46b537c7194c58172dd5f704554bf0724cb0899ecb61b1eeea467226fa83c0679c336f5
+DIST mdbook-0.4.21.tar.gz 1513223 BLAKE2B 47f9fed97c08af77729288b06cfd89b0ad6e738f25dab30968ce7c6a8bc1c6bef1645c99bd0841a709d247b2f41a16c62a14540db6ad313b795240571a772bfe SHA512 74e78f0d7a2352c4402324373f6249810feb836b77493b0d128eebc2b3092cd399ac30a1886f4c9e8ad8401ccc75a7377dbbe5c9c9d3fcc260dbaf2d8d83e66a
DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
@@ -127,12 +123,11 @@ DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19b
DIST predicates-2.0.1.crate 27077 BLAKE2B eca1527c1734b3bbd674dd5fadbe040187b95f66480b6cbf322f225db0b47e49d5a510bb97e861fb28a6ddaf56a1f10ae8c3136a22953c86a491086d63c08848 SHA512 81d5faa0224c430d467d22edc20a02dc214852d937f948ca1d51eac61788f4340a279a93ecb8a9bea495f2a45e2c86a42b8b495c431f50e752c2ee0c422b946f
DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
-DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
+DIST pretty_assertions-1.2.1.crate 79474 BLAKE2B fbdc7c7ddc40aedaaa845f9096d52eeadd9772f64fda71eb2a2ecfd40745ae6a7ed8baa2a83c909f2a01bfaad31c00aa7c24af6d449022486dac204a3671dd55 SHA512 6e6cb21bf03f34effe3c38ab9b31d768c7a7c02dfb385efb5c1dade7547a367276c5b00c4eae11aa85d90b6f2dbe5033acdf109200196e225e335e73bf5e0ad4
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
DIST pulldown-cmark-0.9.1.crate 114955 BLAKE2B ee295f4b65dee11c0b39054a4613cbfa1058a8dce05dc298bacc151e049dbe3f05b1739205ac345a98e70662187932d226c0d0667974b3c6a6f55882b566564b SHA512 466d6b4ceee89e1a8c71ff7ab8fc1000e7ef1d9bd22193a152358e1dad28c0c1bbe619caf71106d74eb376805dbfd2b888a0626c8c2851bd814d348873843306
-DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -167,20 +162,20 @@ DIST socket2-0.4.1.crate 41364 BLAKE2B 6b1ab3dc342a30467a9579a2dea338e3f5e2a7374
DIST string_cache-0.8.1.crate 14423 BLAKE2B af0c9b9f52a246d5537ac2831be6aea462ce253b086baf6fb1773f760d566ba70917b686c2c732f60cff4c30068c5800b7c26f73763e9ef825b2fa619f6a7c00 SHA512 476aa99da2d83de7eabe68b3dc2d064cb549e2caa2b708459f883cc0a8f27bed1b1607abb1481959cc26046cfd4c44886bb87bbef5aba95a195a9d850311915b
DIST string_cache_codegen-0.5.1.crate 8243 BLAKE2B 3ce7bd89edfdd58260fb58e7b954eec503dab2562d13274f401a0af5f7e5152a660298e9884f578e361557225c67c80c0342e5c71d47aad7ec43a47ea91c617c SHA512 c3aeb752cbdbcb78cee6156b726264d182e77b3d6ac89066c366d87d8bdffc32d83e6e59a40471f07d7c827717db25fa6fb489dbd3a650f2fc252a7c85f4ecae
DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
-DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
DIST syn-1.0.75.crate 233068 BLAKE2B 8d4b5ddf1a18c59989f7664f0893265dbb6c833235afa430bf1fd224f3f542ff7385c5068a0da8841c9771ba9e93ce8974c6ae8dd0033235447d6a44488652bf SHA512 9ecda1f0cb91b4472309ad00f10eae80fdfce3c60990ec5f6510cb2ae8adb6f49e8b1d092426c5d1f0a7e9d669929330ac26a78fed227046dd1eb09a81d2e53f
DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
DIST tendril-0.4.2.crate 37138 BLAKE2B 444fd1ac19fa456075534123f73774f95f36b296afbb4b1e82a6c306971928c851dd663ab6baf09cd20f65b06e7ad46a726690df19bf00c3dddd164420b815ae SHA512 84cce485442a2e1ee6f8806a20dff038b1ff446d22ecfc9865c9ec8bcd209afe0748c7dd31f89c45cd5fd98e34abc1faf3c7a21b6d4bd5863e53d295bb700b3f
DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tokio-1.10.0.crate 509770 BLAKE2B a4cd395932a450432e2cebd8a55115e0236f8f255c44915ee68c3e286e97528ade8fa939764817cd4c7fbc9641772da80bf02ed2ea50c8e843db34b8749d8f32 SHA512 fb848dd97062c9c1e004f8e42444b43990463a815560fff2412a73cca82b4857259b52ce88b8c4542dc3a798cc85df855541e75a02f366f41c258aecf9da9bc6
-DIST tokio-macros-1.3.0.crate 7876 BLAKE2B 8541e18365182f65034f1ef7096c77186744edf5a171a2806f60c291d8475fa3722430f37936a28fb9e1d525a31e7fdfaff460d1d967e5b4ee875541f4e7581b SHA512 1ec1bc27236b76a9652595d2874d587e724207c1bbce777beeb41edcef5282cb740af28a99aee187127ec9cf824aa34a0a3983098bb355c73d7b4afd18eef1f9
+DIST tokio-1.16.1.crate 552194 BLAKE2B d6ffe82e6a0d5b5137c75b0e2867537561ccab3fb70d0a866ae3d9e67aeccf8bb047e486c004fd05547310259ff62a50ca373f1fea2f0bae354e71a7a0cd12cd SHA512 ae0d1ecb2fd733380cc9edcb7ed3c0fa2ed35e0ef9fd6e239f0eb2925cc82b5c01e0e65cc5e1c2a4274da5040d27a9e6d4a537d7530295bc9abcd08259ece0ea
+DIST tokio-macros-1.8.0.crate 9346 BLAKE2B b334eb3f221ae22ad379db2ef7e4c88e6a01a69146726287b16a958a0c17fadc69063c2e6ca3cd1dbb21e764084c9ba64cfad705b5b5d448133349a7aed69437 SHA512 3fa620db09a8e911a2896c5c671494d3f5894b4014e868374e4f1331829975b287499c2f7a7615bf26a6b9abb3815b459c1fa684a738ea153ce09cecbfa57bc2
DIST tokio-stream-0.1.7.crate 30323 BLAKE2B 53980ab6bc37662de285b4d8d7bccaea93a56f0a343f673254cdd8a32024292ccec59196e515a454b401f97e892a657ddc4d4731d2d86b87781b705f2009a2b2 SHA512 1c9a7922f7cd9bf9d9694d708aaced4c8d4deea584dd77422976f83f1935c440a9bb63152584e48142d732bdd97674ffa8ce41cfeb905ff0784b47e2670898d5
-DIST tokio-tungstenite-0.13.0.crate 30189 BLAKE2B 58069c327de8ed663425bd6b9655ff03a631a78e32196ea204ece32d6efa2b71f03d6328640d41e5355c4981ad4374491dd1610905dde226773a5b3167947dec SHA512 2f96950bb4fa474b945e3f29bdf482b4f56f898ae384428c272fc4c1bb5bd522ec0cb3691af46ffb334aa900b57ed0fd527092c81195b80fad69ab74ef33a21c
+DIST tokio-tungstenite-0.15.0.crate 28347 BLAKE2B 303b0e20d8a526749967e3f6aed7155b0b65b4e060c7b21c63e6d913b6163e36d44734cc5116f12b565757dc8394c95f84059fc5c5836d5dbb8b6ca3df688c87 SHA512 f2b3ae0a01c4dbd811b639e81dd36414357e791c8921796fc60bcfc615489ed2c240027473c50919ef680c8af77e66c684bdee0fcf604136e48136bd0634ae85
DIST tokio-util-0.6.7.crate 73201 BLAKE2B 4bed0bdc343b9fce03c12c0ab442cd7eaf3681232090547a0269bef5f362e1d96d2a10cf78708c6775234e23e8e2e00697333dc861df56136a29583d7a2401d2 SHA512 f6d81191a1caffd2cf78175bf0de3432bec684c739378072cf23daa1280b54d1781cf43d663a49b0cb34662043c1747073c97291414cf0407581325cb091b263
DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
DIST topological-sort-0.1.0.crate 8728 BLAKE2B 4ac5cd3c9da1f2825d8ab5d40b7657a8723bb498338bad8887bb69fcbeacb7d8a5ea980696db92db8769f77d2fb8dacebae2e40d8e23a9abdd7604d686b4f78d SHA512 abba534c349e0583212c3c88779c244faa4ec41c2446c134cc43e94a851878c4c08d9a6316a8723052fc5de628f7b0acfd74aab09be363b568d54ff0de1e0590
@@ -189,13 +184,12 @@ DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99c
DIST tracing-core-0.1.19.crate 50079 BLAKE2B 4eb551d147eb17d96f9248dc780ebb305c622173d98fb429fc17ee6544e30f499883973c1d7c80d322a509c69df632fd47ec6be5ed0e7fd2e04e3751d7d40252 SHA512 27db417a15eeb736b695374650994029c41a7ac50b6b7ab0a76a02aca0473be14a2d4aa0a27029071d6b864760f32977a9fb3e47144dc5f3b79fdd1a42c7bd4f
DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
-DIST tungstenite-0.12.0.crate 54287 BLAKE2B 211a39484af5a12262fc95eeacb0f68a1076956aa3e2df0f06d6a2839ceb4e096ef3919df60a2bf4ebd74eeff85a21a9242330cd1e892bff04fd3588b04da810 SHA512 d6d93b143a4e1ab6a610954f9621518f1b50e0b8d1ca019d106027bc1a9f4698bf455f3948afed1cf7c626b04f426075d9b0393922f16b8ace50aa1ccfea0474
+DIST tungstenite-0.14.0.crate 57702 BLAKE2B 552379d5f6d097eaa869266a1c2c01c02d90dad5fc9d4c0c1ce8d89891eaf1801873196f6257a02bfcc323275808a85fd923a7114bd2720d1b4d57f8a330842c SHA512 2abcfe0d7b9f6179b3afc33a016c97c7b7f2ac25dc83c7933c13bdb9499dd16a714c97526c0661714ab07281a6b7f51b3afcb5a513373cb734948f9b7c2a3de7
DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
@@ -203,7 +197,7 @@ DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae
DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
-DIST warp-0.3.1.crate 112030 BLAKE2B f04805b8387712347fbfe8ac8d1af0eb498e4a71b361ab3179235f881b68077720d378c567a164bc0d987b3b3872ce3a2ed8c8e9669fba9aaa65986de061eb5b SHA512 55f510780a10cbc31338a661292ed5dd75ff701d5b47cd1af7bc048bf8d960d512af21a0d978eab6bfd63f622464ff1e117888194caef7702ac5ec466c5603fc
+DIST warp-0.3.2.crate 113933 BLAKE2B c38aa8f2f60223352fe5844f2f23be5e0f1ec1e0a190d38b931d6f90ce1f76881a439aad16c3ea8ea6c1f646aad898a908c7ce6dcb7f71d003e3b677fee01872 SHA512 1390394d76dc95d888eec6670b668b1572502251c6e65eaa050d9717298be51799a84ef0407462337295a42116162644280f6b5bebde608f14b904312cabafac
DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
diff --git a/app-text/mdbook/mdbook-0.4.18.ebuild b/app-text/mdbook/mdbook-0.4.21.ebuild
index f7012293c71..39bb0cabc80 100644
--- a/app-text/mdbook/mdbook-0.4.18.ebuild
+++ b/app-text/mdbook/mdbook-0.4.21.ebuild
@@ -6,7 +6,7 @@ EAPI=8
CRATES="
aho-corasick-0.7.18
ammonia-3.1.2
- ansi_term-0.11.0
+ ansi_term-0.12.1
anyhow-1.0.43
assert_cmd-1.0.7
atty-0.2.14
@@ -29,14 +29,14 @@ CRATES="
clap_complete-3.0.4
cpufeatures-0.1.5
ctor-0.1.20
- difference-2.0.0
+ diff-0.1.12
difflib-0.4.0
digest-0.8.1
digest-0.9.0
doc-comment-0.3.3
either-1.6.1
- elasticlunr-rs-2.3.13
- env_logger-0.7.1
+ elasticlunr-rs-3.0.0
+ env_logger-0.9.0
fake-simd-0.1.2
filetime-0.2.15
float-cmp-0.9.0
@@ -47,12 +47,10 @@ CRATES="
fuchsia-zircon-0.3.3
fuchsia-zircon-sys-0.3.3
futf-0.1.4
- futures-0.3.16
- futures-channel-0.3.16
- futures-core-0.3.16
- futures-io-0.3.16
+ futures-channel-0.3.21
+ futures-core-0.3.21
futures-macro-0.3.16
- futures-sink-0.3.16
+ futures-sink-0.3.21
futures-task-0.3.16
futures-util-0.3.16
generic-array-0.12.4
@@ -66,20 +64,18 @@ CRATES="
hashbrown-0.11.2
headers-0.3.4
headers-core-0.2.0
- heck-0.3.3
hermit-abi-0.1.19
html5ever-0.25.1
http-0.2.4
http-body-0.4.3
httparse-1.5.1
httpdate-1.0.1
- humantime-1.3.0
+ humantime-2.1.0
hyper-0.14.11
idna-0.2.3
indexmap-1.7.0
inotify-0.7.1
inotify-sys-0.1.5
- input_buffer-0.4.0
iovec-0.1.4
itertools-0.10.1
itoa-0.4.8
@@ -132,12 +128,11 @@ CRATES="
predicates-2.0.1
predicates-core-1.0.2
predicates-tree-1.0.2
- pretty_assertions-0.6.1
+ pretty_assertions-1.2.1
proc-macro-hack-0.5.19
proc-macro-nested-0.1.7
proc-macro2-1.0.28
pulldown-cmark-0.9.1
- quick-error-1.2.3
quick-error-2.0.1
quote-1.0.9
rand-0.7.3
@@ -172,20 +167,20 @@ CRATES="
string_cache-0.8.1
string_cache_codegen-0.5.1
strsim-0.10.0
- strum-0.21.0
- strum_macros-0.21.1
syn-1.0.75
tempfile-3.2.0
tendril-0.4.2
termcolor-1.1.2
textwrap-0.14.2
+ thiserror-1.0.31
+ thiserror-impl-1.0.31
time-0.1.43
tinyvec-1.3.1
tinyvec_macros-0.1.0
- tokio-1.10.0
- tokio-macros-1.3.0
+ tokio-1.16.1
+ tokio-macros-1.8.0
tokio-stream-0.1.7
- tokio-tungstenite-0.13.0
+ tokio-tungstenite-0.15.0
tokio-util-0.6.7
toml-0.5.8
topological-sort-0.1.0
@@ -194,13 +189,12 @@ CRATES="
tracing-core-0.1.19
treeline-0.1.0
try-lock-0.2.3
- tungstenite-0.12.0
+ tungstenite-0.14.0
typenum-1.13.0
ucd-trie-0.1.3
unicase-2.6.0
unicode-bidi-0.3.6
unicode-normalization-0.1.19
- unicode-segmentation-1.8.0
unicode-xid-0.2.2
url-2.2.2
utf-8-0.7.6
@@ -208,7 +202,7 @@ CRATES="
wait-timeout-0.2.0
walkdir-2.3.2
want-0.3.0
- warp-0.3.1
+ warp-0.3.2
wasi-0.10.2+wasi-snapshot-preview1
wasi-0.9.0+wasi-snapshot-preview1
winapi-0.2.8
@@ -231,7 +225,7 @@ S="${WORKDIR}/${P/b/B}"
# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
LICENSE="Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="doc"
QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 0caf6327ca0..cc47b0f8bc4 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
IUSE="static-libs unicode"
DEPEND="dev-lang/perl
+ sys-devel/gettext
virtual/libiconv"
RDEPEND=""
PDEPEND="|| (
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 3d78de6e91c..b1c36c1034d 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo Shell Tools Project</name>
</maintainer>
<upstream>
- <remote-id type="github">flok99/multitail</remote-id>
+ <remote-id type="github">folkertvanheusden/multitail</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 71a4a94d384..f87bb21f3f6 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,4 +1,3 @@
-DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
+DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee
diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
new file mode 100644
index 00000000000..a5cb30e3b74
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
@@ -0,0 +1,69 @@
+From d98de0bb0b627772625c1acf050ba0dd4b5ac9df Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Tue, 5 Jul 2022 11:35:28 +0200
+Subject: [PATCH] Perform type punning via union without undefined behavior
+
+* The previous code from c3d7f491e2daebda2413fb3d2935c51df1c50ac7
+ still contains undefined behavior, since it just creates
+ temporary pointer variables.
+---
+ src/cmsplugin.c | 31 +++++++++++++++----------------
+ 1 file changed, 15 insertions(+), 16 deletions(-)
+
+This patch slightly differs from the upstream commit, because
+the lcms2 version used in mupdf is slightly behind the upstream
+version.
+
+See: https://github.com/mm2/Little-CMS/commit/d98de0bb0b627772625c1acf050ba0dd4b5ac9df.patch
+
+diff --git a/src/cmsplugin.c b/src/cmsplugin.c
+index 556fbc28..b34e3aab 100644
+--- a/thirdparty/lcms2/src/cmsplugin.c
++++ b/thirdparty/lcms2/src/cmsplugin.c
+@@ -167,17 +167,20 @@ cmsBool CMSEXPORT _cmsReadUInt32Number(cmsContext ContextID, cmsIOHANDLER* io,
+
+ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number* n)
+ {
+- cmsUInt32Number tmp;
++ union typeConverter {
++ cmsUInt32Number integer;
++ cmsFloat32Number floating_point;
++ } tmp;
+
+ _cmsAssert(io != NULL);
+
+- if (io->Read(ContextID, io, &tmp, sizeof(cmsUInt32Number), 1) != 1)
++ if (io->Read(ContextID, io, &tmp.integer, sizeof(cmsUInt32Number), 1) != 1)
+ return FALSE;
+
+ if (n != NULL) {
+
+- tmp = _cmsAdjustEndianess32(tmp);
+- *n = *(cmsFloat32Number*)(void*)&tmp;
++ tmp.integer = _cmsAdjustEndianess32(tmp.integer);
++ *n = tmp.floating_point;
+
+ // Safeguard which covers against absurd values
+ if (*n > 1E+20 || *n < -1E+20) return FALSE;
+@@ -304,13 +307,14 @@ cmsBool CMSEXPORT _cmsWriteUInt32Number(cmsContext ContextID, cmsIOHANDLER* io,
+
+ cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number n)
+ {
+- cmsUInt32Number tmp;
+-
+- _cmsAssert(io != NULL);
+-
+- tmp = *(cmsUInt32Number*) (void*) &n;
+- tmp = _cmsAdjustEndianess32(tmp);
+- if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1)
++ union typeConverter {
++ cmsUInt32Number integer;
++ cmsFloat32Number floating_point;
++ } tmp;
++
++ tmp.floating_point = n;
++ tmp.integer = _cmsAdjustEndianess32(tmp.integer);
++ if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp.integer) != 1)
+ return FALSE;
+
+ return TRUE;
diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
deleted file mode 100644
index 85aad834e2c..00000000000
--- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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.xz"
-S="${WORKDIR}"/${P}-source
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 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=
- virtual/jpeg
- javascript? ( >=dev-lang/mujs-1.0.7:= )
- opengl? ( >=media-libs/freeglut-3.0.0 )
- ssl? ( >=dev-libs/openssl-1.1:0= )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.18-Makefile.patch
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
- "${FILESDIR}"/${PN}-1.18.0-darwin.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
- # General cross fixes from Debian (refreshed)
- "${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
- # Additional security patches post-1.18.0
- "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
- "${FILESDIR}"/${P}-fix-oob-in-pixmap.c
- "${FILESDIR}"/${P}-CVE-2021-3407.patch
-)
-
-src_prepare() {
- xdg_src_prepare
-
- 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
-}
-
-_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 platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1 || die
- fi
-
- sed -i \
- -e "1iprefix = ${ED}/usr" \
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
- -i Makerules || die
-
- _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
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild
index 3d7f8f3e294..c541f96f9cd 100644
--- a/app-text/mupdf/mupdf-1.20.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
LICENSE="AGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
IUSE="+javascript opengl ssl X"
REQUIRED_USE="opengl? ( javascript )"
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
# General cross fixes from Debian (refreshed)
"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+ "${FILESDIR}"/${P}-lcms2.patch
)
src_prepare() {
@@ -68,6 +69,11 @@ src_prepare() {
-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() {
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild
index 6dfeb8c2ecc..44f07ffa307 100644
--- a/app-text/mupdf/mupdf-1.19.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.3.ebuild
@@ -10,12 +10,12 @@ 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.xz"
+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 ppc ppc64 ~riscv ~s390 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
IUSE="+javascript opengl ssl X"
REQUIRED_USE="opengl? ( javascript )"
@@ -24,15 +24,16 @@ REQUIRED_USE="opengl? ( javascript )"
# install system's freeglut.
RDEPEND="
dev-libs/gumbo
- media-libs/freetype:2=
+ media-libs/freetype:2
media-libs/harfbuzz:=[truetype]
media-libs/jbig2dec:=
media-libs/libpng:0=
>=media-libs/openjpeg-2.1:2=
- virtual/jpeg
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0=
javascript? ( >=dev-lang/mujs-1.0.7:= )
opengl? ( >=media-libs/freeglut-3.0.0 )
ssl? ( >=dev-libs/openssl-1.1:0= )
+ sys-libs/zlib
X? (
x11-libs/libX11
x11-libs/libXext
@@ -51,6 +52,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
# General cross fixes from Debian (refreshed)
"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+ "${FILESDIR}"/${PN}-1.20.0-lcms2.patch
)
src_prepare() {
@@ -68,6 +70,11 @@ src_prepare() {
-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() {
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index eecadde98eb..898deef3d38 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1 +1,2 @@
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/mythes-1.2.4-r1.ebuild b/app-text/mythes/mythes-1.2.4-r1.ebuild
index bd7896cb0b5..2feaec8566c 100644
--- a/app-text/mythes/mythes-1.2.4-r1.ebuild
+++ b/app-text/mythes/mythes-1.2.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="app-text/hunspell"
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 00000000000..b3cceb01c07
--- /dev/null
+++ b/app-text/mythes/mythes-1.2.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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/nuspell/Manifest b/app-text/nuspell/Manifest
index a9821cff84a..b18823b319f 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1 +1,3 @@
DIST nuspell-5.1.0.tar.gz 370368 BLAKE2B 67338fe79ddb98267e0c1efc575e47fc1a8f894cd09b6ada6c6a3f5e89b02fe3a81686b1ff1af73e28fd86437d0f115e04fd5f5aea1954c3da4414f25325ec46 SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a
+DIST nuspell-5.1.1.tar.gz 370879 BLAKE2B b02126a00f266b0a4a2271a530ee1aeac3c42d8b0474b5e2f12afa401f9ecfdb37e2bb2a759e74e522679e850622d34f86a4d66e4f7d6572285de06803ec75d6 SHA512 c33a52e3603071d3281b7cdcfa42776cd7ecb998292939538e53e364cfff63227cf094cd88ee6072b8a857f5d85c984c359a16b480dd462dac9cfd602cfd6c2c
+DIST nuspell-5.1.2.tar.gz 371092 BLAKE2B 720ff398ae34ff92884f4eec97e90d88082562a73046a7189f9fa0e93c3ca9de08033e06e27eae6e22ff027428dc904ea4d1e7870aacdaea45712ea2db1755c5 SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8
diff --git a/app-text/nuspell/nuspell-5.1.1.ebuild b/app-text/nuspell/nuspell-5.1.1.ebuild
new file mode 100644
index 00000000000..ce8325fe527
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~riscv ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/icu-60"
+DEPEND="${RDEPEND}
+ doc? ( app-text/pandoc )
+ test? ( <dev-cpp/catch-3:0 )
+ "
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ rm -R external/Catch2/ || die
+ 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.2.ebuild b/app-text/nuspell/nuspell-5.1.2.ebuild
new file mode 100644
index 00000000000..ce8325fe527
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~riscv ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/icu-60"
+DEPEND="${RDEPEND}
+ doc? ( app-text/pandoc )
+ test? ( <dev-cpp/catch-3:0 )
+ "
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ rm -R external/Catch2/ || die
+ 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/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 714fa4e9060..939f3230291 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -1,2 +1,6 @@
-DIST pandoc-2.18-linux-amd64.tar.gz 16713899 BLAKE2B 89f2166fb93793c07af9d3ddff56767e4072500b80cd462a498f5534fdbfba974fa517fa05c3bfeaf44179cd23b6d53fc5daed5916f18fce13df4486040610ca SHA512 ec0285e9a1640e7594d5bdca3fcdc738b2139e20f4a4f75b0f49ff76d2d2f5a0e8b90912e63a93e787c57f18eb3d155f214f088e55b435ef03acb8cfbf92272b
-DIST pandoc-2.18-linux-arm64.tar.gz 18522530 BLAKE2B 84e2479a77c12ace90a93ed9b66be2abdec357e0b4338143db8a9318cd48e76852d9fc12ceb8bd795860412a2e98d11a4d1e54bf74bdf68494c699fd5878c818 SHA512 e2be1473edeba12996a9eb7af3fe7dfd860adb1054446d2b93db6d712708282424628b14fea8809dba903e93daa1626a0dc3e1304af33b77e9da298c8fd7885b
+DIST pandoc-2.19-linux-amd64.tar.gz 16807538 BLAKE2B f92ca873d3f048768ecf39533c60157db59ed3c0b1849b7bfe8093f1590a076bd36f3fda81800527d1ec03b2387564e4bd37e35fd991a356d3caa33afb3de30a SHA512 8ad0b0a790681d2665866d8ecd6b04a5b0944e88ff6c202e4b44c0dc0ad27f45ab24136641dbcb03e10953fcaa833020125b0e08f12e3a18e014dab32934f67e
+DIST pandoc-2.19-linux-arm64.tar.gz 18631015 BLAKE2B 5e4ca9f33a10dd98c3e95798f073d2527d6aebe8a12af2d24fb93346a5ef5c6e567d3fb1b26a222a4f252efc77d874233ad4eb0c26a2b7185b4593541235d583 SHA512 f16c8114e2551203e603285f4ab27a1343516acaad622b672d617ce15b3fb108fe4e9a5926ba1d70545bdba8822291a94f4b65ff228a89bf7262286c80eb887c
+DIST pandoc-2.19.1-linux-amd64.tar.gz 17167943 BLAKE2B 7799baa54cf340581113eac5e783c8eaff52f93cd0992a706f6c1cfd176d37466acadd46be9ef624de3633c5f32bd9f62b61d886af64f00a7c993829fe57aac8 SHA512 504ee74f8fa67789472d69f7545588cbc990a4a637f38281ee7e71ce9022153994f291a1470fadbbe457d032543524e2c62ea98889c1f75ba86788dcc605c652
+DIST pandoc-2.19.1-linux-arm64.tar.gz 19030188 BLAKE2B de56902e276e9df89e88c92cb470e177d23a957542bfb11ff8449fec3c5af4a461b36b3093c5523e273d68a28784de9b88af862aa5d1be6f493c3a7485c001ca SHA512 8e74784690bb14d2239f83a52992548f7e27ad5ff93cf844cdb93f6e74d904592cd64cd98b6e93daa66b5cf83ce6c3e5968ab4ae86f23d69557b863ffea60ce4
+DIST pandoc-2.19.2-linux-amd64.tar.gz 17174200 BLAKE2B effed9eab23fb5e957e3f6282fe0356935819e5a89ac02bd687b6b635fd0a1f5ba65b5b8b40d5bbd8f89d3b17d290184dd84555442eae15f1c1d5c916711d43a SHA512 c3c2ea179601cf9fea3826e6e6d148b951e5d5fe440db80759bdd49de2200660e6b66100453bd1714623bd98ac46fd51a4fb6e715668de04a122181949eee82a
+DIST pandoc-2.19.2-linux-arm64.tar.gz 19033935 BLAKE2B c6964e708d6f0fbb4be4c3ba226dbc31629c466caa75f97ec450296f2c546d587db6c7d9145c65147d5c7ac7949e1dbd3fa3f6944276b4af8ccca2d896010403 SHA512 adb4eb5e3fa79d188d2123d132493c131dbedb408380012876b8ee80950cde4315ac179e9126d30d55221c3637b911b153ee4e6f550ccbc4dcd1f4828229974a
diff --git a/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild b/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild
new file mode 100644
index 00000000000..6a233967519
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 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/"
+
+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" # Upstream provides only AMD and ARM 64-bit binaries
+IUSE="+pandoc-symlink"
+
+RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped
+ unpack "${S}"/share/man/man1/${MY_PN}.1.gz
+}
+
+src_install() {
+ exeinto /usr/bin
+ newexe bin/${MY_PN} ${PN}
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ fi
+}
diff --git a/app-text/pandoc-bin/pandoc-bin-2.18.ebuild b/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
index 13a2ca15776..28e55509b66 100644
--- a/app-text/pandoc-bin/pandoc-bin-2.18.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64" # Upstream provides only AMD and ARM 64-bit binaries
+KEYWORDS="-* ~amd64 ~arm64" # Upstream provides only AMD and ARM 64-bit binaries
IUSE="+pandoc-symlink"
RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
diff --git a/app-text/pandoc-bin/pandoc-bin-2.19.ebuild b/app-text/pandoc-bin/pandoc-bin-2.19.ebuild
new file mode 100644
index 00000000000..28e55509b66
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 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/"
+
+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" # Upstream provides only AMD and ARM 64-bit binaries
+IUSE="+pandoc-symlink"
+
+RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped
+ unpack "${S}"/share/man/man1/${MY_PN}.1.gz
+}
+
+src_install() {
+ newbin bin/${MY_PN} ${PN}
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ fi
+}
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 6062b60a805..983aabbbc38 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,3 +1 @@
-DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
-DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
-DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
+DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212
diff --git a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
deleted file mode 100644
index 1a0dacce99b..00000000000
--- a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/785268
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -729,7 +729,7 @@ executable trypandoc
- main-is: trypandoc.hs
- hs-source-dirs: trypandoc
- if flag(trypandoc)
-- build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24
-+ build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24, text
- buildable: True
- else
- buildable: False
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 00000000000..6cf30a7c9bc
--- /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 8f389f32b1c..76ff98a64e2 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,7 +16,6 @@
</longdescription>
<use>
<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
- <flag name="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag>
<flag name="trypandoc">Build trypandoc cgi executable.</flag>
</use>
</pkgmetadata>
diff --git a/app-text/pandoc/pandoc-2.11.3.1.ebuild b/app-text/pandoc/pandoc-2.11.3.1.ebuild
deleted file mode 100644
index d51982085be..00000000000
--- a/app-text/pandoc/pandoc-2.11.3.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -static
-
-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 ~x86"
-IUSE="embed-data-files optimize trypandoc"
-
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base-compat-0.9:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.2:=[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.3.0.1:=[profile?] <dev-haskell/citeproc-0.4:=[profile?]
- >=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
- >=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
- >=dev-haskell/commonmark-pandoc-0.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.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?]
- >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[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.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
- >=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[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.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
- >=dev-haskell/jira-wiki-markup-1.3.2:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[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/safe-0.3:=[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.10.2:=[profile?] <dev-haskell/skylighting-0.11:=[profile?]
- >=dev-haskell/skylighting-core-0.10.2:=[profile?] <dev-haskell/skylighting-core-0.11:=[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.0.2:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
- >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[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.0.1:=
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
- >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
- >=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-0.2 <dev-haskell/tasty-lua-0.3
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
- # optimisations require ~16GB of memory on ghc-8.8.3
- use optimize || HCFLAGS+=' -O0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed-data-files embed_data_files) \
- --flag=-static \
- $(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
- haskell-cabal_src_install
-
- doman "${S}/man/${PN}.1"
-}
diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild
index f0ae5e9a824..a50d80c0359 100644
--- a/app-text/pandoc/pandoc-2.13.ebuild
+++ b/app-text/pandoc/pandoc-2.18-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -static
+# 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
@@ -15,102 +15,91 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files optimize trypandoc"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files trypandoc"
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+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.3.0.9:=[profile?] <dev-haskell/citeproc-0.3.1:=[profile?]
- >=dev-haskell/commonmark-0.1.1.3:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
- >=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
- >=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.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.3.0.1:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[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/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[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.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/hslua-module-path-0.1.0:=[profile?] <dev-haskell/hslua-module-path-0.2.0:=[profile?]
- >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
- >=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[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.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
- >=dev-haskell/jira-wiki-markup-1.3.4:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[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/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[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.7:=[profile?]
- >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[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.10.5:=[profile?] <dev-haskell/skylighting-0.10.6:=[profile?]
- >=dev-haskell/skylighting-core-0.10.5:=[profile?] <dev-haskell/skylighting-core-0.10.6:=[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.2:=[profile?] <dev-haskell/texmath-0.12.3:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[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-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[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.7:=[profile?] <dev-haskell/xml-conduit-1.10:=[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.4.3:=
+ >=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?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
+ >=dev-haskell/cabal-3.2.0.0
test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
>=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-0.2 <dev-haskell/tasty-lua-0.3
+ >=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}-trypandoc.patch)
-
-src_prepare() {
- default
- # optimisations require ~16GB of memory on ghc-8.8.3
- use optimize || HCFLAGS+=' -O0'
-}
+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-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild
deleted file mode 100644
index 878536e561c..00000000000
--- a/app-text/pandoc/pandoc-2.9.2.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-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 ~x86"
-IUSE="embed-data-files optimize static trypandoc"
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base-compat-0.9:=[profile?]
- >=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[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/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?]
- >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
- >=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?]
- >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
- >=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
- >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[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.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
- >=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[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/safe-0.3:=[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.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
- >=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[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.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
- >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[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/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.0.1:=
- embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
- test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
- >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3
- >=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-0.2 <dev-haskell/tasty-lua-0.3
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
- # optimisations require ~16GB of memory on ghc-8.8.3
- use optimize || HCFLAGS+=' -O0'
- cabal_chdeps \
- 'haddock-library >= 1.8 && < 1.9' 'haddock-library >= 1.7'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed-data-files embed_data_files) \
- $(cabal_flag static static) \
- $(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
- haskell-cabal_src_install
-
- doman "${S}/man/${PN}.1"
-}
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
index b20acac9dac..4f0cf6cbd94 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,6 +18,7 @@ IUSE=""
RDEPEND="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}]
@@ -25,7 +26,6 @@ RDEPEND="app-text/poppler[introspection]
dev-python/pycountry[${PYTHON_USEDEP}]
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-levenshtein[${PYTHON_USEDEP}]
dev-python/termcolor[${PYTHON_USEDEP}]
dev-python/whoosh[${PYTHON_USEDEP}]
sci-libs/scikit-learn[${PYTHON_USEDEP}]"
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild
index 03be19a641d..fc9f7013f9c 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -14,10 +14,13 @@ 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]
+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}]
@@ -25,8 +28,23 @@ RDEPEND="app-text/poppler[introspection]
dev-python/pycountry[${PYTHON_USEDEP}]
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/python-levenshtein[${PYTHON_USEDEP}]
dev-python/termcolor[${PYTHON_USEDEP}]
dev-python/whoosh[${PYTHON_USEDEP}]
- sci-libs/scikit-learn[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+ sci-libs/scikit-learn[${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/paperwork-2.1.1.ebuild b/app-text/paperwork/paperwork-2.1.1-r1.ebuild
index 5fb6e834f6a..cd4fb6cfa7a 100644
--- a/app-text/paperwork/paperwork-2.1.1.ebuild
+++ b/app-text/paperwork/paperwork-2.1.1-r1.ebuild
@@ -29,6 +29,13 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
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
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 00000000000..ee7245c03fa
--- /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/pastebinit-1.5.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
new file mode 100644
index 00000000000..7eabfda86fb
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index 550104a796b..1f6b2139f19 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
inherit python-single-r1
MY_P="${PN}_${PV}"
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 03630e69ae7..d007ffa7c0b 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1 +1,2 @@
DIST pdfarranger-1.8.2.tar.gz 258995 BLAKE2B 019d41e6c89ee4e7a93bd4be9aa593bebf00c3489bae5db46f201e519e7dbd6c011ac5b15ba6450906a8e8ef8610dc9083c32b01fb88828281c0206e32c9d601 SHA512 e0b1ed59158681766e6b707a207363a8ccd38bdc76311600d338ef443e0ee79405af6afb65b878a68d7e52d2ea35f6a7aa700d9aaf46b31bcf64fd863c8784f2
+DIST pdfarranger-1.9.1.tar.gz 279138 BLAKE2B 18ac9a63eff5455e395b3c126adea590b230b1884ee64e08eeaf4951c663787a827e42db9475632210b2ca3875a23e1718fdfc1b4309c5babc7ce31b6e188829 SHA512 ba60744f1b7c96ca9f86ed75cc5ea1b3df41af162048550a916a96972b0e987acfbdc3c46693adc239fdad5569369f24555e157a2f56936374ba132ffc8cbde6
diff --git a/app-text/pdfarranger/pdfarranger-1.9.1.ebuild b/app-text/pdfarranger/pdfarranger-1.9.1.ebuild
new file mode 100644
index 00000000000..9f1c50faa73
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.9.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+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}]
+"
+
+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/pdfsandwich/pdfsandwich-0.1.7.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
index c42e8230671..14d6940316f 100644
--- a/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 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"
@@ -31,6 +32,8 @@ src_prepare() {
sed -i \
-e "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" \
Makefile || die
+ # Bug #866043
+ filter-lto
default
}
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index dce889480e2..95cab58de5e 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1 +1,3 @@
DIST pdftk-v3.3.2.tar.bz2 2169492 BLAKE2B 53cb98fe3e3d1dbe8b01a45b5b11c6fbe57017ea8029efe35677914a48ffd446c5d67621443a89f512b15d0f7e77a81c945d4c220ccaf4fd658cc1726cc32059 SHA512 b02c713b67531205e760e8d8a240a82af47dbdc28e59aa683e03772d2fb27b504b98f8be1e8dc73bfc967cc9532f3dc1eccbd105abb21db396268855233051eb
+DIST pdftk-v3.3.2.tar.gz 2343475 BLAKE2B cfa3cac4b78695d757e9cd3ba02f2a3e304343c481a44b0b6165e239d90e5ef72be3385faa1a72cd36194844f441fd1e93194e8d815807d2d0b364d0421553d2 SHA512 44056737e3b9b3cb988f46e96a0f3ec13193cfc662946f6def93add0ed56608fc026181254165440f1172e9fdda00771c3c018c20bf20ce87dad322fc1394893
+DIST pdftk-v3.3.3.tar.gz 2380289 BLAKE2B b370777f5b87706ed811e424214db23b5622ef4e2420fe00c7e5e7d03fb51314589e7a1588d911c0734c075612adab9af17a1ad4ddcaac7a5dfc407c1aa28392 SHA512 2fd8dce8787856955984d6396ccb9a57d4e7a255cd74f10b31a7d87c84fac80143c0067d76bf6d8c0ec1a55dfb7d1e90f4898706e8ae26ccdf657b38d88e6cd6
diff --git a/app-text/pdftk/pdftk-3.3.2-r1.ebuild b/app-text/pdftk/pdftk-3.3.2-r1.ebuild
new file mode 100644
index 00000000000..281e7ea1e3a
--- /dev/null
+++ b/app-text/pdftk/pdftk-3.3.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 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.2"
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/bcprov:0
+ dev-java/commons-lang:3.6
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.github.stefanbirkner:system-rules:1.19.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ app-text/poppler[cairo]
+ dev-java/system-rules:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
+JAVA_SRC_DIR="java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
+JAVA_TEST_SRC_DIR="test"
+
+src_prepare() {
+ default
+ 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
+}
diff --git a/app-text/pdftk/pdftk-3.3.3.ebuild b/app-text/pdftk/pdftk-3.3.3.ebuild
new file mode 100644
index 00000000000..986693f7805
--- /dev/null
+++ b/app-text/pdftk/pdftk-3.3.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+ dev-java/bcprov:0
+ dev-java/commons-lang:3.6
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.github.stefanbirkner:system-rules:1.19.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+
+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 )
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
+JAVA_SRC_DIR="java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
+JAVA_TEST_SRC_DIR="test"
+
+src_prepare() {
+ default
+ 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
+}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index b87a7a69ebd..2ea92663222 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1 +1,2 @@
DIST pelican-4.7.2.tar.gz 1401737 BLAKE2B c277844c0c153f71aae051dd8897e9abf8fd1ddc7c49251aaa7b85b7324a85da0ded74e8328a4b64ec79b8e6b4e143d5496b8535900c8a88bfa6198489c0a80c SHA512 9fbf2ecb3c193e976e01a4d095095ac55d56fe45aa24467d91635bbecb9df933ccabd6a456e14c6ee14ce0a845820be8d887917af314e13c7a3eb830cb0ce7e6
+DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-4.8.0.ebuild
index aa9807867aa..ea0e121101a 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-4.8.0.ebuild
@@ -1,23 +1,22 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 optfeature
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}"
+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"
-RESTRICT="test"
RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
>=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
@@ -29,11 +28,24 @@ RDEPEND=">=dev-python/docutils-0.16[${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}] )"
+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 )
-distutils_enable_tests nose
+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
@@ -41,10 +53,16 @@ python_compile_all() {
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
+ 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/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 00000000000..724873090c1
--- /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/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index 288dacb2649..6ef0fb385c2 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 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"
@@ -15,17 +16,17 @@ KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
BDEPEND="app-arch/unzip"
-S=${WORKDIR}
-
# 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
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 1df54b9b984..fc8475b53d5 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,4 +1,3 @@
-DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
-DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
-DIST po4a-0.65.tar.gz 4152612 BLAKE2B 81d330f234cae10f228b5de7e8417f79d7008f827faf676a68c83b05044a2198c1c03f8d19d8bbbfdb71a83cb93abc319e7e6ac5ce57704294d0f3b858bb9b56 SHA512 eea2ddc1344d371ee685e73dc3c3b1b58d24f8bae7edbe7f2112bfead1c481c6796d02c5f7d9fc9bbac57bd93c4194ade51368bb8b29ba62aee333a7afa2e7e6
DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c2d33252d6ae08a00fddfa8aaa6e9c652f764ae46bf14fea3bcd1093f923fcbf08d96e97296954199e9b900 SHA512 f72e1267cbd6ced01ecc362c327b1634c47dff15398b48644548d28e01ba91108d5626e6d4abcfcb360697e4c0affa3228c6993653ce8f257acbbb3d7ae20fc4
+DIST po4a-0.67.tar.gz 4466869 BLAKE2B c4dab0e40e7f5eb24ec85abf8a02131144b181d9b783a5dccc30221d1cc3a493f16d7c2faf8284c6d2f2259661a6f2c280624e5fd16e2d4d0bf878f8291ef7b5 SHA512 6445db615ac1a2e752daca7dca0c44a88e74c7a26c06ba8e7cb6bdeeaacce78cb74a671579dd95ee8341d817e16717e8cf99022a37c5d152e0c9828bd6aae3d9
+DIST po4a-0.68.tar.gz 4605485 BLAKE2B fe649a28c0c181f53d7eb3f583d4a7dffe4fc22fb316c1c534b672a267eef16ccdf39a77caff3a2d75b7bfcb36e68c49229aaddeb8dff5ee475b71b58402200e SHA512 d7c60a3647d8f4265ce6f016d33430c72775ae19eb2efb240532545b08280368fea70db3360131f6537eb7cc72c19299dff4b6f938ac09cbef1b2db1a93d996e
diff --git a/app-text/po4a/files/po4a-0.66-man.patch b/app-text/po4a/files/po4a-0.66-man.patch
new file mode 100644
index 00000000000..40927dbda81
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.66-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -232,7 +232,6 @@
+ }
+ $parser->parse_from_file ($file, $out);
+
+- system("gzip -9 -f $out") and die;
+ unlink "$file" || die;
+ }
+
+@@ -250,7 +249,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 -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 40927dbda81..6c79ebf77dd 100644
--- a/app-text/po4a/files/po4a-man.patch
+++ b/app-text/po4a/files/po4a-man.patch
@@ -1,6 +1,6 @@
--- a/Po4aBuilder.pm
+++ b/Po4aBuilder.pm
-@@ -232,7 +232,6 @@
+@@ -234,7 +234,6 @@
}
$parser->parse_from_file ($file, $out);
@@ -8,11 +8,11 @@
unlink "$file" || die;
}
-@@ -250,7 +249,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 -f $outdir/$outfile.$section") and 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 -f $outdir/$outfile.$section") and die;
+ }
+ unlink "$file" || die;
}
- unlink "$file" || die;
- }
diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
deleted file mode 100644
index f8606e59828..00000000000
--- a/app-text/po4a/po4a-0.63-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
-
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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/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
- 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.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
index 9e119d269b2..075e72ec5e4 100644
--- a/app-text/po4a/po4a-0.66.ebuild
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -37,7 +37,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
virtual/latex-base
)"
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
DIST_TEST="do"
diff --git a/app-text/po4a/po4a-0.65.ebuild b/app-text/po4a/po4a-0.67.ebuild
index 809d0390cd6..6ef3081431c 100644
--- a/app-text/po4a/po4a-0.65.ebuild
+++ b/app-text/po4a/po4a-0.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -12,7 +12,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -21,6 +21,7 @@ RDEPEND="app-text/opensp
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
diff --git a/app-text/po4a/po4a-0.64.ebuild b/app-text/po4a/po4a-0.68.ebuild
index 7859d1c978d..af06aeeeee9 100644
--- a/app-text/po4a/po4a-0.64.ebuild
+++ b/app-text/po4a/po4a-0.68.ebuild
@@ -12,7 +12,7 @@ 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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -21,6 +21,7 @@ RDEPEND="app-text/opensp
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
@@ -30,6 +31,7 @@ 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
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
index 74c9b102939..bd8bf05d1b8 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ RDEPEND="${LUA_DEPS}
DEPEND="${RDEPEND}
test? ( dev-util/cppunit )"
BDEPEND="virtual/pkgconfig
- boost? ( dev-util/boost-build )"
+ boost? ( dev-libs/boost )"
PATCHES=(
"${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
diff --git a/app-text/podofo/podofo-0.9.7.ebuild b/app-text/podofo/podofo-0.9.7.ebuild
index 5510e90dad7..97e2a987c7a 100644
--- a/app-text/podofo/podofo-0.9.7.ebuild
+++ b/app-text/podofo/podofo-0.9.7.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="virtual/pkgconfig
- boost? ( dev-util/boost-build )"
+ boost? ( dev-libs/boost )"
PATCHES=(
"${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index dfa49f62de3..9ad957e6702 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,2 +1,2 @@
-DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
+DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885
DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
diff --git a/app-text/poppler-data/poppler-data-0.4.10.ebuild b/app-text/poppler-data/poppler-data-0.4.10.ebuild
deleted file mode 100644
index 09992c6a315..00000000000
--- a/app-text/poppler-data/poppler-data-0.4.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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-data/poppler-data-0.4.11-r2.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
new file mode 100644
index 00000000000..3d7a975e6b0
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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/Manifest b/app-text/poppler/Manifest
index 0258caecbc7..21d9e83d404 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,6 @@
-DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737
-DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3
-DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5
+DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
+DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
+DIST poppler-22.09.0.tar.xz 1842704 BLAKE2B 7104dc18582611901e55dbaa84d9ae87121773370b677719c470c9804fd0a74164e72b4f39c5113531736e37327b59abb2d47b9dba58acf127180fed0cd3021c SHA512 bd288b042ad6fa31584d733b941b7ba72d9e68407fda5596827d559be0f46cf27dd8e0b1b7e0d58c997e29b18c5f086486f900965229c61e034e31d8ac474613
+DIST poppler-22.09.0.tar.xz.sig 833 BLAKE2B bda372fa8d8d3d7ebe4263f9f81212d69e09b50e787a853390191c1bfcc38fd65f8e524f3810b6d3d25820ba5b2fe3d337c9e661c0747a73d64cbcdfb06b8205 SHA512 678e374c184e403b85cfbdc954b80fa4132f37d34eb60854f7708d7963b98f4e57997ec9a9aa8e17090ee696ff5821c3479857ef3f93a69e32c3f25744c84e43
+DIST poppler-22.10.0.tar.xz 1844524 BLAKE2B 4784f0aa9bf19beb251e0b7e3a9f42d6e21fea6f9e2ccdffd5ffc59167902466faf4bc13ab20a4e30cb272010416ede61020ab781c601cbe808debcce93013ef SHA512 9f80a08ae7c6c41c2ae9a2f3d2fbd8b65e430f290d2603aaa6df39d1d69f4418f76584c3f20733fb38731e4a57a8b04f55cf0f9753dd8a43be7b6d18f609f116
+DIST poppler-22.10.0.tar.xz.sig 833 BLAKE2B 0714d81b8ded72b239b7e8e8d7a7812336f03a2a37a242270b64c4622e994ad9f2798c49f8f8c2de9a0c3c732bd55a87ce37c66eb35819fa0a26ace072c0dc5a SHA512 6341fbbe65ae8ce132c7384f00ff4cef900854d72bfe2d1aae15767eef0a85e2817527ffea3e089dc08e076af4f72b67f1db559e90d32a9e29949b51abcf5a8d
diff --git a/app-text/poppler/files/poppler-22.05.0-missing-include.patch b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
deleted file mode 100644
index 9dfdcfa1240..00000000000
--- a/app-text/poppler/files/poppler-22.05.0-missing-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/freedesktop/poppler/commit/5d543e801d304e4cdbe12506f62c340d509f12f3
-
-From: "Tobias C. Berner" <tcberner@gmail.com>
-Date: Thu, 5 May 2022 04:59:42 +0000
-Subject: [PATCH] Fix c_time usage
-
-In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched
-to time_t, without including the necessary ctime header.
---- a/cpp/poppler-global.h
-+++ b/cpp/poppler-global.h
-@@ -25,6 +25,7 @@
-
- #include "poppler_cpp_export.h"
-
-+#include <ctime>
- #include <iosfwd>
- #include <string>
- #include <vector>
diff --git a/app-text/poppler/poppler-22.05.0.ebuild b/app-text/poppler/poppler-22.07.0.ebuild
index 6bd8c9f87f8..0656b36915d 100644
--- a/app-text/poppler/poppler-22.05.0.ebuild
+++ b/app-text/poppler/poppler-22.07.0.ebuild
@@ -10,9 +10,13 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,7 +28,7 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
# No test data provided
RESTRICT="test"
-DEPEND="
+COMMON_DEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.8
sys-libs/zlib
@@ -46,10 +50,10 @@ DEPEND="
)
tiff? ( media-libs/tiff:0 )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
-DEPEND+="
+DEPEND="${COMMON_DEPEND}
boost? ( dev-libs/boost )
"
BDEPEND="
@@ -57,13 +61,16 @@ BDEPEND="
virtual/pkgconfig
"
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
- "${FILESDIR}/${P}-missing-include.patch"
)
src_prepare() {
diff --git a/app-text/poppler/poppler-22.09.0.ebuild b/app-text/poppler/poppler-22.09.0.ebuild
new file mode 100644
index 00000000000..d488e2de94f
--- /dev/null
+++ b/app-text/poppler/poppler-22.09.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/124" # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ media-libs/fontconfig
+ >=media-libs/freetype-2.8
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ 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="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( dev-libs/boost )
+"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+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
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -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)
+ -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_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ 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-22.06.0.ebuild b/app-text/poppler/poppler-22.10.0.ebuild
index b7d83c0dd31..89fdf77aacf 100644
--- a/app-text/poppler/poppler-22.06.0.ebuild
+++ b/app-text/poppler/poppler-22.10.0.ebuild
@@ -16,7 +16,7 @@ else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/125" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -28,7 +28,7 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
# No test data provided
RESTRICT="test"
-DEPEND="
+COMMON_DEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.8
sys-libs/zlib
@@ -50,10 +50,10 @@ DEPEND="
)
tiff? ( media-libs/tiff:0 )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
-DEPEND+="
+DEPEND="${COMMON_DEPEND}
boost? ( dev-libs/boost )
"
BDEPEND="
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 1e336c95ce5..89fdf77aacf 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -15,8 +15,8 @@ else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/125" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -28,7 +28,7 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
# No test data provided
RESTRICT="test"
-DEPEND="
+COMMON_DEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.8
sys-libs/zlib
@@ -50,10 +50,10 @@ DEPEND="
)
tiff? ( media-libs/tiff:0 )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
-DEPEND+="
+DEPEND="${COMMON_DEPEND}
boost? ( dev-libs/boost )
"
BDEPEND="
diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r4.ebuild
index fbbb6af016a..814f6a39569 100644
--- a/app-text/pstotext/pstotext-1.9-r4.ebuild
+++ b/app-text/pstotext/pstotext-1.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,6 @@ SLOT="0"
KEYWORDS="amd64 ~hppa ppc ppc64 x86"
IUSE=""
-DEPEND="app-arch/ncompress"
RDEPEND="app-text/ghostscript-gpl"
PATCHES=(
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 76920dff8ac..32a27964115 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 00000000000..0f70648dd60
--- /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/metadata.xml b/app-text/psutils/metadata.xml
index edfe9723199..bdd03acf530 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 "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-r5.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
index dd64aadab49..87cb6542588 100644
--- a/app-text/psutils/psutils-1.17-r5.ebuild
+++ b/app-text/psutils/psutils-1.17-r5.ebuild
@@ -19,6 +19,7 @@ BDEPEND="dev-lang/perl"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-no-fixmacps.patch
+ "${FILESDIR}"/${P}-clang-implicit-int.patch
)
src_compile() {
diff --git a/app-text/psutils/psutils-2.09.ebuild b/app-text/psutils/psutils-2.09.ebuild
new file mode 100644
index 00000000000..eaf8dba1f9f
--- /dev/null
+++ b/app-text/psutils/psutils-2.09.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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/qpdf/Manifest b/app-text/qpdf/Manifest
index b3eaae211c0..c10b476a929 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,12 +1,8 @@
-DIST qpdf-10.3.2.tar.gz 18943834 BLAKE2B 5b4e320ddd663721d8201139842bb09a752347f86c3e33116063b2fff1426aed5ff6e3c581c120771a712a8ed278102e0d41816db207a25dabd84e5b89490d35 SHA512 4e630959abf27d1801e36d0cbd754945ded42ade9299057a6b9a642c7cb2a3f8242e274642f1c33a65b4a5a77562d91dcbe64fd5772d483cbe5edb4a6a389219
-DIST qpdf-10.4.0.tar.gz 18942833 BLAKE2B bc984c742bec582b5b67f7a4f4f00bb22a36e8e14d78b8e8848baed0c94489f6920070bc317928c53aca855c252c2fa5de0fba8b64ba16ba37afc2362d6ae7ba SHA512 7a17cc2b3168bb60ac05d01b585d34d94f62e44e309b86635351b2564bc2c3b7846d3a008ae0d6c068bce3b1d9c42d3a3ab40de3f85a1ec4952280cf8321a041
-DIST qpdf-10.5.0-doc.zip 6621139 BLAKE2B 9297946619df67799a450495ead8a980d8e2cfa92556e9eb6ac6f365b80d489bb11a9c5dd95e13df9a8fb013a3f254e89ae1682e8be73799ba0c872dc50075c5 SHA512 75c4eac6e828eb5f8544b4194b775e8258a769aa5e18006b9491d9658981abcd286cd082a233122805e785f283704dccaf2078cd84965ab58ebc6c80fdb4a06f
-DIST qpdf-10.5.0.tar.gz 18362586 BLAKE2B efb0a051df9824c6324ce3c4de7b6f5890a04e0a0e1e08a1086c7b7a7e3d29e01d8b6760eeb36cd5461f5ea8a9ac1e6453711df53b514c223abd3d2a41ae1a93 SHA512 758dd4fd86b79a8b08738abb36685cf4a458dcf70a480efe3207d1148a691cf06a8040c83075ace9c3bbaf372cefe78508df2e52513cc969dca76442ed43775d
-DIST qpdf-10.6.1-doc.zip 6850012 BLAKE2B 866bfd1261f392b9e666a948c4002a625952950aeeca974402ddbf1172329a8186fd6c74282002e566cf844a9af5f1a78d433717e9ec350faac5b9649f517fe9 SHA512 73180e1fc562b163a70b4c2c7342b1d7769fe070137db9d5c4e3345d4d994400a39d64c4364b2188681a915e1df4ab3f2ab6ce28e5dad1d710b254d1d1b021ab
-DIST qpdf-10.6.1.tar.gz 18518114 BLAKE2B a51e856cf6af380845b30a396d2f4a73ddc2ea6d85ce29198744b781556782d9b9e02a3b575c2f94aa1bcbb5e94818e8a4d7e19625258032b09f2e5d98f6efca SHA512 01bc02da2e389423d575053f1460638efb0af069bc63cd898b958e7105990c21670a281c834e3d72846542c74f2bda083f1cb786b4599332fec5b817934e44df
-DIST qpdf-10.6.2-doc.zip 6850957 BLAKE2B cc287e7b5dee4829a150b536ae2f092a1773fd7b1449ef7c249893cde756b82e503579149c4907f9d7f268de1f34c393d02ff96fe071641f55f8d6c33e164a39 SHA512 aecce306e334f172b9d3beb3f1a0d56eb8e5066682fc549741c1c5db2f0390b050f55fb97a9f2bd5efc48fc5c654dde0b14772c05d22ee6605ca9231f8b28bff
-DIST qpdf-10.6.2.tar.gz 18524447 BLAKE2B caf5b0c683c26ace1afbd83c454a4a787bbf49ac08d1ace8652e57866fba3f0f2e05b97ab36db59db78c5dbcb841935ddbd2fab5e57bd92c33e1eec776e83d1c SHA512 87a76c5e199b9af9744114120649f80aa271347262646c1b4a3c6008668f8a5ec215f6389a1f3202a61904f1ba74db442df59132f5090555b29ccedea60481f0
DIST qpdf-10.6.3-doc.zip 6852725 BLAKE2B 407b5994d3c3f80f71e60da12ebecf2c977fecb9e42be1aef32586b7b743bb62acc9662bc02fee174f9738f3e4e43e2769a5df415ae4bb9fb80f16b9d00cfd0e SHA512 780c25df78bc0360a17de85b0701f2e929677b02989d47c6e26b57749dd2315bb21511de9d8d40670a4745254c5c17fcf1c649233be1a0255b5a661f5dcda61b
-DIST qpdf-10.6.3.0cmake1-doc.zip 6894533 BLAKE2B 7c14f3de5225b90fd40ba8200b076c937d431a8dc5064d3ceb308c7d42f3624fe85ada7ed5661b7f3809e58ed8f6d3e55417782ebd6842cd9c60f09f896ce658 SHA512 b6a43476887371039922691c14f40be5d69230868c8f0c49555fb163ba339a6cfbebc7b140bf90d27e66e0fc864e69d8ee08d737ef2edf893447b5e49ee59920
-DIST qpdf-10.6.3.0cmake1.tar.gz 18241584 BLAKE2B 24231d6d5692052d1d4de74e2ccd150fa65efbdef94d2ea0823f9ef569ba7034f3b801ef3071d9d82da57e8c76952a215235190b6b5153b18646d582463ac0fb SHA512 27a8317eadc02370875ecb0f9c1d90e38c1538cde5f58d8a698891250b92525e26c6d523db595bf1ec675d5ddfe215a7483ff67f70febad5e14c808d466b8736
DIST qpdf-10.6.3.tar.gz 18573584 BLAKE2B 3b6ee845163ab6593ba3d85e8563e4f56f57a831e2bf67fd3a2ccd19aaca47af8c50e03dede233380442384e5bb8fa3fc317a8c54732d2cf3bdfd7d152210a4c SHA512 c584b7443984b0f28eec2fbff054096b9a14a10858dda0c6b370d7a19e34c395ee15a8dc0770d3d85773281cd79944f029fb3bfad55833a2c32ff7e1a751c149
+DIST qpdf-11.0.0-doc.zip 7049971 BLAKE2B 25191511e4327d99eab8bcd08b1db3a16c5289898034d1ec12d4f551264da489e040b2cac25d34f320898ad5698f2f7578c4ce7c0ec73c682ae2583f341ab996 SHA512 1e393007a4334467668079b4807724d36e9af15f05696f9b512a28b7172a9f74180c684141b3bec9dd973ba37827b159c3fd3adbd1da3061899d9a81cffb5da6
+DIST qpdf-11.0.0.tar.gz 18452218 BLAKE2B bb1dabae56f6ef5ca635ec7a0434387294ff6b6150ed19335243ac8774f4ecb57a7f97b00ef07c0c4f3bdfd2b510b4699324f77405c2342162c37a7860313c56 SHA512 08f1f3cfb3bc1532d04da9a3453dee6c9b411020c0a1dfe112da1961dd4d6dc76d6e89d57cb00b3b8b0cf0848e9fd3032a16c3c591a89b5631d0badfb44ef234
+DIST qpdf-11.1.0-doc.zip 7053772 BLAKE2B 8e2d377fc40a8206567e82733125b4abf23f07d062e0416ed2f2d9349a3555188cba1b68737cfae8943bcda3b93effdd020548b45d257eb9845fe1b569394000 SHA512 300dca6495ff9770138b7166e584cff1f2d26c60f273030211a895cf0f0147124240c2f22e79fae4f66595b863e2ce9dcdd7e8144c8b64357bf9a9e9b92ca6ea
+DIST qpdf-11.1.0.tar.gz 18452386 BLAKE2B 1df1f148db3132073f5e504b0dc79f8029e7049b334591d5dbd0adb425964d2d97ae5e086a3cbfcd82c82b22491b7b8897db8c3f20dab35feac3657066c6a776 SHA512 4c4daf3e6ae40e57d0d099abb7c9e694b7bec0c6657ffa4dc084f295d57799b8a5cbe5827d346fcbb89fa88a84c4dbd9a5437cc649b617cd479231c9ecc3fb5a
+DIST qpdf-11.1.1-doc.zip 7062109 BLAKE2B f9ffa32efa3835427773ee6ef87985388722b868f5a6e9a6df23e5458c2fde049aadbc98dc6966c0b2268c7a264af07cb448f61e49e04b25d908f2bafe140469 SHA512 6e4b87abefedcaf1e3407d1630f9c6e796db64b3cdae25a9489d8f0b1d5c06673821436877c36f015d6a5d126feefda17bb246f0b8ea87c0617238254816f7c2
+DIST qpdf-11.1.1.tar.gz 18464793 BLAKE2B 66fa80b513bc5ef033a60011e34df1c6e9ac6a8b777ab1eb30aeddfa077827dcfe30f6ea5816ab0ec208840d4dc2b4e3823449378b5bc50073ae1d754fb124c4 SHA512 da7540152a82cbb853089afa2503ece04086513bab662171758f1e0e928ac09cc7c00e61470bd5ec5285d99ef586b59ad66d5ff90e9060b1361d837fe18cbc24
diff --git a/app-text/qpdf/qpdf-10.3.2.ebuild b/app-text/qpdf/qpdf-10.3.2.ebuild
deleted file mode 100644
index 9b78f115b94..00000000000
--- a/app-text/qpdf/qpdf-10.3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- net-libs/gnutls:0=
- sys-libs/zlib
- virtual/jpeg:0=
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- test? (
- app-text/ghostscript-gpl[tiff(+)]
- media-libs/tiff
- sys-apps/diffutils
- )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- local myeconfargs=(
- --disable-implicit-crypto
- --enable-crypto-gnutls
- --enable-crypto-native
- --with-default-crypto=gnutls
- --disable-static
- $(use_enable ssl crypto-openssl)
- $(use_enable test test-compare-images)
- )
- CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.4.0.ebuild b/app-text/qpdf/qpdf-10.4.0.ebuild
deleted file mode 100644
index 565dad6b7c5..00000000000
--- a/app-text/qpdf/qpdf-10.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="examples ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- net-libs/gnutls:0=
- sys-libs/zlib
- virtual/jpeg:0=
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="${RDEPEND}
- test? (
- app-text/ghostscript-gpl[tiff(+)]
- media-libs/tiff
- sys-apps/diffutils
- )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- local myeconfargs=(
- --disable-implicit-crypto
- --enable-crypto-gnutls
- --enable-crypto-native
- --with-default-crypto=gnutls
- --disable-static
- $(use_enable ssl crypto-openssl)
- $(use_enable test test-compare-images)
- )
- CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use examples ; then
- dobin examples/build/.libs/*
- fi
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.5.0.ebuild b/app-text/qpdf/qpdf-10.5.0.ebuild
deleted file mode 100644
index ed57a49349f..00000000000
--- a/app-text/qpdf/qpdf-10.5.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-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"
-SRC_URI+=" doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-# subslot = libqpdf soname version
-SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples gnutls ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
- ssl? (
- 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 )"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
- local myeconfargs=(
- --disable-check-autofiles
-
- --disable-implicit-crypto
- --enable-crypto-native
-
- --disable-oss-fuzz
- $(use_enable test test-compare-images)
- )
-
- if use ssl ; then
- local crypto_provider=openssl
-
- if use gnutls ; then
- crypto_provider=gnutls
- fi
-
- myeconfargs+=(
- --with-default-crypto=${crypto_provider}
- --enable-crypto-${crypto_provider}
- )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use doc ; then
- docompress -x /usr/share/doc/${PF}/singlehtml
- dodoc -r "${WORKDIR}"/${P}-doc/.
-
- fi
-
- if use examples ; then
- dobin $(find examples/build/.libs -maxdepth 1 -type f -executable || die)
- fi
-
- # Completions
- dobashcomp completions/bash/qpdf
-
- insinto /usr/share/zsh/site-functions
- doins completions/zsh/_qpdf
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.6.1.ebuild b/app-text/qpdf/qpdf-10.6.1.ebuild
deleted file mode 100644
index 0b1fa0eff5e..00000000000
--- a/app-text/qpdf/qpdf-10.6.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-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"
-SRC_URI+=" doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-# subslot = libqpdf soname version
-SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples gnutls ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
- ssl? (
- 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 )"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
- local myeconfargs=(
- --disable-check-autofiles
-
- --disable-implicit-crypto
- --enable-crypto-native
-
- --disable-oss-fuzz
- $(use_enable test test-compare-images)
- )
-
- if use ssl ; then
- local crypto_provider=openssl
-
- if use gnutls ; then
- crypto_provider=gnutls
- fi
-
- myeconfargs+=(
- --with-default-crypto=${crypto_provider}
- --enable-crypto-${crypto_provider}
- )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use doc ; then
- docompress -x /usr/share/doc/${PF}/singlehtml
- dodoc -r "${WORKDIR}"/${P}-doc/.
-
- fi
-
- if use examples ; then
- dobin $(find examples/build/.libs -maxdepth 1 -type f -executable || die)
- fi
-
- # Completions
- dobashcomp completions/bash/qpdf
-
- insinto /usr/share/zsh/site-functions
- doins completions/zsh/_qpdf
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.6.2.ebuild b/app-text/qpdf/qpdf-10.6.2.ebuild
deleted file mode 100644
index 85eaaf317a8..00000000000
--- a/app-text/qpdf/qpdf-10.6.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1
-
-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
- doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )
-"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-# subslot = libqpdf soname version
-SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples gnutls ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg:0=
- ssl? (
- 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 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
- # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
- local myconf=(
- --disable-check-autofiles
-
- --disable-implicit-crypto
- --enable-crypto-native
-
- --disable-oss-fuzz
- $(use_enable test test-compare-images)
- )
-
- if use ssl ; then
- local crypto_provider=$(usex gnutls gnutls openssl)
- myconf+=(
- --with-default-crypto=${crypto_provider}
- --enable-crypto-${crypto_provider}
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- if use doc ; then
- docompress -x /usr/share/doc/${PF}/singlehtml
- dodoc -r "${WORKDIR}"/${P}-doc/.
-
- fi
-
- if use examples ; then
- find examples/build/.libs -maxdepth 1 -type f -executable \
- -exec dobin {} + || die
- fi
-
- # Completions
- dobashcomp completions/bash/qpdf
-
- insinto /usr/share/zsh/site-functions
- doins completions/zsh/_qpdf
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-10.6.3-r100.ebuild b/app-text/qpdf/qpdf-11.0.0.ebuild
index 1cc2e3c951f..bd30e1e661f 100644
--- a/app-text/qpdf/qpdf-10.6.3-r100.ebuild
+++ b/app-text/qpdf/qpdf-11.0.0.ebuild
@@ -5,33 +5,22 @@ EAPI=8
inherit cmake bash-completion-r1
-if [[ ${PVR} != 10.6.3-r100 ]] ; then
- # See https://github.com/qpdf/qpdf/releases/tag/release-qpdf-10.6.3.0cmake1
- die "Please update the ebuild / be careful with using it, as it's for previewing CMake!"
-fi
-
DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
HOMEPAGE="https://qpdf.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz
-# doc? ( mirror://sourceforge/qpdf/${P}-doc.zip )"
-# TODO: make SRC_URI generic
-SRC_URI="https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1.tar.gz"
-SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/release-qpdf-10.6.3.0cmake1/qpdf-10.6.3.0cmake1-doc.zip )"
+# TODO: verify-sig
+SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
LICENSE="|| ( Apache-2.0 Artistic-2 )"
-# subslot = libqpdf soname version
-SLOT="0/28"
-# Unkeyworded testing version for CMake
-# Do not keyword -- qpdf 11 will be the first released version w/ CMake
-# This version is for packagers to test.
-# https://github.com/qpdf/qpdf/discussions/676
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="doc examples gnutls ssl test"
RESTRICT="!test? ( test )"
RDEPEND="
+ media-libs/libjpeg-turbo:=
sys-libs/zlib
- virtual/jpeg:0=
ssl? (
gnutls? ( net-libs/gnutls:= )
!gnutls? ( dev-libs/openssl:= )
@@ -56,7 +45,9 @@ src_configure() {
# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
local mycmakeargs=(
-DINSTALL_EXAMPLES=$(usex examples)
- -DINSTALL_MANUAL=ON
+
+ # Breaks install with USE=-doc in 11.0.0?
+ #-DINSTALL_MANUAL=ON
)
if use ssl ; then
diff --git a/app-text/qpdf/qpdf-11.1.0-r2.ebuild b/app-text/qpdf/qpdf-11.1.0-r2.ebuild
new file mode 100644
index 00000000000..774c671b824
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.1.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="https://qpdf.sourceforge.net/"
+# TODO: verify-sig
+SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
+
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib
+ ssl? (
+ 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 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+ # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+ local mycmakeargs=(
+ -DINSTALL_EXAMPLES=$(usex examples)
+
+ # Breaks install with USE=-doc in 11.0.0?
+ #-DINSTALL_MANUAL=ON
+ )
+
+ if use ssl ; then
+ local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+ local crypto_provider_lowercase=${crypto_provider,,}
+ mycmakeargs+=(
+ -DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+ -DREQUIRE_CRYPTO_${crypto_provider}=ON
+ )
+ fi
+
+ 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.1.1.ebuild b/app-text/qpdf/qpdf-11.1.1.ebuild
new file mode 100644
index 00000000000..774c671b824
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.1.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="https://qpdf.sourceforge.net/"
+# TODO: verify-sig
+SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
+
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib
+ ssl? (
+ 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 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+ # Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+ local mycmakeargs=(
+ -DINSTALL_EXAMPLES=$(usex examples)
+
+ # Breaks install with USE=-doc in 11.0.0?
+ #-DINSTALL_MANUAL=ON
+ )
+
+ if use ssl ; then
+ local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+ local crypto_provider_lowercase=${crypto_provider,,}
+ mycmakeargs+=(
+ -DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+ -DREQUIRE_CRYPTO_${crypto_provider}=ON
+ )
+ fi
+
+ 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/rarian/Manifest b/app-text/rarian/Manifest
index b0e3f1c2ec3..08b7e20f986 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,2 +1,2 @@
-DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
+DIST rarian-0.8.1-r4-patches.tar.xz 33868 BLAKE2B e272598fce4119ad4995b665b988080dc4aee23ba6d03e462e4c76186a418601cbc5c4f403beb64aad05c9e7003d58c2070122ddcaf7188335ec4b8370eb7afb SHA512 766223faedb743c350de4f5c4dc3081f95a2c617d52ddedd4e78f64b3cbbacc20293cc4e98bbe38b41f795cefbf83d624d4434c2b94129ce224ad66da9e5760c
DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r4.ebuild
index 91083f780f9..14156fe2ff4 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r4.ebuild
@@ -1,32 +1,28 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit autotools eutils
+inherit autotools
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"
+SRC_URI="
+ https://${PN}.freedesktop.org/Releases/${P}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/${P}-r4-patches.tar.xz"
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 ~ppc-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 )
+ app-misc/getopt
+ )"
+DEPEND="${RDEPEND}"
PATCHES=(
"${WORKDIR}"/0001-Fix-uri-of-omf-files-produced-by-rarian-sk-preinstal.patch
@@ -38,6 +34,7 @@ PATCHES=(
"${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
+ "${WORKDIR}"/0010-Wimplicit-int.patch
)
src_prepare() {
@@ -55,8 +52,7 @@ src_configure() {
econf \
--localstatedir="${EPREFIX}"/var \
- $(use_enable static-libs static) \
- ${myconf[@]}
+ "${myconf[@]}"
}
src_install() {
diff --git a/app-text/recode/recode-3.7.11.ebuild b/app-text/recode/recode-3.7.11.ebuild
index 84074fbac49..8a466fea9cd 100644
--- a/app-text/recode/recode-3.7.11.ebuild
+++ b/app-text/recode/recode-3.7.11.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
python_check_deps() {
if use test ; then
- has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+ python_has_version "dev-python/cython[${PYTHON_USEDEP}]" || return 1
fi
}
diff --git a/app-text/recode/recode-3.7.12.ebuild b/app-text/recode/recode-3.7.12.ebuild
index 7f4e75b9cc7..b4f1454b52a 100644
--- a/app-text/recode/recode-3.7.12.ebuild
+++ b/app-text/recode/recode-3.7.12.ebuild
@@ -34,9 +34,11 @@ BDEPEND="
"
python_check_deps() {
- if use test ; then
- has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
- fi
+ python_has_version "dev-python/cython[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
}
src_configure() {
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
index 31a05a563f1..a3592d9cc9d 100644
--- a/app-text/recode/recode-3.7.9.ebuild
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
python_check_deps() {
if use test ; then
- has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+ python_has_version "dev-python/cython[${PYTHON_USEDEP}]" || return 1
fi
}
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 581faaa017c..435382f3cbd 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 "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 1ca31dcce3d..4d5043c9f5c 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/ronn-ng/ronn-ng-0.9.1-r1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
deleted file mode 100644
index efd0ff6ffd2..00000000000
--- a/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-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"
-
-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}"
-
-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
-}
-
-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/ronn-ng/ronn-ng-0.9.1-r2.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
index 17a0b8f79da..52501cd297a 100644
--- a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
deleted file mode 100644
index 6a13d881df7..00000000000
--- a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
-
-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 ~sparc ~x86"
-
-IUSE=""
-
-RDEPEND+="!app-text/ronn"
-
-ruby_add_rdepend "
- >=dev-ruby/kramdown-2.1:2
- >=dev-ruby/mustache-0.7.0
- >=dev-ruby/nokogiri-1.9.0:0
-"
-
-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/scdoc/Manifest b/app-text/scdoc/Manifest
index 35301769e14..e5b998c01dd 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,3 +1 @@
-DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
-DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
DIST scdoc-1.11.2.tar.gz 12746 BLAKE2B f4cb2c400103c1f2247a2bee79dca9ae5c50b8397c65edbdf4d70265a4596f85e0c47aab014699c4d63929b258db8ae3ff6728a9b95f212be9db1fa657e5b93a SHA512 3fbf1a74b222dd88410636124e4b6ca73f7e77f67d512cf430a878fefcaa5c6c13a1e9f6c0c9654de15353f94bb1bd528665acebc2293bebb325501d1eb6cda3
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index 5ee60cd0b38..4160f5fe1fa 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>bman@gentoo.org</email>
- <name>Aaron Bauman</name>
+ <email>arthurzam@gentoo.org</email>
+ <name>Arthur Zamarin</name>
</maintainer>
+ <upstream>
+ <remote-id type="sourcehut">~sircmpwn/scdoc</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/scdoc/scdoc-1.11.0.ebuild b/app-text/scdoc/scdoc-1.11.0.ebuild
deleted file mode 100644
index 9460e30e3a9..00000000000
--- a/app-text/scdoc/scdoc-1.11.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 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 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
-}
diff --git a/app-text/scdoc/scdoc-1.11.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
deleted file mode 100644
index 22b84e1fade..00000000000
--- a/app-text/scdoc/scdoc-1.11.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 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 arm arm64 ppc64 ~riscv 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="${ED}/usr/$(get_libdir)/pkgconfig" install
-}
diff --git a/app-text/scdoc/scdoc-1.11.2-r1.ebuild b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
index 302c086c2d0..bb57bb33d44 100644
--- a/app-text/scdoc/scdoc-1.11.2-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
@@ -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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
fi
LICENSE="MIT"
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index 302c086c2d0..1e3c06c1ea6 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
fi
LICENSE="MIT"
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 8373056714f..b5ab19e853a 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,2 @@
-DIST sigil-1.8.0.tar.gz 21217901 BLAKE2B 78615652859d1f61bab18b1b248d342dc6892943a2310659859ab577981c4452fbaeb567758097427453c8dfe95e42b499616a423b5c11b42238f763ac0653c8 SHA512 1a911aac996d3519f501820f8da9c810db9793063e481a6169288d402ef7e6b797308cf7ca5517162d0eb4d80f38f968627bca676b724ea5be5109c427473c95
-DIST sigil-1.9.2.tar.gz 23225656 BLAKE2B 410b2cf1772158aa9b0d499ba54bb7fc176c479acf7e9f48c5113a4e253becab35b6b4aeaa83da249d7c36f824cb1ee9b7a2e95e29c023b37afed9e864f94134 SHA512 fd6a71ce3b05b08651476f86a166d1ccdbecca31b19ecfa31c9d18ebe4daccfd69cf51d687686917c401f4b6e26cc6a57dbae5f9b1d8ba49fe08ccdd0bdf75d7
+DIST sigil-1.9.10.tar.gz 25263060 BLAKE2B ef8d6b5552689f0501971563b429efa050456826ee85dbf524ecb1c1931506de95909e3443bc259353c012b3e4a2b6ce3299f20af8e65d07324818a8f208c2a8 SHA512 e328d8e207cff1dc007391c246792c3d53f7b9f078dd87a61088a61a5a192ed85802057b0f2d61b14bcac6094bb1ac2ff74a5096b54d9b82f0c6b2bef7eceb1a
+DIST sigil-1.9.20.tar.gz 25139664 BLAKE2B ca0a8ba5ec9b76ea4016766872e7a70d839c2b3f24a658e90e619fd2feb01de74e05e30cdcf53c79ce92196c380da1d348ec2776f77060b18d2c664ff8171c6a SHA512 07aff142f65084b7900b25b089fca1d9a36022e690acaf0db3c7b2eb310a847834baff42884e73bbe6b31ff2dd7f73e76819c5c7a4292578fbea2edcebec5ad1
diff --git a/app-text/sigil/sigil-1.8.0.ebuild b/app-text/sigil/sigil-1.9.10.ebuild
index 7eba49a4ab0..3f4f5f1b065 100644
--- a/app-text/sigil/sigil-1.8.0.ebuild
+++ b/app-text/sigil/sigil-1.9.10.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
app-text/hunspell:=
- dev-libs/libpcre:3=[pcre16]
+ dev-libs/libpcre2:=[pcre16]
$(python_gen_cond_dep '
dev-python/css-parser[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
@@ -53,12 +53,15 @@ 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}"
+
-DINSTALL_BUNDLED_DICTS=0
- -DUSE_SYSTEM_LIBS=1
-DSYSTEM_LIBS_REQUIRED=1
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DUSE_SYSTEM_LIBS=1
+ -DUSE_QT6=0
)
use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
diff --git a/app-text/sigil/sigil-1.9.2-r1.ebuild b/app-text/sigil/sigil-1.9.20.ebuild
index d9a47a339dc..d9a47a339dc 100644
--- a/app-text/sigil/sigil-1.9.2-r1.ebuild
+++ b/app-text/sigil/sigil-1.9.20.ebuild
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 5b3ea271236..be0bcf1f3e4 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,2 +1 @@
-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 db6f19549e5..00000000000
--- 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/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index 072c9c1ef29..00000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/tesseract/Manifest b/app-text/tesseract/Manifest
index 2da095ce49c..5522c177da8 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,3 +1,4 @@
DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
DIST tesseract-5.0.1.tar.gz 1913596 BLAKE2B 94098704c0a177eb1afc365036f9ff8d7648f80398f20a410e11b7884e1411432c2938e3ab176930630500793ef2e3f33b82f214461ef6677d289c56919f8d55 SHA512 0a4824f71eb76ab022f3b9258d12b9a059adcf2f37fac6442ae1096d0efc80404ba1bfd9c90e8263178c1af606c2aad2b277ceb93efc3b9e93c125f931ff08c1
DIST tesseract-5.1.0.tar.gz 1910376 BLAKE2B e1c1c5c563e30689d66fb09ab73fdce853a469dfcf3c759571f6e6e1da71809a8fd1fb74c0be38588e97bbdac230c2ce10a35fd66faa6a4370d78efe112d3243 SHA512 d874fc995182c2c7ce210ebd79ad36414fa73afc53063505bc0b0aa0f090dc48db09c650c86a727778584f34a421b7d64c129cefe282ea112560cd7ca24e7f59
+DIST tesseract-5.2.0.tar.gz 1913462 BLAKE2B 6b80e5bb71543cf971683f66b87fd45a971a6f337ca53567d134c3bdc227f1338a3340f5bb5c2f183288135acd6521031b0f6de6e96e333fed4dc10e93b7319e SHA512 23ed931495e4ea793904f99a06a95a47873b923c4e5d8f3fc8f9203cac86b0e0013c416ab4d8d4a863a081eea00a196a0198c6fb17a39917a1baea2280d84794
diff --git a/app-text/tesseract/tesseract-5.2.0.ebuild b/app-text/tesseract/tesseract-5.2.0.ebuild
new file mode 100644
index 00000000000..302638df9e4
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 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:0=[${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-doc/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/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 00000000000..07ca8933fac
--- /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-slibtool.patch b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
new file mode 100644
index 00000000000..4b026177b68
--- /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/texlive-core-2021-r1.ebuild b/app-text/texlive-core/texlive-core-2021-r2.ebuild
index 7c256aa5427..22b8b8716b8 100644
--- a/app-text/texlive-core/texlive-core-2021-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2021-r2.ebuild
@@ -96,9 +96,9 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
>=x11-libs/cairo-1.12
>=x11-libs/pixman-0.18
dev-libs/zziplib:=
- app-text/libpaper
- dev-libs/gmp:0
- dev-libs/mpfr:0=
+ app-text/libpaper:=
+ dev-libs/gmp:=
+ dev-libs/mpfr:=
>=dev-libs/ptexenc-1.3.8
xetex? (
>=app-text/teckit-2.5.3
diff --git a/app-text/texlive-core/texlive-core-2021-r3.ebuild b/app-text/texlive-core/texlive-core-2021-r3.ebuild
new file mode 100644
index 00000000000..22942ff163d
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r3.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2022 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/~zlogene/distfiles/texlive/${MY_P}.tar.xz
+ https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+ https://dev.gentoo.org/~zlogene/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/~zlogene/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/~zlogene/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/~zlogene/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 ~sparc-solaris ~sparc64-solaris"
+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
+ 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
+ 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
+
+ default
+
+ elibtoolize
+ "${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
+
+ 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
+ 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-r4.ebuild b/app-text/texlive-core/texlive-core-2021-r4.ebuild
new file mode 100644
index 00000000000..1d9065ebab6
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r4.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2022 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/~zlogene/distfiles/texlive/${MY_P}.tar.xz
+ https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+ https://dev.gentoo.org/~zlogene/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/~zlogene/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/~zlogene/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/~zlogene/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 ~sparc-solaris ~sparc64-solaris"
+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
+ 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
+ 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
+
+ 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
+
+ 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
+ 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/tree/Manifest b/app-text/tree/Manifest
index c2456751555..320423be412 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,2 +1,3 @@
DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
DIST tree-2.0.1.tgz 57213 BLAKE2B 977f3bd606881f92f7e39fb167205b468f77408a2fa3ff14c20eeab0e6f194115d2d41a3919751c9c9d103ae185dc231710a464f0c57ea244e8a410782503d6f SHA512 11a45136d62ee7b4acdb599025ddddc250f3b95c46c94cea132bdc226357561bbae3ed874a99e554d2e01a93eaac639fb89d8a2539964ce788540ac3537f0e4c
+DIST tree-2.0.2.tgz 57960 BLAKE2B 3038b4a0f904ba4854ab40d52448fd0859380346d1a355c16fa97dfcae7b650ba4406e970555c79b5c5d5dca31677f5ae2b83cab0178e5580d342956167ba80b SHA512 5b9612ada9e3b1414d06daf5d7589f18480f232ba6ea29a004ceb7ff5b46c57610766bdb2babe9c20047dfea39cb233a6d92a60fcf2c38beccbebc94fb1eb20f
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index d8a49607812..074c45a5cb8 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -7,6 +7,8 @@
</maintainer>
<upstream>
<changelog>http://mama.indstate.edu/users/ice/tree/changes.html</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-2.0.1.ebuild b/app-text/tree/tree-2.0.1.ebuild
index 4c7a39b7f49..3dd93deef57 100644
--- a/app-text/tree/tree-2.0.1.ebuild
+++ b/app-text/tree/tree-2.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND=""
diff --git a/app-text/tree/tree-2.0.2.ebuild b/app-text/tree/tree-2.0.2.ebuild
new file mode 100644
index 00000000000..4c7a39b7f49
--- /dev/null
+++ b/app-text/tree/tree-2.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 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="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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+ sed -i -e 's:LINUX:__linux__:' tree.c || die
+ 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/unpaper/Manifest b/app-text/unpaper/Manifest
index 17c2bd98c4e..371e03985fd 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 b31f89c8113..e62ed22a3e7 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 "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-7.0.0.ebuild
index 91982d16e2c..77d0a4fbc40 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -1,11 +1,13 @@
# 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 ~arm64 x86"
@@ -17,18 +19,13 @@ 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="dev-libs/libxslt
+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/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index cb59b6c27de..a26b8376338 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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"
@@ -17,18 +19,13 @@ 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="dev-libs/libxslt
+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/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 9f0af0d46f1..4418e21d3f0 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Create a diff disregarding formatting"
HOMEPAGE="https://www.gnu.org/software/wdiff/"
@@ -16,14 +16,16 @@ RESTRICT="!test? ( test )"
RDEPEND="
sys-apps/diffutils
sys-apps/less
- sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
+ sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/texinfo
- test? ( app-misc/screen )"
+ test? ( app-misc/screen )
+"
src_configure() {
- econf \
- $(use_enable experimental)
+ econf $(use_enable experimental)
}
src_test() {
@@ -31,5 +33,6 @@ src_test() {
# when an incompatible screenrc is found
touch tests/screenrc || die
export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
default
}
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 00000000000..b200055cf5b
--- /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/wv-1.2.9-r3.ebuild b/app-text/wv/wv-1.2.9-r3.ebuild
index 4876a095e7f..c2a286d095f 100644
--- a/app-text/wv/wv-1.2.9-r3.ebuild
+++ b/app-text/wv/wv-1.2.9-r3.ebuild
@@ -28,16 +28,24 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
+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
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 02e41dbac76..b8778a8c762 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,3 +1,5 @@
DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
+DIST xapian-omega-1.4.20.tar.xz 563324 BLAKE2B 3836cc1f219f228edbd910dd92eb5bf7f91c6e0e5a1be2fad271dc9246ef0e5dd68d99d48f15c8ac9c449112d492e3becd501413a8c190d0b611d2506f8d82cb SHA512 026ca234d072da39a29d47b5b53033ec7677d51f93a6fedffb2a57ff5b788cc08d94d1dc43ff8c0062639470b8fe3150781008e4b50abd3ec5526b2b98a3a676
+DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec
diff --git a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
index 616e6bd3839..a4f6177030f 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
IUSE=""
DEPEND="~dev-libs/xapian-${PV}:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
new file mode 100644
index 00000000000..91ff25791e2
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 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"
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-libs/xapian-${PV}:0/30
+ dev-lang/perl
+ dev-libs/libpcre
+ 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
+ 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.21.ebuild b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
new file mode 100644
index 00000000000..91ff25791e2
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 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"
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-libs/xapian-${PV}:0/30
+ dev-lang/perl
+ dev-libs/libpcre
+ 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
+ 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/xdvik/xdvik-22.87.03-r3.ebuild b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
deleted file mode 100644
index 6ae5639b553..00000000000
--- a/app-text/xdvik/xdvik-22.87.03-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop elisp-common flag-o-matic 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 ~riscv ~s390 sparc x86 ~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? ( >=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:="
-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.03-r4.ebuild b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
index 1d19d16bb0f..7502839c86c 100644
--- a/app-text/xdvik/xdvik-22.87.03-r4.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://xdvi.sourceforge.net/"
SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
S="${WORKDIR}"/${P}/texk/xdvik
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index 82f096bdede..a1c78ebba9a 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
LICENSE="W3C"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+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
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index 73061b4a3f0..1561e35e91b 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 37ed9694ee5..a234631ef8b 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -28,9 +28,11 @@ src_prepare() {
# 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.
- 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
+ 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
}
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 00000000000..b90eea1f42d
--- /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/xmlto-0.0.28-r9.ebuild b/app-text/xmlto/xmlto-0.0.28-r9.ebuild
new file mode 100644
index 00000000000..953366daa3e
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="latex text"
+
+RDEPEND="
+ 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 flex when we patch the input lexer.
+# We touch it in fix-warnings.patch.
+BDEPEND="sys-devel/flex"
+
+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() {
+ # 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/xournalpp/xournalpp-1.1.1-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
new file mode 100644
index 00000000000..a1105db47c0
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615
+LUA_COMPAT=( lua5-3 )
+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
+ elibc_musl? ( sys-libs/libbacktrace )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 761bc8769f6..a1105db47c0 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
-inherit cmake xdg
+# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615
+LUA_COMPAT=( lua5-3 )
+inherit cmake lua-single xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
- unset SRC_URI
else
- KEYWORDS="~amd64 ~ppc64"
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"
@@ -19,9 +20,11 @@ HOMEPAGE="https://github.com/xournalpp/xournalpp"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
-COMMONDEPEND="
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
app-text/poppler[cairo]
dev-libs/glib
dev-libs/libxml2
@@ -32,10 +35,8 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/gtk+:3
"
-RDEPEND="${COMMONDEPEND}
-"
-DEPEND="${COMMONDEPEND}
-"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
BDEPEND="
virtual/pkgconfig
sys-apps/lsb-release
@@ -46,7 +47,3 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
)
-
-src_prepare() {
- cmake_src_prepare
-}
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 46bf6536f10..5f89e2aa56c 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,3 @@
-DIST xpdf-4.03.tar.gz 936046 BLAKE2B bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144 SHA512 5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
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
diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
deleted file mode 100644
index c9761c8e26b..00000000000
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop 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
- )"
-
-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 )
-"
-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
-)
-
-DOCS=( ANNOUNCE CHANGES README )
-
-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"
- )
- 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.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
index aaedc7d90ef..9d39323e7d0 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
BDEPEND="
@@ -39,7 +39,7 @@ DEPEND="
net-print/cups
)
fontconfig? ( media-libs/fontconfig )
- libpaper? ( app-text/libpaper )
+ libpaper? ( app-text/libpaper:= )
utils? ( png? ( media-libs/libpng:0 ) )
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
@@ -59,6 +59,13 @@ PATCHES=(
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|;
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index e53e22034f6..8c6f047d69a 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,3 +1,3 @@
-DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3e71a974a118476f2720a356a0c51476f7c827d16b4fbb00d4cebcd803e75ff34b5e7d5c024db57fae17861c137487e021 SHA512 1e27bcf0fc2eb730e77d3dab7c25575e0ae830ca251f380d740a4b8bef588122d279b2c97a7b75fb749daaf24bb458cd54ec7a11321d75bfb5c1b4b0dc0fccac
DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
+DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8f9d9250a654ddb628849a8750fc4bbbb730cb6707d1959d0d28189d99af6bc041e1806036737b3daaa739373e632e304d SHA512 12537ca4c579be6dfa4c94195eafea09e45a08207eb131ed806ab868a71d781dbe6fef5e4442f77bcc0a70921d44654d97d48a6f4bfdbe28e0bdb9fec67f69b1
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
index 1be8dffa6bb..5ca8fe3fc82 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit meson xdg
@@ -10,31 +10,29 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="amd64 arm x86"
+ 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://pwmt.org/projects/zathura-pdf-mupdf/"
+HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
LICENSE="ZLIB"
SLOT="0"
-DEPEND=">=app-text/mupdf-1.17:=
+DEPEND=">=app-text/mupdf-1.20.0:=
>=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"
+BDEPEND="app-text/tesseract
+ dev-lang/mujs
+ media-libs/leptonica
+ virtual/pkgconfig"
-src_prepare() {
- sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
-
- default
-}
+PATCHES=(
+ "${FILESDIR}/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch"
+)
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 ee7721ceea6..e1fbd119eba 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
LICENSE="ZLIB"
SLOT="0"
-DEPEND=">=app-text/mupdf-1.19:=
+DEPEND=">=app-text/mupdf-1.20:=
>=app-text/zathura-0.3.9
dev-libs/girara
dev-libs/glib:2
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 621cfcd0557..ac817f94e66 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1 +1,4 @@
-DIST zotero-bin-6.0.8.tar.bz2 68592532 BLAKE2B 2a0cd400d2c2ff03e0cbdecf5730404570d4667cf4076badea5f85a02a3170bcf8e60a13224da852e3264a0293f1c187ed690097907b8e9852fc1bb48e5bca54 SHA512 5b39d2a8aa4d3d973f74cb13a5a0feb961639cf7955b447dfff82517fc86f3ad579a0093b4f33e93c7fa974ae026e21dc0f3a320c9de318873f1d0ca0fec467b
+DIST zotero-bin-6.0.14-amd64.tar.bz2 69149210 BLAKE2B 8979e00f2bb80c97aa65fde5b247198628544202682d1ed754135279c8001658e6aea68bf55ed3051f0e6dd4a27c60f1fe633a4310dc9d53de597048cd937ac3 SHA512 6d3604ed3eb7821316ea378b92bf3bdc3e89e077fa1ccfef7e2baa4d26455f8b04d68aee3036711bf85ef97a79e6f97cc37cb9e1156320b11c6c8fe9156f5526
+DIST zotero-bin-6.0.14-x86.tar.bz2 70825827 BLAKE2B e4f2ed26997feac6a3214dd06fc91f5555afd583ce835a4f34bb84c659a38ed2fbdc59692a5fdf2423c7d480d0c7e6b0dbf361a462661bd9fb05955532e15a15 SHA512 3c26ce57570946c2a62eb3631fa95c0130372144ab3d2a5ba795290031f247939d25c541c6f7e9a2f31a3478e09e2196771299bce1683232a476e31836c6bb7a
+DIST zotero-bin-6.0.15-amd64.tar.bz2 69160685 BLAKE2B 0e02bf2762ec89e206bb52c84ce855d00500ba8dc70d8715553eaaf70a9aa97b1b2bd1628dfee24c9c2e47ce7174be2f9b733efce2d9062f93d7f82ec4e12e8c SHA512 f1fb30a3446f9373f9f7aa1d0a21a26dc3f1bf34f0804e2aeabc617cbd2b93b471dfbaec51c41e1745e6813ead9029e5b3c5dae199760193433c51cb7316a8c9
+DIST zotero-bin-6.0.15-x86.tar.bz2 70849558 BLAKE2B 1214ca4b0a06398f5f424a20320cddb7fb8b5f6815f01d05f0d92b274e991df2a6dc5005645fcf64e724229ff346928c44b59364a8de31c80f2f4d65f00a7f66 SHA512 81a994ca2932f423e13988cb3579c2e4d4e2a3aa3a21456fb351259ea8ea4467931bba12f5e5f3416f7bdebc2038dc266fa20f71eea3b62de31d0848ea975d4a
diff --git a/app-text/zotero-bin/zotero-bin-6.0.8.ebuild b/app-text/zotero-bin/zotero-bin-6.0.14.ebuild
index b9f2fd5004e..a31cabce92e 100644
--- a/app-text/zotero-bin/zotero-bin-6.0.8.ebuild
+++ b/app-text/zotero-bin/zotero-bin-6.0.14.ebuild
@@ -7,12 +7,15 @@ inherit desktop xdg
DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
HOMEPAGE="https://www.zotero.org"
-SRC_URI="https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}.tar.bz2"
-S="${WORKDIR}/Zotero_linux-x86_64"
+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"
+KEYWORDS="-* ~amd64 ~x86"
RDEPEND="
dev-libs/atk
@@ -44,6 +47,12 @@ RDEPEND="
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
@@ -59,8 +68,14 @@ src_prepare() {
}
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 "${S}"/* "${ED}/opt/zotero" || die
+ cp -a * "${ED}/opt/zotero" || die
dosym ../../opt/zotero/zotero usr/bin/zotero
diff --git a/app-text/zotero-bin/zotero-bin-6.0.15.ebuild b/app-text/zotero-bin/zotero-bin-6.0.15.ebuild
new file mode 100644
index 00000000000..a31cabce92e
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.15.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 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="
+ dev-libs/atk
+ 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
+}