summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/XML-Schema-learner/metadata.xml2
-rw-r--r--app-text/a2ps/metadata.xml2
-rw-r--r--app-text/agrep/agrep-2.04-r2.ebuild4
-rw-r--r--app-text/agrep/metadata.xml2
-rw-r--r--app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild2
-rw-r--r--app-text/aiksaurus/metadata.xml2
-rw-r--r--app-text/an/metadata.xml2
-rw-r--r--app-text/ansifilter/metadata.xml2
-rw-r--r--app-text/antiword/metadata.xml2
-rw-r--r--app-text/antixls/metadata.xml2
-rw-r--r--app-text/apvlv/metadata.xml2
-rw-r--r--app-text/asa/metadata.xml2
-rw-r--r--app-text/asciidoc/asciidoc-9.1.0.ebuild2
-rw-r--r--app-text/asciidoc/metadata.xml4
-rw-r--r--app-text/aspell/metadata.xml2
-rw-r--r--app-text/atril/metadata.xml2
-rw-r--r--app-text/bact/metadata.xml2
-rw-r--r--app-text/barcode/metadata.xml2
-rw-r--r--app-text/bdf2psf/metadata.xml7
-rw-r--r--app-text/bibclean/metadata.xml2
-rw-r--r--app-text/bibletime/Manifest2
-rw-r--r--app-text/bibletime/bibletime-3.0.1.ebuild2
-rw-r--r--app-text/bibletime/bibletime-3.0.2.ebuild (renamed from app-text/bibletime/bibletime-3.0.ebuild)6
-rw-r--r--app-text/bibletime/metadata.xml2
-rw-r--r--app-text/bibutils/Manifest1
-rw-r--r--app-text/bibutils/bibutils-6.10.ebuild16
-rw-r--r--app-text/bibutils/bibutils-7.1.ebuild43
-rw-r--r--app-text/bibutils/metadata.xml2
-rw-r--r--app-text/binfind/metadata.xml2
-rw-r--r--app-text/blahtexml/blahtexml-0.9.ebuild2
-rw-r--r--app-text/blahtexml/metadata.xml2
-rw-r--r--app-text/blogc/Manifest2
-rw-r--r--app-text/blogc/blogc-0.20.1.ebuild (renamed from app-text/blogc/blogc-0.20.0.ebuild)23
-rw-r--r--app-text/blogc/blogc-9999.ebuild23
-rw-r--r--app-text/blogc/metadata.xml2
-rw-r--r--app-text/bogosort/metadata.xml2
-rw-r--r--app-text/build-docbook-catalog/Manifest1
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild3
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild39
-rw-r--r--app-text/build-docbook-catalog/metadata.xml2
-rw-r--r--app-text/c2ps/metadata.xml2
-rw-r--r--app-text/calibre/Manifest2
-rw-r--r--app-text/calibre/calibre-5.16.1-r1.ebuild (renamed from app-text/calibre/calibre-5.16.1.ebuild)13
-rw-r--r--app-text/calibre/calibre-5.25.0-r2.ebuild263
-rw-r--r--app-text/calibre/calibre-5.30.0.ebuild263
-rw-r--r--app-text/calibre/files/calibre-5.16.1-zeroconf.patch30
-rw-r--r--app-text/calibre/files/calibre-disable_plugins.patch8
-rw-r--r--app-text/calibre/metadata.xml2
-rw-r--r--app-text/capyt/metadata.xml2
-rw-r--r--app-text/catdoc/catdoc-0.95-r1.ebuild4
-rw-r--r--app-text/catdoc/metadata.xml2
-rw-r--r--app-text/cb2bib/metadata.xml2
-rw-r--r--app-text/cedilla/metadata.xml2
-rw-r--r--app-text/chasen/chasen-2.4.4-r3.ebuild2
-rw-r--r--app-text/chasen/metadata.xml2
-rw-r--r--app-text/cherrytree/metadata.xml2
-rw-r--r--app-text/cmark/Manifest2
-rw-r--r--app-text/cmark/cmark-0.30.2.ebuild (renamed from app-text/cmark/cmark-0.30.0.ebuild)8
-rw-r--r--app-text/cmark/metadata.xml2
-rw-r--r--app-text/cmigemo/metadata.xml2
-rw-r--r--app-text/code2html/metadata.xml2
-rw-r--r--app-text/convertlit/convertlit-1.8-r3.ebuild4
-rw-r--r--app-text/convertlit/metadata.xml2
-rw-r--r--app-text/convmv/metadata.xml2
-rw-r--r--app-text/coolreader/Manifest2
-rw-r--r--app-text/coolreader/coolreader-3.2.57-r1.ebuild (renamed from app-text/coolreader/coolreader-3.2.57.ebuild)2
-rw-r--r--app-text/coolreader/coolreader-3.2.58-r1.ebuild67
-rw-r--r--app-text/coolreader/coolreader-3.2.59-r2.ebuild71
-rw-r--r--app-text/coolreader/files/coolreader-wxwidgets.patch109
-rw-r--r--app-text/coolreader/metadata.xml2
-rw-r--r--app-text/cpdf/metadata.xml2
-rw-r--r--app-text/crf++/metadata.xml2
-rw-r--r--app-text/crm114/metadata.xml2
-rw-r--r--app-text/cssmin/Manifest1
-rw-r--r--app-text/cssmin/cssmin-0.2.0.ebuild15
-rw-r--r--app-text/cssmin/metadata.xml13
-rw-r--r--app-text/cuneiform/metadata.xml2
-rw-r--r--app-text/cwtext/metadata.xml2
-rw-r--r--app-text/dbacl/metadata.xml2
-rw-r--r--app-text/dblatex/dblatex-0.3.12.ebuild4
-rw-r--r--app-text/dblatex/metadata.xml2
-rw-r--r--app-text/delta/metadata.xml2
-rw-r--r--app-text/dictd/dictd-1.13.0-r3.ebuild3
-rw-r--r--app-text/dictd/metadata.xml2
-rw-r--r--app-text/diction/metadata.xml2
-rw-r--r--app-text/diff-pdf/metadata.xml2
-rw-r--r--app-text/diffpdf/metadata.xml2
-rw-r--r--app-text/ding/metadata.xml2
-rw-r--r--app-text/discount/metadata.xml2
-rw-r--r--app-text/djview/metadata.xml2
-rw-r--r--app-text/djvu/metadata.xml2
-rw-r--r--app-text/docbook-dsssl-stylesheets/metadata.xml2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/metadata.xml2
-rw-r--r--app-text/docbook-sgml-utils/metadata.xml2
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild8
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild8
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild8
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild8
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild8
-rw-r--r--app-text/docbook-xml-dtd/metadata.xml2
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild8
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild8
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild8
-rw-r--r--app-text/docbook-xml-simple-dtd/metadata.xml2
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild6
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/metadata.xml2
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild6
-rw-r--r--app-text/docbook-xsl-stylesheets/metadata.xml2
-rw-r--r--app-text/docbook2X/metadata.xml2
-rw-r--r--app-text/docx2txt/metadata.xml2
-rw-r--r--app-text/dos2unix/metadata.xml2
-rw-r--r--app-text/dvipng/metadata.xml2
-rw-r--r--app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild (renamed from app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild)2
-rw-r--r--app-text/dvipsk/metadata.xml2
-rw-r--r--app-text/dvisvgm/Manifest1
-rw-r--r--app-text/dvisvgm/dvisvgm-2.12.ebuild43
-rw-r--r--app-text/dvisvgm/metadata.xml2
-rw-r--r--app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild2
-rw-r--r--app-text/ebook-tools/metadata.xml2
-rw-r--r--app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild4
-rw-r--r--app-text/editorconfig-core-c/metadata.xml2
-rw-r--r--app-text/enchant/Manifest1
-rw-r--r--app-text/enchant/enchant-1.6.1-r1.ebuild2
-rw-r--r--app-text/enchant/enchant-2.3.1.ebuild47
-rw-r--r--app-text/enchant/metadata.xml2
-rw-r--r--app-text/enscript/metadata.xml2
-rw-r--r--app-text/epspdf/metadata.xml2
-rw-r--r--app-text/epstool/epstool-3.09.ebuild4
-rw-r--r--app-text/epstool/metadata.xml2
-rw-r--r--app-text/evince/evince-40.4.ebuild20
-rw-r--r--app-text/evince/metadata.xml2
-rw-r--r--app-text/expander/metadata.xml2
-rw-r--r--app-text/extract_url/metadata.xml2
-rw-r--r--app-text/fb2edit/Manifest1
-rw-r--r--app-text/fb2edit/fb2edit-0.1.0.ebuild26
-rw-r--r--app-text/fb2edit/metadata.xml10
-rw-r--r--app-text/fblog/metadata.xml2
-rw-r--r--app-text/fbpdf/metadata.xml2
-rw-r--r--app-text/fbreader/metadata.xml2
-rw-r--r--app-text/fictionup/metadata.xml2
-rw-r--r--app-text/flpsed/metadata.xml2
-rw-r--r--app-text/foliate/metadata.xml2
-rw-r--r--app-text/ghostscript-gpl/Manifest2
-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/ghostscript-gpl-9.54.0-r1.ebuild194
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild189
-rw-r--r--app-text/ghostscript-gpl/metadata.xml2
-rw-r--r--app-text/gnome-doc-utils/metadata.xml2
-rw-r--r--app-text/gocr/metadata.xml2
-rw-r--r--app-text/grip/grip-4.5.2-r2.ebuild1
-rw-r--r--app-text/grip/metadata.xml2
-rw-r--r--app-text/groonga-normalizer-mysql/metadata.xml2
-rw-r--r--app-text/groonga/metadata.xml2
-rw-r--r--app-text/grutatxt/metadata.xml2
-rw-r--r--app-text/gspell/gspell-1.9.1.ebuild2
-rw-r--r--app-text/gspell/metadata.xml2
-rw-r--r--app-text/gtkspell/gtkspell-2.0.16-r1.ebuild2
-rw-r--r--app-text/gtkspell/gtkspell-3.0.10.ebuild2
-rw-r--r--app-text/gtkspell/metadata.xml2
-rw-r--r--app-text/gtranslator/metadata.xml2
-rw-r--r--app-text/gv/metadata.xml2
-rw-r--r--app-text/hd2u/metadata.xml2
-rw-r--r--app-text/highlight/highlight-4.1.ebuild2
-rw-r--r--app-text/highlight/metadata.xml2
-rw-r--r--app-text/hnb/metadata.xml2
-rw-r--r--app-text/htag/metadata.xml2
-rw-r--r--app-text/html-xml-utils/metadata.xml2
-rw-r--r--app-text/html2text/metadata.xml2
-rw-r--r--app-text/html401/metadata.xml2
-rw-r--r--app-text/htmlc/metadata.xml2
-rw-r--r--app-text/htmldoc/metadata.xml2
-rw-r--r--app-text/htmlinc/metadata.xml2
-rw-r--r--app-text/htmlmin/htmlmin-0.1.12.ebuild7
-rw-r--r--app-text/htmlmin/metadata.xml3
-rw-r--r--app-text/htmlrecode/metadata.xml2
-rw-r--r--app-text/htmltidy/Manifest2
-rw-r--r--app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch34
-rw-r--r--app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch12
-rw-r--r--app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch31
-rw-r--r--app-text/htmltidy/htmltidy-0.99.0.ebuild80
-rw-r--r--app-text/htmltidy/htmltidy-5.8.0-r1.ebuild9
-rw-r--r--app-text/htmltidy/metadata.xml6
-rw-r--r--app-text/htp/metadata.xml2
-rw-r--r--app-text/hunspell/metadata.xml2
-rw-r--r--app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild (renamed from app-text/hyperestraier/hyperestraier-1.4.13.ebuild)8
-rw-r--r--app-text/hyperestraier/metadata.xml2
-rw-r--r--app-text/iso-codes/Manifest1
-rw-r--r--app-text/iso-codes/iso-codes-4.6.0.ebuild2
-rw-r--r--app-text/iso-codes/iso-codes-4.7.0.ebuild79
-rw-r--r--app-text/iso-codes/metadata.xml2
-rw-r--r--app-text/itex2mml/metadata.xml2
-rw-r--r--app-text/jabref-bin/metadata.xml2
-rw-r--r--app-text/jabref/metadata.xml2
-rw-r--r--app-text/jo/metadata.xml2
-rw-r--r--app-text/kbibtex/metadata.xml5
-rw-r--r--app-text/kchmviewer/metadata.xml2
-rw-r--r--app-text/kjots/metadata.xml5
-rw-r--r--app-text/kramdown-rfc2629/Manifest1
-rw-r--r--app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.9.ebuild30
-rw-r--r--app-text/kramdown-rfc2629/metadata.xml2
-rw-r--r--app-text/krop/metadata.xml2
-rw-r--r--app-text/languagetool/Manifest1
-rw-r--r--app-text/languagetool/files/languagetool.initd19
-rw-r--r--app-text/languagetool/languagetool-5.4.ebuild77
-rw-r--r--app-text/languagetool/metadata.xml2
-rw-r--r--app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild (renamed from app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild)4
-rw-r--r--app-text/lcdf-typetools/metadata.xml2
-rw-r--r--app-text/lesspipe/Manifest3
-rw-r--r--app-text/lesspipe/lesspipe-1.89.ebuild (renamed from app-text/lesspipe/lesspipe-1.86.ebuild)23
-rw-r--r--app-text/lesspipe/lesspipe-1.90.ebuild60
-rw-r--r--app-text/lesspipe/metadata.xml2
-rw-r--r--app-text/letterize/metadata.xml2
-rw-r--r--app-text/libabw/metadata.xml2
-rw-r--r--app-text/libebook/metadata.xml2
-rw-r--r--app-text/libepubgen/metadata.xml2
-rw-r--r--app-text/libetonyek/metadata.xml2
-rw-r--r--app-text/libexttextcat/metadata.xml2
-rw-r--r--app-text/libgepub/libgepub-0.6.0.ebuild9
-rw-r--r--app-text/libgepub/metadata.xml2
-rw-r--r--app-text/libgxps/libgxps-0.3.2.ebuild2
-rw-r--r--app-text/libgxps/metadata.xml2
-rw-r--r--app-text/liblangtag/metadata.xml2
-rw-r--r--app-text/libmspub/metadata.xml2
-rw-r--r--app-text/libmwaw/Manifest1
-rw-r--r--app-text/libmwaw/libmwaw-0.3.19.ebuild52
-rw-r--r--app-text/libmwaw/libmwaw-0.3.20.ebuild2
-rw-r--r--app-text/libmwaw/metadata.xml2
-rw-r--r--app-text/libnumbertext/metadata.xml2
-rw-r--r--app-text/libodfgen/metadata.xml2
-rw-r--r--app-text/libpaper/metadata.xml2
-rw-r--r--app-text/libqxp/metadata.xml2
-rw-r--r--app-text/libspectre/metadata.xml2
-rw-r--r--app-text/libstaroffice/metadata.xml2
-rw-r--r--app-text/libwpd/libwpd-0.10.3.ebuild4
-rw-r--r--app-text/libwpd/metadata.xml2
-rw-r--r--app-text/libwpg/libwpg-0.3.3.ebuild4
-rw-r--r--app-text/libwpg/metadata.xml2
-rw-r--r--app-text/libwps/metadata.xml2
-rw-r--r--app-text/libxmlpatch/metadata.xml2
-rw-r--r--app-text/linuxdoc-tools/metadata.xml2
-rw-r--r--app-text/llpp/metadata.xml2
-rw-r--r--app-text/logmerge/metadata.xml2
-rw-r--r--app-text/lout/Manifest1
-rw-r--r--app-text/lout/files/lout-3.38-makefile.patch33
-rw-r--r--app-text/lout/lout-3.40.ebuild85
-rw-r--r--app-text/lout/metadata.xml8
-rw-r--r--app-text/lowdown/metadata.xml2
-rw-r--r--app-text/lv/metadata.xml2
-rw-r--r--app-text/mandoc/Manifest1
-rw-r--r--app-text/mandoc/mandoc-1.14.6.ebuild124
-rw-r--r--app-text/mandoc/metadata.xml2
-rw-r--r--app-text/manpager/metadata.xml2
-rw-r--r--app-text/master-pdf-editor/Manifest3
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.7.90.ebuild (renamed from app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild)0
-rw-r--r--app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild42
-rw-r--r--app-text/master-pdf-editor/metadata.xml2
-rw-r--r--app-text/mathtex/mathtex-1.04.ebuild4
-rw-r--r--app-text/mathtex/metadata.xml2
-rw-r--r--app-text/mecab/mecab-0.996-r1.ebuild2
-rw-r--r--app-text/mecab/metadata.xml2
-rw-r--r--app-text/metadata.xml2
-rw-r--r--app-text/mpage/metadata.xml2
-rw-r--r--app-text/msort/metadata.xml2
-rw-r--r--app-text/multitail/metadata.xml2
-rw-r--r--app-text/mupdf/metadata.xml7
-rw-r--r--app-text/mupdf/mupdf-1.18.0-r4.ebuild3
-rw-r--r--app-text/mythes/metadata.xml2
-rw-r--r--app-text/namazu/Manifest2
-rw-r--r--app-text/namazu/files/namazu-emacs-27.patch14
-rw-r--r--app-text/namazu/metadata.xml2
-rw-r--r--app-text/namazu/namazu-2.0.21.ebuild17
-rw-r--r--app-text/namazu/namazu-2.0.22_pre8.ebuild (renamed from app-text/namazu/namazu-2.0.22_pre7.ebuild)16
-rw-r--r--app-text/nfoview/metadata.xml2
-rw-r--r--app-text/nuspell/metadata.xml2
-rw-r--r--app-text/o3read/metadata.xml2
-rw-r--r--app-text/ocrad/metadata.xml2
-rw-r--r--app-text/odt2txt/metadata.xml2
-rw-r--r--app-text/openjade/metadata.xml2
-rw-r--r--app-text/openpaperwork-core/metadata.xml2
-rw-r--r--app-text/openpaperwork-gtk/metadata.xml2
-rw-r--r--app-text/opensp/metadata.xml2
-rw-r--r--app-text/pandoc/metadata.xml2
-rw-r--r--app-text/paperwork-backend/metadata.xml2
-rw-r--r--app-text/paperwork/metadata.xml2
-rw-r--r--app-text/paps/metadata.xml2
-rw-r--r--app-text/par/metadata.xml2
-rw-r--r--app-text/pastebinit/metadata.xml2
-rw-r--r--app-text/pastebinit/pastebinit-1.5.1.ebuild2
-rw-r--r--app-text/pdf2html/metadata.xml2
-rw-r--r--app-text/pdf2oo/metadata.xml2
-rw-r--r--app-text/pdfarranger/metadata.xml2
-rw-r--r--app-text/pdfgrep/metadata.xml2
-rw-r--r--app-text/pdfjam/metadata.xml2
-rw-r--r--app-text/pdfjam/pdfjam-2.08-r1.ebuild2
-rw-r--r--app-text/pdfminer/metadata.xml2
-rw-r--r--app-text/pdfsandwich/metadata.xml2
-rw-r--r--app-text/pdftk/metadata.xml2
-rw-r--r--app-text/pelican/metadata.xml2
-rw-r--r--app-text/pep/metadata.xml2
-rw-r--r--app-text/pinfo/metadata.xml2
-rw-r--r--app-text/pinfo/pinfo-0.6.13.ebuild4
-rw-r--r--app-text/po4a/Manifest3
-rw-r--r--app-text/po4a/files/po4a-man.patch18
-rw-r--r--app-text/po4a/metadata.xml2
-rw-r--r--app-text/po4a/po4a-0.57-r1.ebuild55
-rw-r--r--app-text/po4a/po4a-0.63-r1.ebuild2
-rw-r--r--app-text/po4a/po4a-0.64.ebuild (renamed from app-text/po4a/po4a-0.62-r1.ebuild)9
-rw-r--r--app-text/podofo/metadata.xml2
-rw-r--r--app-text/poppler-data/Manifest1
-rw-r--r--app-text/poppler-data/metadata.xml2
-rw-r--r--app-text/poppler-data/poppler-data-0.4.11.ebuild21
-rw-r--r--app-text/poppler/Manifest3
-rw-r--r--app-text/poppler/files/poppler-21.09.0-respect-cflags.patch116
-rw-r--r--app-text/poppler/metadata.xml2
-rw-r--r--app-text/poppler/poppler-21.08.0.ebuild126
-rw-r--r--app-text/poppler/poppler-21.09.0.ebuild126
-rw-r--r--app-text/poppler/poppler-21.10.0.ebuild126
-rw-r--r--app-text/poppler/poppler-9999.ebuild18
-rw-r--r--app-text/ps2eps/metadata.xml2
-rw-r--r--app-text/ps2eps/ps2eps-1.68.ebuild2
-rw-r--r--app-text/ps2pkm/metadata.xml2
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild (renamed from app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild)2
-rw-r--r--app-text/psiconv/metadata.xml2
-rw-r--r--app-text/pspdftool/metadata.xml2
-rw-r--r--app-text/pspresent/metadata.xml2
-rw-r--r--app-text/pstotext/metadata.xml2
-rw-r--r--app-text/psutils/metadata.xml2
-rw-r--r--app-text/psutils/psutils-1.17-r3.ebuild2
-rw-r--r--app-text/pytextile/metadata.xml2
-rw-r--r--app-text/q-text-as-data/metadata.xml2
-rw-r--r--app-text/qpdf/metadata.xml2
-rw-r--r--app-text/qpdfview/metadata.xml2
-rw-r--r--app-text/qpdfview/qpdfview-0.4.18_p1.ebuild2
-rw-r--r--app-text/rarian/metadata.xml2
-rw-r--r--app-text/rarian/rarian-0.8.1-r3.ebuild2
-rw-r--r--app-text/recode/Manifest2
-rw-r--r--app-text/recode/metadata.xml2
-rw-r--r--app-text/recode/recode-3.7.6-r1.ebuild37
-rw-r--r--app-text/recode/recode-3.7.8.ebuild58
-rw-r--r--app-text/recode/recode-3.7.9.ebuild6
-rw-r--r--app-text/reed/metadata.xml2
-rw-r--r--app-text/refbase/metadata.xml2
-rw-r--r--app-text/restview/metadata.xml2
-rw-r--r--app-text/rman/metadata.xml2
-rw-r--r--app-text/rman/rman-3.2-r1.ebuild2
-rw-r--r--app-text/rnc2rng/Manifest1
-rw-r--r--app-text/rnc2rng/metadata.xml3
-rw-r--r--app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild24
-rw-r--r--app-text/rnv/metadata.xml2
-rw-r--r--app-text/robodoc/metadata.xml2
-rw-r--r--app-text/ronn/metadata.xml2
-rw-r--r--app-text/rpl/Manifest1
-rw-r--r--app-text/rpl/metadata.xml4
-rw-r--r--app-text/rpl/rpl-1.9.1.ebuild27
-rw-r--r--app-text/rtf2html/metadata.xml2
-rw-r--r--app-text/sablotron/metadata.xml2
-rw-r--r--app-text/scdoc/metadata.xml2
-rw-r--r--app-text/scrollkeeper-dtd/metadata.xml2
-rw-r--r--app-text/sdcv/metadata.xml2
-rw-r--r--app-text/sgml-common/metadata.xml2
-rw-r--r--app-text/sgrep/metadata.xml2
-rw-r--r--app-text/sigil/Manifest2
-rw-r--r--app-text/sigil/metadata.xml10
-rw-r--r--app-text/sigil/sigil-1.7.0.ebuild2
-rw-r--r--app-text/sigil/sigil-1.8.0.ebuild (renamed from app-text/sigil/sigil-1.5.1.ebuild)42
-rw-r--r--app-text/simple-fb2-reader/metadata.xml2
-rw-r--r--app-text/sloccount/metadata.xml2
-rw-r--r--app-text/spellutils/metadata.xml2
-rw-r--r--app-text/stardict/metadata.xml2
-rw-r--r--app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild4
-rw-r--r--app-text/sword-modules/metadata.xml2
-rw-r--r--app-text/sword-modules/sword-modules-2.5.ebuild (renamed from app-text/sword-modules/sword-modules-2.4.ebuild)15
-rw-r--r--app-text/sword/metadata.xml2
-rw-r--r--app-text/sword/sword-1.9.0-r1.ebuild2
-rw-r--r--app-text/t1utils/Manifest1
-rw-r--r--app-text/t1utils/metadata.xml2
-rw-r--r--app-text/t1utils/t1utils-1.42.ebuild18
-rw-r--r--app-text/tabler/metadata.xml2
-rw-r--r--app-text/talkfilters/metadata.xml2
-rw-r--r--app-text/teckit/metadata.xml2
-rw-r--r--app-text/teseq/metadata.xml2
-rw-r--r--app-text/tessdata_best/metadata.xml2
-rw-r--r--app-text/tessdata_best/tessdata_best-4.1.0.ebuild2
-rw-r--r--app-text/tessdata_fast/metadata.xml2
-rw-r--r--app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild2
-rw-r--r--app-text/tessdata_legacy/metadata.xml2
-rw-r--r--app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild2
-rw-r--r--app-text/tesseract/Manifest46
-rw-r--r--app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch74
-rw-r--r--app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch27
-rw-r--r--app-text/tesseract/metadata.xml6
-rw-r--r--app-text/tesseract/tesseract-3.05.02.ebuild148
-rw-r--r--app-text/tesseract/tesseract-4.1.1.ebuild4
-rw-r--r--app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild (renamed from app-text/tesseract/tesseract-4.1.0-r1.ebuild)14
-rw-r--r--app-text/texi2html/metadata.xml2
-rw-r--r--app-text/texlive-core/metadata.xml2
-rw-r--r--app-text/texlive-core/texlive-core-2021-r1.ebuild (renamed from app-text/texlive-core/texlive-core-2021.ebuild)4
-rw-r--r--app-text/texlive/metadata.xml2
-rw-r--r--app-text/texlive/texlive-2021.ebuild2
-rw-r--r--app-text/tidy-html5/metadata.xml4
-rw-r--r--app-text/tkinfo/metadata.xml2
-rw-r--r--app-text/tkman/metadata.xml2
-rw-r--r--app-text/tofrodos/metadata.xml2
-rw-r--r--app-text/tokyodystopia/metadata.xml2
-rw-r--r--app-text/trang/metadata.xml2
-rw-r--r--app-text/tree/metadata.xml2
-rw-r--r--app-text/tree/tree-1.8.0.ebuild2
-rw-r--r--app-text/ttf2pk2/metadata.xml2
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild2
-rw-r--r--app-text/ttf2pt1/metadata.xml2
-rw-r--r--app-text/txt2man/metadata.xml2
-rw-r--r--app-text/txt2pdbdoc/metadata.xml2
-rw-r--r--app-text/txt2tags/metadata.xml4
-rw-r--r--app-text/txt2tags/txt2tags-3.7.ebuild11
-rw-r--r--app-text/u2ps/metadata.xml2
-rw-r--r--app-text/unac/metadata.xml2
-rw-r--r--app-text/unpaper/metadata.xml2
-rw-r--r--app-text/unrtf/metadata.xml2
-rw-r--r--app-text/uudeview/metadata.xml2
-rw-r--r--app-text/vgrep/Manifest1
-rw-r--r--app-text/vgrep/metadata.xml2
-rw-r--r--app-text/vgrep/vgrep-2.5.2.ebuild30
-rw-r--r--app-text/vilistextum/metadata.xml2
-rw-r--r--app-text/wdiff/metadata.xml2
-rw-r--r--app-text/webgen/metadata.xml2
-rw-r--r--app-text/wgetpaste/metadata.xml2
-rw-r--r--app-text/wiki2beamer/metadata.xml2
-rw-r--r--app-text/writerperfect/metadata.xml2
-rw-r--r--app-text/wscr/metadata.xml2
-rw-r--r--app-text/wscr/wscr-1.2-r2.ebuild4
-rw-r--r--app-text/wv/metadata.xml2
-rw-r--r--app-text/wv2/metadata.xml2
-rw-r--r--app-text/xapers/metadata.xml2
-rw-r--r--app-text/xapian-omega/metadata.xml2
-rw-r--r--app-text/xchm/metadata.xml2
-rw-r--r--app-text/xchm/xchm-1.32.ebuild2
-rw-r--r--app-text/xdvik/metadata.xml2
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r3.ebuild (renamed from app-text/xdvik/xdvik-22.87.03-r2.ebuild)6
-rw-r--r--app-text/xhtml1/metadata.xml2
-rw-r--r--app-text/xhtml11/metadata.xml2
-rw-r--r--app-text/xiphos/metadata.xml2
-rw-r--r--app-text/xlhtml/metadata.xml2
-rw-r--r--app-text/xlsx2csv/metadata.xml3
-rw-r--r--app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild4
-rw-r--r--app-text/xml2/metadata.xml2
-rw-r--r--app-text/xml2doc/metadata.xml2
-rw-r--r--app-text/xmldiff/metadata.xml2
-rw-r--r--app-text/xmldiff/xmldiff-2.4.ebuild2
-rw-r--r--app-text/xmlformat/metadata.xml2
-rw-r--r--app-text/xmlstarlet/metadata.xml2
-rw-r--r--app-text/xmlto/metadata.xml2
-rw-r--r--app-text/xournal/metadata.xml2
-rw-r--r--app-text/xournalpp/metadata.xml2
-rw-r--r--app-text/xournalpp/xournalpp-1.0.20.ebuild2
-rw-r--r--app-text/xpdf/metadata.xml2
-rw-r--r--app-text/yelp-tools/metadata.xml2
-rw-r--r--app-text/yelp-tools/yelp-tools-40.0.ebuild4
-rw-r--r--app-text/yodl/metadata.xml2
-rw-r--r--app-text/zathura-cb/metadata.xml2
-rw-r--r--app-text/zathura-cb/zathura-cb-0.1.8.ebuild15
-rw-r--r--app-text/zathura-cb/zathura-cb-9999.ebuild15
-rw-r--r--app-text/zathura-djvu/metadata.xml2
-rw-r--r--app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild14
-rw-r--r--app-text/zathura-djvu/zathura-djvu-9999.ebuild16
-rw-r--r--app-text/zathura-meta/metadata.xml2
-rw-r--r--app-text/zathura-pdf-mupdf/metadata.xml2
-rw-r--r--app-text/zathura-pdf-poppler/metadata.xml2
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild4
-rw-r--r--app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild4
-rw-r--r--app-text/zathura-ps/metadata.xml2
-rw-r--r--app-text/zathura-ps/zathura-ps-0.2.6.ebuild4
-rw-r--r--app-text/zathura-ps/zathura-ps-9999.ebuild4
-rw-r--r--app-text/zathura/Manifest1
-rw-r--r--app-text/zathura/metadata.xml2
-rw-r--r--app-text/zathura/zathura-0.4.7.ebuild4
-rw-r--r--app-text/zathura/zathura-0.4.8.ebuild57
-rw-r--r--app-text/zathura/zathura-9999.ebuild8
-rw-r--r--app-text/zotero-bin/Manifest2
-rw-r--r--app-text/zotero-bin/metadata.xml2
-rw-r--r--app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild (renamed from app-text/zotero-bin/zotero-bin-5.0.96.2.ebuild)2
483 files changed, 3618 insertions, 1467 deletions
diff --git a/app-text/XML-Schema-learner/metadata.xml b/app-text/XML-Schema-learner/metadata.xml
index a1b8a8d9169..4dcf546c3a5 100644
--- a/app-text/XML-Schema-learner/metadata.xml
+++ b/app-text/XML-Schema-learner/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index 98cea90097e..834aba280f8 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/agrep/agrep-2.04-r2.ebuild b/app-text/agrep/agrep-2.04-r2.ebuild
index d2ff1e0dd62..522dc26f746 100644
--- a/app-text/agrep/agrep-2.04-r2.ebuild
+++ b/app-text/agrep/agrep-2.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.arizona.edu/${PN}/${P}.tar.Z"
LICENSE="AGREP"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
RDEPEND="
!dev-libs/tre
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
index 3cf14bf7463..6258504e513 100644
--- a/app-text/agrep/metadata.xml
+++ b/app-text/agrep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
index 0062ee0b9a9..396c7f41401 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="gtk"
RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/aiksaurus/metadata.xml b/app-text/aiksaurus/metadata.xml
index fbf374360c7..4f9abf2b840 100644
--- a/app-text/aiksaurus/metadata.xml
+++ b/app-text/aiksaurus/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/an/metadata.xml
+++ b/app-text/an/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 69570e84932..0563834f556 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>kensington@gentoo.org</email>
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index a5fb11f5d0c..48758def3c6 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
diff --git a/app-text/antixls/metadata.xml b/app-text/antixls/metadata.xml
index a53ffbea77d..3d1a383e5d9 100644
--- a/app-text/antixls/metadata.xml
+++ b/app-text/antixls/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
diff --git a/app-text/apvlv/metadata.xml b/app-text/apvlv/metadata.xml
index 2985af6e7c9..43022be5fe1 100644
--- a/app-text/apvlv/metadata.xml
+++ b/app-text/apvlv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/asa/metadata.xml b/app-text/asa/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/app-text/asa/metadata.xml
+++ b/app-text/asa/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/asciidoc/asciidoc-9.1.0.ebuild b/app-text/asciidoc/asciidoc-9.1.0.ebuild
index 43ecd600c6f..f3c86d982e9 100644
--- a/app-text/asciidoc/asciidoc-9.1.0.ebuild
+++ b/app-text/asciidoc/asciidoc-9.1.0.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
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index cde4f44f98a..bf7692827ca 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>marcec@gmx.de</email>
@@ -11,5 +11,7 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">asciidoc</remote-id>
+ <remote-id type="github">asciidoc-py/asciidoc-py</remote-id>
+ <bugs-to>https://github.com/asciidoc-py/asciidoc-py/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index 3e3880cf105..c07e13d4a6b 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 57f8c6d47b4..93a232547a2 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>mate@gentoo.org</email>
diff --git a/app-text/bact/metadata.xml b/app-text/bact/metadata.xml
index 38a3b6a3c08..514b83d226e 100644
--- a/app-text/bact/metadata.xml
+++ b/app-text/bact/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
index 7b2aa138b85..3dcb3e34c20 100644
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tamiko@gentoo.org</email>
diff --git a/app-text/bdf2psf/metadata.xml b/app-text/bdf2psf/metadata.xml
index de09ffd8b08..115e9d64a66 100644
--- a/app-text/bdf2psf/metadata.xml
+++ b/app-text/bdf2psf/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/bibclean/metadata.xml b/app-text/bibclean/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/bibclean/metadata.xml
+++ b/app-text/bibclean/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index d0646e7b464..2ff7a048d6f 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,2 +1,2 @@
DIST bibletime-3.0.1.tar.xz 1630180 BLAKE2B fe03cc8396f44ba0d68e27d50f60435c9d9501b620278c5d7565bea50c18f711675ac1020c6738790eb8452380ed974cba1a41bfb6f87778224d814c63e10aa3 SHA512 217e45c034d8fd8de4b7ef936f340a613fd7046b4700f828edd6d6f32f4bad4ecda2ec2c4425461af39c6926170fe080406238780e3c63bdbe0273679e0aef94
-DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
+DIST bibletime-3.0.2.tar.xz 1631828 BLAKE2B 7ff319e6810717391d7b4a8b96a63ac315bf1663dd4caaa742f9ec92a3a6490d238cdf4e13ea6aef45b7c6772d4c41ea498c181daa7a8d0abacc58ca59c39b4e SHA512 d374bf88844e63dead0da5dc3f951a7e6eca133e18067acf28432d1e9d12ac9f481fb7421d9b5ae4c76b5aff7eb05c083fa6828a58332d02a3975f1921d8914c
diff --git a/app-text/bibletime/bibletime-3.0.1.ebuild b/app-text/bibletime/bibletime-3.0.1.ebuild
index 1e4d38ca16f..9aa26c20e7e 100644
--- a/app-text/bibletime/bibletime-3.0.1.ebuild
+++ b/app-text/bibletime/bibletime-3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=app-text/sword-1.8.1
dev-cpp/clucene
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.2.ebuild
index bc31ba995fc..1e4d38ca16f 100644
--- a/app-text/bibletime/bibletime-3.0.ebuild
+++ b/app-text/bibletime/bibletime-3.0.2.ebuild
@@ -11,11 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Known to fail and will all be gone come next release (see upstream commit
-# d05797db79074c526987329dff78d89eef8c501c)
-RESTRICT="test"
+KEYWORDS="~amd64 ~x86"
RDEPEND=">=app-text/sword-1.8.1
dev-cpp/clucene
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index d5f2dfe886c..524103f2351 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index c72c9c3707b..c4cb296642d 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1 +1,2 @@
DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911
+DIST bibutils_7.1_src.tgz 620141 BLAKE2B f020ea7c8164a870ef4c72defae1adc11558661a7ae9f3b037115cfc4a9e71b4f37c64f3b74641182300c3e921b8a0c309257a468b6b32f4fc2915e4a36f04d1 SHA512 2a155ca60c97d37941c860635d8e6920bd78de84452e1fee93a2f7331392f6a43f2c10055e84349bcac89314025d1524fd5cc73c47ad1613baa7baf2667c3f33
diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
index fb3e20024c4..9b7f812f98c 100644
--- a/app-text/bibutils/bibutils-6.10.ebuild
+++ b/app-text/bibutils/bibutils-6.10.ebuild
@@ -16,11 +16,17 @@ KEYWORDS="amd64 ~ppc ~x86"
S="${WORKDIR}/${MY_P}"
+src_prepare() {
+ default
+ sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
+ sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
+}
+
src_configure() {
./configure \
- --dynamic \
- --install-dir "${ED}/usr/bin" \
- --install-lib "${ED}/usr/$(get_libdir)" || die
+ --install-dir /usr/bin \
+ --install-lib /usr/$(get_libdir) \
+ --dynamic || die
}
src_compile() {
@@ -36,3 +42,7 @@ src_test() {
DISTRO_CFLAGS="${CFLAGS}" \
LDFLAGSIN="${LDFLAGS}" test
}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+}
diff --git a/app-text/bibutils/bibutils-7.1.ebuild b/app-text/bibutils/bibutils-7.1.ebuild
new file mode 100644
index 00000000000..a54bd087935
--- /dev/null
+++ b/app-text/bibutils/bibutils-7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
+HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+ default
+ sed -ie 's/REPLACE_INSTALLDIR/${DESTDIR}&/' Makefile_start || die
+ sed -ie 's/REPLACE_LIBINSTALLDIR/${DESTDIR}&/' Makefile_start || die
+}
+
+src_configure() {
+ ./configure \
+ --install-dir /usr/bin \
+ --install-lib /usr/$(get_libdir) \
+ --dynamic || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ DISTRO_CFLAGS="${CFLAGS}" \
+ LDFLAGSIN="${LDFLAGS}"
+}
+
+src_test() {
+ emake \
+ CC="$(tc-getCC)" \
+ DISTRO_CFLAGS="${CFLAGS}" \
+ LDFLAGSIN="${LDFLAGS}" test
+}
diff --git a/app-text/bibutils/metadata.xml b/app-text/bibutils/metadata.xml
index cc8df557e38..d24e2cfca4c 100644
--- a/app-text/bibutils/metadata.xml
+++ b/app-text/bibutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/app-text/binfind/metadata.xml b/app-text/binfind/metadata.xml
index 79d462e8557..aaab041e888 100644
--- a/app-text/binfind/metadata.xml
+++ b/app-text/binfind/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index f470b619764..9e5e3851e78 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -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 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
IUSE="doc"
RDEPEND="dev-libs/xerces-c"
diff --git a/app-text/blahtexml/metadata.xml b/app-text/blahtexml/metadata.xml
index 1b2becffa26..bef24d2c233 100644
--- a/app-text/blahtexml/metadata.xml
+++ b/app-text/blahtexml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 0089acec57c..c6b4c49b927 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.20.0.tar.xz 347924 BLAKE2B faabb51237ff4ba3b431b84394cb8ca6f977770f9ed8c1ffbcc841773dc707b9a51694d7a5f3dbe5c573bdd7a16971004551b8ae2c0347273d8c246ae329bd82 SHA512 3738eb23341deb755dbfb0d2e98a73fe53f0e38b929606ebb0a3210d0564a626375d5c20ebff220e63be1f61299492da9061db5366d9d53a28f7ff18cff678a5
+DIST blogc-0.20.1.tar.xz 346280 BLAKE2B b2cf2c0ac0eaa857d91c75f7bcdf9e6b6ce0132e5a999719f9da3d32c7c336b8557f0e76b13ca02e6a20d67aef5cccedf01b3abe7b77dce6be612501d208eb8e SHA512 0e64e3da70ce52cec148210c140000b34cdafb848ae1fbd6160979de47738257a08af236e53e908f256d610ae6680bb554376c049246c32867b64985a637746c
diff --git a/app-text/blogc/blogc-0.20.0.ebuild b/app-text/blogc/blogc-0.20.1.ebuild
index 3b3a78e46d4..75b89915692 100644
--- a/app-text/blogc/blogc-0.20.0.ebuild
+++ b/app-text/blogc/blogc-0.20.1.ebuild
@@ -1,20 +1,19 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+DESCRIPTION="A blog compiler"
+HOMEPAGE="https://blogc.rgm.io/"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/blogc/blogc.git"
inherit git-r3 autotools
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
fi
-DESCRIPTION="A blog compiler"
-HOMEPAGE="https://blogc.rgm.io/"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- DEPEND="app-text/ronn"
+ BDEPEND="app-text/ronn"
else
KEYWORDS="~amd64 ~x86"
fi
@@ -25,12 +24,12 @@ IUSE="git httpd make test"
RESTRICT="!test? ( test )"
RDEPEND="git? ( dev-vcs/git )"
-
-DEPEND="${DEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
test? (
git? ( dev-vcs/git )
- dev-util/cmocka )"
+ )"
src_prepare() {
[[ ${PV} = *9999* ]] && eautoreconf
@@ -40,11 +39,13 @@ src_prepare() {
src_configure() {
local myconf=""
+
if [[ ${PV} = *9999* ]]; then
myconf+="--enable-ronn"
else
myconf+="--disable-ronn"
fi
+
econf \
$(use_enable test tests) \
$(use_enable git git-receiver) \
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index 3b3a78e46d4..75b89915692 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -1,20 +1,19 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+DESCRIPTION="A blog compiler"
+HOMEPAGE="https://blogc.rgm.io/"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/blogc/blogc.git"
inherit git-r3 autotools
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
fi
-DESCRIPTION="A blog compiler"
-HOMEPAGE="https://blogc.rgm.io/"
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- DEPEND="app-text/ronn"
+ BDEPEND="app-text/ronn"
else
KEYWORDS="~amd64 ~x86"
fi
@@ -25,12 +24,12 @@ IUSE="git httpd make test"
RESTRICT="!test? ( test )"
RDEPEND="git? ( dev-vcs/git )"
-
-DEPEND="${DEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
test? (
git? ( dev-vcs/git )
- dev-util/cmocka )"
+ )"
src_prepare() {
[[ ${PV} = *9999* ]] && eautoreconf
@@ -40,11 +39,13 @@ src_prepare() {
src_configure() {
local myconf=""
+
if [[ ${PV} = *9999* ]]; then
myconf+="--enable-ronn"
else
myconf+="--disable-ronn"
fi
+
econf \
$(use_enable test tests) \
$(use_enable git git-receiver) \
diff --git a/app-text/blogc/metadata.xml b/app-text/blogc/metadata.xml
index a650b4e025b..8c11c2e02d0 100644
--- a/app-text/blogc/metadata.xml
+++ b/app-text/blogc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/bogosort/metadata.xml b/app-text/bogosort/metadata.xml
index 46dbedede5f..e138ba20e25 100644
--- a/app-text/bogosort/metadata.xml
+++ b/app-text/bogosort/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 66484e06090..7a28c363894 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1 +1,2 @@
DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
+DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index faaa5b36fd2..ea434173b02 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -34,5 +34,6 @@ src_configure() {
pkg_postinst() {
# New version -> regen files
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
new file mode 100644
index 00000000000..3deb1d96043
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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 ~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
+ # create directory if needed
+ mkdir -p "${EROOT}"/run/lock
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
+}
diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/build-docbook-catalog/metadata.xml
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/c2ps/metadata.xml b/app-text/c2ps/metadata.xml
index c439b06d8c8..e2fedda90ee 100644
--- a/app-text/c2ps/metadata.xml
+++ b/app-text/c2ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index eae60e865b0..b964061e63a 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,2 +1,4 @@
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
diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 497d1187304..32b84b85f21 100644
--- a/app-text/calibre/calibre-5.16.1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6,sqlite,ssl"
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=sys-apps/dbus-1.10.8
$(python_gen_cond_dep '
>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${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}]
@@ -123,12 +123,9 @@ src_prepare() {
# 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"
-
- if ! has_version ">=dev-python/sip-5"; then
- einfo "Applying SIP v4 patch because SIP v5 was not detected"
- eapply "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
- fi
+ "${FILESDIR}/${PN}-disable_plugins.patch" \
+ "${FILESDIR}/${P}-zeroconf.patch" \
+ "${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
eapply_user
diff --git a/app-text/calibre/calibre-5.25.0-r2.ebuild b/app-text/calibre/calibre-5.25.0-r2.ebuild
new file mode 100644
index 00000000000..40fa50fcc40
--- /dev/null
+++ b/app-text/calibre/calibre-5.25.0-r2.ebuild
@@ -0,0 +1,263 @@
+# 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
new file mode 100644
index 00000000000..40fa50fcc40
--- /dev/null
+++ b/app-text/calibre/calibre-5.30.0.ebuild
@@ -0,0 +1,263 @@
+# 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/files/calibre-5.16.1-zeroconf.patch b/app-text/calibre/files/calibre-5.16.1-zeroconf.patch
new file mode 100644
index 00000000000..68c09d219c6
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.16.1-zeroconf.patch
@@ -0,0 +1,30 @@
+diff --color -Naru a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
+--- a/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:32:03.104016444 +0200
++++ b/src/calibre/devices/smart_device_app/driver.py 2021-08-08 08:33:30.699018403 +0200
+@@ -2040,13 +2040,6 @@
+ # Function to monkeypatch zeroconf to remove the 15 character name length restriction.
+ # Copied from https://github.com/jstasiak/python-zeroconf version 0.28.1
+
+-
+-from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z,
+- _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE,
+- _HAS_ASCII_CONTROL_CHARS,
+- _HAS_ONLY_A_TO_Z_NUM_HYPHEN)
+-
+-
+ def service_type_name(type_: str, *, allow_underscores: bool = False) -> str:
+ """
+ Validate a fully qualified service name, instance or subtype. [rfc6763]
+@@ -2087,6 +2080,12 @@
+ :param type_: Type, SubType or service name to validate
+ :return: fully qualified service name (eg: _http._tcp.local.)
+ """
++
++ from zeroconf import (BadTypeInNameException, _HAS_A_TO_Z,
++ _HAS_ONLY_A_TO_Z_NUM_HYPHEN_UNDERSCORE,
++ _HAS_ASCII_CONTROL_CHARS,
++ _HAS_ONLY_A_TO_Z_NUM_HYPHEN)
++
+ if not (type_.endswith('._tcp.local.') or type_.endswith('._udp.local.')):
+ raise BadTypeInNameException("Type '%s' must end with '._tcp.local.' or '._udp.local.'" % type_)
+
diff --git a/app-text/calibre/files/calibre-disable_plugins.patch b/app-text/calibre/files/calibre-disable_plugins.patch
index 9ef1dd04251..9bd6893a4ae 100644
--- a/app-text/calibre/files/calibre-disable_plugins.patch
+++ b/app-text/calibre/files/calibre-disable_plugins.patch
@@ -6,12 +6,6 @@ Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
===================================================================
--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100
+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100
-@@ -28,8 +28,6 @@
- pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
- cm('welcome wizard', _('Run welcome wizard'),
- icon='wizard.png', triggered=self.gui.run_wizard)
+@@ -33,2 +32,0 @@
- cm('plugin updater', _('Get plugins to enhance calibre'),
- icon='plugins/plugin_updater.png', triggered=self.get_plugins)
- if not DEBUG:
- pm.addSeparator()
- cm('restart', _('Restart in debug mode'), icon='debug.png',
diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
index c7f35ac2f85..8165729d6a4 100644
--- a/app-text/calibre/metadata.xml
+++ b/app-text/calibre/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/app-text/capyt/metadata.xml b/app-text/capyt/metadata.xml
index 302b667eb00..43a7697782e 100644
--- a/app-text/capyt/metadata.xml
+++ b/app-text/capyt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>juippis@gentoo.org</email>
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
index c3758c22051..6940f7b90c3 100644
--- a/app-text/catdoc/catdoc-0.95-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
}
src_configure() {
- econf --with-install-root="${D}" \
+ econf \
$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
$(use_enable tk wordview)
}
@@ -41,7 +41,7 @@ src_compile() {
}
src_install() {
- default
+ emake install installroot="${ED}"
# dev-libs/libxls and app-text/catdoc both provide xls2cvs
if [[ -e ${ED}/usr/bin/xls2csv ]]; then
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml
index 57bbf03e3c9..faf815a1d97 100644
--- a/app-text/cb2bib/metadata.xml
+++ b/app-text/cb2bib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml
index b3c1d365eaa..f8003ca6d19 100644
--- a/app-text/cedilla/metadata.xml
+++ b/app-text/cedilla/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>titanofold@gentoo.org</email>
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
index e8557113ca4..179bcc124be 100644
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/chasen-legacy/32224/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~sparc-solaris"
IUSE="perl static-libs"
DEPEND=">=dev-libs/darts-0.32"
diff --git a/app-text/chasen/metadata.xml b/app-text/chasen/metadata.xml
index edc470c136a..7f50ab9cb7b 100644
--- a/app-text/chasen/metadata.xml
+++ b/app-text/chasen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index 33e0b920375..850e860f9c4 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 1b6ebbb7e33..f6800339eee 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,2 +1,2 @@
DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-DIST cmark-0.30.0.tar.gz 244190 BLAKE2B 71061a472aed262928e1dc9103241d5e73465781238af4c366e79d818c82041932b534015758426c2b2dd6313acadfb6d9be0b931701c67577e8b4421a781ec4 SHA512 53bbb8cdcac5431b88000f69df0aecfc7bd0d9ec0f7bc5a343281ca75e98304ef2674f55f76733acd81f8e8b9079eefabc9b3f3ef7dcd64087497282f17034a9
+DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
diff --git a/app-text/cmark/cmark-0.30.0.ebuild b/app-text/cmark/cmark-0.30.2.ebuild
index 9a1437df5f0..67faa19c8c5 100644
--- a/app-text/cmark/cmark-0.30.0.ebuild
+++ b/app-text/cmark/cmark-0.30.2.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
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-any-r1
@@ -12,12 +12,12 @@ HOMEPAGE="https://github.com/commonmark/cmark"
SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
-SLOT="0/0.30.0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
pkg_setup() {
use test && python-any-r1_pkg_setup
diff --git a/app-text/cmark/metadata.xml b/app-text/cmark/metadata.xml
index d8780cb2ed5..931b2156ee9 100644
--- a/app-text/cmark/metadata.xml
+++ b/app-text/cmark/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>azamat.hackimov@gmail.com</email>
diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
index 6f2ca22da23..a94766977fa 100644
--- a/app-text/cmigemo/metadata.xml
+++ b/app-text/cmigemo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/code2html/metadata.xml b/app-text/code2html/metadata.xml
index a669204029f..c4cda555914 100644
--- a/app-text/code2html/metadata.xml
+++ b/app-text/code2html/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index e534ab320b3..840c6a5c1e1 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/convertlit/metadata.xml b/app-text/convertlit/metadata.xml
index d566173e69a..e5a5ef959c3 100644
--- a/app-text/convertlit/metadata.xml
+++ b/app-text/convertlit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml
index c7be278b645..2ac0eef8d76 100644
--- a/app-text/convmv/metadata.xml
+++ b/app-text/convmv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 829b30a9272..d0f98b60e95 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1 +1,3 @@
DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
+DIST coolreader-3.2.58.tar.gz 13454079 BLAKE2B e3b85ffbb3e4023a8c0567879a4a67d21141c1025b58f7d2c5017cab773e989e797229529440167a8c83db810f599566a77aaaab06b34081472f0e4b20293ec9 SHA512 d1d3e60bf5b73c20617937850912d7c452863bd5c91f0154be320ad256f774f368039896ad5e8acfc3cafa7361e8c11ca526accf0a14dabb79f059255989bac6
+DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6
diff --git a/app-text/coolreader/coolreader-3.2.57.ebuild b/app-text/coolreader/coolreader-3.2.57-r1.ebuild
index 7e824ab85bc..ee6aad129b3 100644
--- a/app-text/coolreader/coolreader-3.2.57.ebuild
+++ b/app-text/coolreader/coolreader-3.2.57-r1.ebuild
@@ -24,7 +24,7 @@ CDEPEND="sys-libs/zlib
media-libs/freetype
dev-libs/fribidi
media-libs/fontconfig
- media-libs/harfbuzz
+ media-libs/harfbuzz:=
dev-libs/libunibreak
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
diff --git a/app-text/coolreader/coolreader-3.2.58-r1.ebuild b/app-text/coolreader/coolreader-3.2.58-r1.ebuild
new file mode 100644
index 00000000000..185afe5052b
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.58-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake plocale wxwidgets xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+ media-libs/libpng:0
+ virtual/jpeg:0
+ media-libs/freetype
+ dev-libs/fribidi
+ media-libs/fontconfig
+ media-libs/harfbuzz:=
+ dev-libs/libunibreak
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+ !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+ !wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+ wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+ cmake_src_prepare
+ xdg_src_prepare
+
+ # locales
+ plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+ sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
+ -i "${S}"/cr3qt/CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ CMAKE_BUILD_TYPE="Release"
+ if use wxwidgets; then
+ setup-wxwidgets
+ local mycmakeargs=(-D GUI=WX)
+ else
+ local mycmakeargs=(-D GUI=QT5)
+ fi
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ if ! use wxwidgets; then
+ mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+ rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+ gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+ gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+ fi
+}
diff --git a/app-text/coolreader/coolreader-3.2.59-r2.ebuild b/app-text/coolreader/coolreader-3.2.59-r2.ebuild
new file mode 100644
index 00000000000..187ca478a5b
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.59-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake plocale wxwidgets xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+ app-arch/zstd
+ media-libs/libpng:0
+ virtual/jpeg:0
+ media-libs/freetype
+ dev-libs/fribidi
+ media-libs/fontconfig
+ media-libs/harfbuzz:=
+ dev-libs/libunibreak
+ dev-libs/libutf8proc
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+ !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+ !wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+ wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch )
+
+src_prepare() {
+ cmake_src_prepare
+ xdg_environment_reset
+
+ # locales
+ plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+ sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
+ -i "${S}"/cr3qt/CMakeLists.txt \
+ || die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ CMAKE_BUILD_TYPE="Release"
+ if use wxwidgets; then
+ setup-wxwidgets
+ local mycmakeargs=(-DGUI=WX)
+ else
+ local mycmakeargs=(-DGUI=QT5)
+ fi
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ if ! use wxwidgets; then
+ mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+ rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+ gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+ gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+ fi
+}
diff --git a/app-text/coolreader/files/coolreader-wxwidgets.patch b/app-text/coolreader/files/coolreader-wxwidgets.patch
new file mode 100644
index 00000000000..aac02864b0e
--- /dev/null
+++ b/app-text/coolreader/files/coolreader-wxwidgets.patch
@@ -0,0 +1,109 @@
+From 2040a15d2a23ee4d16af8f2294e1593fa267e8d9 Mon Sep 17 00:00:00 2001
+From: Aleksey Chernov <valexlin@gmail.com>
+Date: Thu, 9 Sep 2021 10:41:38 +0400
+Subject: [PATCH] Fixed wxWidgets build failure: compilation error due to API
+ change. Introduced in c47cab44799475a48230312b8e97cd7a71edddb0.
+
+---
+ cr3wx/src/view.cpp | 82 ++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 61 insertions(+), 21 deletions(-)
+
+diff --git a/cr3wx/src/view.cpp b/cr3wx/src/view.cpp
+index df2a264f7f..2ee30f9421 100644
+--- a/cr3wx/src/view.cpp
++++ b/cr3wx/src/view.cpp
+@@ -307,33 +307,73 @@ void cr3view::OnTimer(wxTimerEvent& event)
+ }
+ }
+
+-void cr3view::Paint()
++static bool getBatteryState(int& state, int& chargingConn, int& level)
+ {
+- //printf("cr3view::Paint() \n");
+- int battery_state = -1;
+ #ifdef _WIN32
++ // update battery state
+ SYSTEM_POWER_STATUS bstatus;
+ BOOL pow = GetSystemPowerStatus(&bstatus);
+- if (bstatus.BatteryFlag & 128)
+- pow = FALSE;
+- if (bstatus.ACLineStatus!=0 || bstatus.BatteryLifePercent==255)
+- pow = FALSE;
+- if ( pow )
+- battery_state = bstatus.BatteryLifePercent;
++ if (pow) {
++ state = CR_BATTERY_STATE_DISCHARGING;
++ if (bstatus.BatteryFlag & 128)
++ state = CR_BATTERY_STATE_NO_BATTERY; // no system battery
++ else if (bstatus.BatteryFlag & 8)
++ state = CR_BATTERY_STATE_CHARGING; // charging
++ chargingConn = CR_BATTERY_CHARGER_NO;
++ if (bstatus.ACLineStatus==1)
++ chargingConn = CR_BATTERY_CHARGER_AC; // AC power charging connected
++ if (bstatus.BatteryLifePercent>=0 && bstatus.BatteryLifePercent<=100)
++ level = bstatus.BatteryLifePercent;
++ return true;
++ }
++ return false;
+ #else
+- if ( ::wxGetPowerType() == wxPOWER_BATTERY ) {
+- int n = ::wxGetBatteryState();
+- if ( n == wxBATTERY_NORMAL_STATE )
+- battery_state = 100;
+- else if ( n == wxBATTERY_LOW_STATE )
+- battery_state = 50;
+- else if ( n == wxBATTERY_CRITICAL_STATE )
+- battery_state = 0;
+- else if ( n == wxBATTERY_SHUTDOWN_STATE )
+- battery_state = 0;
+- };
++ wxPowerType wxpwrtype = wxGetPowerType();
++ switch (wxpwrtype) {
++ case wxPOWER_SOCKET:
++ state = CR_BATTERY_STATE_CHARGING;
++ chargingConn = CR_BATTERY_CHARGER_AC;
++ break;
++ case wxPOWER_BATTERY:
++ state = CR_BATTERY_STATE_DISCHARGING;
++ chargingConn = CR_BATTERY_CHARGER_NO;
++ break;
++ default:
++ state = CR_BATTERY_STATE_NO_BATTERY;
++ chargingConn = CR_BATTERY_CHARGER_NO;
++ break;
++ }
++ wxBatteryState wxbatstate = wxGetBatteryState();
++ switch (wxbatstate) {
++ case wxBATTERY_NORMAL_STATE:
++ level = 100;
++ break;
++ case wxBATTERY_LOW_STATE:
++ level = 50;
++ break;
++ case wxBATTERY_CRITICAL_STATE:
++ level = 5;
++ break;
++ case wxBATTERY_SHUTDOWN_STATE:
++ level = 0;
++ break;
++ default:
++ level = 0;
++ break;
++ }
++ return true;
+ #endif
+- getDocView()->setBatteryState( battery_state );
++}
++
++void cr3view::Paint()
++{
++ //printf("cr3view::Paint() \n");
++ int battery_state;
++ int charging_conn;
++ int charge_level;
++ if (getBatteryState(battery_state, charging_conn, charge_level)) {
++ getDocView()->setBatteryState( battery_state, charging_conn, charge_level );
++ }
+ //_docview->Draw();
+ UpdateScrollBar();
+ Refresh( FALSE );
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
index 0bc14087cc2..d51eccb7c80 100644
--- a/app-text/coolreader/metadata.xml
+++ b/app-text/coolreader/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/cpdf/metadata.xml b/app-text/cpdf/metadata.xml
index a6f3d7a17c8..ab661943a41 100644
--- a/app-text/cpdf/metadata.xml
+++ b/app-text/cpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index edc6c2bf83c..7b15ca6515d 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index 6948a216bce..db1d29d9325 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/cssmin/Manifest b/app-text/cssmin/Manifest
new file mode 100644
index 00000000000..ea1eaab6805
--- /dev/null
+++ b/app-text/cssmin/Manifest
@@ -0,0 +1 @@
+DIST cssmin-0.2.0.tar.gz 3228 BLAKE2B 2322d7c38e334234b11292c24752549404ce8c70068c6c70a1c6e227a9f63a721a923dbb3006199df2e96fc5c0aba44349a6d8ce33791aff2dc1275e186b8961 SHA512 9422152578bf28cf7c3eb063c1f0dd3604a3d8fa73cd81cde09ae297ab27669126c230ef40a2e8c37083c1e781ab977554f9012e60979fe431ceb83d43452a9d
diff --git a/app-text/cssmin/cssmin-0.2.0.ebuild b/app-text/cssmin/cssmin-0.2.0.ebuild
new file mode 100644
index 00000000000..03344db2ee8
--- /dev/null
+++ b/app-text/cssmin/cssmin-0.2.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of the YUI CSS compression algorithm"
+HOMEPAGE="https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-text/cssmin/metadata.xml b/app-text/cssmin/metadata.xml
new file mode 100644
index 00000000000..48e52c4496a
--- /dev/null
+++ b/app-text/cssmin/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="pypi">cssmin</remote-id>
+ <remote-id type="github">zacharyvoase/cssmin</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
index 0c8e3f8c107..003d130a6b5 100644
--- a/app-text/cuneiform/metadata.xml
+++ b/app-text/cuneiform/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/cwtext/metadata.xml b/app-text/cwtext/metadata.xml
index 303a257b21e..5729a3ce967 100644
--- a/app-text/cwtext/metadata.xml
+++ b/app-text/cwtext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml
index 708c728bb7e..a7fbda3ebab 100644
--- a/app-text/dbacl/metadata.xml
+++ b/app-text/dbacl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index bf46b5ae0c8..cad3460da6c 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
inherit distutils-r1
@@ -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 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="inkscape"
RDEPEND="
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index 08fd7881b0f..84b40f0ce16 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>zoltan@sinustrom.info</email>
diff --git a/app-text/delta/metadata.xml b/app-text/delta/metadata.xml
index 493b7194651..5b571a9d257 100644
--- a/app-text/delta/metadata.xml
+++ b/app-text/delta/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
diff --git a/app-text/dictd/dictd-1.13.0-r3.ebuild b/app-text/dictd/dictd-1.13.0-r3.ebuild
index 342d7ec8462..382b8c1052a 100644
--- a/app-text/dictd/dictd-1.13.0-r3.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
LICENSE="GPL-1+ GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="dbi judy minimal test"
RESTRICT="!test? ( test )"
@@ -28,6 +28,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
>=sys-apps/gawk-3.1.6
+ sys-devel/flex
virtual/yacc
test? ( !~sys-apps/gawk-4.2.1 )
"
diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml
index 0ecc963168a..d7d240c1624 100644
--- a/app-text/dictd/metadata.xml
+++ b/app-text/dictd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 50f56e7e101..802a5254041 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
diff --git a/app-text/diff-pdf/metadata.xml b/app-text/diff-pdf/metadata.xml
index 45125b9b6e9..f2908ee10b5 100644
--- a/app-text/diff-pdf/metadata.xml
+++ b/app-text/diff-pdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/app-text/diffpdf/metadata.xml b/app-text/diffpdf/metadata.xml
index 62f8df43d2e..853c0d96f91 100644
--- a/app-text/diffpdf/metadata.xml
+++ b/app-text/diffpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>reavertm@gentoo.org</email>
diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml
index 95aa13f6c5e..99e2666c588 100644
--- a/app-text/ding/metadata.xml
+++ b/app-text/ding/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>
diff --git a/app-text/discount/metadata.xml b/app-text/discount/metadata.xml
index c67d4dcaca5..aa20bff17b1 100644
--- a/app-text/discount/metadata.xml
+++ b/app-text/discount/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
diff --git a/app-text/djview/metadata.xml b/app-text/djview/metadata.xml
index 73ad11b1a6a..5d6d042f8e8 100644
--- a/app-text/djview/metadata.xml
+++ b/app-text/djview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/djvu/metadata.xml b/app-text/djvu/metadata.xml
index 775c1334667..ad9fd52b789 100644
--- a/app-text/djvu/metadata.xml
+++ b/app-text/djvu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index 9842e9a0785..382383a9935 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
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-r1.ebuild
index 484d0e72473..db8c331274e 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-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
diff --git a/app-text/docbook-sgml-dtd/metadata.xml b/app-text/docbook-sgml-dtd/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/docbook-sgml-dtd/metadata.xml
+++ b/app-text/docbook-sgml-dtd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index e57bb4319ef..e1e2cfbd990 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
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 f049bf68fff..e3188ba498f 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
@@ -51,14 +51,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index ee06649a6b4..ee19a3db01c 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
@@ -51,14 +51,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index ee06649a6b4..ee19a3db01c 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
@@ -51,14 +51,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 175a7581c5e..b9ce7d99daf 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
@@ -52,14 +52,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 175a7581c5e..b9ce7d99daf 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
@@ -52,14 +52,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/docbook-xml-dtd/metadata.xml
+++ b/app-text/docbook-xml-dtd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index 2f7d18739a2..4650a13e7f0 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -38,14 +38,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-simple-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index 8e164c62c15..ebc3aba11d4 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -41,14 +41,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-simple-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 64ebd01a124..5e77faad079 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -38,14 +38,18 @@ pkg_preinst() {
pkg_postinst() {
local backup=${T}/xml-simple-docbook-${PV}.cat
local real=${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat
+
if ! cmp -s "${backup}" "${real}"; then
cp "${backup}" "${real}" || die
fi
- build-docbook-catalog
+
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postinst
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
sgml-catalog-r1_pkg_postrm
}
diff --git a/app-text/docbook-xml-simple-dtd/metadata.xml b/app-text/docbook-xml-simple-dtd/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/docbook-xml-simple-dtd/metadata.xml
+++ b/app-text/docbook-xml-simple-dtd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
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 1755483b705..d45bb7f2656 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
@@ -72,9 +72,11 @@ EOF
}
pkg_postinst() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
}
diff --git a/app-text/docbook-xsl-ns-stylesheets/metadata.xml b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
index cb97b29419e..385cd4b9beb 100644
--- a/app-text/docbook-xsl-ns-stylesheets/metadata.xml
+++ b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<use>
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 57242978424..1e1416abedf 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
@@ -94,9 +94,11 @@ EOF
}
pkg_postinst() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
}
pkg_postrm() {
- build-docbook-catalog
+ # See bug #816303 for rationale behind die
+ build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
}
diff --git a/app-text/docbook-xsl-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml
index cef0d5fef5c..e170e24574b 100644
--- a/app-text/docbook-xsl-stylesheets/metadata.xml
+++ b/app-text/docbook-xsl-stylesheets/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/docbook2X/metadata.xml b/app-text/docbook2X/metadata.xml
index f5186760fa4..228501cf1f7 100644
--- a/app-text/docbook2X/metadata.xml
+++ b/app-text/docbook2X/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/docx2txt/metadata.xml b/app-text/docx2txt/metadata.xml
index 1dee59e685b..db310c1d76e 100644
--- a/app-text/docx2txt/metadata.xml
+++ b/app-text/docx2txt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/dos2unix/metadata.xml b/app-text/dos2unix/metadata.xml
index 963ee8fb3de..ef6bd76d6bb 100644
--- a/app-text/dos2unix/metadata.xml
+++ b/app-text/dos2unix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
index 08df7bc3b39..9412c9dcc95 100644
--- a/app-text/dvipng/metadata.xml
+++ b/app-text/dvipng/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
index ee98901e570..84f1ed701a1 100644
--- a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
@@ -28,7 +28,7 @@ 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"
IUSE="doc source"
-DEPEND=">=dev-libs/kpathsea-6.2.1"
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
BDEPEND="virtual/pkgconfig"
diff --git a/app-text/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml
index c4b55593420..52546db0796 100644
--- a/app-text/dvipsk/metadata.xml
+++ b/app-text/dvipsk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 1386e9392b6..f385c668afb 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/app-text/dvisvgm/dvisvgm-2.12.ebuild b/app-text/dvisvgm/dvisvgm-2.12.ebuild
new file mode 100644
index 00000000000..1c8d9fa3d37
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND=">=app-arch/brotli-1.0.5:=
+ app-text/ghostscript-gpl:=
+ dev-libs/kpathsea:=
+ dev-libs/openssl:=
+ >=dev-libs/xxhash-0.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}
+ test? ( dev-cpp/gtest )"
+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/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
index 23a377bd57d..08f80fcdf5f 100644
--- a/app-text/dvisvgm/metadata.xml
+++ b/app-text/dvisvgm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
index 5b0050533e9..4e293663956 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86"
IUSE="+lit2epub"
DEPEND="
diff --git a/app-text/ebook-tools/metadata.xml b/app-text/ebook-tools/metadata.xml
index b2aa1c1313b..196bd564704 100644
--- a/app-text/ebook-tools/metadata.xml
+++ b/app-text/ebook-tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
index c79152307cf..2b2c11d556d 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.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://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="cli doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/editorconfig-core-c/metadata.xml b/app-text/editorconfig-core-c/metadata.xml
index 639c3f19060..fe78564c2b5 100644
--- a/app-text/editorconfig-core-c/metadata.xml
+++ b/app-text/editorconfig-core-c/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<upstream>
<remote-id type="github">editorconfig/editorconfig-core-c</remote-id>
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 2d92bfdd7f6..556ae82eb87 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,2 +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
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 7a5f39aa232..595d263abfd 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="aspell +hunspell static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.3.1.ebuild b/app-text/enchant/enchant-2.3.1.ebuild
new file mode 100644
index 00000000000..66d254be6a2
--- /dev/null
+++ b/app-text/enchant/enchant-2.3.1.ebuild
@@ -0,0 +1,47 @@
+# 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/metadata.xml b/app-text/enchant/metadata.xml
index 7f09ef69f50..3033ca238ad 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
index c439b06d8c8..e2fedda90ee 100644
--- a/app-text/enscript/metadata.xml
+++ b/app-text/enscript/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/epspdf/metadata.xml b/app-text/epspdf/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/epspdf/metadata.xml
+++ b/app-text/epspdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 285d5ecb3f1..96cdb44c516 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.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="http://www.ghostgum.com.au/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="app-text/ghostscript-gpl"
RDEPEND="${DEPEND}"
diff --git a/app-text/epstool/metadata.xml b/app-text/epstool/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/epstool/metadata.xml
+++ b/app-text/epstool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/evince/evince-40.4.ebuild b/app-text/evince/evince-40.4.ebuild
index f3d4f7e417e..d64fa863654 100644
--- a/app-text/evince/evince-40.4.ebuild
+++ b/app-text/evince/evince-40.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-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"
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
@@ -70,7 +70,7 @@ PATCHES=(
)
src_prepare() {
- default
+ xdg_src_prepare
# Do not depend on adwaita-icon-theme, bug #326855, #391859
# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
@@ -114,14 +114,12 @@ src_configure() {
meson_src_configure
}
-src_compile() {
- meson_src_compile
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
}
-src_test() {
- meson_src_test
-}
-
-src_install() {
- meson_src_install
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
}
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index 12e56453922..97826857755 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/expander/metadata.xml b/app-text/expander/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/expander/metadata.xml
+++ b/app-text/expander/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/extract_url/metadata.xml b/app-text/extract_url/metadata.xml
index ad9e7554f68..dbfea27111b 100644
--- a/app-text/extract_url/metadata.xml
+++ b/app-text/extract_url/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/fb2edit/Manifest b/app-text/fb2edit/Manifest
deleted file mode 100644
index 5efe364483a..00000000000
--- a/app-text/fb2edit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fb2edit-0.1.0.tar.gz 244667 BLAKE2B 332ba2801a346ef667760ff9f116aec6ae3ef93c7d862884514982bcc6adfd5413b22beb40859cc28ca297548e2e8f1c95885c2e68734c554922965d53c8f7ab SHA512 f13d45987a513fa9ea8139b195cda77dd39d4d680b5a826882b8b9d6d5704f10ed4b447070f1de39997b3be0fafa8378fe1261ff2d1e53cf9b3225c07a293d08
diff --git a/app-text/fb2edit/fb2edit-0.1.0.ebuild b/app-text/fb2edit/fb2edit-0.1.0.ebuild
deleted file mode 100644
index 1eaa7cee867..00000000000
--- a/app-text/fb2edit/fb2edit-0.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake xdg
-DESCRIPTION="Create and edit fb2 books"
-HOMEPAGE="https://github.com/vitlav/fb2edit"
-SRC_URI="https://github.com/vitlav/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtwebkit:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- dev-libs/libxml2:2"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare () {
- cmake_src_prepare
-}
diff --git a/app-text/fb2edit/metadata.xml b/app-text/fb2edit/metadata.xml
deleted file mode 100644
index e236be2dcc2..00000000000
--- a/app-text/fb2edit/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>grozin@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">vitlav/fb2edit</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/fblog/metadata.xml b/app-text/fblog/metadata.xml
index 715b1052cb7..96ceda888ca 100644
--- a/app-text/fblog/metadata.xml
+++ b/app-text/fblog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/fbpdf/metadata.xml b/app-text/fbpdf/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/app-text/fbpdf/metadata.xml
+++ b/app-text/fbpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
index c7713ae7f27..ffee515991e 100644
--- a/app-text/fbreader/metadata.xml
+++ b/app-text/fbreader/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/fictionup/metadata.xml b/app-text/fictionup/metadata.xml
index 985c9143d19..f4e295b81e8 100644
--- a/app-text/fictionup/metadata.xml
+++ b/app-text/fictionup/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/flpsed/metadata.xml b/app-text/flpsed/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/flpsed/metadata.xml
+++ b/app-text/flpsed/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/foliate/metadata.xml b/app-text/foliate/metadata.xml
index 7c05fa08f38..86063f52e8d 100644
--- a/app-text/foliate/metadata.xml
+++ b/app-text/foliate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 6bdcc0767c2..c4e41390ab8 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,6 +1,8 @@
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-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
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
new file mode 100644
index 00000000000..779bedad4bd
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-CVE-2021-3781.patch
@@ -0,0 +1,213 @@
+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
new file mode 100644
index 00000000000..38f0eaa1516
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps-2.patch
@@ -0,0 +1,96 @@
+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
new file mode 100644
index 00000000000..51ce95958ba
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
@@ -0,0 +1,112 @@
+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/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
new file mode 100644
index 00000000000..d112d005195
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+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/latest/debian/patches
+ 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
+ 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
new file mode 100644
index 00000000000..9f00300df38
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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.55-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 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/openjpeg-2.1.0:2=
+ >=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 ) )
+ 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/latest/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 \
+ --enable-openjpeg \
+ --disable-compile-inits \
+ --with-drivers=ALL \
+ --with-fontpath="$FONTPATH" \
+ --with-ijs \
+ --with-jbig2dec \
+ --with-libpaper \
+ --with-system-libtiff \
+ $(use_enable cups) \
+ $(use_enable dbus) \
+ $(use_enable gtk) \
+ $(use_with cups pdftoraster) \
+ $(use_with unicode libidn) \
+ $(use_with X x) \
+ DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+ cd "${S}/ijs" || die
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake so all
+
+ cd ijs || die
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-so install
+
+ # move gsc to gs, bug #343447
+ # gsc collides with gambit, bug #253064
+ mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+ cd "${S}/ijs" || die
+ emake DESTDIR="${D}" install
+
+ # 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/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index aa055c05a0b..9da8ae5ef67 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>codec@gentoo.org</email>
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index 4cbddcaa19a..c6e394b17a2 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
index de812a8b64b..20f8c25eb8a 100644
--- a/app-text/gocr/metadata.xml
+++ b/app-text/gocr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.5.2-r2.ebuild
index bcc8bb3ea4c..77bd4c34223 100644
--- a/app-text/grip/grip-4.5.2-r2.ebuild
+++ b/app-text/grip/grip-4.5.2-r2.ebuild
@@ -4,7 +4,6 @@
EAPI=7
PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
diff --git a/app-text/grip/metadata.xml b/app-text/grip/metadata.xml
index bb0121d9f63..96476934325 100644
--- a/app-text/grip/metadata.xml
+++ b/app-text/grip/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bkohler@gentoo.org</email>
diff --git a/app-text/groonga-normalizer-mysql/metadata.xml b/app-text/groonga-normalizer-mysql/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/groonga-normalizer-mysql/metadata.xml
+++ b/app-text/groonga-normalizer-mysql/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 42a2573c623..8d14952aa04 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/grutatxt/metadata.xml b/app-text/grutatxt/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/grutatxt/metadata.xml
+++ b/app-text/grutatxt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.9.1.ebuild
index f754d7d1f1f..8228c7822e6 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 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/app-text/gspell/metadata.xml
+++ b/app-text/gspell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
index 4dcc29ecf4b..d2a9465c87c 100644
--- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
index 679cc5564c8..9e36430f1a6 100644
--- a/app-text/gtkspell/gtkspell-3.0.10.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="3/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gtkspell/metadata.xml b/app-text/gtkspell/metadata.xml
index 12e634dd940..f81ad141804 100644
--- a/app-text/gtkspell/metadata.xml
+++ b/app-text/gtkspell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index 8a993fd39f8..64f3ff5e69d 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/gv/metadata.xml b/app-text/gv/metadata.xml
index c439b06d8c8..e2fedda90ee 100644
--- a/app-text/gv/metadata.xml
+++ b/app-text/gv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/hd2u/metadata.xml b/app-text/hd2u/metadata.xml
index 3cf14bf7463..6258504e513 100644
--- a/app-text/hd2u/metadata.xml
+++ b/app-text/hd2u/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index 0772a0b94e4..c9571abe99d 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples qt5"
REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/highlight/metadata.xml b/app-text/highlight/metadata.xml
index 852927a9d00..19b56b196be 100644
--- a/app-text/highlight/metadata.xml
+++ b/app-text/highlight/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/hnb/metadata.xml b/app-text/hnb/metadata.xml
index b426f3b5f74..b3064f5795a 100644
--- a/app-text/hnb/metadata.xml
+++ b/app-text/hnb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/app-text/htag/metadata.xml b/app-text/htag/metadata.xml
index 3e927f8d748..df1ea8d8452 100644
--- a/app-text/htag/metadata.xml
+++ b/app-text/htag/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/html-xml-utils/metadata.xml b/app-text/html-xml-utils/metadata.xml
index 294c350c696..bd8bcb2854e 100644
--- a/app-text/html-xml-utils/metadata.xml
+++ b/app-text/html-xml-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>monsieurp@gentoo.org</email>
diff --git a/app-text/html2text/metadata.xml b/app-text/html2text/metadata.xml
index a53ffbea77d..3d1a383e5d9 100644
--- a/app-text/html2text/metadata.xml
+++ b/app-text/html2text/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grobian@gentoo.org</email>
diff --git a/app-text/html401/metadata.xml b/app-text/html401/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/html401/metadata.xml
+++ b/app-text/html401/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/app-text/htmlc/metadata.xml
+++ b/app-text/htmlc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
index f6208173d9c..8eab97c666e 100644
--- a/app-text/htmldoc/metadata.xml
+++ b/app-text/htmldoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/htmlinc/metadata.xml b/app-text/htmlinc/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/htmlinc/metadata.xml
+++ b/app-text/htmlinc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index c58e6016ce1..6cdeeaa6b4c 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
@@ -19,7 +18,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
distutils_enable_tests setup.py
diff --git a/app-text/htmlmin/metadata.xml b/app-text/htmlmin/metadata.xml
index 86d2c7f7283..d57782f9638 100644
--- a/app-text/htmlmin/metadata.xml
+++ b/app-text/htmlmin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>python@gentoo.org</email>
@@ -9,6 +9,7 @@
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="pypi">htmlmin</remote-id>
<remote-id type="github">mankyd/htmlmin</remote-id>
diff --git a/app-text/htmlrecode/metadata.xml b/app-text/htmlrecode/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/htmlrecode/metadata.xml
+++ b/app-text/htmlrecode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index bf1af04e9c9..4df9f10537d 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,3 +1 @@
DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
-DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
-DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
deleted file mode 100644
index b4d6158ea04..00000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
-From: Geoff McLane <ubuntu@geoffair.info>
-Date: Wed, 3 Jun 2015 20:26:03 +0200
-Subject: [PATCH] Issue #217 - avoid len going negative, ever...
-
----
- src/lexer.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index 376a3d8..664f806 100644
---- a/src/lexer.c
-+++ b/src/lexer.c
-@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
- /* and prompts attributes unless --literal-attributes is set to yes */
- /* #994841 - Whitespace is removed from value attributes */
-
-- if (munge &&
-+ /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
-+ if ((len > 0) && munge &&
- TY_(tmbstrcasecmp)(name, "alt") &&
- TY_(tmbstrcasecmp)(name, "title") &&
- TY_(tmbstrcasecmp)(name, "value") &&
- TY_(tmbstrcasecmp)(name, "prompt"))
- {
-- while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
-+ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
- --len;
-
-- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
-+ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
- {
- ++start;
- --len;
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
deleted file mode 100644
index 4c805cf2226..00000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN tidy.old/configure.in tidy-26/configure.in
---- tidy.old/configure.in 2006-02-13 17:17:49.000000000 +0100
-+++ tidy-26/configure.in 2006-02-13 17:17:20.000000000 +0100
-@@ -72,7 +72,7 @@
- if test $debug_build = yes; then
- CFLAGS="$save_cflags -g"
- else
-- CFLAGS="-O2 $save_cflags"
-+ CFLAGS="$save_cflags"
- fi
- #
- # =============================================
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
deleted file mode 100644
index 942a61e1464..00000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: tidy-20090325/include/platform.h
-===================================================================
---- tidy-20090325.orig/include/platform.h
-+++ tidy-20090325/include/platform.h
-@@ -24,7 +24,7 @@ extern "C" {
- */
-
- /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
--/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
-+#define TIDY_CONFIG_FILE "/etc/tidyrc"
- /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
-
- /*
-@@ -33,7 +33,7 @@ extern "C" {
- It enables tidy to find config files named ~/.tidyrc if
- the HTML_TIDY environment variable is not set.
- */
--/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
-+#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
-
- /*
- Uncomment the following #define if your
-@@ -48,7 +48,7 @@ extern "C" {
- Contributed by Todd Lewis.
- */
-
--/* #define SUPPORT_GETPWNAM */
-+#define SUPPORT_GETPWNAM
-
-
- /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/app-text/htmltidy/htmltidy-0.99.0.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
deleted file mode 100644
index 8cacda80a2a..00000000000
--- a/app-text/htmltidy/htmltidy-0.99.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="tidy"
-MY_PV="20090325"
-MY_P="${MY_PN}-${MY_PV}"
-
-inherit epatch autotools
-
-DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
-HOMEPAGE="http://tidy.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
- mirror://gentoo/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- # Required to setup the source dist for autotools
- einfo "Setting up autotools for source build"
- cp -R ./build/gnuauto/* . || die "could not prepare autotools environment"
-
- # Stop tidy from appending -O2 to our CFLAGS
- epatch "${FILESDIR}"/${P}-strip-O2-flag.patch
-
- # Define /etc/tidyrc for system wide config, bug 154834
- epatch "${FILESDIR}"/${P}-tidyrc.patch
-
- # Fix security bug 561452
- epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch
-
- eautoreconf
-}
-
-src_compile() {
- default
-
- if use doc ; then
- doxygen htmldoc/doxygen.cfg || die "error making apidocs"
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- # Now the man page is provided as an xsl file, which
- # we can't use until htmltidy is merged.
- # I have generated the man page and quickref which is on
- # the mirrors. (bug #132429)
- doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
-
- # Fix name before installing
- mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
- "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
- cd "${S}"/htmldoc
- # Install basic html documentation
- dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
- # If use 'doc' is set, then we also want to install the
- # api documentation
- use doc && dohtml -r api
-}
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 3ca575025b3..f398e94701d 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -17,14 +17,11 @@ 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="deprecated test"
-# TODO: in principle this works but the new dependencies have got WAY fewer
-# keywords at the moment, keep tests restricted until the situation has improved.
-#RESTRICT="!test? ( test )"
-#ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
+ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
PATCHES=(
"${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index d1dfd0869ca..cf0b468ab05 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="person">
<email>marecki@gentoo.org</email>
<name>Marek Szuba</name>
</maintainer>
diff --git a/app-text/htp/metadata.xml b/app-text/htp/metadata.xml
index ae333307c43..c52150a31f2 100644
--- a/app-text/htp/metadata.xml
+++ b/app-text/htp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>web-apps@gentoo.org</email>
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index d9ca517caa6..527d24169a8 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<upstream>
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
index f759094eb85..28d438f7c84 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
@@ -18,15 +18,15 @@ IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib"
RDEPEND="dev-db/qdbm
bzip2? ( app-arch/bzip2 )
- java? ( >=virtual/jre-1.4:* )
+ java? ( >=virtual/jre-1.8:* )
lzo? ( dev-libs/lzo )
mecab? ( app-text/mecab )
perl? ( dev-lang/perl )
ruby? ( $(ruby_implementations_depend) )
zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- java? ( >=virtual/jdk-1.4:* )"
+DEPEND="${RDEPEND}
+ java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/all/${P}"
PATCHES=(
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
index e89da165177..95ab1cd5841 100644
--- a/app-text/hyperestraier/metadata.xml
+++ b/app-text/hyperestraier/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 5989f5c0851..3ee204c953f 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1 +1,2 @@
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
diff --git a/app-text/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
index 5078155ea34..35577914637 100644
--- a/app-text/iso-codes/iso-codes-4.6.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.6.0.ebuild
@@ -26,7 +26,7 @@ RESTRICT="binchecks strip"
DOCS=( ChangeLog.md README.md )
-# l10n_find_plocales_changes doesn't support multiple directories,
+# plocale_find_changes doesn't support multiple directories,
# so need to do the update scan ourselves.
check_existing_locales() {
local std loc all_locales=()
diff --git a/app-text/iso-codes/iso-codes-4.7.0.ebuild b/app-text/iso-codes/iso-codes-4.7.0.ebuild
new file mode 100644
index 00000000000..fde78634b31
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.7.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 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"
+
+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/metadata.xml b/app-text/iso-codes/metadata.xml
index c5fcc42a3a2..05de60192e4 100644
--- a/app-text/iso-codes/metadata.xml
+++ b/app-text/iso-codes/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/itex2mml/metadata.xml b/app-text/itex2mml/metadata.xml
index 1b2becffa26..bef24d2c233 100644
--- a/app-text/itex2mml/metadata.xml
+++ b/app-text/itex2mml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index 3ccaac3de7d..75bd03e0389 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nicolasbock@gentoo.org</email>
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
index 9bbc4a0655f..8117e098039 100644
--- a/app-text/jabref/metadata.xml
+++ b/app-text/jabref/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nicolasbock@gentoo.org</email>
diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
index 268a79f7660..6aaa98d22ea 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
index bbd2b00bbf6..b150cc0faf5 100644
--- a/app-text/kbibtex/metadata.xml
+++ b/app-text/kbibtex/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
<use>
<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for HTML previews</flag>
<flag name="zotero">Enable support for synchronisation with zotero.org web service</flag>
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
index 18d8646795d..59f7e66a3fa 100644
--- a/app-text/kchmviewer/metadata.xml
+++ b/app-text/kchmviewer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/kjots/metadata.xml b/app-text/kjots/metadata.xml
index 2fdbf33d963..d925f243975 100644
--- a/app-text/kjots/metadata.xml
+++ b/app-text/kjots/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/kramdown-rfc2629/Manifest b/app-text/kramdown-rfc2629/Manifest
index 0984cf5d93e..67e7f3dbb1b 100644
--- a/app-text/kramdown-rfc2629/Manifest
+++ b/app-text/kramdown-rfc2629/Manifest
@@ -1 +1,2 @@
DIST kramdown-rfc2629-1.4.19.gem 47104 BLAKE2B a967987f34b0af0bff964488d640a8ca830e55b8a1955442896ed0bebf2cd4d9b902699e1347bd81d82a1b10e085ad2f2827968ff62e96cc4ea7f023f8336af1 SHA512 4843690fe10ae02d90a4dde9ade086308b8081155bd6fea1d83c38563cba1c2d447e337f658666fabb57ca9f85b5f4d5687db2503b0b28b5718b978b1db2714a
+DIST kramdown-rfc2629-1.5.9.gem 49152 BLAKE2B 08250e69009d5f4ab1be51bb749d0e43d8b33c9142cbe4d0b63b7d3ca6e2d1e52631d31ac43477ad336607f6ed80232eb69db92835b584972e392327e7b86016 SHA512 b4644738ee2985cb0461ff13ac5575c8f8ad2eabb89cd68d8623f2fe5d164da7c80d665b7bfe4e74faea1a1a182aaecc30f572ff8ee56c9ff11c866879404cc5
diff --git a/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.9.ebuild b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.9.ebuild
new file mode 100644
index 00000000000..057efaabbd8
--- /dev/null
+++ b/app-text/kramdown-rfc2629/kramdown-rfc2629-1.5.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/certified-1.0.0
+ >=dev-ruby/json-2.0.0
+ >=dev-ruby/kramdown-2.3.0
+ >=dev-ruby/kramdown-parser-gfm-1.1.0
+"
+
+all_ruby_prepare() {
+ sed -i 's/json_pure/json/' ../metadata || die
+}
diff --git a/app-text/kramdown-rfc2629/metadata.xml b/app-text/kramdown-rfc2629/metadata.xml
index 109b200cf8d..06c61aaee4c 100644
--- a/app-text/kramdown-rfc2629/metadata.xml
+++ b/app-text/kramdown-rfc2629/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type='person'>
<name>Florian Schmaus</name>
diff --git a/app-text/krop/metadata.xml b/app-text/krop/metadata.xml
index 49bbc63e4ae..cb675f253c1 100644
--- a/app-text/krop/metadata.xml
+++ b/app-text/krop/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 3a4f4ed94a7..af3897fdf1c 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -1,2 +1,3 @@
DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
+DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
diff --git a/app-text/languagetool/files/languagetool.initd b/app-text/languagetool/files/languagetool.initd
new file mode 100644
index 00000000000..30a72a91a93
--- /dev/null
+++ b/app-text/languagetool/files/languagetool.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ after modules
+}
+
+start() {
+ ebegin "Starting languagetool [server]"
+ start-stop-daemon --start --background --exec /bin/bash /usr/bin/languagetool-server \
+ --config "/etc/languagetool.cfg" --allow-origin "*" --port 8081
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping languagetool [server]"
+ start-stop-daemon --stop --exec /bin/bash /usr/bin/languagetool-server
+ eend $?
+}
diff --git a/app-text/languagetool/languagetool-5.4.ebuild b/app-text/languagetool/languagetool-5.4.ebuild
new file mode 100644
index 00000000000..34da42ede96
--- /dev/null
+++ b/app-text/languagetool/languagetool-5.4.ebuild
@@ -0,0 +1,77 @@
+# 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/hamcrest-core:1.3
+ dev-java/jcommander:0
+ dev-java/jna:4
+ dev-java/slf4j-api:0
+"
+
+RDEPEND="
+ >=virtual/jre-1.8
+ ${CP_DEPEND}"
+
+BDEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+ rm libs/commons-{cli,collections4,io,logging}.jar || die
+ rm libs/{hamcrest-core,jcommander,junit,slf4j-api}.jar || die
+
+ # Loads of bundled stuff :(
+ #java-pkg-2_src_prepare
+}
+
+src_compile() { :; }
+
+src_install() {
+ java-pkg_dojar *.jar libs/*.jar
+
+ local DIR=/usr/share/${PN}/lib/language-modules
+ java-pkg_addcp "${EPREFIX}${DIR}"
+ insinto ${DIR}
+ doins -r org META-INF
+
+ java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
+ java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
+ java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer --config /etc/languagetool.cfg
+ newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
+ domenu "${FILESDIR}"/${PN}.desktop
+ newinitd "${FILESDIR}/languagetool.initd" languagetool
+
+ dodoc CHANGES.md README.md
+
+ unset MY_DEPEND
+ java-pkg_gen-cp MY_DEPEND
+ java-pkg_register-dependency "${MY_DEPEND}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-text/languagetool/metadata.xml b/app-text/languagetool/metadata.xml
index 84f8f1cf6bc..2e4c5182444 100644
--- a/app-text/languagetool/metadata.xml
+++ b/app-text/languagetool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
index dd313076fa4..b1b8d8ccf1f 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108-r1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="https://lcdf.org/type/${P}.tar.gz"
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 ~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 )"
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea:= )"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
index 37d6794d875..e56e1b213eb 100644
--- a/app-text/lcdf-typetools/metadata.xml
+++ b/app-text/lcdf-typetools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 047709596ab..57deafb6e63 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,2 +1,3 @@
DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-DIST lesspipe-1.86.tar.gz 120910 BLAKE2B 1065bd95707991380cee8b1be917ae66a6537fdd721e9ec0c326b1ce3358ae518dd28902505967fc086e57e9d3e603e27a328f38c79ae38fe70e5e2a8306b59a SHA512 88a890b91ff3d889f32f23d85d76ef96947e8f1175d54d4301e8891587e87bf1c0a147f1fd5391e52badf4ee31229d337b97c5d5e5f74f4dde966eb93294cfb2
+DIST lesspipe-1.89.tar.gz 121118 BLAKE2B e730b6e8afc767a0118abbcc6221d2c18467393119c26baf71b8758b5826ba52230526b9c5cd67704aadda07b63a62dfe006db10de1dbae0a73ede1885b03ed0 SHA512 b8d7c92d3dae77f2ccee8e314af4354fefc9f3aaec1566af02c9be2640f11ebf7ea1432334470c5d5dbce39d2ac7c3e9f4074bcf9ee4a502dc59b370a21b54f5
+DIST lesspipe-1.90.tar.gz 121098 BLAKE2B 269f4193f423e4ac5770171156e2f63d14966d7dcc77bf015c3100f281206424ef334acc1edf2edb6fe31f73aed80b9c3ba6c715d6e97993c5a90dfc1ce42405 SHA512 d402bd46c37d2509c90530e9da0560fa3e5da9002c37a515451a8ab9275576d1af44793a10914e74e804f10a3352439815c6763d2d77e5e41a0e9840286f518e
diff --git a/app-text/lesspipe/lesspipe-1.86.ebuild b/app-text/lesspipe/lesspipe-1.89.ebuild
index 6ebe2f17d7a..bc53c82f7b8 100644
--- a/app-text/lesspipe/lesspipe-1.86.ebuild
+++ b/app-text/lesspipe/lesspipe-1.89.ebuild
@@ -1,18 +1,18 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=8
+EAPI=7
-DESCRIPTION="a preprocessor for less"
+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"
-IUSE=""
# 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"
@@ -21,16 +21,31 @@ 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.
+ # 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
diff --git a/app-text/lesspipe/lesspipe-1.90.ebuild b/app-text/lesspipe/lesspipe-1.90.ebuild
new file mode 100644
index 00000000000..bc53c82f7b8
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.90.ebuild
@@ -0,0 +1,60 @@
+# 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/metadata.xml b/app-text/lesspipe/metadata.xml
index f48f0758cb2..6d48d5fa839 100644
--- a/app-text/lesspipe/metadata.xml
+++ b/app-text/lesspipe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/app-text/letterize/metadata.xml b/app-text/letterize/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/letterize/metadata.xml
+++ b/app-text/letterize/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/libabw/metadata.xml b/app-text/libabw/metadata.xml
index 13ce236ee51..f632b40c7d8 100644
--- a/app-text/libabw/metadata.xml
+++ b/app-text/libabw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libebook/metadata.xml b/app-text/libebook/metadata.xml
index 70dbb606d4c..4353583eba8 100644
--- a/app-text/libebook/metadata.xml
+++ b/app-text/libebook/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libepubgen/metadata.xml b/app-text/libepubgen/metadata.xml
index 13ce236ee51..f632b40c7d8 100644
--- a/app-text/libepubgen/metadata.xml
+++ b/app-text/libepubgen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
index 13ce236ee51..f632b40c7d8 100644
--- a/app-text/libetonyek/metadata.xml
+++ b/app-text/libetonyek/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libexttextcat/metadata.xml b/app-text/libexttextcat/metadata.xml
index 13ce236ee51..f632b40c7d8 100644
--- a/app-text/libexttextcat/metadata.xml
+++ b/app-text/libexttextcat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index c15bb234a06..a00d54d6d7f 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit gnome.org meson xdg
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
IUSE="+introspection"
RDEPEND="
@@ -22,9 +22,8 @@ RDEPEND="
x11-libs/gtk+:3
introspection? ( >=dev-libs/gobject-introspection-1.30:= )
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_configure() {
meson_src_configure \
diff --git a/app-text/libgepub/metadata.xml b/app-text/libgepub/metadata.xml
index 4cbddcaa19a..c6e394b17a2 100644
--- a/app-text/libgepub/metadata.xml
+++ b/app-text/libgepub/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/libgxps/libgxps-0.3.2.ebuild b/app-text/libgxps/libgxps-0.3.2.ebuild
index 4ed7f9aa471..f92890236f9 100644
--- a/app-text/libgxps/libgxps-0.3.2.ebuild
+++ b/app-text/libgxps/libgxps-0.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="gtk-doc +introspection jpeg lcms tiff"
RDEPEND="
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/app-text/libgxps/metadata.xml
+++ b/app-text/libgxps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index eb7dc90a5e6..4ec4bf37c82 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libmspub/metadata.xml b/app-text/libmspub/metadata.xml
index 13ce236ee51..f632b40c7d8 100644
--- a/app-text/libmspub/metadata.xml
+++ b/app-text/libmspub/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 1ff60daad3d..148a7da2b6c 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,2 +1 @@
-DIST libmwaw-0.3.19.tar.xz 1401720 BLAKE2B 93e63993dd73d52d1b071c44a5efa4ba2495a370a767cd80fbeb437a56224d333781cfdf32c3ca1c0a3794544da6cdf8c967badf98b6858796fbc8f2ea7878c1 SHA512 a5b74f417366f7e8a8303948e678d54caf9c45e0b51694d39593926b2f2fbbaa5dfea5dee8a6b4a656e5ca5bd880f41a76e7b869f55230690740b7ab75a28f1f
DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b
diff --git a/app-text/libmwaw/libmwaw-0.3.19.ebuild b/app-text/libmwaw/libmwaw-0.3.19.ebuild
deleted file mode 100644
index 4f07691b3c3..00000000000
--- a/app-text/libmwaw/libmwaw-0.3.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
- inherit autotools git-r3
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc tools"
-
-BDEPEND="
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-DEPEND="
- dev-libs/librevenge
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- # zip is hard enabled as the zlib is dep on the rdeps anyway
- local myeconfargs=(
- --enable-zip
- --disable-static
- --disable-werror
- $(use_with doc docs)
- $(use_enable tools)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libmwaw/libmwaw-0.3.20.ebuild b/app-text/libmwaw/libmwaw-0.3.20.ebuild
index f0bf404e1fb..31e61e23923 100644
--- a/app-text/libmwaw/libmwaw-0.3.20.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.20.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
index 09f5b872fd2..f8fefe6463f 100644
--- a/app-text/libmwaw/metadata.xml
+++ b/app-text/libmwaw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libnumbertext/metadata.xml b/app-text/libnumbertext/metadata.xml
index 13ce236ee51..f632b40c7d8 100644
--- a/app-text/libnumbertext/metadata.xml
+++ b/app-text/libnumbertext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libodfgen/metadata.xml b/app-text/libodfgen/metadata.xml
index d7faa3c71f7..0ae8367cec7 100644
--- a/app-text/libodfgen/metadata.xml
+++ b/app-text/libodfgen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml
index c439b06d8c8..e2fedda90ee 100644
--- a/app-text/libpaper/metadata.xml
+++ b/app-text/libpaper/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/libqxp/metadata.xml b/app-text/libqxp/metadata.xml
index e99ec98e14f..b2796e63fc6 100644
--- a/app-text/libqxp/metadata.xml
+++ b/app-text/libqxp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libspectre/metadata.xml b/app-text/libspectre/metadata.xml
index f3cab85cf60..d0b58801b31 100644
--- a/app-text/libspectre/metadata.xml
+++ b/app-text/libspectre/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
diff --git a/app-text/libstaroffice/metadata.xml b/app-text/libstaroffice/metadata.xml
index 27a1e937c80..f9a75b8ce69 100644
--- a/app-text/libstaroffice/metadata.xml
+++ b/app-text/libstaroffice/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index edac8b995a8..7031422c057 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-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.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
IUSE="doc +tools"
RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
index 19419ec1fa6..c702ee54c41 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
index 79b75e002d3..c2c69bbccd1 100644
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 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.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/app-text/libwpg/metadata.xml b/app-text/libwpg/metadata.xml
index f341402a4a4..bb9cb0fabe4 100644
--- a/app-text/libwpg/metadata.xml
+++ b/app-text/libwpg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
index e942043e448..78e528e747b 100644
--- a/app-text/libwps/metadata.xml
+++ b/app-text/libwps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-text/libxmlpatch/metadata.xml b/app-text/libxmlpatch/metadata.xml
index ddc9bcf76f3..0a4e7b0f969 100644
--- a/app-text/libxmlpatch/metadata.xml
+++ b/app-text/libxmlpatch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
index 18cb80e2e9e..11c81e94bca 100644
--- a/app-text/linuxdoc-tools/metadata.xml
+++ b/app-text/linuxdoc-tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
index 604d9e32df7..11265970dec 100644
--- a/app-text/logmerge/metadata.xml
+++ b/app-text/logmerge/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
deleted file mode 100644
index 673ad8d54d5..00000000000
--- a/app-text/lout/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lout-3.40.tar.gz 2172651 BLAKE2B 0bf2ee498d6fbb91e353d46fe1f7f0f44053be174df901b08ee630f0b4935e19c056a50e2eda4d07ab69aac6d7bf738b42277bb37060e967db73ace6a51029af SHA512 adffbb44b9328f0d64b1c8f08fe0217307b1cca870827ca54e0aaae5a2258f519e3e6f0adc715ba6d192dd731ab26c2cc86aa8611d991d5665503842e599c061
diff --git a/app-text/lout/files/lout-3.38-makefile.patch b/app-text/lout/files/lout-3.38-makefile.patch
deleted file mode 100644
index cb7fc66bf43..00000000000
--- a/app-text/lout/files/lout-3.38-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- lout-3.38/makefile.orig 2008-10-13 23:35:17.000000000 +0200
-+++ lout-3.38/makefile 2009-09-04 16:40:00.000000000 +0200
-@@ -295,11 +295,9 @@
- ZLIB =
- ZLIBPATH =
-
--CC = gcc
--
- RCOPY = cp -r
-
--COPTS = -ansi -pedantic -Wall -O3
-+COPTS += -ansi -pedantic -Wall
-
- CFLAGS = -DOS_UNIX=$(OSUNIX) \
- -DOS_DOS=$(OSDOS) \
-@@ -333,7 +331,7 @@
- z49.o z50.o z51.o z52.o
-
- lout: $(OBJS)
-- $(CC) -o lout $(OBJS) $(ZLIB) -lm
-+ $(CC) $(COPTS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
- chmod a+x lout
-
- $(OBJS): externs.h
-@@ -341,7 +339,7 @@
- externs.h:
-
- prg2lout: prg2lout.c
-- $(CC) $(COPTS) -o prg2lout prg2lout.c
-+ $(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
- chmod a+x prg2lout
-
- all: lout prg2lout
diff --git a/app-text/lout/lout-3.40.ebuild b/app-text/lout/lout-3.40.ebuild
deleted file mode 100644
index e6d0cc7f1f2..00000000000
--- a/app-text/lout/lout-3.40.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-IUSE="zlib doc"
-
-DESCRIPTION="High-level language for document formatting"
-HOMEPAGE="http://savannah.nongnu.org/projects/lout"
-SRC_URI="mirror://nongnu/lout/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.38-makefile.patch"
-)
-
-src_compile() {
- tc-export CC
- local myconf
- use zlib && myconf="$myconf PDF_COMPRESSION=1 ZLIB=-lz"
- emake COPTS="${CFLAGS}" BINDIR="${EPREFIX}"/usr/bin \
- LOUTLIBDIR="${EPREFIX}"/usr/share/lout \
- LOUTDOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man/man1 \
- ${myconf} lout prg2lout || die "emake prg2lout lout failed"
-}
-
-compile_doc() {
- #
- # SYNOPSIS: compile_doc file times
- #
-
- einfo "${1}:"
- # yes, it *is* necessary to run this 6 times...
- for i in $(seq 1 $(expr $2 - 1)) ; do
- einfo " pass $i"
- lout all -o ${docdir}/$1 -e /dev/null
- done
- # in the last one, let errors be reported
- einfo " final pass"
- lout all -o ${docdir}/$1 || die "final pass failed"
-}
-
-src_install() {
- local bindir libdir docdir mandir
- bindir=${ED}usr/bin
- libdir=${ED}usr/share/lout
- docdir=${ED}usr/share/doc/${PF}
- mandir=${ED}usr/share/man/man1
- export LOUTLIB=${libdir}
- export PATH="${bindir}:${PATH}"
-
- mkdir -p ${bindir} ${docdir} ${mandir}
-
- make BINDIR=${bindir} \
- LOUTLIBDIR=${libdir} \
- LOUTDOCDIR=${docdir} \
- MANDIR=${mandir} \
- install installdoc installman || die "make install failed"
-
- lout -x -s "${ED}"usr/share/lout/include/init || die "lout init failed"
-
- mv ${docdir}/README{,.docs}
- dodoc README READMEPDF blurb blurb.short whatsnew
-
- if use doc ; then
- einfo "building postscript documentation (may take a while)"
- cd doc/user
- compile_doc user.ps 6
- cd ../design
- compile_doc design.ps 3
- cd ../expert
- compile_doc expert.ps 4
- cd ../slides
- compile_doc slides.ps 2
- fi
-}
diff --git a/app-text/lout/metadata.xml b/app-text/lout/metadata.xml
deleted file mode 100644
index d87f47dba10..00000000000
--- a/app-text/lout/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">lout</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/lowdown/metadata.xml b/app-text/lowdown/metadata.xml
index cee379b1540..bd6443d4a37 100644
--- a/app-text/lowdown/metadata.xml
+++ b/app-text/lowdown/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
diff --git a/app-text/lv/metadata.xml b/app-text/lv/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-text/lv/metadata.xml
+++ b/app-text/lv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index f44b4b353ca..a8738ed240b 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1 +1,2 @@
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/mandoc-1.14.6.ebuild b/app-text/mandoc/mandoc-1.14.6.ebuild
new file mode 100644
index 00000000000..c533b6e8298
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.6.ebuild
@@ -0,0 +1,124 @@
+# 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
+)
+
+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/metadata.xml b/app-text/mandoc/metadata.xml
index 814b35c6240..bcdbf9ac8af 100644
--- a/app-text/mandoc/metadata.xml
+++ b/app-text/mandoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/app-text/manpager/metadata.xml b/app-text/manpager/metadata.xml
index 56c12441305..73dda144f9a 100644
--- a/app-text/manpager/metadata.xml
+++ b/app-text/manpager/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index b6ee0bdd492..edff18e5dfa 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1 +1,2 @@
-DIST master-pdf-editor-5.7.40-qt5.x86_64.tar.gz 15880536 BLAKE2B 0e0c59ca74dfd8532513cbc6cbe96b9ca73cc9d838d9d4c55dc44fdd838d5c7ddb14c6725ef86d6da95c211355a716bee328a5147cce2833b10994b313848d97 SHA512 10962402f26a12eec625e2d366e99490995c5ab5011e05364af72f67504487cd913200a809db83d9b81df18f89318a719167efcb0e8cfa8ee1796698fc79303f
+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
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.7.90.ebuild
index 1300656eb4a..1300656eb4a 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.7.90.ebuild
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.06.ebuild
new file mode 100644
index 00000000000..b6b616512c5
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.8.06.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+ dev-libs/nss
+ >=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
+ >=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r fonts lang stamps templates masterpdfeditor5.png
+
+ exeinto /opt/${PN}
+ doexe masterpdfeditor5
+ dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+ make_desktop_entry "masterpdfeditor5 %f" \
+ "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+ "Office;Graphics;Viewer" \
+ "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/master-pdf-editor/metadata.xml b/app-text/master-pdf-editor/metadata.xml
index 21140496ac4..609ebb83586 100644
--- a/app-text/master-pdf-editor/metadata.xml
+++ b/app-text/master-pdf-editor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>joaompssantos@gmail.com</email>
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
index 597f3f4add0..ac93ae93133 100644
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ b/app-text/mathtex/mathtex-1.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="png"
RDEPEND="app-text/dvipng
diff --git a/app-text/mathtex/metadata.xml b/app-text/mathtex/metadata.xml
index c3330bb45b7..24bacc8e9ec 100644
--- a/app-text/mathtex/metadata.xml
+++ b/app-text/mathtex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 6db5fa57b54..68305e1647f 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -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 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="static-libs unicode"
diff --git a/app-text/mecab/metadata.xml b/app-text/mecab/metadata.xml
index 82adca0f7b8..eaec32deefa 100644
--- a/app-text/mecab/metadata.xml
+++ b/app-text/mecab/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/metadata.xml b/app-text/metadata.xml
index ab8ebb95cb7..5a2c46fa133 100644
--- a/app-text/metadata.xml
+++ b/app-text/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The app-text category contains tools for working with human-language
diff --git a/app-text/mpage/metadata.xml b/app-text/mpage/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/mpage/metadata.xml
+++ b/app-text/mpage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/msort/metadata.xml b/app-text/msort/metadata.xml
index ff4a65d1fb1..dc5a253a178 100644
--- a/app-text/msort/metadata.xml
+++ b/app-text/msort/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 8f762a00e90..3d78de6e91c 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 979bcc7aec9..115e9d64a66 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>sam@gentoo.org</email>
- <name>Sam James</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
index 66511fc715f..85aad834e2c 100644
--- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -3,6 +3,9 @@
EAPI=7
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
inherit desktop flag-o-matic toolchain-funcs xdg
DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
index 99d138c6b1a..8acbf740b37 100644
--- a/app-text/mythes/metadata.xml
+++ b/app-text/mythes/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 8629ab62e8e..a234f038899 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,2 +1,2 @@
DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
+DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0
diff --git a/app-text/namazu/files/namazu-emacs-27.patch b/app-text/namazu/files/namazu-emacs-27.patch
new file mode 100644
index 00000000000..cb9dd4de959
--- /dev/null
+++ b/app-text/namazu/files/namazu-emacs-27.patch
@@ -0,0 +1,14 @@
+--- a/lisp/namazu.el
++++ b/lisp/namazu.el
+@@ -99,9 +99,9 @@
+ (defmacro defgroup (&rest args)
+ nil)
+ (defmacro defcustom (var value doc &rest args)
+- (` (defvar (, var) (, value) (, doc))))
++ `(defvar (, var) (, value) (, doc)))
+ (defmacro defface (var value doc &rest args)
+- (` (make-face (, var))))
++ `(make-face (, var)))
+ (defmacro define-widget (&rest args)
+ nil)))
+
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index e1a49f49888..491c88b3a31 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 5d0b4d0d14e..ef46e76118d 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit autotools elisp-common
@@ -9,7 +9,7 @@ DESCRIPTION="Namazu is a full-text search engine"
HOMEPAGE="http://www.namazu.org/"
SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="emacs l10n_ja nls static-libs tk"
@@ -30,11 +30,12 @@ RDEPEND="dev-perl/File-MMagic
dev-lang/tk:0
www-client/lynx
)"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-emacs-27.patch
"${FILESDIR}"/${PN}-perl-5.18.patch
"${FILESDIR}"/${PN}-perl-5.26.patch
"${FILESDIR}"/${P}-memmove.patch
@@ -43,8 +44,8 @@ PATCHES=(
src_prepare() {
default
- mv configure.{in,ac}
- mv tk${PN}/configure.{in,ac}
+ mv configure.{in,ac} || die
+ mv tk${PN}/configure.{in,ac} || die
eautoreconf
}
@@ -64,7 +65,7 @@ src_configure() {
}
src_compile() {
- emake
+ default
if use emacs; then
cd lisp
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 8517c855436..4c8146e3b31 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit autotools elisp-common
@@ -11,7 +11,7 @@ DESCRIPTION="Namazu is a full-text search engine"
HOMEPAGE="http://www.namazu.org/"
SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS=""
IUSE="emacs l10n_ja nls static-libs tk"
@@ -32,8 +32,8 @@ RDEPEND="dev-perl/File-MMagic
dev-lang/tk:0
www-client/lynx
)"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
S="${WORKDIR}"/${MY_P}
PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
@@ -41,8 +41,8 @@ PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
src_prepare() {
default
- mv configure.{in,ac}
- mv tk${PN}/configure.{in,ac}
+ mv configure.{in,ac} || die
+ mv tk${PN}/configure.{in,ac} || die
eautoreconf
}
@@ -62,7 +62,7 @@ src_configure() {
}
src_compile() {
- emake
+ default
if use emacs; then
cd lisp
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
index a6de1706c8d..602aa45fcc0 100644
--- a/app-text/nfoview/metadata.xml
+++ b/app-text/nfoview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>till2.schaefer@uni-dortmund.de</email>
diff --git a/app-text/nuspell/metadata.xml b/app-text/nuspell/metadata.xml
index 1b840bff947..5e487ead4f5 100644
--- a/app-text/nuspell/metadata.xml
+++ b/app-text/nuspell/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
diff --git a/app-text/o3read/metadata.xml b/app-text/o3read/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/o3read/metadata.xml
+++ b/app-text/o3read/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 40249c58ed5..553d68b0ca0 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
index 1a3a16228ac..b3509edbf32 100644
--- a/app-text/openjade/metadata.xml
+++ b/app-text/openjade/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/openpaperwork-core/metadata.xml b/app-text/openpaperwork-core/metadata.xml
index 273bb67f278..3bbef27953e 100644
--- a/app-text/openpaperwork-core/metadata.xml
+++ b/app-text/openpaperwork-core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/openpaperwork-gtk/metadata.xml b/app-text/openpaperwork-gtk/metadata.xml
index ae90bd98b33..4b3eaa67df5 100644
--- a/app-text/openpaperwork-gtk/metadata.xml
+++ b/app-text/openpaperwork-gtk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/opensp/metadata.xml b/app-text/opensp/metadata.xml
index 7c52bdf9578..19b5abd52e4 100644
--- a/app-text/opensp/metadata.xml
+++ b/app-text/opensp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>heroxbd@gentoo.org</email>
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 4394f860232..8f389f32b1c 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
diff --git a/app-text/paperwork-backend/metadata.xml b/app-text/paperwork-backend/metadata.xml
index 0119fbc6c78..f6e9749123d 100644
--- a/app-text/paperwork-backend/metadata.xml
+++ b/app-text/paperwork-backend/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml
index de2ee75db18..e8fb28ebd49 100644
--- a/app-text/paperwork/metadata.xml
+++ b/app-text/paperwork/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/paps/metadata.xml b/app-text/paps/metadata.xml
index 54bd128e976..9a99904e90f 100644
--- a/app-text/paps/metadata.xml
+++ b/app-text/paps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/par/metadata.xml b/app-text/par/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/par/metadata.xml
+++ b/app-text/par/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml
index 6a9946b0c43..82a1a366072 100644
--- a/app-text/pastebinit/metadata.xml
+++ b/app-text/pastebinit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<stabilize-allarches/>
diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index 7a0e41a109b..550104a796b 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="crypt"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/pdf2html/metadata.xml b/app-text/pdf2html/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/pdf2html/metadata.xml
+++ b/app-text/pdf2html/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
index 9c4c3c2f8de..a639e8828d9 100644
--- a/app-text/pdf2oo/metadata.xml
+++ b/app-text/pdf2oo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/pdfarranger/metadata.xml b/app-text/pdfarranger/metadata.xml
index b1f526c7da8..4ccfb01ea25 100644
--- a/app-text/pdfarranger/metadata.xml
+++ b/app-text/pdfarranger/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index 9ff36e4fd90..a7d27c20e52 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type='person'>
<email>flow@gentoo.org</email>
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
index 7b4a61aab74..d724efdf402 100644
--- a/app-text/pdfjam/metadata.xml
+++ b/app-text/pdfjam/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index 69826d88b34..17672fc01c1 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
S="${WORKDIR}"/${PN}
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
index c67c1ba8759..be0a94d38c1 100644
--- a/app-text/pdfminer/metadata.xml
+++ b/app-text/pdfminer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/pdfsandwich/metadata.xml b/app-text/pdfsandwich/metadata.xml
index fce36805a6f..fa3120d44e5 100644
--- a/app-text/pdfsandwich/metadata.xml
+++ b/app-text/pdfsandwich/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tupone@gentoo.org</email>
diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
index 03c3390d2bb..0761a7190d4 100644
--- a/app-text/pdftk/metadata.xml
+++ b/app-text/pdftk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index 74329b5b96e..ac8365be630 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>djc@gentoo.org</email>
diff --git a/app-text/pep/metadata.xml b/app-text/pep/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/pep/metadata.xml
+++ b/app-text/pep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml
index 3e5026ee375..beac02a9af1 100644
--- a/app-text/pinfo/metadata.xml
+++ b/app-text/pinfo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 00dad93c8fc..fd125b72037 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 sparc x86"
+KEYWORDS="~alpha amd64 ~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 acbde749fba..387bfeb428d 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,3 +1,2 @@
-DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
+DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
diff --git a/app-text/po4a/files/po4a-man.patch b/app-text/po4a/files/po4a-man.patch
deleted file mode 100644
index 6dd94aed153..00000000000
--- a/app-text/po4a/files/po4a-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -233,7 +233,6 @@
- }
- $parser->parse_from_file ($file, $out);
-
-- system("gzip -9 -f $out") and die;
- unlink "$file" || die;
- }
-
-@@ -245,7 +244,6 @@
- if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
- my ($outdir, $section, $outfile) = ($1, $2, $3);
- system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-- system ("gzip -9 -f $outdir/$outfile.$section") and die;
- }
- unlink "$file" || die;
- }
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
index c1b8da0d8d0..1a6ce2f1873 100644
--- a/app-text/po4a/metadata.xml
+++ b/app-text/po4a/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-text/po4a/po4a-0.57-r1.ebuild b/app-text/po4a/po4a-0.57-r1.ebuild
deleted file mode 100644
index e05dec8567c..00000000000
--- a/app-text/po4a/po4a-0.57-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
-
-inherit perl-module plocale
-
-DESCRIPTION="Tools to ease the translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/opensp
- dev-libs/libxslt
- dev-perl/Locale-gettext
- dev-perl/SGMLSpm
- dev-perl/TermReadKey
- dev-perl/Text-WrapI18N
- dev-perl/Unicode-LineBreak
- dev-perl/YAML-Tiny
- sys-devel/gettext
- dev-perl/Pod-Parser"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-perl/Module-Build
- test? (
- app-text/docbook-sgml-dtd:4.1
- virtual/latex-base
- )"
-
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
-
-PERL_RM_FILES=(
- t/09-html.t
-)
-DIST_TEST="do"
-
-src_prepare() {
- plocale_find_changes "${S}/po/bin" '' '.po'
-
- rm_locale() {
- PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
- }
- plocale_for_each_disabled_locale rm_locale
-
- perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
index d2312dd067e..6299fac79ff 100644
--- a/app-text/po4a/po4a-0.63-r1.ebuild
+++ b/app-text/po4a/po4a-0.63-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~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.62-r1.ebuild b/app-text/po4a/po4a-0.64.ebuild
index d2312dd067e..d1d6f4f2dc6 100644
--- a/app-text/po4a/po4a-0.62-r1.ebuild
+++ b/app-text/po4a/po4a-0.64.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+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
@@ -19,16 +19,15 @@ 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
- dev-perl/Pod-Parser"
+ sys-devel/gettext"
DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xsl-stylesheets
dev-perl/Module-Build
test? (
diff --git a/app-text/podofo/metadata.xml b/app-text/podofo/metadata.xml
index 0a2bfbe2da9..c0b71a58230 100644
--- a/app-text/podofo/metadata.xml
+++ b/app-text/podofo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 050e04dd929..dfa49f62de3 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1 +1,2 @@
DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
+DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
diff --git a/app-text/poppler-data/metadata.xml b/app-text/poppler-data/metadata.xml
index c439b06d8c8..e2fedda90ee 100644
--- a/app-text/poppler-data/metadata.xml
+++ b/app-text/poppler-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/poppler-data/poppler-data-0.4.11.ebuild b/app-text/poppler-data/poppler-data-0.4.11.ebuild
new file mode 100644
index 00000000000..bbc24bd33be
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.11.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+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"
+
+src_install() {
+ emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+ # bug #409361
+ dodir /usr/share/poppler/cMaps
+ cd "${ED}"/usr/share/poppler/cMaps || die
+ find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index aa9c0f7d774..e7b624d08ad 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1 +1,4 @@
DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
+DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211
+DIST poppler-21.09.0.tar.xz 1722828 BLAKE2B 02bb35a051fadccd6e6d071b74f169fa8aca0f83aa27aac420fdb7998537b42747134efe6562ee2a09598761c55494e30dabf5785f70f84029c5662bbd7311a2 SHA512 e63181b98cbcb71e5b1beefce3aa7c196f69a7adc4304c8ced70eac7ab8a7edf918988faeb2a23727ecaafd6f4a809f561fa1c86f1fda0ab7e5e2dc882a5ab55
+DIST poppler-21.10.0.tar.xz 1779668 BLAKE2B f4464b70ba031ed697443803c435a79498184fc9a74381f5ac7c6ee0f856d77d6e270fe0cea70ee9bbc54713ec69d45ea0ffc66e820d80061856d6711d584e04 SHA512 4a125784716ee578f5be39830cc5903c27eeb707d3756c2ff04ef97328ed8d9e35d3873b7731d2144997cb31794674a1bd35461c84d4237335db27c8df43e4f1
diff --git a/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch
new file mode 100644
index 00000000000..08eb5beed26
--- /dev/null
+++ b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch
@@ -0,0 +1,116 @@
+This can be renamed on the next version after 21.08.0. User wanted to test
+some patches committed upstream so ended up needing to rebase this patch.
+
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
+From: Theo Anderson <telans@posteo.de>
+Date: Wed, 14 Apr 2021 10:16:11 +1200
+Subject: [PATCH] build: respect cflags
+
+[Rebased by: Stefan Radermacher <gentoo@zaister.de>]
+Signed-off-by: Theo Anderson <telans@posteo.de>
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -87,20 +87,15 @@ set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
+ # CMake toolchain file). To avoid surprising compilation errors, we emit an
+ # error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE
+ # in the compiler flags logic below.
+-if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types)
+- message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-endif()
+ set(_save_cflags "${CMAKE_C_FLAGS}")
+ set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- # set the default compile warnings
+ set(_warn "-Wall -Wextra -Wpedantic")
+ set(_warn "${_warn} -Wno-unused-parameter")
+ set(_warn "${_warn} -Wcast-align")
+ set(_warn "${_warn} -Wformat-security")
+ set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wlogical-op")
+ set(_warn "${_warn} -Wmissing-format-attribute")
+ set(_warn "${_warn} -Wnon-virtual-dtor")
+ set(_warn "${_warn} -Woverloaded-virtual")
+@@ -116,20 +111,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+
+ set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+ set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+ poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+ if(GCC_HAS_AS_NEEDED)
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+@@ -139,56 +120,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(_compiler_flags_changed 1)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+- set(_warn "-Wall -Wextra -Wpedantic")
+- set(_warn "${_warn} -Wno-unused-parameter")
+- set(_warn "${_warn} -Wcast-align")
+- set(_warn "${_warn} -Wformat-security")
+- set(_warn "${_warn} -Wframe-larger-than=65536")
+- set(_warn "${_warn} -Wmissing-format-attribute")
+- set(_warn "${_warn} -Wnon-virtual-dtor")
+- set(_warn "${_warn} -Woverloaded-virtual")
+- set(_warn "${_warn} -Wmissing-declarations")
+- set(_warn "${_warn} -Wundef")
+- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+- set(_warn "${_warn} -Wshadow")
+- set(_warn "${_warn} -Wweak-vtables")
+-
+- # set extra warnings
+- set(_warnx "${_warnx} -Wconversion")
+-
+- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-
+- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+- set(CMAKE_CXX_FLAGS_DEBUG "-g")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
+- set(CMAKE_C_FLAGS_DEBUG "-g")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+- set(_compiler_flags_changed 1)
+-endif()
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign")
+- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
+- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign")
+- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
+- set(_compiler_flags_changed 1)
+-endif(CMAKE_C_COMPILER MATCHES "icc")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
+ if(_compiler_flags_changed)
+ # Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags.
+--
+2.33.0
+
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index c2171ad4189..96ffce9a041 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>reavertm@gentoo.org</email>
diff --git a/app-text/poppler/poppler-21.08.0.ebuild b/app-text/poppler/poppler-21.08.0.ebuild
new file mode 100644
index 00000000000..be72663ad68
--- /dev/null
+++ b/app-text/poppler/poppler-21.08.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ 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/112" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+DEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND+="
+ boost? ( dev-libs/boost )
+"
+
+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}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if [[ ${CC} == clang ]] ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-21.09.0.ebuild b/app-text/poppler/poppler-21.09.0.ebuild
new file mode 100644
index 00000000000..20065b9bb13
--- /dev/null
+++ b/app-text/poppler/poppler-21.09.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ 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/113" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+DEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+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.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-21.10.0.ebuild b/app-text/poppler/poppler-21.10.0.ebuild
new file mode 100644
index 00000000000..2ca5838c2b0
--- /dev/null
+++ b/app-text/poppler/poppler-21.10.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ 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/114" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+DEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+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.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a7d99002f54..2ca5838c2b0 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 2005-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake toolchain-funcs xdg-utils
@@ -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 ~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
+ 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/114" # 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/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
index e851bc46fd9..e9e2f73d517 100644
--- a/app-text/ps2eps/metadata.xml
+++ b/app-text/ps2eps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index bbb3620563b..a717ead4844 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 ~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/metadata.xml b/app-text/ps2pkm/metadata.xml
index c4b55593420..52546db0796 100644
--- a/app-text/ps2pkm/metadata.xml
+++ b/app-text/ps2pkm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
index 5296e0bb44c..c1d0a1b552d 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325-r1.ebuild
@@ -11,7 +11,7 @@ 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"
-DEPEND=">=dev-libs/kpathsea-6.2.1"
+DEPEND=">=dev-libs/kpathsea-6.2.1:="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-text/psiconv/metadata.xml b/app-text/psiconv/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/psiconv/metadata.xml
+++ b/app-text/psiconv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/pspdftool/metadata.xml b/app-text/pspdftool/metadata.xml
index b9fd4eef9db..b7a70000aec 100644
--- a/app-text/pspdftool/metadata.xml
+++ b/app-text/pspdftool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<longdescription lang="en">
diff --git a/app-text/pspresent/metadata.xml b/app-text/pspresent/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/pspresent/metadata.xml
+++ b/app-text/pspresent/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/pstotext/metadata.xml b/app-text/pstotext/metadata.xml
index 7b4a61aab74..d724efdf402 100644
--- a/app-text/pstotext/metadata.xml
+++ b/app-text/pstotext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/psutils/metadata.xml b/app-text/psutils/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/psutils/metadata.xml
+++ b/app-text/psutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index ebf36d5f8f5..a2df5ca8d37 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 ~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/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
index 08d54e0cbc1..9fcb3d2c7ea 100644
--- a/app-text/pytextile/metadata.xml
+++ b/app-text/pytextile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>python@gentoo.org</email>
diff --git a/app-text/q-text-as-data/metadata.xml b/app-text/q-text-as-data/metadata.xml
index 90846aa5f93..c75df62c69d 100644
--- a/app-text/q-text-as-data/metadata.xml
+++ b/app-text/q-text-as-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index bc587dc3763..9248740ded3 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>printing@gentoo.org</email>
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 481838d8952..8cbacb076ed 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
index 6422a16977e..c0030735c53 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
REQUIRED_USE="?? ( fitz pdf )"
diff --git a/app-text/rarian/metadata.xml b/app-text/rarian/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/app-text/rarian/metadata.xml
+++ b/app-text/rarian/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 7e123ebc5c1..3672b9dc6da 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 9e411606aca..967ebb61d83 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,3 +1 @@
-DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
-DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
DIST recode-3.7.9.tar.gz 2230259 BLAKE2B 36039ba9e62c5113231764dfa9cffa73b7ff5cd91bab622a0daf0a48a73ab8a62afd16132cec2590eed14623ce5b86ad057e8ca8454cf8185869f0780b3523e7 SHA512 277074dee63cdc7f1a1be2acca67481b8fb816bd4319fe8e882696e42d15309750b930fa9e8d6286e714132a976f0eaf87f718560d6cb86eeaa79b86f0700a6c
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
index 6776427c11f..e404cde1655 100644
--- a/app-text/recode/metadata.xml
+++ b/app-text/recode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/recode/recode-3.7.6-r1.ebuild b/app-text/recode/recode-3.7.6-r1.ebuild
deleted file mode 100644
index 52086b8a4c8..00000000000
--- a/app-text/recode/recode-3.7.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# librecode soname version
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls static-libs"
-
-DEPEND="sys-devel/flex"
-BDEPEND="
- nls? ( sys-devel/gettext )
-"
-
-src_configure() {
- tc-export CC LD
- # on solaris -lintl is needed to compile
- [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
- # --without-included-gettext means we always use system headers
- # and library
- econf \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -v {} + || die
-}
diff --git a/app-text/recode/recode-3.7.8.ebuild b/app-text/recode/recode-3.7.8.ebuild
deleted file mode 100644
index 15bed5b9e88..00000000000
--- a/app-text/recode/recode-3.7.8.ebuild
+++ /dev/null
@@ -1,58 +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} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="https://github.com/rrthomas/recode"
-SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-# librecode soname version
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/libiconv"
-DEPEND="
- ${RDEPEND}
- sys-devel/flex
-"
-BDEPEND="
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/cython[${PYTHON_USEDEP}]
- ')
- )
-"
-
-python_check_deps() {
- if use test ; then
- has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
- fi
-}
-
-src_configure() {
- tc-export CC LD
-
- # on solaris -lintl is needed to compile
- [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
-
- # --without-included-gettext means we always use system headers
- # and library
- econf \
- $(use_enable nls) \
- --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
index 163176ef093..824721b61d6 100644
--- a/app-text/recode/recode-3.7.9.ebuild
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit flag-o-matic python-any-r1 toolchain-funcs
@@ -11,10 +11,10 @@ DESCRIPTION="Convert files between various character sets"
HOMEPAGE="https://github.com/rrthomas/recode"
SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
# librecode soname version
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-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 ~x86-solaris"
IUSE="nls test"
RESTRICT="!test? ( test )"
diff --git a/app-text/reed/metadata.xml b/app-text/reed/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/reed/metadata.xml
+++ b/app-text/reed/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/refbase/metadata.xml b/app-text/refbase/metadata.xml
index 4652275b560..63cb8119895 100644
--- a/app-text/refbase/metadata.xml
+++ b/app-text/refbase/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/app-text/restview/metadata.xml b/app-text/restview/metadata.xml
index 320646448c7..1ad1d969aa9 100644
--- a/app-text/restview/metadata.xml
+++ b/app-text/restview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/rman/metadata.xml b/app-text/rman/metadata.xml
index 142b0794892..fc390f3663d 100644
--- a/app-text/rman/metadata.xml
+++ b/app-text/rman/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci@gentoo.org</email>
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index 82199ea901d..948f2049b1d 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
RESTRICT="test"
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index 351a08ddecd..ca711dad946 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -1 +1,2 @@
DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378
+DIST rnc2rng-2.6.6.tar.gz 18089 BLAKE2B be9b2a22770bed034b4ad93bba23dba7e1f58c553cef4e1a507a00ffb62c6f6e937df22e4d5f2fd3c542acebd72adb82320cddf34f873d35f442be0d457b3cba SHA512 a0f108383ad927c2d9e1cc11960ddaab99a8cb4bf0417cd8e7ccdbc7925746b2fa8c1cbd96a74e89f7166eb8e330c224a49d97aa2ef5d83d7a0c4254240fb308
diff --git a/app-text/rnc2rng/metadata.xml b/app-text/rnc2rng/metadata.xml
index b9e9ece4553..de7a05dc131 100644
--- a/app-text/rnc2rng/metadata.xml
+++ b/app-text/rnc2rng/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="github">djc/rnc2rng</remote-id>
<remote-id type="pypi">rnc2rng</remote-id>
diff --git a/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild b/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild
new file mode 100644
index 00000000000..a5e2a0f22c4
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.6.6-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_test() {
+ "${EPYTHON}" test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 453784645d4..581faaa017c 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index 29a83a3afc4..dcd3426ebeb 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>ovi@ovidiu.at</email>
diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml
index dfaa4cf0e49..62ac5e34fda 100644
--- a/app-text/ronn/metadata.xml
+++ b/app-text/ronn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ruby@gentoo.org</email>
diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest
index 0dfff1ab427..c439d510478 100644
--- a/app-text/rpl/Manifest
+++ b/app-text/rpl/Manifest
@@ -1 +1,2 @@
DIST rpl-1.6.7.tar.gz 21867 BLAKE2B ac523aa836312d6ed6db9eabaf9b6499ce00047ce1a4d35bf398f769036d65aa5b52c410b2110cf5bb14c31d782bc1c424bcd1b2a26692de28ca70fd452b18f1 SHA512 f853eae0ce0a82d864e72ecf3fd3f20fba10553357b23d0012ed22ee0efd57bbefea71095775f7215323d829057f6579aadfc006b6a893972e05039784dc5add
+DIST rpl-1.9.1.gh.tar.gz 22858 BLAKE2B 583a29fd34d7a0d2b3a35b0966a6bd42ac2851750806a97846785dc0331bd5d2199ffba3309184e64a4aa7194f9ae4b9ecb2acc500830b841bd34e2184ec1798 SHA512 be480c6788fa1eb672b892d798deb7d263eae227dac5d93a55f28ebf3b4a43f896eb10edd00e52aad1cd57f4a80faf4a4552b4762b26da273cd05f0c5bce754a
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
index 4962fc76aac..a973364c904 100644
--- a/app-text/rpl/metadata.xml
+++ b/app-text/rpl/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">rpl</remote-id>
+ <remote-id type="github">rrthomas/rpl</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/rpl/rpl-1.9.1.ebuild b/app-text/rpl/rpl-1.9.1.ebuild
new file mode 100644
index 00000000000..fb8fe14b615
--- /dev/null
+++ b/app-text/rpl/rpl-1.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="http://rpl.sourceforge.net/ https://github.com/rrthomas/rpl"
+SRC_URI="https://github.com/rrthomas/rpl/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+ dev-python/argparse-manpage[${PYTHON_USEDEP}]
+ sys-apps/help2man[nls]
+"
+
+python_compile_all() {
+ # Compile man file
+ emake rpl.1
+}
diff --git a/app-text/rtf2html/metadata.xml b/app-text/rtf2html/metadata.xml
index 9de0fd52d0e..ed64c873d35 100644
--- a/app-text/rtf2html/metadata.xml
+++ b/app-text/rtf2html/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
diff --git a/app-text/sablotron/metadata.xml b/app-text/sablotron/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/sablotron/metadata.xml
+++ b/app-text/sablotron/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index 727060ea1ff..c627ee66d57 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo@aisha.cc</email>
diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
index d23324a6570..65ccd825a3d 100644
--- a/app-text/scrollkeeper-dtd/metadata.xml
+++ b/app-text/scrollkeeper-dtd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index 6d7f3a75811..06fc63cfdd2 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bircoph@gentoo.org</email>
diff --git a/app-text/sgml-common/metadata.xml b/app-text/sgml-common/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/sgml-common/metadata.xml
+++ b/app-text/sgml-common/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/sgrep/metadata.xml b/app-text/sgrep/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/sgrep/metadata.xml
+++ b/app-text/sgrep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 0e192e4f03c..268c2d87d33 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,2 @@
-DIST sigil-1.5.1.tar.gz 20020962 BLAKE2B ac70c117d69c4062d66151372fc8cbede48be6f38ceae7d1dd1bd49fd8a0a4a352c885a120e00ba729e64ebfa928103d07f7bb85d69cbb3385f640f4fcf42985 SHA512 281c8327f7a05b9c9f805b02ef4c21f50d340a2f9e09dcae74be30aad107b0f2605801f0239e9a503db70afa2b37b7931dfec0efa5662dde906ce6c014da8849
DIST sigil-1.7.0.tar.gz 21315598 BLAKE2B 29f7c682925d1e1bbff082e96b747ce32df82d78406ccd984b4f8de1f01944c35aa86587ce47a18687d5fe281b8cb656085b52d3a1e72ed17862501121d9d134 SHA512 9918bb0bfbe3d068c95bb31cd84a37a0fac6dd6be9e94cb382e8c0140cdb375f47384f33c62fdff7f27aed379037a4a64e8d4a1065ae297bb389e2be78597c16
+DIST sigil-1.8.0.tar.gz 21217901 BLAKE2B 78615652859d1f61bab18b1b248d342dc6892943a2310659859ab577981c4452fbaeb567758097427453c8dfe95e42b499616a423b5c11b42238f763ac0653c8 SHA512 1a911aac996d3519f501820f8da9c810db9793063e481a6169288d402ef7e6b797308cf7ca5517162d0eb4d80f38f968627bca676b724ea5be5109c427473c95
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 0ee8d300aeb..16a802d7daa 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>arthurzam+gentoo@gmail.com</email>
+ <maintainer type="person">
+ <email>arthurzam@gentoo.org</email>
<name>Arthur Zamarin</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<use>
<flag name="plugins">Installed needed Python packages for using Sigil plugins</flag>
<flag name="system-mathjax">Use the system-wide <pkg>dev-libs/mathjax</pkg> instead of bundled</flag>
diff --git a/app-text/sigil/sigil-1.7.0.ebuild b/app-text/sigil/sigil-1.7.0.ebuild
index 0b2453ffe0d..56f93e6b73f 100644
--- a/app-text/sigil/sigil-1.7.0.ebuild
+++ b/app-text/sigil/sigil-1.7.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
LICENSE="GPL-3+ Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+plugins system-mathjax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/sigil/sigil-1.5.1.ebuild b/app-text/sigil/sigil-1.8.0.ebuild
index c7f5b33a10e..11d9e2e1dd8 100644
--- a/app-text/sigil/sigil-1.5.1.ebuild
+++ b/app-text/sigil/sigil-1.8.0.ebuild
@@ -1,20 +1,21 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="tk"
-inherit cmake python-single-r1 xdg-utils
+inherit xdg cmake python-single-r1
DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
LICENSE="GPL-3+ Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+plugins system-mathjax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -22,19 +23,19 @@ RDEPEND="
${PYTHON_DEPS}
app-text/hunspell:=
dev-libs/libpcre:3=[pcre16]
- $(python_gen_cond_dep \
- 'dev-python/css-parser[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/css-parser[${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]')
- >=dev-qt/qtconcurrent-5.12:5
- >=dev-qt/qtcore-5.12:5
- >=dev-qt/qtgui-5.12:5
- >=dev-qt/qtprintsupport-5.12:5
- >=dev-qt/qtwebengine-5.12:5[widgets]
- >=dev-qt/qtwidgets-5.12:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
sys-libs/zlib[minizip]
- plugins? ( $(python_gen_cond_dep \
- 'dev-python/chardet[${PYTHON_USEDEP}]
+ plugins? ( $(python_gen_cond_dep '
+ dev-python/chardet[${PYTHON_USEDEP}]
dev-python/cssselect[${PYTHON_USEDEP}]
dev-python/dulwich[${PYTHON_USEDEP}]
dev-python/html5lib[${PYTHON_USEDEP}]
@@ -43,14 +44,11 @@ RDEPEND="
system-mathjax? ( dev-libs/mathjax )
"
DEPEND="${RDEPEND}"
-
BDEPEND="
+ ${PYTHON_DEPS}
dev-qt/linguist-tools:5
- virtual/pkgconfig
"
-S="${WORKDIR}/Sigil-${PV}"
-
DOCS=( ChangeLog.txt README.md )
src_configure() {
@@ -72,11 +70,3 @@ src_install() {
python_fix_shebang "${ED}"/usr/share/sigil/
python_optimize "${ED}"/usr/share/sigil/
}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/simple-fb2-reader/metadata.xml b/app-text/simple-fb2-reader/metadata.xml
index 07d74f27a51..5dec6bf1c5a 100644
--- a/app-text/simple-fb2-reader/metadata.xml
+++ b/app-text/simple-fb2-reader/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/app-text/sloccount/metadata.xml b/app-text/sloccount/metadata.xml
index 79d462e8557..aaab041e888 100644
--- a/app-text/sloccount/metadata.xml
+++ b/app-text/sloccount/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/app-text/spellutils/metadata.xml b/app-text/spellutils/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/spellutils/metadata.xml
+++ b/app-text/spellutils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index 6f654ddb742..2734425ad0e 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bircoph@gentoo.org</email>
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
index 41900b018b6..a0b09d5647a 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304-r1.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=6
@@ -20,7 +20,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz
LICENSE="CPL-1.0 GPL-3 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="advertisement cal debug dictdotcn espeak examples flite
fortune gucharmap +htmlparse info man perl +powerwordparse
pronounce qqwry spell tools updateinfo +wikiparse +wordnet
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
index 49ef5f0ab29..0f90da8d9af 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-text/sword-modules/sword-modules-2.4.ebuild b/app-text/sword-modules/sword-modules-2.5.ebuild
index 63f79eb5b4d..072c374759c 100644
--- a/app-text/sword-modules/sword-modules-2.4.ebuild
+++ b/app-text/sword-modules/sword-modules-2.5.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
HOMEPAGE="https://www.crosswire.org/sword/modules/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
+LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
IUSE="esoteric ${LANGS// / l10n_}"
RDEPEND="
@@ -41,13 +41,13 @@ RDEPEND="
l10n_bg? (
app-dicts/sword-BulVeren
)
- l10n_bla? (
- app-dicts/sword-BlaMat
- )
l10n_br? (
app-dicts/sword-BretonNT
app-dicts/sword-br_en
)
+ l10n_ceb? (
+ app-dicts/sword-CebPinadayag
+ )
l10n_ch? (
app-dicts/sword-Chamorro
)
@@ -92,7 +92,6 @@ RDEPEND="
app-dicts/sword-GerKingComm
app-dicts/sword-GerLeoNA28
app-dicts/sword-GerLeoRP18
- app-dicts/sword-GerLut1545
app-dicts/sword-GerLutherpredigten
app-dicts/sword-GerMenge
app-dicts/sword-GerNeUe
@@ -124,6 +123,7 @@ RDEPEND="
app-dicts/sword-BBE
app-dicts/sword-BDBGlosses_Strongs
app-dicts/sword-BWE
+ app-dicts/sword-BaptistConfession1646
app-dicts/sword-BaptistConfession1689
app-dicts/sword-Barnes
app-dicts/sword-Burkitt
@@ -354,6 +354,7 @@ RDEPEND="
app-dicts/sword-HunIMIT
app-dicts/sword-HunKNB
app-dicts/sword-HunKar
+ app-dicts/sword-HunRUF
app-dicts/sword-HunUj
)
l10n_hy? (
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index 760864b569c..cc49ea864df 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild
index e07a0369156..60349d5cfaf 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~ppc-macos"
IUSE="clucene curl debug doc icu"
RDEPEND="sys-libs/zlib
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 868221477e3..5b3ea271236 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1 +1,2 @@
DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
+DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
diff --git a/app-text/t1utils/metadata.xml b/app-text/t1utils/metadata.xml
index 1375a4fcfd2..81930151803 100644
--- a/app-text/t1utils/metadata.xml
+++ b/app-text/t1utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild
new file mode 100644
index 00000000000..896f2c6e472
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.42.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Type 1 Font utilities"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#t1utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="BSD"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ !<media-libs/freetype-1.4_pre20080316"
+
+DOCS=( NEWS.md README.md )
diff --git a/app-text/tabler/metadata.xml b/app-text/tabler/metadata.xml
index 254ba3093fd..e50e5251ba4 100644
--- a/app-text/tabler/metadata.xml
+++ b/app-text/tabler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/talkfilters/metadata.xml b/app-text/talkfilters/metadata.xml
index feef11aea0b..bf3a9719199 100644
--- a/app-text/talkfilters/metadata.xml
+++ b/app-text/talkfilters/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/teckit/metadata.xml b/app-text/teckit/metadata.xml
index 940a9da898c..a2d0516d199 100644
--- a/app-text/teckit/metadata.xml
+++ b/app-text/teckit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/teseq/metadata.xml
+++ b/app-text/teseq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/tessdata_best/metadata.xml b/app-text/tessdata_best/metadata.xml
index 8b6d846a5d0..5cc9e15c3cf 100644
--- a/app-text/tessdata_best/metadata.xml
+++ b/app-text/tessdata_best/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/tessdata_best/tessdata_best-4.1.0.ebuild b/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
index f443489a355..580847d36fa 100644
--- a/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
+++ b/app-text/tessdata_best/tessdata_best-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+osd"
RDEPEND="!app-text/tessdata_fast
diff --git a/app-text/tessdata_fast/metadata.xml b/app-text/tessdata_fast/metadata.xml
index 57cc972314d..acc4e1fe419 100644
--- a/app-text/tessdata_fast/metadata.xml
+++ b/app-text/tessdata_fast/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
index a987bdcdf6a..d883e9719cd 100644
--- a/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
+++ b/app-text/tessdata_fast/tessdata_fast-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="+osd"
RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tessdata_legacy/metadata.xml b/app-text/tessdata_legacy/metadata.xml
index e9834bb6f66..4d735709aad 100644
--- a/app-text/tessdata_legacy/metadata.xml
+++ b/app-text/tessdata_legacy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
diff --git a/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild b/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
index 1a38a3063e1..1af98161922 100644
--- a/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
+++ b/app-text/tessdata_legacy/tessdata_legacy-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="math osd"
RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 62173ed3960..0266650c7a4 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,46 +1,2 @@
-DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
-DIST bul.traineddata-3.04.00 6026234 BLAKE2B a39a5757ec6bbb77ed6fe9a263e11b9d83eb64653f62f96dec68c102aa199348eefb8f99642f9824af9e41c537573f06af45f393271145fdcfbfff71bd07e1fd SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c
-DIST cat.traineddata-3.04.00 5356190 BLAKE2B 64c7677812342474a7182c4e7907e068231511e09403c7122004e7720ab023f98c2d157ba5d417582d6323d3aa3ce5eb9914ce10506663f70749a1290c553747 SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630
-DIST ces.traineddata-3.04.00 11896327 BLAKE2B 253795339231d377d3b033f348cc3413ba3bf9520bae44d318b459271608501db7958dcd216f44deabc7755008cb66c5b20625ad3a00a3ea8fca2258aef3c8af SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d
-DIST chi_sim.traineddata-3.04.00 42089623 BLAKE2B d7ac25d5a43ab36fe54035e78c34aa9b7fd4fee06fb32da6ec8173d0c0a40ea727d0c529f0d02ec949642c81c81a4d180c6c68557709d3561d169c9e7c3a29f8 SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673
-DIST chi_tra.traineddata-3.04.00 56692327 BLAKE2B 83ef6e067107b14cacb208ec5885d3db6a9fc6be85eae90f27eb4c70ae723cec6fa17912068f46078d8a03541a51ee2aa7b1eea007211b5fa9f7282142fd8ffb SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1
-DIST chr.traineddata-3.04.00 1083194 BLAKE2B 86a4c64f3df108d92f0b1d68743fb0a7c6e6aef328751c770968d946a476b1123141beb99730d67af8a4a321220be2a82cb3d96920352fd21709bfd15507a284 SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455
-DIST dan.traineddata-3.04.00 7340575 BLAKE2B 8437979bd4a01534e7a2c1c82c88232707ba10043c3bb824f71f8c365fed1353ce438dd08205286c1e2053adbe96211f34a5199648679f7c147806083d659a26 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff
-DIST dan_frak.traineddata-3.04.00 1622710 BLAKE2B 458935c2176a74ef0090574be0ead1d65a0ede29fee48215a674643bb3a38f7a4fb40c940480e1e490edab8758f49010c6c2304ad9490ea22f60d8a8602317e1 SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01
-DIST deu.traineddata-3.04.00 13367187 BLAKE2B 3ead7f065fc4284f1dbdb83180d5f87e717fe39971d2bcf248f22125b5ac5fa9ed0f53491b955c9e0063a419dfd23a6696841ad0d12d7f6de13411f81254c416 SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995
-DIST deu_frak.traineddata-3.04.00 1978593 BLAKE2B 7a9bf16949baa3167d162f5075a254fac7699cd6ce2766423a1d0ef652daa0174ae6a36c6dd0d0e6f45bf961b4a0d13a7f55a0de3bfa2afe023816dff0f54ed2 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7
-DIST ell.traineddata-3.04.00 5422512 BLAKE2B cec340bb25a6f60fdf17dff46c06440ee2be62bf4b8dc8055dae1d77ec4a06a43862052399a3ece1c3d860cb1d88a1511a3b58a8b9f61bde3371736b0d686c01 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48
-DIST eng.traineddata-3.04.00 21876550 BLAKE2B 983f91e54b334ee533d5689ac8ce768922e348ef89a284c47d93ba91fcad6de8614998c8a5b17c2406c5c30c1228530077aad84929da6d8bc983c89c1d3a2234 SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a
-DIST equ.traineddata-3.04.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST fin.traineddata-3.04.00 13274908 BLAKE2B 7fd89de5435619600523106184aea5e7c87720b1d5796508b4953d6d8c19e2e2bee96b7a36c887ab0f456a0322c30f17e37d91e3afaa1e0733c110f3324aa784 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789
-DIST fra.traineddata-3.04.00 14044118 BLAKE2B 9acb6f5d6710632178aba4b95db27390d0100d9dec6ca3648c518dbc221b2cc03ecaaf33aafa363265863b9032e2ab7a327beafb8a6e29ae1a3345ba80455aed SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561
-DIST heb.traineddata-3.04.00 4339016 BLAKE2B cbc22428f18602f7d9af02465e5e8c1088a86db812c37e113ea6a52a914710377d480366c190c852e466b7861172b964b705e328ba9cd3de5364c992e2c6e938 SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727
-DIST hin.traineddata-3.04.00 14152165 BLAKE2B 1efd29d700d9baaf2a6865caebca5b6375fe5e459cf0dc075396062233f54a1ea136787a975e3b0701956200fa79c539de5ff2e615ac83862b229c74b172c85f SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed
-DIST hun.traineddata-3.04.00 12213770 BLAKE2B 70f39e1e9b370c186cdffc2532810542e4655dd46274ea8e2ba9249383b991be4d82793edbab2edf7ad400eb54e0c7be032a20fa3fe851d5c6e9b5f4be12f139 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e
-DIST ind.traineddata-3.04.00 6503178 BLAKE2B 183221318212ff8c121f07541dc0d2855f12a0f5020b71d9e91a0c03c3938b7908debbcbe55e2df6d9f4f04066d513925d000cf1662aa084691f52532a4ae6a9 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77
-DIST ita.traineddata-3.04.00 14210569 BLAKE2B 2bfe588757c1f4765d5f6323cd7a72a80ba37c2796dcfd58b8dc00d9a3ad94f1e8710690b75542758be01fbe7b966d29e19054affc27d473e43448be0b2f327c SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef
-DIST jpn.traineddata-3.04.00 33072615 BLAKE2B 39fc312a431c2fa8a82a4fd81cb2ed27bc29b92daba71307db484c34ca0cb616e816ce7404214e562b822251862ba79f256108320ff8fbb1cf942e3facd571f2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567
-DIST kor.traineddata-3.04.00 13309831 BLAKE2B 6a2ebbe51f8c1b5dd426a62b982acaa1b1a7c32f1a9282ccdb9561846d36a77660c8911065a72f80fb353d757b34958292b76dcc25656441e30c68f648df5cf8 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee
-DIST lav.traineddata-3.04.00 7802105 BLAKE2B 40b90aadcab68a1787c77ebc3bceeb120fd4407cad3b7a33ca176cf1741d3b32ce1c4e81b3b793872caff756ec9651bfe7fc99e9721747eca7681024eb4b4726 SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b
-DIST lit.traineddata-3.04.00 8916163 BLAKE2B 7530938920b957b5affabc2e73deeb5e1c44a1005c5fddb3e5981db3c9b4c42fae45eb5ff88b1b41a9da9fa888ea4679ac2bb36f458c5da81d0251c85874ccc0 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0
-DIST nld.traineddata-3.04.00 17098919 BLAKE2B dcf0641a78f1c8c6493e504229a08e1d4838d6c808446693b354ea822c7e2afc5fd9c9a1a2b970543c92fd7d4b3e9090dd8a6cd2461d6ac91aade1e1cf150aef SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c
-DIST nor.traineddata-3.04.00 8262167 BLAKE2B 5ee6362a945e0ba56da6da95fd9a7958ff90fbbb20b978975092410f9d8da7f600f8eafd8587f32065b669b8399a228ccea14db94c9e74f32b1c8b683facc36b SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2
-DIST osd.traineddata-3.04.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST pol.traineddata-3.04.00 13918058 BLAKE2B 5531bcda6cbe2a27655f3448b5093fc1cbd1167e91fe3bb410a260062a7163790667d43954d880b20df23d68d73f2aa2933d425a8651b2c3ca7c8387486b876a SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10
-DIST por.traineddata-3.04.00 12914622 BLAKE2B ed0edc8440ebd3f2e9df7dac9ed399df79ca803d16a1396434cb058424637b123af54b0f970120b54d21c00d8a0b1fd387a12bbd200d5a85ed1d49bfea297026 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03
-DIST ron.traineddata-3.04.00 7957608 BLAKE2B f17e0e139bb0c5b12de89b82b62fa3014ed6129c60278a751994fd107a4ee310f991ef425296e3f3e3f44387ec8fa22da4e6b29127d7a7f5b31140240b79cc9c SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a
-DIST rus.traineddata-3.04.00 16152507 BLAKE2B 329619a15cfb48c04d1d4e4bf902e090aac9ffaa1998a26a8861dc24ddb8d9727d473024dae44a43b7ff29f0079cb87dd60dc1a49d2e310249eb05999daea839 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335
-DIST slk.traineddata-3.04.00 9126966 BLAKE2B fba32bf08f14a2e354b298e01b900f7e7b0aa6082c78214a19b2a11a9b2cc73a0ab9f70453888860b3e1db5b450c1934099375c258d363b32ea497c2833335c6 SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96
-DIST slk_frak.traineddata-3.04.00 845250 BLAKE2B 623c43315b4fc842811d4f165d19f82b1141c22d78e1ae98ec31b5b05df31f7c05702f30a37043c7bfe6bb29b8f7648f50445e7a2f4b1de666599b211c1de6b6 SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5
-DIST slv.traineddata-3.04.00 6824064 BLAKE2B b9e804194e82b3f7358cb794ca0eea0766e9166e76d0d48f6be57b431c8ea4d88884adb4dc68dda24e07d06ced018992cb9e4690d5778ae192fa9aa533ccd8b2 SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe
-DIST spa.traineddata-3.04.00 15953087 BLAKE2B 9eba61ca27a8697b4e671d8f0d1626500da4c18f046b51fdd692576e5b9068898a75663d2745cd21345a6f3df5108b358624b7b7a264e3c3d4baa34cf0631771 SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8
-DIST srp.traineddata-3.04.00 4611681 BLAKE2B 08c3814a6463a279fa4111d9c94161ec43c84e6479436734e067ae5aa9b17d09ed02a74ea814ffe389e625253599a757b2bb5b866d1ca0e8991308658f57585a SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a
-DIST swe.traineddata-3.04.00 9460295 BLAKE2B 766bcd64e506eea7014975de1ddf6cffcf8610d23e38ddee77ac00125eed6c3db9c434c9f1d111a9fbfa64543b230743e1cce141b19201c7c94c96967bc35141 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167
-DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
-DIST tesseract-4.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
-DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
-DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad7cac9d60d59189e26fef6c11469da26e86ca867ff97cbf1b83fc501d6e48fee0e729f6e73e7f5a512e7b89998475c2 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a
-DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
-DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
-DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
+DIST tesseract-5.0.0_beta20210815.tar.gz 1914265 BLAKE2B eadefb46a84fcc73d3da7a1780d1e0669840183266176021871e57ca55c79e9b56a78334414732b9024ae911cee522069c3170bf71af877c46c1ffae37c88b3f SHA512 4b78af9119c35d783e47523b41ee8bbf63913f8c122e94b6e6538a4cbab8e751df9f00f3a50d48e8a7beb948c6b23794e2481721696bf3e0f284de8aa6e9e8e7
diff --git a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
deleted file mode 100644
index d6250d66c05..00000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4141de7f8ddb5ac3c39fd9c1fc77ed911c768c3d Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
-Date: Fri, 27 Jan 2017 12:02:54 +0100
-Subject: [PATCH] Provide SVSync::StartThread() with GRAPHICS_DISABLED
-
----
- viewer/svutil.cpp | 44 +++++++++++++++++++++-----------------------
- 1 file changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
-index 34a2286..84a4b94 100644
---- a/viewer/svutil.cpp
-+++ b/viewer/svutil.cpp
-@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
- #endif
- }
-
-+// Create new thread.
-+void SVSync::StartThread(void *(*func)(void*), void* arg) {
-+#ifdef _WIN32
-+ LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-+ DWORD threadid;
-+ HANDLE newthread = CreateThread(
-+ NULL, // default security attributes
-+ 0, // use default stack size
-+ f, // thread function
-+ arg, // argument to thread function
-+ 0, // use default creation flags
-+ &threadid); // returns the thread identifier
-+#else
-+ pthread_t helper;
-+ pthread_attr_t attr;
-+ pthread_attr_init(&attr);
-+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+ pthread_create(&helper, &attr, func, arg);
-+#endif
-+}
-+
- #ifndef GRAPHICS_DISABLED
-
- const int kMaxMsgSize = 4096;
-@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
- #endif
- }
-
--
--// Create new thread.
--
--void SVSync::StartThread(void *(*func)(void*), void* arg) {
--#ifdef _WIN32
-- LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-- DWORD threadid;
-- HANDLE newthread = CreateThread(
-- NULL, // default security attributes
-- 0, // use default stack size
-- f, // thread function
-- arg, // argument to thread function
-- 0, // use default creation flags
-- &threadid); // returns the thread identifier
--#else
-- pthread_t helper;
-- pthread_attr_t attr;
-- pthread_attr_init(&attr);
-- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-- pthread_create(&helper, &attr, func, arg);
--#endif
--}
--
- // Place a message in the message buffer (and flush it).
- void SVNetwork::Send(const char* msg) {
- mutex_send_->Lock();
---
-2.12.0
-
diff --git a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
deleted file mode 100644
index ad1f0f3df20..00000000000
--- a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am 2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am 2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- com/google/scrollview/ScrollView.class
-
- SCROLLVIEW_LIBS = \
-- piccolo2d-core-3.0.jar \
-- piccolo2d-extras-3.0.jar
-+ /usr/share/piccolo2d/lib/piccolo2d.jar
-
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
-
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- $(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
---- tesseract.orig/viewer/Makefile.am 2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/viewer/Makefile.am 2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
-
- libtesseract_viewer_la_SOURCES = \
- scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index c3f203799bf..f0a94f16893 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>voyageur@gentoo.org</email>
@@ -16,9 +16,7 @@
<remote-id type="github">tesseract-ocr/tesseract</remote-id>
</upstream>
<use>
- <flag name="math"> Enable support for recognition of equations.</flag>
- <flag name="scrollview"> Install viewer to debug recognition (ScrollView).</flag>
- <flag name="osd"> Enable support orientation and script detection.</flag>
+ <flag name="float32">Support float for model training and text recognition (faster, requires less RAM)</flag>
<flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
<flag name="training">Install training applications to add support for new languages.</flag>
</use>
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
deleted file mode 100644
index d237b25cfbf..00000000000
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
- math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
- l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
- l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
- l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
- l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
- l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
- l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
- ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
- l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
- ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
- l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
- l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
- l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
- l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
- l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
- l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
- l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
- l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
- l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
- l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
- l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
- l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
- l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
- l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
- l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
- l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
- l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
- l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
- l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
- l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
- ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
- l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
- l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
- l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
- l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
- l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
- l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
- l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
- l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
- l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
- l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
- osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
- opencl? (
- virtual/opencl
- media-libs/tiff:0=
- media-libs/leptonica:=[tiff]
- )
- scrollview? (
- >=dev-java/piccolo2d-3.0:0
- )
- training? (
- dev-libs/icu:=
- x11-libs/pango:=
- x11-libs/cairo:=
- )"
-
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )
- scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
- scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
- "${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
- for file in ${A}; do
- if [[ "${file}" == *traineddata* ]]; then
- cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
- fi
- done
-}
-
-src_prepare() {
- default
- eautoreconf
-
- java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable opencl)
- $(use_enable scrollview graphics)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use doc && emake doc
- use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
- use training && emake training
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
- find "${ED}" -name '*.la' -delete || die
-
- if use training; then
- emake DESTDIR="${D}" training-install
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins testing/eurotext.tif testing/phototest.tif
- fi
-
- insinto /usr/share/tessdata
- doins tessdata/*traineddata* # language files
- use scrollview && doins java/ScrollView.jar # scrollview
-}
diff --git a/app-text/tesseract/tesseract-4.1.1.ebuild b/app-text/tesseract/tesseract-4.1.1.ebuild
index 805fff26819..2351e1f1609 100644
--- a/app-text/tesseract/tesseract-4.1.1.ebuild
+++ b/app-text/tesseract/tesseract-4.1.1.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://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-5.0.0_beta20210815.ebuild
index ac660c1f07d..0cd62461203 100644
--- a/app-text/tesseract/tesseract-4.1.0-r1.ebuild
+++ b/app-text/tesseract/tesseract-5.0.0_beta20210815.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
@@ -7,12 +7,13 @@ inherit autotools multilib-minimal toolchain-funcs
DESCRIPTION="An OCR Engine, originally developed at HP, now open source."
HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+BETA_PV=$(ver_rs 3-4 "-")
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${BETA_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
opencl? (
@@ -37,6 +38,8 @@ DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
doc? ( app-doc/doxygen )"
+S=${WORKDIR}/${PN}-${BETA_PV}
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -55,6 +58,7 @@ multilib_src_configure() {
local myeconfargs=(
--enable-shared
--disable-graphics
+ $(use_enable float32)
$(use_enable opencl)
$(use_enable openmp)
$(use_enable static-libs static)
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/texi2html/metadata.xml
+++ b/app-text/texi2html/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index 816bc484af1..24e17b73aba 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
diff --git a/app-text/texlive-core/texlive-core-2021.ebuild b/app-text/texlive-core/texlive-core-2021-r1.ebuild
index 1372c2a1984..58d08c4cf2b 100644
--- a/app-text/texlive-core/texlive-core-2021.ebuild
+++ b/app-text/texlive-core/texlive-core-2021-r1.ebuild
@@ -89,7 +89,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
!app-text/epspdf
!app-text/pdfjam
sys-libs/zlib
- >=media-libs/harfbuzz-1.4.5[icu,graphite]
+ >=media-libs/harfbuzz-1.4.5:=[icu,graphite]
>=media-libs/libpng-1.2.43-r2:0=
media-libs/gd[png]
media-gfx/graphite2
@@ -107,7 +107,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
xindy? ( dev-lisp/clisp:= )
media-libs/freetype:2
>=dev-libs/icu-50:=
- >=dev-libs/kpathsea-6.3.2"
+ >=dev-libs/kpathsea-6.3.2:="
BDEPEND="sys-apps/ed
sys-devel/flex
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index f6c6fed830e..8c23ee5d3c5 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021.ebuild
index 8e45ab20cc6..b1eedb0fe04 100644
--- a/app-text/texlive/texlive-2021.ebuild
+++ b/app-text/texlive/texlive-2021.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
LICENSE="metapackage"
SLOT="0"
-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 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
diff --git a/app-text/tidy-html5/metadata.xml b/app-text/tidy-html5/metadata.xml
index d15ff3d4d28..541e52bb72b 100644
--- a/app-text/tidy-html5/metadata.xml
+++ b/app-text/tidy-html5/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
</maintainer>
<upstream>
- <remote-id type="github">nhatminhle/cofoja</remote-id>
+ <remote-id type="github">htacg/tidy-html5</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/tkinfo/metadata.xml b/app-text/tkinfo/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/tkinfo/metadata.xml
+++ b/app-text/tkinfo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/tkman/metadata.xml b/app-text/tkman/metadata.xml
index 1300475e7aa..cac093375a9 100644
--- a/app-text/tkman/metadata.xml
+++ b/app-text/tkman/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/tofrodos/metadata.xml b/app-text/tofrodos/metadata.xml
index a8e3b2aeed3..ad6c3b11b01 100644
--- a/app-text/tofrodos/metadata.xml
+++ b/app-text/tofrodos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
diff --git a/app-text/tokyodystopia/metadata.xml b/app-text/tokyodystopia/metadata.xml
index 40aa45df2b0..2ce0e74f986 100644
--- a/app-text/tokyodystopia/metadata.xml
+++ b/app-text/tokyodystopia/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>patrick@gentoo.org</email>
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
index 04751195a35..35e9588fb69 100644
--- a/app-text/trang/metadata.xml
+++ b/app-text/trang/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index c30fee716df..d8a49607812 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>jstein@gentoo.org</email>
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index bcac09b3ccd..98111d9ab0f 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND=""
diff --git a/app-text/ttf2pk2/metadata.xml b/app-text/ttf2pk2/metadata.xml
index 13170c3184d..edfe9723199 100644
--- a/app-text/ttf2pk2/metadata.xml
+++ b/app-text/ttf2pk2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
index e722a14b481..f86a9000452 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
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 ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
index 7c608c9e66b..6cfdfa2235b 100644
--- a/app-text/ttf2pt1/metadata.xml
+++ b/app-text/ttf2pt1/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>fonts@gentoo.org</email>
diff --git a/app-text/txt2man/metadata.xml b/app-text/txt2man/metadata.xml
index 6327aa55324..9e061696f43 100644
--- a/app-text/txt2man/metadata.xml
+++ b/app-text/txt2man/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/txt2pdbdoc/metadata.xml b/app-text/txt2pdbdoc/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/txt2pdbdoc/metadata.xml
+++ b/app-text/txt2pdbdoc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/txt2tags/metadata.xml b/app-text/txt2tags/metadata.xml
index dbfe7dbaf13..9ec2b5c9524 100644
--- a/app-text/txt2tags/metadata.xml
+++ b/app-text/txt2tags/metadata.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <stabilize-allarches/>
<upstream>
+ <remote-id type="github">txt2tags/txt2tags</remote-id>
<remote-id type="google-code">txt2tags</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index 8a244a869e9..bde19fb5de1 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -3,15 +3,18 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
HOMEPAGE="https://txt2tags.org"
SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+
+python_test() {
+ cd test || die
+ "${EPYTHON}" run.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-text/u2ps/metadata.xml b/app-text/u2ps/metadata.xml
index ae74331bddb..675a0172f42 100644
--- a/app-text/u2ps/metadata.xml
+++ b/app-text/u2ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/unac/metadata.xml b/app-text/unac/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/unac/metadata.xml
+++ b/app-text/unac/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
index 384639eac55..b31f89c8113 100644
--- a/app-text/unpaper/metadata.xml
+++ b/app-text/unpaper/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<upstream>
diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml
index 79d462e8557..aaab041e888 100644
--- a/app-text/unrtf/metadata.xml
+++ b/app-text/unrtf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/app-text/uudeview/metadata.xml b/app-text/uudeview/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/uudeview/metadata.xml
+++ b/app-text/uudeview/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index fb996f7ee81..356b2e984d0 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1 +1,2 @@
DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
+DIST vgrep-2.5.2.tar.gz 1571753 BLAKE2B c3378fa11e9bb88fb8d63a380722603efa0725e2d43b69aafbb6ff8788abab441f1fbd3d0c946c922c8100863c185623b41aa76a04e81aab302b26d68f5956d7 SHA512 dc63647b995a21e75d9658efd7e9bcc4c706221ac249d0273cf6997eef832ba4a27f825126fb3fb4c65d724c75e27d04e9b5505b0b65c9b9b0022a49580011a6
diff --git a/app-text/vgrep/metadata.xml b/app-text/vgrep/metadata.xml
index 4965843d0e8..3efa0310a8a 100644
--- a/app-text/vgrep/metadata.xml
+++ b/app-text/vgrep/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>whissi@gentoo.org</email>
diff --git a/app-text/vgrep/vgrep-2.5.2.ebuild b/app-text/vgrep/vgrep-2.5.2.ebuild
new file mode 100644
index 00000000000..8946ea7fa45
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# golangci-lint is required to run tests which is not yet packaged
+RESTRICT="strip test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ emake PREFIX="${D}/usr" install
+ einstalldocs
+}
diff --git a/app-text/vilistextum/metadata.xml b/app-text/vilistextum/metadata.xml
index 3e927f8d748..df1ea8d8452 100644
--- a/app-text/vilistextum/metadata.xml
+++ b/app-text/vilistextum/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index 640511937e2..cd21cfd82da 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>shell-tools@gentoo.org</email>
diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
index 352da8e8c75..96be9c2520c 100644
--- a/app-text/webgen/metadata.xml
+++ b/app-text/webgen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ruby@gentoo.org</email>
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 572530f7b09..5c01cb52317 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zlogene@gentoo.org</email>
diff --git a/app-text/wiki2beamer/metadata.xml b/app-text/wiki2beamer/metadata.xml
index 2d21a5ac6b1..d20f47202bf 100644
--- a/app-text/wiki2beamer/metadata.xml
+++ b/app-text/wiki2beamer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
index 14c2a0236a3..af150e94b57 100644
--- a/app-text/writerperfect/metadata.xml
+++ b/app-text/writerperfect/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>office@gentoo.org</email>
diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
index 63ca2d1443d..3061be5b02d 100644
--- a/app-text/wscr/metadata.xml
+++ b/app-text/wscr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">WSCR is a program to solve word jumbles, print all
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index b0d8920b953..b035e8ba14f 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.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
@@ -6,7 +6,7 @@ inherit toolchain-funcs
DESCRIPTION="A Lightweight and Fast Anagram Solver"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
index cd50be09652..197cdb24251 100644
--- a/app-text/wv/metadata.xml
+++ b/app-text/wv/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
index f7ff6e99633..95c9b6583b4 100644
--- a/app-text/wv2/metadata.xml
+++ b/app-text/wv2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
index 2fe89408ee8..2541df48c09 100644
--- a/app-text/xapers/metadata.xml
+++ b/app-text/xapers/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>william@ewpettersson.se</email>
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
index d920e3ba3e5..489e730c1c9 100644
--- a/app-text/xapian-omega/metadata.xml
+++ b/app-text/xapian-omega/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>blueness@gentoo.org</email>
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
index 4834790e1a2..40a9febafab 100644
--- a/app-text/xchm/metadata.xml
+++ b/app-text/xchm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.32.ebuild
index 67a67e5064b..4f682b41d68 100644
--- a/app-text/xchm/xchm-1.32.ebuild
+++ b/app-text/xchm/xchm-1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~riscv x86"
IUSE="nls"
RDEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index c04b182d3bd..4aef98d6734 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r3.ebuild
index 584d1a9aed5..113fe335056 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r3.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=6
@@ -9,7 +9,7 @@ DESCRIPTION="DVI previewer for X Window System"
HOMEPAGE="http://xdvi.sourceforge.net/"
SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="motif neXt Xaw3d emacs"
@@ -29,7 +29,7 @@ CDEPEND=">=media-libs/freetype-2.9.1-r2:2
!Xaw3d? ( x11-libs/libXaw )
)
)
- dev-libs/kpathsea"
+ dev-libs/kpathsea:="
DEPEND="sys-devel/flex
virtual/yacc
virtual/pkgconfig
diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/xhtml1/metadata.xml
+++ b/app-text/xhtml1/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/xhtml11/metadata.xml b/app-text/xhtml11/metadata.xml
index 0319eec4c8b..076793e3f54 100644
--- a/app-text/xhtml11/metadata.xml
+++ b/app-text/xhtml11/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 5f7e93359df..b844aa2c06e 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-text/xlhtml/metadata.xml b/app-text/xlhtml/metadata.xml
index 093eecf6e48..a29058ff024 100644
--- a/app-text/xlhtml/metadata.xml
+++ b/app-text/xlhtml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml
index 69984cfb9ab..c50d8f0b46d 100644
--- a/app-text/xlsx2csv/metadata.xml
+++ b/app-text/xlsx2csv/metadata.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <stabilize-allarches/>
<upstream>
<remote-id type="pypi">xlsx2csv</remote-id>
<remote-id type="github">dilshod/xlsx2csv</remote-id>
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index ccf9a6924e0..73061b4a3f0 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="xml"
DISTUTILS_USE_SETUPTOOLS=no
diff --git a/app-text/xml2/metadata.xml b/app-text/xml2/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/xml2/metadata.xml
+++ b/app-text/xml2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/xml2doc/metadata.xml b/app-text/xml2doc/metadata.xml
index 6109befef74..61aee6082a3 100644
--- a/app-text/xml2doc/metadata.xml
+++ b/app-text/xml2doc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index 32124eb5f86..ba7acd51612 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>
diff --git a/app-text/xmldiff/xmldiff-2.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild
index 77e4b4f9ab5..16acc93ca98 100644
--- a/app-text/xmldiff/xmldiff-2.4.ebuild
+++ b/app-text/xmldiff/xmldiff-2.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
diff --git a/app-text/xmlformat/metadata.xml b/app-text/xmlformat/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/app-text/xmlformat/metadata.xml
+++ b/app-text/xmlformat/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/xmlstarlet/metadata.xml b/app-text/xmlstarlet/metadata.xml
index 19176727202..0d4da1d9219 100644
--- a/app-text/xmlstarlet/metadata.xml
+++ b/app-text/xmlstarlet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sping@gentoo.org</email>
diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
index d52af1c934c..b1da74ae66b 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>sam@gentoo.org</email>
diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml
index 125eb5b19af..d7d5af0839e 100644
--- a/app-text/xournal/metadata.xml
+++ b/app-text/xournal/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/app-text/xournalpp/metadata.xml b/app-text/xournalpp/metadata.xml
index b1dfcefdcde..96729a07e76 100644
--- a/app-text/xournalpp/metadata.xml
+++ b/app-text/xournalpp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
diff --git a/app-text/xournalpp/xournalpp-1.0.20.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild
index 1feb81cd876..24914b97a85 100644
--- a/app-text/xournalpp/xournalpp-1.0.20.ebuild
+++ b/app-text/xournalpp/xournalpp-1.0.20.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
unset SRC_URI
else
- KEYWORDS="amd64"
+ KEYWORDS="amd64 ~ppc64"
SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
fi
diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml
index 89d3f9dff56..77412381d44 100644
--- a/app-text/xpdf/metadata.xml
+++ b/app-text/xpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>bircoph@gentoo.org</email>
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/app-text/yelp-tools/metadata.xml
+++ b/app-text/yelp-tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
index d1ed655e2e8..df5d518f592 100644
--- a/app-text/yelp-tools/yelp-tools-40.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-40.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit gnome2 meson python-single-r1
DESCRIPTION="Collection of tools for building and converting documentation"
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
index 72d8dd2d70b..ad9519f3992 100644
--- a/app-text/yodl/metadata.xml
+++ b/app-text/yodl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index 7f5e7f55e60..e0e23d23393 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
index 237c58a1247..dbee873ba60 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit meson xdg-utils
+inherit meson xdg-utils optfeature
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="amd64 arm x86"
+ KEYWORDS="amd64 arm ~riscv x86"
SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
fi
@@ -20,10 +20,13 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
LICENSE="ZLIB"
SLOT="0"
-DEPEND=">=app-text/zathura-0.3.9
+DEPEND="app-arch/libarchive:=
+ >=app-text/zathura-0.3.9
dev-libs/girara
dev-libs/glib:2
- x11-libs/cairo"
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3"
RDEPEND="${DEPEND}"
@@ -31,6 +34,8 @@ BDEPEND="virtual/pkgconfig"
pkg_postinst() {
xdg_desktop_database_update
+
+ optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
}
pkg_postrm() {
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index a5d47c0a1d7..de2653af775 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit meson xdg-utils
+inherit meson xdg-utils optfeature
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
fi
@@ -20,10 +20,13 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
LICENSE="ZLIB"
SLOT="0"
-DEPEND=">=app-text/zathura-0.3.9
+DEPEND="app-arch/libarchive:=
+ >=app-text/zathura-0.3.9
dev-libs/girara
dev-libs/glib:2
- x11-libs/cairo"
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3"
RDEPEND="${DEPEND}"
@@ -31,6 +34,8 @@ BDEPEND="virtual/pkgconfig"
pkg_postinst() {
xdg_desktop_database_update
+
+ optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
}
pkg_postrm() {
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index f3839784e58..c6b72890006 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
index 6b35a56bea1..392cfe24b68 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -3,14 +3,14 @@
EAPI=7
-inherit meson xdg-utils
+inherit meson xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="amd64 arm x86"
+ KEYWORDS="amd64 arm ~riscv x86"
SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
fi
@@ -28,13 +28,3 @@ RDEPEND="app-text/djvu
DEPEND="${RDEPEND}
virtual/pkgconfig"
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 7262f7ee1ca..8b3af5827a6 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit gnome2-utils meson xdg-utils
+inherit meson xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
fi
@@ -28,13 +28,3 @@ RDEPEND="app-text/djvu
DEPEND="${RDEPEND}
virtual/pkgconfig"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml
index c80ab57c7e6..b3facb93961 100644
--- a/app-text/zathura-meta/metadata.xml
+++ b/app-text/zathura-meta/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index 8557cb82e32..18a11cea9c4 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index 81dd25281b3..9e8a429671b 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>slashbeast@gentoo.org</email>
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
index 629dcc59d61..efb6d5f2541 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 5b4915a8a87..1d1d57e3ea6 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
fi
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index 7f5e7f55e60..e0e23d23393 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
index e115907ec1e..023f84490bc 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
fi
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 1029752194f..01488806de7 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
fi
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 17d373d4aa4..d6cadf260b5 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,3 +2,4 @@ DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e
DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
+DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index f7ab7af931b..f7b9cf89b9e 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>slashbeast@gentoo.org</email>
diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.4.7.ebuild
index 4d891afcd06..1be1a779319 100644
--- a/app-text/zathura/zathura-0.4.7.ebuild
+++ b/app-text/zathura/zathura-0.4.7.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild
new file mode 100644
index 00000000000..0de2aed7939
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.6
+ >=dev-libs/glib-2.50:2
+ >=sys-devel/gettext-0.19.8
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.22:3
+ magic? ( sys-apps/file )
+ seccomp? ( sys-libs/libseccomp )
+ sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+ synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+ test? ( dev-libs/appstream-glib
+ dev-libs/check )
+ virtual/pkgconfig"
+
+src_configure() {
+ local emesonargs=(
+ -Dconvert-icon=disabled
+ -Dmagic=$(usex magic enabled disabled)
+ -Dmanpages=$(usex doc enabled disabled)
+ -Dseccomp=$(usex seccomp enabled disabled)
+ -Dsqlite=$(usex sqlite enabled disabled)
+ -Dsynctex=$(usex synctex enabled disabled)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 96647a9ccf4..0de2aed7939 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit meson virtualx
+inherit meson virtualx xdg
DESCRIPTION="A highly customizable and functional document viewer"
HOMEPAGE="https://pwmt.org/projects/zathura/"
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_BRANCH="develop"
else
SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
@@ -23,7 +23,7 @@ IUSE="doc +magic seccomp sqlite synctex test"
RESTRICT="!test? ( test )"
-DEPEND=">=dev-libs/girara-0.3.3
+DEPEND=">=dev-libs/girara-0.3.6
>=dev-libs/glib-2.50:2
>=sys-devel/gettext-0.19.8
x11-libs/cairo
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index a3f13bd6299..88755cde623 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1 +1 @@
-DIST zotero-bin-5.0.96.2.tar.bz2 60475436 BLAKE2B 2c113fbbb78f0e4ca4e12ed31ed43ba6e65eea88039f9fda1d1f97e6407b95e9ac1d89b2504f220ce96634f5404defcdb5f5346dec83d5d9f02832e1573f1a60 SHA512 4fc988bf74179ad5f28a4649cfc6c6c5d4eeabc3b7aa60e717681bc57dd1c3ba6f2d3310fb83e6e2e55475aa9d7077329acc3dff52b63a0759c32f542ef0ef47
+DIST zotero-bin-5.0.96.3.tar.bz2 61236517 BLAKE2B 3de6d41349f9cc405dd3d44e8e456169d58bdd1f4522c31cd168182878839fe8ca6280eff7339bcf3d66c87c7d4f5af55d768551abcff3cd579342cae37b64e3 SHA512 0777ec41bc151b0bd30076f8a7f59e431c3435728b4d85298421ef11aea5b7c1e122d3bb7fcc5551bb8c4472922796d9508a56df7a0913515d8568fcf3ca6fee
diff --git a/app-text/zotero-bin/metadata.xml b/app-text/zotero-bin/metadata.xml
index dc1be65adf8..922dd08e5b7 100644
--- a/app-text/zotero-bin/metadata.xml
+++ b/app-text/zotero-bin/metadata.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>andrewammerlaan@gentoo.org</email>
diff --git a/app-text/zotero-bin/zotero-bin-5.0.96.2.ebuild b/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
index a6626cdb894..561cabf9e7f 100644
--- a/app-text/zotero-bin/zotero-bin-5.0.96.2.ebuild
+++ b/app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop xdg