summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/ansifilter/metadata.xml3
-rw-r--r--app-text/asciidoc/Manifest1
-rw-r--r--app-text/asciidoc/asciidoc-10.2.0.ebuild48
-rw-r--r--app-text/asciidoc/metadata.xml19
-rw-r--r--app-text/atril/atril-1.24.1.ebuild4
-rw-r--r--app-text/bibletime/Manifest1
-rw-r--r--app-text/bibletime/bibletime-3.0.3-r2.ebuild (renamed from app-text/bibletime/bibletime-3.0.2.ebuild)10
-rw-r--r--app-text/bibletime/bibletime-3.0.3.ebuild2
-rw-r--r--app-text/build-docbook-catalog/Manifest2
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild39
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild (renamed from app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild)1
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild37
-rw-r--r--app-text/calibre/Manifest2
-rw-r--r--app-text/calibre/calibre-5.43.0.ebuild2
-rw-r--r--app-text/calibre/calibre-5.44.0-r1.ebuild (renamed from app-text/calibre/calibre-5.42.0-r1.ebuild)2
-rw-r--r--app-text/capyt/capyt-1.1.1.ebuild6
-rw-r--r--app-text/cb2bib/cb2bib-2.0.0-r1.ebuild8
-rw-r--r--app-text/cherrytree/Manifest1
-rw-r--r--app-text/cherrytree/cherrytree-0.99.48.ebuild91
-rw-r--r--app-text/convmv/metadata.xml4
-rw-r--r--app-text/dblatex/dblatex-0.3.11-r1.ebuild4
-rw-r--r--app-text/dblatex/dblatex-0.3.12.ebuild2
-rw-r--r--app-text/dictd/dictd-1.13.0-r5.ebuild129
-rw-r--r--app-text/dictd/files/dictd-1.13.0-lex.patch28
-rw-r--r--app-text/dictd/files/dictd-1.13.0-libtool.patch59
-rw-r--r--app-text/dictd/files/dictd-1.13.0-version.patch65
-rw-r--r--app-text/diff-pdf/Manifest2
-rw-r--r--app-text/diff-pdf/diff-pdf-0.5.ebuild (renamed from app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild)15
-rw-r--r--app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch24
-rw-r--r--app-text/ding/ding-1.8.1.ebuild2
-rw-r--r--app-text/ding/ding-1.9.ebuild4
-rw-r--r--app-text/ding/metadata.xml5
-rw-r--r--app-text/discount/files/gethopt-undefined.patch11
-rw-r--r--app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild4
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild4
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild70
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild2
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild (renamed from app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild)35
-rw-r--r--app-text/dos2unix/Manifest1
-rw-r--r--app-text/dos2unix/dos2unix-7.4.3.ebuild89
-rw-r--r--app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild4
-rw-r--r--app-text/enchant/Manifest1
-rw-r--r--app-text/enchant/enchant-1.6.1-r1.ebuild60
-rw-r--r--app-text/enchant/enchant-2.3.2.ebuild47
-rw-r--r--app-text/enchant/enchant-2.3.3-r1.ebuild2
-rw-r--r--app-text/evince/Manifest3
-rw-r--r--app-text/evince/evince-41.3.ebuild126
-rw-r--r--app-text/evince/evince-42.1.ebuild122
-rw-r--r--app-text/evince/evince-42.2.ebuild122
-rw-r--r--app-text/evince/evince-42.3.ebuild2
-rw-r--r--app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch54
-rw-r--r--app-text/evince/metadata.xml2
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild2
-rw-r--r--app-text/ghostscript-gpl/metadata.xml2
-rw-r--r--app-text/grip/grip-4.6.1.ebuild2
-rw-r--r--app-text/groonga/metadata.xml35
-rw-r--r--app-text/gspell/Manifest2
-rw-r--r--app-text/gspell/gspell-1.11.1.ebuild (renamed from app-text/gspell/gspell-1.9.1.ebuild)19
-rw-r--r--app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild28
-rw-r--r--app-text/html2text/Manifest2
-rw-r--r--app-text/html2text/html2text-2.1.1.ebuild (renamed from app-text/html2text/html2text-2.0.0.ebuild)9
-rw-r--r--app-text/html2text/html2text-9999.ebuild2
-rw-r--r--app-text/htmltidy/htmltidy-5.8.0-r1.ebuild2
-rw-r--r--app-text/iso-codes/Manifest3
-rw-r--r--app-text/iso-codes/iso-codes-4.10.0.ebuild (renamed from app-text/iso-codes/iso-codes-4.9.0.ebuild)0
-rw-r--r--app-text/iso-codes/iso-codes-4.11.0.ebuild79
-rw-r--r--app-text/jabref/Manifest1
-rw-r--r--app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch313
-rw-r--r--app-text/jabref/files/jabref-2.10-skip-failing-tests.patch349
-rw-r--r--app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch49
-rw-r--r--app-text/jabref/files/jabref-2.10-test-prefs.xml19
-rw-r--r--app-text/jabref/jabref-2.10-r7.ebuild132
-rw-r--r--app-text/jabref/metadata.xml19
-rw-r--r--app-text/jo/Manifest1
-rw-r--r--app-text/jo/jo-1.6.ebuild (renamed from app-text/jo/jo-99999.ebuild)18
-rw-r--r--app-text/jo/jo-9999.ebuild36
-rw-r--r--app-text/jo/metadata.xml15
-rw-r--r--app-text/kramdown-rfc/Manifest3
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild33
-rw-r--r--app-text/kramdown-rfc/kramdown-rfc-1.6.13.ebuild (renamed from app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild)5
-rw-r--r--app-text/krop/krop-0.6.0-r1.ebuild2
-rw-r--r--app-text/krop/krop-9999.ebuild2
-rw-r--r--app-text/lesspipe/Manifest2
-rw-r--r--app-text/lesspipe/lesspipe-1.91.ebuild60
-rw-r--r--app-text/lesspipe/lesspipe-2.04-r1.ebuild47
-rw-r--r--app-text/lesspipe/lesspipe-2.05.ebuild2
-rw-r--r--app-text/libabw/libabw-0.1.3.ebuild2
-rw-r--r--app-text/libebook/libebook-0.1.3-r2.ebuild2
-rw-r--r--app-text/libepubgen/libepubgen-0.1.1-r1.ebuild (renamed from app-text/libepubgen/libepubgen-0.1.1.ebuild)12
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10-r1.ebuild2
-rw-r--r--app-text/libetonyek/libetonyek-0.1.10.ebuild58
-rw-r--r--app-text/libetonyek/libetonyek-9999.ebuild2
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.6.ebuild4
-rw-r--r--app-text/liblangtag/Manifest1
-rw-r--r--app-text/liblangtag/liblangtag-0.6.4.ebuild55
-rw-r--r--app-text/libmspub/libmspub-0.1.4.ebuild2
-rw-r--r--app-text/libmspub/libmspub-9999.ebuild2
-rw-r--r--app-text/libmwaw/libmwaw-0.3.21.ebuild2
-rw-r--r--app-text/libmwaw/libmwaw-9999.ebuild4
-rw-r--r--app-text/libnumbertext/Manifest1
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.10.ebuild2
-rw-r--r--app-text/libnumbertext/libnumbertext-1.0.8.ebuild23
-rw-r--r--app-text/libodfgen/libodfgen-0.1.8.ebuild4
-rw-r--r--app-text/libodfgen/libodfgen-9999.ebuild4
-rw-r--r--app-text/libqxp/libqxp-0.0.2.ebuild2
-rw-r--r--app-text/libspectre/libspectre-0.2.10.ebuild2
-rw-r--r--app-text/libstaroffice/libstaroffice-0.0.7.ebuild4
-rw-r--r--app-text/libstaroffice/libstaroffice-9999.ebuild4
-rw-r--r--app-text/libwpd/libwpd-0.10.3.ebuild4
-rw-r--r--app-text/libwpg/libwpg-0.3.3.ebuild4
-rw-r--r--app-text/libwps/libwps-0.4.12.ebuild4
-rw-r--r--app-text/lv/lv-4.51-r5.ebuild4
-rw-r--r--app-text/mdbook/Manifest40
-rw-r--r--app-text/mdbook/mdbook-0.4.21.ebuild (renamed from app-text/mdbook/mdbook-0.4.18.ebuild)40
-rw-r--r--app-text/multitail/metadata.xml2
-rw-r--r--app-text/mupdf/Manifest1
-rw-r--r--app-text/mupdf/files/mupdf-1.20.0-lcms2.patch69
-rw-r--r--app-text/mupdf/mupdf-1.19.1.ebuild2
-rw-r--r--app-text/mupdf/mupdf-1.20.0.ebuild159
-rw-r--r--app-text/mythes/mythes-1.2.4-r1.ebuild2
-rw-r--r--app-text/nuspell/Manifest7
-rw-r--r--app-text/nuspell/nuspell-3.1.2-r1.ebuild51
-rw-r--r--app-text/nuspell/nuspell-4.0.0-r1.ebuild51
-rw-r--r--app-text/nuspell/nuspell-4.0.1.ebuild51
-rw-r--r--app-text/nuspell/nuspell-4.1.0.ebuild51
-rw-r--r--app-text/nuspell/nuspell-4.2.0.ebuild51
-rw-r--r--app-text/nuspell/nuspell-5.0.0.ebuild51
-rw-r--r--app-text/nuspell/nuspell-5.0.1.ebuild51
-rw-r--r--app-text/pandoc-bin/Manifest2
-rw-r--r--app-text/pandoc-bin/pandoc-bin-2.19.ebuild44
-rw-r--r--app-text/pandoc/Manifest4
-rw-r--r--app-text/pandoc/files/pandoc-2.13-trypandoc.patch12
-rw-r--r--app-text/pandoc/files/pandoc-2.18-tests.patch79
-rw-r--r--app-text/pandoc/metadata.xml1
-rw-r--r--app-text/pandoc/pandoc-2.11.3.1.ebuild114
-rw-r--r--app-text/pandoc/pandoc-2.18-r2.ebuild (renamed from app-text/pandoc/pandoc-2.13.ebuild)93
-rw-r--r--app-text/pandoc/pandoc-2.9.2.1.ebuild112
-rw-r--r--app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild1
-rw-r--r--app-text/paperwork/paperwork-2.1.0.ebuild7
-rw-r--r--app-text/paperwork/paperwork-2.1.1.ebuild5
-rw-r--r--app-text/pastebinit/files/pastebinit-1.5.1-distro.patch13
-rw-r--r--app-text/pastebinit/pastebinit-1.5.1-r1.ebuild74
-rw-r--r--app-text/pastebinit/pastebinit-1.5.1.ebuild4
-rw-r--r--app-text/pdfgrep/metadata.xml2
-rw-r--r--app-text/pdfminer/pdfminer-20220506.ebuild2
-rw-r--r--app-text/pelican/Manifest2
-rw-r--r--app-text/pelican/metadata.xml1
-rw-r--r--app-text/pelican/pelican-4.5.3.ebuild50
-rw-r--r--app-text/pelican/pelican-4.7.2-r1.ebuild2
-rw-r--r--app-text/pelican/pelican-4.8.0.ebuild (renamed from app-text/pelican/pelican-9999.ebuild)42
-rw-r--r--app-text/po4a/Manifest2
-rw-r--r--app-text/po4a/files/po4a-0.67-man.patch18
-rw-r--r--app-text/po4a/po4a-0.66.ebuild2
-rw-r--r--app-text/po4a/po4a-0.67.ebuild (renamed from app-text/po4a/po4a-0.65.ebuild)7
-rw-r--r--app-text/poppler/Manifest7
-rw-r--r--app-text/poppler/poppler-22.05.0.ebuild2
-rw-r--r--app-text/poppler/poppler-22.06.0.ebuild (renamed from app-text/poppler/poppler-22.03.0.ebuild)16
-rw-r--r--app-text/poppler/poppler-22.07.0.ebuild134
-rw-r--r--app-text/poppler/poppler-22.08.0.ebuild134
-rw-r--r--app-text/poppler/poppler-9999.ebuild16
-rw-r--r--app-text/psutils/files/psutils-1.17-ldflags.patch44
-rw-r--r--app-text/psutils/files/psutils-1.17-makefile.patch210
-rw-r--r--app-text/psutils/psutils-1.17-r5.ebuild (renamed from app-text/psutils/psutils-1.17-r3.ebuild)28
-rw-r--r--app-text/rarian/rarian-0.8.1-r3.ebuild4
-rw-r--r--app-text/recode/recode-3.7.12.ebuild2
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild52
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild2
-rw-r--r--app-text/ronn-ng/ronn-ng-0.9.1.ebuild41
-rw-r--r--app-text/scdoc/metadata.xml5
-rw-r--r--app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild4
-rw-r--r--app-text/sigil/Manifest1
-rw-r--r--app-text/sigil/sigil-1.9.10.ebuild75
-rw-r--r--app-text/t1utils/Manifest1
-rw-r--r--app-text/t1utils/files/t1utils-1.41-memmem.patch27
-rw-r--r--app-text/t1utils/t1utils-1.41-r2.ebuild28
-rw-r--r--app-text/tesseract/Manifest1
-rw-r--r--app-text/tesseract/tesseract-5.2.0.ebuild92
-rw-r--r--app-text/tree/Manifest1
-rw-r--r--app-text/tree/metadata.xml2
-rw-r--r--app-text/tree/tree-2.0.1.ebuild2
-rw-r--r--app-text/tree/tree-2.0.2.ebuild41
-rw-r--r--app-text/unpaper/Manifest1
-rw-r--r--app-text/unpaper/metadata.xml10
-rw-r--r--app-text/unpaper/unpaper-7.0.0.ebuild31
-rw-r--r--app-text/unpaper/unpaper-9999.ebuild29
-rw-r--r--app-text/vgrep/metadata.xml5
-rw-r--r--app-text/wdiff/wdiff-1.2.2-r2.ebuild (renamed from app-text/wdiff/wdiff-1.2.2-r1.ebuild)15
-rw-r--r--app-text/wv/wv-1.2.9-r3.ebuild (renamed from app-text/wv/wv-1.2.9-r2.ebuild)39
-rw-r--r--app-text/xapian-omega/Manifest1
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.19.ebuild8
-rw-r--r--app-text/xapian-omega/xapian-omega-1.4.20.ebuild42
-rw-r--r--app-text/xdvik/xdvik-22.87.03-r4.ebuild2
-rw-r--r--app-text/xhtml1/xhtml1-20020801-r6.ebuild2
-rw-r--r--app-text/xiphos/Manifest1
-rw-r--r--app-text/xiphos/xiphos-4.2.1-r1.ebuild (renamed from app-text/xiphos/xiphos-4.2.1.ebuild)22
-rw-r--r--app-text/xournalpp/xournalpp-1.1.1-r2.ebuild49
-rw-r--r--app-text/xournalpp/xournalpp-9999.ebuild23
-rw-r--r--app-text/xpdf/Manifest1
-rw-r--r--app-text/xpdf/xpdf-4.03.ebuild146
-rw-r--r--app-text/xpdf/xpdf-4.04.ebuild9
-rw-r--r--app-text/yelp-tools/Manifest1
-rw-r--r--app-text/yelp-tools/yelp-tools-41.0.ebuild36
-rw-r--r--app-text/yelp-tools/yelp-tools-42.0.ebuild2
-rw-r--r--app-text/zathura-cb/zathura-cb-0.1.9.ebuild2
-rw-r--r--app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild (renamed from app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild)4
-rw-r--r--app-text/zathura-ps/zathura-ps-0.2.7.ebuild2
-rw-r--r--app-text/zathura/zathura-0.4.9.ebuild2
-rw-r--r--app-text/zotero-bin/Manifest3
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.10.ebuild (renamed from app-text/zotero-bin/zotero-bin-6.0.8.ebuild)0
-rw-r--r--app-text/zotero-bin/zotero-bin-6.0.9.ebuild72
210 files changed, 2548 insertions, 3246 deletions
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
index 4c0df79c263..c27cd0454f6 100644
--- a/app-text/ansifilter/metadata.xml
+++ b/app-text/ansifilter/metadata.xml
@@ -5,4 +5,7 @@
<email>kensington@gentoo.org</email>
<name>Michael Palimaka</name>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">saalen/ansifilter</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index b612e2b0e86..67d8e93f468 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,4 @@
DIST asciidoc-10.1.4.tar.gz 215656 BLAKE2B 461dd31ebc7067430e595935681ec6e0207a481ec183f0c29e08be444b40a26afabe84ac46dd8f7c563eb8d28ad8eed4b63a23fccd1105d817f7402f6afbfc5e SHA512 fba8c8efe215da0170fc46f1245af831c7b9e982705fbd9cbfe4cd2b979286b49f30570b116bc9f095f060099904a30671ab0498a58fc24b0069575ecf026a7d
+DIST asciidoc-10.2.0.tar.gz 216824 BLAKE2B 500038d655f820fe89048bbff683ae029c7044de839ae4f9ec4666b843585511c99bbc1991ec1764262f33c55b08845661fc1e62eb21bb3250d3168e369928ff SHA512 2f83c7f6d1d0a34948035347833ca59841de1271e8d008b4c4a43a7a8273b230148e6f51ee8f6e2dc702460e27c495037fbe2d6d43195b70bf3447ad86390d28
DIST asciidoc-9.1.0.new.tar.gz 1249958 BLAKE2B 0a98f58f7604f84d704092313c38563634bad5d697d60d02760f3be1d2a78a97ee2488dda3a9918b02e0062710175c6513d600f3fbd850fe700bf3fa917a3980 SHA512 c30854a936228fe5bcf2f9305741fbc4b17ef088b2fa637d5f3b19c7803306085634fb71146f0b089c2fad01f986da71a4fae364139f520c0906525317c0c4a6
DIST asciidoc-9.1.1.new.tar.gz 1259206 BLAKE2B da274d3a9389ee2e42ad1be70467f11d0164df3e6f9102e6ef1be6a802dbeb12898786fa1fe37a95755d0db8c9df5d5dd3faf000dfb73b701a83af3cc0261606 SHA512 74b83e8c8904fd761783c2f572d353656fc0794c6cb427f61e9179c9f80b6fc3b3ee8d028baba4e25eafe5f8cf5318f9984a5828849a793a7520f83e6fe50d66
diff --git a/app-text/asciidoc/asciidoc-10.2.0.ebuild b/app-text/asciidoc/asciidoc-10.2.0.ebuild
new file mode 100644
index 00000000000..9f376b493bd
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-10.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1 optfeature readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
+# Could use the github tarball but we need autotools then
+#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-text/docbook-xml-dtd:4.5
+ >=app-text/docbook-xsl-stylesheets-1.75
+ dev-libs/libxslt
+ dev-libs/libxml2:2"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_install() {
+ distutils-r1_src_install
+
+ # TODO: Consider using Debian patch to allow /usr/share?
+ insinto /usr/share/asciidoc
+ doins -r asciidoc/resources/.
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ optfeature "music filter support" "media-sound/lilypond virtual/imagemagick-tools"
+ optfeature "source filter support" "dev-util/source-highlight dev-python/pygments app-text/highlight"
+ optfeature "latex filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+ optfeature "graphviz filter support" "media-gfx/graphviz"
+}
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 3c2c02f59a4..47206531efe 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">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>
+ <maintainer type="person" proxied="yes">
+ <name>Thamognya Kodi</name>
+ <email>contact@thamognya.com</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <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/atril/atril-1.24.1.ebuild b/app-text/atril/atril-1.24.1.ebuild
index 16cc0e88ee9..3d098e7a9f2 100644
--- a/app-text/atril/atril-1.24.1.ebuild
+++ b/app-text/atril/atril-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{7..9} )
inherit mate python-any-r1 virtualx
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
fi
DESCRIPTION="Atril document viewer for MATE"
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 989726feee5..0f53ac88566 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,2 +1 @@
-DIST bibletime-3.0.2.tar.xz 1631828 BLAKE2B 7ff319e6810717391d7b4a8b96a63ac315bf1663dd4caaa742f9ec92a3a6490d238cdf4e13ea6aef45b7c6772d4c41ea498c181daa7a8d0abacc58ca59c39b4e SHA512 d374bf88844e63dead0da5dc3f951a7e6eca133e18067acf28432d1e9d12ac9f481fb7421d9b5ae4c76b5aff7eb05c083fa6828a58332d02a3975f1921d8914c
DIST bibletime-3.0.3.tar.xz 1620012 BLAKE2B 5f2f5bb071d7ffb625bd687c99a328ba758f8e842138204aa770714f830594fe49c61a45e51f7de69d865b95b154ad934da7af49f391b22907773a1435e4fbbf SHA512 553549b39bf3341dbf310908b24db246d88ba01524d424de14ece35c12160565185547fc0250fe8bb248a32d8a012b99afbc022d9a513dcc916c3e8089f72090
diff --git a/app-text/bibletime/bibletime-3.0.2.ebuild b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
index 9aa26c20e7e..810bcbf14e9 100644
--- a/app-text/bibletime/bibletime-3.0.2.ebuild
+++ b/app-text/bibletime/bibletime-3.0.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg-utils
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
RDEPEND=">=app-text/sword-1.8.1
dev-cpp/clucene
@@ -25,11 +25,11 @@ RDEPEND=">=app-text/sword-1.8.1
dev-qt/qtxml:5"
DEPEND="${RDEPEND}
dev-libs/boost
- dev-libs/icu:=
- dev-qt/linguist-tools:5
+ dev-libs/icu
dev-qt/qttest:5
net-misc/curl
sys-libs/zlib"
+BDEPEND="dev-qt/linguist-tools:5"
DOCS=( ChangeLog README.md )
diff --git a/app-text/bibletime/bibletime-3.0.3.ebuild b/app-text/bibletime/bibletime-3.0.3.ebuild
index f7b3e8d6ce3..08049be9d0a 100644
--- a/app-text/bibletime/bibletime-3.0.3.ebuild
+++ b/app-text/bibletime/bibletime-3.0.3.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/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index f00d05a8510..c8a02895283 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1 @@
-DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-DIST build-docbook-catalog-2.2.tar.bz2 4711 BLAKE2B c93f6c14450e9308dce82724c305846b1635e96470ecb72c240d502b6f7ed360ee013bf40e3cda204e784c034b8a522f6247b3dbc24fe92a9e12d0ca5c28acb7 SHA512 2e6895f8d3564dbef0dc4882448ee5f4457ac01c58be09e2939a364676a52f7d44899cab621101fb4a3161292d15d9df898e076e412ff50fb88d2861ca554b1e
DIST build-docbook-catalog-2.3.tar.bz2 4686 BLAKE2B 3e386d0aec67ed9cada98cacd9bdce4345f8732a1d9653c096744178902036da5cefa2bde1d69279fe2080f660635f5c29380f40f6fb39aa586d80206c5e42b2 SHA512 79649f39f5a432a57e2457f61b73d83c8ccf76144e29b8e44a2c81bb86a00ff711c199fbd126236edfa965518e0cbd023597c97e386211b8c07a6ef66bf232a7
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
deleted file mode 100644
index ea434173b02..00000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~haubi/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 )
- !<app-text/docbook-xsl-stylesheets-1.73.1
-"
-
-src_prepare() {
- default
-
- sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
- has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
-}
-
-src_configure() {
- # export for bug #490754
- export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-
- default
-}
-
-pkg_postinst() {
- # New version -> regen files
- # See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog. Is /run mounted?"
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
index e354a2c7f34..3755bae4d9f 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
src_prepare() {
default
+ sed -i -e "1s@#!@#!${EPREFIX}@" build-docbook-catalog || die
sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
deleted file mode 100644
index a4684d16c16..00000000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
-SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- dev-libs/libxml2
- || ( sys-apps/util-linux app-misc/getopt )
-"
-
-src_prepare() {
- default
-
- sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
- has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
-}
-
-src_configure() {
- # export for bug #490754
- export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-
- default
-}
-
-pkg_postinst() {
- # New version -> regen files
- # See bug #816303 for rationale behind die
- build-docbook-catalog || die "Failed to regenerate docbook catalog."
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c8dc6645006..629b07ae235 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,4 +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.42.0.tar.xz 38523536 BLAKE2B 81d8477fbbaeedbf589c3c25b16925f6fe383c74d9ad17d0036f886304c9ce1f807fea6463ef0dc345a07de69438785faca6ef7337e5ff1e7d5684b4d0ed7cdd SHA512 dac197d0a6f36f8ebb56720214df355bfc2625ecf55992b824e3409e7273db12fabfd54d2f602f950761efc717e52f872f5f2c2078770abbc887ef30cc64bbe8
DIST calibre-5.43.0.tar.xz 38641220 BLAKE2B dddf9e5f7303845f8d86826d38d08dfbf05f144c4fb80d215197f51dc6685f09d848148f00f9795c441f8cd8c541ed9d4988b0a5d2020ce98eb8f8bcd4853dac SHA512 1a5b95c621e47b660841d989445ab56244b9c805aa5d01efc4d95d8c37c5290e93523cedec92a6ca12d16e5f74b63743d6e682bf4084f400d080678ff540a190
+DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230
diff --git a/app-text/calibre/calibre-5.43.0.ebuild b/app-text/calibre/calibre-5.43.0.ebuild
index f3484c05792..a0b49ccc552 100644
--- a/app-text/calibre/calibre-5.43.0.ebuild
+++ b/app-text/calibre/calibre-5.43.0.ebuild
@@ -31,7 +31,7 @@ LICENSE="
OFL-1.1
PSF-2
"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
SLOT="0"
IUSE="ios +udisks"
diff --git a/app-text/calibre/calibre-5.42.0-r1.ebuild b/app-text/calibre/calibre-5.44.0-r1.ebuild
index f3484c05792..ef3d30c83df 100644
--- a/app-text/calibre/calibre-5.42.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r1.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=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/pillow-3.2.0[truetype,${PYTHON_USEDEP}]
>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1.ebuild
index 0e5d70ae2ad..48c2366f2c1 100644
--- a/app-text/capyt/capyt-1.1.1.ebuild
+++ b/app-text/capyt/capyt-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -13,7 +13,7 @@ MY_PV=$(ver_rs 2 '-')
DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service"
HOMEPAGE="https://github.com/lbatalha/capyt
https://pypi.org/project/capyt/"
-SRC_URI="https://github.com/lbatalha/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/lbatalha/capyt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
index 746edabdcd5..a46e68c271d 100644
--- a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -51,6 +51,8 @@ src_install() {
}
pkg_postinst() {
+ xdg_desktop_database_update
+
elog "For best functionality, emerge the following packages:"
elog " app-text/poppler[utils] - for data import from PDF files"
elog " app-text/dvipdfm - for data import from DVI files"
@@ -62,10 +64,6 @@ pkg_postinst() {
elog " nice printing through the shell script bib2pdf"
}
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
pkg_postrm() {
xdg_desktop_database_update
}
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index b18ed8916d6..8337beb3344 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,3 @@
DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60 SHA512 2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742 SHA512 2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
+DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865 SHA512 eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
diff --git a/app-text/cherrytree/cherrytree-0.99.48.ebuild b/app-text/cherrytree/cherrytree-0.99.48.ebuild
new file mode 100644
index 00000000000..7787d4048a9
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.48.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
+ S="${WORKDIR}/${P}/future"
+else
+ SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz"
+ #SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${P/-/_}
+
+ KEYWORDS="~amd64 ~x86"
+ # S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+ app-text/gspell:=
+ >=dev-cpp/glibmm-2.64.2:2
+ dev-cpp/gtkmm:3.0
+ dev-cpp/gtksourceviewmm:3.0
+ dev-cpp/libxmlpp:2.6
+ dev-cpp/pangomm:1.4
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/libfmt:=
+ dev-libs/libxml2:2
+ dev-libs/fribidi
+ dev-libs/spdlog
+ net-misc/curl
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig
+ nls? (
+ sys-devel/gettext
+ )
+ test? ( dev-util/cpputest )"
+
+python_check_deps() {
+ has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ # disable compress man pages
+ sed -i -e \
+ '/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+ CMakeLists.txt || die
+
+ if [[ ${PV} != *9999 ]]; then
+ sed -i \
+ -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+ CMakeLists.txt || die
+ fi
+
+ # python_fix_shebang .
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DPYTHON_EXEC="${PYTHON}"
+ -DUSE_NLS=$(usex nls)
+ -DBUILD_TESTING=$(usex test)
+ -DUSE_SHARED_FMT_SPDLOG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml
index 2ac0eef8d76..ec151f29d1b 100644
--- a/app-text/convmv/metadata.xml
+++ b/app-text/convmv/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
</maintainer>
</pkgmetadata>
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index 37b46061e62..5bab62cc5e6 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit distutils-r1
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index 17da88fbf40..122c894d418 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_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit distutils-r1
diff --git a/app-text/dictd/dictd-1.13.0-r5.ebuild b/app-text/dictd/dictd-1.13.0-r5.ebuild
new file mode 100644
index 00000000000..77f5dd08163
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="dbi judy minimal test"
+RESTRICT="!test? ( test )"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+ acct-group/dictd
+ acct-user/dictd
+ >=sys-apps/coreutils-6.10
+ dev-libs/libmaa
+ sys-libs/zlib
+ dbi? ( dev-db/libdbi )
+ judy? ( dev-libs/judy )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=sys-apps/gawk-3.1.6
+ sys-devel/flex
+ virtual/yacc
+ test? ( !~sys-apps/gawk-4.2.1 )
+"
+
+DOC_CONTENTS="
+ To start and use ${PN} you need to emerge at least one dictionary from
+ the app-dicts category with the package name starting with 'dictd-'.
+ To install all available dictionaries, emerge app-dicts/dictd-dicts.
+ ${PN} will NOT start without at least one dictionary.\n
+ \nIf you are running systemd, you will need to review the instructions
+ explained in /etc/dict/dictd.conf comments.
+"
+
+PATCHES=(
+ "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+ "${FILESDIR}"/dictd-1.12.0-build.patch
+ "${FILESDIR}"/dictd-1.13.0-lex.patch
+ "${FILESDIR}"/dictd-1.13.0-libtool.patch # 818535
+ "${FILESDIR}"/dictd-1.13.0-version.patch # 852884
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with dbi plugin-dbi) \
+ $(use_with judy plugin-judy) \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+ --sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+ # -j1 for bug #743292
+
+ if use minimal; then
+ emake -j1 dictfmt dictzip dictzip
+ else
+ emake -j1
+ fi
+}
+
+src_test() {
+ use minimal && return 0 # All tests are for dictd which we don't build...
+
+ if [[ ${EUID} -eq 0 ]]; then
+ # If dictd is run as root user (-userpriv) it drops its privileges to
+ # dictd user and group. Give dictd group write access to test directory.
+ chown :dictd "${WORKDIR}" "${S}/test" || die
+ chmod 770 "${WORKDIR}" "${S}/test" || die
+ fi
+
+ emake -j1 test
+}
+
+src_install() {
+ if use minimal; then
+ emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
+ else
+ default
+
+ # Don't install rfc2229.txt because it is non-free
+ dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
+ dodoc doc/{security.doc,toc.ms}
+ dodoc -r examples
+
+ # conf files. For dict.conf see below.
+ insinto /etc/dict
+ for f in dictd.conf site.info colorit.conf; do
+ doins "${FILESDIR}/1.10.11/${f}"
+ done
+
+ # startups for dictd
+ newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+ newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ fi
+
+ find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+ insinto /etc/dict
+ doins "${FILESDIR}"/1.10.11/dict.conf
+
+ dodoc ANNOUNCE NEWS README TODO
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if has_version sys-apps/systemd; then
+ ewarn "The default location for dicts has changed! If you've modified your"
+ ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+ ewarn "to point at /usr/share/dict now."
+ fi
+}
diff --git a/app-text/dictd/files/dictd-1.13.0-lex.patch b/app-text/dictd/files/dictd-1.13.0-lex.patch
new file mode 100644
index 00000000000..c69758c4805
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-lex.patch
@@ -0,0 +1,28 @@
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 09:10:18 -0700
+Subject: [PATCH] build: Fix implicit function declarations
+
+--- a/clientparse.y
++++ b/clientparse.y
+@@ -24,6 +24,9 @@
+ #define YYERROR_VERBOSE
+
+ static dictServer *s;
++
++int yylex();
++void yyerror(const char *s);
+ %}
+
+ %union {
+--- a/servparse.y
++++ b/servparse.y
+@@ -30,6 +30,9 @@
+
+ static dictDatabase *db;
+
++int yylex();
++void yyerror(const char *s);
++
+ static int string2bool (const char *str)
+ {
+ if (
diff --git a/app-text/dictd/files/dictd-1.13.0-libtool.patch b/app-text/dictd/files/dictd-1.13.0-libtool.patch
new file mode 100644
index 00000000000..f687a182f60
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-libtool.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/818535
+
+From: orbea <orbea@riseup.net>
+Date: Fri, 17 Jun 2022 16:18:40 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -28,6 +28,7 @@ endif
+
+ .SUFFIXES:
+
++top_builddir= @top_builddir@
+ srcdir= @srcdir@
+ VPATH= @srcdir@:.
+ prefix= @prefix@
+--- a/configure.in
++++ b/configure.in
+@@ -35,6 +35,8 @@ AC_INIT([dict],[VERSION],[dict-beta@dict.org])
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+
++LT_INIT
++
+ echo Configuring for dict
+ echo .
+
+@@ -70,13 +72,10 @@ echo Checking for programs
+
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_YACC
+ AC_PROG_LEX
+
+-AC_CHECK_PROG(LIBTOOL,libtool,libtool)
+-
+ AC_CHECK_PROGS(NROFF,gnroff nroff)
+ AC_CHECK_PROGS(TROFF,groff troff)
+ AC_CHECK_PROGS(COL,col cat)
+@@ -188,7 +187,6 @@ AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+-AC_SUBST(LIBTOOL)
+
+ AC_SUBST(PLUGINS)
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,6 +28,7 @@ endif
+
+ .SUFFIXES:
+
++top_builddir= @top_builddir@
+ srcdir= @srcdir@
+ VPATH= @srcdir@
+ prefix= @prefix@
diff --git a/app-text/dictd/files/dictd-1.13.0-version.patch b/app-text/dictd/files/dictd-1.13.0-version.patch
new file mode 100644
index 00000000000..fee60efe22d
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-version.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/852884
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 10:00:21 -0700
+Subject: [PATCH] configure: Set version directly in AC_INIT
+
+This avoids a command not found error in config.status.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -20,7 +20,7 @@
+
+ # Add a _letter_ if you change the version number and release your own version.
+ # Numbers are for the original author(s) only.
+-DICT_VERSION=@DICT_VERSION@
++DICT_VERSION=@PACKAGE_VERSION@
+
+ ifneq (,)
+ This makefile requires GNU Make.
+--- a/configure.in
++++ b/configure.in
+@@ -23,14 +23,10 @@ dnl CFLAGS and LDFLAGS should be settable on the make commandline
+ dnl for optimization and stripping.
+ dnl LIBOBJS is an automatically-generated list of extra objects we need
+
+-
+-define(VERSION, 1.13.0)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.0],[dict-beta@dict.org])
+
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+@@ -40,8 +36,6 @@ LT_INIT
+ echo Configuring for dict
+ echo .
+
+-DICT_VERSION=VERSION
+-
+ AC_CANONICAL_HOST
+
+ AC_PROG_CC
+@@ -183,7 +177,6 @@ SBINDIR=`eval3 $sbindir`
+ LIBEXECDIR=`eval3 $libexecdir`
+ DATADIR=`eval3 $datadir`
+
+-AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+--- a/dictdplugin-config.in
++++ b/dictdplugin-config.in
+@@ -24,7 +24,7 @@ while test $# -ne 0; do
+ usage
+ exit;;
+ --version)
+- echo @DICT_VERSION@
++ echo @PACKAGE_VERSION@
+ exit;;
+ --libs)
+ echo -L@libdir@
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index e57fab6485b..9486bceaf45 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1 +1 @@
-DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
+DIST diff-pdf-0.5.tar.gz 135755 BLAKE2B e4b9599b4f443171473ef483fe868c58e0a0c9f23838895aa08f1bd662c4df920fdb50277d2d0a5b28d5bb66054e700012a98be636a12d34ec919ad85d332cc0 SHA512 62a868118fc807b433e504edfefdc6a9598a8197aaf5cd4e46451b67d5d73fcf9234bd6efbe6307ed7c3821aabef8edea81cbb0bbe5f4d34365c5f8d6dd9a51d
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.5.ebuild
index ec808cb9bab..2ec1dc0bd7d 100644
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
WX_GTK_VER="3.0-gtk3"
-inherit autotools wxwidgets
+inherit wxwidgets
DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
+HOMEPAGE="https://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
# The COPYING.icons file states that two icons were taken from
@@ -32,13 +32,6 @@ DEPEND="app-text/poppler[cairo]
x11-libs/wxGTK:${WX_GTK_VER}[X]"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
-
-src_prepare() {
- default
- eautoreconf
-}
-
src_configure() {
setup-wxwidgets
default
diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
deleted file mode 100644
index ecef020a998..00000000000
--- a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001
-From: FX Coudert <fxcoudert@gmail.com>
-Date: Sat, 12 Dec 2020 16:18:59 +0100
-Subject: [PATCH] Remove legacy poppler-cairo dependency (#69)
-
-poppler-glib already depended on it, so this is non-breaking,
-and it is removed in poppler 0.18.1.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 382e220..2e9b6e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,7 +41,7 @@ AC_LANG(C++)
- dnl === Library checks ===
-
- PKG_CHECK_MODULES(POPPLER,
-- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf])
-+ [poppler-glib >= 0.10 cairo-pdf])
-
- AM_OPTIONS_WXCONFIG
- AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])
diff --git a/app-text/ding/ding-1.8.1.ebuild b/app-text/ding/ding-1.8.1.ebuild
index c9cdbf0e1e8..fee3c2f2be2 100644
--- a/app-text/ding/ding-1.8.1.ebuild
+++ b/app-text/ding/ding-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
RDEPEND=">=dev-lang/tk-8.3"
diff --git a/app-text/ding/ding-1.9.ebuild b/app-text/ding/ding-1.9.ebuild
index fb609a2d281..7b7ecc39822 100644
--- a/app-text/ding/ding-1.9.ebuild
+++ b/app-text/ding/ding-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
RDEPEND=">=dev-lang/tk-8.3"
diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml
index 99e2666c588..115e9d64a66 100644
--- a/app-text/ding/metadata.xml
+++ b/app-text/ding/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
deleted file mode 100644
index b74e2e79bc1..00000000000
--- a/app-text/discount/files/gethopt-undefined.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,7 +139,7 @@
-
- pandoc_headers.o: tools/pandoc_headers.c config.h
- $(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
--pandoc_headers: pandoc_headers.o
-+pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON)
- $(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown
-
- branch.o: tools/branch.c config.h
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index e3203a498c0..3bb7a6a274d 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
index dfb1003e7ab..e22f103cf28 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
BDEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
deleted file mode 100644
index 344496f27da..00000000000
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools prefix
-
-MY_P=${PN/-sgml/}-${PV}
-DESCRIPTION="Shell scripts to manage DocBook documents"
-HOMEPAGE="https://sourceware.org/docbook-tools/"
-SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jadetex"
-
-DEPEND=">=dev-lang/perl-5
- app-text/docbook-dsssl-stylesheets
- app-text/openjade
- dev-perl/SGMLSpm
- ~app-text/docbook-xml-simple-dtd-4.1.2.4
- ~app-text/docbook-xml-simple-dtd-1.0
- app-text/docbook-xml-dtd
- ~app-text/docbook-sgml-dtd-3.0
- ~app-text/docbook-sgml-dtd-3.1
- ~app-text/docbook-sgml-dtd-4.0
- ~app-text/docbook-sgml-dtd-4.1
- ~app-text/docbook-sgml-dtd-4.2
- ~app-text/docbook-sgml-dtd-4.4
- sys-apps/which
- jadetex? ( dev-texlive/texlive-formatsextra )
- || (
- www-client/lynx
- www-client/links
- www-client/elinks
- virtual/w3m
- )"
-RDEPEND="${DEPEND}"
-
-# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
-# transition to simple-dtd 1.0, <obz@gentoo.org>
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${MY_P}-elinks.patch
- eapply "${FILESDIR}"/${P}-grep-2.7.patch
- if use prefix; then
- eapply "${FILESDIR}"/${MY_P}-prefix.patch
- eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
- eautoreconf
- fi
-}
-
-src_install() {
- make DESTDIR="${D}" \
- htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- install
-
- if ! use jadetex; then
- local i
- for i in dvi pdf ps; do
- rm "${ED}"/usr/bin/docbook2${i} || die
- rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/${i} || die
- rm "${ED}"/usr/share/man/man1/docbook2${i}.1 || die
- done
- fi
- einstalldocs
-}
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
index 13d1a9971d1..e050c2dcd0d 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r5.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="jadetex"
DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
index ba35adf0459..82ed385947c 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-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27"
inherit ruby-single
DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
@@ -13,22 +13,20 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="XSL Stylesheets for Docbook"
HOMEPAGE="https://github.com/docbook/wiki/wiki"
SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
+# Makefile is broken since 1.76.0
+RESTRICT="test"
RDEPEND="
>=app-text/build-docbook-catalog-1.1
ruby? ( ${RUBY_DEPS} )
"
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
PATCHES=(
"${FILESDIR}"/nonrecursive-string-subst.patch
)
@@ -66,30 +64,25 @@ src_install() {
for i in */; do
i=${i%/}
- cd "${S}"/${i}
for doc in ChangeLog README; do
- if [ -e "$doc" ]; then
- mv ${doc} ${doc}.${i}
- dodoc ${doc}.${i}
- rm ${doc}.${i}
+ if [[ -e ${i}/${doc} ]]; then
+ newdoc ${i}/${doc} ${doc}.${i}
+ rm ${i}/${doc} || die
fi
done
- doins -r "${S}"/${i}
+ doins -r ${i}
done
if use ruby; then
local cmd="dbtoepub${MY_PN#docbook-xsl}"
- # we can't use a symlink or it'll look for the library in the
- # wrong path.
- dodir /usr/bin
- cat - > "${ED%/}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
+ # we can't use a symlink or it'll look for the library in the wrong path
+ newbin - ${cmd} <<-EOF
+ #!/usr/bin/env ruby
-load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
- fperms 0755 /usr/bin/${cmd}
+ load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
+ EOF
fi
}
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 72471086c17..a7860f08787 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1 +1,2 @@
DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
+DIST dos2unix-7.4.3.tar.gz 788278 BLAKE2B da959b06e583bbf27a2cb2ce5b1f1a41380722aa09ac75b3d31260e92fd6f1203d87266d3a12201b036a69796b4aa4f23718741036e20fe686801bb368fbde22 SHA512 1c6d81348de8aca451174794141d0802685487cf6847fa91f7de745d89bcf2af864fc2ec549b9af72031891d4efcb9731fe823ce05da36d1f9e9890ff2cb60fb
diff --git a/app-text/dos2unix/dos2unix-7.4.3.ebuild b/app-text/dos2unix/dos2unix-7.4.3.ebuild
new file mode 100644
index 00000000000..bc7cc8179d7
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit plocale toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+ http://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+ mirror://sourceforge/${PN}/${P/_/-}.tar.gz"
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="BSD-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+ !app-text/hd2u
+ virtual/libintl"
+
+DEPEND="
+ ${RDEPEND}
+ test? ( virtual/perl-Test-Simple )
+"
+BDEPEND="
+ dev-lang/perl
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror "po*/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ rm_loc() { rm po*/$1.po || die; }
+ plocale_for_each_disabled_locale rm_loc
+}
+
+src_prepare() {
+ default
+
+ handle_locales
+
+ sed \
+ -e '/^LDFLAGS/s|=|+=|' \
+ -e '/CFLAGS_OS \+=/d' \
+ -e '/LDFLAGS_EXTRA \+=/d' \
+ -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+ -i Makefile || die
+
+ if use debug ; then
+ sed -e "/^DEBUG/s:0:1:" \
+ -e "/EXTRA_CFLAGS +=/s:-g::" \
+ -i Makefile || die
+ fi
+
+ tc-export CC
+}
+
+lintl() {
+ # same logic as from virtual/libintl
+ use !elibc_glibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+ emake prefix="${EPREFIX}/usr" \
+ $(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+ $(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
index 2b2c11d556d..a3246a626c2 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="cli doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 0b9c3f27c38..1d9db96e6dc 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,3 +1,2 @@
DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.3.2.tar.gz 991782 BLAKE2B ece8c4cbac2c242c23b4b8c5ab2daf1037705dbf58ad29b4863dd01cb30b2d98e11828f2b9d1ce3823aec419c871cc3dd1092e4659e10ef3e3cd2df867255be4 SHA512 886635bb55c5f0c774445e4a0f14d39e2d08eeb964257037062c2e97c2cf3348be8c631ff5e7a13144936127761964bdc60ff1e0dd6f63b292a655626f91ef62
DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
deleted file mode 100644
index 595d263abfd..00000000000
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
- default
- sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
- sed -e "s/build_zemberek=yes//" -i "${S}"/configure{.ac,} || die # bug 662484, shouldn't be an issue in 2.2
-}
-
-src_configure() {
- econf \
- $(use_enable aspell) \
- $(use_enable hunspell myspell) \
- $(use_enable static-libs static) \
- --disable-hspell \
- --disable-ispell \
- --disable-uspell \
- --disable-voikko \
- --disable-zemberek \
- --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.3.2.ebuild b/app-text/enchant/enchant-2.3.2.ebuild
deleted file mode 100644
index 2da677c77f4..00000000000
--- a/app-text/enchant/enchant-2.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="aspell +hunspell test voikko"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-RDEPEND="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )
- voikko? ( dev-libs/libvoikko )"
-DEPEND="${RDEPEND}
- test? ( >=dev-libs/unittest++-2.0.0-r2 )"
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="test" # Tests fail
-
-src_configure() {
- # TODO: Add app-text/nuspell support
- econf \
- --datadir="${EPREFIX}"/usr/share/enchant-2 \
- --disable-static \
- $(use_enable test relocatable) \
- $(use_with aspell) \
- $(use_with hunspell) \
- $(use_with voikko) \
- --without-nuspell \
- --without-hspell \
- --without-applespell \
- --without-zemberek \
- --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
index e749a7903c5..3f7c2ef5100 100644
--- a/app-text/enchant/enchant-2.3.3-r1.ebuild
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="aspell +hunspell nuspell test voikko"
RESTRICT="!test? ( test )"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 232d75ac584..b4f593097b0 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,4 +1 @@
-DIST evince-41.3.tar.xz 2889368 BLAKE2B c6ef9b4c126f938ef8b50aa65d8591e0ce02e7404dd1984bce27e0acce6e62462d42665ad19992cb2fa22afd09d6da49ecdbbb51eb209518d415966824523628 SHA512 b00422ef0fd752e5afacea2db852ad71d8d16514945a9a54c54967cecd2b1f5058b762ec53eb9057b8f583d5e1e3363c2b7ae1f4434fa6637ad45c5217f082cd
-DIST evince-42.1.tar.xz 2850652 BLAKE2B 4fb03270caf1be548a82f9094973e584807c497171cef960f344c14158420e02a0fed6d84dcc8d09d3a7f2e8a68f69ffae36398fe6e747d86e3a63132d5a36d6 SHA512 d8ea086b6530c186ac48d88fa2546cd8abd8a075d79037c1f0bf76e63b28914b04a58af83c96e44e04d625fec674f3989bfd51472cd458be9c903a1a4512d8df
-DIST evince-42.2.tar.xz 2854836 BLAKE2B ed8b9e6117d2d456e59d5fd4aac664b73fb450589a04b04b3ada7f1606781001c5ab75a98d425fdf00409e2f4abad59f6a140f39df4ca6bd82a641caaf944062 SHA512 81e93eb5575169ed1a31fdd321a1d7080b4391ddf1ebf13ce49df5ede8bb5f578094b55b2e1075f0a418ef21e8b73f02b259c2bda44b317ea9f551372ee3b860
DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e
diff --git a/app-text/evince/evince-41.3.ebuild b/app-text/evince/evince-41.3.ebuild
deleted file mode 100644
index 59de9f04351..00000000000
--- a/app-text/evince/evince-41.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.44.0:2
- >=gui-libs/libhandy-1.0:1=
- >=dev-libs/libxml2-2.5:2
- sys-libs/zlib:=
- >=x11-libs/gdk-pixbuf-2.40:2
- >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/cairo-1.10:=
- >=app-text/poppler-0.86.0[cairo]
- >=app-arch/libarchive-3.2.0
- djvu? ( >=app-text/djvu-3.5.22:= )
- dvi? (
- >=app-text/libspectre-0.2:=
- dev-libs/kpathsea:=
- t1lib? ( >=media-libs/t1lib-5:= ) )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0 )
- gnome? ( gnome-base/gnome-desktop:3= )
- gnome-keyring? ( >=app-crypt/libsecret-0.5 )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
- nautilus? ( >=gnome-base/nautilus-3.28.0 )
- postscript? ( >=app-text/libspectre-0.2:= )
- spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-4.0:0= )
- xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
- gnome-base/gvfs
- gnome-base/librsvg
- || (
- >=x11-themes/adwaita-icon-theme-2.17.1
- >=x11-themes/hicolor-icon-theme-0.10
- )
-"
-BDEPEND="
- gtk-doc? (
- >=dev-util/gtk-doc-1.33
- app-text/docbook-xml-dtd:4.3
- )
- dev-libs/appstream-glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
-)
-
-src_prepare() {
- xdg_src_prepare
-
- # Do not depend on adwaita-icon-theme, bug #326855, #391859
- # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
- sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Ddevelopment=false
- -Dplatform=gnome
-
- -Dviewer=true
- -Dpreviewer=true
- -Dthumbnailer=true
- $(meson_use nautilus)
-
- -Dcomics=enabled
- $(meson_feature djvu)
- $(meson_feature dvi)
- -Dpdf=enabled
- $(meson_feature postscript ps)
- $(meson_feature tiff)
- $(meson_feature xps)
-
- $(meson_use gtk-doc gtk_doc)
- -Duser_doc=true
- $(meson_use introspection)
- -Ddbus=true
- $(meson_feature gnome-keyring keyring)
- $(meson_feature cups gtk_unix_print)
- $(meson_feature gnome thumbnail_cache)
- $(meson_feature gstreamer multimedia)
- $(meson_feature spell gspell)
-
- -Dinternal_synctex=true
- $(meson_feature t1lib)
-
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-text/evince/evince-42.1.ebuild b/app-text/evince/evince-42.1.ebuild
deleted file mode 100644
index c8e4f7b1747..00000000000
--- a/app-text/evince/evince-42.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.44.0:2
- >=gui-libs/libhandy-1.5.0:1=
- >=dev-libs/libxml2-2.5:2
- sys-libs/zlib:=
- >=x11-libs/gdk-pixbuf-2.40:2
- >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/cairo-1.10:=
- >=app-text/poppler-22.02.0[cairo]
- >=app-arch/libarchive-3.6.0
- djvu? ( >=app-text/djvu-3.5.22:= )
- dvi? (
- >=app-text/libspectre-0.2:=
- dev-libs/kpathsea:=
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0 )
- gnome? ( gnome-base/gnome-desktop:3= )
- gnome-keyring? ( >=app-crypt/libsecret-0.5 )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
- nautilus? ( >=gnome-base/nautilus-3.28.0 )
- postscript? ( >=app-text/libspectre-0.2:= )
- spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-4.0:0= )
- xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
- gnome-base/gvfs
- gnome-base/librsvg
- || (
- >=x11-themes/adwaita-icon-theme-2.17.1
- >=x11-themes/hicolor-icon-theme-0.10
- )
-"
-BDEPEND="
- gtk-doc? (
- >=dev-util/gi-docgen-2021.1
- app-text/docbook-xml-dtd:4.3
- )
- dev-libs/appstream-glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- xdg_environment_reset
-
- # Do not depend on adwaita-icon-theme, bug #326855, #391859
- # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
- sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Ddevelopment=false
- -Dplatform=gnome
-
- -Dviewer=true
- -Dpreviewer=true
- -Dthumbnailer=true
- $(meson_use nautilus)
-
- -Dcomics=enabled
- $(meson_feature djvu)
- $(meson_feature dvi)
- -Dpdf=enabled
- $(meson_feature postscript ps)
- $(meson_feature tiff)
- $(meson_feature xps)
-
- $(meson_use gtk-doc gtk_doc)
- -Duser_doc=true
- $(meson_use introspection)
- -Ddbus=true
- $(meson_feature gnome-keyring keyring)
- $(meson_feature cups gtk_unix_print)
- $(meson_feature gnome thumbnail_cache)
- $(meson_feature gstreamer multimedia)
- $(meson_feature spell gspell)
-
- -Dinternal_synctex=true
-
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-text/evince/evince-42.2.ebuild b/app-text/evince/evince-42.2.ebuild
deleted file mode 100644
index b299f33dce2..00000000000
--- a/app-text/evince/evince-42.2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.44.0:2
- >=gui-libs/libhandy-1.5.0:1=
- >=dev-libs/libxml2-2.5:2
- sys-libs/zlib:=
- >=x11-libs/gdk-pixbuf-2.40:2
- >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/cairo-1.10:=
- >=app-text/poppler-22.02.0[cairo]
- >=app-arch/libarchive-3.6.0
- djvu? ( >=app-text/djvu-3.5.22:= )
- dvi? (
- >=app-text/libspectre-0.2:=
- dev-libs/kpathsea:=
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0 )
- gnome? ( gnome-base/gnome-desktop:3= )
- gnome-keyring? ( >=app-crypt/libsecret-0.5 )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
- nautilus? ( >=gnome-base/nautilus-3.28.0 )
- postscript? ( >=app-text/libspectre-0.2:= )
- spell? ( >=app-text/gspell-1.6.0:= )
- tiff? ( >=media-libs/tiff-4.0:0= )
- xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
- gnome-base/gvfs
- gnome-base/librsvg
- || (
- >=x11-themes/adwaita-icon-theme-2.17.1
- >=x11-themes/hicolor-icon-theme-0.10
- )
-"
-BDEPEND="
- gtk-doc? (
- >=dev-util/gi-docgen-2021.1
- app-text/docbook-xml-dtd:4.3
- )
- dev-libs/appstream-glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- xdg_environment_reset
-
- # Do not depend on adwaita-icon-theme, bug #326855, #391859
- # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
- sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- -Ddevelopment=false
- -Dplatform=gnome
-
- -Dviewer=true
- -Dpreviewer=true
- -Dthumbnailer=true
- $(meson_use nautilus)
-
- -Dcomics=enabled
- $(meson_feature djvu)
- $(meson_feature dvi)
- -Dpdf=enabled
- $(meson_feature postscript ps)
- $(meson_feature tiff)
- $(meson_feature xps)
-
- $(meson_use gtk-doc gtk_doc)
- -Duser_doc=true
- $(meson_use introspection)
- -Ddbus=true
- $(meson_feature gnome-keyring keyring)
- $(meson_feature cups gtk_unix_print)
- $(meson_feature gnome thumbnail_cache)
- $(meson_feature gstreamer multimedia)
- $(meson_feature spell gspell)
-
- -Dinternal_synctex=true
-
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-text/evince/evince-42.3.ebuild b/app-text/evince/evince-42.3.ebuild
index c8e4f7b1747..b299f33dce2 100644
--- a/app-text/evince/evince-42.3.ebuild
+++ b/app-text/evince/evince-42.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
diff --git a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch b/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index fa0a5cd8291..00000000000
--- a/app-text/evince/files/41.3-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54
-https://bugs.gentoo.org/831853
-
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:22:45 +0800
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for
-a time and explicitly rejects with error since meson 0.60.0
----
- backend/meson.build | 1 -
- data/meson.build | 1 -
- meson.build | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/backend/meson.build b/backend/meson.build
-index e44c1d6d7..ab3df9acf 100644
---- a/backend/meson.build
-+++ b/backend/meson.build
-@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
- )
-
- i18n.merge_file(
-- appstream,
- input: appstream_in,
- output: appstream,
- po_dir: po_dir,
-diff --git a/data/meson.build b/data/meson.build
-index 8a308b853..afc302098 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -15,7 +15,6 @@ foreach desktop: desktops
- )
-
- i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop_in,
- output: desktop,
-diff --git a/meson.build b/meson.build
-index 34c86661f..f74efb3c4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -492,7 +492,6 @@ install_headers(
- appdata = ev_namespace + '.appdata.xml'
-
- i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
---
-GitLab
-
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index 97826857755..87c11128663 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -10,8 +10,6 @@
<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
<flag name="postscript" restrict="&gt;=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag>
<flag name="spell">Enable inline spell check for annotations via <pkg>app-text/gspell</pkg></flag>
- <flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
- (<pkg>media-libs/t1lib</pkg>)</flag>
<flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
</use>
</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
index ab663210234..7a14da73aa0 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1.ebuild
@@ -15,7 +15,7 @@ PVM_S=$(ver_rs 1-2 "")
MY_PATCHSET="ghostscript-gpl-9.56.1-patchset-01.tar.xz"
DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
if [[ -n "${MY_PATCHSET}" ]] ; then
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 9da8ae5ef67..3570f4ae29c 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -14,8 +14,8 @@
</slots>
<upstream>
<remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
- <remote-id type="sourceforge">djvu</remote-id>
<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
+ <bugs-to>https://bugs.ghostscript.com/</bugs-to>
</upstream>
<use>
<flag name="unicode">Add support for unicode passwords via <pkg>net-dns/libidn</pkg></flag>
diff --git a/app-text/grip/grip-4.6.1.ebuild b/app-text/grip/grip-4.6.1.ebuild
index 224d3078f62..94f4ad0ba80 100644
--- a/app-text/grip/grip-4.6.1.ebuild
+++ b/app-text/grip/grip-4.6.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
inherit distutils-r1
DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 8d14952aa04..e44ae2d43a9 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="abort">Enable query abortion</flag>
- <flag name="benchmark">Build benchmark programs</flag>
- <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag>
- <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
- <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
- <flag name="futex">Use futex</flag>
- <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
- <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
- <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
- <flag name="nfkc">Use nfkc based utf8 normalization</flag>
- <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
- <flag name="uyield">Build for detecting race conditions</flag>
- <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
-</use>
+ <!-- maintainer-needed -->
+ <use>
+ <flag name="abort">Enable query abortion</flag>
+ <flag name="benchmark">Build benchmark programs</flag>
+ <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag>
+ <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
+ <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
+ <flag name="futex">Use futex</flag>
+ <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
+ <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
+ <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
+ <flag name="nfkc">Use nfkc based utf8 normalization</flag>
+ <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
+ <flag name="uyield">Build for detecting race conditions</flag>
+ <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">groonga/groonga</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index e3c76382999..1a928a69544 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,2 +1,2 @@
DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
-DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
+DIST gspell-1.11.1.tar.xz 432216 BLAKE2B aa6e6873fcb9cc7d3e7e05fe0abdd3b2e271c0483b7dc4d1c28179b87cea66b0fef86aa6ca94b7a571447ab70ac4ec55ac04b4b1f78415bea2db6c4f8fbc69ce SHA512 df13ef76340b3f644b517f05941c4a11f90212511229a4644cda0d605af428222bf7dd15dbdf51da80e07b7689249728f5739020349226b78d1990707f9706d9
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.11.1.ebuild
index df529ccddab..0b9c655be19 100644
--- a/app-text/gspell/gspell-1.9.1.ebuild
+++ b/app-text/gspell/gspell-1.11.1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-VALA_USE_DEPEND="vapigen"
+EAPI=8
inherit gnome2 vala virtualx
DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
LICENSE="LGPL-2.1+"
SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="+introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-DEPEND="
+RDEPEND="
>=app-text/enchant-2.1.3:2
>=dev-libs/glib-2.44:2
>=x11-libs/gtk+-3.20:3[introspection?]
dev-libs/icu:=
introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ test? ( sys-apps/dbus )
+"
BDEPEND="
dev-libs/libxml2:2
dev-util/glib-utils
@@ -45,7 +46,7 @@ BDEPEND="
# but we don't support them at this time (2020-04-12) in enchant:2
src_prepare() {
- use vala && vala_src_prepare
+ use vala && vala_setup
gnome2_src_prepare
}
@@ -56,5 +57,5 @@ src_configure() {
}
src_test() {
- virtx emake check
+ virtx dbus-run-session emake check
}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
new file mode 100644
index 00000000000..28ec0c74a63
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
+SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
+
+RDEPEND="
+ net-dns/libidn2:=
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+src_test() {
+ # Lots of tests lack a shebang and use bashisms
+ emake check SHELL="${BROOT}"/bin/bash
+}
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 209f4d06cc3..e728da0cc0d 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,5 +1,5 @@
DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
-DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb
+DIST html2text-2.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769b2c8cd758022e9b650a2cbd1788064ada1949e9efddc591c819b0c86890e22504bebde68c2973c353b6fa85da33 SHA512 e7fbd795b06895d866e3379c343860dc8816d5069b476cd13abeb066ba1ad222050863c1d52c6b2c05d426a17af7b427913341c8205964b21f18a3d26c3528c4
DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
diff --git a/app-text/html2text/html2text-2.0.0.ebuild b/app-text/html2text/html2text-2.1.1.ebuild
index f7558b5e8e2..ee93a794aec 100644
--- a/app-text/html2text/html2text-2.0.0.ebuild
+++ b/app-text/html2text/html2text-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/grobian/html2text.git"
else
SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="HTML to text converter"
@@ -19,9 +19,10 @@ HOMEPAGE="https://github.com/grobian/html2text"
LICENSE="GPL-2"
SLOT="0"
-src_prepare() {
- default
+src_configure() {
+ # non-autoconf configure
tc-export CXX
+ default
}
src_compile() {
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index 124d0962c32..eb8aef7abf0 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
src_configure() {
# non-autoconf configure
tc-export CXX
- ./configure || die
+ default
}
src_compile() {
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 3259929cc1d..b69b369a2d1 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
RUBY_OPTIONAL="yes"
inherit cmake ruby-ng
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index c633c55a9a8..a5c9683a4bf 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1 +1,2 @@
-DIST iso-codes-v4.9.0.tar.gz 14483789 BLAKE2B 683921fede69149cf196b70dded975763746d943f470d21e517334890c4c45b11b551c0746e3907341e55870ac733d1f14f74ea5cf723e3f4df164f56531b7da SHA512 0e14101b6a1480c463d83b32a40715485ad5494e799bf0cb6b7ed927b69dff0454512bbccbcc23de8741bf7dce139feb7490c4edf75b4a0af8473fe5ad9c567c
+DIST iso-codes-v4.10.0.tar.gz 14624397 BLAKE2B a797db4cad381ae92bdeebf2b771059b5033a763dd1dc4ec85ac9eb81448482b20fc2c7293605816ad59ca6f5559221c72e22b6c0cd2c167af77b4f40dece4e3 SHA512 f77568fd803c32d8f28fc123c64c3122859f51c4c8f2f9cc4dc857e51d6fd6d1dfa42a4531f699b1f4b4b89adecb541a56e2cce0aac81ebf83f9c063dd79c86e
+DIST iso-codes-v4.11.0.tar.gz 14756251 BLAKE2B dd3bc5bae4def6338527a9c7c41f0ef9603eb2a2a7e4e2a95399bc4891a0d66fa323bb1f960263662cd6b4a42902defede64ad732f4a894d3073a7a68b5b9f80 SHA512 524be572c2505b0b2d55a7a0dd8d6bdff68edbc89c569652b11070cc6412881c98ea66a001193f1540153d44d6b41d921444a1d1a2bde6929bbe445eb369ea3e
diff --git a/app-text/iso-codes/iso-codes-4.9.0.ebuild b/app-text/iso-codes/iso-codes-4.10.0.ebuild
index ea78d3608c3..ea78d3608c3 100644
--- a/app-text/iso-codes/iso-codes-4.9.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.10.0.ebuild
diff --git a/app-text/iso-codes/iso-codes-4.11.0.ebuild b/app-text/iso-codes/iso-codes-4.11.0.ebuild
new file mode 100644
index 00000000000..b27a4c748d9
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.11.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+ local std loc all_locales=()
+
+ ebegin "Looking for new locales"
+ for std in "${all_stds[@]}"; do
+ pushd "${std}" >/dev/null || die
+ for loc in *.po; do
+ all_locales+=( "${loc%.po}" )
+ done
+ popd >/dev/null
+ done
+
+ all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+ if [[ ${PLOCALES} != "${all_locales}" ]]; then
+ eend 1
+ eerror "There are changes in locales! This ebuild should be updated to:"
+ eerror "PLOCALES=\"${all_locales}\""
+ die "Update PLOCALES in the ebuild"
+ else
+ eend 0
+ fi
+}
+
+src_prepare() {
+ default
+
+ local std loc mylinguas
+ local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+ check_existing_locales
+
+ # Modify the Makefiles so they only install requested locales.
+ for std in "${all_stds[@]}"; do
+ einfo "Preparing ${std} ..."
+ pushd "${std}" >/dev/null || die
+ mylinguas=()
+ for loc in *.po; do
+ if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+ mylinguas+=( "${loc}" )
+ fi
+ done
+
+ sed \
+ -e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+ -e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+ -i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+ popd >/dev/null
+ done
+}
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
deleted file mode 100644
index 2759022f01e..00000000000
--- a/app-text/jabref/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
diff --git a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
deleted file mode 100644
index 30dbe53e972..00000000000
--- a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From bd03f07b5bcc5feb558caec4fbfd556947630fb9 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 19 Feb 2022 08:25:21 -0800
-Subject: [PATCH] Update uses of javax.swing API members for Java 9+
-
-These changes are backward compatible with Java 8.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- .../sf/jabref/FindUnlinkedFilesDialog.java | 9 ++++-----
- .../net/sf/jabref/collab/EntryChange.java | 6 +++---
- .../sf/jabref/groups/AddToGroupAction.java | 5 +++--
- .../net/sf/jabref/groups/GroupSelector.java | 9 +++++----
- .../net/sf/jabref/groups/GroupTreeNode.java | 20 ++++++++-----------
- src/java/net/sf/jabref/groups/GroupsTree.java | 17 ++++++++--------
- .../jabref/imports/AppendDatabaseAction.java | 5 +++--
- .../sf/jabref/sql/exporter/DBExporter.java | 9 +++++----
- 8 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-index 4bcbd73..5f7473d 100644
---- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-+++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-@@ -669,13 +669,12 @@ public class FindUnlinkedFilesDialog extends JDialog {
- * The root node representing a tree structure.
- * @return A list of files of all checked leaf nodes.
- */
-- @SuppressWarnings("unchecked")
- private List<File> getFileListFromNode(CheckableTreeNode node) {
- List<File> filesList = new ArrayList<File>();
-- Enumeration<CheckableTreeNode> childs = node.depthFirstEnumeration();
-+ Enumeration<TreeNode> childs = node.depthFirstEnumeration();
- ArrayList<CheckableTreeNode> nodesToRemove = new ArrayList<FindUnlinkedFilesDialog.CheckableTreeNode>();
- while (childs.hasMoreElements()) {
-- CheckableTreeNode child = childs.nextElement();
-+ CheckableTreeNode child = (CheckableTreeNode) childs.nextElement();
- if (child.isLeaf() && child.getSelected()) {
- File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
- if (nodeFile != null && nodeFile.isFile()) {
-@@ -1105,9 +1104,9 @@ public class FindUnlinkedFilesDialog extends JDialog {
- @SuppressWarnings("unchecked")
- public void setSelected(boolean bSelected) {
- isSelected = bSelected;
-- Enumeration<CheckableTreeNode> children = this.children();
-+ Enumeration<TreeNode> children = this.children();
- while (children.hasMoreElements()) {
-- CheckableTreeNode child = children.nextElement();
-+ CheckableTreeNode child = (CheckableTreeNode) children.nextElement();
- child.setSelected(bSelected);
- }
-
-diff --git a/src/java/net/sf/jabref/collab/EntryChange.java b/src/java/net/sf/jabref/collab/EntryChange.java
-index 924fd25..d479995 100644
---- a/src/java/net/sf/jabref/collab/EntryChange.java
-+++ b/src/java/net/sf/jabref/collab/EntryChange.java
-@@ -21,6 +21,7 @@ import java.util.TreeSet;
- import javax.swing.JComponent;
- import javax.swing.JLabel;
- import javax.swing.JScrollPane;
-+import javax.swing.tree.TreeNode;
-
- import net.sf.jabref.*;
- import net.sf.jabref.undo.NamedCompound;
-@@ -83,11 +84,10 @@ public class EntryChange extends Change {
-
-
- public boolean makeChange(BasePanel panel, BibtexDatabase secondary, NamedCompound undoEdit) {
-- @SuppressWarnings("unchecked")
- boolean allAccepted = true;
-- Enumeration<Change> e = children();
-+ Enumeration<TreeNode> e = children();
- for (; e.hasMoreElements();) {
-- Change c = e.nextElement();
-+ Change c = (Change) e.nextElement();
- if (c.isAcceptable() && c.isAccepted())
- c.makeChange(panel, secondary, undoEdit);
- else allAccepted = false;
-diff --git a/src/java/net/sf/jabref/groups/AddToGroupAction.java b/src/java/net/sf/jabref/groups/AddToGroupAction.java
-index 30d57c8..1840e32 100644
---- a/src/java/net/sf/jabref/groups/AddToGroupAction.java
-+++ b/src/java/net/sf/jabref/groups/AddToGroupAction.java
-@@ -20,6 +20,7 @@ import java.util.Enumeration;
- import java.util.Vector;
-
- import javax.swing.AbstractAction;
-+import javax.swing.tree.TreeNode;
- import javax.swing.undo.AbstractUndoableEdit;
-
- import net.sf.jabref.BasePanel;
-@@ -59,10 +60,10 @@ public class AddToGroupAction extends AbstractAction {
-
- if (m_move) {
- // collect warnings for removal
-- Enumeration<GroupTreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
-+ Enumeration<TreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
- GroupTreeNode node;
- while (e.hasMoreElements()) {
-- node = e.nextElement();
-+ node = (GroupTreeNode) e.nextElement();
- if (!node.getGroup().supportsRemove())
- continue;
- for (int i = 0; i < entries.length; ++i) {
-diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java
-index 4700d13..4813f12 100644
---- a/src/java/net/sf/jabref/groups/GroupSelector.java
-+++ b/src/java/net/sf/jabref/groups/GroupSelector.java
-@@ -60,6 +60,7 @@ import javax.swing.event.PopupMenuListener;
- import javax.swing.event.TreeSelectionEvent;
- import javax.swing.event.TreeSelectionListener;
- import javax.swing.tree.DefaultTreeModel;
-+import javax.swing.tree.TreeNode;
- import javax.swing.tree.TreePath;
- import javax.swing.undo.AbstractUndoableEdit;
- import javax.swing.undo.CompoundEdit;
-@@ -1498,8 +1499,8 @@ public class GroupSelector extends SidePaneComponent implements
- GroupTreeNode node;
- AbstractGroup group;
- Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
-- for (Enumeration<GroupTreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
-- node = e.nextElement();
-+ for (Enumeration<TreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
-+ node = (GroupTreeNode) e.nextElement();
- group = node.getGroup();
- int i;
- for (i = 0; i < entries.length; ++i) {
-@@ -1537,8 +1538,8 @@ public class GroupSelector extends SidePaneComponent implements
- BibtexEntry entry;
- Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
- Map<String, String> dummyMap = new HashMap<String, String>(); // just because I don't want to use null...
-- for (Enumeration<GroupTreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
-- node = e.nextElement();
-+ for (Enumeration<TreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
-+ node = (GroupTreeNode) e.nextElement();
- rule = node.getSearchRule();
- for (Iterator<BibtexEntry> it = matches.iterator(); it.hasNext();) {
- entry = it.next();
-diff --git a/src/java/net/sf/jabref/groups/GroupTreeNode.java b/src/java/net/sf/jabref/groups/GroupTreeNode.java
-index 9013af4..c55c7cf 100644
---- a/src/java/net/sf/jabref/groups/GroupTreeNode.java
-+++ b/src/java/net/sf/jabref/groups/GroupTreeNode.java
-@@ -81,10 +81,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
- */
- public String getTreeAsString() {
- StringBuffer sb = new StringBuffer();
-- Enumeration<GroupTreeNode> e = preorderEnumeration();
-+ Enumeration<TreeNode> e = preorderEnumeration();
- GroupTreeNode cursor;
- while (e.hasMoreElements()) {
-- cursor = e.nextElement();
-+ cursor = (GroupTreeNode) e.nextElement();
- sb.append(cursor.getLevel()).append(" ").append(cursor.getGroup().toString()).append("\n");
- }
- return sb.toString();
-@@ -194,26 +194,22 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
- }
-
- @Override
-- @SuppressWarnings("unchecked")
-- public Enumeration<GroupTreeNode> preorderEnumeration(){
-+ public Enumeration<TreeNode> preorderEnumeration(){
- return super.preorderEnumeration();
- }
-
- @Override
-- @SuppressWarnings("unchecked")
-- public Enumeration<GroupTreeNode> depthFirstEnumeration(){
-+ public Enumeration<TreeNode> depthFirstEnumeration(){
- return super.depthFirstEnumeration();
- }
-
- @Override
-- @SuppressWarnings("unchecked")
-- public Enumeration<GroupTreeNode> breadthFirstEnumeration(){
-+ public Enumeration<TreeNode> breadthFirstEnumeration(){
- return super.breadthFirstEnumeration();
- }
-
- @Override
-- @SuppressWarnings("unchecked")
-- public Enumeration<GroupTreeNode> children(){
-+ public Enumeration<TreeNode> children(){
- return super.children();
- }
-
-@@ -224,10 +220,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
- */
- public AbstractGroup[] getMatchingGroups(BibtexEntry entry) {
- Vector<AbstractGroup> matchingGroups = new Vector<AbstractGroup>();
-- Enumeration<GroupTreeNode> e = preorderEnumeration();
-+ Enumeration<TreeNode> e = preorderEnumeration();
- AbstractGroup group;
- while (e.hasMoreElements()) {
-- group = (e.nextElement()).getGroup();
-+ group = ((GroupTreeNode) e.nextElement()).getGroup();
- if (group.contains(null, entry)) // first argument is never used
- matchingGroups.add(group);
- }
-diff --git a/src/java/net/sf/jabref/groups/GroupsTree.java b/src/java/net/sf/jabref/groups/GroupsTree.java
-index e58a567..c3daf94 100644
---- a/src/java/net/sf/jabref/groups/GroupsTree.java
-+++ b/src/java/net/sf/jabref/groups/GroupsTree.java
-@@ -31,6 +31,7 @@ import javax.swing.JTree;
- import javax.swing.SwingUtilities;
- import javax.swing.ToolTipManager;
- import javax.swing.tree.DefaultMutableTreeNode;
-+import javax.swing.tree.TreeNode;
- import javax.swing.tree.TreePath;
- import javax.swing.tree.TreeSelectionModel;
- import javax.swing.undo.AbstractUndoableEdit;
-@@ -415,14 +416,14 @@ public class GroupsTree extends JTree implements DragSourceListener,
-
- /** Expand this node and all its children. */
- public void expandSubtree(GroupTreeNode node) {
-- for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
-- expandPath(new TreePath(e.nextElement().getPath()));
-+ for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
-+ expandPath(new TreePath(((GroupTreeNode) e.nextElement()).getPath()));
- }
-
- /** Collapse this node and all its children. */
- public void collapseSubtree(GroupTreeNode node) {
-- for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
-- collapsePath(new TreePath((e.nextElement())
-+ for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
-+ collapsePath(new TreePath(((GroupTreeNode) e.nextElement())
- .getPath()));
- }
-
-@@ -432,8 +433,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
- */
- public boolean hasExpandedDescendant(TreePath path) {
- GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
-- for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
-- GroupTreeNode child = e.nextElement();
-+ for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
-+ GroupTreeNode child = (GroupTreeNode) e.nextElement();
- if (child.isLeaf())
- continue; // don't care about this case
- TreePath pathToChild = path.pathByAddingChild(child);
-@@ -449,8 +450,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
- */
- public boolean hasCollapsedDescendant(TreePath path) {
- GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
-- for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
-- GroupTreeNode child = e.nextElement();
-+ for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
-+ GroupTreeNode child = (GroupTreeNode) e.nextElement();
- if (child.isLeaf())
- continue; // don't care about this case
- TreePath pathToChild = path.pathByAddingChild(child);
-diff --git a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
-index ad84bbc..5fdce20 100644
---- a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
-+++ b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
-@@ -22,6 +22,7 @@ import java.util.Iterator;
- import java.util.List;
-
- import javax.swing.JOptionPane;
-+import javax.swing.tree.TreeNode;
-
- import net.sf.jabref.BaseAction;
- import net.sf.jabref.BasePanel;
-@@ -175,9 +176,9 @@ public class AppendDatabaseAction extends BaseAction {
- ExplicitGroup group;
- BibtexEntry entry;
-
-- for (Enumeration<GroupTreeNode> e = newGroups
-+ for (Enumeration<TreeNode> e = newGroups
- .preorderEnumeration(); e.hasMoreElements();) {
-- node = e.nextElement();
-+ node = (GroupTreeNode) e.nextElement();
- if (!(node.getGroup() instanceof ExplicitGroup))
- continue;
- group = (ExplicitGroup) node.getGroup();
-diff --git a/src/java/net/sf/jabref/sql/exporter/DBExporter.java b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
-index deb9126..1518e0b 100644
---- a/src/java/net/sf/jabref/sql/exporter/DBExporter.java
-+++ b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
-@@ -32,6 +32,7 @@ import java.util.Set;
- import java.util.Vector;
-
- import javax.swing.JOptionPane;
-+import javax.swing.tree.TreeNode;
-
- import net.sf.jabref.BibtexDatabase;
- import net.sf.jabref.BibtexEntry;
-@@ -201,9 +202,9 @@ public abstract class DBExporter extends DBImporterExporter{
- rs.next();
- myID = rs.getInt("groups_id");
- }
-- for (Enumeration<GroupTreeNode> e = cursor.children(); e
-+ for (Enumeration<TreeNode> e = cursor.children(); e
- .hasMoreElements();)
-- currentID = populateEntryGroupsTable(e.nextElement(), myID,
-+ currentID = populateEntryGroupsTable((GroupTreeNode) e.nextElement(), myID,
- currentID, out, database_id);
- return currentID;
- }
-@@ -338,9 +339,9 @@ public abstract class DBExporter extends DBImporterExporter{
- rs.next();
- myID = rs.getInt("groups_id");
- }
-- for (Enumeration<GroupTreeNode> e = cursor.children(); e
-+ for (Enumeration<TreeNode> e = cursor.children(); e
- .hasMoreElements();)
-- currentID = populateGroupsTable(e.nextElement(), myID, ++currentID,
-+ currentID = populateGroupsTable((GroupTreeNode) e.nextElement(), myID, ++currentID,
- out, database_id);
- return currentID;
- }
---
-2.34.1
-
diff --git a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
deleted file mode 100644
index 95a2e7310fe..00000000000
--- a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-From 0791be415c4104a4c7ff79487823a9f0a7a1d2ec Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 19 Feb 2022 10:47:42 -0800
-Subject: [PATCH] Skip tests that fail when run directly outside Portage
-
-Because the tests are JUnit 3 tests, to skip them, each test's method
-name needs to be changed to something that does not start with 'test'.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- .../tests/net/sf/jabref/UtilFindFileTest.java | 4 ++--
- src/java/tests/net/sf/jabref/UtilTest.java | 10 +++++-----
- .../jabref/export/layout/LayoutEntryTest.java | 19 ++++++++++++++-----
- .../sf/jabref/export/layout/LayoutTest.java | 4 ++--
- .../sf/jabref/export/layout/RTFCharsTest.java | 4 ++--
- .../AuthorLastFirstAbbreviatorTester.java | 2 +-
- .../export/layout/format/DOICheckTest.java | 10 +++++++++-
- .../sf/jabref/imports/BibtexParserTest.java | 4 ++--
- .../sf/jabref/imports/CopacImporterTest.java | 4 ++--
- .../sf/jabref/imports/IsiImporterTest.java | 4 ++--
- .../net/sf/jabref/imports/OAI2ImportTest.java | 2 +-
- .../tests/net/sf/jabref/util/XMPUtilTest.java | 6 +++---
- 12 files changed, 45 insertions(+), 28 deletions(-)
-
-diff --git a/src/java/tests/net/sf/jabref/UtilFindFileTest.java b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
-index 7718c2c..b82360b 100644
---- a/src/java/tests/net/sf/jabref/UtilFindFileTest.java
-+++ b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
-@@ -27,7 +27,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
- *
- * @throws IOException
- */
-- public void testFindFileRelative() throws IOException {
-+ public void skipTestFindFileRelative() throws IOException {
-
- // Most basic case
- assertEqualPaths("HipKro03.pdf", findFile(root.getAbsolutePath() + "/test/",
-@@ -144,7 +144,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
-
- }
-
-- public void testFindFile() throws IOException {
-+ public void skipTestFindFile() throws IOException {
-
- // Simple case
- assertEqualPaths("HipKro03.pdf", Util.findFile(entry, database, root.getAbsolutePath()
-diff --git a/src/java/tests/net/sf/jabref/UtilTest.java b/src/java/tests/net/sf/jabref/UtilTest.java
-index a2e4ac6..50a6cad 100644
---- a/src/java/tests/net/sf/jabref/UtilTest.java
-+++ b/src/java/tests/net/sf/jabref/UtilTest.java
-@@ -65,7 +65,7 @@ public class UtilTest extends TestCase {
-
- }
-
-- public void testPlaceDialog() {
-+ public void skipTestPlaceDialog() {
- Dialog d = new JDialog();
- d.setSize(50, 50);
- Container c = new JWindow();
-@@ -111,7 +111,7 @@ public class UtilTest extends TestCase {
- assertEquals("\"{a\"}", Util.shaveString(" \"{a\"} "));
- }
-
-- public void testCheckLegalKey() {
-+ public void skipTestCheckLegalKey() {
-
- assertEquals("AAAA", Util.checkLegalKey("AA AA"));
- assertEquals("SPECIALCHARS", Util.checkLegalKey("SPECIAL CHARS#{\\\"}~,^"));
-@@ -119,7 +119,7 @@ public class UtilTest extends TestCase {
- assertEquals("", Util.checkLegalKey("\n\t\r"));
- }
-
-- public void testReplaceSpecialCharacters() {
-+ public void skipTestReplaceSpecialCharacters() {
- // Shouldn't German � be resolved to Ae
- assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������"));
- assertEquals("Hallo Arger", Util.replaceSpecialCharacters("Hallo Arger"));
-@@ -221,7 +221,7 @@ public class UtilTest extends TestCase {
- }
-
-
-- public void testFieldAndFormat(){
-+ public void skipTestFieldAndFormat(){
- assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("[author]", entry, database));
-
- assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("author", entry, database));
-@@ -239,7 +239,7 @@ public class UtilTest extends TestCase {
- assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey:]", entry, database));
- }
-
-- public void testUserFieldAndFormat(){
-+ public void skipTestUserFieldAndFormat(){
-
- String[] names = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATER_KEY);
- if (names == null)
-diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
-index 8d6cea9..3197bf0 100644
---- a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
-@@ -92,11 +92,20 @@ public class LayoutEntryTest extends TestCase
- /*************************/
- /****** tests Cases ******/
- /*************************/
-+
-+ /*
-+ * An empty test case to avoid "No tests found" failure:
-+ *
-+ * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
-+ * No tests found in tests.net.sf.jabref.export.layout.LayoutEntryTest
-+ */
-+ public void testDummy() {
-+ }
-
- /**
- * @throws Exception
- */
-- public void testNoHighlighting() throws Exception
-+ public void skipTestNoHighlighting() throws Exception
- {
- // say that this bibtex object was found
- mBTE.setSearchHit(true);
-@@ -113,7 +122,7 @@ public class LayoutEntryTest extends TestCase
- /**
- * @throws Exception
- */
-- public void testHighlightingOneWordCaseInsesitive() throws Exception
-+ public void skipTestHighlightingOneWordCaseInsesitive() throws Exception
- {
- // say that this bibtex object was found
- mBTE.setSearchHit(true);
-@@ -135,7 +144,7 @@ public class LayoutEntryTest extends TestCase
- /**
- * @throws Exception
- */
-- public void testHighlightingTwoWordsCaseInsesitive() throws Exception
-+ public void skipTestHighlightingTwoWordsCaseInsesitive() throws Exception
- {
- // say that this bibtex object was found
- mBTE.setSearchHit(true);
-@@ -162,7 +171,7 @@ public class LayoutEntryTest extends TestCase
- /**
- * @throws Exception
- */
-- public void testHighlightingOneWordCaseSesitive() throws Exception
-+ public void skipTestHighlightingOneWordCaseSesitive() throws Exception
- {
- // say that this bibtex object was found
- mBTE.setSearchHit(true);
-@@ -184,7 +193,7 @@ public class LayoutEntryTest extends TestCase
- /**
- * @throws Exception
- */
-- public void testHighlightingMoreWordsCaseSesitive() throws Exception
-+ public void skipTestHighlightingMoreWordsCaseSesitive() throws Exception
- {
- // say that this bibtex object was found
- mBTE.setSearchHit(true);
-diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
-index cb98fe3..e54a9b8 100644
---- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
-@@ -66,7 +66,7 @@ public class LayoutTest extends TestCase {
- assertEquals("Misc", layout("\\bibtextype", "@misc{bla, author={This\nis\na\ntext}}"));
- }
-
-- public void testHTMLChar() throws Exception {
-+ public void skipTestHTMLChar() throws Exception {
- String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
- "@other{bla, author={This\nis\na\ntext}}");
-
-@@ -95,7 +95,7 @@ public class LayoutTest extends TestCase {
- *
- * @throws Exception
- */
-- public void testLayout() throws Exception {
-+ public void skipTestLayout() throws Exception {
-
- String layoutText = layout(
- "<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
-diff --git a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
-index 43627ba..e977614 100644
---- a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
-@@ -35,7 +35,7 @@ public class RTFCharsTest extends TestCase {
- assertEquals("{\\b hallo}", layout.format("{\\textbf hallo}"));
- }
-
-- public void testComplicated() {
-+ public void skipTestComplicated() {
- LayoutFormatter layout = new RTFChars();
-
- assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("Réflexions sur le timing de la quantité \\ae should be æ"));
-@@ -43,7 +43,7 @@ public class RTFCharsTest extends TestCase {
- assertEquals("h\\u225all{\\uc2\\u339oe}", layout.format("h\\'all\\oe "));
- }
-
-- public void testSpecialCharacters() {
-+ public void skipTestSpecialCharacters() {
-
- LayoutFormatter layout = new RTFChars();
-
-diff --git a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
-index 446a89c..496f18b 100644
---- a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
-@@ -76,7 +76,7 @@ public class AuthorLastFirstAbbreviatorTester extends TestCase {
- * Testcase for
- * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306
- */
-- public void testJrAuthor(){
-+ public void skipTestJrAuthor(){
- String name = "Other, Jr., Anthony N.";
- assertEquals("Other, A. N.", abbreviate(name));
- }
-diff --git a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
-index dceb88c..d0680e3 100644
---- a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
-@@ -5,8 +5,16 @@ import net.sf.jabref.export.layout.LayoutFormatter;
- import net.sf.jabref.export.layout.format.DOICheck;
-
- public class DOICheckTest extends TestCase {
-+ /*
-+ * An empty test case to avoid "No tests found" failure:
-+ *
-+ * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
-+ * No tests found in tests.net.sf.jabref.export.layout.format.DOICheckTest
-+ */
-+ public void testDummy() {
-+ }
-
-- public void testFormat() {
-+ public void skipTestFormat() {
- LayoutFormatter lf = new DOICheck();
-
- assertEquals("", lf.format(""));
-diff --git a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
-index f8bc3dc..ad4899b 100644
---- a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
-@@ -257,7 +257,7 @@ public class BibtexParserTest extends TestCase {
- assertEquals("2002", e.getField("year"));
- }
-
-- public void testNewlineHandling() throws IOException {
-+ public void skipTestNewlineHandling() throws IOException {
-
- BibtexEntry e = BibtexParser.singleFromString("@article{canh05," +
- "a = {a\nb}," +
-@@ -320,7 +320,7 @@ public class BibtexParserTest extends TestCase {
- * @author Uwe Kuehn
- * @author Andrei Haralevich
- */
-- public void testFileNaming3(){
-+ public void skipTestFileNaming3(){
- BibtexEntry e = BibtexParser.singleFromString("@article{canh05,"
- + "title = {\nHallo \nWorld \nthis \n is\n\nnot \n\nan \n\n exercise \n \n.\n \n\n},\n"
- + "tabs = {\nHallo \tWorld \tthis \t is\t\tnot \t\tan \t\n exercise \t \n.\t \n\t},\n"
-diff --git a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
-index 558ebb7..20f6c02 100644
---- a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
-@@ -24,7 +24,7 @@ public class CopacImporterTest extends TestCase {
- super.tearDown();
- }
-
-- public void testIsRecognizedFormat() throws IOException {
-+ public void skipTestIsRecognizedFormat() throws IOException {
-
- CopacImporter importer = new CopacImporter();
- assertTrue(importer.isRecognizedFormat(CopacImporterTest.class
-@@ -46,7 +46,7 @@ public class CopacImporterTest extends TestCase {
- .getResourceAsStream("IsiImporterTestMedline.isi")));
- }
-
-- public void testImportEntries() throws IOException {
-+ public void skipTestImportEntries() throws IOException {
- CopacImporter importer = new CopacImporter();
-
- List<BibtexEntry> entries = importer.importEntries(CopacImporterTest.class
-diff --git a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
-index 041a31e..ee89a2b 100644
---- a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
-@@ -33,7 +33,7 @@ public class IsiImporterTest extends TestCase {
- super.tearDown();
- }
-
-- public void testIsRecognizedFormat() throws IOException {
-+ public void skipTestIsRecognizedFormat() throws IOException {
-
- IsiImporter importer = new IsiImporter();
- assertTrue(importer.isRecognizedFormat(IsiImporterTest.class
-@@ -201,7 +201,7 @@ public class IsiImporterTest extends TestCase {
- assertEquals(BibtexEntryType.ARTICLE, b.getType());
- }
-
-- public void testImportEntriesWOS() throws IOException {
-+ public void skipTestImportEntriesWOS() throws IOException {
- IsiImporter importer = new IsiImporter();
-
- List<BibtexEntry> entries = importer.importEntries(IsiImporterTest.class
-diff --git a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
-index 9e7e73f..e0bfdf5 100644
---- a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
-@@ -112,7 +112,7 @@ public class OAI2ImportTest extends TestCase {
- assertEquals("", OAI2Fetcher.fixKey("arXiv:"));
- }
-
-- public void testOnline() throws InterruptedException {
-+ public void skipTestOnline() throws InterruptedException {
-
- {
- OAI2Fetcher fetcher = new OAI2Fetcher();
-diff --git a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
-index 74571f5..5b74057 100644
---- a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
-+++ b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
-@@ -345,7 +345,7 @@ public class XMPUtilTest extends TestCase {
- * @throws TransformerException
- * Should not happen.
- */
-- public void testPrivacyFilter() throws IOException, TransformerException {
-+ public void skipTestPrivacyFilter() throws IOException, TransformerException {
-
- { // First set:
- prefs.putBoolean("useXmpPrivacyFilter", true);
-@@ -1023,7 +1023,7 @@ public class XMPUtilTest extends TestCase {
- assertEquals(t3BibtexEntry(), b);
- }
-
-- public void testReadWriteDC() throws IOException, TransformerException {
-+ public void skipTestReadWriteDC() throws IOException, TransformerException {
- List<BibtexEntry> l = new LinkedList<BibtexEntry>();
- l.add(t3BibtexEntry());
-
-@@ -1103,7 +1103,7 @@ public class XMPUtilTest extends TestCase {
-
- }
-
-- public void testWriteSingleUpdatesDCAndInfo() throws IOException,
-+ public void skipTestWriteSingleUpdatesDCAndInfo() throws IOException,
- TransformerException {
- List<BibtexEntry> l = new LinkedList<BibtexEntry>();
- l.add(t3BibtexEntry());
---
-2.34.1
-
diff --git a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
deleted file mode 100644
index d3e413e9b0f..00000000000
--- a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f24492bff17f728bcf2b5a50069669ae08b8b372 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 19 Feb 2022 10:21:04 -0800
-Subject: [PATCH] Add JVM system properties and argument for tests
-
-The changes to system properties ensure that all paths the application
-may write to during the tests are not protected by the Portage sandbox.
-
-The extra argument added is required on Java 17+, but it should also be
-compatible with all Java versions that support the Java Platform Module
-System (JPMS), namely Java 9+. On older Java versions, it is optional.
-On Java 8, however, including it in JVM arguments would cause an error.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index d13a9f3..788a4d1 100644
---- a/build.xml
-+++ b/build.xml
-@@ -28,7 +28,7 @@
-
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
-
--<project name="JabRef" default="jars" basedir=".">
-+<project name="JabRef" default="jars" basedir="." xmlns:if="ant:if">
-
- <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- PROPERTY SETUP
-@@ -596,7 +596,14 @@ version=${jabref.version}</echo>
- </target>
-
- <target name="test" depends="buildtest" description="Runs all unit tests">
-+ <condition property="shouldAddOpens">
-+ <javaversion atleast="9" />
-+ </condition>
- <java fork="yes" classname="junit.textui.TestRunner" failonerror="true">
-+ <sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}" />
-+ <sysproperty key="user.home" value="${user.home}" />
-+ <jvmarg if:set="shouldAddOpens"
-+ value="--add-opens=java.desktop/java.awt=ALL-UNNAMED" />
- <arg value="tests.net.sf.jabref.AllTests" />
- <classpath refid="classpathTest" />
- </java>
---
-2.34.1
-
diff --git a/app-text/jabref/files/jabref-2.10-test-prefs.xml b/app-text/jabref/files/jabref-2.10-test-prefs.xml
deleted file mode 100644
index aea6c9f32bb..00000000000
--- a/app-text/jabref/files/jabref-2.10-test-prefs.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0">
- <entry key="autoAssignGroup" value="true"/>
- <entry key="autoCompFF" value="false"/>
- <entry key="autoCompFirstNameMode" value="both"/>
- <entry key="autoCompLF" value="false"/>
- <entry key="autoComplete" value="true"/>
- <entry key="autolinkExactKeyOnly" value="true"/>
- <entry key="caseSensitiveSearch" value="false"/>
- <entry key="nameFormatterFormats" value=""/>
- <entry key="nameFormatterNames" value=""/>
- <entry key="pdfDirectory" value=""/>
- <entry key="pushToApplication" value="Insert selected citations into LyX/Kile"/>
- <entry key="showFileLinksUpgradeWarning" value="false"/>
- <entry key="useRegExpSearch" value="false"/>
- <entry key="useXmpPrivacyFilter" value="false"/>
- <entry key="xmpPrivacyFilter" value="pdf;timestamp;keywords;owner;note;review"/>
-</map>
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
deleted file mode 100644
index 2dfca56aca1..00000000000
--- a/app-text/jabref/jabref-2.10-r7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc test"
-
-inherit desktop java-pkg-2 java-ant-2 virtualx xdg-utils
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="https://www.jabref.org/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-CP_DEPEND="
- dev-java/antlr:0
- dev-java/antlr:3
- dev-java/commons-logging:0
- dev-java/fontbox:1.7
- dev-java/jaxb-api:2
- dev-java/jempbox:1.7
- dev-java/log4j-12-api:2
- dev-java/log4j-api:2
- dev-java/spin:0
- dev-java/microba:0
- >=dev-java/glazedlists-1.8.0:0"
-
-TEST_DEPEND="dev-java/junit:0"
-
-# Since Java 9, all dependencies ever imported by the source files need to be
-# present in the classpath for Javadoc generation; in particular, for this
-# package, the test sources will be passed to 'javadoc' as well as the non-test
-# sources, so all test dependencies are required for Javadoc generation too.
-DEPEND="
- >=virtual/jdk-1.8:*
- doc? ( ${TEST_DEPEND} )
- test? ( ${TEST_DEPEND} )
- ${CP_DEPEND}"
-
-# Java 17+ requires "--add-opens=java.desktop/java.awt=ALL-UNNAMED" in
-# arguments to the JVM that runs this application; Java 8 and 11 are OK,
-# but dev-java/java-config currently does not support declaration like
-# RDEPEND="|| ( virtual/jre:1.8 virtual/jre:11 )" yet, so only one JRE
-# version can be chosen to run this application at the moment.
-RDEPEND="
- virtual/jre:1.8
- ${CP_DEPEND}"
-
-IDEPEND="dev-util/desktop-file-utils"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-javax.swing-java-9+.patch"
- "${FILESDIR}/${P}-skip-failing-tests.patch"
- "${FILESDIR}/${P}-test-jvm-props-args.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="docs"
-
-# Some dependencies that are also used by the tests need to be explicitly
-# listed to avoid "package does not exist" compiler errors.
-EANT_TEST_GENTOO_CLASSPATH="junit"
-EANT_TEST_GENTOO_CLASSPATH+=",antlr-3,commons-logging,glazedlists"
-EANT_TEST_GENTOO_CLASSPATH+=",jempbox-1.7,microba,spin"
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T} -Duser.home=${HOME}"
-
-src_prepare() {
- default
-
- # If we cleanup it complains about missing jarbundler
- # BUILD FAILED
- # taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
-# java-pkg_clean
-
- # Remove bundled dependencies.
- rm lib/antlr*.jar || die
- rm lib/fontbox*.jar || die
- rm lib/glazedlists*.jar || die
- rm lib/jempbox*.jar || die
- rm lib/microba.jar || die
- rm lib/spin.jar || die
- rm lib/plugin/commons-logging.jar || die
-
- # Remove unjarlib target (do this only once we have removed all
- # bundled dependencies in lib).
- #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
- # Fix license file copy operation for microba bundled lib.
- sed -i -e 's:^.*microba-license.*::' build.xml
-
- use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(\
- java-pkg_getjars --build-only junit)"
-}
-
-src_test() {
- # Tests will launch the application, which requires an X environment.
- # An existing application preference file is needed to make the tests
- # non-interactive; otherwise, the application will hang for user input.
- local prefs_dir="${HOME}/.java/.userPrefs/net/sf/jabref"
- mkdir -p "${prefs_dir}" ||
- die "Failed to create application preference directory for tests"
- cp "${FILESDIR}/${P}-test-prefs.xml" "${prefs_dir}/prefs.xml" ||
- die "Failed to copy application preference file for tests"
- virtx java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
- dodoc src/txt/README
- use doc && java-pkg_dojavadoc build/docs/API
-
- java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
- newicon src/images/JabRef-icon-48.png JabRef-icon.png
- make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
deleted file mode 100644
index 8117e098039..00000000000
--- a/app-text/jabref/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>nicolasbock@gentoo.org</email>
- <name>Nicolas Bock</name>
- </maintainer>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jabref</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 51d13aea303..d415981d974 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1 +1,2 @@
DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
+DIST jo-1.6.tar.gz 151941 BLAKE2B 13d7d68c33d7f89ebb4a5cdb448082bd4d245060ebf8c85149c39f2a184f03f1ac1c380833a742894c37c0815e3627569cfe29f202f9aa3dcec7fa089f99b918 SHA512 a2cb1327c8255e0f8d1b6e6056bbce081d7703192bdb974e908549b863d7db645531dbeff87629a6ed53626295ab7ca8a72816d104f9188846ef175c8a9acb07
diff --git a/app-text/jo/jo-99999.ebuild b/app-text/jo/jo-1.6.ebuild
index 098a68881de..162d12aebd8 100644
--- a/app-text/jo/jo-99999.ebuild
+++ b/app-text/jo/jo-1.6.ebuild
@@ -1,16 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools bash-completion-r1 git-r3
+EAPI=8
+
+inherit autotools bash-completion-r1
DESCRIPTION="JSON output from a shell"
HOMEPAGE="https://github.com/jpmens/jo"
-EGIT_REPO_URI="https://github.com/jpmens/${PN}"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jpmens/${PN}"
+else
+ SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS=""
+
+BDEPEND="virtual/pkgconfig"
src_prepare() {
default
diff --git a/app-text/jo/jo-9999.ebuild b/app-text/jo/jo-9999.ebuild
new file mode 100644
index 00000000000..162d12aebd8
--- /dev/null
+++ b/app-text/jo/jo-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jpmens/${PN}"
+else
+ SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ export bashcompdir=$(get_bashcompdir)
+ default
+}
+
+src_install() {
+ default
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
+}
diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
index 6aaa98d22ea..602b4237d04 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">jpmens/jo</remote-id>
- </upstream>
+ <maintainer type="person" proxied="yes">
+ <name>Thamognya Kodi</name>
+ <email>contact@thamognya.com</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jpmens/jo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index 0041e2a8cfe..77987b95710 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1 +1,2 @@
-DIST kramdown-rfc-1.6.5.gem 4608 BLAKE2B fb62c69a186f80da15555937209b59af370a5c9dd742d5a704e4af73931728fb7337162848af02dab7d7ee520c7883a82b00adcc0e4b5ab97020f9fc530ee42a SHA512 0bd9f24bf793e9a92f7a479a75a739cea4bfd8cdd20ee9c4bd52b8de5c7fe71db777ac0826412e132b2c227dfcf9c4b333f3bfb648f4598599919a64a21bce69
+DIST kramdown-rfc2629-1.6.11.gem 55296 BLAKE2B ed2f60e4ad5c4d35acbcfeb0b7d57928a2b9c5d7676379ce5cfee11de21a7d02593218b9728ce11b828cb28055f1580c474a176f751d7239315b8857893a3733 SHA512 da97a25df4efb4e618fc3b35cdc7fd7343d670758e2af4aefe16212054063f3d682ba59ad961eed54594ce76e45e5f7f90e1237b96ca31808e06c757c0c284d7
+DIST kramdown-rfc2629-1.6.13.gem 55296 BLAKE2B c880e114567739ca99af76457cbca5b13bb5554c2016fac1a3233eb8e32db0ecfbb2e91d42109f53c34e284bffa9d501ce65b037dfc468b173c6ffa83ecf0a88 SHA512 8c1f9cf69d83c02b5b2b2793d35add9ca5207a5e412dfcf674c2f0f9f835f8b1a2c0afa96c77b5771e8cd116d63ab1bee9a0f507dc03535fe3566da2d2bc759e
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild
new file mode 100644
index 00000000000..3156d56315c
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.11.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+# The software got renamed from kramdown-rfc2629 to kramdown-rfc,
+# however the gem coordinate is still kramdown-rfc2629.
+RUBY_FAKEGEM_NAME="${PN}2629"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+ruby_add_rdepend "
+ >=dev-ruby/certified-1.0.0
+ >=dev-ruby/json-2.0.0
+ >=dev-ruby/kramdown-2.4.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-rfc/kramdown-rfc-1.6.5.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.13.ebuild
index ea795b2d7ef..c39dcb1683d 100644
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.5.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.13.ebuild
@@ -5,6 +5,9 @@ EAPI=8
USE_RUBY="ruby26 ruby27"
+# The software got renamed from kramdown-rfc2629 to kramdown-rfc,
+# however the gem coordinate is still kramdown-rfc2629.
+RUBY_FAKEGEM_NAME="${PN}2629"
RUBY_FAKEGEM_RECIPE_TEST="none"
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_EXTRAINSTALL="data"
@@ -21,7 +24,7 @@ KEYWORDS="~amd64"
ruby_add_rdepend "
>=dev-ruby/certified-1.0.0
>=dev-ruby/json-2.0.0
- >=dev-ruby/kramdown-2.3.0
+ >=dev-ruby/kramdown-2.4.0
>=dev-ruby/kramdown-parser-gfm-1.1.0
"
diff --git a/app-text/krop/krop-0.6.0-r1.ebuild b/app-text/krop/krop-0.6.0-r1.ebuild
index 6085c6264fb..9ba6a12603e 100644
--- a/app-text/krop/krop-0.6.0-r1.ebuild
+++ b/app-text/krop/krop-0.6.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit desktop distutils-r1 xdg-utils
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 71df1f4d3c2..8495b133a7c 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit desktop distutils-r1 xdg-utils
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 3d7322d22af..ffb4af80882 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1 @@
-DIST lesspipe-1.91.tar.gz 121965 BLAKE2B 93c169b2b1a81db7e7b569718a43152a8f2b9ea95258047a00ae4940509817a3eb861fdadb6bafc5861c49e805ce910348a57f634bdae57317811ac6fbfc6945 SHA512 d080ceaae019d8885a53c8abb26f4a159b78578f68c2b9a024960aa69509651e3b6638e78bd6e2e57c23d81123d9a3cab167736f253ba4276a3889890d594bd3
-DIST lesspipe-2.04.tar.gz 166831 BLAKE2B c33620b1c2714b01a89eaaeaeccfd72e62fd5123270ec84d3e27e914bda8f734758b36ea850126aa1ecd6ab36b9442577ac591024c373bdf6540b95816ed750b SHA512 04312d21c4f45b1630efd597ffafd69fc46ceff1fd5872d296a7811940f9d34da805c4ef4fa543af839de7e8bb4225c6ef5e680e9675eae4f56de669ec975669
DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
diff --git a/app-text/lesspipe/lesspipe-1.91.ebuild b/app-text/lesspipe/lesspipe-1.91.ebuild
deleted file mode 100644
index 39cb02be307..00000000000
--- a/app-text/lesspipe/lesspipe-1.91.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Tests are broken in 1.84, 1.85.
-# Still fragile in 1.88. Passes when lesspipe is not installed.
-# ... and in 1.91, things are being overhauled still.
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- # Drop a failing test. Not ideal, however:
- # The test suite for this package is pretty fragile; it's more valuable
- # to have _something_ failing/passing overall, than relying on a single
- # test which seems to fail due to an unpredictable external command.
- #sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
-}
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build (avoids the "all" target)
- :
-}
-
-src_test() {
- # LC_ALL=C manages to fix one test failure
- LC_ALL=C ./test.pl -d || die "Tests failed!"
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.04-r1.ebuild b/app-text/lesspipe/lesspipe-2.04-r1.ebuild
deleted file mode 100644
index dc26753ae52..00000000000
--- a/app-text/lesspipe/lesspipe-2.04-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-BDEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # Not an autoconf script.
- ./configure --fixed || die
-}
-
-src_compile() {
- # Nothing to build (avoids the "all" target)
- :
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
- einstalldocs
-
- rm -r "${ED}"/etc/bash_completion.d || die
- newbashcomp less_completion less
-}
-
-pkg_preinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
- elog "The latter is the Gentoo-specific version. Make sure to update your"
- elog "LESSOPEN environment variable if you wish to use this copy."
- fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.05.ebuild b/app-text/lesspipe/lesspipe-2.05.ebuild
index dc26753ae52..cee412a1d9f 100644
--- a/app-text/lesspipe/lesspipe-2.05.ebuild
+++ b/app-text/lesspipe/lesspipe-2.05.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Please check again on bumps!
# bug #734896
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
index a62943210fa..849f0bc754c 100644
--- a/app-text/libabw/libabw-0.1.3.ebuild
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="doc static-libs"
BDEPEND="
diff --git a/app-text/libebook/libebook-0.1.3-r2.ebuild b/app-text/libebook/libebook-0.1.3-r2.ebuild
index af3d44da21e..017194d774f 100644
--- a/app-text/libebook/libebook-0.1.3-r2.ebuild
+++ b/app-text/libebook/libebook-0.1.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
index 6623d64ea80..55726e6a867 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="EPUB generator for librevenge"
HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="debug doc test"
RESTRICT="!test? ( test )"
@@ -18,13 +18,15 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/boost
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
test? (
dev-util/cppunit
dev-libs/libxml2:2
)
"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
src_configure() {
econf \
@@ -36,5 +38,5 @@ src_configure() {
src_install() {
default
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
index b2d0bb4788d..a9dcc430864 100644
--- a/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.10-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
else
MDDS_VER="2.0"
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libetonyek/libetonyek-0.1.10.ebuild b/app-text/libetonyek/libetonyek-0.1.10.ebuild
deleted file mode 100644
index 141836ac119..00000000000
--- a/app-text/libetonyek/libetonyek-0.1.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
- inherit autotools git-r3
-else
- SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- app-text/liblangtag
- dev-libs/librevenge
- dev-libs/libxml2
- >=dev-util/mdds-1.5:1/1.5
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- media-libs/glm
- sys-devel/libtool
- test? ( dev-util/cppunit )
-"
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-werror
- $(use_with doc docs)
- $(use_enable static-libs static)
- $(use_enable test tests)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 85eb33c3055..ff236d229cc 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild b/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
index a172edef94d..f39780be7b8 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
src_configure() {
econf \
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 23a73ff0574..807aa173a3e 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1 +1,2 @@
DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
+DIST liblangtag-0.6.4.tar.bz2 764946 BLAKE2B 1d94f341359f880acb8a0a0526da625cb39d85b33665b861c0fbd94064228a3d5328f3a3b7d62bffd29c6ff8161fa499b6565010ba3065c90f87b5902969e81f SHA512 6c6dd3e6b0fc8d6f10cafd74112cbaf2a2342a88a908ad2f7ae759b3f5fb0cf6d788504c1de072e9ef019f2f5a284daeb2d2393036b6b402c5bc87f32b55f271
diff --git a/app-text/liblangtag/liblangtag-0.6.4.ebuild b/app-text/liblangtag/liblangtag-0.6.4.ebuild
new file mode 100644
index 00000000000..93ee89300fa
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.6.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Interface library to access tags for identifying languages"
+HOMEPAGE="https://bitbucket.org/tagoh/liblangtag/wiki/Home"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc introspection test"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/libxml2
+ introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+"
+BDEPEND="
+ sys-devel/gettext
+ sys-devel/libtool
+ doc? ( dev-util/gtk-doc )
+ introspection? ( dev-libs/gobject-introspection-common )
+"
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ if [[ -d docs/html ]]; then
+ rm -r docs/html || die "Failed to remove existing gtk-doc"
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable doc gtk-doc)
+ $(use_enable introspection)
+ $(use_enable test)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 71840443972..a38d69537cb 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index 93a7036a4d2..529a9929ca5 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
diff --git a/app-text/libmwaw/libmwaw-0.3.21.ebuild b/app-text/libmwaw/libmwaw-0.3.21.ebuild
index 3c35ea5b1c4..c576261ecb7 100644
--- a/app-text/libmwaw/libmwaw-0.3.21.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.21.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index 4c609720e0d..52053156b9a 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
fi
DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index c9ce7a60f58..24f9ceff77c 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,2 +1 @@
DIST libnumbertext-1.0.10.tar.xz 292852 BLAKE2B 1dfc5bd974525a3923325357c30cc80ecac0be856288cfc9effe13a0cda5f45eba22b333b606113bea8dff0bc08333a4b203f539b860ec48e214c35bc4dacb41 SHA512 6cb1b09b43c77f9fe1928d72deabdd06cbb3f7185823fcf045855b26ea6e0e017b2eba9dcd4725161012ed6d37a416c98b838145aa418bd0bd79ce52bf456417
-DIST libnumbertext-1.0.8.tar.xz 292568 BLAKE2B d385f0bdb19013673190533a21305e12211e1427d59503a9b3c54bc1deda27f405dae347c4cc43161766a901ec14c9ea4b0eed17ba468eb0855ef1a6b0ec95c3 SHA512 b29e544eac25a0603ba7fc68744ac54a372402af32f4bbf52f2373b280efce2eb6831c803d0a10e1f674988839f4c123b8a120e2697bcfa2510d3852d856fe2d
diff --git a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
index 14a4ecfc51f..41fa8cf1cda 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
IUSE=""
src_configure() {
diff --git a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild b/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
deleted file mode 100644
index 33ff29c4d14..00000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_configure() {
- econf \
- --disable-werror
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libodfgen/libodfgen-0.1.8.ebuild b/app-text/libodfgen/libodfgen-0.1.8.ebuild
index 72cf673a399..f494e1c1568 100644
--- a/app-text/libodfgen/libodfgen-0.1.8.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 6c33ab30007..d3f5e575b85 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index 1b88010e8ba..24521e60096 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="debug doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/libspectre/libspectre-0.2.10.ebuild b/app-text/libspectre/libspectre-0.2.10.ebuild
index 04e44d862e0..50aad4538d1 100644
--- a/app-text/libspectre/libspectre-0.2.10.ebuild
+++ b/app-text/libspectre/libspectre-0.2.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="debug doc"
BDEPEND="
diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
index 09a586e63ec..2be8e63e70d 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86"
fi
DESCRIPTION="Import filter for old StarOffice documents"
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
index 22578cbcb77..3c514f0b343 100644
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3 autotools
else
SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
fi
DESCRIPTION="Import filter for old StarOffice documents"
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index 7031422c057..82b7e9e0241 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
IUSE="doc +tools"
RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
index c2c69bbccd1..8939b8e743b 100644
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
index 01e24de2504..c1516565292 100644
--- a/app-text/libwps/libwps-0.4.12.ebuild
+++ b/app-text/libwps/libwps-0.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
IUSE="debug doc tools"
BDEPEND="
diff --git a/app-text/lv/lv-4.51-r5.ebuild b/app-text/lv/lv-4.51-r5.ebuild
index b67db19482e..79220d16491 100644
--- a/app-text/lv/lv-4.51-r5.ebuild
+++ b/app-text/lv/lv-4.51-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="!app-editors/levee
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index b84995708b5..5c522679151 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -1,6 +1,6 @@
DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
DIST ammonia-3.1.2.crate 39704 BLAKE2B 78c4df1a201b1899331a1e9c4861bb792b0a0da4573881608591dd661373063d7c9b91255f22e998ac19b6e5f78ba1318fab066bf18c2d2792059c991ec127ea SHA512 eec32f6367740d78bfe17c3c83adbc34d6143b01b64e19a0821726155206883229884464893048b235164c21e0c122a5b3e530ccd8d80ad78ab19243bcdcae97
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
DIST assert_cmd-1.0.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -23,14 +23,14 @@ DIST clap-3.0.10.crate 190580 BLAKE2B 0286717f1bf5315ee97809d0fd7dc860b6b82b83b6
DIST clap_complete-3.0.4.crate 22317 BLAKE2B 2f69d411c6c41a8ef584cb58014310e0d1431134ff0721972d71ab0e2c9c97b8fb35c3145fd1e43375c69a174ee5f327cead3331107ef31d65ef216bb3c72b58 SHA512 87c8ba56350f0e1a7dc7a453b93e8ade77186cbe123dfbf01bb5b04995f1c3d960b564f8ea1127eb54f19e511a7a586836b2d3e2365892f156e684972359a307
DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST elasticlunr-rs-2.3.13.crate 93039 BLAKE2B e414342dd7a0b69022d57a853ef523cb5d480f7c2f284ad955b2e217f44432e7271c8642fd3a1500f63122e0c399337cc82fa7b0e241669ea3d8a194b923567a SHA512 5a4bf14fea7bbe55d33f2cf69cd989b93169b57ef317badc48815381eaf2534e2a02ca0a0ca7ccc16f9df3cfbcca729ddb879050ae2788a68904895b540a34ad
-DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST elasticlunr-rs-3.0.0.crate 100054 BLAKE2B 35830306706b651f7e427e7a9a14c509997abcce8d76c79e6720b095bfb09166b9fabf56b5613cba5d2404ae27b057d6450d1e2ce490b3fc457c7c65b3517e5a SHA512 bc6e99d86545f64372abdd84f681de3a873fe0d09031e89db401601773c40fb6eb1f1a9cb141b58b85b92265427113487b6b2106b037290e5d8c1844de9ae42d
+DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566
DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
@@ -41,12 +41,10 @@ DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d1
DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
DIST futf-0.1.4.crate 11341 BLAKE2B 804cdb89803ecba0371ba045d3af3f4c4cf219e31f0cfff3ab96720ef39cbde14418ae8031601c211b279682781b1d3e6d2ce31c2d212d21afda7fc1da64d8cd SHA512 4cd5ecbb8c180c9b390a6884edf65bfc3aff53ffe7b930cf2b432ff9c46a8c5a06001f3f412f99c41a60def52207e709ffa07a4b432ada488e77067fb5e1b3bf
-DIST futures-0.3.16.crate 46410 BLAKE2B 30fab6c72c09c030ebfa8d4deaf35cf5d5efc2b14a8cc7c3eea83109e1588f6042daab3ddf2e660daa643d26cd227229e2f3d780e24b7686dde1ca04e24c7d08 SHA512 57a58ede8599cc61fcbe555c84df312aa890ea993ba956759ec8effb71982fad668f024c536dbd20856388d6ceb93841de6c063e5321affcd41e96fddf7a9a0a
-DIST futures-channel-0.3.16.crate 31765 BLAKE2B eaef9d4daa760dde5811355230659ee5ec1e8ad784fd935667664cb3db65bed30c4e342bbb4ec4687ed2ab299c7e733d30c017055b18e307296dc8e7797cbc5c SHA512 84baf9a5b74693448ba3cdc402957d0882da6ad0becd3588fb61107d0ed9912a6ddfe599ecc4751713c81f4c962cfa283f0b3bf6472ca17383ab7c5ea5821e65
-DIST futures-core-0.3.16.crate 14486 BLAKE2B eb6afd63cea682e3b3252e956a213d9a6a7135ee3631eb10482af03e3bd717e1c69b49c6956aa3390cb4c9961a50b33cf7e7a356e6a511d98de9893d93f2f9c3 SHA512 cc3aa3794a0fc6005c88134943552dd426dcdbe0d117a2ab3269fc6b5b7ae637e0441c28f5b25bc544585c8830ceebde252241a0502fe832f64476c4b4774bb4
-DIST futures-io-0.3.16.crate 9050 BLAKE2B 60bcaca9e006adbc0d97af5cd9a5a7c3b50a94f017a130c21d7132f7f121e1e74f5ab538362afaffe44d4ad1bdb67f89dc8c7fa28ea69ee30dde84019ebe4c70 SHA512 cb9edb5224741f249f1936b3444e6bfd4ea4eee1d3964971d242ae1f80bb191067b1e3f0b36045e3234ea7f35738037c863fec204b952a40f84c5f46026c9ac9
+DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
+DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
DIST futures-macro-0.3.16.crate 10779 BLAKE2B 94d23ff28c5211f27faf1e9f3444b00a226dd1b43594edc8016dbe425b07ba59d335c1fb93ddce63d1ca1ca2c9ccdf3a56dfd6d8088391d62fadc71fd2cbea97 SHA512 ca36a9499937d0afcfaa9fe9f3e29fbed1ae8fb83e7e6cd267c67fdc3c723098788aa25a941ba8571fb9a5f9e40431a1024c647cd719ca57b847659b926cc515
-DIST futures-sink-0.3.16.crate 7663 BLAKE2B 355c7372524be71fbd6405f5bbd173765eb191008c725deb790f183eedae194a8b5c09c512a8e4641a903c409c2a903fc6a2095372ee52dc15f9e10527abeb98 SHA512 32d42751026ea88aa169c0e8f69b80aaa4ad582d852492f7056da35859ec3299d4ff57f508a5fa2da18c5931e97c924d88ec72341cdb342ff79f50f7dba1f87a
+DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f96d4f0df0cb035ce964b91e97f88c7a1a4942ec4010cb4da5f4a3552487eac048a6bfcef637bf1f83398d7f38758e SHA512 9bc0198495b5a1b3ed25fcf7b053a235bba0a43a4226bf085d9027537a57add1686ef61179bf2a2d4189945cb5a05a8d64ba6e6e647c56245666d51e138d113f
DIST futures-task-0.3.16.crate 11712 BLAKE2B 88c095b45590e6b4d645413fdfb82b3be178fbfb44c6e36c31a6e78f97cf4a7f53d896ae57b0e34da4195678a49c68a684b3af2f3182435352884a7562d30426 SHA512 7c95d177e9cca05ca8982886957010c4defa9c5dcd3b425738b68f750515277e27fd331148168e866d55da4b2389aeb8f0a7af0174553914c55095654666b6ec
DIST futures-util-0.3.16.crate 144642 BLAKE2B 0ce9ebcd85868d6e64622ab498962d8450f7fdb3d15357b77d94409640f6d09803f4ddf6423a118a87231799f0dd495f59ec431e4bd3e823f0decb035f5b43f4 SHA512 21815551e0e22d9fdfbb7ad36daeb3b01bd01c58e85091d0fe08a677141338f68f8754012c9e7b78e031e3baa345927fd05851f20de29fe6155e532bebb19b26
DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
@@ -60,20 +58,18 @@ DIST handlebars-4.1.2.crate 89046 BLAKE2B 0b3442309632a3826ddfdbe0b6c51a15d40188
DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
DIST headers-0.3.4.crate 67384 BLAKE2B 4e5b2767fe120911b15f72605f4be957cb0ad7d2d87bb521f9c960fd0fbf56f7d761a69516c708dc1c5c7c0f4d44f2086e43537d689a15f484bc17b04eac17e2 SHA512 b19f4058f2a69dc9bd3b20294962beb9e02d7fa82630740a7eff19720ebab2e8332f11b129d9932eec34a03070d6b807f72979060a4ef582860996a13b88dcc0
DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
-DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
DIST html5ever-0.25.1.crate 73165 BLAKE2B 70bee0c77337b2fee3fedda6fc475969b5e9a20342bf6890819fa9a69be8cac66e0dfc0a608f5cd6ba789a780f403ee736dbde1af52cb800a599b0113801dc99 SHA512 2b946224a0c5859436a57a507a89601adeffc12092376fe47429c5c5a61bd1d00b3271f0be7dea82ba1dce93a1cb820f72df8ba4c90fd13bd1ec408cff6ca660
DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
DIST http-body-0.4.3.crate 7660 BLAKE2B ef56f26e844f1f234a5fd96f29aed91897617ce126e6f143ee29fda2183858b3439570ee980469fd092ae8d7fab00ce7d4300e0f2506a9348876df766d80ed50 SHA512 2d72e11cbb072dde536c5187f22d88dd9aca0768e7b0191003e463900d50ba73e01ec6dd8c98d348c0fc5651ec022b859daedb5194c71fd787af4f2dfb97650c
DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
-DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
DIST hyper-0.14.11.crate 169467 BLAKE2B d4640bf1619711c15c155777a84cad1c5d9220d6d029ec808d953f46ec409b14664e8a5ffb489250874790ee512c4a30d1c298d974d9da83c40a88690c6dfeeb SHA512 c04875f2e3c1732ed29c4f73de24fc197486d157325fa8304aa29e6948984a01d91ae7e9455f56337d3cff2c270694cdec0dad950f1b4bc3f8b3c7964fc079af
DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
DIST inotify-0.7.1.crate 24637 BLAKE2B 7089e15c76ab1585850cc17d1c7d5094f6c229d2009dd90648df78d08a5b82567ccfbc116547e4d78df5b4821f4d3fdd7b46b22e0d1b8cd1569cf22c4877b4da SHA512 e98e041efbfaa932f0eb2e21f1831776280ec3873ecba8815dc3af716a37ec19c863a909d9f10a49347e964eae0aba33290a892dc0f0e178f6ccc0a4fdcf2c6f
DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST input_buffer-0.4.0.crate 7771 BLAKE2B e23b89b67f70decf77b91d3a370d07f430d7119ba5fbfeabaa8f669ada225ea9c37a40e80457f112b3519369b7dae0f886bdb0e03314421486167c3d071343fb SHA512 85ac0716580a3d2121d35d9d2f721b282f3424ff78947c31ac203f4ea85cbcd9fd86efd3f41341551da15beb51171a5a8f8aa09ea081715236f23b5c5234cf2b
DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
@@ -87,7 +83,7 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce12bb776d22e4409ad388678a92965834acb9b1b2fa51e6472ee2c0db156e4a75e5b6db5f6b6d4220159ab93b056d0418c SHA512 7c21836fcdd45bfdef7305327255291c92d75d3329798d31abab26297de8c381e41b4419fb7ac631310835d590b63751a63bdd87e2697ea3dfdd6599033433c7
DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST mdbook-0.4.18.tar.gz 1510868 BLAKE2B 4b47b41fc03fb923891b419098bf553dbbfb0066b1d51bfd58e3cc69e1e686f7bdb5210b6b4cb19f09c35cd6e926ede3378e49debd5a54d838c2028d44186aaa SHA512 f209d8882ff317deb3356a5de0d39c71fe0c51cf80874f0edc56c7ddf46b537c7194c58172dd5f704554bf0724cb0899ecb61b1eeea467226fa83c0679c336f5
+DIST mdbook-0.4.21.tar.gz 1513223 BLAKE2B 47f9fed97c08af77729288b06cfd89b0ad6e738f25dab30968ce7c6a8bc1c6bef1645c99bd0841a709d247b2f41a16c62a14540db6ad313b795240571a772bfe SHA512 74e78f0d7a2352c4402324373f6249810feb836b77493b0d128eebc2b3092cd399ac30a1886f4c9e8ad8401ccc75a7377dbbe5c9c9d3fcc260dbaf2d8d83e66a
DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
@@ -127,12 +123,11 @@ DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19b
DIST predicates-2.0.1.crate 27077 BLAKE2B eca1527c1734b3bbd674dd5fadbe040187b95f66480b6cbf322f225db0b47e49d5a510bb97e861fb28a6ddaf56a1f10ae8c3136a22953c86a491086d63c08848 SHA512 81d5faa0224c430d467d22edc20a02dc214852d937f948ca1d51eac61788f4340a279a93ecb8a9bea495f2a45e2c86a42b8b495c431f50e752c2ee0c422b946f
DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
-DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
+DIST pretty_assertions-1.2.1.crate 79474 BLAKE2B fbdc7c7ddc40aedaaa845f9096d52eeadd9772f64fda71eb2a2ecfd40745ae6a7ed8baa2a83c909f2a01bfaad31c00aa7c24af6d449022486dac204a3671dd55 SHA512 6e6cb21bf03f34effe3c38ab9b31d768c7a7c02dfb385efb5c1dade7547a367276c5b00c4eae11aa85d90b6f2dbe5033acdf109200196e225e335e73bf5e0ad4
DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
DIST pulldown-cmark-0.9.1.crate 114955 BLAKE2B ee295f4b65dee11c0b39054a4613cbfa1058a8dce05dc298bacc151e049dbe3f05b1739205ac345a98e70662187932d226c0d0667974b3c6a6f55882b566564b SHA512 466d6b4ceee89e1a8c71ff7ab8fc1000e7ef1d9bd22193a152358e1dad28c0c1bbe619caf71106d74eb376805dbfd2b888a0626c8c2851bd814d348873843306
-DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -167,20 +162,20 @@ DIST socket2-0.4.1.crate 41364 BLAKE2B 6b1ab3dc342a30467a9579a2dea338e3f5e2a7374
DIST string_cache-0.8.1.crate 14423 BLAKE2B af0c9b9f52a246d5537ac2831be6aea462ce253b086baf6fb1773f760d566ba70917b686c2c732f60cff4c30068c5800b7c26f73763e9ef825b2fa619f6a7c00 SHA512 476aa99da2d83de7eabe68b3dc2d064cb549e2caa2b708459f883cc0a8f27bed1b1607abb1481959cc26046cfd4c44886bb87bbef5aba95a195a9d850311915b
DIST string_cache_codegen-0.5.1.crate 8243 BLAKE2B 3ce7bd89edfdd58260fb58e7b954eec503dab2562d13274f401a0af5f7e5152a660298e9884f578e361557225c67c80c0342e5c71d47aad7ec43a47ea91c617c SHA512 c3aeb752cbdbcb78cee6156b726264d182e77b3d6ac89066c366d87d8bdffc32d83e6e59a40471f07d7c827717db25fa6fb489dbd3a650f2fc252a7c85f4ecae
DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
-DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
-DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
DIST syn-1.0.75.crate 233068 BLAKE2B 8d4b5ddf1a18c59989f7664f0893265dbb6c833235afa430bf1fd224f3f542ff7385c5068a0da8841c9771ba9e93ce8974c6ae8dd0033235447d6a44488652bf SHA512 9ecda1f0cb91b4472309ad00f10eae80fdfce3c60990ec5f6510cb2ae8adb6f49e8b1d092426c5d1f0a7e9d669929330ac26a78fed227046dd1eb09a81d2e53f
DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
DIST tendril-0.4.2.crate 37138 BLAKE2B 444fd1ac19fa456075534123f73774f95f36b296afbb4b1e82a6c306971928c851dd663ab6baf09cd20f65b06e7ad46a726690df19bf00c3dddd164420b815ae SHA512 84cce485442a2e1ee6f8806a20dff038b1ff446d22ecfc9865c9ec8bcd209afe0748c7dd31f89c45cd5fd98e34abc1faf3c7a21b6d4bd5863e53d295bb700b3f
DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tokio-1.10.0.crate 509770 BLAKE2B a4cd395932a450432e2cebd8a55115e0236f8f255c44915ee68c3e286e97528ade8fa939764817cd4c7fbc9641772da80bf02ed2ea50c8e843db34b8749d8f32 SHA512 fb848dd97062c9c1e004f8e42444b43990463a815560fff2412a73cca82b4857259b52ce88b8c4542dc3a798cc85df855541e75a02f366f41c258aecf9da9bc6
-DIST tokio-macros-1.3.0.crate 7876 BLAKE2B 8541e18365182f65034f1ef7096c77186744edf5a171a2806f60c291d8475fa3722430f37936a28fb9e1d525a31e7fdfaff460d1d967e5b4ee875541f4e7581b SHA512 1ec1bc27236b76a9652595d2874d587e724207c1bbce777beeb41edcef5282cb740af28a99aee187127ec9cf824aa34a0a3983098bb355c73d7b4afd18eef1f9
+DIST tokio-1.16.1.crate 552194 BLAKE2B d6ffe82e6a0d5b5137c75b0e2867537561ccab3fb70d0a866ae3d9e67aeccf8bb047e486c004fd05547310259ff62a50ca373f1fea2f0bae354e71a7a0cd12cd SHA512 ae0d1ecb2fd733380cc9edcb7ed3c0fa2ed35e0ef9fd6e239f0eb2925cc82b5c01e0e65cc5e1c2a4274da5040d27a9e6d4a537d7530295bc9abcd08259ece0ea
+DIST tokio-macros-1.8.0.crate 9346 BLAKE2B b334eb3f221ae22ad379db2ef7e4c88e6a01a69146726287b16a958a0c17fadc69063c2e6ca3cd1dbb21e764084c9ba64cfad705b5b5d448133349a7aed69437 SHA512 3fa620db09a8e911a2896c5c671494d3f5894b4014e868374e4f1331829975b287499c2f7a7615bf26a6b9abb3815b459c1fa684a738ea153ce09cecbfa57bc2
DIST tokio-stream-0.1.7.crate 30323 BLAKE2B 53980ab6bc37662de285b4d8d7bccaea93a56f0a343f673254cdd8a32024292ccec59196e515a454b401f97e892a657ddc4d4731d2d86b87781b705f2009a2b2 SHA512 1c9a7922f7cd9bf9d9694d708aaced4c8d4deea584dd77422976f83f1935c440a9bb63152584e48142d732bdd97674ffa8ce41cfeb905ff0784b47e2670898d5
-DIST tokio-tungstenite-0.13.0.crate 30189 BLAKE2B 58069c327de8ed663425bd6b9655ff03a631a78e32196ea204ece32d6efa2b71f03d6328640d41e5355c4981ad4374491dd1610905dde226773a5b3167947dec SHA512 2f96950bb4fa474b945e3f29bdf482b4f56f898ae384428c272fc4c1bb5bd522ec0cb3691af46ffb334aa900b57ed0fd527092c81195b80fad69ab74ef33a21c
+DIST tokio-tungstenite-0.15.0.crate 28347 BLAKE2B 303b0e20d8a526749967e3f6aed7155b0b65b4e060c7b21c63e6d913b6163e36d44734cc5116f12b565757dc8394c95f84059fc5c5836d5dbb8b6ca3df688c87 SHA512 f2b3ae0a01c4dbd811b639e81dd36414357e791c8921796fc60bcfc615489ed2c240027473c50919ef680c8af77e66c684bdee0fcf604136e48136bd0634ae85
DIST tokio-util-0.6.7.crate 73201 BLAKE2B 4bed0bdc343b9fce03c12c0ab442cd7eaf3681232090547a0269bef5f362e1d96d2a10cf78708c6775234e23e8e2e00697333dc861df56136a29583d7a2401d2 SHA512 f6d81191a1caffd2cf78175bf0de3432bec684c739378072cf23daa1280b54d1781cf43d663a49b0cb34662043c1747073c97291414cf0407581325cb091b263
DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
DIST topological-sort-0.1.0.crate 8728 BLAKE2B 4ac5cd3c9da1f2825d8ab5d40b7657a8723bb498338bad8887bb69fcbeacb7d8a5ea980696db92db8769f77d2fb8dacebae2e40d8e23a9abdd7604d686b4f78d SHA512 abba534c349e0583212c3c88779c244faa4ec41c2446c134cc43e94a851878c4c08d9a6316a8723052fc5de628f7b0acfd74aab09be363b568d54ff0de1e0590
@@ -189,13 +184,12 @@ DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99c
DIST tracing-core-0.1.19.crate 50079 BLAKE2B 4eb551d147eb17d96f9248dc780ebb305c622173d98fb429fc17ee6544e30f499883973c1d7c80d322a509c69df632fd47ec6be5ed0e7fd2e04e3751d7d40252 SHA512 27db417a15eeb736b695374650994029c41a7ac50b6b7ab0a76a02aca0473be14a2d4aa0a27029071d6b864760f32977a9fb3e47144dc5f3b79fdd1a42c7bd4f
DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
-DIST tungstenite-0.12.0.crate 54287 BLAKE2B 211a39484af5a12262fc95eeacb0f68a1076956aa3e2df0f06d6a2839ceb4e096ef3919df60a2bf4ebd74eeff85a21a9242330cd1e892bff04fd3588b04da810 SHA512 d6d93b143a4e1ab6a610954f9621518f1b50e0b8d1ca019d106027bc1a9f4698bf455f3948afed1cf7c626b04f426075d9b0393922f16b8ace50aa1ccfea0474
+DIST tungstenite-0.14.0.crate 57702 BLAKE2B 552379d5f6d097eaa869266a1c2c01c02d90dad5fc9d4c0c1ce8d89891eaf1801873196f6257a02bfcc323275808a85fd923a7114bd2720d1b4d57f8a330842c SHA512 2abcfe0d7b9f6179b3afc33a016c97c7b7f2ac25dc83c7933c13bdb9499dd16a714c97526c0661714ab07281a6b7f51b3afcb5a513373cb734948f9b7c2a3de7
DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
@@ -203,7 +197,7 @@ DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae
DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
-DIST warp-0.3.1.crate 112030 BLAKE2B f04805b8387712347fbfe8ac8d1af0eb498e4a71b361ab3179235f881b68077720d378c567a164bc0d987b3b3872ce3a2ed8c8e9669fba9aaa65986de061eb5b SHA512 55f510780a10cbc31338a661292ed5dd75ff701d5b47cd1af7bc048bf8d960d512af21a0d978eab6bfd63f622464ff1e117888194caef7702ac5ec466c5603fc
+DIST warp-0.3.2.crate 113933 BLAKE2B c38aa8f2f60223352fe5844f2f23be5e0f1ec1e0a190d38b931d6f90ce1f76881a439aad16c3ea8ea6c1f646aad898a908c7ce6dcb7f71d003e3b677fee01872 SHA512 1390394d76dc95d888eec6670b668b1572502251c6e65eaa050d9717298be51799a84ef0407462337295a42116162644280f6b5bebde608f14b904312cabafac
DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
diff --git a/app-text/mdbook/mdbook-0.4.18.ebuild b/app-text/mdbook/mdbook-0.4.21.ebuild
index c10d0f673b2..e71f1fedb09 100644
--- a/app-text/mdbook/mdbook-0.4.18.ebuild
+++ b/app-text/mdbook/mdbook-0.4.21.ebuild
@@ -6,7 +6,7 @@ EAPI=8
CRATES="
aho-corasick-0.7.18
ammonia-3.1.2
- ansi_term-0.11.0
+ ansi_term-0.12.1
anyhow-1.0.43
assert_cmd-1.0.7
atty-0.2.14
@@ -29,14 +29,14 @@ CRATES="
clap_complete-3.0.4
cpufeatures-0.1.5
ctor-0.1.20
- difference-2.0.0
+ diff-0.1.12
difflib-0.4.0
digest-0.8.1
digest-0.9.0
doc-comment-0.3.3
either-1.6.1
- elasticlunr-rs-2.3.13
- env_logger-0.7.1
+ elasticlunr-rs-3.0.0
+ env_logger-0.9.0
fake-simd-0.1.2
filetime-0.2.15
float-cmp-0.9.0
@@ -47,12 +47,10 @@ CRATES="
fuchsia-zircon-0.3.3
fuchsia-zircon-sys-0.3.3
futf-0.1.4
- futures-0.3.16
- futures-channel-0.3.16
- futures-core-0.3.16
- futures-io-0.3.16
+ futures-channel-0.3.21
+ futures-core-0.3.21
futures-macro-0.3.16
- futures-sink-0.3.16
+ futures-sink-0.3.21
futures-task-0.3.16
futures-util-0.3.16
generic-array-0.12.4
@@ -66,20 +64,18 @@ CRATES="
hashbrown-0.11.2
headers-0.3.4
headers-core-0.2.0
- heck-0.3.3
hermit-abi-0.1.19
html5ever-0.25.1
http-0.2.4
http-body-0.4.3
httparse-1.5.1
httpdate-1.0.1
- humantime-1.3.0
+ humantime-2.1.0
hyper-0.14.11
idna-0.2.3
indexmap-1.7.0
inotify-0.7.1
inotify-sys-0.1.5
- input_buffer-0.4.0
iovec-0.1.4
itertools-0.10.1
itoa-0.4.8
@@ -132,12 +128,11 @@ CRATES="
predicates-2.0.1
predicates-core-1.0.2
predicates-tree-1.0.2
- pretty_assertions-0.6.1
+ pretty_assertions-1.2.1
proc-macro-hack-0.5.19
proc-macro-nested-0.1.7
proc-macro2-1.0.28
pulldown-cmark-0.9.1
- quick-error-1.2.3
quick-error-2.0.1
quote-1.0.9
rand-0.7.3
@@ -172,20 +167,20 @@ CRATES="
string_cache-0.8.1
string_cache_codegen-0.5.1
strsim-0.10.0
- strum-0.21.0
- strum_macros-0.21.1
syn-1.0.75
tempfile-3.2.0
tendril-0.4.2
termcolor-1.1.2
textwrap-0.14.2
+ thiserror-1.0.31
+ thiserror-impl-1.0.31
time-0.1.43
tinyvec-1.3.1
tinyvec_macros-0.1.0
- tokio-1.10.0
- tokio-macros-1.3.0
+ tokio-1.16.1
+ tokio-macros-1.8.0
tokio-stream-0.1.7
- tokio-tungstenite-0.13.0
+ tokio-tungstenite-0.15.0
tokio-util-0.6.7
toml-0.5.8
topological-sort-0.1.0
@@ -194,13 +189,12 @@ CRATES="
tracing-core-0.1.19
treeline-0.1.0
try-lock-0.2.3
- tungstenite-0.12.0
+ tungstenite-0.14.0
typenum-1.13.0
ucd-trie-0.1.3
unicase-2.6.0
unicode-bidi-0.3.6
unicode-normalization-0.1.19
- unicode-segmentation-1.8.0
unicode-xid-0.2.2
url-2.2.2
utf-8-0.7.6
@@ -208,7 +202,7 @@ CRATES="
wait-timeout-0.2.0
walkdir-2.3.2
want-0.3.0
- warp-0.3.1
+ warp-0.3.2
wasi-0.10.2+wasi-snapshot-preview1
wasi-0.9.0+wasi-snapshot-preview1
winapi-0.2.8
@@ -231,7 +225,7 @@ S="${WORKDIR}/${P/b/B}"
# CC-BY-4.0/OFL-1.1: embeds fonts inside the executable
LICENSE="Apache-2.0 BSD CC-BY-4.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
IUSE="doc"
QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 3d78de6e91c..b1c36c1034d 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -6,6 +6,6 @@
<name>Gentoo Shell Tools Project</name>
</maintainer>
<upstream>
- <remote-id type="github">flok99/multitail</remote-id>
+ <remote-id type="github">folkertvanheusden/multitail</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 5c05a175105..71a4a94d384 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,3 +1,4 @@
DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
+DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
new file mode 100644
index 00000000000..a5cb30e3b74
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
@@ -0,0 +1,69 @@
+From d98de0bb0b627772625c1acf050ba0dd4b5ac9df Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Tue, 5 Jul 2022 11:35:28 +0200
+Subject: [PATCH] Perform type punning via union without undefined behavior
+
+* The previous code from c3d7f491e2daebda2413fb3d2935c51df1c50ac7
+ still contains undefined behavior, since it just creates
+ temporary pointer variables.
+---
+ src/cmsplugin.c | 31 +++++++++++++++----------------
+ 1 file changed, 15 insertions(+), 16 deletions(-)
+
+This patch slightly differs from the upstream commit, because
+the lcms2 version used in mupdf is slightly behind the upstream
+version.
+
+See: https://github.com/mm2/Little-CMS/commit/d98de0bb0b627772625c1acf050ba0dd4b5ac9df.patch
+
+diff --git a/src/cmsplugin.c b/src/cmsplugin.c
+index 556fbc28..b34e3aab 100644
+--- a/thirdparty/lcms2/src/cmsplugin.c
++++ b/thirdparty/lcms2/src/cmsplugin.c
+@@ -167,17 +167,20 @@ cmsBool CMSEXPORT _cmsReadUInt32Number(cmsContext ContextID, cmsIOHANDLER* io,
+
+ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number* n)
+ {
+- cmsUInt32Number tmp;
++ union typeConverter {
++ cmsUInt32Number integer;
++ cmsFloat32Number floating_point;
++ } tmp;
+
+ _cmsAssert(io != NULL);
+
+- if (io->Read(ContextID, io, &tmp, sizeof(cmsUInt32Number), 1) != 1)
++ if (io->Read(ContextID, io, &tmp.integer, sizeof(cmsUInt32Number), 1) != 1)
+ return FALSE;
+
+ if (n != NULL) {
+
+- tmp = _cmsAdjustEndianess32(tmp);
+- *n = *(cmsFloat32Number*)(void*)&tmp;
++ tmp.integer = _cmsAdjustEndianess32(tmp.integer);
++ *n = tmp.floating_point;
+
+ // Safeguard which covers against absurd values
+ if (*n > 1E+20 || *n < -1E+20) return FALSE;
+@@ -304,13 +307,14 @@ cmsBool CMSEXPORT _cmsWriteUInt32Number(cmsContext ContextID, cmsIOHANDLER* io,
+
+ cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io, cmsFloat32Number n)
+ {
+- cmsUInt32Number tmp;
+-
+- _cmsAssert(io != NULL);
+-
+- tmp = *(cmsUInt32Number*) (void*) &n;
+- tmp = _cmsAdjustEndianess32(tmp);
+- if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1)
++ union typeConverter {
++ cmsUInt32Number integer;
++ cmsFloat32Number floating_point;
++ } tmp;
++
++ tmp.floating_point = n;
++ tmp.integer = _cmsAdjustEndianess32(tmp.integer);
++ if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp.integer) != 1)
+ return FALSE;
+
+ return TRUE;
diff --git a/app-text/mupdf/mupdf-1.19.1.ebuild b/app-text/mupdf/mupdf-1.19.1.ebuild
index 6fb20816830..f2daed4e128 100644
--- a/app-text/mupdf/mupdf-1.19.1.ebuild
+++ b/app-text/mupdf/mupdf-1.19.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P}-source
LICENSE="AGPL-3"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
IUSE="+javascript opengl ssl X"
REQUIRED_USE="opengl? ( javascript )"
diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild
new file mode 100644
index 00000000000..c541f96f9cd
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please check upstream git regularly for relevant security-related commits
+# to backport.
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
+IUSE="+javascript opengl ssl X"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+RDEPEND="
+ dev-libs/gumbo
+ media-libs/freetype:2=
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ >=media-libs/libjpeg-turbo-1.5.3-r2:0
+ javascript? ( >=dev-lang/mujs-1.0.7:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? ( >=dev-libs/openssl-1.1:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="X? ( x11-base/xorg-proto )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.19.0-Makefile.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ "${FILESDIR}"/${PN}-1.19.0-darwin.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+ "${FILESDIR}"/${P}-lcms2.patch
+)
+
+src_prepare() {
+ default
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+ # Adjust MuPDF version in .pc file created by the
+ # mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+ sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+ -i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ #
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ local myemakeargs=(
+ GENTOO_PV=${PV}
+ HAVE_GLUT=$(usex opengl)
+ HAVE_LIBCRYPTO=$(usex ssl)
+ HAVE_X11=$(usex X)
+ USE_SYSTEM_LIBS=yes
+ USE_SYSTEM_MUJS=$(usex javascript)
+ USE_SYSTEM_GLUT=no
+ HAVE_OBJCOPY=no
+ "$@"
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ _emake XCFLAGS="-fPIC"
+}
+
+src_install() {
+ if use opengl || use X ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
+ fi
+
+ sed -i \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mythes/mythes-1.2.4-r1.ebuild b/app-text/mythes/mythes-1.2.4-r1.ebuild
index bd7896cb0b5..2feaec8566c 100644
--- a/app-text/mythes/mythes-1.2.4-r1.ebuild
+++ b/app-text/mythes/mythes-1.2.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="app-text/hunspell"
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 4a4c9bff949..a9821cff84a 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1,8 +1 @@
-DIST nuspell-3.1.2.tar.gz 379029 BLAKE2B 80f773ffdcbfbeee0dd13cd325bb4fec5efa5b54ece92ac1589c418aab46c925419e9e1bc7e257a8320e24399f49bb867600679e34a5e40070b01a660578c92c SHA512 ed5206cb9ffa7e4ec6843988a75627d4ae7d5170444b6e7bd3496c1bf61c25412c4e68864800f2ad238d014b4e50d25282f367de2900f8a230f3ecc9ae5772be
-DIST nuspell-4.0.0.tar.gz 379136 BLAKE2B 90aebe8318cd28240dfb7c1b034b2c045ac208c6d25344a3f2fc2f1a38995a1d6f81e70399c644c70255fbbb30f61e340808d1a71dfccab1726f89b742cf7b65 SHA512 2b08e30c4ac91a243c74f21eaf4a8d55d8b1c834e0f293fea76a9f02660f2ee89fe4d4071b1b9ed97b8c1db80b0645c71f8746738d97fc3ae779a65dc1583d3b
-DIST nuspell-4.0.1.tar.gz 379342 BLAKE2B be52797ddd737c523a6141fc1c2683690cfcd1aa09e6548d7eed593ab023d2b45d3538f2a9964a7c2b4abc6506c67058cdc2479ec12ae5438ffe9faa00f0680c SHA512 122616fd24c2de35000ba12d680d3617e7fe97881d33febbcb106ce70d3bac356a00d90680a1bc8ee631ed532ace0f4b4f9fce4760a25b0f7fc1d60553e74528
-DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e66532150614dd3463eda95ab421094e6c0485396b7ef1dd4b7fc03cadf10316d9cfdb1390b2769ddcc963d8b3 SHA512 d0c01dd73fefd8b9c800e6419fe916e55a53b8b19f5848d3766cdcb50383fdcd9e9bb49362b5cea4d9d2d7fda21aed055f28cb47b006e2049b2a904355f7f9ed
-DIST nuspell-4.2.0.tar.gz 382635 BLAKE2B cc141e764ce4e649a7a10f213c392973eb98eb21adddc7d2cd46c01f3cc9a6c85432bfb13ce178fba387a01aa1661e7c9b6a4717fca18fb3bfa220732daf53eb SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d
-DIST nuspell-5.0.0.tar.gz 372940 BLAKE2B 67e3b9b73f79d39c7cdb371ae7699fdaf8323db15dacd17907642f3d799eeb3e3303678d4a9ee4c5a88a5f61d7f1778745590fbac880625dc08c78e94752da6b SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5
-DIST nuspell-5.0.1.tar.gz 372917 BLAKE2B 30743620035fa49b9d2d190673de1b3de4be0978633eeead1775586c5ab4f0912e4f778867b5839105d1b4f4597e8a2ece33ddbb3290b6447755bfe4a742ea5c SHA512 f883d8c8a3a722a62d411d7b0973dd409c6d09d08ea678c577cef68ec8b5c7e4a4e4cb8a1323e632114414fc17137d1add996a72fbd522ab4de8c6f70fc77073
DIST nuspell-5.1.0.tar.gz 370368 BLAKE2B 67338fe79ddb98267e0c1efc575e47fc1a8f894cd09b6ada6c6a3f5e89b02fe3a81686b1ff1af73e28fd86437d0f115e04fd5f5aea1954c3da4414f25325ec46 SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a
diff --git a/app-text/nuspell/nuspell-3.1.2-r1.ebuild b/app-text/nuspell/nuspell-3.1.2-r1.ebuild
deleted file mode 100644
index f0fd181ee33..00000000000
--- a/app-text/nuspell/nuspell-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/3" # due to libnuspell.so.3
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-libs/icu"
-DEPEND="${RDEPEND}
- test? ( >=dev-cpp/catch-2.3.0:0 )
- >=dev-libs/boost-1.62[icu,nls]"
-BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/nuspell/nuspell-4.0.0-r1.ebuild b/app-text/nuspell/nuspell-4.0.0-r1.ebuild
deleted file mode 100644
index fa2f0d78afd..00000000000
--- a/app-text/nuspell/nuspell-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/4" # due to libnuspell.so.4
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-libs/icu"
-DEPEND="${RDEPEND}
- test? ( >=dev-cpp/catch-2.3.0:0 )
- >=dev-libs/boost-1.62[icu,nls]"
-BDEPEND="doc? ( || ( app-text/ronn-ng app-text/ronn ) )"
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/nuspell/nuspell-4.0.1.ebuild b/app-text/nuspell/nuspell-4.0.1.ebuild
deleted file mode 100644
index f38131dbab5..00000000000
--- a/app-text/nuspell/nuspell-4.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/4" # due to libnuspell.so.4
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-libs/icu"
-DEPEND="${RDEPEND}
- doc? ( app-text/pandoc )
- test? ( >=dev-cpp/catch-2.3.0:0 )
- >=dev-libs/boost-1.62[icu,nls]"
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/nuspell/nuspell-4.1.0.ebuild b/app-text/nuspell/nuspell-4.1.0.ebuild
deleted file mode 100644
index f38131dbab5..00000000000
--- a/app-text/nuspell/nuspell-4.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/4" # due to libnuspell.so.4
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-libs/icu"
-DEPEND="${RDEPEND}
- doc? ( app-text/pandoc )
- test? ( >=dev-cpp/catch-2.3.0:0 )
- >=dev-libs/boost-1.62[icu,nls]"
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/nuspell/nuspell-4.2.0.ebuild b/app-text/nuspell/nuspell-4.2.0.ebuild
deleted file mode 100644
index fa0c2f91518..00000000000
--- a/app-text/nuspell/nuspell-4.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/4" # due to libnuspell.so.4
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-libs/icu"
-DEPEND="${RDEPEND}
- doc? ( app-text/pandoc )
- test? ( >=dev-cpp/catch-2.3.0:0 )
- "
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/nuspell/nuspell-5.0.0.ebuild b/app-text/nuspell/nuspell-5.0.0.ebuild
deleted file mode 100644
index f23bbc3b51b..00000000000
--- a/app-text/nuspell/nuspell-5.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/5" # due to libnuspell.so.5
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/icu-59"
-DEPEND="${RDEPEND}
- doc? ( app-text/pandoc )
- test? ( >=dev-cpp/catch-2.3.0:0 )
- "
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/nuspell/nuspell-5.0.1.ebuild b/app-text/nuspell/nuspell-5.0.1.ebuild
deleted file mode 100644
index 5645809c40f..00000000000
--- a/app-text/nuspell/nuspell-5.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Spell checker library and CLI for complex natural languages"
-HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
-SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/5" # due to libnuspell.so.5
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/icu-60"
-DEPEND="${RDEPEND}
- doc? ( app-text/pandoc )
- test? ( >=dev-cpp/catch-2.3.0:0 )
- "
-
-DOCS=( CHANGELOG.md )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- rm -R external/Catch2/ || die
- if ! use test ; then
- rm -R external/hunspell/ || die
- fi
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- einfo
- einfo 'Nuspell needs language packs and/or dictionaries to be of use'
- einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
- einfo
- einfo 'Besides MySpell dictionaries, for other options please'
- einfo 'see https://nuspell.github.io/#languages-and-users .'
- einfo
-}
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 714fa4e9060..96d2e3aa85c 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -1,2 +1,4 @@
DIST pandoc-2.18-linux-amd64.tar.gz 16713899 BLAKE2B 89f2166fb93793c07af9d3ddff56767e4072500b80cd462a498f5534fdbfba974fa517fa05c3bfeaf44179cd23b6d53fc5daed5916f18fce13df4486040610ca SHA512 ec0285e9a1640e7594d5bdca3fcdc738b2139e20f4a4f75b0f49ff76d2d2f5a0e8b90912e63a93e787c57f18eb3d155f214f088e55b435ef03acb8cfbf92272b
DIST pandoc-2.18-linux-arm64.tar.gz 18522530 BLAKE2B 84e2479a77c12ace90a93ed9b66be2abdec357e0b4338143db8a9318cd48e76852d9fc12ceb8bd795860412a2e98d11a4d1e54bf74bdf68494c699fd5878c818 SHA512 e2be1473edeba12996a9eb7af3fe7dfd860adb1054446d2b93db6d712708282424628b14fea8809dba903e93daa1626a0dc3e1304af33b77e9da298c8fd7885b
+DIST pandoc-2.19-linux-amd64.tar.gz 16807538 BLAKE2B f92ca873d3f048768ecf39533c60157db59ed3c0b1849b7bfe8093f1590a076bd36f3fda81800527d1ec03b2387564e4bd37e35fd991a356d3caa33afb3de30a SHA512 8ad0b0a790681d2665866d8ecd6b04a5b0944e88ff6c202e4b44c0dc0ad27f45ab24136641dbcb03e10953fcaa833020125b0e08f12e3a18e014dab32934f67e
+DIST pandoc-2.19-linux-arm64.tar.gz 18631015 BLAKE2B 5e4ca9f33a10dd98c3e95798f073d2527d6aebe8a12af2d24fb93346a5ef5c6e567d3fb1b26a222a4f252efc77d874233ad4eb0c26a2b7185b4593541235d583 SHA512 f16c8114e2551203e603285f4ab27a1343516acaad622b672d617ce15b3fb108fe4e9a5926ba1d70545bdba8822291a94f4b65ff228a89bf7262286c80eb887c
diff --git a/app-text/pandoc-bin/pandoc-bin-2.19.ebuild b/app-text/pandoc-bin/pandoc-bin-2.19.ebuild
new file mode 100644
index 00000000000..13a2ca15776
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+ amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+ arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64" # Upstream provides only AMD and ARM 64-bit binaries
+IUSE="+pandoc-symlink"
+
+RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+ default
+
+ # Manpages are gzipped
+ unpack "${S}"/share/man/man1/${MY_PN}.1.gz
+}
+
+src_install() {
+ newbin bin/${MY_PN} ${PN}
+ newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+ if use pandoc-symlink ; then
+ dosym ${PN} /usr/bin/${MY_PN}
+ dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+ fi
+}
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 6062b60a805..983aabbbc38 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,3 +1 @@
-DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
-DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
-DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
+DIST pandoc-2.18.tar.gz 7251114 BLAKE2B 90413c0c2061f52cfdf2e8b50aa376605a3872e357baa951d327560094638d1f0dadd9f77e4b8ff5beadaf79330dd91e23fdbee490df8d1b6a6224b8abd9086f SHA512 0e8210a37dda6818b23b9fac25b73b240d67f8e03c41d1f3a776dcf95d7fdf48354a25c08ad64eea069003f4ab7a3167ee9c3e80d4f6684ad6ec33d8c477d212
diff --git a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch b/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
deleted file mode 100644
index 1a0dacce99b..00000000000
--- a/app-text/pandoc/files/pandoc-2.13-trypandoc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/785268
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -729,7 +729,7 @@ executable trypandoc
- main-is: trypandoc.hs
- hs-source-dirs: trypandoc
- if flag(trypandoc)
-- build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24
-+ build-depends: aeson, http-types, wai >= 0.3, wai-extra >= 3.0.24, text
- buildable: True
- else
- buildable: False
diff --git a/app-text/pandoc/files/pandoc-2.18-tests.patch b/app-text/pandoc/files/pandoc-2.18-tests.patch
new file mode 100644
index 00000000000..6cf30a7c9bc
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-2.18-tests.patch
@@ -0,0 +1,79 @@
+From 9aff86143e12e22cec152fd08ec8b68ee75ccafa Mon Sep 17 00:00:00 2001
+From: John MacFarlane <jgm@berkeley.edu>
+Date: Tue, 31 May 2022 19:49:27 -0700
+Subject: [PATCH] Require skylighting 0.12.3.1 and update tests.
+
+---
+ pandoc.cabal | 4 ++--
+ stack.yaml | 4 ++--
+ test/lhs-test.html | 4 ++--
+ test/lhs-test.html+lhs | 4 ++--
+ test/lhs-test.latex | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/test/lhs-test.html b/test/lhs-test.html
+index 754b25e1f570..85e5d785d14a 100644
+--- a/test/lhs-test.html
++++ b/test/lhs-test.html
+@@ -190,7 +190,7 @@
+ code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+ code span.at { color: #7d9029; } /* Attribute */
+ code span.bn { color: #40a070; } /* BaseN */
+- code span.bu { } /* BuiltIn */
++ code span.bu { color: #008000; } /* BuiltIn */
+ code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+ code span.ch { color: #4070a0; } /* Char */
+ code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+ code span.ex { } /* Extension */
+ code span.fl { color: #40a070; } /* Float */
+ code span.fu { color: #06287e; } /* Function */
+- code span.im { } /* Import */
++ code span.im { color: #008000; font-weight: bold; } /* Import */
+ code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+ code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+ code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
+index 7198397d8f45..32e0baf4d7e2 100644
+--- a/test/lhs-test.html+lhs
++++ b/test/lhs-test.html+lhs
+@@ -190,7 +190,7 @@
+ code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+ code span.at { color: #7d9029; } /* Attribute */
+ code span.bn { color: #40a070; } /* BaseN */
+- code span.bu { } /* BuiltIn */
++ code span.bu { color: #008000; } /* BuiltIn */
+ code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+ code span.ch { color: #4070a0; } /* Char */
+ code span.cn { color: #880000; } /* Constant */
+@@ -203,7 +203,7 @@
+ code span.ex { } /* Extension */
+ code span.fl { color: #40a070; } /* Float */
+ code span.fu { color: #06287e; } /* Function */
+- code span.im { } /* Import */
++ code span.im { color: #008000; font-weight: bold; } /* Import */
+ code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+ code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+ code span.op { color: #666666; } /* Operator */
+diff --git a/test/lhs-test.latex b/test/lhs-test.latex
+index 49521d3c1522..435d1dfefb07 100644
+--- a/test/lhs-test.latex
++++ b/test/lhs-test.latex
+@@ -44,7 +44,7 @@
+ \newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
+ \newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+-\newcommand{\BuiltInTok}[1]{#1}
++\newcommand{\BuiltInTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{#1}}
+ \newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
+ \newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
+ \newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+@@ -57,7 +57,7 @@
+ \newcommand{\ExtensionTok}[1]{#1}
+ \newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+ \newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
+-\newcommand{\ImportTok}[1]{#1}
++\newcommand{\ImportTok}[1]{\textcolor[rgb]{0.00,0.50,0.00}{\textbf{#1}}}
+ \newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+ \newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
+ \newcommand{\NormalTok}[1]{#1}
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 8f389f32b1c..76ff98a64e2 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -16,7 +16,6 @@
</longdescription>
<use>
<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
- <flag name="optimize">Enable -O1 optimizations (requires ~16GiB memory)</flag>
<flag name="trypandoc">Build trypandoc cgi executable.</flag>
</use>
</pkgmetadata>
diff --git a/app-text/pandoc/pandoc-2.11.3.1.ebuild b/app-text/pandoc/pandoc-2.11.3.1.ebuild
deleted file mode 100644
index d51982085be..00000000000
--- a/app-text/pandoc/pandoc-2.11.3.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -static
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files optimize trypandoc"
-
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base-compat-0.9:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.2:=[profile?]
- >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/citeproc-0.3.0.1:=[profile?] <dev-haskell/citeproc-0.4:=[profile?]
- >=dev-haskell/commonmark-0.1.1.2:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
- >=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
- >=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
- >=dev-haskell/connection-0.3.1:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?]
- >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
- >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
- >=dev-haskell/haddock-library-1.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
- >=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
- >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
- >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
- >=dev-haskell/jira-wiki-markup-1.3.2:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/skylighting-0.10.2:=[profile?] <dev-haskell/skylighting-0.11:=[profile?]
- >=dev-haskell/skylighting-core-0.10.2:=[profile?] <dev-haskell/skylighting-core-0.11:=[profile?]
- >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- >=dev-haskell/texmath-0.12.0.2:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
- >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2
- test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
- >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
- >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
- # optimisations require ~16GB of memory on ghc-8.8.3
- use optimize || HCFLAGS+=' -O0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed-data-files embed_data_files) \
- --flag=-static \
- $(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
- haskell-cabal_src_install
-
- doman "${S}/man/${PN}.1"
-}
diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.18-r2.ebuild
index f0ae5e9a824..1e73bcd0c28 100644
--- a/app-text/pandoc/pandoc-2.13.ebuild
+++ b/app-text/pandoc/pandoc-2.18-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -static
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -static,-lua53
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -16,101 +16,90 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files optimize trypandoc"
+IUSE="embed-data-files trypandoc"
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
- >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+ >=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+ >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/citeproc-0.3.0.9:=[profile?] <dev-haskell/citeproc-0.3.1:=[profile?]
- >=dev-haskell/commonmark-0.1.1.3:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
- >=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
- >=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
+ >=dev-haskell/citeproc-0.7:=[profile?] <dev-haskell/citeproc-0.8:=[profile?]
+ >=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+ >=dev-haskell/commonmark-extensions-0.2.3.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+ >=dev-haskell/commonmark-pandoc-0.2.1.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
>=dev-haskell/connection-0.3.1:=[profile?]
>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doclayout-0.3.0.1:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?]
+ >=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+ >=dev-haskell/doctemplates-0.10:=[profile?] <dev-haskell/doctemplates-0.11:=[profile?]
>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
- >=dev-haskell/haddock-library-1.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
- >=dev-haskell/hslua-module-path-0.1.0:=[profile?] <dev-haskell/hslua-module-path-0.2.0:=[profile?]
- >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
- >=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+ >=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.11:=[profile?]
+ >=dev-haskell/hslua-module-doclayout-1.0.4:=[profile?] <dev-haskell/hslua-module-doclayout-1.1:=[profile?]
+ >=dev-haskell/hslua-module-path-1.0:=[profile?] <dev-haskell/hslua-module-path-1.1:=[profile?]
+ >=dev-haskell/hslua-module-system-1.0:=[profile?] <dev-haskell/hslua-module-system-1.1:=[profile?]
+ >=dev-haskell/hslua-module-text-1.0:=[profile?] <dev-haskell/hslua-module-text-1.1:=[profile?]
+ >=dev-haskell/hslua-module-version-1.0:=[profile?] <dev-haskell/hslua-module-version-1.1:=[profile?]
>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
- >=dev-haskell/jira-wiki-markup-1.3.4:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?]
+ >=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?]
+ >=dev-haskell/jira-wiki-markup-1.4:=[profile?] <dev-haskell/jira-wiki-markup-1.5:=[profile?]
>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ >=dev-haskell/lpeg-1.0.1:=[profile?] <dev-haskell/lpeg-1.1:=[profile?]
>=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+ >=dev-haskell/pandoc-lua-marshal-0.1.5:=[profile?] <dev-haskell/pandoc-lua-marshal-0.2:=[profile?]
+ >=dev-haskell/pandoc-types-1.22.2:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+ >=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
>=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?]
>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/skylighting-0.10.5:=[profile?] <dev-haskell/skylighting-0.10.6:=[profile?]
- >=dev-haskell/skylighting-core-0.10.5:=[profile?] <dev-haskell/skylighting-core-0.10.6:=[profile?]
+ >=dev-haskell/skylighting-0.12.3.1:=[profile?] <dev-haskell/skylighting-0.13:=[profile?]
+ >=dev-haskell/skylighting-core-0.12.3.1:=[profile?] <dev-haskell/skylighting-core-0.13:=[profile?]
>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- >=dev-haskell/texmath-0.12.2:=[profile?] <dev-haskell/texmath-0.12.3:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-haskell/texmath-0.12.5:=[profile?] <dev-haskell/texmath-0.12.6:=[profile?]
>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
- >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+ >=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+ >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?]
>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/xml-conduit-1.7:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+ >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+ >=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-8.4.3:=
+ >=dev-lang/ghc-8.10.1:=
+ >=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.3:=[profile?]
trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
>=dev-haskell/wai-extra-3.0.24:=[profile?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2.0.1
+ >=dev-haskell/cabal-3.2.0.0
test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
+ >=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1
>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
"
-PATCHES=("${FILESDIR}"/${P}-trypandoc.patch)
-
-src_prepare() {
- default
- # optimisations require ~16GB of memory on ghc-8.8.3
- use optimize || HCFLAGS+=' -O0'
-}
+PATCHES=("${FILESDIR}"/${P}-tests.patch )
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag embed-data-files embed_data_files) \
+ --flag=-lua53 \
--flag=-static \
$(cabal_flag trypandoc trypandoc)
}
src_install() {
haskell-cabal_src_install
-
doman "${S}/man/${PN}.1"
}
diff --git a/app-text/pandoc/pandoc-2.9.2.1.ebuild b/app-text/pandoc/pandoc-2.9.2.1.ebuild
deleted file mode 100644
index 878536e561c..00000000000
--- a/app-text/pandoc/pandoc-2.9.2.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="https://pandoc.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="embed-data-files optimize static trypandoc"
-# test failure: error while loading shared libraries:
-# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
-# cannot open shared object file: No such file or directory
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
- >=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
- >=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base-compat-0.9:=[profile?]
- >=dev-haskell/base-noprelude-4.9:=[profile?] <dev-haskell/base-noprelude-5:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
- >=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
- >=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
- >=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
- >=dev-haskell/cmark-gfm-0.2:=[profile?] <dev-haskell/cmark-gfm-0.3:=[profile?]
- >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
- >=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
- >=dev-haskell/doctemplates-0.8:=[profile?] <dev-haskell/doctemplates-0.9:=[profile?]
- >=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
- >=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
- >=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
- >=dev-haskell/haddock-library-1.7:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
- >=dev-haskell/hslua-1.0.1:=[profile?] <dev-haskell/hslua-1.1:=[profile?]
- >=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
- >=dev-haskell/hslua-module-text-0.2:=[profile?] <dev-haskell/hslua-module-text-0.3:=[profile?]
- >=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
- >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
- >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
- >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
- >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
- >=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
- >=dev-haskell/jira-wiki-markup-1.1.3:=[profile?] <dev-haskell/jira-wiki-markup-1.2:=[profile?]
- >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
- >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
- >=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
- >=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
- >=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
- >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
- >=dev-haskell/skylighting-0.8.3.2:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
- >=dev-haskell/skylighting-core-0.8.3.2:=[profile?] <dev-haskell/skylighting-core-0.9:=[profile?]
- >=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
- >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
- >=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
- >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- >=dev-haskell/texmath-0.12.0.1:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
- >=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
- >=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
- >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
- >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
- >=dev-lang/ghc-8.0.1:=
- embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
- trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
- dev-haskell/wai-extra:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.0
- test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
- >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
- >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
- >=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.3
- >=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
- >=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
- >=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
- >=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
- default
- # optimisations require ~16GB of memory on ghc-8.8.3
- use optimize || HCFLAGS+=' -O0'
- cabal_chdeps \
- 'haddock-library >= 1.8 && < 1.9' 'haddock-library >= 1.7'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed-data-files embed_data_files) \
- $(cabal_flag static static) \
- $(cabal_flag trypandoc trypandoc)
-}
-
-src_install() {
- haskell-cabal_src_install
-
- doman "${S}/man/${PN}.1"
-}
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
index 03be19a641d..820e83331f3 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
@@ -30,3 +30,4 @@ RDEPEND="app-text/poppler[introspection]
dev-python/whoosh[${PYTHON_USEDEP}]
sci-libs/scikit-learn[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
+distutils_enable_tests unittest
diff --git a/app-text/paperwork/paperwork-2.1.0.ebuild b/app-text/paperwork/paperwork-2.1.0.ebuild
index 4167c0385cf..344a70f2974 100644
--- a/app-text/paperwork/paperwork-2.1.0.ebuild
+++ b/app-text/paperwork/paperwork-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -34,9 +34,10 @@ python_install_all() {
distutils-r1_python_install_all
# This queries tesseract languages and will fail sandbox with
- # USE=opencl, bugs #793446 #830012
- addpredict /dev/nvidiactl
+ # USE=opencl, bugs #793446 #830012 #852134
+ addpredict /dev/dri/renderD128
addpredict /dev/kfd
+ addpredict /dev/nvidiactl
PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
--icon_base_dir="${ED}"/usr/share/icons \
diff --git a/app-text/paperwork/paperwork-2.1.1.ebuild b/app-text/paperwork/paperwork-2.1.1.ebuild
index 27169a2d1a1..5fb6e834f6a 100644
--- a/app-text/paperwork/paperwork-2.1.1.ebuild
+++ b/app-text/paperwork/paperwork-2.1.1.ebuild
@@ -33,9 +33,10 @@ python_install_all() {
distutils-r1_python_install_all
# This queries tesseract languages and will fail sandbox with
- # USE=opencl, bugs #793446 #830012
- addpredict /dev/nvidiactl
+ # USE=opencl, bugs #793446 #830012 #852134
+ addpredict /dev/dri/renderD128
addpredict /dev/kfd
+ addpredict /dev/nvidiactl
PYTHONPATH="src" "${EPYTHON}" src/paperwork_gtk/main.py install \
--icon_base_dir="${ED}"/usr/share/icons \
diff --git a/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
new file mode 100644
index 00000000000..ee7245c03fa
--- /dev/null
+++ b/app-text/pastebinit/files/pastebinit-1.5.1-distro.patch
@@ -0,0 +1,13 @@
+Fix DeprecationWarning
+--- a/pastebinit
++++ b/pastebinit
+@@ -32,8 +32,7 @@
+ # Now try to override it with a distributor pastebin
+ try:
+ import distro
+- release = distro.linux_distribution(
+- full_distribution_name=False)[0].lower()
++ release = distro.id()
+ if release == 'debian':
+ defaultPB = "paste.debian.net"
+ elif release == 'fedora':
diff --git a/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
new file mode 100644
index 00000000000..7eabfda86fb
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.5.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit optfeature python-single-r1
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
+HOMEPAGE="https://launchpad.net/pastebinit"
+SRC_URI="mirror://ubuntu/pool/main/p/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/configobj[${PYTHON_USEDEP}]
+ ')
+"
+BDEPEND="
+ sys-devel/gettext
+ man? (
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-distro.patch )
+
+src_prepare() {
+ default
+ python_fix_shebang "${S}"/${PN}
+}
+
+src_compile() {
+ emake -C po
+
+ if use man; then
+ ebegin "Generating a manpage with xsltproc"
+ xsltproc --nonet \
+ "${BROOT}"/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+ pastebinit.xml
+ eend $?
+ fi
+}
+
+src_install() {
+ dobin pastebinit utils/pbput
+ dosym pbput /usr/bin/pbget
+ dosym pbput /usr/bin/pbputs
+
+ einstalldocs
+ doman utils/*.1
+ use man && doman pastebinit.1
+
+ insinto /usr/share/locale
+ doins -r po/mo/*
+
+ insinto /usr/share
+ doins -r pastebin.d
+}
+
+pkg_postinst() {
+ optfeature "identification of your distribution" dev-python/distro
+ optfeature "pbput and pbputs scripts" app-arch/xz-utils
+ optfeature "pbget and pbputs scripts" app-crypt/gnupg
+}
diff --git a/app-text/pastebinit/pastebinit-1.5.1.ebuild b/app-text/pastebinit/pastebinit-1.5.1.ebuild
index 550104a796b..2813fc45c49 100644
--- a/app-text/pastebinit/pastebinit-1.5.1.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="xml"
inherit python-single-r1
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index a7d27c20e52..fcea8993d2b 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -9,6 +9,6 @@
<flag name="unac">Removing accents and ligatures before search</flag>
</use>
<upstream>
- <remote-id type="gitlab">pdfgrep</remote-id>
+ <remote-id type="gitlab">pdfgrep/pdfgrep</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-text/pdfminer/pdfminer-20220506.ebuild b/app-text/pdfminer/pdfminer-20220506.ebuild
index 6be430cfc7c..f5ac8b47540 100644
--- a/app-text/pdfminer/pdfminer-20220506.ebuild
+++ b/app-text/pdfminer/pdfminer-20220506.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc examples"
RDEPEND=">=dev-python/charset_normalizer-2.0.0[${PYTHON_USEDEP}]
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index a900cf6df05..2ea92663222 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,2 +1,2 @@
-DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
DIST pelican-4.7.2.tar.gz 1401737 BLAKE2B c277844c0c153f71aae051dd8897e9abf8fd1ddc7c49251aaa7b85b7324a85da0ded74e8328a4b64ec79b8e6b4e143d5496b8535900c8a88bfa6198489c0a80c SHA512 9fbf2ecb3c193e976e01a4d095095ac55d56fe45aa24467d91635bbecb9df933ccabd6a456e14c6ee14ce0a845820be8d887917af314e13c7a3eb830cb0ce7e6
+DIST pelican-4.8.0.gh.tar.gz 1401791 BLAKE2B 889c9054659c9f98cca571fa0f3ea9ee7752aa65c3feb71278570bad74095f521d3838aa1a32dc3ae331ba86149cdd10be9c31c7ed5bc6e06348edf3eb3bb081 SHA512 2e94eb88a836bcb430026463c0e7e906b7f065507e0d873b6e0fc980e271e6a8f2e62b22af4b61c963d90ef61d57787de20656fe7497b0ae14e93eff2d364f3b
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
index 7b14026889d..fd35483237c 100644
--- a/app-text/pelican/metadata.xml
+++ b/app-text/pelican/metadata.xml
@@ -2,6 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <stabilize-allarches/>
<upstream>
<remote-id type="pypi">pelican</remote-id>
<remote-id type="github">getpelican/pelican</remote-id>
diff --git a/app-text/pelican/pelican-4.5.3.ebuild b/app-text/pelican/pelican-4.5.3.ebuild
deleted file mode 100644
index 65a8c28e825..00000000000
--- a/app-text/pelican/pelican-4.5.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples markdown"
-
-RESTRICT="test"
-RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- >=dev-python/six-1.4[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
-DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst )
-
-distutils_enable_tests nose
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
- fi
- distutils-r1_python_install_all
-}
diff --git a/app-text/pelican/pelican-4.7.2-r1.ebuild b/app-text/pelican/pelican-4.7.2-r1.ebuild
index 368acba99bd..eabb1d350c9 100644
--- a/app-text/pelican/pelican-4.7.2-r1.ebuild
+++ b/app-text/pelican/pelican-4.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
IUSE="doc examples markdown"
RESTRICT="test"
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-4.8.0.ebuild
index aa9807867aa..ea0e121101a 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-4.8.0.ebuild
@@ -1,23 +1,22 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 optfeature
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE="doc examples markdown"
-RESTRICT="test"
RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
>=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
@@ -29,11 +28,24 @@ RDEPEND=">=dev-python/docutils-0.16[${PYTHON_USEDEP}]
>=dev-python/unidecode-1.1[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
markdown? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
-BDEPEND="test? ( >=dev-python/markdown-3.1[${PYTHON_USEDEP}] )"
+BDEPEND="
+ test? (
+ >=dev-python/markdown-3.1[${PYTHON_USEDEP}]
+ dev-python/typogrify[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )"
DOCS=( README.rst )
-distutils_enable_tests nose
+EPYTEST_DESELECT=(
+ # Needs investigation, we weren't running tests at all before
+ pelican/tests/test_testsuite.py::TestSuiteTest::test_error_on_warning
+ pelican/tests/test_pelican.py::TestPelican::test_basic_generation_works
+ pelican/tests/test_pelican.py::TestPelican::test_custom_generation_works
+)
+
+distutils_enable_tests pytest
python_compile_all() {
use doc && emake -C docs html
@@ -41,10 +53,16 @@ python_compile_all() {
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
+
if use examples; then
- insinto "/usr/share/doc/${PF}"
- docompress -x "/usr/share/doc/${PF}/samples"
- doins -r samples
+ docinto /usr/share/doc/${PF}
+ docompress -x /usr/share/doc/${PF}/samples
+ dodoc -r samples
fi
+
distutils-r1_python_install_all
}
+
+pkg_postinst() {
+ optfeature "Typographical enhancements (alternative to markdown)" dev-python/typogrify
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 1df54b9b984..dac96558d3d 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,4 +1,4 @@
DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
-DIST po4a-0.65.tar.gz 4152612 BLAKE2B 81d330f234cae10f228b5de7e8417f79d7008f827faf676a68c83b05044a2198c1c03f8d19d8bbbfdb71a83cb93abc319e7e6ac5ce57704294d0f3b858bb9b56 SHA512 eea2ddc1344d371ee685e73dc3c3b1b58d24f8bae7edbe7f2112bfead1c481c6796d02c5f7d9fc9bbac57bd93c4194ade51368bb8b29ba62aee333a7afa2e7e6
DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c2d33252d6ae08a00fddfa8aaa6e9c652f764ae46bf14fea3bcd1093f923fcbf08d96e97296954199e9b900 SHA512 f72e1267cbd6ced01ecc362c327b1634c47dff15398b48644548d28e01ba91108d5626e6d4abcfcb360697e4c0affa3228c6993653ce8f257acbbb3d7ae20fc4
+DIST po4a-0.67.tar.gz 4466869 BLAKE2B c4dab0e40e7f5eb24ec85abf8a02131144b181d9b783a5dccc30221d1cc3a493f16d7c2faf8284c6d2f2259661a6f2c280624e5fd16e2d4d0bf878f8291ef7b5 SHA512 6445db615ac1a2e752daca7dca0c44a88e74c7a26c06ba8e7cb6bdeeaacce78cb74a671579dd95ee8341d817e16717e8cf99022a37c5d152e0c9828bd6aae3d9
diff --git a/app-text/po4a/files/po4a-0.67-man.patch b/app-text/po4a/files/po4a-0.67-man.patch
new file mode 100644
index 00000000000..6c79ebf77dd
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.67-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -234,7 +234,6 @@
+ }
+ $parser->parse_from_file ($file, $out);
+
+- system("gzip -9 -f $out") and die;
+ unlink "$file" || die;
+ }
+
+@@ -253,7 +252,6 @@
+ print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+ }
+- system ("gzip -9 -f $outdir/$outfile.$section") and die;
+ }
+ unlink "$file" || die;
+ }
diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
index 9e119d269b2..0c39ceb095c 100644
--- a/app-text/po4a/po4a-0.66.ebuild
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/po4a/po4a-0.65.ebuild b/app-text/po4a/po4a-0.67.ebuild
index 809d0390cd6..4fe9ab68c59 100644
--- a/app-text/po4a/po4a-0.65.ebuild
+++ b/app-text/po4a/po4a-0.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -21,6 +21,7 @@ RDEPEND="app-text/opensp
dev-perl/Locale-gettext
dev-perl/Pod-Parser
dev-perl/SGMLSpm
+ dev-perl/Syntax-Keyword-Try
dev-perl/TermReadKey
dev-perl/Text-WrapI18N
dev-perl/Unicode-LineBreak
@@ -37,7 +38,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
virtual/latex-base
)"
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
DIST_TEST="do"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index e68fff1340a..a0ca23a9227 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,2 +1,7 @@
-DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569
DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737
+DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3
+DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5
+DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
+DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
+DIST poppler-22.08.0.tar.xz 1840700 BLAKE2B 7e27eb1e41afb83633288d2d923a58e94590780f6f558e403928582de11c742781a12df11dcd7d9aadbfcbdae2662c83ae23f683552fba9e1984d3a0c4577f53 SHA512 bbff6d51eaafe58891357069c83e43ea25b4077755fa715a17b38660cd3cd546fa21d2e17a272d9b375f7e440e6e3661e84a20f18d445e0f28d06971abc04666
+DIST poppler-22.08.0.tar.xz.sig 833 BLAKE2B 8f6476068a78a0d145b2c43826ad3a73175a5506aaaecd14f837deb21b7a247154ba41e87877e35f249229871f006930c5849649a4310820020dc4cd7284497d SHA512 3c5350e5b9ddd872c4cf61e7463897298fbd4233be45241d6720e0debb6a0577dd45d663ba863bcc6ebb457197ade1093d518a363f3d277e382947c75a897ebb
diff --git a/app-text/poppler/poppler-22.05.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild
index 06ec20258b9..6bd8c9f87f8 100644
--- a/app-text/poppler/poppler-22.05.0.ebuild
+++ b/app-text/poppler/poppler-22.05.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/poppler/poppler-22.03.0.ebuild b/app-text/poppler/poppler-22.06.0.ebuild
index f6a73f037df..a45c4fcca60 100644
--- a/app-text/poppler/poppler-22.03.0.ebuild
+++ b/app-text/poppler/poppler-22.06.0.ebuild
@@ -10,9 +10,13 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- 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/119" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -26,7 +30,7 @@ RESTRICT="test"
DEPEND="
media-libs/fontconfig
- media-libs/freetype
+ >=media-libs/freetype-2.8
sys-libs/zlib
cairo? (
dev-libs/glib:2
@@ -34,7 +38,7 @@ DEPEND="
introspection? ( dev-libs/gobject-introspection:= )
)
curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
lcms? ( media-libs/lcms:2 )
nss? ( >=dev-libs/nss-3.19:0 )
@@ -57,6 +61,10 @@ BDEPEND="
virtual/pkgconfig
"
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
diff --git a/app-text/poppler/poppler-22.07.0.ebuild b/app-text/poppler/poppler-22.07.0.ebuild
new file mode 100644
index 00000000000..0656b36915d
--- /dev/null
+++ b/app-text/poppler/poppler-22.07.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ media-libs/fontconfig
+ >=media-libs/freetype-2.8
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( dev-libs/boost )
+"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-22.08.0.ebuild b/app-text/poppler/poppler-22.08.0.ebuild
new file mode 100644
index 00000000000..02a66a8252b
--- /dev/null
+++ b/app-text/poppler/poppler-22.08.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
+ SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SLOT="0/123" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ media-libs/fontconfig
+ >=media-libs/freetype-2.8
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+DEPEND="${COMMON_DEPEND}
+ boost? ( dev-libs/boost )
+"
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+ "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if tc-is-clang ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DBUILD_MANUAL_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_BOOST="$(usex boost)"
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a5f3b33d973..02a66a8252b 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -10,9 +10,13 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
+ inherit verify-sig
+
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/123" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,7 +28,7 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss
# No test data provided
RESTRICT="test"
-DEPEND="
+COMMON_DEPEND="
media-libs/fontconfig
>=media-libs/freetype-2.8
sys-libs/zlib
@@ -46,10 +50,10 @@ DEPEND="
)
tiff? ( media-libs/tiff:0 )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
-DEPEND+="
+DEPEND="${COMMON_DEPEND}
boost? ( dev-libs/boost )
"
BDEPEND="
@@ -57,6 +61,10 @@ BDEPEND="
virtual/pkgconfig
"
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
+fi
+
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
diff --git a/app-text/psutils/files/psutils-1.17-ldflags.patch b/app-text/psutils/files/psutils-1.17-ldflags.patch
deleted file mode 100644
index 124768062a4..00000000000
--- a/app-text/psutils/files/psutils-1.17-ldflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: psutils/Makefile.unix
-===================================================================
---- psutils.orig/Makefile.unix
-+++ psutils/Makefile.unix
-@@ -39,7 +39,7 @@ MANEXT = 1
- MANDIR = /usr/local/share/man/man$(MANEXT)
-
- CC = gcc
--CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
-+CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
-
- BIN = psbook psselect pstops epsffit psnup \
- psresize
-@@ -65,30 +65,24 @@ pserror.o: psutil.h patchlev.h pserror.h
- epsffit.o: epsffit.c pserror.h patchlev.h
-
- epsffit: epsffit.o pserror.o
-- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
-
- psnup: psnup.o psutil.o psspec.o pserror.o
-- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
-
- psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
-
- psresize: psresize.o psutil.o pserror.o psspec.o
-- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
-
- psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
-
- psbook: psbook.o psutil.o pserror.o
-- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
-
- psbook.o: psutil.h patchlev.h pserror.h psbook.c
-
- psselect: psselect.o psutil.o pserror.o
-- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
-
- psselect.o: psutil.h patchlev.h pserror.h psselect.c
-
- pstops: pstops.o psutil.o psspec.o pserror.o
-- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
-
- pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
-
diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch
new file mode 100644
index 00000000000..8e8f03208f7
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-makefile.patch
@@ -0,0 +1,210 @@
+--- a/Makefile.unix
++++ b/Makefile.unix
+@@ -25,10 +25,10 @@
+
+ OS = UNIX
+
+-BINDIR = /usr/local/bin
++BINDIR = $(DESTDIR)$(EPREFIX)/usr/bin
+ SCRIPTDIR = $(BINDIR)
+-INCLUDEDIR = /usr/local/share/psutils
+-PERL = /usr/local/bin/perl
++INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils
++PERL = "/usr/bin/env perl"
+
+ BINMODE = 0755
+ MANMODE = 0644
+@@ -36,10 +36,9 @@
+ INSTALL = install -c -m $(BINMODE)
+ INSTALLMAN = install -c -m $(MANMODE)
+ MANEXT = 1
+-MANDIR = /usr/local/share/man/man$(MANEXT)
++MANDIR = $(DESTDIR)$(EPREFIX)/usr/share/man/man$(MANEXT)
+
+-CC = gcc
+-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
++CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
+
+ BIN = psbook psselect pstops epsffit psnup \
+ psresize
+@@ -65,30 +64,24 @@
+ epsffit.o: epsffit.c pserror.h patchlev.h
+
+ epsffit: epsffit.o pserror.o
+- $(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
+
+ psnup: psnup.o psutil.o psspec.o pserror.o
+- $(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
+
+ psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
+
+ psresize: psresize.o psutil.o pserror.o psspec.o
+- $(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
+
+ psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
+
+ psbook: psbook.o psutil.o pserror.o
+- $(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
+
+ psbook.o: psutil.h patchlev.h pserror.h psbook.c
+
+ psselect: psselect.o psutil.o pserror.o
+- $(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
+
+ psselect.o: psutil.h patchlev.h pserror.h psselect.c
+
+ pstops: pstops.o psutil.o psspec.o pserror.o
+- $(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
+
+ pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
+
+@@ -99,116 +92,116 @@
+ cp $? $@
+
+ psmerge: psmerge.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixfmps: fixfmps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixmacps: fixmacps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixpsditps: fixpsditps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixpspps: fixpspps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixscribeps: fixscribeps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixtpps: fixtpps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixwfwps: fixwfwps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixwpps: fixwpps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixwwps: fixwwps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ fixdlsrps: fixdlsrps.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ extractres: extractres.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ includeres: includeres.pl
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+ $(CHMOD) $(BINMODE) $@
+
+ epsffit.$(MANEXT): epsffit.man
+- $(PERL) maketext MAN="$(MANPAGES)" $? > $@
++ perl maketext MAN="$(MANPAGES)" $? > $@
+
+ psnup.$(MANEXT): psnup.man
+- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
+
+ psresize.$(MANEXT): psresize.man
+- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
+
+ psbook.$(MANEXT): psbook.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ psselect.$(MANEXT): psselect.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ pstops.$(MANEXT): pstops.man
+- $(PERL) maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@
++ perl maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@
+
+ psmerge.$(MANEXT): psmerge.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixfmps.$(MANEXT): fixfmps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixmacps.$(MANEXT): fixmacps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+
+ fixpsditps.$(MANEXT): fixpsditps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixpspps.$(MANEXT): fixpspps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixscribeps.$(MANEXT): fixscribeps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixtpps.$(MANEXT): fixtpps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixwfwps.$(MANEXT): fixwfwps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixwpps.$(MANEXT): fixwpps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixwwps.$(MANEXT): fixwwps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ fixdlsrps.$(MANEXT): fixdlsrps.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ extractres.$(MANEXT): extractres.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ includeres.$(MANEXT): includeres.man
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+
+ getafm.$(MANEXT): getafm.man
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++ perl maketext "MAN=$(MANPAGES)" $? > $@
+
+ clean:
+ rm -f *.o
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
index f1c0d00de2e..dd64aadab49 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r5.ebuild
@@ -1,40 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="PostScript Utilities"
HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
+S="${WORKDIR}/${P}.orig"
LICENSE="psutils"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-lang/perl"
-S="${WORKDIR}/${P}.orig"
+BDEPEND="dev-lang/perl"
-src_prepare() {
- eapply "${FILESDIR}/${P}-ldflags.patch"
- eapply "${FILESDIR}/${P}-no-fixmacps.patch"
- sed \
- -e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
- "${S}/Makefile.unix" > "${S}/Makefile"
- default
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-no-fixmacps.patch
+)
src_compile() {
- emake CC="$(tc-getCC)"
+ emake -f Makefile.unix CC="$(tc-getCC)"
}
src_install() {
dodir /usr/{bin,share/man}
- emake DESTDIR="${D}" install
+ emake -f Makefile.unix DESTDIR="${D}" install
dodoc README
}
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 3672b9dc6da..91083f780f9 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/app-text/recode/recode-3.7.12.ebuild b/app-text/recode/recode-3.7.12.ebuild
index 84074fbac49..7f4e75b9cc7 100644
--- a/app-text/recode/recode-3.7.12.ebuild
+++ b/app-text/recode/recode-3.7.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
LICENSE="GPL-3+"
# librecode soname version
SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/ronn-ng/ronn-ng-0.9.1-r1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
deleted file mode 100644
index efd0ff6ffd2..00000000000
--- a/app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
-RUBY_FAKEGEM_GEMSPEC="ronn-ng.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown"
-HOMEPAGE="https://github.com/apjanke/ronn-ng"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE=""
-
-RDEPEND+="!app-text/ronn"
-
-DEPS="
- >=dev-ruby/kramdown-2.1:2
- >=dev-ruby/nokogiri-1.9.0:0
-"
-
-ruby_add_rdepend "
- =dev-ruby/mustache-1*
- ${DEPS}
-"
-
-ruby_add_bdepend "${DEPS}"
-
-all_ruby_prepare() {
- sed -i -e '/mustache/ s/0.7/1.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
- # Make sure that we always use the right interpreter during tests.
- sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
-}
-
-all_ruby_compile() {
- PATH="${S}/bin:${PATH}" rake man || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/ronn.1 man/ronn-format.7
-}
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
index 17a0b8f79da..52501cd297a 100644
--- a/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
+++ b/app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/apjanke/ronn-ng"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE=""
diff --git a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild b/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
deleted file mode 100644
index 6a13d881df7..00000000000
--- a/app-text/ronn-ng/ronn-ng-0.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Builds manuals in HTML and Unix man page format from Markdown"
-HOMEPAGE="https://github.com/apjanke/ronn-ng"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE=""
-
-RDEPEND+="!app-text/ronn"
-
-ruby_add_rdepend "
- >=dev-ruby/kramdown-2.1:2
- >=dev-ruby/mustache-0.7.0
- >=dev-ruby/nokogiri-1.9.0:0
-"
-
-each_ruby_prepare() {
- # Make sure that we always use the right interpreter during tests.
- sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
-}
-
-all_ruby_compile() {
- PATH="${S}/bin:${PATH}" rake man || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/ronn.1 man/ronn-format.7
-}
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
index 5ee60cd0b38..115e9d64a66 100644
--- a/app-text/scdoc/metadata.xml
+++ b/app-text/scdoc/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bman@gentoo.org</email>
- <name>Aaron Bauman</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
index 84cbc50be67..71794e2fed4 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
LICENSE="FDL-1.1"
SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 8373056714f..1b7611416d8 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,3 @@
DIST sigil-1.8.0.tar.gz 21217901 BLAKE2B 78615652859d1f61bab18b1b248d342dc6892943a2310659859ab577981c4452fbaeb567758097427453c8dfe95e42b499616a423b5c11b42238f763ac0653c8 SHA512 1a911aac996d3519f501820f8da9c810db9793063e481a6169288d402ef7e6b797308cf7ca5517162d0eb4d80f38f968627bca676b724ea5be5109c427473c95
+DIST sigil-1.9.10.tar.gz 25263060 BLAKE2B ef8d6b5552689f0501971563b429efa050456826ee85dbf524ecb1c1931506de95909e3443bc259353c012b3e4a2b6ce3299f20af8e65d07324818a8f208c2a8 SHA512 e328d8e207cff1dc007391c246792c3d53f7b9f078dd87a61088a61a5a192ed85802057b0f2d61b14bcac6094bb1ac2ff74a5096b54d9b82f0c6b2bef7eceb1a
DIST sigil-1.9.2.tar.gz 23225656 BLAKE2B 410b2cf1772158aa9b0d499ba54bb7fc176c479acf7e9f48c5113a4e253becab35b6b4aeaa83da249d7c36f824cb1ee9b7a2e95e29c023b37afed9e864f94134 SHA512 fd6a71ce3b05b08651476f86a166d1ccdbecca31b19ecfa31c9d18ebe4daccfd69cf51d687686917c401f4b6e26cc6a57dbae5f9b1d8ba49fe08ccdd0bdf75d7
diff --git a/app-text/sigil/sigil-1.9.10.ebuild b/app-text/sigil/sigil-1.9.10.ebuild
new file mode 100644
index 00000000000..d9a47a339dc
--- /dev/null
+++ b/app-text/sigil/sigil-1.9.10.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk"
+
+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"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ app-text/hunspell:=
+ dev-libs/libpcre2:=[pcre16]
+ $(python_gen_cond_dep '
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]')
+ 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}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/dulwich[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]') )
+ system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+ local mycmakeargs=(
+ -DTRY_NEWER_FINDPYTHON3=1
+ -DPython3_INCLUDE_DIR="$(python_get_includedir)"
+ -DPython3_LIBRARY="$(python_get_library_path)"
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ -DINSTALL_BUNDLED_DICTS=0
+ -DSYSTEM_LIBS_REQUIRED=1
+ -DUSE_SYSTEM_LIBS=1
+ -DUSE_QT6=0
+ )
+ use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_fix_shebang "${ED}"/usr/share/sigil/
+ python_optimize "${ED}"/usr/share/sigil/
+}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 5b3ea271236..be0bcf1f3e4 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,2 +1 @@
-DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
deleted file mode 100644
index db6f19549e5..00000000000
--- a/app-text/t1utils/files/t1utils-1.41-memmem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
-Author: Eddie Kohler <ekohler@gmail.com>
-Date: Wed Aug 16 12:37:34 2017 -0400
-
- Check for memmem declaration; sometimes it is not declared by default.
-
-diff --git a/configure.ac b/configure.ac
-index 5b4e3ff..b4dc4fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,7 @@ dnl strerror()?
- dnl
-
- AC_REPLACE_FUNCS([strerror memmem])
-+AC_CHECK_DECLS([memmem])
-
-
- dnl
-@@ -88,7 +89,7 @@ char* strerror(int errno);
- #endif
-
- /* Prototype memmem if we don't have it. */
--#if !HAVE_MEMMEM
-+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
- void* memmem(const void* haystack, size_t haystack_len,
- const void* needle, size_t needle_len);
- #endif
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index 072c9c1ef29..00000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- !<media-libs/freetype-1.4_pre20080316"
-
-PATCHES=(
- "${FILESDIR}"/${P}-memmem.patch
-)
-DOCS=( NEWS.md README.md )
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 2da095ce49c..5522c177da8 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,3 +1,4 @@
DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
DIST tesseract-5.0.1.tar.gz 1913596 BLAKE2B 94098704c0a177eb1afc365036f9ff8d7648f80398f20a410e11b7884e1411432c2938e3ab176930630500793ef2e3f33b82f214461ef6677d289c56919f8d55 SHA512 0a4824f71eb76ab022f3b9258d12b9a059adcf2f37fac6442ae1096d0efc80404ba1bfd9c90e8263178c1af606c2aad2b277ceb93efc3b9e93c125f931ff08c1
DIST tesseract-5.1.0.tar.gz 1910376 BLAKE2B e1c1c5c563e30689d66fb09ab73fdce853a469dfcf3c759571f6e6e1da71809a8fd1fb74c0be38588e97bbdac230c2ce10a35fd66faa6a4370d78efe112d3243 SHA512 d874fc995182c2c7ce210ebd79ad36414fa73afc53063505bc0b0aa0f090dc48db09c650c86a727778584f34a421b7d64c129cefe282ea112560cd7ca24e7f59
+DIST tesseract-5.2.0.tar.gz 1913462 BLAKE2B 6b80e5bb71543cf971683f66b87fd45a971a6f337ca53567d134c3bdc227f1338a3340f5bb5c2f183288135acd6521031b0f6de6e96e333fed4dc10e93b7319e SHA512 23ed931495e4ea793904f99a06a95a47873b923c4e5d8f3fc8f9203cac86b0e0013c416ab4d8d4a863a081eea00a196a0198c6fb17a39917a1baea2280d84794
diff --git a/app-text/tesseract/tesseract-5.2.0.ebuild b/app-text/tesseract/tesseract-5.2.0.ebuild
new file mode 100644
index 00000000000..302638df9e4
--- /dev/null
+++ b/app-text/tesseract/tesseract-5.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, originally developed at HP, now open source"
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+ opencl? (
+ virtual/opencl[${MULTILIB_USEDEP}]
+ media-libs/tiff:0=[${MULTILIB_USEDEP}]
+ media-libs/leptonica:=[tiff]
+ )
+ training? (
+ dev-libs/icu:=
+ x11-libs/pango:=
+ x11-libs/cairo:=
+ )"
+RDEPEND="${COMMON_DEPEND}
+ || (
+ >=app-text/tessdata_fast-4.0.0
+ >=app-text/tessdata_best-4.0.0
+ >=app-text/tessdata_legacy-4.0.0
+ )"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-doc/doxygen )"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # scrollview disabled for now, see bug #686944
+ local myeconfargs=(
+ --enable-shared
+ --disable-graphics
+ $(use_enable float32)
+ $(use_enable opencl)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi; then
+ use doc && emake doc
+ use training && emake training
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+ if use doc; then
+ HTML_DOCS=( doc/html/. )
+ fi
+ einstalldocs
+
+ if use training; then
+ emake DESTDIR="${D}" training-install
+ fi
+ fi
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index c2456751555..320423be412 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,2 +1,3 @@
DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
DIST tree-2.0.1.tgz 57213 BLAKE2B 977f3bd606881f92f7e39fb167205b468f77408a2fa3ff14c20eeab0e6f194115d2d41a3919751c9c9d103ae185dc231710a464f0c57ea244e8a410782503d6f SHA512 11a45136d62ee7b4acdb599025ddddc250f3b95c46c94cea132bdc226357561bbae3ed874a99e554d2e01a93eaac639fb89d8a2539964ce788540ac3537f0e4c
+DIST tree-2.0.2.tgz 57960 BLAKE2B 3038b4a0f904ba4854ab40d52448fd0859380346d1a355c16fa97dfcae7b650ba4406e970555c79b5c5d5dca31677f5ae2b83cab0178e5580d342956167ba80b SHA512 5b9612ada9e3b1414d06daf5d7589f18480f232ba6ea29a004ceb7ff5b46c57610766bdb2babe9c20047dfea39cb233a6d92a60fcf2c38beccbebc94fb1eb20f
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
index d8a49607812..074c45a5cb8 100644
--- a/app-text/tree/metadata.xml
+++ b/app-text/tree/metadata.xml
@@ -7,6 +7,8 @@
</maintainer>
<upstream>
<changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog>
+ <remote-id type="gitlab">OldManProgrammer/unix-tree</remote-id>
+ <remote-id type="github">Old-Man-Programmer/tree</remote-id>
</upstream>
<longdescription>Tree is a recursive directory listing command that
produces a depth indented listing of files, which is colorized ala
diff --git a/app-text/tree/tree-2.0.1.ebuild b/app-text/tree/tree-2.0.1.ebuild
index 4c7a39b7f49..3dd93deef57 100644
--- a/app-text/tree/tree-2.0.1.ebuild
+++ b/app-text/tree/tree-2.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND=""
diff --git a/app-text/tree/tree-2.0.2.ebuild b/app-text/tree/tree-2.0.2.ebuild
new file mode 100644
index 00000000000..4c7a39b7f49
--- /dev/null
+++ b/app-text/tree/tree-2.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+ sed -i -e 's:LINUX:__linux__:' tree.c || die
+ if use !elibc_glibc ; then
+ # 433972, also previously done only for elibc_uclibc
+ sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+ fi
+ default
+}
+
+src_compile() {
+ append-lfs-flags
+ emake \
+ CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin tree
+ doman doc/tree*.1
+ einstalldocs
+ newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 17c2bd98c4e..4f3ac2e27f1 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1 +1,2 @@
DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
+DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
index b31f89c8113..e62ed22a3e7 100644
--- a/app-text/unpaper/metadata.xml
+++ b/app-text/unpaper/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
- <upstream>
- <remote-id type="github">Flameeyes/unpaper</remote-id>
- <bugs-to>https://github.com/Flameeyes/unpaper/issues</bugs-to>
- </upstream>
+ <!--maintainer-needed-->
+ <upstream>
+ <remote-id type="github">unpaper/unpaper</remote-id>
+ <bugs-to>https://github.com/unpaper/unpaper/issues</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
new file mode 100644
index 00000000000..a26b8376338
--- /dev/null
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Post-processor for scanned and photocopied book pages"
+HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/docbook-xsl-ns-stylesheets
+ dev-libs/libxslt
+ dev-python/sphinx
+ test? ( dev-python/pytest )
+"
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index cb59b6c27de..a26b8376338 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
+inherit meson
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
- inherit git-r3 autotools
+ inherit git-r3
else
SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DESCRIPTION="Post-processor for scanned and photocopied book pages"
@@ -17,18 +19,13 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
LICENSE="GPL-2"
SLOT="0"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
-DEPEND="dev-libs/libxslt
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/docbook-xsl-ns-stylesheets
- virtual/pkgconfig
- ${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-src_prepare() {
- default
- [[ ${PV} == *9999 ]] && eautoreconf
-}
+ dev-libs/libxslt
+ dev-python/sphinx
+ test? ( dev-python/pytest )
+"
diff --git a/app-text/vgrep/metadata.xml b/app-text/vgrep/metadata.xml
index 3efa0310a8a..afe9da64695 100644
--- a/app-text/vgrep/metadata.xml
+++ b/app-text/vgrep/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>whissi@gentoo.org</email>
- <name>Thomas Deutschmann</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/vrothberg/vgrep/issues</bugs-to>
<remote-id type="github">vrothberg/vgrep</remote-id>
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
index 9f0af0d46f1..4418e21d3f0 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Create a diff disregarding formatting"
HOMEPAGE="https://www.gnu.org/software/wdiff/"
@@ -16,14 +16,16 @@ RESTRICT="!test? ( test )"
RDEPEND="
sys-apps/diffutils
sys-apps/less
- sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
+ sys-libs/ncurses:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/texinfo
- test? ( app-misc/screen )"
+ test? ( app-misc/screen )
+"
src_configure() {
- econf \
- $(use_enable experimental)
+ econf $(use_enable experimental)
}
src_test() {
@@ -31,5 +33,6 @@ src_test() {
# when an incompatible screenrc is found
touch tests/screenrc || die
export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+
default
}
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r3.ebuild
index a587d0bffd5..4876a095e7f 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r3.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
inherit autotools
DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
-SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
-IUSE="tools wmf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="tools wmf"
RDEPEND="
>=dev-libs/glib-2:2
@@ -19,15 +20,15 @@ RDEPEND="
sys-libs/zlib
media-libs/libpng:0=
dev-libs/libxml2:2
- tools? ( app-text/texlive-core
- dev-texlive/texlive-latex )
- wmf? ( >=media-libs/libwmf-0.2.2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+ tools? (
+ app-text/texlive-core
+ dev-texlive/texlive-latex
+ )
+ wmf? ( >=media-libs/libwmf-0.2.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
+PATCHES=( "${FILESDIR}"/${P}-format-security.patch )
src_prepare() {
default
@@ -46,17 +47,13 @@ src_prepare() {
}
src_configure() {
- econf \
- --disable-static \
- $(use_with wmf libwmf)
+ econf $(use_with wmf libwmf)
}
src_install() {
default
find "${ED}" -name '*.la' -delete || die
- rm -f "${ED}"/usr/share/man/man1/wvConvert.1
- if use tools; then
- dosym /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1
- fi
+ rm -f "${ED}"/usr/share/man/man1/wvConvert.1 || die
+ use tools && dosym wvWare.1 /usr/share/man/man1/wvConvert.1
}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 02e41dbac76..8fb02309024 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,3 +1,4 @@
DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
+DIST xapian-omega-1.4.20.tar.xz 563324 BLAKE2B 3836cc1f219f228edbd910dd92eb5bf7f91c6e0e5a1be2fad271dc9246ef0e5dd68d99d48f15c8ac9c449112d492e3becd501413a8c190d0b611d2506f8d82cb SHA512 026ca234d072da39a29d47b5b53033ec7677d51f93a6fedffb2a57ff5b788cc08d94d1dc43ff8c0062639470b8fe3150781008e4b50abd3ec5526b2b98a3a676
diff --git a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
index 8095ec6dba1..a4f6177030f 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
@@ -10,17 +10,17 @@ S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
IUSE=""
-DEPEND="~dev-libs/xapian-1.4.19:0/30
+DEPEND="~dev-libs/xapian-${PV}:0/30
dev-lang/perl
dev-libs/libpcre
sys-libs/zlib"
RDEPEND="${DEPEND}"
src_install() {
- emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
# Protect /etc/omega.conf
echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
@@ -32,7 +32,7 @@ src_install() {
# Directory containing OmegaScript templates:
keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+ mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
# Directory to write Omega logs to:
keepdir /var/log/omega
diff --git a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
new file mode 100644
index 00000000000..91ff25791e2
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="~dev-libs/xapian-${PV}:0/30
+ dev-lang/perl
+ dev-libs/libpcre
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
+
+ # Protect /etc/omega.conf
+ echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+ doenvd "${T}"/20xapian-omega
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+ # Directory containing Xapian databases:
+ keepdir /var/lib/omega/data
+
+ # Directory containing OmegaScript templates:
+ keepdir /var/lib/omega/templates
+ mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
+
+ # Directory to write Omega logs to:
+ keepdir /var/log/omega
+
+ # Directory containing any cdb files for the $lookup OmegaScript command:
+ keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xdvik/xdvik-22.87.03-r4.ebuild b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
index 1d19d16bb0f..2f0571e7826 100644
--- a/app-text/xdvik/xdvik-22.87.03-r4.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://xdvi.sourceforge.net/"
SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
S="${WORKDIR}"/${P}/texk/xdvik
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="GPL-2"
IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index 7ae0fb63aba..eaa55b40c25 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
LICENSE="W3C"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND="app-text/sgml-common
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 739b78fae71..fb4e42013cc 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1 +1,2 @@
+DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
index a5bdd72a906..dd9eb10be24 100644
--- a/app-text/xiphos/xiphos-4.2.1.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
@@ -1,13 +1,14 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg-utils
DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
SLOT="0"
@@ -22,7 +23,6 @@ RDEPEND="${COMMON}
>=app-text/sword-1.8.1
dev-libs/glib:2
dev-libs/icu
- gnome-extra/gtkhtml:4.0
>=net-libs/biblesync-1.2.0
net-libs/webkit-gtk:4
sys-libs/zlib[minizip]
@@ -38,18 +38,15 @@ BDEPEND="${COMMON}
virtual/pkgconfig"
PATCHES=(
+ "${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
)
src_configure() {
- # TODO: stop using gtkhtml, it is deprecated (Bug #667914). However, as
- # of 4.2.1 it is still required because the WebKit-based editor
- # does not support webkit-gtk:4.
local mycmakeargs=(
-DDBUS=$(usex dbus)
-DDEBUG=$(usex debug)
- -DGTKHTML=on
-DPOSTINST=off
)
cmake_src_configure
@@ -57,6 +54,17 @@ src_configure() {
pkg_postinst() {
xdg_icon_cache_update
+
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS}; do
+ if ver_test "${rver}" -le "4.2.1"; then
+ ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+ ewarn "Studypad and the personal commentary will no longer work."
+ break
+ fi
+ done
+ fi
}
pkg_postrm() {
diff --git a/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
new file mode 100644
index 00000000000..a1105db47c0
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615
+LUA_COMPAT=( lua5-3 )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+else
+ SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+ KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
+ app-text/poppler[cairo]
+ dev-libs/glib
+ dev-libs/libxml2
+ dev-libs/libzip:=
+ gnome-base/librsvg
+ media-libs/portaudio[cxx]
+ media-libs/libsndfile
+ sys-libs/zlib:=
+ x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ sys-apps/lsb-release
+ elibc_musl? ( sys-libs/libbacktrace )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 761bc8769f6..a1105db47c0 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -3,15 +3,16 @@
EAPI=8
-inherit cmake xdg
+# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615
+LUA_COMPAT=( lua5-3 )
+inherit cmake lua-single xdg
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
- unset SRC_URI
else
- KEYWORDS="~amd64 ~ppc64"
SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+ KEYWORDS="~amd64 ~ppc64"
fi
DESCRIPTION="Handwriting notetaking software with PDF annotation support"
@@ -19,9 +20,11 @@ HOMEPAGE="https://github.com/xournalpp/xournalpp"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
-COMMONDEPEND="
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${LUA_DEPS}
app-text/poppler[cairo]
dev-libs/glib
dev-libs/libxml2
@@ -32,10 +35,8 @@ COMMONDEPEND="
sys-libs/zlib:=
x11-libs/gtk+:3
"
-RDEPEND="${COMMONDEPEND}
-"
-DEPEND="${COMMONDEPEND}
-"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
BDEPEND="
virtual/pkgconfig
sys-apps/lsb-release
@@ -46,7 +47,3 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
)
-
-src_prepare() {
- cmake_src_prepare
-}
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 46bf6536f10..5f89e2aa56c 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,3 @@
-DIST xpdf-4.03.tar.gz 936046 BLAKE2B bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144 SHA512 5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
DIST xpdf-4.04.tar.gz 969535 BLAKE2B 981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8 SHA512 a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab SHA512 4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925
DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
deleted file mode 100644
index c9761c8e26b..00000000000
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
- i18n? (
- https://dl.xpdfreader.com/xpdf-arabic.tar.gz
- https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
- https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
- https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
- https://dl.xpdfreader.com/xpdf-greek.tar.gz
- https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
- https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
- https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
- https://dl.xpdfreader.com/xpdf-latin2.tar.gz
- https://dl.xpdfreader.com/xpdf-thai.tar.gz
- https://dl.xpdfreader.com/xpdf-turkish.tar.gz
- )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
- icons? ( gnome-base/librsvg )
-"
-DEPEND="
- cups? (
- dev-qt/qtprintsupport:5[cups]
- net-print/cups
- )
- fontconfig? ( media-libs/fontconfig )
- libpaper? ( app-text/libpaper )
- utils? ( png? ( media-libs/libpng:0 ) )
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-libs/freetype
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}
- dev-qt/qtsvg:5
- media-fonts/urw-fonts
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-automagic.patch
- "${FILESDIR}"/${PN}-visibility.patch
- "${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-DOCS=( ANNOUNCE CHANGES README )
-
-src_prepare() {
- sed -i \
- "s|/usr/local/etc|${EPREFIX}/etc|;
- s|/usr/local|${EPREFIX}/usr|" \
- doc/sample-xpdfrc || die
-
- if use i18n; then
- sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
- fi
-
- xdg_environment_reset
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DA4_PAPER=$(usex metric)
- -DNO_FONTCONFIG=$(usex fontconfig off on)
- -DNO_TEXT_SELECT=$(usex textselect off on)
- -DOPI_SUPPORT=$(usex opi)
- -DSPLASH_CMYK=$(usex cmyk)
- -DWITH_LIBPAPER=$(usex libpaper)
- -DWITH_LIBPNG=$(usex png)
- -DXPDFWIDGET_PRINTING=$(usex cups)
- -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use icons; then
- sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
- cd xpdf-qt
- mkdir $sizes
- local i
- for i in $sizes; do
- rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
- done
- fi
-}
-
-src_install() {
- cmake_src_install
-
- domenu "${FILESDIR}/xpdf.desktop"
- newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
- if use icons; then
- local i
- for i in $sizes; do
- doicon -s $i xpdf-qt/$i/xpdf.png
- done
- unset sizes
- fi
-
- insinto /etc
- newins doc/sample-xpdfrc xpdfrc
-
- local d i
- if use utils; then
- for d in "bin" "share/man/man1"; do
- pushd "${ED}/usr/${d}" || die
- for i in pdf*; do
- mv "${i}" "x${i}" || die
- done
- popd || die
- done
-
- einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
- einfo "with other packages"
- else
- rm -rf "${ED}"/usr/bin/pdf* \
- "${ED}"/usr/share/man/man1/pdf* \
- "${ED}"/usr/$(get_libdir) || die
- fi
-
- if use i18n; then
- for i in arabic chinese-simplified chinese-traditional cyrillic greek \
- hebrew japanese korean latin2 thai turkish; do
- insinto "/usr/share/xpdf/${i}"
- doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
- ! -name README ! -name add-to-xpdfrc || die)
-
- cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
- done
- fi
-}
diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04.ebuild
index aaedc7d90ef..682bfe8d9f7 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
BDEPEND="
@@ -59,6 +59,13 @@ PATCHES=(
DOCS=( ANNOUNCE CHANGES README )
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+ fi
+ default
+}
+
src_prepare() {
sed -i \
"s|/usr/local/etc|${EPREFIX}/etc|;
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index e6f379dca69..e94a66bf9cf 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,2 +1 @@
-DIST yelp-tools-41.0.tar.xz 38696 BLAKE2B 6e742e0a5c05c07fb3eb80fc10201650597fb36702edb1d9fc022895daf2837daed15a2b69b8bed7aaf0106139c7138e8f13b65b63cf18971e14eaeb0068b061 SHA512 76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e
DIST yelp-tools-42.0.tar.xz 38788 BLAKE2B 9dc34f4b32c9e705f427bccad5ff3c2cd222a1391a780dde145ea894e1065fc873fd4ef020d1b7809b653c8237fbedb7f0b07d684d8d906b7af7a0fd8ebf79e4 SHA512 ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786
diff --git a/app-text/yelp-tools/yelp-tools-41.0.ebuild b/app-text/yelp-tools/yelp-tools-41.0.ebuild
deleted file mode 100644
index 4e78eaca75e..00000000000
--- a/app-text/yelp-tools/yelp-tools-41.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome2 meson python-single-r1
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- >=dev-libs/libxml2-2.6.12
- >=dev-libs/libxslt-1.1.8
- dev-util/itstool
- >=gnome-extra/yelp-xsl-3.38
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_install() {
- meson_src_install
- python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
-}
diff --git a/app-text/yelp-tools/yelp-tools-42.0.ebuild b/app-text/yelp-tools/yelp-tools-42.0.ebuild
index 3ec172ca54c..7ef91ca39aa 100644
--- a/app-text/yelp-tools/yelp-tools-42.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-42.0.ebuild
@@ -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
diff --git a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
index c0c5faa1ea5..a20b5eca3b9 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="amd64 ~arm ~riscv x86"
+ KEYWORDS="amd64 arm ~riscv x86"
SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
fi
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild
index 650adb455ea..e7aecbc89e4 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
EGIT_BRANCH="develop"
else
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
fi
@@ -20,7 +20,7 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
LICENSE="ZLIB"
SLOT="0"
-DEPEND=">=app-text/mupdf-1.19:=
+DEPEND="~app-text/mupdf-1.19.1:=
>=app-text/zathura-0.3.9
dev-libs/girara
dev-libs/glib:2
diff --git a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
index 97788ac057d..8ccbde58f64 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
@@ -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 ~riscv x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
fi
diff --git a/app-text/zathura/zathura-0.4.9.ebuild b/app-text/zathura/zathura-0.4.9.ebuild
index 4b5f9deeebf..907d082c8c1 100644
--- a/app-text/zathura/zathura-0.4.9.ebuild
+++ b/app-text/zathura/zathura-0.4.9.ebuild
@@ -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 ~riscv x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
fi
LICENSE="ZLIB"
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 621cfcd0557..b903b5a2984 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1 +1,2 @@
-DIST zotero-bin-6.0.8.tar.bz2 68592532 BLAKE2B 2a0cd400d2c2ff03e0cbdecf5730404570d4667cf4076badea5f85a02a3170bcf8e60a13224da852e3264a0293f1c187ed690097907b8e9852fc1bb48e5bca54 SHA512 5b39d2a8aa4d3d973f74cb13a5a0feb961639cf7955b447dfff82517fc86f3ad579a0093b4f33e93c7fa974ae026e21dc0f3a320c9de318873f1d0ca0fec467b
+DIST zotero-bin-6.0.10.tar.bz2 68712203 BLAKE2B 45e4ff33de1cf84c9c6bf9177de4096eb52abfaeb3347153376598d1dd8ad0d90a11383a4a1c62f77e8234f167cf0950fbfa4f58b74d33f48ec073a22a8bc832 SHA512 06ac2a21f8ec7576c759b6375a66e7e9370ac81f6e8832b7ca4850311a2d7e208d17b5fe2cda372763f80756fbaccaffc75afc828014611723931ace2958f19a
+DIST zotero-bin-6.0.9.tar.bz2 68609695 BLAKE2B a921b6558d53b162ef2d3ef23db73dfd20f9f87f2fa533b28d95fe33f5e20c1c9d341b72d7a51f4780f3081f6f925991b40193ae5287565f3de0a4d937ec9333 SHA512 4610d0e7ae8fe228ffe6ceff9cd9724bc47b8fa7b6b0d0cdac3e539b67af037aeaaeb5d7f0935306f2e6bb719ca16bcad266a576e6389674f6717b15d610643c
diff --git a/app-text/zotero-bin/zotero-bin-6.0.8.ebuild b/app-text/zotero-bin/zotero-bin-6.0.10.ebuild
index b9f2fd5004e..b9f2fd5004e 100644
--- a/app-text/zotero-bin/zotero-bin-6.0.8.ebuild
+++ b/app-text/zotero-bin/zotero-bin-6.0.10.ebuild
diff --git a/app-text/zotero-bin/zotero-bin-6.0.9.ebuild b/app-text/zotero-bin/zotero-bin-6.0.9.ebuild
new file mode 100644
index 00000000000..b9f2fd5004e
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}.tar.bz2"
+S="${WORKDIR}/Zotero_linux-x86_64"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ dev-libs/atk
+ dev-libs/dbus-glib
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+ # disable auto-update
+ sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+ # disable default oo installation questions - manual installation is still possible
+ sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+ extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+ # fix desktop-file
+ sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
+ sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+ default
+}
+
+src_install() {
+ dodir opt/zotero
+ cp -a "${S}"/* "${ED}/opt/zotero" || die
+
+ dosym ../../opt/zotero/zotero usr/bin/zotero
+
+ domenu zotero.desktop
+
+ for size in 16 32 48 256; do
+ newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+ done
+}