summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild25
-rw-r--r--app-text/App-XML-DocBook-Builder/Manifest1
-rw-r--r--app-text/App-XML-DocBook-Builder/metadata.xml13
-rw-r--r--app-text/XML-Schema-learner/Manifest1
-rw-r--r--app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild41
-rw-r--r--app-text/XML-Schema-learner/metadata.xml24
-rw-r--r--app-text/a2ps/a2ps-4.14-r6.ebuild8
-rw-r--r--app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild2
-rw-r--r--app-text/aiksaurus/aiksaurus-1.2.1.ebuild32
-rw-r--r--app-text/ansifilter/ansifilter-2.18.ebuild9
-rw-r--r--app-text/ansifilter/metadata.xml1
-rw-r--r--app-text/antiword/antiword-0.37-r2.ebuild (renamed from app-text/antiword/antiword-0.37-r1.ebuild)35
-rw-r--r--app-text/apvlv/Manifest1
-rw-r--r--app-text/apvlv/apvlv-0.4.0.ebuild57
-rw-r--r--app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch11
-rw-r--r--app-text/apvlv/files/apvlv-0.4.0-icon.patch10
-rw-r--r--app-text/apvlv/metadata.xml9
-rw-r--r--app-text/asciidoc/Manifest5
-rw-r--r--app-text/asciidoc/asciidoc-10.1.4.ebuild48
-rw-r--r--app-text/asciidoc/asciidoc-9.0.2-r1.ebuild84
-rw-r--r--app-text/asciidoc/asciidoc-9.0.4-r1.ebuild84
-rw-r--r--app-text/asciidoc/asciidoc-9.1.0.ebuild4
-rw-r--r--app-text/asciidoc/asciidoc-9.1.1.ebuild (renamed from app-text/asciidoc/asciidoc-9.0.5-r1.ebuild)6
-rw-r--r--app-text/asciidoc/metadata.xml9
-rw-r--r--app-text/aspell/aspell-0.60.8-r4.ebuild (renamed from app-text/aspell/aspell-0.60.8-r3.ebuild)6
-rw-r--r--app-text/barcode/Manifest2
-rw-r--r--app-text/barcode/barcode-0.99-r1.ebuild4
-rw-r--r--app-text/bdf2psf/bdf2psf-1.155.ebuild4
-rw-r--r--app-text/bibclean/Manifest1
-rw-r--r--app-text/bibclean/bibclean-3.04.ebuild25
-rw-r--r--app-text/bibletime/Manifest1
-rw-r--r--app-text/bibletime/bibletime-3.0.3.ebuild59
-rw-r--r--app-text/binfind/binfind-0.0.3.ebuild4
-rw-r--r--app-text/blahtexml/blahtexml-0.9.ebuild4
-rw-r--r--app-text/blogc/blogc-0.20.1.ebuild4
-rw-r--r--app-text/blogc/blogc-9999.ebuild4
-rw-r--r--app-text/build-docbook-catalog/Manifest3
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild (renamed from app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild)8
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild37
-rw-r--r--app-text/build-docbook-catalog/metadata.xml6
-rw-r--r--app-text/calibre/Manifest6
-rw-r--r--app-text/calibre/calibre-5.16.1-r1.ebuild17
-rw-r--r--app-text/calibre/calibre-5.25.0-r2.ebuild263
-rw-r--r--app-text/calibre/calibre-5.30.0.ebuild262
-rw-r--r--app-text/calibre/calibre-5.31.0.ebuild262
-rw-r--r--app-text/calibre/calibre-5.31.1.ebuild315
-rw-r--r--app-text/calibre/calibre-5.42.0-r1.ebuild (renamed from app-text/calibre/calibre-5.32.0-r1.ebuild)23
-rw-r--r--app-text/calibre/files/calibre-5.35.0-jxr-test.patch (renamed from app-text/calibre/files/calibre-5.31.0-jxr-test.patch)8
-rw-r--r--app-text/cherrytree/Manifest2
-rw-r--r--app-text/cherrytree/cherrytree-0.99.47-r1.ebuild (renamed from app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild)53
-rw-r--r--app-text/cmark/cmark-0.30.2.ebuild4
-rw-r--r--app-text/coolreader/metadata.xml2
-rw-r--r--app-text/crf++/crf++-0.58.ebuild8
-rw-r--r--app-text/dbacl/Manifest2
-rw-r--r--app-text/dbacl/dbacl-1.14.1.ebuild28
-rw-r--r--app-text/dbacl/dbacl-1.14.ebuild27
-rw-r--r--app-text/dbacl/metadata.xml9
-rw-r--r--app-text/dblatex/dblatex-0.3.12.ebuild4
-rw-r--r--app-text/discount/Manifest1
-rw-r--r--app-text/discount/discount-2.2.7-r2.ebuild2
-rw-r--r--app-text/discount/discount-2.2.7b.ebuild (renamed from app-text/discount/discount-2.2.7-r1.ebuild)8
-rw-r--r--app-text/djvu/Manifest1
-rw-r--r--app-text/djvu/djvu-3.5.27-r2.ebuild73
-rw-r--r--app-text/djvu/djvu-3.5.28-r1.ebuild4
-rw-r--r--app-text/djvu/djvu-3.5.28.ebuild65
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild)2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild)2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild)2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild)6
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild)2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild)2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild)2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild (renamed from app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild)2
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild4
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild71
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch4
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch5
-rw-r--r--app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch20
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild4
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild4
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild4
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild4
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild4
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild4
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild4
-rw-r--r--app-text/dos2unix/dos2unix-7.4.2.ebuild6
-rw-r--r--app-text/dvipng/dvipng-1.17.ebuild4
-rw-r--r--app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild4
-rw-r--r--app-text/dvisvgm/Manifest3
-rw-r--r--app-text/dvisvgm/dvisvgm-2.11-r1.ebuild49
-rw-r--r--app-text/dvisvgm/dvisvgm-2.12.ebuild4
-rw-r--r--app-text/dvisvgm/dvisvgm-2.13.ebuild (renamed from app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild)34
-rw-r--r--app-text/enchant/Manifest4
-rw-r--r--app-text/enchant/enchant-1.6.1-r2.ebuild60
-rw-r--r--app-text/enchant/enchant-2.3.0.ebuild47
-rw-r--r--app-text/enchant/enchant-2.3.2.ebuild (renamed from app-text/enchant/enchant-2.3.1.ebuild)2
-rw-r--r--app-text/enchant/enchant-2.3.3-r1.ebuild52
-rw-r--r--app-text/enchant/metadata.xml1
-rw-r--r--app-text/epspdf/Manifest1
-rw-r--r--app-text/epspdf/epspdf-0.6.5.ebuild56
-rw-r--r--app-text/evince/Manifest5
-rw-r--r--app-text/evince/evince-41.3.ebuild (renamed from app-text/evince/evince-40.4.ebuild)23
-rw-r--r--app-text/evince/evince-42.1.ebuild (renamed from app-text/evince/evince-40.2.ebuild)51
-rw-r--r--app-text/evince/evince-42.2.ebuild122
-rw-r--r--app-text/evince/files/40.0-internal-synctex.patch28
-rw-r--r--app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch54
-rw-r--r--app-text/expander/expander-2.0.5-r2.ebuild4
-rw-r--r--app-text/foliate/Manifest3
-rw-r--r--app-text/foliate/foliate-2.6.2.ebuild51
-rw-r--r--app-text/foliate/foliate-2.6.4-r1.ebuild (renamed from app-text/foliate/foliate-2.6.3.ebuild)21
-rw-r--r--app-text/fzy/Manifest1
-rw-r--r--app-text/fzy/files/1.0-cflags.patch34
-rw-r--r--app-text/fzy/fzy-1.0-r1.ebuild45
-rw-r--r--app-text/fzy/fzy-9999.ebuild44
-rw-r--r--app-text/fzy/metadata.xml23
-rw-r--r--app-text/ghostscript-gpl/Manifest8
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch16
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch20
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch213
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch96
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch112
-rw-r--r--app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch12
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild197
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild196
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild189
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild8
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild (renamed from app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild)54
-rw-r--r--app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild4
-rw-r--r--app-text/gocr/Manifest1
-rw-r--r--app-text/gocr/gocr-0.50.ebuild53
-rw-r--r--app-text/grip/Manifest3
-rw-r--r--app-text/grip/grip-4.6.0.ebuild (renamed from app-text/grip/grip-4.5.2-r2.ebuild)4
-rw-r--r--app-text/grip/grip-4.6.1.ebuild27
-rw-r--r--app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild (renamed from app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild)18
-rw-r--r--app-text/grutatxt/Manifest1
-rw-r--r--app-text/grutatxt/grutatxt-2.0.16-r1.ebuild22
-rw-r--r--app-text/grutatxt/grutatxt-2.200.0.ebuild2
-rw-r--r--app-text/gspell/Manifest1
-rw-r--r--app-text/gspell/gspell-1.10.0.ebuild61
-rw-r--r--app-text/gspell/gspell-1.9.1.ebuild2
-rw-r--r--app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch30
-rw-r--r--app-text/gtranslator/gtranslator-40.0.ebuild6
-rw-r--r--app-text/highlight/Manifest2
-rw-r--r--app-text/highlight/highlight-3.57-r100.ebuild103
-rw-r--r--app-text/highlight/highlight-3.60.ebuild103
-rw-r--r--app-text/highlight/highlight-4.1.ebuild24
-rw-r--r--app-text/html2text/Manifest1
-rw-r--r--app-text/html2text/html2text-2.0.1.ebuild38
-rw-r--r--app-text/html2text/html2text-9999.ebuild7
-rw-r--r--app-text/htmltidy/htmltidy-5.8.0-r1.ebuild4
-rw-r--r--app-text/hunspell/hunspell-1.7.0-r2.ebuild4
-rw-r--r--app-text/iso-codes/Manifest3
-rw-r--r--app-text/iso-codes/iso-codes-4.6.0.ebuild79
-rw-r--r--app-text/iso-codes/iso-codes-4.9.0.ebuild (renamed from app-text/iso-codes/iso-codes-4.7.0.ebuild)14
-rw-r--r--app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch313
-rw-r--r--app-text/jabref/files/jabref-2.10-skip-failing-tests.patch349
-rw-r--r--app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch49
-rw-r--r--app-text/jabref/files/jabref-2.10-test-prefs.xml19
-rw-r--r--app-text/jabref/jabref-2.10-r6.ebuild84
-rw-r--r--app-text/jabref/jabref-2.10-r7.ebuild132
-rw-r--r--app-text/katarakt/Manifest1
-rw-r--r--app-text/katarakt/files/katarakt-0.2-install.patch26
-rw-r--r--app-text/katarakt/files/katarakt-0.2-poppler.patch29
-rw-r--r--app-text/katarakt/katarakt-0.2.ebuild47
-rw-r--r--app-text/katarakt/metadata.xml25
-rw-r--r--app-text/kchmviewer/kchmviewer-8.0.ebuild2
-rw-r--r--app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch272
-rw-r--r--app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch87
-rw-r--r--app-text/kjots/files/kjots-5.1.0-implicit-dep.patch26
-rw-r--r--app-text/kjots/files/kjots-5.1.0-missing-lib.patch25
-rw-r--r--app-text/kjots/files/kjots-5.1.0-speech-optional.patch82
-rw-r--r--app-text/kjots/kjots-5.1.0-r2.ebuild (renamed from app-text/kjots/kjots-5.1.0.ebuild)19
-rw-r--r--app-text/kjots/metadata.xml3
-rw-r--r--app-text/kramdown-rfc/Manifest1
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild (renamed from app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.17.ebuild)6
-rw-r--r--app-text/kramdown-rfc/metadata.xml (renamed from app-text/kramdown-rfc2629/metadata.xml)0
-rw-r--r--app-text/kramdown-rfc2629/Manifest2
-rw-r--r--app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild29
-rw-r--r--app-text/languagetool/Manifest2
-rw-r--r--app-text/languagetool/languagetool-4.5.ebuild66
-rw-r--r--app-text/languagetool/languagetool-4.6.ebuild77
-rw-r--r--app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild2
-rw-r--r--app-text/lesspipe/Manifest5
-rw-r--r--app-text/lesspipe/lesspipe-1.89.ebuild60
-rw-r--r--app-text/lesspipe/lesspipe-1.90.ebuild60
-rw-r--r--app-text/lesspipe/lesspipe-1.91.ebuild7
-rw-r--r--app-text/lesspipe/lesspipe-2.04-r1.ebuild (renamed from app-text/lesspipe/lesspipe-1.85.ebuild)24
-rw-r--r--app-text/lesspipe/lesspipe-2.05.ebuild47
-rw-r--r--app-text/libabw/libabw-0.1.3.ebuild4
-rw-r--r--app-text/libebook/libebook-0.1.3-r2.ebuild4
-rw-r--r--app-text/libepubgen/libepubgen-0.1.1.ebuild4
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10-r1.ebuild5
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10.ebuild6
-rw-r--r--app-text/libetonyek/libetonyek-9999.ebuild10
-rw-r--r--app-text/libexttextcat/Manifest1
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.5.ebuild27
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.6.ebuild2
-rw-r--r--app-text/libgepub/libgepub-0.6.0.ebuild2
-rw-r--r--app-text/liblangtag/liblangtag-0.6.3.ebuild4
-rw-r--r--app-text/libmspub/libmspub-0.1.4.ebuild12
-rw-r--r--app-text/libmspub/libmspub-9999.ebuild10
-rw-r--r--app-text/libmwaw/Manifest2
-rw-r--r--app-text/libmwaw/libmwaw-0.3.21.ebuild (renamed from app-text/libmwaw/libmwaw-0.3.20.ebuild)4
-rw-r--r--app-text/libnumbertext/Manifest3
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.10.ebuild23
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.8.ebuild (renamed from app-text/libnumbertext/libnumbertext-1.0.7.ebuild)5
-rw-r--r--app-text/libodfgen/libodfgen-0.1.8.ebuild2
-rw-r--r--app-text/libpaper/libpaper-1.1.28.ebuild4
-rw-r--r--app-text/libqxp/libqxp-0.0.2.ebuild4
-rw-r--r--app-text/libspectre/Manifest1
-rw-r--r--app-text/libspectre/libspectre-0.2.10.ebuild46
-rw-r--r--app-text/libwps/libwps-0.4.12.ebuild4
-rw-r--r--app-text/lowdown/Manifest3
-rw-r--r--app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch11
-rw-r--r--app-text/lowdown/files/lowdown-0.11.1-linking.patch37
-rw-r--r--app-text/lowdown/files/lowdown-0.8.4-configure.patch31
-rw-r--r--app-text/lowdown/lowdown-0.11.1-r1.ebuild (renamed from app-text/lowdown/lowdown-0.8.4-r1.ebuild)22
-rw-r--r--app-text/lowdown/lowdown-0.11.2.ebuild45
-rw-r--r--app-text/mandoc/Manifest1
-rw-r--r--app-text/mandoc/files/mandoc-1.14.5-gcc10.patch54
-rw-r--r--app-text/mandoc/mandoc-1.14.5-r1.ebuild125
-rw-r--r--app-text/mandoc/mandoc-1.14.6.ebuild4
-rw-r--r--app-text/manpager/manpager-1.ebuild4
-rw-r--r--app-text/master-pdf-editor/Manifest4
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.8.33.ebuild (renamed from app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild)3
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.8.52.ebuild (renamed from app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild)8
-rw-r--r--app-text/mathtex/Manifest1
-rw-r--r--app-text/mathtex/mathtex-1.04.ebuild46
-rw-r--r--app-text/mathtex/mathtex-1.05.ebuild2
-rw-r--r--app-text/mdbook/Manifest20
-rw-r--r--app-text/mdbook/mdbook-0.4.18.ebuild (renamed from app-text/mdbook/mdbook-0.4.14.ebuild)24
-rw-r--r--app-text/mecab/mecab-0.996-r1.ebuild4
-rw-r--r--app-text/msort/msort-8.53-r1.ebuild (renamed from app-text/msort/msort-8.53.ebuild)4
-rw-r--r--app-text/multitail/multitail-6.4.2-r1.ebuild4
-rw-r--r--app-text/mupdf/Manifest2
-rw-r--r--app-text/mupdf/files/mupdf-1.19.0-Makefile.patch37
-rw-r--r--app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch130
-rw-r--r--app-text/mupdf/files/mupdf-1.19.0-darwin.patch39
-rw-r--r--app-text/mupdf/metadata.xml9
-rw-r--r--app-text/mupdf/mupdf-1.19.0.ebuild153
-rw-r--r--app-text/mupdf/mupdf-1.19.1.ebuild153
-rw-r--r--app-text/mythes/mythes-1.2.4-r1.ebuild4
-rw-r--r--app-text/nfoview/Manifest3
-rw-r--r--app-text/nfoview/nfoview-1.27.1.ebuild40
-rw-r--r--app-text/nfoview/nfoview-1.28.1-r1.ebuild (renamed from app-text/nfoview/nfoview-1.28-r1.ebuild)19
-rw-r--r--app-text/nfoview/nfoview-9999.ebuild29
-rw-r--r--app-text/nuspell/Manifest1
-rw-r--r--app-text/nuspell/nuspell-3.1.2-r1.ebuild (renamed from app-text/nuspell/nuspell-3.1.2.ebuild)4
-rw-r--r--app-text/nuspell/nuspell-4.0.0-r1.ebuild (renamed from app-text/nuspell/nuspell-4.0.0.ebuild)4
-rw-r--r--app-text/nuspell/nuspell-5.1.0.ebuild51
-rw-r--r--app-text/ocrad/Manifest1
-rw-r--r--app-text/ocrad/metadata.xml5
-rw-r--r--app-text/ocrad/ocrad-0.26.ebuild34
-rw-r--r--app-text/ocrad/ocrad-0.27.ebuild9
-rw-r--r--app-text/openjade/openjade-1.3.2-r9.ebuild4
-rw-r--r--app-text/openpaperwork-core/Manifest4
-rw-r--r--app-text/openpaperwork-core/openpaperwork-core-2.1.0.ebuild (renamed from app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild)4
-rw-r--r--app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild (renamed from app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild)6
-rw-r--r--app-text/openpaperwork-gtk/Manifest4
-rw-r--r--app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.0-r1.ebuild (renamed from app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild)7
-rw-r--r--app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild (renamed from app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild)7
-rw-r--r--app-text/opensp/opensp-1.5.2-r7.ebuild (renamed from app-text/opensp/opensp-1.5.2-r6.ebuild)28
-rw-r--r--app-text/paperwork-backend/Manifest4
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild (renamed from app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild)4
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild (renamed from app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild)10
-rw-r--r--app-text/paperwork/Manifest4
-rw-r--r--app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch12
-rw-r--r--app-text/paperwork/paperwork-2.1.0.ebuild (renamed from app-text/paperwork/paperwork-2.0.3.ebuild)10
-rw-r--r--app-text/paperwork/paperwork-2.1.1.ebuild (renamed from app-text/paperwork/paperwork-2.0.2.ebuild)23
-rw-r--r--app-text/pdf2oo/Manifest1
-rw-r--r--app-text/pdf2oo/metadata.xml8
-rw-r--r--app-text/pdf2oo/pdf2oo-20090715-r1.ebuild24
-rw-r--r--app-text/pdfarranger/Manifest4
-rw-r--r--app-text/pdfarranger/pdfarranger-1.6.2.ebuild50
-rw-r--r--app-text/pdfarranger/pdfarranger-1.7.0.ebuild51
-rw-r--r--app-text/pdfarranger/pdfarranger-1.8.2.ebuild (renamed from app-text/pdfarranger/pdfarranger-1.7.1.ebuild)21
-rw-r--r--app-text/pdfgrep/pdfgrep-2.1.2.ebuild2
-rw-r--r--app-text/pdfminer/Manifest1
-rw-r--r--app-text/pdfminer/metadata.xml3
-rw-r--r--app-text/pdfminer/pdfminer-20220506.ebuild42
-rw-r--r--app-text/pdftk/Manifest2
-rw-r--r--app-text/pdftk/pdftk-3.3.2.ebuild (renamed from app-text/pdftk/pdftk-3.2.2.ebuild)6
-rw-r--r--app-text/pdftk/pdftk-9999.ebuild10
-rw-r--r--app-text/pelican/Manifest1
-rw-r--r--app-text/pelican/metadata.xml5
-rw-r--r--app-text/pelican/pelican-4.7.2-r1.ebuild50
-rw-r--r--app-text/pelican/pelican-9999.ebuild25
-rw-r--r--app-text/pinfo/pinfo-0.6.13.ebuild2
-rw-r--r--app-text/po4a/Manifest1
-rw-r--r--app-text/po4a/po4a-0.64.ebuild4
-rw-r--r--app-text/po4a/po4a-0.66.ebuild53
-rw-r--r--app-text/podofo/Manifest1
-rw-r--r--app-text/podofo/podofo-0.9.7.ebuild114
-rw-r--r--app-text/poppler-data/poppler-data-0.4.11.ebuild4
-rw-r--r--app-text/poppler/Manifest4
-rw-r--r--app-text/poppler/files/poppler-21.04.0-respect-cflags.patch117
-rw-r--r--app-text/poppler/files/poppler-22.05.0-missing-include.patch18
-rw-r--r--app-text/poppler/poppler-22.03.0.ebuild (renamed from app-text/poppler/poppler-21.07.0.ebuild)18
-rw-r--r--app-text/poppler/poppler-22.05.0.ebuild (renamed from app-text/poppler/poppler-21.11.0.ebuild)11
-rw-r--r--app-text/poppler/poppler-9999.ebuild10
-rw-r--r--app-text/ps2eps/ps2eps-1.68.ebuild2
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild4
-rw-r--r--app-text/pspresent/pspresent-1.3-r1.ebuild4
-rw-r--r--app-text/psutils/psutils-1.17-r3.ebuild2
-rw-r--r--app-text/qpdf/Manifest13
-rw-r--r--app-text/qpdf/qpdf-10.0.4.ebuild56
-rw-r--r--app-text/qpdf/qpdf-10.1.0.ebuild56
-rw-r--r--app-text/qpdf/qpdf-10.3.1.ebuild56
-rw-r--r--app-text/qpdf/qpdf-10.4.0.ebuild2
-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-10.6.3-r100.ebuild85
-rw-r--r--app-text/qpdf/qpdf-10.6.3.ebuild89
-rw-r--r--app-text/qpdfview/Manifest1
-rw-r--r--app-text/qpdfview/metadata.xml4
-rw-r--r--app-text/qpdfview/qpdfview-0.4.18_p1.ebuild2
-rw-r--r--app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild86
-rw-r--r--app-text/recode/Manifest2
-rw-r--r--app-text/recode/recode-3.7.11.ebuild59
-rw-r--r--app-text/recode/recode-3.7.12.ebuild59
-rw-r--r--app-text/recode/recode-3.7.9.ebuild4
-rw-r--r--app-text/restview/Manifest1
-rw-r--r--app-text/restview/metadata.xml9
-rw-r--r--app-text/restview/restview-3.0.0.ebuild24
-rw-r--r--app-text/rnc2rng/metadata.xml3
-rw-r--r--app-text/ronn-ng/Manifest1
-rw-r--r--app-text/ronn-ng/metadata.xml11
-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.ebuild53
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1.ebuild41
-rw-r--r--app-text/ronn/ronn-0.7.3-r4.ebuild6
-rw-r--r--app-text/scdoc/Manifest1
-rw-r--r--app-text/scdoc/metadata.xml3
-rw-r--r--app-text/scdoc/scdoc-1.11.1.ebuild4
-rw-r--r--app-text/scdoc/scdoc-1.11.2-r1.ebuild45
-rw-r--r--app-text/scdoc/scdoc-9999.ebuild13
-rw-r--r--app-text/sgml-common/sgml-common-0.6.3-r7.ebuild4
-rw-r--r--app-text/sigil/Manifest2
-rw-r--r--app-text/sigil/sigil-1.8.0.ebuild4
-rw-r--r--app-text/sigil/sigil-1.9.2-r1.ebuild (renamed from app-text/sigil/sigil-1.7.0.ebuild)21
-rw-r--r--app-text/stardict/stardict-3.0.6-r4.ebuild12
-rw-r--r--app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild12
-rw-r--r--app-text/sword/sword-1.9.0-r1.ebuild4
-rw-r--r--app-text/t1utils/t1utils-1.42.ebuild2
-rw-r--r--app-text/teckit/teckit-2.5.10.ebuild4
-rw-r--r--app-text/tesseract/Manifest3
-rw-r--r--app-text/tesseract/tesseract-4.1.1.ebuild2
-rw-r--r--app-text/tesseract/tesseract-5.0.1.ebuild (renamed from app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild)11
-rw-r--r--app-text/tesseract/tesseract-5.1.0.ebuild92
-rw-r--r--app-text/tesseract/tesseract-9999.ebuild9
-rw-r--r--app-text/texlive-core/texlive-core-2021-r1.ebuild6
-rw-r--r--app-text/texlive/texlive-2021.ebuild2
-rw-r--r--app-text/tkman/tkman-2.2-r1.ebuild40
-rw-r--r--app-text/tkman/tkman-2.2-r3.ebuild (renamed from app-text/tkman/tkman-2.2-r2.ebuild)8
-rw-r--r--app-text/trang/Manifest2
-rw-r--r--app-text/trang/files/trang-20181222-build-fixes.patch31
-rw-r--r--app-text/trang/files/trang-20181222-unicode-data-path.patch15
-rw-r--r--app-text/trang/trang-20181222.ebuild (renamed from app-text/trang/trang-20151127.ebuild)58
-rw-r--r--app-text/tree/Manifest1
-rw-r--r--app-text/tree/tree-2.0.1.ebuild41
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild4
-rw-r--r--app-text/txt2man/txt2man-1.7.1.ebuild4
-rw-r--r--app-text/txt2tags/txt2tags-3.7.ebuild4
-rw-r--r--app-text/unac/unac-1.8.0.ebuild2
-rw-r--r--app-text/unpaper/unpaper-6.1-r1.ebuild4
-rw-r--r--app-text/unrtf/unrtf-0.21.10.ebuild4
-rw-r--r--app-text/uudeview/uudeview-0.5.20-r2.ebuild4
-rw-r--r--app-text/vgrep/Manifest1
-rw-r--r--app-text/vgrep/vgrep-2.6.0.ebuild30
-rw-r--r--app-text/wdiff/wdiff-1.2.2-r1.ebuild4
-rw-r--r--app-text/webgen/Manifest1
-rw-r--r--app-text/webgen/webgen-1.7.1.ebuild52
-rw-r--r--app-text/wgetpaste/wgetpaste-2.29-r1.ebuild6
-rw-r--r--app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild4
-rw-r--r--app-text/wgetpaste/wgetpaste-2.32.ebuild6
-rw-r--r--app-text/writerperfect/writerperfect-0.9.6.ebuild4
-rw-r--r--app-text/wv/wv-1.2.9-r2.ebuild2
-rw-r--r--app-text/wv2/wv2-0.4.2-r3.ebuild (renamed from app-text/wv2/wv2-0.4.2-r2.ebuild)18
-rw-r--r--app-text/xapers/xapers-0.9.0.ebuild4
-rw-r--r--app-text/xapian-omega/Manifest4
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.15.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.16.ebuild42
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.18.ebuild4
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.19.ebuild (renamed from app-text/xapian-omega/xapian-omega-1.4.14.ebuild)8
-rw-r--r--app-text/xchm/Manifest2
-rw-r--r--app-text/xchm/xchm-1.33.ebuild (renamed from app-text/xchm/xchm-1.32.ebuild)3
-rw-r--r--app-text/xchm/xchm-9999.ebuild58
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r3.ebuild2
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r4.ebuild114
-rw-r--r--app-text/xhtml1/xhtml1-20020801-r6.ebuild4
-rw-r--r--app-text/xiphos/Manifest2
-rw-r--r--app-text/xiphos/xiphos-4.2.1.ebuild4
-rw-r--r--app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild4
-rw-r--r--app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch4
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r3.ebuild49
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r6.ebuild52
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r8.ebuild (renamed from app-text/xmlto/xmlto-0.0.28-r7.ebuild)4
-rw-r--r--app-text/xournalpp/Manifest1
-rw-r--r--app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch53
-rw-r--r--app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch31
-rw-r--r--app-text/xournalpp/xournalpp-1.1.1-r1.ebuild52
-rw-r--r--app-text/xournalpp/xournalpp-1.1.1.ebuild46
-rw-r--r--app-text/xournalpp/xournalpp-9999.ebuild15
-rw-r--r--app-text/xpdf/Manifest2
-rw-r--r--app-text/xpdf/xpdf-4.04.ebuild149
-rw-r--r--app-text/yelp-tools/Manifest3
-rw-r--r--app-text/yelp-tools/yelp-tools-41.0.ebuild (renamed from app-text/yelp-tools/yelp-tools-40.0.ebuild)2
-rw-r--r--app-text/yelp-tools/yelp-tools-42.0.ebuild34
-rw-r--r--app-text/yodl/yodl-4.03.00.ebuild12
-rw-r--r--app-text/zathura-cb/Manifest1
-rw-r--r--app-text/zathura-cb/zathura-cb-0.1.9.ebuild43
-rw-r--r--app-text/zathura-pdf-mupdf/Manifest2
-rw-r--r--app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch24
-rw-r--r--app-text/zathura-pdf-mupdf/metadata.xml14
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild4
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.7-r1.ebuild37
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild38
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild26
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild4
-rw-r--r--app-text/zathura-ps/Manifest1
-rw-r--r--app-text/zathura-ps/zathura-ps-0.2.7.ebuild39
-rw-r--r--app-text/zathura/Manifest4
-rw-r--r--app-text/zathura/files/zathura-0.4.8-meson-0.61-build.patch27
-rw-r--r--app-text/zathura/zathura-0.4.3.ebuild57
-rw-r--r--app-text/zathura/zathura-0.4.5.ebuild57
-rw-r--r--app-text/zathura/zathura-0.4.7.ebuild4
-rw-r--r--app-text/zathura/zathura-0.4.8.ebuild6
-rw-r--r--app-text/zathura/zathura-0.4.9.ebuild (renamed from app-text/zathura/zathura-0.4.4.ebuild)10
-rw-r--r--app-text/zotero-bin/Manifest2
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.8.ebuild (renamed from app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild)12
431 files changed, 6199 insertions, 5689 deletions
diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
new file mode 100644
index 00000000000..3b98813d5a1
--- /dev/null
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR="SHLOMIF"
+DIST_VERSION="0.1003"
+inherit perl-module
+
+DESCRIPTION="A Perl-based tool to Render DocBook/XML"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
+
+RDEPEND="dev-perl/Class-XSAccessor
+ virtual/perl-Getopt-Long
+ virtual/perl-File-Path
+ dev-perl/Path-Tiny
+ dev-perl/Test-Trap"
+BDEPEND="dev-perl/Module-Build
+ test? (
+ virtual/perl-File-Spec
+ )"
diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest
new file mode 100644
index 00000000000..84953984589
--- /dev/null
+++ b/app-text/App-XML-DocBook-Builder/Manifest
@@ -0,0 +1 @@
+DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb
diff --git a/app-text/App-XML-DocBook-Builder/metadata.xml b/app-text/App-XML-DocBook-Builder/metadata.xml
new file mode 100644
index 00000000000..0fb423f0684
--- /dev/null
+++ b/app-text/App-XML-DocBook-Builder/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">shlomif/docmake</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
deleted file mode 100644
index 509e1b8e556..00000000000
--- a/app-text/XML-Schema-learner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
deleted file mode 100644
index c876bebfd7d..00000000000
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
-HOMEPAGE="https://github.com/kore/XML-Schema-learner"
-SRC_URI="https://github.com/kore/XML-Schema-learner/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# This test suite used to work but needs an update for modern versions
-# of PHPUnit. See https://github.com/kore/XML-Schema-learner/issues/6
-RESTRICT="test"
-
-# PHP dependency can be inferred from .travis.yml in the repository.
-# The necessary USE flags on the other hand were found the hard way.
-#
-# The dependencies here aren't as expressive as they should be. What we
-# really want is for php[...] to apply to everything in PHP_TARGETS, and
-# for those interpreters (the ones in PHP_TARGETS) to be used to run the
-# test suite.
-#
-# See bug #497606.
-#
-RDEPEND="dev-lang/php:*[cli,xml,xmlreader]"
-DEPEND="test? ( ${RDEPEND}
- dev-php/phpunit )"
-
-src_compile() {
- # Don't run make, the default target is 'check'.
- :
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
- dodoc README.rst
-}
diff --git a/app-text/XML-Schema-learner/metadata.xml b/app-text/XML-Schema-learner/metadata.xml
deleted file mode 100644
index 4dcf546c3a5..00000000000
--- a/app-text/XML-Schema-learner/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>mjo@gentoo.org</email>
- </maintainer>
- <longdescription>
- This software implements various state-of-the-art algorithms for
- algorithmic learning of XML Schema definitions and Document Type
- Definitions.
-
- Given a set or a single XML instance it can algorithmically infer
- a schema which describes the XML instances. The resulting schemas
- are of high-quality and human readable.
-
- The theory behind the project is described in Kore Nordmann's
- thesis, "Algorithmic learning of XML Schema definitions from XML
- data," available at
- http://kore-nordmann.de/talks/11_03_learning_xml_schema_definitions_from_xml_data.pdf.
- </longdescription>
- <upstream>
- <remote-id type="github">kore/XML-Schema-learner</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index ffcce4cd01e..614a0ba87c5 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-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=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
+IUSE="cjk emacs latex nls static-libs vanilla"
RESTRICT=test
@@ -20,10 +20,10 @@ RDEPEND="app-text/ghostscript-gpl
app-text/libpaper
>=app-text/psutils-1.17
app-text/wdiff
+ >=sys-apps/coreutils-6.10-r1
emacs? ( >=app-editors/emacs-23.1:* )
latex? ( virtual/latex-base )
- nls? ( virtual/libintl )
- userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )"
+ nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
>=dev-util/gperf-2.7.2
virtual/yacc
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
index 396c7f41401..1fbc912f1ab 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="gtk"
RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
deleted file mode 100644
index b0454f1c513..00000000000
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic libtool
-
-DESCRIPTION="A thesaurus lib, tool and database"
-HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- gtk? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
-
-src_prepare() {
- default
- # Needed to make relink work on FreeBSD, without it won't install.
- # Also needed for a sane .so versionning there.
- elibtoolize
-}
-
-src_configure() {
- filter-flags -fno-exceptions
- econf $(use_with gtk)
-}
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
index 1a9bac6deb2..28b90939cdf 100644
--- a/app-text/ansifilter/ansifilter-2.18.ebuild
+++ b/app-text/ansifilter/ansifilter-2.18.ebuild
@@ -1,9 +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
-inherit toolchain-funcs qmake-utils
+inherit desktop toolchain-funcs qmake-utils
DESCRIPTION="Handles text files containing ANSI terminal escape codes"
HOMEPAGE="http://www.andre-simon.de/"
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="qt5"
RDEPEND="
@@ -55,8 +55,7 @@ src_install() {
dobin src/${PN}
if use qt5 ; then
dobin src/qt-gui/${PN}-gui
- insinto /usr/share/applications
- doins ${PN}.desktop
+ domenu ${PN}.desktop
fi
doman man/${PN}.1
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 0563834f556..4c0df79c263 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -3,5 +3,6 @@
<pkgmetadata>
<maintainer type="person">
<email>kensington@gentoo.org</email>
+ <name>Michael Palimaka</name>
</maintainer>
</pkgmetadata>
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r2.ebuild
index b9ae5e10151..4cad9bec11e 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r2.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=8
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
-IUSE="kde"
PATCHVER="r2"
DESCRIPTION="free MS Word reader"
HOMEPAGE="http://www.winfield.demon.nl"
SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
https://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+PATCHES=(
+ "${WORKDIR}"/${PN}-gentoo-patches-${PATCHVER}
+ "${FILESDIR}"/${P}-CVE-2014-8123.patch
+)
+
+DOCS=( Docs/{ChangeLog,Exmh,Emacs,FAQ,History,Netscape,QandA,ReadMe,Mozilla,Mutt} )
+
src_prepare() {
# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
# accident using patch <2.7, see bug #435492
rm Makefile || die
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}"
+ default
# Re-add convenience symlink, see above
ln -s Makefile.Linux Makefile
-
- epatch "${FILESDIR}"/${P}-CVE-2014-8123.patch
}
-src_configure() { :; }
+src_configure() {
+ true
+}
src_compile() {
emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
@@ -39,12 +45,11 @@ src_compile() {
src_install() {
emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install
- use kde || rm -f "${ED}"/usr/bin/kantiword
+ einstalldocs
- insinto /usr/share/${PN}/examples
- doins Docs/testdoc.doc Docs/antiword.php
+ docompress -x /usr/share/doc/${PF}/examples
+ docinto examples
+ dodoc Docs/testdoc.doc Docs/antiword.php
- cd Docs
- doman antiword.1
- dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt
+ doman Docs/antiword.1
}
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index e2e8e977e53..4e7bd904c04 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1 +1,2 @@
DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
+DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
diff --git a/app-text/apvlv/apvlv-0.4.0.ebuild b/app-text/apvlv/apvlv-0.4.0.ebuild
new file mode 100644
index 00000000000..50ce18678ec
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake desktop
+
+DESCRIPTION="Alf's PDF/DJVU/EPUB Viewer like Vim"
+HOMEPAGE="https://github.com/naihe2010/apvlv/"
+SRC_URI="https://github.com/naihe2010/apvlv/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug djvu"
+
+RDEPEND="
+ app-text/ebook-tools
+ >=app-text/poppler-0.5.0:=[cairo,xpdf-headers(+)]
+ dev-libs/glib:2
+ dev-libs/libxml2
+ net-libs/webkit-gtk:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ djvu? ( app-text/djvu )
+"
+
+DEPEND="${RDEPEND}
+ app-text/ghostscript-gpl
+ media-libs/freetype
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake-cxxflags.patch
+ "${FILESDIR}"/${P}-icon.patch
+)
+src_prepare() {
+ cmake_src_prepare
+}
+src_configure() {
+ local mycmakeargs=(
+ -DAPVLV_WITH_DJVU=$(usex djvu)
+ -DAPVLV_ENABLE_DEBUG=$(usex debug)
+ -DAPVLV_WITH_TXT=ON
+ -DDOCDIR="/usr/share/doc/${PF}"
+ )
+ cmake_src_configure
+}
+src_install() {
+ cmake_src_install
+ newicon -s 32 icons/pdf.png ${PN}.png
+}
diff --git a/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch
new file mode 100644
index 00000000000..101877bbff6
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-cmake-cxxflags.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ IF (WIN32)
+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+ ELSE (WIN32)
+- SET(CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+
+ OPTION(APVLV_ENABLE_DEBUG "If build binary with debug information." OFF)
+ IF (APVLV_ENABLE_DEBUG)
diff --git a/app-text/apvlv/files/apvlv-0.4.0-icon.patch b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
new file mode 100644
index 00000000000..f5e8ad37087
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.4.0-icon.patch
@@ -0,0 +1,10 @@
+--- a/apvlv.desktop
++++ b/apvlv.desktop
+@@ -2,6 +2,7 @@
+ Version=1.0
+ Type=Application
+ Name=apvlv
++Icon=apvlv
+ Comment=A minimalistic document viewer
+ Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+ Comment[fr]=Un visionneur de document minimaliste
diff --git a/app-text/apvlv/metadata.xml b/app-text/apvlv/metadata.xml
index 43022be5fe1..6a3c3096b61 100644
--- a/app-text/apvlv/metadata.xml
+++ b/app-text/apvlv/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>c@cgps.ch</email>
+ <name>Chaquen Beliakov Amaya</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">apvlv</remote-id>
<remote-id type="github">naihe2010/apvlv</remote-id>
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 064d9296ad3..b612e2b0e86 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,4 +1,3 @@
-DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c35edb0e7f3a222743ce1476b405483b01144faf768ab1492fd3f378960f6cc8e17d92ef61671d84c318fbe7c1ca8cd7c SHA512 c20629001704f1c3acfef0407b82f35f6077f5b32ef754fcbeee03a5a86d4e01e374e89b79cbdb236fc2c7fc76bf47ba81efd691f2f9e1c87dc85a7111f5e030
-DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089
-DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
+DIST asciidoc-10.1.4.tar.gz 215656 BLAKE2B 461dd31ebc7067430e595935681ec6e0207a481ec183f0c29e08be444b40a26afabe84ac46dd8f7c563eb8d28ad8eed4b63a23fccd1105d817f7402f6afbfc5e SHA512 fba8c8efe215da0170fc46f1245af831c7b9e982705fbd9cbfe4cd2b979286b49f30570b116bc9f095f060099904a30671ab0498a58fc24b0069575ecf026a7d
DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
+DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
diff --git a/app-text/asciidoc/asciidoc-10.1.4.ebuild b/app-text/asciidoc/asciidoc-10.1.4.ebuild
new file mode 100644
index 00000000000..9f376b493bd
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 optfeature readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
+# Could use the github tarball but we need autotools then
+#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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"
+
+RDEPEND="app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75
+ dev-libs/libxslt
+ dev-libs/libxml2:2"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_install() {
+ distutils-r1_src_install
+
+ # TODO: Consider using Debian patch to allow /usr/share?
+ insinto /usr/share/asciidoc
+ doins -r asciidoc/resources/.
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
+ optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
+ optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+ optfeature "graphviz filter support" "media-gfx/graphviz"
+}
diff --git a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
deleted file mode 100644
index 7772c2bc97e..00000000000
--- a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- dev-libs/libxml2:2
- "
-DEPEND="
- test? (
- ${PYTHON_DEPS}
- app-text/dvipng
- app-text/dvisvgm
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
- docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
- filters/code/code-filter-readme.txt )
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- asciidoc.py || die
-
- # enforce usage of the configured version of Python
- sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
- default
-
- if use doc; then
- emake DESTDIR="${D}" docs
- fi
-
- python_fix_shebang "${ED}"/usr/bin/*.py
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
- optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
- optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
- optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
deleted file mode 100644
index 7772c2bc97e..00000000000
--- a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit autotools optfeature python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- dev-libs/libxml2:2
- "
-DEPEND="
- test? (
- ${PYTHON_DEPS}
- app-text/dvipng
- app-text/dvisvgm
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
- docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
- filters/code/code-filter-readme.txt )
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- asciidoc.py || die
-
- # enforce usage of the configured version of Python
- sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_install() {
- default
-
- if use doc; then
- emake DESTDIR="${D}" docs
- fi
-
- python_fix_shebang "${ED}"/usr/bin/*.py
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
- optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
- optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
- optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
index f3c86d982e9..437f83acac4 100644
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ b/app-text/asciidoc/asciidoc-9.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=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="doc test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild b/app-text/asciidoc/asciidoc-9.1.1.ebuild
index 7772c2bc97e..f3c86d982e9 100644
--- a/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.1.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit autotools optfeature python-single-r1 readme.gentoo-r1
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="doc test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -33,7 +33,7 @@ DEPEND="
dev-texlive/texlive-latex
dev-util/source-highlight
media-gfx/graphviz
- media-gfx/imagemagick
+ media-gfx/imagemagick[png]
media-sound/lilypond
)"
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index bf7692827ca..3c2c02f59a4 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">
- <email>marcec@gmx.de</email>
- <name>Marc Joliet</name>
- </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/aspell/aspell-0.60.8-r3.ebuild b/app-text/aspell/aspell-0.60.8-r4.ebuild
index 499e003d437..c338ba1221d 100644
--- a/app-text/aspell/aspell-0.60.8-r3.ebuild
+++ b/app-text/aspell/aspell-0.60.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=7
+EAPI=8
inherit autotools flag-o-matic libtool toolchain-funcs
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2.1"
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 ~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 ~x86-solaris"
IUSE="nls unicode"
# All available language app-dicts/aspell-* packages.
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index 524bab8c61a..dae2ad2935b 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1 +1 @@
-DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
+DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e
diff --git a/app-text/barcode/barcode-0.99-r1.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild
index 51debbbbb97..7afa62168be 100644
--- a/app-text/barcode/barcode-0.99-r1.ebuild
+++ b/app-text/barcode/barcode-0.99-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
@@ -7,7 +7,7 @@ inherit autotools
DESCRIPTION="barcode generator"
HOMEPAGE="https://www.gnu.org/software/barcode/"
-SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
+SRC_URI="mirror://gnu/barcode/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index e3c04746c94..ecd93be01be 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.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=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index 53213aaaeab..02c7c5dc9e0 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1,2 +1 @@
-DIST bibclean-3.04.tar.gz 2712015 BLAKE2B 80d2fccb3b453dfda935bedd73ea2173b6ba1416c425a094c6ca915e86a886fe269b2f0e392274775228b03578ccf19da03291ed644f589edec1692120456a99 SHA512 7cdd22d07f627944d90e04ca73c3c82529e2fa9a011469f8d5b418f7651332b4e8c29aceda32b966bb1778151505d7f135ead6a12db8975ff46f650c4c43b4f3
DIST bibclean-3.06.tar.xz 1697732 BLAKE2B c1d9623588e892360eb98e753b44cb54e0eb65d3e3d46a04463c0c3183beacb58fd07542ba06d00eb754061b45ed195a82b90b2843b6ba456c7ba09856090474 SHA512 b167243415f010d7597ffdf52c5bb71de3585f70443c3a04f762a633b2bc276c7aef50e16159c32d8765924be2781b1e60a111305a17c2f42b68ed5216b2e31b
diff --git a/app-text/bibclean/bibclean-3.04.ebuild b/app-text/bibclean/bibclean-3.04.ebuild
deleted file mode 100644
index d7f1a69fa5e..00000000000
--- a/app-text/bibclean/bibclean-3.04.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
-SRC_URI="ftp://ftp.math.utah.edu/pub/bibclean/${P}.tar.gz"
-HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
-
-# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-src_compile() {
- emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin bibclean
- newman bibclean.man bibclean.1
-}
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 61ea3eb5ae5..989726feee5 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1 +1,2 @@
DIST bibletime-3.0.2.tar.xz 1631828 BLAKE2B 7ff319e6810717391d7b4a8b96a63ac315bf1663dd4caaa742f9ec92a3a6490d238cdf4e13ea6aef45b7c6772d4c41ea498c181daa7a8d0abacc58ca59c39b4e SHA512 d374bf88844e63dead0da5dc3f951a7e6eca133e18067acf28432d1e9d12ac9f481fb7421d9b5ae4c76b5aff7eb05c083fa6828a58332d02a3975f1921d8914c
+DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090
diff --git a/app-text/bibletime/bibletime-3.0.3.ebuild b/app-text/bibletime/bibletime-3.0.3.ebuild
new file mode 100644
index 00000000000..f7b3e8d6ce3
--- /dev/null
+++ b/app-text/bibletime/bibletime-3.0.3.ebuild
@@ -0,0 +1,59 @@
+# 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"
+
+RDEPEND=">=app-text/sword-1.8.1
+ 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-libs/icu:=
+ dev-qt/linguist-tools:5
+ dev-qt/qttest:5
+ net-misc/curl
+ sys-libs/zlib"
+
+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"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HANDBOOK_HTML=no
+ -DBUILD_HANDBOOK_PDF=no
+ -DBUILD_HOWTO_HTML=no
+ -DBUILD_HOWTO_PDF=no
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index 0285f93dbe5..98b9511f637 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,5 +9,5 @@ SRC_URI="https://www.lith.at/binfind/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE=""
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index 9e5e3851e78..e8daaacf166 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.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="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
LICENSE="BSD CC-BY-3.0 ZLIB"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
IUSE="doc"
RDEPEND="dev-libs/xerces-c"
diff --git a/app-text/blogc/blogc-0.20.1.ebuild b/app-text/blogc/blogc-0.20.1.ebuild
index 75b89915692..16608908395 100644
--- a/app-text/blogc/blogc-0.20.1.ebuild
+++ b/app-text/blogc/blogc-0.20.1.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,7 +13,7 @@ else
fi
if [[ ${PV} = *9999* ]]; then
- BDEPEND="app-text/ronn"
+ BDEPEND="|| ( app-text/ronn-ng app-text/ronn )"
else
KEYWORDS="~amd64 ~x86"
fi
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index 75b89915692..16608908395 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-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
@@ -13,7 +13,7 @@ else
fi
if [[ ${PV} = *9999* ]]; then
- BDEPEND="app-text/ronn"
+ BDEPEND="|| ( app-text/ronn-ng app-text/ronn )"
else
KEYWORDS="~amd64 ~x86"
fi
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 7a28c363894..f00d05a8510 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,2 +1,3 @@
DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
+DIST build-docbook-catalog-2.2.tar.bz2 4711 BLAKE2B c93f6c14450e9308dce82724c305846b1635e96470ecb72c240d502b6f7ed360ee013bf40e3cda204e784c034b8a522f6247b3dbc24fe92a9e12d0ca5c28acb7 SHA512 2e6895f8d3564dbef0dc4882448ee5f4457ac01c58be09e2939a364676a52f7d44899cab621101fb4a3161292d15d9df898e076e412ff50fb88d2861ca554b1e
+DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
index 3deb1d96043..e354a2c7f34 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.2.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="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
RDEPEND="
dev-libs/libxml2
@@ -33,7 +33,5 @@ src_configure() {
pkg_postinst() {
# New version -> regen files
# See bug #816303 for rationale behind die
- # create directory if needed
- mkdir -p "${EROOT}"/run/lock
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+ build-docbook-catalog || die "Failed to regenerate docbook catalog."
}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
new file mode 100644
index 00000000000..a4684d16c16
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ dev-libs/libxml2
+ || ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+ has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+ # export for bug #490754
+ export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+ default
+}
+
+pkg_postinst() {
+ # New version -> regen files
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog."
+}
diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
index 85e4ed814fa..26bb3d595e6 100644
--- a/app-text/build-docbook-catalog/metadata.xml
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index dd33b831070..91f1caca069 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,7 +1,3 @@
DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-DIST calibre-5.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e
-DIST calibre-5.30.0.tar.xz 37002224 BLAKE2B dc034c54a6ebee838652fe10b467bf8408f8dabd759108d617e2c9f64109e92afe0f2994c5df480ec4346c596361ccb63d0aaab2796edc4993ae0eef4222ba6d SHA512 c2d435ec9a8cfd5f76439f229cd9a7a7f4e829e44d9f2ff37003faf8a925df40cd77471d72d05a8d145bfc104bf92dbdd67ddacabc84e6e3cad055887530d8bd
-DIST calibre-5.31.0.tar.xz 36937976 BLAKE2B 55995aa8fc75ebee5506145ab7995ebcfd04dfa080eae48229a167e404cc4f091c27f9d9401656c52b1620b6d407904a6e454b0b693c6e194a871bc6fda30d4b SHA512 4a2926f86d4bb4e9b66312c9f988bdf9cbcf12096c76578259f9473f69f7e8c16f763934fbd2664ba8e3bd24fbe6a878c1e2a9df43152ea0fe0ba3d447dfed42
-DIST calibre-5.31.1.tar.xz 36943652 BLAKE2B 13fa46d4426f705f7af2de07a38ca2266148291ca054a1de65b11013907fa51eb7ebefb774988a0b471af31d62ba8eb890cd3fe687505976d9d70738fb64f538 SHA512 c9f8e7fef430961f51699eeda009a799b702b740c9999744b982dbd14d971557f76b31897853435f8947199ca3d65622bf974b2d2afadc813d292b64bc048121
-DIST calibre-5.32.0.tar.xz 37115596 BLAKE2B c26340a87f77f373de619a1120f572b21530ebb69ba47975c5fd27e00dc5e72bd23c7265065e25d82f8e964fbeac8a05cc6a08c2d361c4f0105702993230ebd4 SHA512 4ad46e169a0ce23b354d2443b615f2fa80ef69aa763a5f26431968c49af433becf736659daaeb8d8d07e4a2326698c920cafa9a74ac5a8b7bb2f82f0fee2f532
+DIST calibre-5.42.0.tar.xz 38523536 BLAKE2B 81d8477fbbaeedbf589c3c25b16925f6fe383c74d9ad17d0036f886304c9ce1f807fea6463ef0dc345a07de69438785faca6ef7337e5ff1e7d5684b4d0ed7cdd SHA512 dac197d0a6f36f8ebb56720214df355bfc2625ecf55992b824e3409e7273db12fabfd54d2f602f950761efc717e52f872f5f2c2078770abbc887ef30cc64bbe8
diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 32b84b85f21..2978c52f78a 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-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
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8..9} )
PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 qmake-utils xdg-utils
DESCRIPTION="Ebook management application"
HOMEPAGE="https://calibre-ebook.com/"
@@ -77,7 +77,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-qt/qtcore:5=
dev-qt/qtdbus:5=
dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
dev-qt/qtwidgets:5=
dev-util/desktop-file-utils
dev-util/gtk-update-icon-cache
@@ -110,14 +109,6 @@ DEPEND="${COMMON_DEPEND}
>=virtual/podofo-build-0.9.6_pre20171027
virtual/pkgconfig"
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
src_prepare() {
# no_updates: do not annoy user with "new version is availible all the time
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
@@ -176,7 +167,7 @@ src_install() {
cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+ export QMAKE="$(qt5_get_bindir)/qmake"
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
# violation with kbuildsycoca as in bug #287067, comment #13.
@@ -207,7 +198,7 @@ src_install() {
addpredict /dev/dri #665310
- PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+ PATH=${T}/bin:$(qt5_get_bindir):${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
"${PYTHON}" setup.py install \
--root="${D}" \
--prefix="${EPREFIX}/usr" \
diff --git a/app-text/calibre/calibre-5.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
deleted file mode 100644
index 40fa50fcc40..00000000000
--- a/app-text/calibre/calibre-5.25.0-r2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- dev-libs/snowball-stemmer:=
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-python/zeroconf[${PYTHON_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- >=dev-python/sip-5[${PYTHON_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- mkdir "${T}/bin" || die
- cat - > "${T}/bin/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.30.0.ebuild b/app-text/calibre/calibre-5.30.0.ebuild
deleted file mode 100644
index b01b4920f27..00000000000
--- a/app-text/calibre/calibre-5.30.0.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- dev-libs/snowball-stemmer:=
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-python/zeroconf[${PYTHON_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- >=dev-python/sip-5[${PYTHON_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
- sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
- -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- mkdir "${T}/bin" || die
- cat - > "${T}/bin/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.31.0.ebuild b/app-text/calibre/calibre-5.31.0.ebuild
deleted file mode 100644
index b01b4920f27..00000000000
--- a/app-text/calibre/calibre-5.31.0.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- dev-libs/snowball-stemmer:=
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-python/zeroconf[${PYTHON_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- >=dev-python/sip-5[${PYTHON_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
- sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
- -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- mkdir "${T}/bin" || die
- cat - > "${T}/bin/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.31.1.ebuild b/app-text/calibre/calibre-5.31.1.ebuild
deleted file mode 100644
index 4c142f046ab..00000000000
--- a/app-text/calibre/calibre-5.31.1.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-libs/dbus-glib-0.106
- dev-libs/snowball-stemmer:=
- >=sys-apps/dbus-1.10.8
- $(python_gen_cond_dep '
- app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-python/zeroconf[${PYTHON_USEDEP}]
- ')
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="$(python_gen_cond_dep '
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- >=dev-python/sip-5[${PYTHON_USEDEP}]
- ')
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-PATCHES=(
- # Don't prompt the user for updates - they've installed via
- # an ebuild.
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
-
- # Skip calling a binary (JxrDecApp) from libjxr which is used for tests
- # We don't (yet?) package libjxr and it seems to be dead upstream
- # (last commit in 2017)
- "${FILESDIR}/${PN}-5.31.0-jxr-test.patch"
-
- # TODO:
- # test_qt tries to load a bunch of images using Qt and it currently fails
- # due to some presumably missing dependencies. This is important and
- # we need to look into it, but at time of writing, none of the tests
- # are even bring run, so I'd like to return to this later.
- # We don't want to skip test_qt entirely, so just skip this particular
- # assert for now.
- "${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- default
-
- # Warning:
- #
- # While it might be rather tempting to add yet another sed here,
- # please don't. There have been several bugs in Gentoo's packaging
- # of calibre from seds-which-become-stale. Please consider
- # creating a patch instead, but in any case, run the test suite
- # and ensure it passes.
- #
- # If in doubt about a problem, checking Fedora or Arch Linux's packaging
- # is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
- # contributor. Or just ask them.
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
- sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
- -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_compile() {
- # TODO: get qmake called by setup.py to respect CC and CXX too
- tc-export CC CXX
-
- # bug 821871
- local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
- export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-
- PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
-}
-
-src_test() {
- # Skipped tests:
- # - 7z (unpackaged Python dependency: py7zr)
- # - test_chardet (unpackaged Python dependency: cchardet)
- # - test_unrar (unpackaged Python dependency: unrardll)
- #
- # Note that we currently have a hack to skip one part of test_qt!
- # See PATCHES for more.
- CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
- --exclude-test-name 7z \
- --exclude-test-name test_chardet \
- --exclude-test-name test_unrar || die
-}
-
-src_install() {
- # calibre works with python 3, so remove the python 2 constraint
- export CALIBRE_PY3_PORT=1
-
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- mkdir "${T}/bin" || die
- cat - > "${T}/bin/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C.utf8 #709682
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.32.0-r1.ebuild b/app-text/calibre/calibre-5.42.0-r1.ebuild
index 7b6a8c3a07b..f3484c05792 100644
--- a/app-text/calibre/calibre-5.32.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.42.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-inherit toolchain-funcs python-single-r1 xdg-utils
+inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
DESCRIPTION="Ebook management application"
HOMEPAGE="https://calibre-ebook.com/"
@@ -46,6 +46,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/icu-57.1:=
dev-libs/libinput:=
>=dev-libs/dbus-glib-0.106
+ dev-libs/openssl:=
dev-libs/snowball-stemmer:=
>=sys-apps/dbus-1.10.8
$(python_gen_cond_dep '
@@ -82,7 +83,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-qt/qtcore:5=
dev-qt/qtdbus:5=
dev-qt/qtgui:5=[jpeg]
- >=dev-qt/qtwebengine-5.12
dev-qt/qtwidgets:5=
dev-util/desktop-file-utils
dev-util/gtk-update-icon-cache
@@ -123,7 +123,7 @@ PATCHES=(
# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
# We don't (yet?) package libjxr and it seems to be dead upstream
# (last commit in 2017)
- "${FILESDIR}/${PN}-5.31.0-jxr-test.patch"
+ "${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
# TODO:
# test_qt tries to load a bunch of images using Qt and it currently fails
@@ -135,14 +135,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
)
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
src_prepare() {
default
@@ -196,7 +188,7 @@ src_compile() {
local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
- PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+ PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die
}
src_test() {
@@ -208,6 +200,7 @@ src_test() {
# See PATCHES for more.
CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
--exclude-test-name 7z \
+ --exclude-test-name test_mem_leaks \
--exclude-test-name test_searching \
--exclude-test-name test_unrar || die
}
@@ -228,7 +221,7 @@ src_install() {
cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+ export QMAKE="$(qt5_get_bindir)/qmake"
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
# violation with kbuildsycoca as in bug #287067, comment #13.
diff --git a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
index c39508474b6..bec72c15cb8 100644
--- a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
+++ b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
@@ -1,18 +1,16 @@
Avoid calling libjxr's JxrDecApp as we currently don't package it.
--- a/src/calibre/utils/img.py
+++ b/src/calibre/utils/img.py
-@@ -119,8 +119,6 @@ def image_from_data(data):
+@@ -118,8 +118,6 @@
i = QImage()
if not i.loadFromData(data):
q = what(None, data)
- if q == 'jxr':
- return load_jxr_data(data)
- raise NotImage('Not a valid image (detected type: {})'.format(q))
+ raise NotImage(f'Not a valid image (detected type: {q})')
return i
---- a/src/calibre/utils/img.py
-+++ b/src/calibre/utils/img.py
-@@ -644,11 +644,6 @@ def test(): # {{{
+@@ -645,11 +643,6 @@
despeckle_image(img)
remove_borders_from_image(img)
image_to_data(img, fmt='GIF')
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 8b27173b2f6..b18ed8916d6 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,2 @@
-DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
+DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742 SHA512 2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
index 8ea8d40b3a3..7f173bed643 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
@@ -1,11 +1,11 @@
-# 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
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake python-any-r1 xdg-utils
+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"
@@ -15,10 +15,12 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
S="${WORKDIR}/${P}/future"
else
- COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523
- SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ 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"
+ # S="${WORKDIR}/${PN}-${COMMIT}/future"
fi
# GPL-3 — future/src/ct (CherryTree)
@@ -28,32 +30,34 @@ LICENSE="GPL-3 LGPL-2.1 MIT"
SLOT="0"
IUSE="nls test"
-RESTRICT="!test? ( test )"
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
-RDEPEND="
+RDEPEND="app-i18n/uchardet
app-text/gspell:=
- dev-libs/glib:2
>=dev-cpp/glibmm-2.64.2:2
dev-cpp/gtkmm:3.0
dev-cpp/gtksourceviewmm:3.0
- dev-libs/libxml2:2
dev-cpp/libxmlpp:2.6
dev-cpp/pangomm:1.4
- dev-db/sqlite:3"
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ 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? (
- dev-util/intltool
sys-devel/gettext
)
test? ( dev-util/cpputest )"
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
python_check_deps() {
has_version "dev-python/lxml[${PYTHON_USEDEP}]"
}
@@ -70,7 +74,7 @@ src_prepare() {
CMakeLists.txt || die
fi
- python_fix_shebang .
+ # python_fix_shebang .
cmake_src_prepare
}
@@ -79,19 +83,8 @@ src_configure() {
-DPYTHON_EXEC="${PYTHON}"
-DUSE_NLS=$(usex nls)
-DBUILD_TESTING=$(usex test)
+ -DUSE_SHARED_FMT_SPDLOG=ON
)
cmake_src_configure
}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/app-text/cmark/cmark-0.30.2.ebuild b/app-text/cmark/cmark-0.30.2.ebuild
index 97d0f495a45..a3f5dd59f29 100644
--- a/app-text/cmark/cmark-0.30.2.ebuild
+++ b/app-text/cmark/cmark-0.30.2.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="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
index d51eccb7c80..5db08561fc9 100644
--- a/app-text/coolreader/metadata.xml
+++ b/app-text/coolreader/metadata.xml
@@ -12,6 +12,6 @@
<flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag>
</use>
<upstream>
- <remote-id type="sourceforge">crengine</remote-id>
+ <remote-id type="github">buggins/coolreader</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 006c97d4b82..f14ffbc4def 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.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="6"
@@ -10,14 +10,13 @@ MY_P="${P^^[crf]}"
DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
HOMEPAGE="https://taku910.github.io/crfpp/"
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="|| ( BSD LGPL-2.1 )"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="examples static-libs"
-S="${WORKDIR}/${MY_P}"
-
PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
HTML_DOCS=( doc/. )
@@ -50,9 +49,8 @@ src_install() {
einstalldocs
if use examples; then
+ dodoc -r example
docompress -x /usr/share/doc/${PF}/example
- insinto /usr/share/doc/${PF}
- doins -r example
fi
if ! use static-libs; then
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
deleted file mode 100644
index 931465f405e..00000000000
--- a/app-text/dbacl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dbacl-1.14.1.tar.gz 923956 BLAKE2B a98b7e01a0cafaee8178120069beaa6fbfe716eaa02eeb9505aa498f11b1c54ef599ea3a40bbc6ddfe235d571f550381a9c8026e80208c56a4a44a80750f00e1 SHA512 910fe5d8e56a92a643f16eab73fc3376489f303e22c470b3d78428d65340b01073f336ac8febb7d911eae0995f08ba265cac09628efd55a64955814a810b7372
-DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9
diff --git a/app-text/dbacl/dbacl-1.14.1.ebuild b/app-text/dbacl/dbacl-1.14.1.ebuild
deleted file mode 100644
index ee861dd57ff..00000000000
--- a/app-text/dbacl/dbacl-1.14.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Digramic Bayesian text classifier"
-HOMEPAGE="http://www.lbreyer.com/gpl.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="interactive"
-
-RDEPEND="interactive? (
- sys-libs/slang:=
- sys-libs/readline:=
- sys-libs/ncurses:= )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # See bug #352636 for reference
- export ac_cv_lib_ncurses_initscr=$(usex interactive)
- export ac_cv_lib_readline_readline=$(usex interactive)
- export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
- default
-}
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
deleted file mode 100644
index 2d58f06146d..00000000000
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Digramic Bayesian text classifier"
-HOMEPAGE="http://www.lbreyer.com/gpl.html"
-SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="interactive"
-
-RDEPEND="interactive? (
- sys-libs/slang:=
- sys-libs/readline:=
- sys-libs/ncurses:= )"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # See bug #352636 for reference
- export ac_cv_lib_ncurses_initscr=$(usex interactive)
- export ac_cv_lib_readline_readline=$(usex interactive)
- export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
-}
diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml
deleted file mode 100644
index a7fbda3ebab..00000000000
--- a/app-text/dbacl/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="interactive">Enable the interactive mailinspect ability</flag>
-</use>
-<longdescription>dbacl is a fast Bayesian text and email classifier. It builds a variety of language models using maximum entropy (minimum divergence) principles, and these can then be used to categorize input data automatically among multiple categories.</longdescription>
-</pkgmetadata>
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index cad3460da6c..17da88fbf40 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.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"
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="inkscape"
RDEPEND="
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index da733602140..9bab7d77019 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1 +1,2 @@
DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
+DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
diff --git a/app-text/discount/discount-2.2.7-r2.ebuild b/app-text/discount/discount-2.2.7-r2.ebuild
index 1af369708c0..10730afd7a9 100644
--- a/app-text/discount/discount-2.2.7-r2.ebuild
+++ b/app-text/discount/discount-2.2.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="minimal test"
RESTRICT="!test? ( test )"
diff --git a/app-text/discount/discount-2.2.7-r1.ebuild b/app-text/discount/discount-2.2.7b.ebuild
index 1ecc2092dae..e496c270875 100644
--- a/app-text/discount/discount-2.2.7-r1.ebuild
+++ b/app-text/discount/discount-2.2.7b.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
@@ -11,12 +11,10 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="minimal test"
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
-
src_prepare() {
default
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index fa7f8b1800d..7853bec4b21 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,2 +1 @@
-DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
deleted file mode 100644
index 2887ff6e9fb..00000000000
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic optfeature xdg-utils
-
-COMMIT="a00b7618c22fb35b030582147a4479c4cf41c349"
-MY_P="${PN}-${PN}libre-git-${COMMIT}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="https://ajakk.github.io/${P}-${COMMIT}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
- tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
- || ( gnome-base/librsvg media-gfx/inkscape )"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
- # We install all desktop files by hand.
- econf \
- $(use_enable xml xmltools) \
- $(use_with jpeg) \
- $(use_with tiff) \
- --disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- use doc && dodoc -r doc
-
- # Install desktop files.
- cd desktopfiles
- for i in {22,32,48,64}; do
- insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
- newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
- done
- insinto /usr/share/mime/packages
- doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- has_version app-text/djview || \
- optfeature "djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.28-r1.ebuild b/app-text/djvu/djvu-3.5.28-r1.ebuild
index 7468d234ff8..61d2046c8eb 100644
--- a/app-text/djvu/djvu-3.5.28-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.28-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
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P%%.3}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="debug doc jpeg tiff xml"
RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28.ebuild
deleted file mode 100644
index 1a910c10979..00000000000
--- a/app-text/djvu/djvu-3.5.28.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic optfeature xdg
-
-MY_P="${PN}libre-${PV#*_p}"
-DESCRIPTION="DjVu viewers, encoders and utilities"
-HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P%%.3}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="debug doc jpeg tiff xml"
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
- tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
- || ( gnome-base/librsvg media-gfx/inkscape )"
-BDEPEND="app-arch/unzip"
-
-DOCS=( NEWS README )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
- # We install all desktop files by hand.
- econf \
- $(use_enable xml xmltools) \
- $(use_with jpeg) \
- $(use_with tiff) \
- --disable-desktopfiles
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- use doc && dodoc -r doc
-
- # Install desktop files.
- cd desktopfiles || die
- for i in {22,32,48,64}; do
- insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
- newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
- done
-
- insinto /usr/share/mime/packages
- doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "djviewer or browser plugin" app-text/djview
-}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
index b416d65c318..dfb1003e7ab 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
@@ -14,7 +14,7 @@ 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"
IUSE=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
index b416d65c318..dfb1003e7ab 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r5.ebuild
@@ -14,7 +14,7 @@ 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"
IUSE=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
index b416d65c318..dfb1003e7ab 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r5.ebuild
@@ -14,7 +14,7 @@ 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"
IUSE=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r5.ebuild
index 7a62740ffb3..c97fe2e1774 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.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,10 +11,10 @@ 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 ~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=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
index 1a818fa15b7..ef1ddb6b081 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r4.ebuild
@@ -14,7 +14,7 @@ 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"
IUSE=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
index 9fa5aaadf06..2e6d2e030fc 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r4.ebuild
@@ -14,7 +14,7 @@ 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"
IUSE=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
index 75a0ff68fff..3391332678f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r2.ebuild
@@ -14,7 +14,7 @@ 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"
IUSE=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
index db8c331274e..2b8e3af280e 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="${PV}"
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=""
-DEPEND=">=app-arch/unzip-5.41"
+BDEPEND=">=app-arch/unzip-5.41"
S="${WORKDIR}"
PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
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
index 1b6ccb1e5dd..344496f27da 100644
--- 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
@@ -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
@@ -29,8 +29,8 @@ DEPEND=">=dev-lang/perl-5
~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 )
- userland_GNU? ( sys-apps/which )
|| (
www-client/lynx
www-client/links
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
new file mode 100644
index 00000000000..13d1a9971d1
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@@ -0,0 +1,71 @@
+# 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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jadetex"
+
+DEPEND=">=dev-lang/perl-5
+ app-text/docbook-dsssl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ app-text/openjade
+ app-text/xhtml1
+ dev-perl/SGMLSpm
+ ~app-text/docbook-sgml-dtd-3.0
+ ~app-text/docbook-sgml-dtd-3.1
+ ~app-text/docbook-sgml-dtd-4.0
+ ~app-text/docbook-sgml-dtd-4.1
+ ~app-text/docbook-sgml-dtd-4.2
+ ~app-text/docbook-sgml-dtd-4.4
+ ~app-text/docbook-xml-simple-dtd-1.0
+ ~app-text/docbook-xml-simple-dtd-4.1.2.4
+ 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/files/docbook-sgml-utils-0.6.14-grep-2.7.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
index 490d65a0aa4..89663829e8b 100644
--- a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
@@ -1,8 +1,8 @@
Fix wrong charakter classes no longer missinterpreted by grep-2.7
Michael Weber <xmw@gentoo.org>
---- docbook-utils-0.6.14/bin/jw.in
-+++ docbook-utils-0.6.14/bin/jw.in
+--- a/bin/jw.in
++++ b/bin/jw.in
@@ -80,9 +80,9 @@
SGML_CATALOGS_DIR="/etc/sgml"
if [ -f "$SGML_CONF" ]
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
index 5256570458a..f437b8163f5 100644
--- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
@@ -1,6 +1,5 @@
-diff -NurdB docbook-utils-0.6.14/backends/txt docbook-utils-0.6.14-patched/backends/txt
---- docbook-utils-0.6.14/backends/txt 2004-02-11 08:58:03.000000000 -0500
-+++ docbook-utils-0.6.14-patched/backends/txt 2006-06-05 21:57:23.000000000 -0500
+--- a/backends/txt
++++ b/backends/txt
@@ -10,6 +10,10 @@
then
CONVERT=/usr/bin/links
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
index 29906c2046a..0f795f7371c 100644
--- a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
@@ -1,5 +1,5 @@
---- doc/HTML/Makefile.am~ 2007-10-08 04:13:04 +0200
-+++ doc/HTML/Makefile.am 2007-10-08 04:13:34 +0200
+--- a/doc/HTML/Makefile.am
++++ b/doc/HTML/Makefile.am
@@ -23,7 +23,7 @@
$(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \
$(top_srcdir)/doc/refentry/frontend-spec.sgml \
@@ -9,8 +9,8 @@
SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
-V '%use-id-as-filename%' $<
---- doc/man/Makefile.am~ 2007-10-08 04:14:16 +0200
-+++ doc/man/Makefile.am 2007-10-08 04:14:29 +0200
+--- a/doc/man/Makefile.am
++++ b/doc/man/Makefile.am
@@ -10,7 +10,7 @@
$(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \
@@ -20,8 +20,8 @@
SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
nsgmls $< | \
sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
---- bin/jw.in~ 2007-10-08 04:27:18 +0200
-+++ bin/jw.in 2007-10-08 04:28:40 +0200
+--- a/bin/jw.in
++++ b/bin/jw.in
@@ -63,7 +63,7 @@
then
SGML_CONF=`sgmlwhich`
@@ -40,8 +40,8 @@
if [ -f "$SGML_CONF" ]
then
RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
---- backends/txt~ 2007-10-08 04:59:59 +0200
-+++ backends/txt 2007-10-08 05:00:52 +0200
+--- a/backends/txt
++++ b/backends/txt
@@ -2,21 +2,21 @@
# Send any comments to Eric Bischoff <eric@caldera.de>
# This program is under GPL license. See LICENSE file for details.
@@ -72,8 +72,8 @@
ARGS="-dump"
else
echo >&2 "No way to convert HTML to text found."
---- configure.in~ 2004-02-11 15:14:15 +0100
-+++ configure.in 2007-10-14 10:40:51 +0200
+--- a/configure.in
++++ b/configure.in
@@ -20,11 +20,11 @@
AC_SUBST(docdir)
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index e3188ba498f..6c957cfa762 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -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/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index ee19a3db01c..c173cd21261 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -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/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index ee19a3db01c..c173cd21261 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -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/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index b9ce7d99daf..c94e3db4bea 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -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/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index b9ce7d99daf..c94e3db4bea 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -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/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index d45bb7f2656..89c5dad6037 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -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,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 1e1416abedf..ba35adf0459 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -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
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 81b5caa7013..47f57b19bcd 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.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
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+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="
@@ -76,7 +76,7 @@ src_prepare() {
lintl() {
# same logic as from virtual/libintl
- use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+ use !elibc_glibc && use !elibc_musl && echo "-lintl"
}
src_compile() {
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index bc88a0173bd..ff2e7e865a1 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.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://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+ Texinfo-manual"
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 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="truetype test"
RESTRICT="!test? ( test )"
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
index 84f1ed701a1..17c6b2af4b9 100644
--- a/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325-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
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
LICENSE="GPL-2"
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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=dev-libs/kpathsea-6.2.1:="
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index f385c668afb..cb823daaa58 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,3 +1,2 @@
-DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
-DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f
DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008
+DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795acb75063f35bf2b6b15b6bacc8ddc60d9622d8554c80f7c2ab44c85c78a120d4e18fd7a0c902eabb70b6060fc SHA512 264643f9d9dcfa7e1d20df31c3514108ed45c88e0bd0f1ce88c37af22ae57447d624537720e902c5e5e799906d567999c9449fea411f755e75e4c4158e37de30
diff --git a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
deleted file mode 100644
index 3bad4b3c179..00000000000
--- a/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~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"
-
-BDEPEND="
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-RDEPEND="
- >=app-arch/brotli-1.0.5:=
- app-text/ghostscript-gpl
- dev-libs/kpathsea:=
- dev-libs/openssl:=
- >=dev-libs/xxhash-0.6.5
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- >=media-libs/woff2-1.0.2
- sys-libs/zlib
- virtual/tex-base
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local myargs=(
- --without-ttfautohint
- )
-
- econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.12.ebuild b/app-text/dvisvgm/dvisvgm-2.12.ebuild
index 1c8d9fa3d37..0fc4f7c9520 100644
--- a/app-text/dvisvgm/dvisvgm-2.12.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.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="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"
+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.
diff --git a/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.13.ebuild
index a35bc82ca5a..25e4d4acd0c 100644
--- a/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.13.ebuild
@@ -1,48 +1,44 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs flag-o-matic
-
DESCRIPTION="Converts DVI files to SVG"
HOMEPAGE="https://dvisvgm.de/"
SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+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
+
+# 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"
-BDEPEND="
- app-text/asciidoc
- app-text/xmlto
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )
-"
-RDEPEND="
- >=app-arch/brotli-1.0.5:=
- app-text/ghostscript-gpl
+RDEPEND=">=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
dev-libs/kpathsea:=
dev-libs/openssl:=
- >=dev-libs/xxhash-0.6.5
+ >=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}"
+ virtual/tex-base"
+DEPEND="${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.11 )"
+BDEPEND="app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig"
src_configure() {
local myargs=(
--without-ttfautohint
)
+
econf "${myargs[@]}"
}
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 556ae82eb87..0b9c3f27c38 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,3 +1,3 @@
DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
-DIST enchant-2.3.1.tar.gz 987361 BLAKE2B 86d6f384ada861a1df40a3241d2d32ef8513784c9dbca3b71bfdc52e2efc94c4d9cfb38e752970dc31a36545c1f9bf32f0550316b969d9170363e8b52c030819 SHA512 c6fb8498d34a55040c2791124c2975952497e5a1b8999958691279b1a60a37473a1d2e3e11504f7cc877370be7772c2db621022040ea7035b21e40e8367606f5
+DIST enchant-2.3.2.tar.gz 991782 BLAKE2B ece8c4cbac2c242c23b4b8c5ab2daf1037705dbf58ad29b4863dd01cb30b2d98e11828f2b9d1ce3823aec419c871cc3dd1092e4659e10ef3e3cd2df867255be4 SHA512 886635bb55c5f0c774445e4a0f14d39e2d08eeb964257037062c2e97c2cf3348be8c631ff5e7a13144936127761964bdc60ff1e0dd6f63b292a655626f91ef62
+DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
new file mode 100644
index 00000000000..d4302d6ca52
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV//./-}"
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="aspell +hunspell test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aspell hunspell )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.6:2
+ aspell? ( app-text/aspell )
+ hunspell? ( >=app-text/hunspell-1.2.1:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<app-text/enchant-2.3.3:2
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-libs/unittest++-2.0.0-r2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
+)
+
+src_prepare() {
+ default
+ sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484
+}
+
+src_configure() {
+ local myconf=(
+ --datadir="${EPREFIX}"/usr/share/enchant-1
+ --disable-static
+ $(use_enable aspell)
+ $(use_enable hunspell myspell)
+ --disable-hspell
+ --disable-ispell
+ --disable-uspell
+ --disable-voikko
+ --disable-zemberek
+ --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild
deleted file mode 100644
index 148aae6be61..00000000000
--- a/app-text/enchant/enchant-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="aspell +hunspell test voikko"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-RDEPEND="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )
- voikko? ( dev-libs/libvoikko )"
-DEPEND="${RDEPEND}
- test? ( >=dev-libs/unittest++-2.0.0-r2 )"
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="test" # Tests fail
-
-src_configure() {
- # TODO: Add app-text/nuspell support
- econf \
- --datadir="${EPREFIX}"/usr/share/enchant-2 \
- --disable-static \
- $(use_enable test relocatable) \
- $(use_with aspell) \
- $(use_with hunspell) \
- $(use_with voikko) \
- --without-nuspell \
- --without-hspell \
- --without-applespell \
- --without-zemberek \
- --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.3.1.ebuild b/app-text/enchant/enchant-2.3.2.ebuild
index 148aae6be61..2da677c77f4 100644
--- a/app-text/enchant/enchant-2.3.1.ebuild
+++ b/app-text/enchant/enchant-2.3.2.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
diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
new file mode 100644
index 00000000000..8e298e6d2d4
--- /dev/null
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="aspell +hunspell nuspell test voikko"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( aspell hunspell nuspell )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.6:2
+ aspell? ( app-text/aspell )
+ hunspell? ( >=app-text/hunspell-1.2.1:0= )
+ nuspell? ( >=app-text/nuspell-5.1.0:0= )
+ voikko? ( dev-libs/libvoikko )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<app-text/enchant-1.6.1-r2:0
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( >=dev-libs/unittest++-2.0.0-r2 )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ local myconf=(
+ --disable-static
+ $(use_enable test relocatable)
+ $(use_with aspell)
+ $(use_with hunspell)
+ $(use_with nuspell)
+ $(use_with voikko)
+ --without-hspell
+ --without-applespell
+ --without-zemberek
+ --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 3033ca238ad..3d5f422a24e 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
+ <flag name="nuspell">Adds support for <pkg>app-text/nuspell</pkg> spell checker</flag>
<flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag>
</use>
</pkgmetadata>
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 01e04f7bbd4..bc3fef3d990 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1 +1,2 @@
+DIST epspdf-0.6.5.zip 331312 BLAKE2B 3bd2c9cd432172c38efe33d08068f20fddf169d5d7bc94c9f1720cf379de9ba54aedb1cb6fd438b721c2e98f24dfd1ca4b3dab5c1fe01a71791748f952832ac9 SHA512 28ef12546a957c62fd94b405b53359898d46c825bad8fd2167b5ab23bb2a6ea457ccbcc8263b31574e128ebe56e21b30fae27d406397df3fdc1506a088ab41f4
DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
diff --git a/app-text/epspdf/epspdf-0.6.5.ebuild b/app-text/epspdf/epspdf-0.6.5.ebuild
new file mode 100644
index 00000000000..1c46675218c
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop texlive-common
+
+DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
+HOMEPAGE="http://tex.aanhet.net/epspdf/"
+# http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc tk"
+
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+ >=dev-texlive/texlive-basic-2011
+ app-text/ghostscript-gpl
+ tk? ( dev-lang/tk )"
+BDEPEND="app-arch/unzip
+ sys-apps/texinfo"
+
+src_compile() {
+ cd doc || die
+ makeinfo epspdf || die
+}
+
+src_install() {
+ exeinto /usr/share/${PN}
+ doexe epspdf.tlu
+
+ insinto /usr/share/${PN}
+
+ if use tk ; then
+ doins epspdf.help doc/images/epspdf.png
+ doexe epspdftk.tcl
+ fi
+
+ dobin_texmf_scripts ${PN}/epspdf.tlu
+ use tk && dobin_texmf_scripts ${PN}/epspdftk.tcl
+
+ doinfo doc/epspdf.info
+ dodoc doc/Changelog
+ if use doc ; then
+ dodoc doc/epspdf.pdf
+ dodoc -r doc
+ fi
+
+ # Give it a .desktop
+ if use tk; then
+ make_desktop_entry epspdftk epspdftk "${EPREFIX}/usr/share/${PN}/epspdf.png" "Graphics;ImageProcessing"
+ fi
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index d6a0f18b996..fca6ef35f38 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,2 +1,3 @@
-DIST evince-40.2.tar.xz 2928072 BLAKE2B 86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660 SHA512 f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
-DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd
+DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
+DIST evince-42.1.tar.xz 2850652 BLAKE2B 4fb03270caf1be548a82f9094973e584807c497171cef960f344c14158420e02a0fed6d84dcc8d09d3a7f2e8a68f69ffae36398fe6e747d86e3a63132d5a36d6 SHA512 d8ea086b6530c186ac48d88fa2546cd8abd8a075d79037c1f0bf76e63b28914b04a58af83c96e44e04d625fec674f3989bfd51472cd458be9c903a1a4512d8df
+DIST evince-42.2.tar.xz 2854836 BLAKE2B ed8b9e6117d2d456e59d5fd4aac664b73fb450589a04b04b3ada7f1606781001c5ab75a98d425fdf00409e2f4abad59f6a140f39df4ca6bd82a641caaf944062 SHA512 81e93eb5575169ed1a31fdd321a1d7080b4391ddf1ebf13ce49df5ede8bb5f578094b55b2e1075f0a418ef21e8b73f02b259c2bda44b317ea9f551372ee3b860
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-41.3.ebuild
index d64fa863654..59de9f04351 100644
--- a/app-text/evince/evince-40.4.ebuild
+++ b/app-text/evince/evince-41.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
@@ -11,8 +11,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell t1lib tiff xps"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
@@ -26,7 +26,7 @@ DEPEND="
>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
- >=app-text/poppler-0.76.0[cairo]
+ >=app-text/poppler-0.86.0[cairo]
>=app-arch/libarchive-3.2.0
djvu? ( >=app-text/djvu-3.5.22:= )
dvi? (
@@ -43,7 +43,7 @@ DEPEND="
nautilus? ( >=gnome-base/nautilus-3.28.0 )
postscript? ( >=app-text/libspectre-0.2:= )
spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-3.6:0= )
+ tiff? ( >=media-libs/tiff-4.0:0= )
xps? ( >=app-text/libgxps-0.2.1:= )
"
RDEPEND="${DEPEND}
@@ -55,8 +55,10 @@ RDEPEND="${DEPEND}
)
"
BDEPEND="
- gtk-doc? ( >=dev-util/gtk-doc-1.33 )
- app-text/docbook-xml-dtd:4.3
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.33
+ app-text/docbook-xml-dtd:4.3
+ )
dev-libs/appstream-glib
dev-util/gdbus-codegen
dev-util/glib-utils
@@ -66,7 +68,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/40.0-internal-synctex.patch
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
)
src_prepare() {
@@ -79,12 +81,12 @@ src_prepare() {
src_configure() {
local emesonargs=(
+ -Ddevelopment=false
-Dplatform=gnome
-Dviewer=true
-Dpreviewer=true
-Dthumbnailer=true
- $(meson_use nsplugin browser_plugin)
$(meson_use nautilus)
-Dcomics=enabled
@@ -105,11 +107,10 @@ src_configure() {
$(meson_feature gstreamer multimedia)
$(meson_feature spell gspell)
+ -Dinternal_synctex=true
$(meson_feature t1lib)
- -Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-
)
meson_src_configure
}
diff --git a/app-text/evince/evince-40.2.ebuild b/app-text/evince/evince-42.1.ebuild
index 7611a7a0a0b..c8e4f7b1747 100644
--- a/app-text/evince/evince-40.2.ebuild
+++ b/app-text/evince/evince-42.1.ebuild
@@ -1,9 +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 gnome.org meson systemd xdg
+inherit gnome.org gnome2-utils meson systemd xdg
DESCRIPTION="Simple document viewer for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
@@ -11,28 +11,28 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+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"
# atk used in libview
# bundles unarr
DEPEND="
dev-libs/atk
>=dev-libs/glib-2.44.0:2
- >=gui-libs/libhandy-1.0:1=
+ >=gui-libs/libhandy-1.5.0:1=
>=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
>=x11-libs/gdk-pixbuf-2.40:2
>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
- >=app-text/poppler-0.76.0[cairo]
- >=app-arch/libarchive-3.2.0
+ >=app-text/poppler-22.02.0[cairo]
+ >=app-arch/libarchive-3.6.0
djvu? ( >=app-text/djvu-3.5.22:= )
dvi? (
>=app-text/libspectre-0.2:=
dev-libs/kpathsea:=
- t1lib? ( >=media-libs/t1lib-5:= ) )
+ )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -43,7 +43,7 @@ DEPEND="
nautilus? ( >=gnome-base/nautilus-3.28.0 )
postscript? ( >=app-text/libspectre-0.2:= )
spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-3.6:0= )
+ tiff? ( >=media-libs/tiff-4.0:0= )
xps? ( >=app-text/libgxps-0.2.1:= )
"
RDEPEND="${DEPEND}
@@ -55,8 +55,10 @@ RDEPEND="${DEPEND}
)
"
BDEPEND="
- gtk-doc? ( >=dev-util/gtk-doc-1.33 )
- app-text/docbook-xml-dtd:4.3
+ gtk-doc? (
+ >=dev-util/gi-docgen-2021.1
+ app-text/docbook-xml-dtd:4.3
+ )
dev-libs/appstream-glib
dev-util/gdbus-codegen
dev-util/glib-utils
@@ -65,12 +67,9 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}"/40.0-internal-synctex.patch
-)
-
src_prepare() {
default
+ xdg_environment_reset
# Do not depend on adwaita-icon-theme, bug #326855, #391859
# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
@@ -79,12 +78,12 @@ src_prepare() {
src_configure() {
local emesonargs=(
+ -Ddevelopment=false
-Dplatform=gnome
-Dviewer=true
-Dpreviewer=true
-Dthumbnailer=true
- $(meson_use nsplugin browser_plugin)
$(meson_use nautilus)
-Dcomics=enabled
@@ -105,23 +104,19 @@ src_configure() {
$(meson_feature gstreamer multimedia)
$(meson_feature spell gspell)
- $(meson_feature t1lib)
+ -Dinternal_synctex=true
- -Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-
)
meson_src_configure
}
-src_compile() {
- meson_src_compile
-}
-
-src_test() {
- meson_src_test
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
}
-src_install() {
- meson_src_install
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
}
diff --git a/app-text/evince/evince-42.2.ebuild b/app-text/evince/evince-42.2.ebuild
new file mode 100644
index 00000000000..c8e4f7b1747
--- /dev/null
+++ b/app-text/evince/evince-42.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+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"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.44.0:2
+ >=gui-libs/libhandy-1.5.0:1=
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib:=
+ >=x11-libs/gdk-pixbuf-2.40:2
+ >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/cairo-1.10:=
+ >=app-text/poppler-22.02.0[cairo]
+ >=app-arch/libarchive-3.6.0
+ djvu? ( >=app-text/djvu-3.5.22:= )
+ dvi? (
+ >=app-text/libspectre-0.2:=
+ dev-libs/kpathsea:=
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0 )
+ gnome? ( gnome-base/gnome-desktop:3= )
+ gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1:= )
+ nautilus? ( >=gnome-base/nautilus-3.28.0 )
+ postscript? ( >=app-text/libspectre-0.2:= )
+ spell? ( >=app-text/gspell-1.6.0:= )
+ tiff? ( >=media-libs/tiff-4.0:0= )
+ xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+ gnome-base/gvfs
+ gnome-base/librsvg
+ || (
+ >=x11-themes/adwaita-icon-theme-2.17.1
+ >=x11-themes/hicolor-icon-theme-0.10
+ )
+"
+BDEPEND="
+ gtk-doc? (
+ >=dev-util/gi-docgen-2021.1
+ app-text/docbook-xml-dtd:4.3
+ )
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ # Do not depend on adwaita-icon-theme, bug #326855, #391859
+ # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+ sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddevelopment=false
+ -Dplatform=gnome
+
+ -Dviewer=true
+ -Dpreviewer=true
+ -Dthumbnailer=true
+ $(meson_use nautilus)
+
+ -Dcomics=enabled
+ $(meson_feature djvu)
+ $(meson_feature dvi)
+ -Dpdf=enabled
+ $(meson_feature postscript ps)
+ $(meson_feature tiff)
+ $(meson_feature xps)
+
+ $(meson_use gtk-doc gtk_doc)
+ -Duser_doc=true
+ $(meson_use introspection)
+ -Ddbus=true
+ $(meson_feature gnome-keyring keyring)
+ $(meson_feature cups gtk_unix_print)
+ $(meson_feature gnome thumbnail_cache)
+ $(meson_feature gstreamer multimedia)
+ $(meson_feature spell gspell)
+
+ -Dinternal_synctex=true
+
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)"
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/app-text/evince/files/40.0-internal-synctex.patch b/app-text/evince/files/40.0-internal-synctex.patch
deleted file mode 100644
index 8c45548c639..00000000000
--- a/app-text/evince/files/40.0-internal-synctex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ce976d98317535d17d8aabd67729918a94b24cea Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 12 Apr 2021 23:07:50 -0400
-Subject: [PATCH] build: always use internal synctex instead of automagically
-
-We don't have a separate synctex package and would have to pull in
-all of texlive-core; so instead of fixing the automagic use of it,
-just remove support for external synctex, as that's easier.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index abee124d..63c5040c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -251,7 +251,7 @@ config_h.set('HAVE_DESKTOP_SCHEMAS', gsettings_desktop_schemas_dep.found())
-
- # *** libsynctex ***
- synctex_dep = dependency('synctex', version: '>= 1.19', required: false)
--external_synctex = synctex_dep.found()
-+external_synctex = false
-
- # *** Mime types list ***
- mime_types_list = {
---
-2.26.3
-
diff --git a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 00000000000..fa0a5cd8291
--- /dev/null
+++ b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,54 @@
+https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54
+https://bugs.gentoo.org/831853
+
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for
+a time and explicitly rejects with error since meson 0.60.0
+---
+ backend/meson.build | 1 -
+ data/meson.build | 1 -
+ meson.build | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
+ )
+
+ i18n.merge_file(
+- appstream,
+ input: appstream_in,
+ output: appstream,
+ po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index 8a308b853..afc302098 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,6 @@ foreach desktop: desktops
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: desktop,
+diff --git a/meson.build b/meson.build
+index 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+
+ i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+--
+GitLab
+
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
index c1ddd2ee423..6684a72038d 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.0.5-r2.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
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}"
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
- emake -C src CC=$(tc-getCC)
+ emake -C src CC="$(tc-getCC)"
}
src_install() {
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index c66e3fbd29a..abe37e46fc6 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,2 +1 @@
-DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
-DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
+DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
diff --git a/app-text/foliate/foliate-2.6.2.ebuild b/app-text/foliate/foliate-2.6.2.ebuild
deleted file mode 100644
index 685d66123a4..00000000000
--- a/app-text/foliate/foliate-2.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
-SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="gtk ebook reader built with gjs"
-HOMEPAGE="https://github.com/johnfactotum/foliate/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="handy spell"
-
-BDEPEND="${MESON_DEPEND}
- sys-devel/gettext"
-RDEPEND="dev-libs/gjs
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- net-libs/webkit-gtk:4[introspection]
- handy? ( gui-libs/libhandy:=[introspection] )
- spell? ( app-text/gspell[introspection] )"
-
-src_prepare() {
- default
-
- plocale_find_changes "${S}"/po '' '.po'
-
- rm_po() {
- rm po/${1}.po
- sed -e "/^${1}/d" -i po/LINGUAS
- }
-
- plocale_for_each_disabled_locale rm_po
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/app-text/foliate/foliate-2.6.3.ebuild b/app-text/foliate/foliate-2.6.4-r1.ebuild
index 9aa32642596..d7d5bfc423b 100644
--- a/app-text/foliate/foliate-2.6.3.ebuild
+++ b/app-text/foliate/foliate-2.6.4-r1.ebuild
@@ -1,30 +1,35 @@
-# 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
PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-inherit meson plocale xdg-utils gnome2-utils
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1 plocale xdg gnome2-utils
SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="gtk ebook reader built with gjs"
HOMEPAGE="https://github.com/johnfactotum/foliate/"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="handy spell"
BDEPEND="${MESON_DEPEND}
+ ${PYTHON_DEPS}
sys-devel/gettext"
RDEPEND="dev-libs/gjs
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection]
x11-libs/gdk-pixbuf:2[introspection]
net-libs/webkit-gtk:4[introspection]
+ sys-devel/gettext
handy? ( gui-libs/libhandy:=[introspection] )
spell? ( app-text/gspell[introspection] )"
src_prepare() {
default
+ python_fix_shebang build-aux/meson
+ xdg_environment_reset
plocale_find_changes "${S}"/po '' '.po'
@@ -37,15 +42,11 @@ src_prepare() {
}
pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
+ xdg_pkg_postinst
gnome2_schemas_update
}
pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
+ xdg_pkg_postinst
gnome2_schemas_update
}
diff --git a/app-text/fzy/Manifest b/app-text/fzy/Manifest
new file mode 100644
index 00000000000..a56ac810427
--- /dev/null
+++ b/app-text/fzy/Manifest
@@ -0,0 +1 @@
+DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
diff --git a/app-text/fzy/files/1.0-cflags.patch b/app-text/fzy/files/1.0-cflags.patch
new file mode 100644
index 00000000000..4805b4814a4
--- /dev/null
+++ b/app-text/fzy/files/1.0-cflags.patch
@@ -0,0 +1,34 @@
+From 89b4a0437dce6f99de80482d484b3e0346067889 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 24 Apr 2020 19:12:16 -0700
+Subject: [PATCH] cflags
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2d23118..713daad 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION=1.0
+
+ CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
+-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps
++CFLAGS+=-Wall -Wextra -std=c99 -pedantic -Ideps
+ PREFIX?=/usr/local
+ MANDIR?=$(PREFIX)/share/man
+ BINDIR?=$(PREFIX)/bin
+@@ -29,7 +29,7 @@ check: test/fzytest
+ $(DEBUGGER) ./test/fzytest
+
+ fzy: $(OBJECTS)
+- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS)
++ $(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS)
+
+ %.o: %.c config.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+--
+2.26.2
+
diff --git a/app-text/fzy/fzy-1.0-r1.ebuild b/app-text/fzy/fzy-1.0-r1.ebuild
new file mode 100644
index 00000000000..a7450fedb76
--- /dev/null
+++ b/app-text/fzy/fzy-1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
+else
+ SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="Fuzzy text selector (interactive grep) for console"
+HOMEPAGE="https://github.com/jhawthorn/fzy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/1.0-cflags.patch )
+
+src_prepare() {
+ default
+ restore_config config.h
+ tc-export CC
+}
+
+src_install() {
+ local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dobin contrib/fzy-tmux
+ dobin contrib/fzy-dvtm
+ einstalldocs
+ save_config config.h
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+ optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm
+ optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux
+}
diff --git a/app-text/fzy/fzy-9999.ebuild b/app-text/fzy/fzy-9999.ebuild
new file mode 100644
index 00000000000..702455296c5
--- /dev/null
+++ b/app-text/fzy/fzy-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
+else
+ SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Fuzzy text selector (interactive grep) for console"
+HOMEPAGE="https://github.com/jhawthorn/fzy"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ default
+ restore_config config.h
+ tc-export CC
+ sed -i 's/$(LIBS)/$(LIBS) $(LDFLAGS)/g' Makefile || die
+}
+
+src_install() {
+ local DOCS=( ALGORITHM.md CHANGELOG.md README.md )
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dobin contrib/fzy-tmux
+ dobin contrib/fzy-dvtm
+ einstalldocs
+ save_config config.h
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+ optfeature "opening search results in dvtm pane with provided ${EPREFIX}/usr/bin/fzy-dvtm" app-misc/dvtm
+ optfeature "opening search results in tmux pane with provided ${EPREFIX}/usr/bin/fzy-tmux" app-misc/tmux
+}
diff --git a/app-text/fzy/metadata.xml b/app-text/fzy/metadata.xml
new file mode 100644
index 00000000000..77fefea822b
--- /dev/null
+++ b/app-text/fzy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Fuzzy text selector (interactive grep) for console.
+ It can be used to filter any list:
+ files, command history, processes, hostnames, bookmarks, git commits, etc.
+ It's designed to be used both as an editor plugin and on the command line.
+ Rather than clearing the screen, fzy displays its interface directly below
+ the current cursor position, scrolling the screen if necessary.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">jhawthorn/fzy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index c4e41390ab8..31c9cc0c5b7 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,8 +1,4 @@
-DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
-DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
-DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
DIST ghostscript-9.55.0.tar.xz 67417724 BLAKE2B 87827856aa60c2c4a4ed209bc4203a837107df0404af036a48e5baa23fccfc945a97fe328a80b15c7357fc71acb82721d4b96e5f726d8c9d836fee031916aef7 SHA512 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
-DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
-DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
-DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
+DIST ghostscript-9.56.1.tar.xz 62589232 BLAKE2B c0457c98e3f13047d9015d9d1415e2935e142d172aa8c560e68250a4110ccb52167988af70e63d86fc3f462a5d521ac45f7b758cb8d1492670930d9b2dc2e196 SHA512 fe5a5103c081dd87cf8b3e0bbbd0df004c0e4e04e41bded7c70372916e6e26249a0e8fa434b561292964c5f3820ee6c60ef1557827a6efb5676012ccb73ded85
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/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch
deleted file mode 100644
index 9d7f53e2fd1..00000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.ghostscript.com/show_bug.cgi?id=703270
-
---- a/lib/ps2epsi
-+++ b/lib/ps2epsi
-@@ -40,8 +40,8 @@ else
- outfile=$2
- fi
-
--# Note, we expect 'ps2epsi.ps' to be in the same directory as 'ps2epsi'
-+# Note, we expect 'ps2epsi.ps' to be on one of the search paths which can be seen by: gs -h
- "$GS_EXECUTABLE" -q -dNOOUTERSAVE -dNODISPLAY -dLastPage=1 -sOutputFile="${outfile}" \
-- --permit-file-all="${infile}" -- "$LIBDIR/ps2epsi.ps" "${infile}" 1>&2
-+ --permit-file-all="${infile}" -- ps2epsi.ps "${infile}" 1>&2
-
- exit 0
-
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch
deleted file mode 100644
index 59d9ae0095f..00000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.ghostscript.com/show_bug.cgi?id=702985
-https://bugs.gentoo.org/747808
-
---- ghostscript-9.53.3/base/fapi_ft.c
-+++ ghostscript-9.53.3/base/fapi_ft.c
-@@ -125,6 +125,14 @@
- delete_inc_int_info(gs_fapi_server * a_server,
- FT_IncrementalRec * a_inc_int_info);
-
-+#ifndef FT_CALLBACK_DEF
-+#ifdef __cplusplus
-+#define FT_CALLBACK_DEF( x ) extern "C" x
-+#else
-+#define FT_CALLBACK_DEF( x ) static x
-+#endif
-+#endif
-+
- FT_CALLBACK_DEF(void *)
- FF_alloc(FT_Memory memory, long size)
- {
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch
deleted file mode 100644
index 779bedad4bd..00000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=a9bd3dec9fde03327a4a2c69dad1036bf9632e20
-https://bugs.gentoo.org/812509
-
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 7 Sep 2021 20:36:12 +0100
-Subject: [PATCH 1/1] Bug 704342: Include device specifier strings in access
- validation
-
-for the "%pipe%", %handle%" and %printer% io devices.
-
-We previously validated only the part after the "%pipe%" Postscript device
-specifier, but this proved insufficient.
-
-This rebuilds the original file name string, and validates it complete. The
-slight complication for "%pipe%" is it can be reached implicitly using
-"|" so we have to check both prefixes.
-
-Addresses CVE-2021-3781
---- a/base/gdevpipe.c
-+++ b/base/gdevpipe.c
-@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access,
- #else
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ /* The pipe device can be reached in two ways, explicltly with %pipe%
-+ or implicitly with "|", so we have to check for both
-+ */
-+ char f[gp_file_name_sizeof];
-+ const char *pipestr = "|";
-+ const size_t pipestrlen = strlen(pipestr);
-+ const size_t preflen = strlen(iodev->dname);
-+ const size_t nlen = strlen(fname);
-+ int code1;
-+
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(f, iodev->dname, preflen);
-+ memcpy(f + preflen, fname, nlen + 1);
-+
-+ code1 = gp_validate_path(mem, f, access);
-+
-+ memcpy(f, pipestr, pipestrlen);
-+ memcpy(f + pipestrlen, fname, nlen + 1);
-
-- if (gp_validate_path(mem, fname, access) != 0)
-+ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 )
- return gs_error_invalidfileaccess;
-
- /*
---- a/base/gp_mshdl.c
-+++ b/base/gp_mshdl.c
-@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access,
- long hfile; /* Correct for Win32, may be wrong for Win64 */
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ char f[gp_file_name_sizeof];
-+ const size_t preflen = strlen(iodev->dname);
-+ const size_t nlen = strlen(fname);
-
-- if (gp_validate_path(mem, fname, access) != 0)
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(f, iodev->dname, preflen);
-+ memcpy(f + preflen, fname, nlen + 1);
-+
-+ if (gp_validate_path(mem, f, access) != 0)
- return gs_error_invalidfileaccess;
-
- /* First we try the open_handle method. */
---- a/base/gp_msprn.c
-+++ b/base/gp_msprn.c
-@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
- uintptr_t *ptid = &((tid_t *)(iodev->state))->tid;
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ const size_t preflen = strlen(iodev->dname);
-+ const size_t nlen = strlen(fname);
-
-- if (gp_validate_path(mem, fname, access) != 0)
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(pname, iodev->dname, preflen);
-+ memcpy(pname + preflen, fname, nlen + 1);
-+
-+ if (gp_validate_path(mem, pname, access) != 0)
- return gs_error_invalidfileaccess;
-
- /* First we try the open_printer method. */
---- a/base/gp_os2pr.c
-+++ b/base/gp_os2pr.c
-@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
- FILE ** pfile, char *rfname, uint rnamelen)
- {
- os2_printer_t *pr = (os2_printer_t *)iodev->state;
-- char driver_name[256];
-+ char driver_name[gp_file_name_sizeof];
- gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
- gs_fs_list_t *fs = ctx->core->fs;
-+ const size_t preflen = strlen(iodev->dname);
-+ const int size_t = strlen(fname);
-+
-+ if (preflen + nlen >= gp_file_name_sizeof)
-+ return_error(gs_error_invalidaccess);
-+
-+ memcpy(driver_name, iodev->dname, preflen);
-+ memcpy(driver_name + preflen, fname, nlen + 1);
-+
-+ if (gp_validate_path(mem, driver_name, access) != 0)
-+ return gs_error_invalidfileaccess;
-
- /* First we try the open_printer method. */
- /* Note that the loop condition here ensures we don't
---- a/base/gslibctx.c
-+++ b/base/gslibctx.c
-@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s)
- int
- gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
-- char *fp, f[gp_file_name_sizeof];
-- const int pipe = 124; /* ASCII code for '|' */
-- const int len = strlen(fname);
-- int i, code;
-+ char f[gp_file_name_sizeof];
-+ int code;
-
- /* Be sure the string copy will fit */
-- if (len >= gp_file_name_sizeof)
-+ if (strlen(fname) >= gp_file_name_sizeof)
- return gs_error_rangecheck;
- strcpy(f, fname);
-- fp = f;
- /* Try to rewrite any %d (or similar) in the string */
- rewrite_percent_specifiers(f);
-- for (i = 0; i < len; i++) {
-- if (f[i] == pipe) {
-- fp = &f[i + 1];
-- /* Because we potentially have to check file permissions at two levels
-- for the output file (gx_device_open_output_file and the low level
-- fopen API, if we're using a pipe, we have to add both the full string,
-- (including the '|', and just the command to which we pipe - since at
-- the pipe_fopen(), the leading '|' has been stripped.
-- */
-- code = gs_add_control_path(mem, gs_permit_file_writing, f);
-- if (code < 0)
-- return code;
-- code = gs_add_control_path(mem, gs_permit_file_control, f);
-- if (code < 0)
-- return code;
-- break;
-- }
-- if (!IS_WHITESPACE(f[i]))
-- break;
-- }
-- code = gs_add_control_path(mem, gs_permit_file_control, fp);
-+
-+ code = gs_add_control_path(mem, gs_permit_file_control, f);
- if (code < 0)
- return code;
-- return gs_add_control_path(mem, gs_permit_file_writing, fp);
-+ return gs_add_control_path(mem, gs_permit_file_writing, f);
- }
-
- int
- gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
-- char *fp, f[gp_file_name_sizeof];
-- const int pipe = 124; /* ASCII code for '|' */
-- const int len = strlen(fname);
-- int i, code;
-+ char f[gp_file_name_sizeof];
-+ int code;
-
- /* Be sure the string copy will fit */
-- if (len >= gp_file_name_sizeof)
-+ if (strlen(fname) >= gp_file_name_sizeof)
- return gs_error_rangecheck;
- strcpy(f, fname);
-- fp = f;
- /* Try to rewrite any %d (or similar) in the string */
-- for (i = 0; i < len; i++) {
-- if (f[i] == pipe) {
-- fp = &f[i + 1];
-- /* Because we potentially have to check file permissions at two levels
-- for the output file (gx_device_open_output_file and the low level
-- fopen API, if we're using a pipe, we have to add both the full string,
-- (including the '|', and just the command to which we pipe - since at
-- the pipe_fopen(), the leading '|' has been stripped.
-- */
-- code = gs_remove_control_path(mem, gs_permit_file_writing, f);
-- if (code < 0)
-- return code;
-- code = gs_remove_control_path(mem, gs_permit_file_control, f);
-- if (code < 0)
-- return code;
-- break;
-- }
-- if (!IS_WHITESPACE(f[i]))
-- break;
-- }
-- code = gs_remove_control_path(mem, gs_permit_file_control, fp);
-+ rewrite_percent_specifiers(f);
-+
-+ code = gs_remove_control_path(mem, gs_permit_file_control, f);
- if (code < 0)
- return code;
-- return gs_remove_control_path(mem, gs_permit_file_writing, fp);
-+ return gs_remove_control_path(mem, gs_permit_file_writing, f);
- }
-
- int
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
deleted file mode 100644
index 38f0eaa1516..00000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Tue, 28 Sep 2021 03:40:19 +0100
-Subject: [PATCH] Rebased versions of upstream Makefile patches
-
-https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=cf868c13c03a781243c1d8764cbeba3a49ffb92e
-https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=c8285e6e9cd42277ae298475ad0c96da009b0e98
-https://bugs.gentoo.org/800125
---- a/devices/devs.mak
-+++ b/devices/devs.mak
-@@ -669,7 +669,7 @@ $(DD)txtwrite.dev : $(ECHOGS_XE) $(txtwrite_) $(GDEV)\
- $(DEVOBJ)gdevtxtw.$(OBJ) : $(DEVVECSRC)gdevtxtw.c $(GDEV) $(gdevkrnlsclass_h) \
- $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
- $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
-- $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(DEVVECSRC)doc_common.h
-+ $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevtxtw.$(OBJ) $(C_) $(DEVVECSRC)gdevtxtw.c
-
- $(DEVOBJ)gdevagl.$(OBJ) : $(DEVVECSRC)gdevagl.c $(GDEV)\
-@@ -684,14 +684,14 @@ gdevagl_h=$(DEVVECSRC)gdevagl.h
- docxwrite_=$(DEVOBJ)gdevdocxw.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ) $(DEVOBJ)doc_common.$(OBJ)
-
- $(DD)docxwrite.dev : $(ECHOGS_XE) $(docxwrite_) $(GDEV)\
-- $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(EXTRACT_OBJS)
-+ $(gdevagl_h) $(DEVS_MAK) $(EXTRACT_OBJS) $(MAKEDIRS)
- $(SETDEV2) $(DD)docxwrite $(docxwrite_) $(EXTRACT_OBJS)
-
- $(DEVOBJ)gdevdocxw.$(OBJ) : $(DEVVECSRC)gdevdocxw.c $(GDEV) $(gdevkrnlsclass_h) \
- $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
- $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
-- $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) \
-- $(DEVVECSRC)doc_common.h
-+ $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h \
-+ $(MAKEDIRS)
- $(DEVCC) $(DEVO_)gdevdocxw.$(OBJ) $(C_) $(DEVVECSRC)gdevdocxw.c
-
- # Shared code used by txtwrite and docxwrite.
-@@ -699,7 +699,7 @@ $(DEVOBJ)gdevdocxw.$(OBJ) : $(DEVVECSRC)gdevdocxw.c $(GDEV) $(gdevkrnlsclass_h)
- $(DEVOBJ)doc_common.$(OBJ) : $(DEVVECSRC)doc_common.c $(GDEV) $(gdevkrnlsclass_h) \
- $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
- $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
-- $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(MAKEDIRS) $(DEVVECSRC)doc_common.h
-+ $(gxgstate_h) $(gxpath_h) $(gdevagl_h) $(DEVS_MAK) $(DEVVECSRC)doc_common.h $(MAKEDIRS)
- $(DEVCC) $(DEVO_)doc_common.$(OBJ) $(C_) $(DEVVECSRC)doc_common.c
-
-
---- a/devices/extract.mak
-+++ b/devices/extract.mak
-@@ -1,37 +1,37 @@
- extract_cc = $(CC) $(CCFLAGS) $(I_)$(EXTRACT_DIR)/include$(_I) $(I_)$(ZSRCDIR)$(_I) $(O_)
- extract_out_prefix = $(GLOBJDIR)$(D)extract_
-
--$(extract_out_prefix)alloc.$(OBJ): $(EXTRACT_DIR)/src/alloc.c
-+$(extract_out_prefix)alloc.$(OBJ): $(EXTRACT_DIR)/src/alloc.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/alloc.c
-
--$(extract_out_prefix)astring.$(OBJ): $(EXTRACT_DIR)/src/astring.c
-+$(extract_out_prefix)astring.$(OBJ): $(EXTRACT_DIR)/src/astring.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/astring.c
-
--$(extract_out_prefix)buffer.$(OBJ): $(EXTRACT_DIR)/src/buffer.c
-+$(extract_out_prefix)buffer.$(OBJ): $(EXTRACT_DIR)/src/buffer.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/buffer.c
-
--$(extract_out_prefix)docx.$(OBJ): $(EXTRACT_DIR)/src/docx.c
-+$(extract_out_prefix)docx.$(OBJ): $(EXTRACT_DIR)/src/docx.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/docx.c
-
--$(extract_out_prefix)docx_template.$(OBJ): $(EXTRACT_DIR)/src/docx_template.c
-+$(extract_out_prefix)docx_template.$(OBJ): $(EXTRACT_DIR)/src/docx_template.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/docx_template.c
-
--$(extract_out_prefix)extract.$(OBJ): $(EXTRACT_DIR)/src/extract.c
-+$(extract_out_prefix)extract.$(OBJ): $(EXTRACT_DIR)/src/extract.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/extract.c
-
--$(extract_out_prefix)join.$(OBJ): $(EXTRACT_DIR)/src/join.c
-+$(extract_out_prefix)join.$(OBJ): $(EXTRACT_DIR)/src/join.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/join.c
-
--$(extract_out_prefix)mem.$(OBJ): $(EXTRACT_DIR)/src/mem.c
-+$(extract_out_prefix)mem.$(OBJ): $(EXTRACT_DIR)/src/mem.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/mem.c
-
--$(extract_out_prefix)outf.$(OBJ): $(EXTRACT_DIR)/src/outf.c
-+$(extract_out_prefix)outf.$(OBJ): $(EXTRACT_DIR)/src/outf.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/outf.c
-
--$(extract_out_prefix)xml.$(OBJ): $(EXTRACT_DIR)/src/xml.c
-+$(extract_out_prefix)xml.$(OBJ): $(EXTRACT_DIR)/src/xml.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/xml.c
-
--$(extract_out_prefix)zip.$(OBJ): $(EXTRACT_DIR)/src/zip.c
-+$(extract_out_prefix)zip.$(OBJ): $(EXTRACT_DIR)/src/zip.c $(MAKEDIRS)
- $(extract_cc)$@ $(C_) $(EXTRACT_DIR)/src/zip.c
-
- EXTRACT_OBJS = \
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
deleted file mode 100644
index 51ce95958ba..00000000000
--- a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1
-https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=cf868c13c03a781243c1d8764cbeba3a49ffb92e
-https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=c8285e6e9cd42277ae298475ad0c96da009b0e98
-https://bugs.gentoo.org/800125
-
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Thu, 6 May 2021 12:23:59 +0100
-Subject: [PATCH] Remove makefile reference to non-existent header file
-
-Fixes (spurious) parallel make failure on the cluster
---- a/base/lib.mak
-+++ b/base/lib.mak
-@@ -488,7 +488,6 @@ gxcoord_h=$(GLSRC)gxcoord.h
- gxcpath_h=$(GLSRC)gxcpath.h
- gxdda_h=$(GLSRC)gxdda.h
- gxdevbuf_h=$(GLSRC)gxdevbuf.h
--gxdevrop_h=$(GLSRC)gxdevrop.h
- gxdevmem_h=$(GLSRC)gxdevmem.h
- gxdhtres_h=$(GLSRC)gxdhtres.h
- gxfont0_h=$(GLSRC)gxfont0.h
-@@ -2407,13 +2406,13 @@ $(GLD)roplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(roplib_) $(LIB_MAK) $(MAKEDIRS)
-
- $(GLOBJ)gdevdrop_1.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \
- $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \
-- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \
-+ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \
- $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS)
- $(GLCC) $(D_)WITH_CAL$(_D) $(I_)$(CALSRCDIR)$(_I) $(GLO_)gdevdrop_1.$(OBJ) $(C_) $(GLSRC)gdevdrop.c
-
- $(GLOBJ)gdevdrop_0.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \
- $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \
-- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \
-+ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \
- $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS)
- $(GLCC) $(GLO_)gdevdrop_0.$(OBJ) $(C_) $(GLSRC)gdevdrop.c
-
-@@ -5585,75 +5584,6 @@ $(GLSRC)gxdevbuf.h:$(GLSRC)std.h
- $(GLSRC)gxdevbuf.h:$(GLSRC)stdpre.h
- $(GLSRC)gxdevbuf.h:$(GLGEN)arch.h
- $(GLSRC)gxdevbuf.h:$(GLSRC)gs_dll_call.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxdevcli.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxcmap.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxtext.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gstext.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsnamecl.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gstparam.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxfmap.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsfunc.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxcspace.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxrplane.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gscsel.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxfcache.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsfont.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsimage.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsdcolor.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxcvalue.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxbcache.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsropt.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxdda.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxpath.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxfrac.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxtmap.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxftype.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gscms.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsrect.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gslparam.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsdevice.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gscpm.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gscspace.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsgstate.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsxfont.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsdsrc.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsiparam.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxfixed.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gscompt.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsmatrix.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gspenum.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxhttile.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsparam.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsrefct.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gp.h
--$(GLSRC)gxdevrop.h:$(GLSRC)memento.h
--$(GLSRC)gxdevrop.h:$(GLSRC)memory_.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsuid.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsstruct.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxsync.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxbitmap.h
--$(GLSRC)gxdevrop.h:$(GLSRC)srdline.h
--$(GLSRC)gxdevrop.h:$(GLSRC)scommon.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsbitmap.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsccolor.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxarith.h
--$(GLSRC)gxdevrop.h:$(GLSRC)stat_.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gpsync.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsstype.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsmemory.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gpgetenv.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gscdefs.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gslibctx.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gxcindex.h
--$(GLSRC)gxdevrop.h:$(GLSRC)stdio_.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gsccode.h
--$(GLSRC)gxdevrop.h:$(GLSRC)stdint_.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gssprintf.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gstypes.h
--$(GLSRC)gxdevrop.h:$(GLSRC)std.h
--$(GLSRC)gxdevrop.h:$(GLSRC)stdpre.h
--$(GLSRC)gxdevrop.h:$(GLGEN)arch.h
--$(GLSRC)gxdevrop.h:$(GLSRC)gs_dll_call.h
- $(GLSRC)gxdevmem.h:$(GLSRC)gxdevcli.h
- $(GLSRC)gxdevmem.h:$(GLSRC)gxcmap.h
- $(GLSRC)gxdevmem.h:$(GLSRC)gxtext.h
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch
new file mode 100644
index 00000000000..e10522af901
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.55.0-no-force-libstdcxx.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/784173
+--- a/configure.ac
++++ b/configure.ac
+@@ -857,7 +857,7 @@
+ else
+
+ save_cxxflags="$CXXFLAGS"
+- cxxflags_to_try="-std=c++17 -stdlib=libstdc++"
++ cxxflags_to_try="-std=c++17"
+ CXXFLAGS_TO_USE=""
+
+ AC_MSG_CHECKING([supported C++ compiler flags])
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
deleted file mode 100644
index 29656ad4315..00000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET="ghostscript-gpl-9.52-patchset-01.tar.xz"
-
-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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
- app-text/libpaper
- media-libs/fontconfig
- >=media-libs/freetype-2.4.9:2=
- >=media-libs/jbig2dec-0.16:=
- >=media-libs/lcms-2.6:2
- >=media-libs/libpng-1.6.2:0=
- >=media-libs/openjpeg-2.1.0:2=
- >=sys-libs/zlib-1.2.7
- virtual/jpeg:0
- cups? ( >=net-print/cups-1.3.8 )
- dbus? ( sys-apps/dbus )
- gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
- unicode? ( net-dns/libidn:0= )
- tiff? ( >=media-libs/tiff-4.0.1:0= )
- X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
- app-text/poppler-data
- >=media-fonts/urw-fonts-2.4.9
- l10n_ja? ( media-fonts/kochi-substitute )
- l10n_ko? ( media-fonts/baekmuk-fonts )
- l10n_zh-CN? ( media-fonts/arphicfonts )
- l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # bug #747808
- "${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch"
-)
-
-src_prepare() {
- if [[ -n "${MY_PATCHSET}" ]] ; then
- # apply various patches, many borrowed from Fedora
- # https://src.fedoraproject.org/rpms/ghostscript
- # and Debian
- # https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
- eapply "${WORKDIR}/patches/"*.patch
- 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/${PVM}/$(get_libdir):" \
- -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
- -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
- -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
- -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
- -i Makefile.in base/*.mak || die "sed failed"
-
- # remove incorrect symlink, bug 590384
- rm ijs/ltmain.sh || die
- eautoreconf
-
- cd ijs || die
- eautoreconf
-}
-
-src_configure() {
- local FONTPATH
- for path in \
- "${EPREFIX}"/usr/share/fonts/urw-fonts \
- "${EPREFIX}"/usr/share/fonts/Type1 \
- "${EPREFIX}"/usr/share/fonts \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
- do
- FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
- done
-
- PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
- econf \
- --enable-dynamic \
- --enable-freetype \
- --enable-fontconfig \
- --enable-openjpeg \
- --disable-compile-inits \
- --with-drivers=ALL \
- --with-fontpath="$FONTPATH" \
- --with-ijs \
- --with-jbig2dec \
- --with-libpaper \
- --without-luratech \
- $(use_enable cups) \
- $(use_enable dbus) \
- $(use_enable gtk) \
- $(use_with cups pdftoraster) \
- $(use_with unicode libidn) \
- $(use_with tiff system-libtiff) \
- $(use_with X x)
-
- cd "${S}/ijs" || die
- econf \
- --enable-shared \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake so all
-
- cd ijs || die
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" install-so install
-
- # move gsc to gs, bug #343447
- # gsc collides with gambit, bug #253064
- mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
- cd "${S}/ijs" || die
- emake DESTDIR="${D}" install
-
- # rename the original cidfmap to cidfmap.GS
- mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
- # install the CMaps from poppler-data properly, bug #409361
- dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
- if ! use static-libs; then
- find "${ED}" -name '*.la' -delete || die
- fi
-
- if ! use l10n_de; then
- rm -r "${ED}"/usr/share/man/de || die
- fi
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild
deleted file mode 100644
index cdb280036d2..00000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
-
-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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0/$(ver_cut 1-2)"
-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="cups dbus gtk +jpeg2k 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:0=
- >=media-libs/tiff-4.0.1:0=
- >=sys-libs/zlib-1.2.7
- virtual/jpeg:0
- cups? ( >=net-print/cups-1.3.8 )
- dbus? ( sys-apps/dbus )
- gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- unicode? ( net-dns/libidn:0= )
- X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
- app-text/poppler-data
- >=media-fonts/urw-fonts-2.4.9
- l10n_ja? ( media-fonts/kochi-substitute )
- l10n_ko? ( media-fonts/baekmuk-fonts )
- l10n_zh-CN? ( media-fonts/arphicfonts )
- l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch" # bug #747808
- "${FILESDIR}/${P}-fix-ps2epsi.patch"
-)
-
-src_prepare() {
- if [[ -n "${MY_PATCHSET}" ]] ; then
- # apply various patches, many borrowed from Fedora
- # https://src.fedoraproject.org/rpms/ghostscript
- # and Debian
- # https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
- eapply "${WORKDIR}/patches/"*.patch
- 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 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
- do
- FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
- done
-
- PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
- econf \
- --enable-dynamic \
- --enable-freetype \
- --enable-fontconfig \
- $(use_enable jpeg2k openjpeg) \
- --disable-compile-inits \
- --with-drivers=ALL \
- --with-fontpath="$FONTPATH" \
- --with-ijs \
- --with-jbig2dec \
- --with-libpaper \
- --with-openprinting \
- --with-system-libtiff \
- --without-luratech \
- $(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
-
- # install the CMaps from poppler-data properly, bug #409361
- dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/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.54.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild
deleted file mode 100644
index 6b35ee1d7bd..00000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET="ghostscript-gpl-9.54-patchset-01.tar.xz"
-
-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/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0/$(ver_cut 1-2)"
-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="cups dbus gtk +jpeg2k 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:0=
- >=media-libs/tiff-4.0.1:0=
- >=sys-libs/zlib-1.2.7
- virtual/jpeg:0
- cups? ( >=net-print/cups-1.3.8 )
- dbus? ( sys-apps/dbus )
- gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- unicode? ( net-dns/libidn:0= )
- X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
- app-text/poppler-data
- >=media-fonts/urw-fonts-2.4.9
- l10n_ja? ( media-fonts/kochi-substitute )
- l10n_ko? ( media-fonts/baekmuk-fonts )
- l10n_zh-CN? ( media-fonts/arphicfonts )
- l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- 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/master/debian/patches
- eapply "${WORKDIR}/patches/"*.patch
- 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 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
- do
- FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
- done
-
- PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
- econf \
- --enable-dynamic \
- --enable-freetype \
- --enable-fontconfig \
- $(use_enable jpeg2k 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
-
- # install the CMaps from poppler-data properly, bug #409361
- dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/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-r1.ebuild
index 9f00300df38..2af192b34ec 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-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=8
@@ -23,7 +23,7 @@ fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0/$(ver_cut 1-2)"
-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 ~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"
@@ -60,6 +60,10 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.55.0-no-force-libstdcxx.patch
+)
+
src_prepare() {
if [[ -n "${MY_PATCHSET}" ]] ; then
# apply various patches, many borrowed from Fedora
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
index d112d005195..ab663210234 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
@@ -1,53 +1,52 @@
-# 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 toolchain-funcs
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
MY_PN=${PN/-gpl}
MY_P="${MY_PN}-${PV/_}"
PVM=$(ver_cut 1-2)
PVM_S=$(ver_rs 1-2 "")
-MY_PATCHSET="ghostscript-gpl-9.54-patchset-01.tar.xz"
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-9.56.1-patchset-01.tar.xz"
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
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}"
SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0/$(ver_cut 1-2)"
-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="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
+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
+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:0=
- >=media-libs/tiff-4.0.1:0=
+ >=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
- virtual/jpeg:0
cups? ( >=net-print/cups-1.3.8 )
dbus? ( sys-apps/dbus )
- gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- unicode? ( net-dns/libidn:0= )
- X? ( x11-libs/libXt x11-libs/libXext )
-"
+ gtk? ( x11-libs/gtk+:3 )
+ unicode? ( net-dns/libidn:= )
+ X? ( x11-libs/libXt x11-libs/libXext )"
BDEPEND="virtual/pkgconfig"
RDEPEND="${DEPEND}
app-text/poppler-data
@@ -55,8 +54,7 @@ RDEPEND="${DEPEND}
l10n_ja? ( media-fonts/kochi-substitute )
l10n_ko? ( media-fonts/baekmuk-fonts )
l10n_zh-CN? ( media-fonts/arphicfonts )
- l10n_zh-TW? ( media-fonts/arphicfonts )
-"
+ l10n_zh-TW? ( media-fonts/arphicfonts )"
S="${WORKDIR}/${MY_P}"
@@ -69,11 +67,6 @@ src_prepare() {
eapply "${WORKDIR}/patches/"*.patch
fi
- # Upstream patches
- eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch
- eapply "${FILESDIR}"/${P}-makefile-deps.patch
- eapply "${FILESDIR}"/${P}-makefile-deps-2.patch
-
default
# remove internal copies of various libraries
@@ -127,12 +120,7 @@ src_configure() {
for path in \
"${EPREFIX}"/usr/share/fonts/urw-fonts \
"${EPREFIX}"/usr/share/fonts/Type1 \
- "${EPREFIX}"/usr/share/fonts \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
- "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+ "${EPREFIX}"/usr/share/fonts
do
FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
done
@@ -142,7 +130,7 @@ src_configure() {
--enable-dynamic \
--enable-freetype \
--enable-fontconfig \
- $(use_enable jpeg2k openjpeg) \
+ --enable-openjpeg \
--disable-compile-inits \
--with-drivers=ALL \
--with-fontpath="$FONTPATH" \
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 4a2508c9489..a7233894758 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
@@ -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=6
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit gnome2 multibuild python-r1
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 12c0bda06be..fcea4e26ef4 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,2 +1 @@
-DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
DIST gocr-0.52.tar.gz 445401 BLAKE2B 1f22f5377bb95053e3ab4ede074b3fceca4065f9ca0ede05a8023ebe807f41074f5ead84e133281e98be7f68f13b036dc759cccaf4a5688bf776f62f2de1970a SHA512 e2e6e690e7a32e32237c8b64b1a11719680c560592349df43f4b230f3c92bf324f98e473979b0913c42e33e8abbaf27952b6af173ea06eb5535878a9f608ce6d
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
deleted file mode 100644
index 3517d1e07a8..00000000000
--- a/app-text/gocr/gocr-0.50.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An OCR (Optical Character Recognition) reader"
-HOMEPAGE="http://jocr.sourceforge.net"
-SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc scanner tk"
-
-DEPEND="
- >=media-libs/netpbm-9.12
- doc? (
- >=media-gfx/transfig-3.2
- app-text/ghostscript-gpl
- )
- tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}
- tk? (
- media-gfx/xli
- scanner? ( media-gfx/xsane )
- )"
-
-src_compile() {
- local targets=( src man )
- use doc && targets+=( doc examples )
-
- emake "${targets[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
- einstalldocs
- dodoc HISTORY REMARK.txt REVIEW
-
- # remove the tk frontend if tk is not selected
- if ! use tk; then
- rm "${ED}"/usr/bin/gocr.tcl || die
- fi
-
- # and install the documentation and examples
- if use doc; then
- dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
-
- docinto examples
- dodoc examples/*.{fig,tex,pcx}
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 88b44b536ed..03742b741c9 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1 +1,2 @@
-DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
+DIST grip-4.6.0.tar.gz 147222 BLAKE2B ee5c10ca47ca0e9089d2618dc765a4ca01f4927da8c4256a251a9cf90ee15d63eb6136848cef0005d5f3af1f12b603f6f0fd55b65840bf542dcb9cd29ff35518 SHA512 483170996e593593781b684986dcb8eec20afb02dca84a9f5baeb3917220706332037f7b18f504aba8aa7d1d1c3587a1af18d6d5628f1e96517511c0be40a6ac
+DIST grip-4.6.1.tar.gz 147894 BLAKE2B e4f6b5c72e98b5d8ec443c794e95ff0a4250526dd7381f5a28da7d1119b607970593c4b3c22a49ec7da7d772e984abb2a0984ed7290b007e48cddf49bfc290ae SHA512 73eb80995457faa10ba5f174c8151c821f4bd9cda066099ba249cc5aad668e6adef267410ddd24fefa1d1e444c276a10a0881ec5e528bc616d3c4d98a8427b3d
diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.6.0.ebuild
index 77bd4c34223..224d3078f62 100644
--- a/app-text/grip/grip-4.5.2-r2.ebuild
+++ b/app-text/grip/grip-4.6.0.ebuild
@@ -1,9 +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
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
diff --git a/app-text/grip/grip-4.6.1.ebuild b/app-text/grip/grip-4.6.1.ebuild
new file mode 100644
index 00000000000..1dc8182a71d
--- /dev/null
+++ b/app-text/grip/grip-4.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
+HOMEPAGE="https://github.com/joeyespo/grip"
+LICENSE="MIT"
+
+SLOT="0"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+ !media-sound/grip
+ >=dev-python/docopt-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+ >=dev-python/markdown-2.5.1[${PYTHON_USEDEP}]
+ >=dev-python/path-and-address-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+"
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild
index 86f8be4f031..c2a7aacdc07 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1-r1.ebuild
@@ -1,7 +1,8 @@
-# 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 autotools
DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
@@ -11,20 +12,21 @@ SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
DOCS=( README.md )
src_prepare() {
- default_src_prepare
+ default
+
eautoreconf
}
src_configure() {
- # ruby is only uses for tests
+ # ruby is only used for tests
econf --without-ruby
}
@@ -32,5 +34,5 @@ src_install() {
default
find "${ED}" -name '*.la' -delete || die
- rm -r "${D}usr/share/doc/${PN}" || die
+ rm -r "${ED}"/usr/share/doc/${PN} || die
}
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index b38d3d72582..e9bd0d97025 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,2 +1 @@
-DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
DIST grutatxt-2.200.0.tar.gz 20751 BLAKE2B 1df00316b4379f7922348fa6a90e53ed0a34e5498558b00a7dde09e7eea53098ce9b66e44260a95575b52180baff5b78073339d0f47370e30b8c61042ae40c4b SHA512 2ecf5145c42efbfde69278ecd9a7bbddceef79aed036a659e126f02ba2c20968c10425004298f6fb786b0e9407b4c78f25885ea4f112dbca111b6bf8b7e834c0
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
deleted file mode 100644
index 68a3e9b6acb..00000000000
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-MY_PN="Grutatxt"
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A converter from plain text to HTML and other markup languages"
-HOMEPAGE="https://triptico.com/software/grutatxt.html"
-SRC_URI="https://www.triptico.com/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
-
-# set the script path to /usr/bin, rather than /usr/local/bin
-myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin"
diff --git a/app-text/grutatxt/grutatxt-2.200.0.ebuild b/app-text/grutatxt/grutatxt-2.200.0.ebuild
index 3f7847db3e9..8ff1c9379a9 100644
--- a/app-text/grutatxt/grutatxt-2.200.0.ebuild
+++ b/app-text/grutatxt/grutatxt-2.200.0.ebuild
@@ -15,4 +15,4 @@ SRC_URI="https://triptico.com/download/${PN}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 34bc9840e69..e3c76382999 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1 +1,2 @@
+DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
diff --git a/app-text/gspell/gspell-1.10.0.ebuild b/app-text/gspell/gspell-1.10.0.ebuild
new file mode 100644
index 00000000000..4fc667187f1
--- /dev/null
+++ b/app-text/gspell/gspell-1.10.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/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"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=app-text/enchant-2.1.3:2
+ >=dev-libs/glib-2.44:2
+ >=x11-libs/gtk+-3.20:3[introspection?]
+ dev-libs/icu:=
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+"
+DEPEND="${RDEPEND}
+ test? ( sys-apps/dbus )
+"
+BDEPEND="
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.25
+ >=sys-devel/gettext-0.19.6
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+ test? (
+ app-text/enchant:2[hunspell]
+ || (
+ app-dicts/myspell-en[l10n_en(+)]
+ app-dicts/myspell-en[l10n_en-US(+)]
+ )
+ )
+"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
+
+src_prepare() {
+ use vala && vala_setup
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ virtx dbus-run-session emake check
+}
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.9.1.ebuild
index b7d8ad8e30f..df529ccddab 100644
--- a/app-text/gspell/gspell-1.9.1.ebuild
+++ b/app-text/gspell/gspell-1.9.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
LICENSE="LGPL-2.1+"
SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~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/gtranslator/files/gtranslator-40.0-meson-0.61.patch b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
new file mode 100644
index 00000000000..a43a32eb4a6
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch
+https://bugs.gentoo.org/831966
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- desktop,
+ type: 'desktop',
+ input: desktop_in,
+ output: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+
+ i18n.merge_file(
+- appdata,
+ input: appdata_in,
+ output: appdata,
+ po_dir: po_dir,
+GitLab
diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
index 00fa6d54bb6..bb0973914e1 100644
--- a/app-text/gtranslator/gtranslator-40.0.ebuild
+++ b/app-text/gtranslator/gtranslator-40.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=7
@@ -40,6 +40,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-0.61.patch
+)
+
src_configure() {
local emesonargs=(
$(meson_use gtk-doc gtk_doc)
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 1e45eded6ce..9afe1785b1d 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,3 +1 @@
-DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
diff --git a/app-text/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
deleted file mode 100644
index b302b8a2f60..00000000000
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
-"
-BDEPEND="
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
-)
-
-myhlopts=(
- "CXX=$(tc-getCXX)"
- "AR=$(tc-getAR)"
- "LDFLAGS=${LDFLAGS}"
- "CFLAGS=${CXXFLAGS} -DNDEBUG"
- "DESTDIR=${D}"
- "PREFIX=${EPREFIX}/usr"
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- "conf_dir=${EPREFIX}/etc/highlight/"
-)
-
-src_prepare() {
- default
-
- # disable man page compression
- sed -e "/GZIP/d" -i makefile || die
-
- sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
- -i src/core/datadir.cpp || die
-
- sed -r -i \
- -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
- "${S}"/extras/tcl/makefile \
- "${S}"/extras/swig/makefile \
- || die "Failed to set Lua implementation"
-
- # We set it via eqmake5, otherwise it forces clang...
- sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
- -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
- -i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- eqmake5 \
- 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- emake
- popd > /dev/null || die
- fi
-}
-
-src_install() {
- emake -f makefile "${myhlopts[@]}" install
- if use qt5; then
- emake -f makefile "${myhlopts[@]}" install-gui
- docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
- fi
-
- if ! use examples ; then
- rm -r "${ED}"/usr/share/doc/${PF}/extras || die
- fi
-}
diff --git a/app-text/highlight/highlight-3.60.ebuild b/app-text/highlight/highlight-3.60.ebuild
deleted file mode 100644
index b302b8a2f60..00000000000
--- a/app-text/highlight/highlight-3.60.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
- ${LUA_DEPS}
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
-"
-BDEPEND="
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
-)
-
-myhlopts=(
- "CXX=$(tc-getCXX)"
- "AR=$(tc-getAR)"
- "LDFLAGS=${LDFLAGS}"
- "CFLAGS=${CXXFLAGS} -DNDEBUG"
- "DESTDIR=${D}"
- "PREFIX=${EPREFIX}/usr"
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- "conf_dir=${EPREFIX}/etc/highlight/"
-)
-
-src_prepare() {
- default
-
- # disable man page compression
- sed -e "/GZIP/d" -i makefile || die
-
- sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
- -i src/core/datadir.cpp || die
-
- sed -r -i \
- -e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
- "${S}"/extras/tcl/makefile \
- "${S}"/extras/swig/makefile \
- || die "Failed to set Lua implementation"
-
- # We set it via eqmake5, otherwise it forces clang...
- sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
- -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
- -i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- eqmake5 \
- 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- emake
- popd > /dev/null || die
- fi
-}
-
-src_install() {
- emake -f makefile "${myhlopts[@]}" install
- if use qt5; then
- emake -f makefile "${myhlopts[@]}" install-gui
- docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
- fi
-
- if ! use examples ; then
- rm -r "${ED}"/usr/share/doc/${PF}/extras || die
- fi
-}
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index c9571abe99d..7a8b44f56b5 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.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,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples qt5"
REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -39,16 +39,16 @@ PATCHES=(
)
myhlopts=(
- "CXX=$(tc-getCXX)"
- "AR=$(tc-getAR)"
- "LDFLAGS=${LDFLAGS}"
- "CFLAGS=${CXXFLAGS} -DNDEBUG"
- "DESTDIR=${D}"
- "PREFIX=${EPREFIX}/usr"
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- "conf_dir=${EPREFIX}/etc/highlight/"
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ LDFLAGS="${LDFLAGS}"
+ CFLAGS="${CXXFLAGS} -DNDEBUG"
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}/usr"
+ HL_CONFIG_DIR="${EPREFIX}/etc/highlight/"
+ HL_DATA_DIR="${EPREFIX}/usr/share/highlight/"
+ doc_dir="${EPREFIX}/usr/share/doc/${PF}/"
+ conf_dir="${EPREFIX}/etc/highlight/"
)
src_prepare() {
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index cfe1827107c..209f4d06cc3 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,4 +1,5 @@
DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
+DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb
DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
diff --git a/app-text/html2text/html2text-2.0.1.ebuild b/app-text/html2text/html2text-2.0.1.ebuild
new file mode 100644
index 00000000000..124d0962c32
--- /dev/null
+++ b/app-text/html2text/html2text-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+ SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~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"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_configure() {
+ # non-autoconf configure
+ tc-export CXX
+ ./configure || die
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ MANDIR="${EPREFIX}/usr/share/man" \
+ DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
+ install
+}
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index f7558b5e8e2..124d0962c32 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-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
@@ -19,9 +19,10 @@ HOMEPAGE="https://github.com/grobian/html2text"
LICENSE="GPL-2"
SLOT="0"
-src_prepare() {
- default
+src_configure() {
+ # non-autoconf configure
tc-export CXX
+ ./configure || die
}
src_compile() {
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index f398e94701d..3259929cc1d 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P
LICENSE="BSD"
SLOT="0/58" # subslot is SOVERSION
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="deprecated test"
RESTRICT="!test? ( test )"
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index cc1274d78f5..18d75871d37 100644
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.
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 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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:0= )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 3ee204c953f..c633c55a9a8 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,2 +1 @@
-DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
-DIST iso-codes-4.7.0.tar.gz 14122654 BLAKE2B 5dfcf4a0b39ff7b696f157a3938b7c1d35015c346ba4b046dda6b6b5bdcb02e561161afecfd2909fdbfbff6378cd4940335543d0ca7313bb9e80e490ad901abb SHA512 77ceb2ba9f3290f9409efdb50112beda2872ed163a86912b46480407f1135c0263cb70bf84bd2635b304d1af65e5b60f97a20b305219ead9ac98423b5abb255d
+DIST iso-codes-v4.9.0.tar.gz 14483789 BLAKE2B 683921fede69149cf196b70dded975763746d943f470d21e517334890c4c45b11b551c0746e3907341e55870ac733d1f14f74ea5cf723e3f4df164f56531b7da SHA512 0e14101b6a1480c463d83b32a40715485ad5494e799bf0cb6b7ed927b69dff0454512bbccbcc23de8741bf7dce139feb7490c4edf75b4a0af8473fe5ad9c567c
diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
deleted file mode 100644
index 35577914637..00000000000
--- a/app-text/iso-codes/iso-codes-4.6.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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 kn ko kok ku 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_Hant zh_TW zu"
-
-inherit python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
-SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-BDEPEND="${PYTHON_DEPS}
- sys-devel/gettext
-"
-S="${WORKDIR}/${PN}-${P}"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-DOCS=( ChangeLog.md README.md )
-
-# plocale_find_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
- local std loc all_locales=()
-
- ebegin "Looking for new locales"
- for std in "${all_stds[@]}"; do
- pushd "${std}" >/dev/null || die
- for loc in *.po; do
- all_locales+=( "${loc%.po}" )
- done
- popd >/dev/null
- done
-
- all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
- if [[ ${PLOCALES} != "${all_locales}" ]]; then
- eend 1
- eerror "There are changes in locales! This ebuild should be updated to:"
- eerror "PLOCALES=\"${all_locales}\""
- die "Update PLOCALES in the ebuild"
- else
- eend 0
- fi
-}
-
-src_prepare() {
- default
-
- local std loc mylinguas
- local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
- check_existing_locales
-
- # Modify the Makefiles so they only install requested locales.
- for std in "${all_stds[@]}"; do
- einfo "Preparing ${std} ..."
- pushd "${std}" >/dev/null || die
- mylinguas=()
- for loc in *.po; do
- if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
- mylinguas+=( "${loc}" )
- fi
- done
-
- sed \
- -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
- -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
- -i Makefile.am Makefile.in || die "sed in ${std} folder failed"
- popd >/dev/null
- done
-}
diff --git a/app-text/iso-codes/iso-codes-4.7.0.ebuild b/app-text/iso-codes/iso-codes-4.9.0.ebuild
index 37abf9cc872..ea78d3608c3 100644
--- a/app-text/iso-codes/iso-codes-4.7.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.9.0.ebuild
@@ -1,30 +1,30 @@
-# 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..10} )
-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_Hant zh_TW zu"
+PYTHON_COMPAT=( python3_{8..10} )
+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
DESCRIPTION="ISO language, territory, currency, script codes and their translations"
HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
-SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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
"
-S="${WORKDIR}/${PN}-${P}"
+S="${WORKDIR}/${PN}-v${PV}"
# This ebuild does not install any binaries.
RESTRICT="binchecks strip"
-DOCS=( ChangeLog.md README.md )
+DOCS=( CHANGELOG.md README.md )
# plocale_find_changes doesn't support multiple directories,
# so need to do the update scan ourselves.
diff --git a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
new file mode 100644
index 00000000000..30dbe53e972
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
@@ -0,0 +1,313 @@
+From bd03f07b5bcc5feb558caec4fbfd556947630fb9 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 19 Feb 2022 08:25:21 -0800
+Subject: [PATCH] Update uses of javax.swing API members for Java 9+
+
+These changes are backward compatible with Java 8.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../sf/jabref/FindUnlinkedFilesDialog.java | 9 ++++-----
+ .../net/sf/jabref/collab/EntryChange.java | 6 +++---
+ .../sf/jabref/groups/AddToGroupAction.java | 5 +++--
+ .../net/sf/jabref/groups/GroupSelector.java | 9 +++++----
+ .../net/sf/jabref/groups/GroupTreeNode.java | 20 ++++++++-----------
+ src/java/net/sf/jabref/groups/GroupsTree.java | 17 ++++++++--------
+ .../jabref/imports/AppendDatabaseAction.java | 5 +++--
+ .../sf/jabref/sql/exporter/DBExporter.java | 9 +++++----
+ 8 files changed, 40 insertions(+), 40 deletions(-)
+
+diff --git a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
+index 4bcbd73..5f7473d 100644
+--- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
++++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
+@@ -669,13 +669,12 @@ public class FindUnlinkedFilesDialog extends JDialog {
+ * The root node representing a tree structure.
+ * @return A list of files of all checked leaf nodes.
+ */
+- @SuppressWarnings("unchecked")
+ private List<File> getFileListFromNode(CheckableTreeNode node) {
+ List<File> filesList = new ArrayList<File>();
+- Enumeration<CheckableTreeNode> childs = node.depthFirstEnumeration();
++ Enumeration<TreeNode> childs = node.depthFirstEnumeration();
+ ArrayList<CheckableTreeNode> nodesToRemove = new ArrayList<FindUnlinkedFilesDialog.CheckableTreeNode>();
+ while (childs.hasMoreElements()) {
+- CheckableTreeNode child = childs.nextElement();
++ CheckableTreeNode child = (CheckableTreeNode) childs.nextElement();
+ if (child.isLeaf() && child.getSelected()) {
+ File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
+ if (nodeFile != null && nodeFile.isFile()) {
+@@ -1105,9 +1104,9 @@ public class FindUnlinkedFilesDialog extends JDialog {
+ @SuppressWarnings("unchecked")
+ public void setSelected(boolean bSelected) {
+ isSelected = bSelected;
+- Enumeration<CheckableTreeNode> children = this.children();
++ Enumeration<TreeNode> children = this.children();
+ while (children.hasMoreElements()) {
+- CheckableTreeNode child = children.nextElement();
++ CheckableTreeNode child = (CheckableTreeNode) children.nextElement();
+ child.setSelected(bSelected);
+ }
+
+diff --git a/src/java/net/sf/jabref/collab/EntryChange.java b/src/java/net/sf/jabref/collab/EntryChange.java
+index 924fd25..d479995 100644
+--- a/src/java/net/sf/jabref/collab/EntryChange.java
++++ b/src/java/net/sf/jabref/collab/EntryChange.java
+@@ -21,6 +21,7 @@ import java.util.TreeSet;
+ import javax.swing.JComponent;
+ import javax.swing.JLabel;
+ import javax.swing.JScrollPane;
++import javax.swing.tree.TreeNode;
+
+ import net.sf.jabref.*;
+ import net.sf.jabref.undo.NamedCompound;
+@@ -83,11 +84,10 @@ public class EntryChange extends Change {
+
+
+ public boolean makeChange(BasePanel panel, BibtexDatabase secondary, NamedCompound undoEdit) {
+- @SuppressWarnings("unchecked")
+ boolean allAccepted = true;
+- Enumeration<Change> e = children();
++ Enumeration<TreeNode> e = children();
+ for (; e.hasMoreElements();) {
+- Change c = e.nextElement();
++ Change c = (Change) e.nextElement();
+ if (c.isAcceptable() && c.isAccepted())
+ c.makeChange(panel, secondary, undoEdit);
+ else allAccepted = false;
+diff --git a/src/java/net/sf/jabref/groups/AddToGroupAction.java b/src/java/net/sf/jabref/groups/AddToGroupAction.java
+index 30d57c8..1840e32 100644
+--- a/src/java/net/sf/jabref/groups/AddToGroupAction.java
++++ b/src/java/net/sf/jabref/groups/AddToGroupAction.java
+@@ -20,6 +20,7 @@ import java.util.Enumeration;
+ import java.util.Vector;
+
+ import javax.swing.AbstractAction;
++import javax.swing.tree.TreeNode;
+ import javax.swing.undo.AbstractUndoableEdit;
+
+ import net.sf.jabref.BasePanel;
+@@ -59,10 +60,10 @@ public class AddToGroupAction extends AbstractAction {
+
+ if (m_move) {
+ // collect warnings for removal
+- Enumeration<GroupTreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
++ Enumeration<TreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
+ GroupTreeNode node;
+ while (e.hasMoreElements()) {
+- node = e.nextElement();
++ node = (GroupTreeNode) e.nextElement();
+ if (!node.getGroup().supportsRemove())
+ continue;
+ for (int i = 0; i < entries.length; ++i) {
+diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java
+index 4700d13..4813f12 100644
+--- a/src/java/net/sf/jabref/groups/GroupSelector.java
++++ b/src/java/net/sf/jabref/groups/GroupSelector.java
+@@ -60,6 +60,7 @@ import javax.swing.event.PopupMenuListener;
+ import javax.swing.event.TreeSelectionEvent;
+ import javax.swing.event.TreeSelectionListener;
+ import javax.swing.tree.DefaultTreeModel;
++import javax.swing.tree.TreeNode;
+ import javax.swing.tree.TreePath;
+ import javax.swing.undo.AbstractUndoableEdit;
+ import javax.swing.undo.CompoundEdit;
+@@ -1498,8 +1499,8 @@ public class GroupSelector extends SidePaneComponent implements
+ GroupTreeNode node;
+ AbstractGroup group;
+ Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
+- for (Enumeration<GroupTreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
+- node = e.nextElement();
++ for (Enumeration<TreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
++ node = (GroupTreeNode) e.nextElement();
+ group = node.getGroup();
+ int i;
+ for (i = 0; i < entries.length; ++i) {
+@@ -1537,8 +1538,8 @@ public class GroupSelector extends SidePaneComponent implements
+ BibtexEntry entry;
+ Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
+ Map<String, String> dummyMap = new HashMap<String, String>(); // just because I don't want to use null...
+- for (Enumeration<GroupTreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
+- node = e.nextElement();
++ for (Enumeration<TreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
++ node = (GroupTreeNode) e.nextElement();
+ rule = node.getSearchRule();
+ for (Iterator<BibtexEntry> it = matches.iterator(); it.hasNext();) {
+ entry = it.next();
+diff --git a/src/java/net/sf/jabref/groups/GroupTreeNode.java b/src/java/net/sf/jabref/groups/GroupTreeNode.java
+index 9013af4..c55c7cf 100644
+--- a/src/java/net/sf/jabref/groups/GroupTreeNode.java
++++ b/src/java/net/sf/jabref/groups/GroupTreeNode.java
+@@ -81,10 +81,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
+ */
+ public String getTreeAsString() {
+ StringBuffer sb = new StringBuffer();
+- Enumeration<GroupTreeNode> e = preorderEnumeration();
++ Enumeration<TreeNode> e = preorderEnumeration();
+ GroupTreeNode cursor;
+ while (e.hasMoreElements()) {
+- cursor = e.nextElement();
++ cursor = (GroupTreeNode) e.nextElement();
+ sb.append(cursor.getLevel()).append(" ").append(cursor.getGroup().toString()).append("\n");
+ }
+ return sb.toString();
+@@ -194,26 +194,22 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
+ }
+
+ @Override
+- @SuppressWarnings("unchecked")
+- public Enumeration<GroupTreeNode> preorderEnumeration(){
++ public Enumeration<TreeNode> preorderEnumeration(){
+ return super.preorderEnumeration();
+ }
+
+ @Override
+- @SuppressWarnings("unchecked")
+- public Enumeration<GroupTreeNode> depthFirstEnumeration(){
++ public Enumeration<TreeNode> depthFirstEnumeration(){
+ return super.depthFirstEnumeration();
+ }
+
+ @Override
+- @SuppressWarnings("unchecked")
+- public Enumeration<GroupTreeNode> breadthFirstEnumeration(){
++ public Enumeration<TreeNode> breadthFirstEnumeration(){
+ return super.breadthFirstEnumeration();
+ }
+
+ @Override
+- @SuppressWarnings("unchecked")
+- public Enumeration<GroupTreeNode> children(){
++ public Enumeration<TreeNode> children(){
+ return super.children();
+ }
+
+@@ -224,10 +220,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
+ */
+ public AbstractGroup[] getMatchingGroups(BibtexEntry entry) {
+ Vector<AbstractGroup> matchingGroups = new Vector<AbstractGroup>();
+- Enumeration<GroupTreeNode> e = preorderEnumeration();
++ Enumeration<TreeNode> e = preorderEnumeration();
+ AbstractGroup group;
+ while (e.hasMoreElements()) {
+- group = (e.nextElement()).getGroup();
++ group = ((GroupTreeNode) e.nextElement()).getGroup();
+ if (group.contains(null, entry)) // first argument is never used
+ matchingGroups.add(group);
+ }
+diff --git a/src/java/net/sf/jabref/groups/GroupsTree.java b/src/java/net/sf/jabref/groups/GroupsTree.java
+index e58a567..c3daf94 100644
+--- a/src/java/net/sf/jabref/groups/GroupsTree.java
++++ b/src/java/net/sf/jabref/groups/GroupsTree.java
+@@ -31,6 +31,7 @@ import javax.swing.JTree;
+ import javax.swing.SwingUtilities;
+ import javax.swing.ToolTipManager;
+ import javax.swing.tree.DefaultMutableTreeNode;
++import javax.swing.tree.TreeNode;
+ import javax.swing.tree.TreePath;
+ import javax.swing.tree.TreeSelectionModel;
+ import javax.swing.undo.AbstractUndoableEdit;
+@@ -415,14 +416,14 @@ public class GroupsTree extends JTree implements DragSourceListener,
+
+ /** Expand this node and all its children. */
+ public void expandSubtree(GroupTreeNode node) {
+- for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
+- expandPath(new TreePath(e.nextElement().getPath()));
++ for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
++ expandPath(new TreePath(((GroupTreeNode) e.nextElement()).getPath()));
+ }
+
+ /** Collapse this node and all its children. */
+ public void collapseSubtree(GroupTreeNode node) {
+- for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
+- collapsePath(new TreePath((e.nextElement())
++ for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
++ collapsePath(new TreePath(((GroupTreeNode) e.nextElement())
+ .getPath()));
+ }
+
+@@ -432,8 +433,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
+ */
+ public boolean hasExpandedDescendant(TreePath path) {
+ GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
+- for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
+- GroupTreeNode child = e.nextElement();
++ for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
++ GroupTreeNode child = (GroupTreeNode) e.nextElement();
+ if (child.isLeaf())
+ continue; // don't care about this case
+ TreePath pathToChild = path.pathByAddingChild(child);
+@@ -449,8 +450,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
+ */
+ public boolean hasCollapsedDescendant(TreePath path) {
+ GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
+- for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
+- GroupTreeNode child = e.nextElement();
++ for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
++ GroupTreeNode child = (GroupTreeNode) e.nextElement();
+ if (child.isLeaf())
+ continue; // don't care about this case
+ TreePath pathToChild = path.pathByAddingChild(child);
+diff --git a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
+index ad84bbc..5fdce20 100644
+--- a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
++++ b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
+@@ -22,6 +22,7 @@ import java.util.Iterator;
+ import java.util.List;
+
+ import javax.swing.JOptionPane;
++import javax.swing.tree.TreeNode;
+
+ import net.sf.jabref.BaseAction;
+ import net.sf.jabref.BasePanel;
+@@ -175,9 +176,9 @@ public class AppendDatabaseAction extends BaseAction {
+ ExplicitGroup group;
+ BibtexEntry entry;
+
+- for (Enumeration<GroupTreeNode> e = newGroups
++ for (Enumeration<TreeNode> e = newGroups
+ .preorderEnumeration(); e.hasMoreElements();) {
+- node = e.nextElement();
++ node = (GroupTreeNode) e.nextElement();
+ if (!(node.getGroup() instanceof ExplicitGroup))
+ continue;
+ group = (ExplicitGroup) node.getGroup();
+diff --git a/src/java/net/sf/jabref/sql/exporter/DBExporter.java b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
+index deb9126..1518e0b 100644
+--- a/src/java/net/sf/jabref/sql/exporter/DBExporter.java
++++ b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
+@@ -32,6 +32,7 @@ import java.util.Set;
+ import java.util.Vector;
+
+ import javax.swing.JOptionPane;
++import javax.swing.tree.TreeNode;
+
+ import net.sf.jabref.BibtexDatabase;
+ import net.sf.jabref.BibtexEntry;
+@@ -201,9 +202,9 @@ public abstract class DBExporter extends DBImporterExporter{
+ rs.next();
+ myID = rs.getInt("groups_id");
+ }
+- for (Enumeration<GroupTreeNode> e = cursor.children(); e
++ for (Enumeration<TreeNode> e = cursor.children(); e
+ .hasMoreElements();)
+- currentID = populateEntryGroupsTable(e.nextElement(), myID,
++ currentID = populateEntryGroupsTable((GroupTreeNode) e.nextElement(), myID,
+ currentID, out, database_id);
+ return currentID;
+ }
+@@ -338,9 +339,9 @@ public abstract class DBExporter extends DBImporterExporter{
+ rs.next();
+ myID = rs.getInt("groups_id");
+ }
+- for (Enumeration<GroupTreeNode> e = cursor.children(); e
++ for (Enumeration<TreeNode> e = cursor.children(); e
+ .hasMoreElements();)
+- currentID = populateGroupsTable(e.nextElement(), myID, ++currentID,
++ currentID = populateGroupsTable((GroupTreeNode) e.nextElement(), myID, ++currentID,
+ out, database_id);
+ return currentID;
+ }
+--
+2.34.1
+
diff --git a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
new file mode 100644
index 00000000000..95a2e7310fe
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
@@ -0,0 +1,349 @@
+From 0791be415c4104a4c7ff79487823a9f0a7a1d2ec Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 19 Feb 2022 10:47:42 -0800
+Subject: [PATCH] Skip tests that fail when run directly outside Portage
+
+Because the tests are JUnit 3 tests, to skip them, each test's method
+name needs to be changed to something that does not start with 'test'.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ .../tests/net/sf/jabref/UtilFindFileTest.java | 4 ++--
+ src/java/tests/net/sf/jabref/UtilTest.java | 10 +++++-----
+ .../jabref/export/layout/LayoutEntryTest.java | 19 ++++++++++++++-----
+ .../sf/jabref/export/layout/LayoutTest.java | 4 ++--
+ .../sf/jabref/export/layout/RTFCharsTest.java | 4 ++--
+ .../AuthorLastFirstAbbreviatorTester.java | 2 +-
+ .../export/layout/format/DOICheckTest.java | 10 +++++++++-
+ .../sf/jabref/imports/BibtexParserTest.java | 4 ++--
+ .../sf/jabref/imports/CopacImporterTest.java | 4 ++--
+ .../sf/jabref/imports/IsiImporterTest.java | 4 ++--
+ .../net/sf/jabref/imports/OAI2ImportTest.java | 2 +-
+ .../tests/net/sf/jabref/util/XMPUtilTest.java | 6 +++---
+ 12 files changed, 45 insertions(+), 28 deletions(-)
+
+diff --git a/src/java/tests/net/sf/jabref/UtilFindFileTest.java b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
+index 7718c2c..b82360b 100644
+--- a/src/java/tests/net/sf/jabref/UtilFindFileTest.java
++++ b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
+@@ -27,7 +27,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
+ *
+ * @throws IOException
+ */
+- public void testFindFileRelative() throws IOException {
++ public void skipTestFindFileRelative() throws IOException {
+
+ // Most basic case
+ assertEqualPaths("HipKro03.pdf", findFile(root.getAbsolutePath() + "/test/",
+@@ -144,7 +144,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
+
+ }
+
+- public void testFindFile() throws IOException {
++ public void skipTestFindFile() throws IOException {
+
+ // Simple case
+ assertEqualPaths("HipKro03.pdf", Util.findFile(entry, database, root.getAbsolutePath()
+diff --git a/src/java/tests/net/sf/jabref/UtilTest.java b/src/java/tests/net/sf/jabref/UtilTest.java
+index a2e4ac6..50a6cad 100644
+--- a/src/java/tests/net/sf/jabref/UtilTest.java
++++ b/src/java/tests/net/sf/jabref/UtilTest.java
+@@ -65,7 +65,7 @@ public class UtilTest extends TestCase {
+
+ }
+
+- public void testPlaceDialog() {
++ public void skipTestPlaceDialog() {
+ Dialog d = new JDialog();
+ d.setSize(50, 50);
+ Container c = new JWindow();
+@@ -111,7 +111,7 @@ public class UtilTest extends TestCase {
+ assertEquals("\"{a\"}", Util.shaveString(" \"{a\"} "));
+ }
+
+- public void testCheckLegalKey() {
++ public void skipTestCheckLegalKey() {
+
+ assertEquals("AAAA", Util.checkLegalKey("AA AA"));
+ assertEquals("SPECIALCHARS", Util.checkLegalKey("SPECIAL CHARS#{\\\"}~,^"));
+@@ -119,7 +119,7 @@ public class UtilTest extends TestCase {
+ assertEquals("", Util.checkLegalKey("\n\t\r"));
+ }
+
+- public void testReplaceSpecialCharacters() {
++ public void skipTestReplaceSpecialCharacters() {
+ // Shouldn't German � be resolved to Ae
+ assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������"));
+ assertEquals("Hallo Arger", Util.replaceSpecialCharacters("Hallo Arger"));
+@@ -221,7 +221,7 @@ public class UtilTest extends TestCase {
+ }
+
+
+- public void testFieldAndFormat(){
++ public void skipTestFieldAndFormat(){
+ assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("[author]", entry, database));
+
+ assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("author", entry, database));
+@@ -239,7 +239,7 @@ public class UtilTest extends TestCase {
+ assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey:]", entry, database));
+ }
+
+- public void testUserFieldAndFormat(){
++ public void skipTestUserFieldAndFormat(){
+
+ String[] names = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATER_KEY);
+ if (names == null)
+diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
+index 8d6cea9..3197bf0 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
+@@ -92,11 +92,20 @@ public class LayoutEntryTest extends TestCase
+ /*************************/
+ /****** tests Cases ******/
+ /*************************/
++
++ /*
++ * An empty test case to avoid "No tests found" failure:
++ *
++ * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
++ * No tests found in tests.net.sf.jabref.export.layout.LayoutEntryTest
++ */
++ public void testDummy() {
++ }
+
+ /**
+ * @throws Exception
+ */
+- public void testNoHighlighting() throws Exception
++ public void skipTestNoHighlighting() throws Exception
+ {
+ // say that this bibtex object was found
+ mBTE.setSearchHit(true);
+@@ -113,7 +122,7 @@ public class LayoutEntryTest extends TestCase
+ /**
+ * @throws Exception
+ */
+- public void testHighlightingOneWordCaseInsesitive() throws Exception
++ public void skipTestHighlightingOneWordCaseInsesitive() throws Exception
+ {
+ // say that this bibtex object was found
+ mBTE.setSearchHit(true);
+@@ -135,7 +144,7 @@ public class LayoutEntryTest extends TestCase
+ /**
+ * @throws Exception
+ */
+- public void testHighlightingTwoWordsCaseInsesitive() throws Exception
++ public void skipTestHighlightingTwoWordsCaseInsesitive() throws Exception
+ {
+ // say that this bibtex object was found
+ mBTE.setSearchHit(true);
+@@ -162,7 +171,7 @@ public class LayoutEntryTest extends TestCase
+ /**
+ * @throws Exception
+ */
+- public void testHighlightingOneWordCaseSesitive() throws Exception
++ public void skipTestHighlightingOneWordCaseSesitive() throws Exception
+ {
+ // say that this bibtex object was found
+ mBTE.setSearchHit(true);
+@@ -184,7 +193,7 @@ public class LayoutEntryTest extends TestCase
+ /**
+ * @throws Exception
+ */
+- public void testHighlightingMoreWordsCaseSesitive() throws Exception
++ public void skipTestHighlightingMoreWordsCaseSesitive() throws Exception
+ {
+ // say that this bibtex object was found
+ mBTE.setSearchHit(true);
+diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
+index cb98fe3..e54a9b8 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
+@@ -66,7 +66,7 @@ public class LayoutTest extends TestCase {
+ assertEquals("Misc", layout("\\bibtextype", "@misc{bla, author={This\nis\na\ntext}}"));
+ }
+
+- public void testHTMLChar() throws Exception {
++ public void skipTestHTMLChar() throws Exception {
+ String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
+ "@other{bla, author={This\nis\na\ntext}}");
+
+@@ -95,7 +95,7 @@ public class LayoutTest extends TestCase {
+ *
+ * @throws Exception
+ */
+- public void testLayout() throws Exception {
++ public void skipTestLayout() throws Exception {
+
+ String layoutText = layout(
+ "<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
+diff --git a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
+index 43627ba..e977614 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
+@@ -35,7 +35,7 @@ public class RTFCharsTest extends TestCase {
+ assertEquals("{\\b hallo}", layout.format("{\\textbf hallo}"));
+ }
+
+- public void testComplicated() {
++ public void skipTestComplicated() {
+ LayoutFormatter layout = new RTFChars();
+
+ assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("Réflexions sur le timing de la quantité \\ae should be æ"));
+@@ -43,7 +43,7 @@ public class RTFCharsTest extends TestCase {
+ assertEquals("h\\u225all{\\uc2\\u339oe}", layout.format("h\\'all\\oe "));
+ }
+
+- public void testSpecialCharacters() {
++ public void skipTestSpecialCharacters() {
+
+ LayoutFormatter layout = new RTFChars();
+
+diff --git a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
+index 446a89c..496f18b 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
++++ b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
+@@ -76,7 +76,7 @@ public class AuthorLastFirstAbbreviatorTester extends TestCase {
+ * Testcase for
+ * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306
+ */
+- public void testJrAuthor(){
++ public void skipTestJrAuthor(){
+ String name = "Other, Jr., Anthony N.";
+ assertEquals("Other, A. N.", abbreviate(name));
+ }
+diff --git a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
+index dceb88c..d0680e3 100644
+--- a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
++++ b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
+@@ -5,8 +5,16 @@ import net.sf.jabref.export.layout.LayoutFormatter;
+ import net.sf.jabref.export.layout.format.DOICheck;
+
+ public class DOICheckTest extends TestCase {
++ /*
++ * An empty test case to avoid "No tests found" failure:
++ *
++ * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
++ * No tests found in tests.net.sf.jabref.export.layout.format.DOICheckTest
++ */
++ public void testDummy() {
++ }
+
+- public void testFormat() {
++ public void skipTestFormat() {
+ LayoutFormatter lf = new DOICheck();
+
+ assertEquals("", lf.format(""));
+diff --git a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
+index f8bc3dc..ad4899b 100644
+--- a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
++++ b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
+@@ -257,7 +257,7 @@ public class BibtexParserTest extends TestCase {
+ assertEquals("2002", e.getField("year"));
+ }
+
+- public void testNewlineHandling() throws IOException {
++ public void skipTestNewlineHandling() throws IOException {
+
+ BibtexEntry e = BibtexParser.singleFromString("@article{canh05," +
+ "a = {a\nb}," +
+@@ -320,7 +320,7 @@ public class BibtexParserTest extends TestCase {
+ * @author Uwe Kuehn
+ * @author Andrei Haralevich
+ */
+- public void testFileNaming3(){
++ public void skipTestFileNaming3(){
+ BibtexEntry e = BibtexParser.singleFromString("@article{canh05,"
+ + "title = {\nHallo \nWorld \nthis \n is\n\nnot \n\nan \n\n exercise \n \n.\n \n\n},\n"
+ + "tabs = {\nHallo \tWorld \tthis \t is\t\tnot \t\tan \t\n exercise \t \n.\t \n\t},\n"
+diff --git a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
+index 558ebb7..20f6c02 100644
+--- a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
++++ b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
+@@ -24,7 +24,7 @@ public class CopacImporterTest extends TestCase {
+ super.tearDown();
+ }
+
+- public void testIsRecognizedFormat() throws IOException {
++ public void skipTestIsRecognizedFormat() throws IOException {
+
+ CopacImporter importer = new CopacImporter();
+ assertTrue(importer.isRecognizedFormat(CopacImporterTest.class
+@@ -46,7 +46,7 @@ public class CopacImporterTest extends TestCase {
+ .getResourceAsStream("IsiImporterTestMedline.isi")));
+ }
+
+- public void testImportEntries() throws IOException {
++ public void skipTestImportEntries() throws IOException {
+ CopacImporter importer = new CopacImporter();
+
+ List<BibtexEntry> entries = importer.importEntries(CopacImporterTest.class
+diff --git a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
+index 041a31e..ee89a2b 100644
+--- a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
++++ b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
+@@ -33,7 +33,7 @@ public class IsiImporterTest extends TestCase {
+ super.tearDown();
+ }
+
+- public void testIsRecognizedFormat() throws IOException {
++ public void skipTestIsRecognizedFormat() throws IOException {
+
+ IsiImporter importer = new IsiImporter();
+ assertTrue(importer.isRecognizedFormat(IsiImporterTest.class
+@@ -201,7 +201,7 @@ public class IsiImporterTest extends TestCase {
+ assertEquals(BibtexEntryType.ARTICLE, b.getType());
+ }
+
+- public void testImportEntriesWOS() throws IOException {
++ public void skipTestImportEntriesWOS() throws IOException {
+ IsiImporter importer = new IsiImporter();
+
+ List<BibtexEntry> entries = importer.importEntries(IsiImporterTest.class
+diff --git a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
+index 9e7e73f..e0bfdf5 100644
+--- a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
++++ b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
+@@ -112,7 +112,7 @@ public class OAI2ImportTest extends TestCase {
+ assertEquals("", OAI2Fetcher.fixKey("arXiv:"));
+ }
+
+- public void testOnline() throws InterruptedException {
++ public void skipTestOnline() throws InterruptedException {
+
+ {
+ OAI2Fetcher fetcher = new OAI2Fetcher();
+diff --git a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
+index 74571f5..5b74057 100644
+--- a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
++++ b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
+@@ -345,7 +345,7 @@ public class XMPUtilTest extends TestCase {
+ * @throws TransformerException
+ * Should not happen.
+ */
+- public void testPrivacyFilter() throws IOException, TransformerException {
++ public void skipTestPrivacyFilter() throws IOException, TransformerException {
+
+ { // First set:
+ prefs.putBoolean("useXmpPrivacyFilter", true);
+@@ -1023,7 +1023,7 @@ public class XMPUtilTest extends TestCase {
+ assertEquals(t3BibtexEntry(), b);
+ }
+
+- public void testReadWriteDC() throws IOException, TransformerException {
++ public void skipTestReadWriteDC() throws IOException, TransformerException {
+ List<BibtexEntry> l = new LinkedList<BibtexEntry>();
+ l.add(t3BibtexEntry());
+
+@@ -1103,7 +1103,7 @@ public class XMPUtilTest extends TestCase {
+
+ }
+
+- public void testWriteSingleUpdatesDCAndInfo() throws IOException,
++ public void skipTestWriteSingleUpdatesDCAndInfo() throws IOException,
+ TransformerException {
+ List<BibtexEntry> l = new LinkedList<BibtexEntry>();
+ l.add(t3BibtexEntry());
+--
+2.34.1
+
diff --git a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
new file mode 100644
index 00000000000..d3e413e9b0f
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
@@ -0,0 +1,49 @@
+From f24492bff17f728bcf2b5a50069669ae08b8b372 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 19 Feb 2022 10:21:04 -0800
+Subject: [PATCH] Add JVM system properties and argument for tests
+
+The changes to system properties ensure that all paths the application
+may write to during the tests are not protected by the Portage sandbox.
+
+The extra argument added is required on Java 17+, but it should also be
+compatible with all Java versions that support the Java Platform Module
+System (JPMS), namely Java 9+. On older Java versions, it is optional.
+On Java 8, however, including it in JVM arguments would cause an error.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ build.xml | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index d13a9f3..788a4d1 100644
+--- a/build.xml
++++ b/build.xml
+@@ -28,7 +28,7 @@
+
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
+
+-<project name="JabRef" default="jars" basedir=".">
++<project name="JabRef" default="jars" basedir="." xmlns:if="ant:if">
+
+ <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ PROPERTY SETUP
+@@ -596,7 +596,14 @@ version=${jabref.version}</echo>
+ </target>
+
+ <target name="test" depends="buildtest" description="Runs all unit tests">
++ <condition property="shouldAddOpens">
++ <javaversion atleast="9" />
++ </condition>
+ <java fork="yes" classname="junit.textui.TestRunner" failonerror="true">
++ <sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}" />
++ <sysproperty key="user.home" value="${user.home}" />
++ <jvmarg if:set="shouldAddOpens"
++ value="--add-opens=java.desktop/java.awt=ALL-UNNAMED" />
+ <arg value="tests.net.sf.jabref.AllTests" />
+ <classpath refid="classpathTest" />
+ </java>
+--
+2.34.1
+
diff --git a/app-text/jabref/files/jabref-2.10-test-prefs.xml b/app-text/jabref/files/jabref-2.10-test-prefs.xml
new file mode 100644
index 00000000000..aea6c9f32bb
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.10-test-prefs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
+<map MAP_XML_VERSION="1.0">
+ <entry key="autoAssignGroup" value="true"/>
+ <entry key="autoCompFF" value="false"/>
+ <entry key="autoCompFirstNameMode" value="both"/>
+ <entry key="autoCompLF" value="false"/>
+ <entry key="autoComplete" value="true"/>
+ <entry key="autolinkExactKeyOnly" value="true"/>
+ <entry key="caseSensitiveSearch" value="false"/>
+ <entry key="nameFormatterFormats" value=""/>
+ <entry key="nameFormatterNames" value=""/>
+ <entry key="pdfDirectory" value=""/>
+ <entry key="pushToApplication" value="Insert selected citations into LyX/Kile"/>
+ <entry key="showFileLinksUpgradeWarning" value="false"/>
+ <entry key="useRegExpSearch" value="false"/>
+ <entry key="useXmpPrivacyFilter" value="false"/>
+ <entry key="xmpPrivacyFilter" value="pdf;timestamp;keywords;owner;note;review"/>
+</map>
diff --git a/app-text/jabref/jabref-2.10-r6.ebuild b/app-text/jabref/jabref-2.10-r6.ebuild
deleted file mode 100644
index 6a4ad246402..00000000000
--- a/app-text/jabref/jabref-2.10-r6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit desktop java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="https://www.jabref.org/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
- dev-java/antlr:0
- dev-java/antlr:3
- dev-java/fontbox:1.7
- dev-java/jempbox:1.7
- dev-java/log4j:0
- dev-java/spin:0
- dev-java/microba:0
- >=dev-java/glazedlists-1.8.0:0
- "
-
-DEPEND="
- virtual/jdk:1.8
- ${COMMON_DEP}"
-
-RDEPEND="
- virtual/jre:1.8
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
-
- # If we cleanup it complains about missing jarbundler
- # BUILD FAILED
- # taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
-# java-pkg_clean
-
- # Remove bundled dependencies.
- rm lib/antlr*.jar || die
- rm lib/fontbox*.jar || die
- rm lib/jempbox*.jar || die
- rm lib/spin.jar || die
- rm lib/microba.jar || die
- rm lib/glazedlists*.jar || die
-
- # Remove unjarlib target (do this only once we have removed all
- # bundled dependencies in lib).
- #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
- # Fix license file copy operation for microba bundled lib.
- sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
- local EXTERNAL_JARS="antlr,antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
- local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
- eant \
- -Dgentoo.classpath=${CLASSPATH} \
- jars \
- $(usex doc docs "")
-}
-
-src_install() {
- java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
- use doc && java-pkg_dojavadoc build/docs/API
- dodoc src/txt/README
-
- java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
- newicon src/images/JabRef-icon-48.png JabRef-icon.png
- make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
new file mode 100644
index 00000000000..2dfca56aca1
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc test"
+
+inherit desktop java-pkg-2 java-ant-2 virtualx xdg-utils
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="https://www.jabref.org/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+ dev-java/antlr:0
+ dev-java/antlr:3
+ dev-java/commons-logging:0
+ dev-java/fontbox:1.7
+ dev-java/jaxb-api:2
+ dev-java/jempbox:1.7
+ dev-java/log4j-12-api:2
+ dev-java/log4j-api:2
+ dev-java/spin:0
+ dev-java/microba:0
+ >=dev-java/glazedlists-1.8.0:0"
+
+TEST_DEPEND="dev-java/junit:0"
+
+# Since Java 9, all dependencies ever imported by the source files need to be
+# present in the classpath for Javadoc generation; in particular, for this
+# package, the test sources will be passed to 'javadoc' as well as the non-test
+# sources, so all test dependencies are required for Javadoc generation too.
+DEPEND="
+ >=virtual/jdk-1.8:*
+ doc? ( ${TEST_DEPEND} )
+ test? ( ${TEST_DEPEND} )
+ ${CP_DEPEND}"
+
+# Java 17+ requires "--add-opens=java.desktop/java.awt=ALL-UNNAMED" in
+# arguments to the JVM that runs this application; Java 8 and 11 are OK,
+# but dev-java/java-config currently does not support declaration like
+# RDEPEND="|| ( virtual/jre:1.8 virtual/jre:11 )" yet, so only one JRE
+# version can be chosen to run this application at the moment.
+RDEPEND="
+ virtual/jre:1.8
+ ${CP_DEPEND}"
+
+IDEPEND="dev-util/desktop-file-utils"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-javax.swing-java-9+.patch"
+ "${FILESDIR}/${P}-skip-failing-tests.patch"
+ "${FILESDIR}/${P}-test-jvm-props-args.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="docs"
+
+# Some dependencies that are also used by the tests need to be explicitly
+# listed to avoid "package does not exist" compiler errors.
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_TEST_GENTOO_CLASSPATH+=",antlr-3,commons-logging,glazedlists"
+EANT_TEST_GENTOO_CLASSPATH+=",jempbox-1.7,microba,spin"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T} -Duser.home=${HOME}"
+
+src_prepare() {
+ default
+
+ # If we cleanup it complains about missing jarbundler
+ # BUILD FAILED
+ # taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
+# java-pkg_clean
+
+ # Remove bundled dependencies.
+ rm lib/antlr*.jar || die
+ rm lib/fontbox*.jar || die
+ rm lib/glazedlists*.jar || die
+ rm lib/jempbox*.jar || die
+ rm lib/microba.jar || die
+ rm lib/spin.jar || die
+ rm lib/plugin/commons-logging.jar || die
+
+ # Remove unjarlib target (do this only once we have removed all
+ # bundled dependencies in lib).
+ #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
+
+ # Fix license file copy operation for microba bundled lib.
+ sed -i -e 's:^.*microba-license.*::' build.xml
+
+ use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(\
+ java-pkg_getjars --build-only junit)"
+}
+
+src_test() {
+ # Tests will launch the application, which requires an X environment.
+ # An existing application preference file is needed to make the tests
+ # non-interactive; otherwise, the application will hang for user input.
+ local prefs_dir="${HOME}/.java/.userPrefs/net/sf/jabref"
+ mkdir -p "${prefs_dir}" ||
+ die "Failed to create application preference directory for tests"
+ cp "${FILESDIR}/${P}-test-prefs.xml" "${prefs_dir}/prefs.xml" ||
+ die "Failed to copy application preference file for tests"
+ virtx java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+
+ dodoc src/txt/README
+ use doc && java-pkg_dojavadoc build/docs/API
+
+ java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
+ newicon src/images/JabRef-icon-48.png JabRef-icon.png
+ make_desktop_entry ${PN} JabRef JabRef-icon Office
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/katarakt/Manifest b/app-text/katarakt/Manifest
new file mode 100644
index 00000000000..3a47b281192
--- /dev/null
+++ b/app-text/katarakt/Manifest
@@ -0,0 +1 @@
+DIST katarakt-v0.2.tar.gz 52004 BLAKE2B af014425bbf9c36350f4c10e57d9668f4a362d786c660f032381f6cf68b006d384c88bb0f4cabee4c0bc8e5f01ad25a44ef38d100ddfdfe955a442313b77b322 SHA512 a07054e0e9915f6239b8149bbd08c8b5ec095b0e9ffb54e03761ad9e59914f66166e4b8359298721a6b46c2bcf5114f40ad117c4826a32660c1fba28f69b8e68
diff --git a/app-text/katarakt/files/katarakt-0.2-install.patch b/app-text/katarakt/files/katarakt-0.2-install.patch
new file mode 100644
index 00000000000..96cb6f4b614
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-install.patch
@@ -0,0 +1,26 @@
+From 4801619c7752b317da8d57183f590d9c3cce42e1 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 30 Jan 2020 19:22:05 +0100
+Subject: [PATCH] build: Install binary
+
+Add an install target for the binary.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ katarakt.pro | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..220dfd68b1b9 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -57,3 +57,6 @@ web.depends = $$website.target
+ web.CONFIG = phony
+
+ QMAKE_EXTRA_TARGETS += documentation website doc web
++
++target.path = $$INSTALL_ROOT/$$PREFIX/bin/
++INSTALLS += target
+--
+2.24.1
+
diff --git a/app-text/katarakt/files/katarakt-0.2-poppler.patch b/app-text/katarakt/files/katarakt-0.2-poppler.patch
new file mode 100644
index 00000000000..7979bf6a59c
--- /dev/null
+++ b/app-text/katarakt/files/katarakt-0.2-poppler.patch
@@ -0,0 +1,29 @@
+From 23b68e9c48204d43b37b23735ad9ea0b219fec7b Mon Sep 17 00:00:00 2001
+From: Philipp Erhardt <Philipp.Erhardt@informatik.stud.uni-erlangen.de>
+Date: Mon, 19 Oct 2020 20:42:37 +0200
+Subject: [PATCH] Fix compilation if the version number contains a leading zero
+
+---
+ katarakt.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/katarakt.pro b/katarakt.pro
+index a632713db2ce..84cd59797d0a 100644
+--- a/katarakt.pro
++++ b/katarakt.pro
+@@ -17,9 +17,9 @@ unix {
+
+ isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf
+ POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
+- POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
+- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
+- POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
++ POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed "\'s,^0*\\(.\\),\1,\'")
++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "\'s,^0*\\(.\\),\1,\'")
++ POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed "\'s,^0*\\(.\\),\1,\'")
+
+ DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
+ DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
+--
+2.33.0
+
diff --git a/app-text/katarakt/katarakt-0.2.ebuild b/app-text/katarakt/katarakt-0.2.ebuild
new file mode 100644
index 00000000000..161ff49aee5
--- /dev/null
+++ b/app-text/katarakt/katarakt-0.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A simple PDF viewer designed to use as much available screen space as possible"
+HOMEPAGE="https://gitlab.cs.fau.de/Qui_Sum/katarakt"
+SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+"
+RDEPEND="
+ app-text/poppler:=[qt5]
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-install.patch"
+ "${FILESDIR}/${P}-poppler.patch"
+)
+
+src_configure() {
+ eqmake5 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install doc
+ doman doc/katarakt.1
+}
diff --git a/app-text/katarakt/metadata.xml b/app-text/katarakt/metadata.xml
new file mode 100644
index 00000000000..7a3b0ef78c1
--- /dev/null
+++ b/app-text/katarakt/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>kurt@kmk-computers.de</email>
+ <name>Kurt Kanzenbach</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ katarakt is a simple PDF viewer. It is designed to use as much available
+ screen space as possible.
+
+ There are currently two layouts. The presentation layout is very simple and
+ only supports scrolling on a per page basis. As the name suggests the
+ current page is displayed in the center and zoomed to fit the window. It is
+ active by default.
+
+ The grid layout is much more advanced and offers continuous (smooth, per
+ pixel) scrolling, zooming and adjusting the column count. Pages keep their
+ correct relative size and are shown in a grid.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-text/kchmviewer/kchmviewer-8.0.ebuild b/app-text/kchmviewer/kchmviewer-8.0.ebuild
index 18bf404abb9..188a1ca12bc 100644
--- a/app-text/kchmviewer/kchmviewer-8.0.ebuild
+++ b/app-text/kchmviewer/kchmviewer-8.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/kchmviewer-RELEASE_8_0"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE=""
DEPEND="
diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch
new file mode 100644
index 00000000000..3f0c4e52779
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-21.12.0.patch
@@ -0,0 +1,272 @@
+From 581548a1de9449efc0c77e9ac85c23066bac983e Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Wed, 8 Sep 2021 00:58:25 +0200
+Subject: [PATCH] Adapt to new Akonadi libraries includes using the C++
+ namespace as prefix
+
+GIT_SILENT
+---
+ src/kjotsedit.cpp | 5 +++++
+ src/kjotsmodel.cpp | 6 ++++++
+ src/kjotsmodel.h | 6 ++++++
+ src/kjotswidget.cpp | 20 +++++++++++++++++++-
+ src/kjotswidget.h | 5 +++++
+ src/noteshared/notecreatorandselector.cpp | 7 +++++++
+ src/noteshared/notecreatorandselector.h | 6 ++++++
+ src/noteshared/notelockattribute.h | 6 ++++++
+ src/noteshared/notepinattribute.h | 6 ++++++
+ src/noteshared/standardnoteactionmanager.cpp | 8 ++++++++
+ src/noteshared/standardnoteactionmanager.h | 9 +++++++--
+ src/notesortproxymodel.cpp | 5 +++++
+ 12 files changed, 86 insertions(+), 3 deletions(-)
+
+diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp
+index f1d61bd..c20bc42 100644
+--- a/src/kjotsedit.cpp
++++ b/src/kjotsedit.cpp
+@@ -33,7 +33,12 @@
+ #include <KPIMTextEdit/RichTextComposerActions>
+ #include <KPIMTextEdit/RichTextComposerImages>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Item>
++#else
+ #include <AkonadiCore/Item>
++#endif
+
+ #include "kjotslinkdialog.h"
+ #include "kjotsmodel.h"
+diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
+index e35c94f..99ee14f 100644
+--- a/src/kjotsmodel.cpp
++++ b/src/kjotsmodel.cpp
+@@ -13,8 +13,14 @@
+ #include <QTextDocument>
+ #include <QIcon>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/ChangeRecorder>
++#include <Akonadi/EntityDisplayAttribute>
++#else
+ #include <AkonadiCore/ChangeRecorder>
+ #include <AkonadiCore/EntityDisplayAttribute>
++#endif
+ #include <Akonadi/Notes/NoteUtils>
+
+ #include <KMime/Message>
+diff --git a/src/kjotsmodel.h b/src/kjotsmodel.h
+index 71e0ca6..ec564a7 100644
+--- a/src/kjotsmodel.h
++++ b/src/kjotsmodel.h
+@@ -10,7 +10,13 @@
+ #ifndef KJOTSMODEL_H
+ #define KJOTSMODEL_H
+
++#include <akonadi_version.h>
++#include <QtGlobal> // for QT_VERSION_CHECK
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityTreeModel>
++#else
+ #include <AkonadiCore/EntityTreeModel>
++#endif
+
+ class QTextDocument;
+
+diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+index 3a3abd0..834fc33 100644
+--- a/src/kjotswidget.cpp
++++ b/src/kjotswidget.cpp
+@@ -35,6 +35,24 @@
+
+ // Akonadi
+ #include <Akonadi/Notes/NoteUtils>
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/AttributeFactory>
++#include <Akonadi/CollectionCreateJob>
++#include <Akonadi/CollectionDeleteJob>
++#include <Akonadi/ChangeRecorder>
++#include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityMimeTypeFilterModel>
++#include <Akonadi/Item>
++#include <Akonadi/ItemCreateJob>
++#include <Akonadi/ItemModifyJob>
++#include <Akonadi/ItemDeleteJob>
++#include <Akonadi/ItemFetchScope>
++#include <Akonadi/EntityOrderProxyModel>
++#include <Akonadi/EntityTreeView>
++#include <Akonadi/ETMViewStateSaver>
++#include <Akonadi/ControlGui>
++#else
+ #include <AkonadiCore/AttributeFactory>
+ #include <AkonadiCore/CollectionCreateJob>
+ #include <AkonadiCore/CollectionDeleteJob>
+@@ -50,7 +68,7 @@
+ #include <AkonadiWidgets/EntityTreeView>
+ #include <AkonadiWidgets/ETMViewStateSaver>
+ #include <AkonadiWidgets/ControlGui>
+-
++#endif
+ // Grantlee
+ #include <grantlee/template.h>
+ #include <grantlee/engine.h>
+diff --git a/src/kjotswidget.h b/src/kjotswidget.h
+index 7fe91ed..00a41b5 100644
+--- a/src/kjotswidget.h
++++ b/src/kjotswidget.h
+@@ -18,7 +18,12 @@
+ #include <QAbstractItemDelegate>
+ #include <QPrinter>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Collection>
++#else
+ #include <AkonadiCore/Collection>
++#endif
+
+ #include <grantlee/templateloader.h>
+
+diff --git a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
+index 2172cbf..6d58c83 100644
+--- a/src/noteshared/notecreatorandselector.cpp
++++ b/src/noteshared/notecreatorandselector.cpp
+@@ -14,9 +14,16 @@
+
+ #include <KMime/Message>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityTreeModel>
++#include <Akonadi/ItemCreateJob>
++#else
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/ItemCreateJob>
++#endif
+ #include <Akonadi/Notes/NoteUtils>
+
+ #include "noteshared_debug.h"
+diff --git a/src/noteshared/notecreatorandselector.h b/src/noteshared/notecreatorandselector.h
+index 90055cf..986d042 100644
+--- a/src/noteshared/notecreatorandselector.h
++++ b/src/noteshared/notecreatorandselector.h
+@@ -14,8 +14,14 @@
+ #include <QItemSelectionModel>
+ #include <QTimer>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Collection>
++#include <Akonadi/Item>
++#else
+ #include <AkonadiCore/Collection>
+ #include <AkonadiCore/Item>
++#endif
+
+ class KJob;
+
+diff --git a/src/noteshared/notelockattribute.h b/src/noteshared/notelockattribute.h
+index 9bdd8a2..b0ee819 100644
+--- a/src/noteshared/notelockattribute.h
++++ b/src/noteshared/notelockattribute.h
+@@ -11,7 +11,13 @@
+ #ifndef KJOTS_LOCK_ATTRIBUTE_H
+ #define KJOTS_LOCK_ATTRIBUTE_H
+
++#include <akonadi_version.h>
++#include <QtGlobal> // for QT_VERSION_CHECK
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Attribute>
++#else
+ #include <AkonadiCore/Attribute>
++#endif
+
+ namespace NoteShared
+ {
+diff --git a/src/noteshared/notepinattribute.h b/src/noteshared/notepinattribute.h
+index 3026dea..5f3903c 100644
+--- a/src/noteshared/notepinattribute.h
++++ b/src/noteshared/notepinattribute.h
+@@ -9,7 +9,13 @@
+ #ifndef NOTE_PIN_ATTRIBUTE_H
+ #define NOTE_PIN_ATTRIBUTE_H
+
++#include <akonadi_version.h>
++#include <QtGlobal> // for QT_VERSION_CHECK
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Attribute>
++#else
+ #include <AkonadiCore/Attribute>
++#endif
+
+ namespace NoteShared
+ {
+diff --git a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
+index a3f4b8b..2a2f4ce 100644
+--- a/src/noteshared/standardnoteactionmanager.cpp
++++ b/src/noteshared/standardnoteactionmanager.cpp
+@@ -13,10 +13,18 @@
+ #include <QColorDialog>
+ #include <QItemSelectionModel>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityDisplayAttribute>
++#include <Akonadi/EntityTreeModel>
++#include <Akonadi/CollectionModifyJob>
++#include <Akonadi/ItemModifyJob>
++#else
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/CollectionModifyJob>
+ #include <AkonadiCore/ItemModifyJob>
++#endif
+ #include <Akonadi/Notes/NoteUtils>
+
+ #include <KXmlGui/KActionCollection>
+diff --git a/src/noteshared/standardnoteactionmanager.h b/src/noteshared/standardnoteactionmanager.h
+index fe80dae..6605820 100644
+--- a/src/noteshared/standardnoteactionmanager.h
++++ b/src/noteshared/standardnoteactionmanager.h
+@@ -10,10 +10,15 @@
+ #ifndef AKONADI_STANDARDNOTESACTIONMANAGER_H
+ #define AKONADI_STANDARDNOTESACTIONMANAGER_H
+
+-#include <AkonadiWidgets/StandardActionManager>
+-
+ #include <QObject>
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/StandardActionManager>
++#else
++#include <AkonadiWidgets/StandardActionManager>
++#endif
++
+ class QAction;
+ class KActionCollection;
+ class QItemSelectionModel;
+diff --git a/src/notesortproxymodel.cpp b/src/notesortproxymodel.cpp
+index 89def1c..dbe582f 100644
+--- a/src/notesortproxymodel.cpp
++++ b/src/notesortproxymodel.cpp
+@@ -8,7 +8,12 @@
+
+ #include "notesortproxymodel.h"
+
++#include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/EntityTreeModel>
++#else
+ #include <AkonadiCore/EntityTreeModel>
++#endif
+
+ #include "noteshared/notepinattribute.h"
+
+--
+GitLab
+
diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch
new file mode 100644
index 00000000000..a5ef2cc2cdf
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch
@@ -0,0 +1,87 @@
+From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 1 Mar 2022 23:33:19 +0100
+Subject: [PATCH] Fix akonadi includes
+
+---
+ src/kjotsmodel.cpp | 2 +-
+ src/kjotswidget.cpp | 2 +-
+ src/noteshared/notecreatorandselector.cpp | 2 +-
+ src/noteshared/standardnoteactionmanager.cpp | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+
+From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Fri, 1 Apr 2022 08:00:34 +0000
+Subject: [PATCH] Fix build with Akonadi 21.12
+
+---
+ src/kjotsmodel.cpp | 4 ++++
+ src/kjotswidget.cpp | 6 +++++-
+ src/noteshared/notecreatorandselector.cpp | 4 ++++
+ src/noteshared/standardnoteactionmanager.cpp | 4 ++++
+ 4 files changed, 17 insertions(+), 1 deletion(-)
+
+diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
+--- a/src/kjotsmodel.cpp
++++ b/src/kjotsmodel.cpp
+@@ -21,7 +21,11 @@
+ #include <AkonadiCore/ChangeRecorder>
+ #include <AkonadiCore/EntityDisplayAttribute>
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
+ #include <Akonadi/Notes/NoteUtils>
++#endif
+
+ #include <KMime/Message>
+ #include <KPIMTextEdit/TextUtils>
+diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp
+--- a/src/kjotswidget.cpp
++++ b/src/kjotswidget.cpp
+@@ -34,8 +34,12 @@
+ #include <QDebug>
+
+ // Akonadi
+-#include <Akonadi/Notes/NoteUtils>
+ #include <akonadi_version.h>
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
++#include <Akonadi/Notes/NoteUtils>
++#endif
+ #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+ #include <Akonadi/AttributeFactory>
+ #include <Akonadi/CollectionCreateJob>
+diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp
+--- a/src/noteshared/notecreatorandselector.cpp
++++ b/src/noteshared/notecreatorandselector.cpp
+@@ -24,7 +24,11 @@
+ #include <AkonadiCore/EntityTreeModel>
+ #include <AkonadiCore/ItemCreateJob>
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
+ #include <Akonadi/Notes/NoteUtils>
++#endif
+
+ #include "noteshared_debug.h"
+
+diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp
+--- a/src/noteshared/standardnoteactionmanager.cpp
++++ b/src/noteshared/standardnoteactionmanager.cpp
+@@ -25,7 +25,11 @@
+ #include <AkonadiCore/CollectionModifyJob>
+ #include <AkonadiCore/ItemModifyJob>
+ #endif
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
++#include <Akonadi/NoteUtils>
++#else
+ #include <Akonadi/Notes/NoteUtils>
++#endif
+
+ #include <KXmlGui/KActionCollection>
+ #include <KLocalizedString>
diff --git a/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch
new file mode 100644
index 00000000000..b81bafc1889
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-implicit-dep.patch
@@ -0,0 +1,26 @@
+From 8803636bf4e0238d0f23bedebdcb4d1e6283ffb7 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 26 Apr 2021 17:09:51 +0200
+Subject: [PATCH] Make dependency on KI18n explicit
+
+It already pulled in by KParts, but we better not rely on that
+---
+ src/kontact_plugin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt
+index dec4b8b..f1d56ec 100644
+--- a/src/kontact_plugin/CMakeLists.txt
++++ b/src/kontact_plugin/CMakeLists.txt
+@@ -13,7 +13,7 @@ set(kontact_kjots_PART_SRCS
+ )
+
+ add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
+-target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
++target_link_libraries(kontact_kjotsplugin KF5::I18n KF5::KontactInterface)
+ kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
+
+ install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
+--
+GitLab
+
diff --git a/app-text/kjots/files/kjots-5.1.0-missing-lib.patch b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch
new file mode 100644
index 00000000000..28418717d3b
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-missing-lib.patch
@@ -0,0 +1,25 @@
+From 3d3cee8caeec813802a1af54c14805203fb1ddf6 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Tue, 7 Sep 2021 23:21:34 +0200
+Subject: [PATCH] noteshared: add missing library to link list
+
+GIT_SILENT
+---
+ src/noteshared/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/noteshared/CMakeLists.txt b/src/noteshared/CMakeLists.txt
+index 5de60ab..6aa0b0a 100644
+--- a/src/noteshared/CMakeLists.txt
++++ b/src/noteshared/CMakeLists.txt
+@@ -16,6 +16,7 @@ target_link_libraries(noteshared
+ Qt5::Core
+ Qt5::Widgets
+ KF5::I18n
++ KF5::AkonadiWidgets
+ KF5::AkonadiCore
+ KF5::AkonadiNotes
+ KF5::XmlGui
+--
+GitLab
+
diff --git a/app-text/kjots/files/kjots-5.1.0-speech-optional.patch b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
new file mode 100644
index 00000000000..95c3309bd5b
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.1.0-speech-optional.patch
@@ -0,0 +1,82 @@
+From c552b158e46ccdefc5c8382911aca907e177d63d Mon Sep 17 00:00:00 2001
+From: Igor Poboiko <igor.poboiko@gmail.com>
+Date: Sat, 19 Mar 2022 15:44:50 +0100
+Subject: [PATCH] Allow compiling without KPIMTextEdit/TextToSpeech
+
+---
+ src/kjotsbrowser.cpp | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/kjotsbrowser.cpp b/src/kjotsbrowser.cpp
+index fd6e6dd..8864f79 100644
+--- a/src/kjotsbrowser.cpp
++++ b/src/kjotsbrowser.cpp
+@@ -15,9 +15,13 @@
+ #include "kjotsmodel.h"
+
+ #include <KPIMTextEdit/RichTextEditFindBar>
+-#include <KPIMTextEdit/TextToSpeechWidget>
+ #include <KPIMTextEdit/SlideContainer>
+
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
++#include <KPIMTextEdit/TextToSpeechWidget>
++#endif
++
+ #include <QHelpEvent>
+ #include <QToolTip>
+ #include <QVBoxLayout>
+@@ -37,14 +41,18 @@ public:
+ : mBrowser(std::move(browser))
+ , mSliderContainer(widget)
+ , mFindBar(mBrowser.get(), &mSliderContainer)
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ , mTextToSpeechWidget(widget)
++#endif
+ {
+ }
+
+ std::unique_ptr<KJotsBrowser> mBrowser;
+ KPIMTextEdit::SlideContainer mSliderContainer;
+ KPIMTextEdit::RichTextEditFindBar mFindBar;
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ KPIMTextEdit::TextToSpeechWidget mTextToSpeechWidget;
++#endif
+ };
+
+ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QWidget *parent)
+@@ -56,11 +64,15 @@ KJotsBrowserWidget::KJotsBrowserWidget(std::unique_ptr<KJotsBrowser> browser, QW
+ d->mFindBar.setHideWhenClose(false);
+
+ connect(&d->mFindBar, &KPIMTextEdit::RichTextEditFindBar::hideFindBar, this, &KJotsBrowserWidget::slotHideFindBar);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ connect(d->mBrowser.get(), &KJotsBrowser::say, &d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
++#endif
+
+ QVBoxLayout *lay = new QVBoxLayout(this);
+ lay->setContentsMargins(0, 0, 0, 0);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ lay->addWidget(&d->mTextToSpeechWidget);
++#endif
+ lay->addWidget(d->mBrowser.get());
+ lay->addWidget(&d->mSliderContainer);
+ }
+@@ -129,6 +141,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event)
+ popup->addSeparator();
+ popup->addAction(m_actionCollection->action(QString::fromLatin1(KStandardAction::name(KStandardAction::Find))));
+ popup->addSeparator();
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ if (!document()->isEmpty() && KPIMTextEdit::TextToSpeech::self()->isReady()) {
+ QAction *speakAction = popup->addAction(i18nc("@info:action", "Speak Text"));
+ speakAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech")));
+@@ -137,6 +150,7 @@ void KJotsBrowser::contextMenuEvent(QContextMenuEvent *event)
+ Q_EMIT say(text);
+ });
+ }
++#endif
+ popup->exec(event->globalPos());
+ delete popup;
+ }
+--
+GitLab
+
diff --git a/app-text/kjots/kjots-5.1.0.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild
index 933ed290e97..7ef5fe96825 100644
--- a/app-text/kjots/kjots-5.1.0.ebuild
+++ b/app-text/kjots/kjots-5.1.0-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
KDE_ORG_CATEGORY="pim"
-KFMIN=5.77.0
+KFMIN=5.82.0
QTMIN=5.15.2
inherit ecm kde.org
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-2"
SLOT="5"
-IUSE=""
+IUSE="speech"
DEPEND="
dev-libs/grantlee:5
@@ -30,7 +30,7 @@ DEPEND="
>=kde-apps/akonadi-notes-20.12.2:5
>=kde-apps/kmime-20.12.2:5
>=kde-apps/kontactinterface-20.12.2:5
- >=kde-apps/kpimtextedit-20.12.2:5
+ >=kde-apps/kpimtextedit-20.12.2:5[speech(+)=]
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -45,4 +45,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES+=( "${FILESDIR}/${P}-unused-dep.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-unused-dep.patch"
+ "${FILESDIR}/${P}-implicit-dep.patch"
+ "${FILESDIR}/${P}-missing-lib.patch"
+ "${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
+)
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index d925f243975..fa80953797d 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
+ <use>
+ <flag name="speech">Enable text-to-speech support</flag>
+ </use>
</pkgmetadata>
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
new file mode 100644
index 00000000000..0041e2a8cfe
--- /dev/null
+++ b/app-text/kramdown-rfc/Manifest
@@ -0,0 +1 @@
+DIST kramdown-rfc-1.6.5.gem 4608 BLAKE2B fb62c69a186f80da15555937209b59af370a5c9dd742d5a704e4af73931728fb7337162848af02dab7d7ee520c7883a82b00adcc0e4b5ab97020f9fc530ee42a SHA512 0bd9f24bf793e9a92f7a479a75a739cea4bfd8cdd20ee9c4bd52b8de5c7fe71db777ac0826412e132b2c227dfcf9c4b333f3bfb648f4598599919a64a21bce69
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.17.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild
index 057efaabbd8..ea795b2d7ef 100644
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.17.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.5.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
@@ -11,8 +11,8 @@ RUBY_FAKEGEM_EXTRAINSTALL="data"
inherit ruby-fakegem
-DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
-HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
LICENSE="MIT"
SLOT="0"
diff --git a/app-text/kramdown-rfc2629/metadata.xml b/app-text/kramdown-rfc/metadata.xml
index 06c61aaee4c..06c61aaee4c 100644
--- a/app-text/kramdown-rfc2629/metadata.xml
+++ b/app-text/kramdown-rfc/metadata.xml
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
deleted file mode 100644
index fbc36f68d68..00000000000
--- a/app-text/kramdown-rfc2629/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
-DIST kramdown-rfc2629-1.5.17.gem 50688 BLAKE2B adca653cad4f6e8ff11ae7cbf5314f963d112ea445a402792ffc66eea9e109830ceac69f5016f1b31a1ca783884f15939986374777f270e09247d3416abfd795 SHA512 b60328a8039628b1ca3655c82f6174f0334c2f15ae9bc3fbd0be2d721837e14f2c6b30ae25c818e11b688735e6ddc83476ad1590ba3fe6acde0e8eff0e2362b9
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
deleted file mode 100644
index c3777b12f31..00000000000
--- a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.4.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An RFC2629 (XML2RFC) backend for Thomas Leitner's kramdown markdown parser"
-HOMEPAGE="https://github.com/cabo/kramdown-rfc2629"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
- >=dev-ruby/kramdown-2.3.0
- >=dev-ruby/certified-1.0.0
- >=dev-ruby/json-2.0.0
-"
-
-all_ruby_prepare() {
- sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index af3897fdf1c..56717604ad5 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,3 +1 @@
-DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
-DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
diff --git a/app-text/languagetool/languagetool-4.5.ebuild b/app-text/languagetool/languagetool-4.5.ebuild
deleted file mode 100644
index afb2f0cde17..00000000000
--- a/app-text/languagetool/languagetool-4.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
- dev-java/commons-cli:1
- dev-java/commons-collections:4
- dev-java/commons-io:1
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/guava:20
- dev-java/hamcrest-core:1.3
- dev-java/jcommander:0
- dev-java/jna:4
- dev-java/slf4j-api:0
- dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
- ${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
- rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
- # Loads of bundled stuff :(
- #java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
- java-pkg_dojar *.jar libs/*.jar
-
- local DIR=/usr/share/${PN}/lib/language-modules
- java-pkg_addcp "${EPREFIX}${DIR}"
- insinto ${DIR}
- doins -r org META-INF
-
- java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
- java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-
- dodoc CHANGES.md README.md
-
- unset MY_DEPEND
- java-pkg_gen-cp MY_DEPEND
- java-pkg_register-dependency "${MY_DEPEND}"
-}
diff --git a/app-text/languagetool/languagetool-4.6.ebuild b/app-text/languagetool/languagetool-4.6.ebuild
deleted file mode 100644
index 8f9296077b6..00000000000
--- a/app-text/languagetool/languagetool-4.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2 desktop xdg-utils
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
- dev-java/commons-cli:1
- dev-java/commons-collections:4
- dev-java/commons-io:1
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/guava:20
- dev-java/hamcrest-core:1.3
- dev-java/jcommander:0
- dev-java/jna:4
- dev-java/slf4j-api:0
- dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
- ${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
- rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
- # Loads of bundled stuff :(
- #java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
- java-pkg_dojar *.jar libs/*.jar
-
- local DIR=/usr/share/${PN}/lib/language-modules
- java-pkg_addcp "${EPREFIX}${DIR}"
- insinto ${DIR}
- doins -r org META-INF
-
- java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
- java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
- java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer
- newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
- domenu "${FILESDIR}"/${PN}.desktop
-
- dodoc CHANGES.md README.md
-
- unset MY_DEPEND
- java-pkg_gen-cp MY_DEPEND
- java-pkg_register-dependency "${MY_DEPEND}"
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
index b1b8d8ccf1f..8117ec68bdd 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lcdf.org/type/${P}.tar.gz"
LICENSE="GPL-2"
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"
+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"
IUSE="+kpathsea"
RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index ea1f332fce7..3d7322d22af 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,4 +1,3 @@
-DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393119c26baf71b8758b5826ba52230526b9c5cd67704aadda07b63a62dfe006db10de1dbae0a73ede1885b03ed0 SHA512 b8d7c92d3dae77f2ccee8e314af4354fefc9f3aaec1566af02c9be2640f11ebf7ea1432334470c5d5dbce39d2ac7c3e9f4074bcf9ee4a502dc59b370a21b54f5
-DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7dcc77bf015c3100f281206424ef334acc1edf2edb6fe31f73aed80b9c3ba6c715d6e97993c5a90dfc1ce42405 SHA512 d402bd46c37d2509c90530e9da0560fa3e5da9002c37a515451a8ab9275576d1af44793a10914e74e804f10a3352439815c6763d2d77e5e41a0e9840286f518e
DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
+DIST lesspipe-2.04.tar.gz 166831 BLAKE2B c33620b1c2714b01a89eaaeaeccfd72e62fd5123270ec84d3e27e914bda8f734758b36ea850126aa1ecd6ab36b9442577ac591024c373bdf6540b95816ed750b SHA512 04312d21c4f45b1630efd597ffafd69fc46ceff1fd5872d296a7811940f9d34da805c4ef4fa543af839de7e8bb4225c6ef5e680e9675eae4f56de669ec975669
+DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
diff --git a/app-text/lesspipe/lesspipe-1.89.ebuild b/app-text/lesspipe/lesspipe-1.89.ebuild
deleted file mode 100644
index bc53c82f7b8..00000000000
--- a/app-text/lesspipe/lesspipe-1.89.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Tests are broken in 1.84, 1.85.
-# Still fragile in 1.88. Passes when lesspipe is not installed.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
-
-src_prepare() {
- default
-
- # Drop a failing test. Not ideal, however:
- # The test suite for this package is pretty fragile; it's more valuable
- # to have _something_ failing/passing overall, than relying on a single
- # test which seems to fail due to an unpredictable external command.
- sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
-}
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build (avoids the "all" target)
- :
-}
-
-src_test() {
- # LC_ALL=C manages to fix one test failure
- LC_ALL=C ./test.pl -d || die "Tests failed!"
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.90.ebuild b/app-text/lesspipe/lesspipe-1.90.ebuild
deleted file mode 100644
index bc53c82f7b8..00000000000
--- a/app-text/lesspipe/lesspipe-1.90.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Tests are broken in 1.84, 1.85.
-# Still fragile in 1.88. Passes when lesspipe is not installed.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
-
-src_prepare() {
- default
-
- # Drop a failing test. Not ideal, however:
- # The test suite for this package is pretty fragile; it's more valuable
- # to have _something_ failing/passing overall, than relying on a single
- # test which seems to fail due to an unpredictable external command.
- sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
-}
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build (avoids the "all" target)
- :
-}
-
-src_test() {
- # LC_ALL=C manages to fix one test failure
- LC_ALL=C ./test.pl -d || die "Tests failed!"
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-1.91.ebuild b/app-text/lesspipe/lesspipe-1.91.ebuild
index ecc7dc9e5b7..39cb02be307 100644
--- a/app-text/lesspipe/lesspipe-1.91.ebuild
+++ b/app-text/lesspipe/lesspipe-1.91.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="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Tests are broken in 1.84, 1.85.
# Still fragile in 1.88. Passes when lesspipe is not installed.
@@ -19,8 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
RESTRICT="test"
DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
+RDEPEND="${DEPEND}"
src_prepare() {
default
diff --git a/app-text/lesspipe/lesspipe-1.85.ebuild b/app-text/lesspipe/lesspipe-2.04-r1.ebuild
index 07996432881..dc26753ae52 100644
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ b/app-text/lesspipe/lesspipe-2.04-r1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=7
-DESCRIPTION="a preprocessor for less"
+inherit bash-completion-r1
+
+DESCRIPTION="A preprocessor for less"
HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+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"
-# Tests are broken in 1.84, 1.85.
# Please check again on bumps!
# bug #734896
RESTRICT="test"
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- !<sys-apps/less-483-r1"
+BDEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
src_configure() {
# Not an autoconf script.
@@ -27,13 +26,16 @@ src_configure() {
}
src_compile() {
- # Nothing to build.
+ # Nothing to build (avoids the "all" target)
:
}
src_install() {
emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
einstalldocs
+
+ rm -r "${ED}"/etc/bash_completion.d || die
+ newbashcomp less_completion less
}
pkg_preinst() {
diff --git a/app-text/lesspipe/lesspipe-2.05.ebuild b/app-text/lesspipe/lesspipe-2.05.ebuild
new file mode 100644
index 00000000000..dc26753ae52
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-2.05.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+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/bash_completion.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/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
index 71115f27526..a62943210fa 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.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
@@ -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 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="doc static-libs"
BDEPEND="
diff --git a/app-text/libebook/libebook-0.1.3-r2.ebuild b/app-text/libebook/libebook-0.1.3-r2.ebuild
index 28eae3a3163..af3d44da21e 100644
--- a/app-text/libebook/libebook-0.1.3-r2.ebuild
+++ b/app-text/libebook/libebook-0.1.3-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 3b3e96693e4..6623d64ea80 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.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=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~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 e8b2ff71f53..b2d0bb4788d 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-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=8
@@ -10,8 +10,7 @@ if [[ ${PV} == *9999 ]]; then
else
MDDS_VER="2.0"
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- # Unkeyworded while libreoffice has no release making use of this slot
- # KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~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-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10.ebuild
index 212b6c2ce43..141836ac119 100644
--- a/app-text/libetonyek/libetonyek-0.1.10.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10.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="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -26,7 +26,7 @@ RDEPEND="
app-text/liblangtag
dev-libs/librevenge
dev-libs/libxml2
- >=dev-util/mdds-1.5:1=
+ >=dev-util/mdds-1.5:1/1.5
sys-libs/zlib
"
DEPEND="${RDEPEND}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 7493c2947bb..85eb33c3055 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
if [[ ${PV} == *9999 ]]; then
- MDDS_VER="9999"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
inherit autotools git-r3
else
- MDDS_VER="2.0"
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -20,6 +18,8 @@ SLOT="0"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
+MDDS_VER="2.0"
+
BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
@@ -28,7 +28,7 @@ RDEPEND="
app-text/liblangtag
dev-libs/librevenge
dev-libs/libxml2
- >=dev-util/mdds-${MDDS_VER}:1=
+ dev-util/mdds:1/${MDDS_VER}
sys-libs/zlib
"
DEPEND="${RDEPEND}
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 30f715c614c..000e00b163d 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,2 +1 @@
-DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
DIST libexttextcat-3.4.6.tar.xz 1111320 BLAKE2B d89b69450a66e8c0f2c4f42ca8d08f2f571d6d7c28e78e43c056c454cee09b95be3f9b32ab445be4c676225b5604535c8948b6942e9c366b94f9773a7b614781 SHA512 5fe7b9b78d2d81b26ba07ce16c6dae490369a0a8b11561cc1260d893c86ef54cf76982751927eed71ac792cdbb47bac0f7acc71939a38c93310ee2bda174448b
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
deleted file mode 100644
index 31d321846aa..00000000000
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library implementing N-gram-based text categorization"
-HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
-SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild b/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
index 0a1f84c140d..a172edef94d 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
@@ -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 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
src_configure() {
econf \
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index a00d54d6d7f..3dc7a2b3c58 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
IUSE="+introspection"
RDEPEND="
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index fd3c9a30603..78e75c1e5a1 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
LICENSE="|| ( LGPL-3 MPL-2.0 )"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="debug doc introspection static-libs test"
BDEPEND="
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 20eba626a22..71840443972 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -1,16 +1,16 @@
-# 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
+inherit autotools flag-o-matic
if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
- inherit autotools git-r3
+ 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 ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
@@ -38,7 +38,9 @@ PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == *9999 ]] && eautoreconf
+
+ # Needed for Clang: stale libtool. bug #832764
+ eautoreconf
}
src_configure() {
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index 2035408ee17..93a7036a4d2 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit flag-o-matic
+inherit autotools flag-o-matic
if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
- inherit autotools git-r3
+ 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"
@@ -36,7 +36,9 @@ DEPEND="${RDEPEND}
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == *9999 ]] && eautoreconf
+
+ # Needed for Clang: stale libtool. bug #832764
+ eautoreconf
}
src_configure() {
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 148a7da2b6c..0331262c6c5 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1 +1 @@
-DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b
+DIST libmwaw-0.3.21.tar.xz 1457212 BLAKE2B 19e0893c186f273f5743a397da895f653cca1300febcac90353951c6ca66405c2481aac6083017f4ec00a31ee0f08e8e77dc579019396e23930a091de2d8903a SHA512 1b6aab4f3e76d1d7a3c15cc175642c62f826172c9fdef558617b87a98d056a05d817caaccdc199197670f84ada448b65cce61f5254ed8e1d7634a637d3367384
diff --git a/app-text/libmwaw/libmwaw-0.3.20.ebuild b/app-text/libmwaw/libmwaw-0.3.21.ebuild
index f78b63dd62c..3c35ea5b1c4 100644
--- a/app-text/libmwaw/libmwaw-0.3.20.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.21.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 ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 0188c3e9fa4..c9ce7a60f58 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1 +1,2 @@
-DIST libnumbertext-1.0.7.tar.xz 289764 BLAKE2B dc7a340dd1843ac77088fd31d4343b570bba0bd5758b939ad228d9d31a7f283ce9c11cf8a504e0c14464bfc6962911b7d1c075122d3efaa7014180a57d419248 SHA512 7755c713dd9b9b75e486eac7ffbfb418c3bdfefd67ecb149f0e25a339410814bf73296f69a4e009a17f9f21292f0eeafa931aef60596cd3d932dab47278de8c2
+DIST libnumbertext-1.0.10.tar.xz 292852 BLAKE2B 1dfc5bd974525a3923325357c30cc80ecac0be856288cfc9effe13a0cda5f45eba22b333b606113bea8dff0bc08333a4b203f539b860ec48e214c35bc4dacb41 SHA512 6cb1b09b43c77f9fe1928d72deabdd06cbb3f7185823fcf045855b26ea6e0e017b2eba9dcd4725161012ed6d37a416c98b838145aa418bd0bd79ce52bf456417
+DIST libnumbertext-1.0.8.tar.xz 292568 BLAKE2B d385f0bdb19013673190533a21305e12211e1427d59503a9b3c54bc1deda27f405dae347c4cc43161766a901ec14c9ea4b0eed17ba468eb0855ef1a6b0ec95c3 SHA512 b29e544eac25a0603ba7fc68744ac54a372402af32f4bbf52f2373b280efce2eb6831c803d0a10e1f674988839f4c123b8a120e2697bcfa2510d3852d856fe2d
diff --git a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
new file mode 100644
index 00000000000..14a4ecfc51f
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_configure() {
+ econf \
+ --disable-werror
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
index 53b9c0af234..33ff29c4d14 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.8.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=7
+EAPI=8
DESCRIPTION="Number to number name and money text conversion libraries"
HOMEPAGE="https://github.com/Numbertext/libnumbertext"
@@ -14,7 +14,6 @@ IUSE=""
src_configure() {
econf \
- --disable-static \
--disable-werror
}
diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild
index e93e04f9333..72cf673a399 100644
--- a/app-text/libodfgen/libodfgen-0.1.8.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild
@@ -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 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index fb8f9a9d49d..77ad5632248 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.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://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
DOCS=( README ChangeLog debian/changelog )
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index b8a7b7ad69f..1b88010e8ba 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.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://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
IUSE="debug doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 45abcebe3af..5a0e02e4ad8 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1 +1,2 @@
+DIST libspectre-0.2.10.tar.gz 436690 BLAKE2B 8c1d25225a212b7e8d2bab7cffa4298509450cf727e38d0be22d27ed5fb161a0f838967afa3f8aa265c2bd243431bbfb92976cf51ee52ee7d3b0479000215546 SHA512 01738f452f99878beaa528b15d8df463ca22d625306d636e1a6199ade9f068d284f1def3882e954a06e5f066937343f79d0c2197fbb19ab53ef1ab0540c72f2f
DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
diff --git a/app-text/libspectre/libspectre-0.2.10.ebuild b/app-text/libspectre/libspectre-0.2.10.ebuild
new file mode 100644
index 00000000000..04e44d862e0
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+RDEPEND=">=app-text/ghostscript-gpl-9.53.0:="
+DEPEND="${RDEPEND}"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug asserts)
+ $(use_enable debug checks)
+ --disable-static
+ --disable-test
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake
+ if use doc; then
+ doxygen || die
+ fi
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/. )
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
index 4e131ee40af..01e24de2504 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-2020 Gentoo Authors
+# Copyright 1999-2021 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 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="debug doc tools"
BDEPEND="
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index ba3e9378cc0..97723936e70 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -1 +1,2 @@
-DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34
+DIST lowdown-0.11.1.tar.gz 571320 BLAKE2B 28fe8cb4f164618be602770c602f3ce51c0f0e765fb9869b82cb29c50bdbe0fd92c09c10074d8968108eca59096d7e176531eb56cb2b40f1d9c00a3f944e3b8c SHA512 5a8ca9d731171b97daed7a9095bc4206d2bed9095fa267eb9270782770247743f1a096c5235fd301320418c37a478fbc71552ade105eba0e756ff687835d4efb
+DIST lowdown-0.11.2.tar.gz 576599 BLAKE2B 579a5257a0c37882c1b5269d8196a974b3ac73be146ba424a129c9421091c462769f065350ede1b8437371141c17c24fa5ac4bdc65f393a92835d6e981c5b181 SHA512 f49ba1358a6de9ab792cf1fb7586e0e326b8ba9a153c234079825534cbdc2d10b6af32d5612b11490b97dbd6c0bea10a79752bf1ad7e7d8af871aa20332fed9e
diff --git a/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
new file mode 100644
index 00000000000..0337f3d68d9
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.10.0-pkgconfig-libmd.patch
@@ -0,0 +1,11 @@
+diff --git a/lowdown.in.pc b/lowdown.in.pc
+index 078d0c0..a31aaac 100644
+--- a/lowdown.in.pc
++++ b/lowdown.in.pc
+@@ -9,5 +9,5 @@ URL: https://kristaps.bsd.lv/lowdown
+ Version: @VERSION@
+ Requires:
+ Libs.private:
+-Libs: -L${libdir} -llowdown -lm
++Libs: -L${libdir} -llowdown -lm -lmd
+ Cflags: -I${includedir}
diff --git a/app-text/lowdown/files/lowdown-0.11.1-linking.patch b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
new file mode 100644
index 00000000000..2aa5cb1fe58
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index ccc163d..d148da6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -173,8 +173,8 @@ installwww: www
+ $(INSTALL) -m 0444 lowdown.tar.gz $(WWWDIR)/snapshots
+ $(INSTALL) -m 0444 lowdown.tar.gz.sha512 $(WWWDIR)/snapshots
+
+-lowdown: liblowdown.a main.o
+- $(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm
++lowdown: liblowdown.so main.o
++ $(CC) -o $@ main.o $(LDADD_MD5) -lm -L. -llowdown $(LDFLAGS)
+
+ lowdown-diff: lowdown
+ ln -f lowdown lowdown-diff
+@@ -183,10 +183,10 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ $(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+
+ liblowdown.so: $(OBJS) $(COMPAT_OBJS)
+- $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-soname,$@.$(LIBVER)
++ $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm -Wl,-soname,$@.$(LIBVER)
+ ln -sf $@.$(LIBVER) $@
+
+-install: bins
++install: bins install_libs
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(MANDIR)/man1
+ mkdir -p $(DESTDIR)$(MANDIR)/man5
+@@ -218,7 +218,7 @@ install_shared: liblowdown.so install_lib_common
+ install_static: liblowdown.a install_lib_common
+ $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
+
+-install_libs: install_shared install_static
++install_libs: install_shared
+
+ distcheck: lowdown.tar.gz.sha512
+ mandoc -Tlint -Werror man/*.[135]
diff --git a/app-text/lowdown/files/lowdown-0.8.4-configure.patch b/app-text/lowdown/files/lowdown-0.8.4-configure.patch
deleted file mode 100644
index ad7bcb69d63..00000000000
--- a/app-text/lowdown/files/lowdown-0.8.4-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c2e2715..4fe977f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -143,7 +143,6 @@ install: all
- $(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- $(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
- $(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
-- $(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
- for f in $(MANS) ; do \
- name=`basename $$f .html` ; \
-diff --git a/configure b/configure
-index d1c16ab..941f185 100755
---- a/configure
-+++ b/configure
-@@ -92,12 +92,12 @@ LDADD_STATIC=
- CPPFLAGS=
- LDFLAGS=
- DESTDIR=
--PREFIX="/usr/local"
-+PREFIX="/usr"
- BINDIR=
- SBINDIR=
- INCLUDEDIR=
- LIBDIR=
--MANDIR=
-+MANDIR="/usr/share/man"
- SHAREDIR=
- INSTALL="install"
- INSTALL_PROGRAM=
diff --git a/app-text/lowdown/lowdown-0.8.4-r1.ebuild b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
index b517049ebd4..203b145ffc6 100644
--- a/app-text/lowdown/lowdown-0.8.4-r1.ebuild
+++ b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
MY_PV="VERSION_${PV//./_}"
DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
@@ -19,15 +19,25 @@ DEPEND="virtual/libcrypt:="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/lowdown-0.8.4-configure.patch"
+ "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+ "${FILESDIR}/lowdown-0.11.1-linking.patch"
)
src_configure() {
- CC="$(tc-getCC)" ./configure || die "./configure failed"
+ append-flags -fPIC
+ tc-export CC AR
+
+ ./configure \
+ PREFIX="/usr" \
+ MANDIR="/usr/share/man" \
+ LDFLAGS="${LDFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LIBDIR="/usr/$(get_libdir)" \
+ || die "./configure failed"
}
src_compile() {
- emake LDFLAGS="${LDFLAGS}" AR="$(tc-getAR)" $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+ emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
}
src_test() {
diff --git a/app-text/lowdown/lowdown-0.11.2.ebuild b/app-text/lowdown/lowdown-0.11.2.ebuild
new file mode 100644
index 00000000000..b1b15bb1dd1
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+ "${FILESDIR}/lowdown-0.11.1-linking.patch"
+)
+
+src_configure() {
+ append-flags -fPIC
+ tc-export CC AR
+
+ ./configure \
+ PREFIX="/usr" \
+ MANDIR="/usr/share/man" \
+ LDFLAGS="${LDFLAGS}" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LIBDIR="/usr/$(get_libdir)" \
+ || die "./configure failed"
+}
+
+src_compile() {
+ emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+ emake regress
+}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index a8738ed240b..fbfe6541cf5 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,2 +1 @@
-DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
DIST mandoc-1.14.6.tar.gz 697150 BLAKE2B e9f6087e9df977901815b1231f68e381502c7392b0ac65a060ce0ef270da3b76540a17931a076b700865a02f9ca1a8ca044a54dbf6318756931c29e6b1deb228 SHA512 54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4
diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
deleted file mode 100644
index 6d976683772..00000000000
--- a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5
-https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
-
-https://bugs.gentoo.org/707254
---- mandoc/compat_reallocarray.c 2014/12/11 09:05:01 1.4
-+++ mandoc/compat_reallocarray.c 2020/06/15 01:37:15 1.5
-@@ -1,8 +1,0 @@
--#include "config.h"
--
--#if HAVE_REALLOCARRAY
--
--int dummy;
--
--#else
--
-@@ -23,6 +15,7 @@ int dummy;
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-+#include "config.h"
-
- #include <sys/types.h>
- #include <errno.h>
-@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size)
- }
- return realloc(optr, size * nmemb);
- }
--
--#endif /*!HAVE_REALLOCARRAY*/
---- mandoc/compat_getline.c 2015/11/07 20:52:52 1.1
-+++ mandoc/compat_getline.c 2020/06/15 01:37:14 1.2
-@@ -1,8 +1,0 @@
--#include "config.h"
--
--#if HAVE_GETLINE
--
--int dummy;
--
--#else
--
-@@ -22,6 +14,7 @@ int dummy;
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-+#include "config.h"
-
- #include <sys/types.h>
- #include <errno.h>
-@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp)
- return pos;
- }
- }
--
--#endif
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
deleted file mode 100644
index e23baa856a5..00000000000
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="https://mdocml.bsd.lv/"
-SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cgi system-man"
-
-RDEPEND="sys-libs/zlib
- system-man? ( !sys-apps/man-db )
-"
-DEPEND="${RDEPEND}
- cgi? ( sys-libs/zlib[static-libs] )
-"
-BDEPEND="
- cgi? ( app-text/highlight )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
- "${FILESDIR}"/${PN}-1.14.5-gcc10.patch
-)
-
-pkg_pretend() {
- if use system-man ; then
- # only support uncompressed and gzip
- [[ -n ${PORTAGE_COMPRESS+unset} ]] && \
- [[ "${PORTAGE_COMPRESS}" == "gzip" || "${PORTAGE_COMPRESS}" == "" ]] || \
- ewarn "only PORTAGE_COMPRESS=gzip or '' is supported, man pages will not be indexed"
- fi
-}
-
-src_prepare() {
- default
-
- # The db-install change is to support parallel installs.
- sed -i \
- -e '/ar rs/s:ar:$(AR):' \
- -e '/^db-install:/s:$: base-install:' \
- Makefile || die
-
- # make-4.3 doesn't like the CC line (bug #706024)
- # and "echo -n" is not portable
- sed \
- -e "s@^\(CC=\).*\$@\1\"$(tc-getCC)\"@" \
- -e 's@echo -n@printf@g' \
- -i configure || die
-
- cat <<-EOF > "configure.local"
- PREFIX="${EPREFIX}/usr"
- BINDIR="${EPREFIX}/usr/bin"
- SBINDIR="${EPREFIX}/usr/sbin"
- LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- MANDIR="${EPREFIX}/usr/share/man"
- INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
- EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
- MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
- CFLAGS="${CFLAGS} ${CPPFLAGS}"
- LDFLAGS="${LDFLAGS}"
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- # The STATIC variable is only used by man.cgi.
- STATIC=
-
- # conflicts with sys-apps/groff
- BINM_SOELIM=msoelim
- MANM_ROFF=mandoc_roff
- # conflicts with sys-apps/man-pages
- MANM_MAN=mandoc_man
-
- # fix utf-8 locale on musl
- $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
- EOF
- use system-man || cat <<-EOF >> "configure.local"
- BINM_MAN=mman
- BINM_APROPOS=mapropos
- BINM_WHATIS=mwhatis
- BINM_MAKEWHATIS=mmakewhatis
- MANM_MDOC=mandoc_mdoc
- MANM_EQN=mandoc_eqn
- MANM_TBL=mandoc_tbl
- MANM_MANCONF=mman.conf
- EOF
- if use cgi; then
- cp cgi.h{.example,} || die
- fi
- if [[ -n "${MANDOC_CGI_H}" ]]; then
- cp "${MANDOC_CGI_H}" cgi.h || die
- fi
-
- # ./configure does not propagate all configure.local
- # settings to Makefile.local settings.
- tc-export AR
-}
-
-src_compile() {
- default
- use cgi && emake man.cgi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- use cgi && emake DESTDIR="${D}" cgi-install www-install
-
- if use system-man ; then
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/mandoc.cron-r0 mandoc
- fi
-}
-
-pkg_postinst() {
- if use system-man ; then
- elog "Generating mandoc database"
- makewhatis || die
- fi
-}
diff --git a/app-text/mandoc/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
index c533b6e8298..5def3a36754 100644
--- a/app-text/mandoc/mandoc-1.14.6.ebuild
+++ b/app-text/mandoc/mandoc-1.14.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 49301d4d54e..625fe3ffedb 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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"
S=${WORKDIR}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index e096d223a55..ce4c4a4519f 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,3 +1,3 @@
DIST master-pdf-editor-5.7.90-qt5.x86_64.tar.gz 15962243 BLAKE2B 4331a5d17ed9a0ff7a70c353907a4c0d5e99db447760f6103d412eabe0064b1e4ac59ca85bb0cab2bffc5867c8ccde96f68e7ceee227b7b319d93b70482f233d SHA512 823c7212cd3d469bb972e7da66e6eada31149c0bab2a6c577e537ca203862d0fe862e8c9b0cbb479eca0557da4b69a91a88ae0c9215d3b5f105288a9c6c1f2bf
-DIST master-pdf-editor-5.8.06-qt5.x86_64.tar.gz 15975595 BLAKE2B 627a4a1f551ffe13917f44768dc6b990d3582a5c2c7d6b7670c94fd880882dcec93c8ccca69240ecb568a7ab20d752180c2981870e5d5671d69c404a7b99c791 SHA512 dd079d11d570909faaf1129342d075550dca3095c5a76748f6f77e2e7df50ec4b46646c5edf40fd2d2f783baaa602fee292dd2fd54ac94fa723e3a40c454e7ad
-DIST master-pdf-editor-5.8.20-qt5.x86_64.tar.gz 16755926 BLAKE2B 7694b825ca846767a0bf776fdd637595d4bd9fe8a9525c2212be7cd186aa230fe6446e157dabdf0a6c2314b49f2a987d2a0b62ac377bec1e3f3e58302668c05d SHA512 006478e65f55e2e24afd9f9581cd3f3ea8cc38c156a7e5c62410fa5bbb94482b627ca4645cbb91d3fdcdda1a779ccda6825107ba65b60b8d50d034b409eabd61
+DIST master-pdf-editor-5.8.33-qt5.x86_64.tar.gz 16917660 BLAKE2B 9461759f75c1c8dde19d5434ce9f404093695385d66777ebe71086a5992ff02830743fb4d87a118605a75f50d53732333a9c51f63acf370c5e53aff04ab47a0c SHA512 e6010a427abe424b0f6c9a6af16280f09445a51c46c62b7c6d58dfb5580cd19486741e9389ef835c33d7ca2e5c1eaffe6b2ccf1046c83c6f7746ba4c446ab28b
+DIST master-pdf-editor-5.8.52-qt5.x86_64.tar.gz 16425989 BLAKE2B 7cb43b2595f32e36a19b7b71ea8d2ddf2ac9e62873f781d45fd4ef2840918d6ee79dc4c23991ae2aa8469fdeaa5b4b2db8ab509609e47079eab3206d2e72c7fb SHA512 c1936eed6c8dc2080d00e0efffcd02782a2dfda321a525d92c82c9e65ea39b140059300359d4d9aabc98d3ba44d07b2a998a6d8f5c7e6a4b3815a85dbd34530a
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.33.ebuild
index 14038cc98d0..f944cce7481 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.8.20.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.33.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
@@ -16,6 +16,7 @@ KEYWORDS="~amd64"
RESTRICT="mirror"
RDEPEND="
+ sys-libs/glibc
>=dev-qt/qtcore-5.12.9:5
>=dev-qt/qtgui-5.12.9:5
>=dev-qt/qtnetwork-5.12.9:5
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.8.52.ebuild
index b6b616512c5..f944cce7481 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.52.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=7
+EAPI=8
inherit desktop xdg
@@ -16,12 +16,14 @@ KEYWORDS="~amd64"
RESTRICT="mirror"
RDEPEND="
- dev-libs/nss
+ sys-libs/glibc
>=dev-qt/qtcore-5.12.9:5
>=dev-qt/qtgui-5.12.9:5
>=dev-qt/qtnetwork-5.12.9:5
>=dev-qt/qtprintsupport-5.12.9:5
>=dev-qt/qtsvg-5.12.9:5
+ dev-qt/qtwidgets:5
+ media-libs/libglvnd
>=media-gfx/sane-backends-1.0
"
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
index 7550548f0e4..f4a8cd62807 100644
--- a/app-text/mathtex/Manifest
+++ b/app-text/mathtex/Manifest
@@ -1,2 +1 @@
-DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
DIST mathtex-1.05.zip 161624 BLAKE2B 9812cfadcc5d47286afb86c6ad38f5bdf932ef39efad2228b04b3b39cbb7543f78be9d82cfa8bbfcc72c9f46fa1931e39aeb71e3abab865dcd60e4e9717e2377 SHA512 f116618de4264efdbccb122b0e9769bbe622f6300266284a96e65f37346c000364063f201b31554bde62a4a4e13c0c8f16d570dca359d3ef27bc0f7622af3715
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
deleted file mode 100644
index ac93ae93133..00000000000
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc"
-HOMEPAGE="http://www.forkosh.com/mathtex.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="png"
-
-RDEPEND="app-text/dvipng
- virtual/latex-base"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-einfo_run_command() {
- einfo "${@}"
- ${@} || die
-}
-
-src_compile() {
- einfo_run_command $(tc-getCC) \
- ${CFLAGS} ${LDFLAGS} \
- -DLATEX=\"/usr/bin/latex\" \
- -DDVIPNG=\"/usr/bin/dvipng\" \
- $(use png && echo "-DPNG") \
- mathtex.c -o mathtex
-}
-
-src_install() {
- dobin mathtex
- dodoc README
- dohtml mathtex.html
-}
-
-pkg_postinst() {
- elog "To use mathtex in your web-pages, just link /usr/bin/mathtex"
- elog "to your cgi-bin subdirectory!"
-}
diff --git a/app-text/mathtex/mathtex-1.05.ebuild b/app-text/mathtex/mathtex-1.05.ebuild
index 9f8ebe06454..47b8d0d3f71 100644
--- a/app-text/mathtex/mathtex-1.05.ebuild
+++ b/app-text/mathtex/mathtex-1.05.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.ctan.org/support/${PN}.zip -> ${P}.zip"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="png"
RDEPEND="app-text/dvipng
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index ecf5facab66..b84995708b5 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -19,7 +19,8 @@ DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b46
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-3.0.10.crate 190580 BLAKE2B 0286717f1bf5315ee97809d0fd7dc860b6b82b83b6fdbd5c5477420bfd7d783583320ebff3548b13b0d7f8f399b11598f9a6a1cb670db0169ada31dd886e0129 SHA512 df152686241d9298b7f0838ad8151bf09a57076105af90ea6cd161c730f7ca978c9046dd3fb34005e0c8b84227bd768e3b5f8969a2cc28b158c84e69892a870f
+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
@@ -50,7 +51,6 @@ DIST futures-task-0.3.16.crate 11712 BLAKE2B 88c095b45590e6b4d645413fdfb82b3be17
DIST futures-util-0.3.16.crate 144642 BLAKE2B 0ce9ebcd85868d6e64622ab498962d8450f7fdb3d15357b77d94409640f6d09803f4ddf6423a118a87231799f0dd495f59ec431e4bd3e823f0decb035f5b43f4 SHA512 21815551e0e22d9fdfbb7ad36daeb3b01bd01c58e85091d0fe08a677141338f68f8754012c9e7b78e031e3baa345927fd05851f20de29fe6155e532bebb19b26
DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
-DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
DIST gitignore-1.0.7.crate 12148 BLAKE2B 730b52920af24a58199c8350e59154b5e71796bc44c54fbff918316dc731712bdc6045730bf9e4060f17a1e589166d17fbeb6715c51bf459b83345ab1383bdf7 SHA512 17b421257ed83cc3fd0a855b5573bd24fdeec13549280bd24b194657f579ce4494d9068aa17f09b1734467aa381289ef465142d349cc5005c7ae44eca917e0a8
@@ -87,7 +87,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.14.tar.gz 1502800 BLAKE2B c1bef8761120bdbdbcbb34454813c620761db16208a935bb0dba39936ca661adc8fbc1cbefc185da7c087de880a8b3c5894536719d01a1376d6d96c72a5539bc SHA512 c45e930e0ff20def1a11e85dbadc3759855fe2a9b5ad63d02d547423abfc16a93d35ff13567ce206274f35e68cf083958cd3caa83a648786e7c32bcfa9bdb6dd
+DIST mdbook-0.4.18.tar.gz 1510868 BLAKE2B 4b47b41fc03fb923891b419098bf553dbbfb0066b1d51bfd58e3cc69e1e686f7bdb5210b6b4cb19f09c35cd6e926ede3378e49debd5a54d838c2028d44186aaa SHA512 f209d8882ff317deb3356a5de0d39c71fe0c51cf80874f0edc56c7ddf46b537c7194c58172dd5f704554bf0724cb0899ecb61b1eeea467226fa83c0679c336f5
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
@@ -107,6 +107,7 @@ DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a7783
DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
DIST opener-0.5.0.crate 12350 BLAKE2B 5992f6d564ae14b609aff2d0415c4d7414a8cafebdccb9ac0b66056cd2968f346d63855d8251b153414115c6c8d8cc91134ab53d6b714df78f2c3c858b22cf8a SHA512 4a9be4d280cc5039d080bfaa318b47a80dfa930f3e60068ca10346aeac421abc8575d7eef3649061847e24ad3a6262fb58ab183f6f2704f429e9674f392c30a7
+DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
@@ -130,7 +131,7 @@ DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e675
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.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
+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
@@ -144,7 +145,7 @@ DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6
DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
@@ -152,8 +153,7 @@ DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c1
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
DIST select-0.5.0.crate 60423 BLAKE2B 96520bd4ce08fdc86836aa7132b92578668795926747900a52d382c8a3fc27a491d9f06454bdc0aa3acf69de20849bb67311be3021a629041a46ae5900b2b232 SHA512 f76fcc87dcba0e2b2804e82e12f744c2a7609080e85dcc6c3eb65ee470ca832d693d3e206c72241d2155112701f0c96a1716f4b666f2e0118b245ec55032d043
-DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
-DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
DIST serde-1.0.129.crate 75300 BLAKE2B a6f1a7df810f3232da585bcff86a7905785f82b2c434a87e2ae7e5cc0dfa8aee2dde47b301fdea17ee885fed54698c607a1334a9faef1a83840b9b111668ba6c SHA512 7c520bd5d9d5ba05c4b696413ab843ba36b22b0a4d8bdb2883eecadd2f69153fa90f57689f861ee5c9ac36536698b7694837cff45c615ec4892fc6b035c25482
DIST serde_derive-1.0.129.crate 54697 BLAKE2B a5921822dbc1761ccf5e5951f60f27e4d2d263491cdddc870acd8cb069bf3194be9099911edc161bc1b037bb4c0551bf8918214d13b52cbb94ab98675dd5b672 SHA512 f4a418a5431a4d9b47f5555e485a81485bc7fa050fe137f8145ac02615cb21ea6d06ffa88e8f2c404341885e51f45750c273382adec1eea20bff9ea7a18b85f7
DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
@@ -166,14 +166,14 @@ DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d
DIST socket2-0.4.1.crate 41364 BLAKE2B 6b1ab3dc342a30467a9579a2dea338e3f5e2a73745f68cd65ee4f34cec390ad67794d2e32d21b01675ed6ce2136c8faa07ea7b8e262a5848cc9b1320e1e53a2b SHA512 71eb3e8d15cf4e88f801d740230710b5b52ff1434526c0e61e950168979ee715dd8acec217d1a5d6f50fa49536558ef94115902f936302d81737eb163db4b8c4
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.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+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.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
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
@@ -196,11 +196,9 @@ DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4
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-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
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
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
diff --git a/app-text/mdbook/mdbook-0.4.14.ebuild b/app-text/mdbook/mdbook-0.4.18.ebuild
index 3141df3501a..c10d0f673b2 100644
--- a/app-text/mdbook/mdbook-0.4.14.ebuild
+++ b/app-text/mdbook/mdbook-0.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,7 +25,8 @@ CRATES="
cfg-if-0.1.10
cfg-if-1.0.0
chrono-0.4.19
- clap-2.33.3
+ clap-3.0.10
+ clap_complete-3.0.4
cpufeatures-0.1.5
ctor-0.1.20
difference-2.0.0
@@ -56,7 +57,6 @@ CRATES="
futures-util-0.3.16
generic-array-0.12.4
generic-array-0.14.4
- getopts-0.2.21
getrandom-0.1.16
getrandom-0.2.3
gitignore-1.0.7
@@ -112,6 +112,7 @@ CRATES="
opaque-debug-0.2.3
opaque-debug-0.3.0
opener-0.5.0
+ os_str_bytes-6.0.0
output_vt100-0.1.2
percent-encoding-2.1.0
pest-2.1.3
@@ -135,7 +136,7 @@ CRATES="
proc-macro-hack-0.5.19
proc-macro-nested-0.1.7
proc-macro2-1.0.28
- pulldown-cmark-0.8.0
+ pulldown-cmark-0.9.1
quick-error-1.2.3
quick-error-2.0.1
quote-1.0.9
@@ -149,7 +150,7 @@ CRATES="
rand_hc-0.3.1
rand_pcg-0.2.1
redox_syscall-0.2.10
- regex-1.5.4
+ regex-1.5.5
regex-automata-0.1.10
regex-syntax-0.6.25
remove_dir_all-0.5.3
@@ -157,8 +158,7 @@ CRATES="
same-file-1.0.6
scoped-tls-1.0.0
select-0.5.0
- semver-0.11.0
- semver-parser-0.10.2
+ semver-1.0.4
serde-1.0.129
serde_derive-1.0.129
serde_json-1.0.66
@@ -171,14 +171,14 @@ CRATES="
socket2-0.4.1
string_cache-0.8.1
string_cache_codegen-0.5.1
- strsim-0.8.0
+ 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.11.0
+ textwrap-0.14.2
time-0.1.43
tinyvec-1.3.1
tinyvec_macros-0.1.0
@@ -201,18 +201,16 @@ CRATES="
unicode-bidi-0.3.6
unicode-normalization-0.1.19
unicode-segmentation-1.8.0
- unicode-width-0.1.8
unicode-xid-0.2.2
url-2.2.2
utf-8-0.7.6
- vec_map-0.8.2
version_check-0.9.3
wait-timeout-0.2.0
walkdir-2.3.2
want-0.3.0
warp-0.3.1
- wasi-0.9.0+wasi-snapshot-preview1
wasi-0.10.2+wasi-snapshot-preview1
+ wasi-0.9.0+wasi-snapshot-preview1
winapi-0.2.8
winapi-0.3.9
winapi-build-0.1.1
@@ -233,7 +231,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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~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 68305e1647f..0caf6327ca0 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-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="6"
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="static-libs unicode"
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53-r1.ebuild
index 62a6fff19ef..7165b1210a0 100644
--- a/app-text/msort/msort-8.53.ebuild
+++ b/app-text/msort/msort-8.53-r1.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=7
+EAPI=8
inherit autotools
diff --git a/app-text/multitail/multitail-6.4.2-r1.ebuild b/app-text/multitail/multitail-6.4.2-r1.ebuild
index 8c10123313f..8f3629c5129 100644
--- a/app-text/multitail/multitail-6.4.2-r1.ebuild
+++ b/app-text/multitail/multitail-6.4.2-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
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug examples unicode"
RESTRICT="test" # bug 492270
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index acda2b0eb4e..5c05a175105 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1 +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
diff --git a/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
new file mode 100644
index 00000000000..b266655aaec
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-Makefile.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile b/Makefile
+index 7fa74b3..e842374 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+
+ ifndef build
+- build := release
++ build := debug
+ endif
+
+ default: all
+@@ -252,17 +252,19 @@ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ else
+-MUPDF_LIB = $(OUT)/libmupdf.a
++MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
+ LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB)
+-THIRD_LIB = $(OUT)/libmupdf-third.a
++THIRD_LIB =
++MUPDF_STATIC = $(OUT)/libmupdf.a
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+ THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+ endif
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
+-$(THIRD_LIB) : $(THIRD_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
diff --git a/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch
new file mode 100644
index 00000000000..643b6d2c8b1
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-cross-fixes.patch
@@ -0,0 +1,130 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
++++ b/Makefile
+@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+
++$(HEXDUMP_EXE): scripts/hexdump.c
++ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
++++ b/Makerules
+@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ WARNING_CFLAGS := -Wall -Wsign-compare
+
+ # Feature configuration options
+@@ -156,51 +159,51 @@ else ifeq ($(OS),MACOS)
+ endif
+ endif
+
+- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+ endif
+- ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+- SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+- SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++ ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++ SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++ SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+ endif
+- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+ endif
+- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+ endif
+- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+ endif
+- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+ endif
+- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+ endif
+
+- HAVE_SYS_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++ HAVE_SYS_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
+ ifeq ($(HAVE_SYS_LEPTONICA),yes)
+- SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+- SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
++ SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
++ SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
+ endif
+
+- HAVE_SYS_TESSERACT := $(shell pkg-config --exists 'tesseract >= 4.0.0' && echo yes)
++ HAVE_SYS_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract >= 4.0.0' && echo yes)
+ ifeq ($(HAVE_SYS_TESSERACT),yes)
+- SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+- SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
++ SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
++ SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
+ endif
+
+- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+ ifeq ($(HAVE_SYS_CURL),yes)
+- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+ endif
+
+ HAVE_GLUT := yes
+@@ -209,16 +212,16 @@ endif
+ SYS_GLUT_LIBS := -lglut -lGL
+ endif
+
+ HAVE_X11 := not-unless-portage-tells-me
+ ifeq ($(HAVE_X11),yes)
+- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+- X11_LIBS := $(shell pkg-config --libs x11 xext)
++ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+ endif
+
+ HAVE_LIBCRYPTO := not-unless-portage-tells-me
+ ifeq ($(HAVE_LIBCRYPTO),yes)
+- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+ endif
+
+ HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.19.0-darwin.patch b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch
new file mode 100644
index 00000000000..a81c7a008e4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.19.0-darwin.patch
@@ -0,0 +1,39 @@
+--- a/Makerules
++++ b/Makerules
+@@ -139,11 +139,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+ HAVE_GLUT := yes
+ SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+- SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+- CC = xcrun cc
+- AR = xcrun ar
+- LD = xcrun ld
+- RANLIB = xcrun ranlib
++ SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++ CC ?= xcrun cc
++ AR ?= xcrun ar
++ LD ?= xcrun ld
++ RANLIB ?= xcrun ranlib
+
+ ifeq (, $(shell which pkg-config))
+ $(warning "No pkg-config found, install it for proper integration of libcrypto")
+@@ -154,9 +154,7 @@ else ifeq ($(OS),MACOS)
+ LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
+ endif
+-
+-else ifeq ($(OS),Linux)
+- HAVE_OBJCOPY := yes
++endif
+
+ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+@@ -229,8 +227,6 @@ else ifeq ($(OS),Linux)
+ PTHREAD_LIBS := -lpthread
+ endif
+
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 115e9d64a66..5d2f87cc317 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>rndxelement@protonmail.com</email>
+ <name>Philipp Rösner</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild
new file mode 100644
index 00000000000..6dfeb8c2ecc
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.19.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.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="X? ( x11-base/xorg-proto )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ "${FILESDIR}"/${PN}-1.19.0-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+}
+
+_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 "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild
new file mode 100644
index 00000000000..6fb20816830
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.19.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.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=
+ >=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= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ "${FILESDIR}"/${PN}-1.19.0-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+}
+
+_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 "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mythes/mythes-1.2.4-r1.ebuild b/app-text/mythes/mythes-1.2.4-r1.ebuild
index da748d27b52..bd7896cb0b5 100644
--- a/app-text/mythes/mythes-1.2.4-r1.ebuild
+++ b/app-text/mythes/mythes-1.2.4-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="app-text/hunspell"
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index e7f92bafe55..358784e45e6 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,2 +1 @@
-DIST nfoview-1.27.1.tar.gz 60211 BLAKE2B 777d9f42a08a17d3790996ff76819a0b74c6e1f01625019259524e6e5cee9afc72ae463085071e4a23cefeebaf5b14f1bbeae949446356ed1aaebebaaf53e230 SHA512 7066995954997a20aec27ff820c0f0a067835e219f9029f696b2885a85c4714b32fc8d474291433f64d9b28e81e5f4c24989a6447affc7b206cef453342a05d2
-DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff7315765187920dc5821de7d717f3381b6126263585a23fdb7847403ae992ee98b7503f7313a312adb0e6b2fb992e69da4a8 SHA512 652ed3a5dd3cad547c6c0f93a0c686c42e9fc58e2f90a682432cbcb865a1b6ab6cb55424ed68128718c0c867ad353d170ecf54619f7006445cb9761bced2bbd3
+DIST nfoview-1.28.1.tar.gz 62571 BLAKE2B 5ecfd83e9429f3d616d9b633a5f3042308df06253065946ea13c66f71dd937a2325f252e04812894d000fea3364337378c4d91b2c54ee530c9d225ce7752dc90 SHA512 55179791b1a8058777a8a8527758687ab5924e00086d1c85a95759d85eb65ec46f072ba5bd5521629f39737437002eb6cf4070bc25b0e9246c511c32c6b08e99
diff --git a/app-text/nfoview/nfoview-1.27.1.ebuild b/app-text/nfoview/nfoview-1.27.1.ebuild
deleted file mode 100644
index 446109f53d4..00000000000
--- a/app-text/nfoview/nfoview-1.27.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
- sys-devel/gettext"
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- media-fonts/terminus-font"
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.28-r1.ebuild b/app-text/nfoview/nfoview-1.28.1-r1.ebuild
index eccd3ea00f3..227f00ed1ed 100644
--- a/app-text/nfoview/nfoview-1.28-r1.ebuild
+++ b/app-text/nfoview/nfoview-1.28.1-r1.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
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 virtualx xdg
@@ -29,12 +29,13 @@ RDEPEND="${DEPEND}
media-fonts/cascadia-code
x11-libs/gtk+:3[introspection]"
+EPYTEST_DESELECT=(
+ "nfoview/test/test_util.py::TestModule::test_show_uri__unix"
+ "nfoview/test/test_util.py::TestModule::test_show_uri__windows"
+)
+
distutils_enable_tests pytest
-python_test() {
- local deselect=(
- --deselect 'nfoview/test/test_util.py::TestModule::test_show_uri__unix'
- --deselect 'nfoview/test/test_util.py::TestModule::test_show_uri__windows'
- )
- virtx epytest "${deselect[@]}"
+src_test() {
+ virtx distutils-r1_src_test
}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
deleted file mode 100644
index c619ae9688c..00000000000
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-BDEPEND="${PYTHON_DEPS}
- sys-devel/gettext"
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- media-fonts/cascadia-code"
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 36441ef368c..4a4c9bff949 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -5,3 +5,4 @@ DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e
DIST nuspell-4.2.0.tar.gz 382635 BLAKE2B cc141e764ce4e649a7a10f213c392973eb98eb21adddc7d2cd46c01f3cc9a6c85432bfb13ce178fba387a01aa1661e7c9b6a4717fca18fb3bfa220732daf53eb SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d
DIST nuspell-5.0.0.tar.gz 372940 BLAKE2B 67e3b9b73f79d39c7cdb371ae7699fdaf8323db15dacd17907642f3d799eeb3e3303678d4a9ee4c5a88a5f61d7f1778745590fbac880625dc08c78e94752da6b SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5
DIST nuspell-5.0.1.tar.gz 372917 BLAKE2B 30743620035fa49b9d2d190673de1b3de4be0978633eeead1775586c5ab4f0912e4f778867b5839105d1b4f4597e8a2ece33ddbb3290b6447755bfe4a742ea5c SHA512 f883d8c8a3a722a62d411d7b0973dd409c6d09d08ea678c577cef68ec8b5c7e4a4e4cb8a1323e632114414fc17137d1add996a72fbd522ab4de8c6f70fc77073
+DIST nuspell-5.1.0.tar.gz 370368 BLAKE2B 67338fe79ddb98267e0c1efc575e47fc1a8f894cd09b6ada6c6a3f5e89b02fe3a81686b1ff1af73e28fd86437d0f115e04fd5f5aea1954c3da4414f25325ec46 SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a
diff --git a/app-text/nuspell/nuspell-3.1.2.ebuild b/app-text/nuspell/nuspell-3.1.2-r1.ebuild
index 57cbf24e8c7..f0fd181ee33 100644
--- a/app-text/nuspell/nuspell-3.1.2.ebuild
+++ b/app-text/nuspell/nuspell-3.1.2-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
@@ -16,9 +16,9 @@ IUSE="doc test"
RDEPEND="dev-libs/icu"
DEPEND="${RDEPEND}
- doc? ( app-text/ronn )
test? ( >=dev-cpp/catch-2.3.0:0 )
>=dev-libs/boost-1.62[icu,nls]"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
DOCS=( CHANGELOG.md )
diff --git a/app-text/nuspell/nuspell-4.0.0.ebuild b/app-text/nuspell/nuspell-4.0.0-r1.ebuild
index b7de7c6dd8c..fa2f0d78afd 100644
--- a/app-text/nuspell/nuspell-4.0.0.ebuild
+++ b/app-text/nuspell/nuspell-4.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
@@ -16,9 +16,9 @@ IUSE="doc test"
RDEPEND="dev-libs/icu"
DEPEND="${RDEPEND}
- doc? ( app-text/ronn )
test? ( >=dev-cpp/catch-2.3.0:0 )
>=dev-libs/boost-1.62[icu,nls]"
+BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
DOCS=( CHANGELOG.md )
diff --git a/app-text/nuspell/nuspell-5.1.0.ebuild b/app-text/nuspell/nuspell-5.1.0.ebuild
new file mode 100644
index 00000000000..7ce026ab194
--- /dev/null
+++ b/app-text/nuspell/nuspell-5.1.0.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-2.3.0: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/ocrad/Manifest b/app-text/ocrad/Manifest
index 86555c36086..e2db2e2b29d 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,2 +1 @@
-DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 553d68b0ca0..7dd28abde31 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/metadata.xml
@@ -1,10 +1,7 @@
<?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-needed -->
<longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
program impleme nted as a filter and based on a feature extraction
method. It reads a bitmap ima ge in pbm format and outputs text in
diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild
deleted file mode 100644
index 8a51b1c5243..00000000000
--- a/app-text/ocrad/ocrad-0.26.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
- # ./configure is not based on autotools
- ./configure \
- CPPFLAGS="${CPPFLAGS}" \
- CXX="$(tc-getCXX)" \
- CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- --prefix=/usr || die
-}
-
-src_install() {
- default
- doman doc/${PN}.1
- doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.27.ebuild b/app-text/ocrad/ocrad-0.27.ebuild
index d7001dd7c77..be1acd75228 100644
--- a/app-text/ocrad/ocrad-0.27.ebuild
+++ b/app-text/ocrad/ocrad-0.27.ebuild
@@ -13,9 +13,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-DEPEND="$(unpacker_src_uri_depends)"
+BDEPEND="$(unpacker_src_uri_depends)"
-DOCS="AUTHORS ChangeLog NEWS README"
+DOCS=( AUTHORS ChangeLog NEWS README )
src_configure() {
# ./configure is not based on autotools
@@ -27,8 +27,13 @@ src_configure() {
--prefix=/usr || die
}
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
src_install() {
default
+
doman doc/${PN}.1
doinfo doc/${PN}.info
}
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index caab0f225c9..95b3e296cfc 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.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
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
LICENSE="MIT"
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 ~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 ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index d1a4c5128f4..b9bc8ffa071 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,2 +1,2 @@
-DIST openpaperwork-core-2.0.2.tar.gz 67268 BLAKE2B 85fcd8d4e1c8a054267b28eb5ec826617e13f93bf7cd54d6defffd62be65fb0306a0ae4fadb1cc8e875c23933c3559e41aab46b58a333489fed0174776ede597 SHA512 fb47d1d8b7747274a6b60248180786f4142110feffa1a8f886b0486a1e1cefbe11d06e3ec1f3a3ee33e38cd40d8e7460afefb466ee938e847deb2518d642ed00
-DIST openpaperwork-core-2.0.3.tar.gz 82231 BLAKE2B d113324f5f0f03d0a7c1c9f28bc4bdfa8dc296104f4f7aef4f172ba9ff94bc02caad928aa3db0f314df64935052b6dc4995b8d6e78e2c33367b080321414f40d SHA512 613e1b07b0ef4be3a429cc88f1fed41d1d79adab0cad70ee4e1d74c06cb8917c7fc6f8d2ffca5fcc95f97fb5c0690cdc21aa5cf7966e19cfb5ae5d2ab0fec6f3
+DIST openpaperwork-core-2.1.0.tar.gz 105113 BLAKE2B a9f37bab4e5af8bb2bbdca2c6785086962d78d0c27791b42a81b5a246152572c987f174bfd501aa9d25e9548b1e17c98115736f2403eb5669d758aa6552d4ccc SHA512 3fd92928416763cedec86de01fdb610b5826a76a092c996451f70f3d6959fc946dcdfce27f3d746b1eee1d5a38a09c4f5161572c72f5d3e0ef471e3af18dac1c
+DIST openpaperwork-core-2.1.1.tar.gz 115580 BLAKE2B a6abd47967b1f94e41d2c491cbbaead3cc2c509e1dc980269e5575d2c08e0a30d50357b5e42ba56569f35b44a470992e45994413dddefd63ba65f8018853a939 SHA512 ef7917dcc0c2520ff63c776b170770a936743fbc8ff2a15993bae7090ef43aa76e66b787aeee6f6d43961fac2f67ebeaf8ba4eb93a912ecfe93567e3c78ed219
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.0.ebuild
index eea70cb4481..b9ca373fcbf 100644
--- a/app-text/openpaperwork-core/openpaperwork-core-2.0.3.ebuild
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.1.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild
index eea70cb4481..cdfc38ca447 100644
--- a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.1.1.ebuild
@@ -1,9 +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
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
index 66264cb1a60..2e300559409 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST openpaperwork-gtk-2.0.2.tar.gz 37740 BLAKE2B 40e1570364dd23cda97184211205186dadf7826624c1d8846a7fb31378fdf0ea9aa715c07adbf657eea9b08f4c583d86eb248b8907317b572bea51ac52c9a54b SHA512 c24f19a47f1ea1452f8efcf5cf1e4492f49a4f1c7fa7572f09341f4a8f70c2e9cfea478c32635d4ad998be90a069a55c4fe2a4c0e12a9835b9fa7e6b707494d7
-DIST openpaperwork-gtk-2.0.3.tar.gz 50590 BLAKE2B 69fd8b9b6b964a375e511dd7ef535a8fea58e6183165a4b7b96239a6a35486f791ca9fc8aced7a5b84cc21cc1ccab12c114276de87e1d1cf55b2565dc44da7fc SHA512 8da5651b7d949dfb4fa32ef84760530bba6d718674e6616ae80d1a274ae51cf5e28a55f7e08fc34e4681f61de8aef9d2094f2c4aa4862f8989b7c81da47e48c8
+DIST openpaperwork-gtk-2.1.0.tar.gz 57327 BLAKE2B 13f3f0ded868948a9b489629e12c56625ce85aa13617fa72a40fa80b7182587340a295631a898e69267ace1df3ef75529e1e2b9d8654131d67224868aefba172 SHA512 73bd7e12c804d2e31920f16f8d2b48ff4d6e387d8982573c1960851b1b6d082ae4961aa163059831b0698d8072a4f9374f9c0b5b3deb52534ed6aa2734e7f916
+DIST openpaperwork-gtk-2.1.1.tar.gz 57893 BLAKE2B 387e04fe0e280f8ac4b8ed7d1c94c2fd8c76d556ee8f7ed7e76e7a1c298e8323664511538c947da4d460e5626cc8b7e3da984360467b96add50ca0c9a77075eb SHA512 0250c457639068a8b6e95f98570872340a145d5b6939d00f9a33139a7c539978e5591dda148e1d3fbedc366f9a0a58ddfb89510374c7b135bcf1550ec744857e
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.0-r1.ebuild
index 5bf52d2c9f6..9ad618a87c2 100644
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.0-r1.ebuild
@@ -1,9 +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
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -19,5 +19,6 @@ IUSE=""
RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gui-libs/libhandy
x11-libs/gtk+:3[introspection]"
DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild
index 5bf52d2c9f6..9ad618a87c2 100644
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.3.ebuild
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.1.ebuild
@@ -1,9 +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
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -19,5 +19,6 @@ IUSE=""
RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
+ gui-libs/libhandy
x11-libs/gtk+:3[introspection]"
DEPEND="${RDEPEND}"
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r7.ebuild
index c3e31ea99fd..9f6b4f539bb 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r7.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit epatch flag-o-matic autotools
+EAPI=8
+
+inherit autotools flag-o-matic
MY_P=${P/opensp/OpenSP}
DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
HOMEPAGE="http://openjade.sourceforge.net/"
SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
LICENSE="MIT"
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="doc elibc_glibc nls static-libs test"
+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="doc nls static-libs test"
RESTRICT="!test? ( test )"
-RDEPEND="
- elibc_glibc? ( net-libs/libnsl:0= )
-"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
+RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
doc? (
app-text/xmlto
app-text/docbook-xml-dtd:4.1.2
@@ -31,11 +31,13 @@ DEPEND="${RDEPEND}
app-text/sgml-common
)"
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-segfault.patch
+ "${FILESDIR}"/${P}-c11-using.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-segfault.patch
- epatch "${FILESDIR}"/${P}-c11-using.patch
+ default
use prefix && eautoreconf
}
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 5371758ce59..3ca1895164f 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,2 +1,2 @@
-DIST paperwork-backend-2.0.2.tar.gz 1293642 BLAKE2B 3785f69e941c14c1146ff1c9a5afa149559821f915ff1068b38f94c3fc3fbd591c2144f24070232e885b616eeb88b5dd1a7c86d608d9ad42f6512688db79b1fe SHA512 36261b89078e7ca10ddda3ad03871db34931d8a04f16edd663873a2f7c46b527bd607c27d0f4ff005ed869c16e0b7065992e629e257677b46d5ccb4b9a1dc7b2
-DIST paperwork-backend-2.0.3.tar.gz 1315449 BLAKE2B b5f788d1f3dd02ae9693ffbde6909fb343d5d68555c2d7225300371d545fc96550a34d5214b7b68594e6c5558aad6c50b38de26e444a7a2ca4f9318a7fbc4c84 SHA512 ed705910a09aedc124d6f14c1fd6d76d5e3790d2d01363bcea3cbb28955c1a08725276f09828ce1e286df06d7310b78630b95201146940d1680395c6420190a6
+DIST paperwork-backend-2.1.0.tar.gz 1352553 BLAKE2B 84bf9f34be50c2cd762c1afb496e4625bed50018242e94925ad4d5428228fadc9ac8d3866f8fbb9f0a78d049599048db62c6d7201852638cc5ad0674ebc791f0 SHA512 72cf3176091d899433a50d8a166a2505f0be9e5917df311a6f5139af472363df427102dcde99e6097b11f6aa26571bdaba06047fafd2365b4dedec0d3a47da7a
+DIST paperwork-backend-2.1.1.tar.gz 1383107 BLAKE2B 0e814a829581fe6322cc0ae44e9e3a20a2fc066e9be5de038c4d08b9d85218961ca87777271ebc646b03425e78017109ddf35c05a4b11e8fcc3bb4b6d10a6273 SHA512 ab75aaf01571eaa52a283ac6e1b9ff080d09e2514e1efb98bc96e9986acf85ec2ab2d94fc27ba15230370c642e39fddf6e11922a3d18b16af38f4281ff9c628f
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
index 111e95df603..b20acac9dac 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.0.3.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
index 6b3c1b66ea7..03be19a641d 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.0.2-r1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
@@ -1,9 +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
DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -26,7 +26,7 @@ RDEPEND="app-text/poppler[introspection]
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-levenshtein[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
dev-python/termcolor[${PYTHON_USEDEP}]
- dev-python/whoosh[${PYTHON_USEDEP}]"
+ dev-python/whoosh[${PYTHON_USEDEP}]
+ sci-libs/scikit-learn[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 7f7bd954b94..1cb0077b96e 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,2 +1,2 @@
-DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853
-DIST paperwork-2.0.3.tar.gz 6224520 BLAKE2B 099d76893b0b89e5f7914456ec31346f28335333361a4528efed6ab4c596fa24893d375557d6c1e89f7c83f4a1acac161004138b7e1537aa2f3cb2de0460bcc3 SHA512 d5cf30ef8a6011817947c9878d4defe93a0c82f77562fd707c198d944657db754ba57d703ae3f931ac9e2d7f9f1eb7f9f9093a1d26f25dac0e336b03f9b25ed3
+DIST paperwork-2.1.0.tar.gz 5887310 BLAKE2B a28229c73342769fe004be38d5782c6e29d3893bf1fbdd8ccac9790057e2af0b01ef0ad6719310a40d609811efd6c13c7b3761bb9d5feab91a6127eca1526a3a SHA512 4362b7feba917017d5c04cbfaf3d77a2619b7431f2687800f112ecac2edc48604f8bca8d4e6defd09bae1c69c6dfc3e1f22327166aa3563eb6b2c575827e536c
+DIST paperwork-2.1.1.tar.gz 5886436 BLAKE2B 5fd5a8a5d45a39298d3bc905360544f695c8c1ffa6e4bac56f3ec7bb9f31842aa71e2dadf0c8f072da59065f15fe5e768e42b8a1574722dfb99f66cc24c5b038 SHA512 e2164dc54eacb6153182c073e15f0605ec2131e17fa1c508d4923d37c1848c286d36807994ce07de99fb9cc5da012c111d84768c2c7c876dfb163811995b10c0
diff --git a/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch b/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
deleted file mode 100644
index 0fbad956449..00000000000
--- a/app-text/paperwork/files/paperwork-2.0.3-desktop_file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py paperwork-2.0.3/src/paperwork_gtk/cmd/install.py
---- paperwork-2.0.3.orig/src/paperwork_gtk/cmd/install.py 2021-02-05 17:46:17.000000000 +0100
-+++ paperwork-2.0.3/src/paperwork_gtk/cmd/install.py 2021-05-30 12:26:21.316348652 +0200
-@@ -122,8 +122,6 @@
- # PDF and all image formats supported by pillow
- entry.set("MimeType",
- "application/pdf;"
-- "image/png;"
-- "image/jpeg;"
- "image/bmp;"
- "image/gif;"
- "image/ico;"
diff --git a/app-text/paperwork/paperwork-2.0.3.ebuild b/app-text/paperwork/paperwork-2.1.0.ebuild
index 3095f01e5a0..4167c0385cf 100644
--- a/app-text/paperwork/paperwork-2.0.3.ebuild
+++ b/app-text/paperwork/paperwork-2.1.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 xdg
@@ -26,19 +26,17 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
media-libs/libinsane
x11-libs/libnotify[introspection]"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-desktop_file.patch )
-
python_install_all() {
distutils-r1_python_install_all
# This queries tesseract languages and will fail sandbox with
- # USE=opencl, bug #793446
+ # USE=opencl, bugs #793446 #830012
addpredict /dev/nvidiactl
+ addpredict /dev/kfd
PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
--icon_base_dir="${ED}"/usr/share/icons \
diff --git a/app-text/paperwork/paperwork-2.0.2.ebuild b/app-text/paperwork/paperwork-2.1.1.ebuild
index d106fb32559..27169a2d1a1 100644
--- a/app-text/paperwork/paperwork-2.0.2.ebuild
+++ b/app-text/paperwork/paperwork-2.1.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} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
+inherit distutils-r1 xdg
DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
@@ -24,9 +24,20 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
dev-python/pyenchant[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/simplebayes[${PYTHON_USEDEP}]
media-libs/libinsane
x11-libs/libnotify[introspection]"
DEPEND="${RDEPEND}"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # This queries tesseract languages and will fail sandbox with
+ # USE=opencl, bugs #793446 #830012
+ addpredict /dev/nvidiactl
+ addpredict /dev/kfd
+
+ PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
+ --icon_base_dir="${ED}"/usr/share/icons \
+ --data_base_dir="${ED}"/usr/share
+}
diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
deleted file mode 100644
index e7dae3ff3ca..00000000000
--- a/app-text/pdf2oo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pdf2oo-20090715.tar.gz 14765 BLAKE2B b84b34f4c932468d26ca6f53b596f762ec098fedfee22f1dc568e27a41c7ea9df32cc645a1f2ffd1469441ef579a11f31840fd9ed536853aacdef1f1593f4aeb SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5
diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
deleted file mode 100644
index a639e8828d9..00000000000
--- a/app-text/pdf2oo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">pdf2oo</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild b/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
deleted file mode 100644
index 9db50ba4886..00000000000
--- a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts pdf files to odf"
-HOMEPAGE="https://sourceforge.net/projects/pdf2oo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/zip
- >=app-text/poppler-0.12.3-r3[utils]
- virtual/imagemagick-tools"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- dobin pdf2oo
- dodoc README
-}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 035901446ec..03630e69ae7 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,3 +1 @@
-DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
-DIST pdfarranger-1.7.0.tar.gz 236125 BLAKE2B f16eb23fb597a22a48f075ee6435c74d51a4c45d35e03ec02b2b2353c29ad327f36f6af9ef028ddc53777ecae069e62437728308cda2a6296bd520c2a54e1220 SHA512 8f3c804119d5e4aa78cdae1964757be3404977a68dacccddea0e3e598c531a0ae163567709358ccd60764bebf3a55b5ed1bfbd2e0392c97569ffd9a18f549552
-DIST pdfarranger-1.7.1.tar.gz 236699 BLAKE2B b82a1f2309cc326bfba33458aaccee5396597a5c937c67baba767632cadddfae4f7ad21e0c86300c889f8e6d5f7dba9c6483b11bc97c83077e5ab01596b76617 SHA512 1adb5700b6497db95c3f727d1c18fc7b98ecc382cf15bc58bb7ce784d094e0d8cd45a26241e06a593eeb7601aa9f32ebba7d7f0f3a816e9384be09102eb0b4db
+DIST pdfarranger-1.8.2.tar.gz 258995 BLAKE2B 019d41e6c89ee4e7a93bd4be9aa593bebf00c3489bae5db46f201e519e7dbd6c011ac5b15ba6450906a8e8ef8610dc9083c32b01fb88828281c0206e32c9d601 SHA512 e0b1ed59158681766e6b707a207363a8ccd38bdc76311600d338ef443e0ee79405af6afb65b878a68d7e52d2ea35f6a7aa700d9aaf46b31bcf64fd863c8784f2
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
deleted file mode 100644
index 628b8bc4e6f..00000000000
--- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature xdg-utils 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[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
- 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() {
- optfeature "image file import" media-gfx/img2pdf
-
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/pdfarranger/pdfarranger-1.7.0.ebuild b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
deleted file mode 100644
index 7fe6453a815..00000000000
--- a/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature xdg-utils 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[${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() {
- optfeature "image file import" media-gfx/img2pdf
-
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/pdfarranger/pdfarranger-1.7.1.ebuild b/app-text/pdfarranger/pdfarranger-1.8.2.ebuild
index c10d59ca846..68059a57f5c 100644
--- a/app-text/pdfarranger/pdfarranger-1.7.1.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.8.2.ebuild
@@ -1,13 +1,13 @@
-# 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
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature xdg-utils desktop
+inherit distutils-r1 optfeature xdg desktop
-DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
+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"
@@ -37,15 +37,6 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
optfeature "image file import" media-gfx/img2pdf
-
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
}
diff --git a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
index 444d6258b3d..22c87a31ea4 100644
--- a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.pdfgrep.org/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
IUSE="+pcre test unac"
RESTRICT="!test? ( test )"
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index f8c634b6d05..1429103931c 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1 +1,2 @@
DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
+DIST pdfminer-20220506.tar.gz 10853104 BLAKE2B b6008db789973fb69537801b8e928761bd0a949cc72ddf380fd71b6373913f6a689b71bee159e6991e99c196b7e8a1fac5530d2bf9c577e53b8b556bed00b85a SHA512 b81916c70f22f3408cf41a50d35937f950ee6205f59fa03603bc7a78d1b1b037311ebaf5661f6d46b9d4190f2f56189fc28b714463dc5854328c14f97fbc28c4
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
index be0a94d38c1..4246c8804ba 100644
--- a/app-text/pdfminer/metadata.xml
+++ b/app-text/pdfminer/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="pypi">pdfminer</remote-id>
+ <remote-id type="github">pdfminer/pdfminer.six</remote-id>
+ <remote-id type="pypi">pdfminer.six</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/pdfminer/pdfminer-20220506.ebuild b/app-text/pdfminer/pdfminer-20220506.ebuild
new file mode 100644
index 00000000000..6be430cfc7c
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20220506.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+MY_P="${PN}.six-${PV}"
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="https://pdfminersix.readthedocs.io/en/latest/"
+# Release tarballs lack tests
+#SRC_URI="https://github.com/pdfminer/pdfminer.six/releases/download/${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/pdfminer/pdfminer.six/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-python/charset_normalizer-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-36.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e "s:package.__version__:${PV}:" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use examples && emake -C samples all
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/. )
+ use examples && dodoc -r samples
+ distutils-r1_python_install_all
+}
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 7842f625de5..dce889480e2 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1 +1 @@
-DIST pdftk-v3.2.2.tar.bz2 1245439 BLAKE2B ac1991e60ad06308cb7be1e74f9b3772c80416e490fe525e806efb6d30c6bbc9d310b98c255ef9e3eb3f814541d7388140210c4df2b694bd4a9ee325c27b3f24 SHA512 03220ac3036098768dd4250bbfeb6675561e9126697b99703ab5788b2cee7551256c301d9191745c5fdedf429056b46641351d1fb92631ef17673d7e740c5431
+DIST pdftk-v3.3.2.tar.bz2 2169492 BLAKE2B 53cb98fe3e3d1dbe8b01a45b5b11c6fbe57017ea8029efe35677914a48ffd446c5d67621443a89f512b15d0f7e77a81c945d4c220ccaf4fd658cc1726cc32059 SHA512 b02c713b67531205e760e8d8a240a82af47dbdc28e59aa683e03772d2fb27b504b98f8be1e8dc73bfc967cc9532f3dc1eccbd105abb21db396268855233051eb
diff --git a/app-text/pdftk/pdftk-3.2.2.ebuild b/app-text/pdftk/pdftk-3.3.2.ebuild
index 5600e30323a..a832a031427 100644
--- a/app-text/pdftk/pdftk-3.2.2.ebuild
+++ b/app-text/pdftk/pdftk-3.3.2.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
@@ -30,11 +30,11 @@ CDEPEND="
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.8"
+ >=virtual/jre-1.8:*"
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.8"
+ >=virtual/jdk-1.8:*"
src_install() {
java-pkg_newjar "build/jar/pdftk.jar"
diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild
index 9fe6b13efc0..01bda985c41 100644
--- a/app-text/pdftk/pdftk-9999.ebuild
+++ b/app-text/pdftk/pdftk-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit java-pkg-2 java-ant-2
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
else
SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
S="${WORKDIR}/pdftk-v${PV}"
fi
@@ -30,11 +30,11 @@ CDEPEND="
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.7"
+ >=virtual/jre-1.8:*"
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.7"
+ >=virtual/jdk-1.8:*"
src_install() {
java-pkg_newjar "build/jar/pdftk.jar"
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index b883eb6230c..a900cf6df05 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1 +1,2 @@
DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
+DIST pelican-4.7.2.tar.gz 1401737 BLAKE2B c277844c0c153f71aae051dd8897e9abf8fd1ddc7c49251aaa7b85b7324a85da0ded74e8328a4b64ec79b8e6b4e143d5496b8535900c8a88bfa6198489c0a80c SHA512 9fbf2ecb3c193e976e01a4d095095ac55d56fe45aa24467d91635bbecb9df933ccabd6a456e14c6ee14ce0a845820be8d887917af314e13c7a3eb830cb0ce7e6
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index ac8365be630..7b14026889d 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>djc@gentoo.org</email>
- <name>Dirkjan Ochtman</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="pypi">pelican</remote-id>
<remote-id type="github">getpelican/pelican</remote-id>
diff --git a/app-text/pelican/pelican-4.7.2-r1.ebuild b/app-text/pelican/pelican-4.7.2-r1.ebuild
new file mode 100644
index 00000000000..368acba99bd
--- /dev/null
+++ b/app-text/pelican/pelican-4.7.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~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}]
+ >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.6[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-10.1[${PYTHON_USEDEP}]
+ >=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+distutils_enable_tests nose
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ if use examples; then
+ insinto "/usr/share/doc/${PF}"
+ docompress -x "/usr/share/doc/${PF}/samples"
+ doins -r samples
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index ea34fe5b61b..aa9807867aa 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 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_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 git-r3
@@ -18,18 +18,19 @@ SLOT="0"
IUSE="doc examples markdown"
RESTRICT="test"
-RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
+ >=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+ >=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/six-1.4[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.6[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+ >=dev-python/rich-10.1[${PYTHON_USEDEP}]
+ >=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
-DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+ markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+
DOCS=( README.rst )
distutils_enable_tests nose
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index fd125b72037..895fff2840a 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE="nls readline"
RDEPEND="
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 6667f7facc2..1df54b9b984 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/app-text/po4a/po4a-0.64.ebuild b/app-text/po4a/po4a-0.64.ebuild
index bd435c6ea6a..7859d1c978d 100644
--- a/app-text/po4a/po4a-0.64.ebuild
+++ b/app-text/po4a/po4a-0.64.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 ~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 )"
diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
new file mode 100644
index 00000000000..9e119d269b2
--- /dev/null
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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
+ sys-devel/gettext
+ test? (
+ app-text/docbook-sgml-dtd:4.1
+ dev-perl/Test-Pod
+ virtual/latex-base
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+ plocale_find_changes "${S}/po/bin" '' '.po'
+
+ rm_locale() {
+ PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+ }
+ plocale_for_each_disabled_locale rm_locale
+
+ perl-module_src_prepare
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index f5d3e309a7d..58833fa8fc0 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1 +1,2 @@
DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
+DIST podofo-0.9.7.tar.gz 1005247 BLAKE2B d8f123008d272c1c39f60438d7cd6112cdd851488775e7e0fcb3fd9c4669fd64867fa293ef18b3189eac01f84a8a6b3c536171528f2b6097a5fe181c98501a71 SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b
diff --git a/app-text/podofo/podofo-0.9.7.ebuild b/app-text/podofo/podofo-0.9.7.ebuild
new file mode 100644
index 00000000000..5510e90dad7
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.7.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="https://cfhcable.dl.sourceforge.net/project/podofo/podofo/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn debug test +tools"
+RESTRICT="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ test? ( tools )"
+
+RDEPEND="${LUA_DEPS}
+ idn? ( net-dns/libidn:= )
+ dev-libs/openssl:0=
+ media-libs/fontconfig:=
+ media-libs/freetype:2=
+ virtual/jpeg:0=
+ media-libs/libpng:0=
+ media-libs/tiff:0=
+ sys-libs/zlib:="
+DEPEND="${RDEPEND}
+ test? ( dev-util/cppunit )
+"
+
+BDEPEND="virtual/pkgconfig
+ boost? ( dev-util/boost-build )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+ cmake_src_prepare
+ local x sed_args
+
+ # bug 620934 - Disable linking with cppunit when possible, since it
+ # triggers errors with some older compilers.
+ use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+ # bug 556962
+ sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+ test/unit/EncryptTest.cpp || die
+
+ sed -i \
+ -e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+ -e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+ CMakeLists.txt || die
+
+ # Use pkg-config to find headers for bug #459404.
+ sed_args=
+ for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+ [[ ${x} == -I* ]] || continue
+ x=${x#-I}
+ if [[ -f ${x}/ft2build.h ]] ; then
+ sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+ elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+ sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+ fi
+ done
+ [[ -n ${sed_args} ]] && \
+ { sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+ # Bug #407015: fix to compile with Lua 5.2+
+ case "${ELUA}" in
+ lua5-1|luajit)
+ ;;
+ *)
+ sed -e 's: lua_open(: luaL_newstate(:' \
+ -e 's: luaL_getn(: lua_rawlen(:' -i \
+ tools/podofocolor/luaconverter.cpp \
+ tools/podofoimpose/planreader_lua.cpp || die
+ ;;
+ esac
+}
+
+src_configure() {
+
+ # Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+ filter-flags -fvisibility-inlines-hidden
+
+ mycmakeargs+=(
+ "-DPODOFO_BUILD_SHARED=1"
+ "-DPODOFO_HAVE_JPEG_LIB=1"
+ "-DPODOFO_HAVE_PNG_LIB=1"
+ "-DPODOFO_HAVE_TIFF_LIB=1"
+ "-DWANT_FONTCONFIG=1"
+ "-DUSE_STLPORT=0"
+ -DLUA_VERSION="$(lua_get_version)"
+ -DWANT_BOOST=$(usex boost ON OFF)
+ -DHAVE_LIBIDN=$(usex idn ON OFF)
+ -DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+ -DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+ )
+
+ cmake_src_configure
+ mkdir -p "${S}/test/TokenizerTest/objects" || die
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/test/unit || die
+ ./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/poppler-data/poppler-data-0.4.11.ebuild b/app-text/poppler-data/poppler-data-0.4.11.ebuild
index bbc24bd33be..8fd03b2e77b 100644
--- a/app-text/poppler-data/poppler-data-0.4.11.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.11.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://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="BSD GPL-2 MIT"
SLOT="0"
-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"
+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
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 09d278d38b3..e68fff1340a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,2 +1,2 @@
-DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
-DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a
+DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569
+DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737
diff --git a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
deleted file mode 100644
index 8781bbec5bb..00000000000
--- a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
-From: Theo Anderson <telans@posteo.de>
-Date: Wed, 14 Apr 2021 10:16:11 +1200
-Subject: [PATCH] build: respect cflags
-
-Signed-off-by: Theo Anderson <telans@posteo.de>
----
- cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
- 1 file changed, 4 insertions(+), 73 deletions(-)
-
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index fe1182da..b77eaa3e 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
--if(CMAKE_COMPILER_IS_GNUCXX)
-- # set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
- set(_warn "${_warn} -Wno-unused-parameter")
- set(_warn "${_warn} -Wcast-align")
- set(_warn "${_warn} -Wformat-security")
- set(_warn "${_warn} -Wframe-larger-than=65536")
-- set(_warn "${_warn} -Wlogical-op")
- set(_warn "${_warn} -Wmissing-format-attribute")
- set(_warn "${_warn} -Wnon-virtual-dtor")
- set(_warn "${_warn} -Woverloaded-virtual")
-@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-
- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
-+
-+if(CMAKE_COMPILER_IS_GNUCXX)
- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
- if(GCC_HAS_AS_NEEDED)
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
-
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
-- set(_warn "-Wall -Wextra -Wpedantic")
-- set(_warn "${_warn} -Wno-unused-parameter")
-- set(_warn "${_warn} -Wcast-align")
-- set(_warn "${_warn} -Wformat-security")
-- set(_warn "${_warn} -Wframe-larger-than=65536")
-- set(_warn "${_warn} -Wmissing-format-attribute")
-- set(_warn "${_warn} -Wnon-virtual-dtor")
-- set(_warn "${_warn} -Woverloaded-virtual")
-- set(_warn "${_warn} -Wmissing-declarations")
-- set(_warn "${_warn} -Wundef")
-- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
-- set(_warn "${_warn} -Wshadow")
-- set(_warn "${_warn} -Wweak-vtables")
--
-- # set extra warnings
-- set(_warnx "${_warnx} -Wconversion")
--
-- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
-- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
-- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--endif()
--
--if(CMAKE_C_COMPILER MATCHES "icc")
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
---
-2.31.1
-
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
new file mode 100644
index 00000000000..9dfdcfa1240
--- /dev/null
+++ b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
@@ -0,0 +1,18 @@
+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-21.07.0.ebuild b/app-text/poppler/poppler-22.03.0.ebuild
index ccde4b8643b..f6a73f037df 100644
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ b/app-text/poppler/poppler-22.03.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2005-2021 Gentoo Authors
+# Copyright 2005-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake toolchain-funcs xdg-utils
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
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 ~x64-solaris ~x86-solaris"
- SLOT="0/111" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/119" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,10 +24,6 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
# No test data provided
RESTRICT="test"
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
DEPEND="
media-libs/fontconfig
media-libs/freetype
@@ -56,12 +52,16 @@ RDEPEND="${DEPEND}
DEPEND+="
boost? ( dev-libs/boost )
"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
- "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)
@@ -70,7 +70,7 @@ src_prepare() {
# Clang doesn't grok this flag, the configure nicely tests that, but
# cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
+ if tc-is-clang ; then
sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
fi
diff --git a/app-text/poppler/poppler-21.11.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild
index 77dc632ebaa..06ec20258b9 100644
--- a/app-text/poppler/poppler-21.11.0.ebuild
+++ b/app-text/poppler/poppler-22.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2021 Gentoo Authors
+# Copyright 2005-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- 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 ~x64-solaris ~x86-solaris"
- SLOT="0/115" # 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/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -26,7 +26,7 @@ RESTRICT="test"
DEPEND="
media-libs/fontconfig
- media-libs/freetype
+ >=media-libs/freetype-2.8
sys-libs/zlib
cairo? (
dev-libs/glib:2
@@ -34,7 +34,7 @@ DEPEND="
introspection? ( dev-libs/gobject-introspection:= )
)
curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
+ 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 )
@@ -63,6 +63,7 @@ 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-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 337023d962c..a5f3b33d973 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2021 Gentoo Authors
+# Copyright 2005-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- 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 ~x64-solaris ~x86-solaris"
- SLOT="0/115" # 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/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -26,7 +26,7 @@ RESTRICT="test"
DEPEND="
media-libs/fontconfig
- media-libs/freetype
+ >=media-libs/freetype-2.8
sys-libs/zlib
cairo? (
dev-libs/glib:2
@@ -34,7 +34,7 @@ DEPEND="
introspection? ( dev-libs/gobject-introspection:= )
)
curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
+ 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 )
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index a717ead4844..e261eb3c9d4 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
RDEPEND="
app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
index c1d0a1b552d..575e1e85866 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325-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
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
LICENSE="MIT"
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"
+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 ~x64-solaris ~x86-solaris"
DEPEND=">=dev-libs/kpathsea-6.2.1:="
RDEPEND="${DEPEND}"
diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild
index 20931af5b1d..24ed68ea8e0 100644
--- a/app-text/pspresent/pspresent-1.3-r1.ebuild
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ src_prepare() {
}
src_compile() {
- emake CC=$(tc-getCC)
+ emake CC="$(tc-getCC)"
}
src_install() {
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index a2df5ca8d37..f1c0d00de2e 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
LICENSE="psutils"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
IUSE=""
RDEPEND=""
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 935af25fb20..b3eaae211c0 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,5 +1,12 @@
-DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
-DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
-DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460fd4f6935a4f69374e49c445cfcbe824175de7137817a26278c2f58d7524f6440181945064fc853f4dd30b2d528 SHA512 def94fe09770e67fe13bd3fc946667fc2935e7c448eb43602e15218e5b50f452e4f4152411f818115620e67934890c37203663537ac77ed1fcd4317e01a6d623
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
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
deleted file mode 100644
index e6c1b177248..00000000000
--- a/app-text/qpdf/qpdf-10.0.4.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 ~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.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
deleted file mode 100644
index e6c1b177248..00000000000
--- a/app-text/qpdf/qpdf-10.1.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=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 ~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.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
deleted file mode 100644
index e6c1b177248..00000000000
--- a/app-text/qpdf/qpdf-10.3.1.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 ~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[@]}"
-}