gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /app-text
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
62 files changed, 619 insertions, 892 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f25c9b8d9508..9cb0e880b998 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
index a3c67e74a889..370874621a6b 100644
--- a/app-text/bibclean/Manifest
+++ b/app-text/bibclean/Manifest
@@ -1,3 +1,5 @@
 DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f
+DIST bibclean-3.04.tar.gz 2712015 BLAKE2B 80d2fccb3b453dfda935bedd73ea2173b6ba1416c425a094c6ca915e86a886fe269b2f0e392274775228b03578ccf19da03291ed644f589edec1692120456a99 SHA512 7cdd22d07f627944d90e04ca73c3c82529e2fa9a011469f8d5b418f7651332b4e8c29aceda32b966bb1778151505d7f135ead6a12db8975ff46f650c4c43b4f3
 EBUILD bibclean-2.17.ebuild 593 BLAKE2B 01d318e8467d69d1d1cce3da545808b10e3c2717a61f4261526145e908b9e2e63200e0bc0af2061501ddfbf4c78c3b6f368cd018f1334420477b894c4827adc7 SHA512 d18ba47f1afefcae8711f1d450a26cbadef08c45a57f4ff971d10d15cd12afa342ccc17c0eda7fa3f3ff32a821ca7f83b61fd101494083857df72a2d18241ba6
+EBUILD bibclean-3.04.ebuild 576 BLAKE2B 50e3e9effa2d3b4b4c0cde9b14c1ed09fe264f3e52eab76dcfa77dfa9766d99dfa81b236680a9baabdee2576250d362e820209f05e8c573cd435624c7d1e7fe0 SHA512 4c9c8e023595fffe5a2a51e7953d5e5e31c5665e9398b949373eb243e4c3827ba65375f6d51d4d30bf068ea27e90b6ac01b89978007cc58644d715be514c2eb8
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/bibclean/bibclean-3.04.ebuild b/app-text/bibclean/bibclean-3.04.ebuild
new file mode 100644
index 000000000000..d7f1a69fa5e6
--- /dev/null
+++ b/app-text/bibclean/bibclean-3.04.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
+SRC_URI="ftp://ftp.math.utah.edu/pub/bibclean/${P}.tar.gz"
+HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
+
+# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin bibclean
+	newman bibclean.man bibclean.1
+}
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index a9727a71661b..e5643efd2401 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,3 +1,5 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
+DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
 EBUILD djvu-3.5.27-r2.ebuild 1660 BLAKE2B ed005e78e907b2caf89118c2e37448a0951b08db834004f480e644534bf337b5dfa6220697dbf8b07f80f651afcfc6bccabe826242eefb6e05432040582ab981 SHA512 c6d5b6e7997fb7d8ab9ab688c3679ca150d92d2a6c787c63001780a30e51de630fec300911979803c4556e4186096ca4600eb0e2b67a3daa6cc8e1033791063c
+EBUILD djvu-3.5.28.ebuild 1529 BLAKE2B 9f08ed62a5891e67f3f59ce97cebe5986ea96b6f353cdd6b5486c69b777be1f26a47a2c42f493b186003087a958b7d7b05a0b7e4a60e6128140fd5be56274ede SHA512 55cd0ef43614ab979be16704fb15d7e277b04e6ffec7c6e8af82aee48495c5d5d029e090bde1ae0d391124dc3624da71dd67c570acbb6114ccf8b0355d1422c6
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28.ebuild
new file mode 100644
index 000000000000..4c1572488ac4
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.28.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic optfeature xdg
+
+MY_P="${PN}libre-${PV#*_p}"
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="http://djvu.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P%%.3}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	|| ( gnome-base/librsvg media-gfx/inkscape )"
+BDEPEND="app-arch/unzip"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		--disable-desktopfiles
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles || die
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+	done
+
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "For additional features, you may wish to install"
+	optfeature "for djviewer or browser plugin" app-text/djview
+}
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 4a21a48e1500..4c344fa13c17 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,9 +1,5 @@
-DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
 DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
-DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
-DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
-EBUILD dvisvgm-2.1.3.ebuild 1098 BLAKE2B b65e4082e5bc9ae1449ffe319b54dd83cfa2d08b4c66c5e69cbfaf165598ce7bf0c891672a2ee5f581c86e52d9c8fa33a5a5859b221211498e4284b76379595d SHA512 0d182e7884dc102759b812324f478e6e8d53d37ba50a071e8797723ad417af104903f9c46a401af85e36f6becf3fbdbe365b7f89db7df48d05b8d25f659061c1
-EBUILD dvisvgm-2.10.1.ebuild 1155 BLAKE2B 5f072ddd7ff2cf1d564b8f2a290dc2ba6aacd1b17cb93da6398efe1a9014bc9906cb210a056b622c47a1d69d080d786bee4660d6764c0adc440be959c2c8dea2 SHA512 9f3910191087d9cfbeee6642bb752147d8d4cb539502ba3b0e1f3857f2caff0197ff6ea832c66be9f0ea7f4ef17b2ffc9789d1236ef60b484e771651a7c4ff64
-EBUILD dvisvgm-2.6.1.ebuild 1187 BLAKE2B 6fa1cd59060e980501c34d1a4a207de4987bd037918e6e28128a55247c6f28121054e8036b9a1e8932f65f3530a1c43cd47fe39ab5eab318d3800b5a20aeaae2 SHA512 8c1ef49c8f3978e10271d92ff5249cf56a5e9111b84ed474bd5a3ecf6a797dd2f6f079d32cd7e65471959aa67625e4d24266323f660ae673b9bbe8ffe672f3ca
-EBUILD dvisvgm-2.7.ebuild 1187 BLAKE2B 1fcabdfd6ab8fd3e46aeb7b602c17b1f402785fc4b784d864933e107d52a758465d1024420cc6a8945617d57a75ecbe2afc3969ec4d9b498dd83783b6daba320 SHA512 11f4fa6fb5b2a6dd1e88748e85bee2127e910257f446dc8d5457a52464263c2fa353c582e91a20415f0d013e2c2bace4ad8361f0b8a0a48a79db63f985caffb0
+DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f
+EBUILD dvisvgm-2.10.1-r1.ebuild 1166 BLAKE2B 26e6a705af966e996d370e139cfcc1e4568b5d2473923ae9d5ccd938703e832c32170779536ca893fb19f066feb931620cedca2a85ad24e809264e50cec98693 SHA512 0820393c43f6358e1e851ade6b2e33d14dec9b35e42566f39d6aeb0b4001db6609f626c2456c02b9a8a1fc300c3641010b28432de4fdbb3a1c79eda93651009f
+EBUILD dvisvgm-2.11-r1.ebuild 1174 BLAKE2B 37615bba08e5a21258ab933ac78effaf67c2e1e59088ea04f2d86d26ffb186b916d278900731ff22bd59a8e9dc0cc59f22646c0c1af4edb9ea8f5cc58a9e814f SHA512 2b4090f58a6018fd07745d0dd3a8d148871e846130c7a4b295703d945f2855ee813d69ac809fc568e503fa8a0e48dcbbb10373042dd7e9b004046a8db6b7c8ee
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
deleted file mode 100644
index 6891f3e0b5f2..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
-	app-text/ghostscript-gpl
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	default
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
index fc2a5095bc13..a35bc82ca5a9 100644
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
@@ -19,23 +19,26 @@ IUSE="test"
 # would make it harder for prefix installs.
 RESTRICT="test"
 
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	>=app-arch/brotli-1.0.5
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	>=app-arch/brotli-1.0.5:=
 	app-text/ghostscript-gpl
 	dev-libs/kpathsea:=
+	dev-libs/openssl:=
 	>=dev-libs/xxhash-0.6.5
 	>=media-gfx/potrace-1.10-r1
 	media-libs/freetype:2
 	>=media-libs/woff2-1.0.2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
+	sys-libs/zlib
+	virtual/tex-base
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local myargs=(
diff --git a/app-text/dvisvgm/dvisvgm-2.10.1.ebuild b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
index 50dc39495c0d..aa5dfaf017e7 100644
--- a/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
@@ -19,26 +19,31 @@ IUSE="test"
 # would make it harder for prefix installs.
 RESTRICT="test"
 
-RDEPEND="virtual/tex-base
-	>=app-arch/brotli-1.0.5
+BDEPEND="
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	>=app-arch/brotli-1.0.5:=
 	app-text/ghostscript-gpl
 	dev-libs/kpathsea:=
+	dev-libs/openssl:=
 	>=dev-libs/xxhash-0.6.5
 	>=media-gfx/potrace-1.10-r1
 	media-libs/freetype:2
 	>=media-libs/woff2-1.0.2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
+	sys-libs/zlib
+	virtual/tex-base
+"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local myargs=(
 		--without-ttfautohint
 	)
+
 	econf "${myargs[@]}"
 }
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
deleted file mode 100644
index 1307115f485c..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
-	>=app-arch/brotli-1.0.5
-	app-text/ghostscript-gpl
-	dev-libs/kpathsea:=
-	>=dev-libs/xxhash-0.6.5
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	>=media-libs/woff2-1.0.2
-	dev-libs/kpathsea
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local myargs=(
-		--without-ttfautohint
-	)
-	econf "${myargs[@]}"
-}
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 9a25e2bd92cf..e1bd51045f03 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,8 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
+DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b43e1caa5f21e52c6f3037268b1959e9cd1adf04b08e05fce78dbbcfd3163795e8d2079c484c530065566a0307f2 SHA512 e29b3a85d993af28044a86dd23a3ca74c7d50b4218e542c380053a3eaf70c3ea2406feb3361ba8e793bac586c252330bb20fb56c65f3a0a54f63f103cc0abb35
 DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
+EBUILD enchant-2.2.15-r1.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
 EBUILD enchant-2.2.8.ebuild 1219 BLAKE2B a68741164e6cb8eb2e96ae2349bc18e584327a10aeb4fe9c6ee0a294a2101709327afda22567832248b36fbeb4d84f6281e99acd0840ba93619d9daa3180ba44 SHA512 a3549c67b4543d18180e6b09072f56b234b04cb374535b3535f71ce5f9156e90705748f0289f127ff5c1074349c57a467f77f2669172abb9b3f6c3929686aebc
-MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
+MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.2.15-r1.ebuild b/app-text/enchant/enchant-2.2.15-r1.ebuild
new file mode 100644
index 000000000000..1c7845af2065
--- /dev/null
+++ b/app-text/enchant/enchant-2.2.15-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="aspell +hunspell test voikko"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+	voikko? ( dev-libs/libvoikko )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/unittest++-2.0.0-r2 )"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="test" # Tests fail
+
+src_configure() {
+	# TODO: Add app-text/nuspell support
+	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
+		$(use_enable test relocatable) \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_with voikko) \
+		--without-nuspell \
+		--without-hspell \
+		--without-applespell \
+		--without-zemberek \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 2b8b7cffbc12..7f09ef69f50c 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
 		<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
+		<flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index a287a6dab1aa..9f1d50a74104 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,5 @@
 DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
-EBUILD htmldoc-1.8.30.ebuild 1117 BLAKE2B e2541de911f24741b3456f02fe4af773e8c918fc3125d2be67276baa2715be6b0d59b6c0e2d4e1714474e0f24755e3b645515dcfaeedd7d90e152a2cdfac346f SHA512 e901762a07d850837ed43f80986d4e63fc724de5f973b71cf10e231e1a462cea693995016e17432a93b9a5767264dd37690b1701a3159d969d71e8f986453e8f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
+EBUILD htmldoc-1.8.30.ebuild 1111 BLAKE2B a5b0b23b01e65a7e525a7d2a078728d4a6e08f0c16659724c3a05d82c64a78261b90b82b14f4704b13745d324589311c28215a0bb982b52698a61c46c9e5e336 SHA512 809df0ddefdbd700eb51e7d23a81b24390f497a7592bd93b737ffd41416ae317ae6d5b3d1e83c29f0ebb667af49188037d87f98c1e7987e440751589080ae7b4
+EBUILD htmldoc-1.9.11-r1.ebuild 1380 BLAKE2B 79e277f05ef278ae821f7539d6fa34d976913e11050a19977c5246b83bbdaa6b845db1c9be80213aac2ff5e00ec7d84ef51d5729b9a33727e34f763972b45a21 SHA512 41f78a9c16e5325ab896d085abc2e6b290252ff0be9f5d96fa559743db3dff7dfb734c21260997aeb9dbb8b2495573a05ded4d6a273ef3f5bbeaff7b025bc6d1
+MISC metadata.xml 253 BLAKE2B 866785a39539e5da350fc5ce3c2039b8e906bb106c7eab83df24a7a66f576e530ade48e9d63e1115ff5cb55617da9bb615f164ffc46f5f16bb93055419d4229e SHA512 cc9791ffe80b6f6064de254903f73d298247a57455a3031fc089abdf5a291a0546e6d8f64fb7886ce5d543af487971149ccf68092a8418e25ed58feece9fc033
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 61956c4652b9..cbff036765a3 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs xdg
 
 DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
 SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
 IUSE="fltk"
 SLOT="0"
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
new file mode 100644
index 000000000000..0ae71c6d5922
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs xdg
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fltk ssl"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=media-libs/libpng-1.4:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	ssl? ( net-libs/gnutls )
+	fltk? ( x11-libs/fltk:1 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Make sure not to use the libs htmldoc ships with
+	rm -r jpeg png zlib || die "failed to unbundle jpeg, png, and zlib"
+
+	# Fix the documentation path in a few places. Some Makefiles aren't
+	# autotoolized =(
+	for file in configure doc/Makefile doc/htmldoc.man; do
+		sed -i "${file}" \
+			-e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+		|| die "failed to fix documentation path in ${file}"
+	done
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with fltk gui)
+		$(use_enable ssl)
+		$(use_enable ssl gnutls)
+		--disable-localjpeg
+		--disable-localpng
+		--disable-localzlib
+	)
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIPPROG="true" DSTROOT="${ED}" install
+}
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
index 6f49eba8f496..f6208173d9c3 100644
--- a/app-text/htmldoc/metadata.xml
+++ b/app-text/htmldoc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">michaelrsweet/htmldoc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index bd7e200bfc30..394517abe2d7 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 656 BLAKE2B 40430fbaa7265cf7fe504e26df882eabfbcf6efa0e3a4e5cf6b18cd18d14f00a236e2939444d6a0b725e250786e5370acade47bfe8836a998ee095bc20d67e6c SHA512 cf0105d8e96fb7c8f3d361dd14cc88ec137c404bff29121f5ae7dd913c8b406995f9fbfab9e0536cdf6c7c6f5e8eaed1c3ebbcf1aa9ea13ea429da3df9529ea0
+EBUILD manpager-1.ebuild 627 BLAKE2B ea3e3eb726a4728147ef1baf445e3e41977f58c029947488124371c688d6762d71aa2074cd7dafb0dee351c14b1ed8f898b841206c894a5b7890c4b3608b864f SHA512 125298c133a14f809e5cdf634c7db645c1da01736ef4c3cbaa4f39fde72df0b66a825796e5192898a9c78241c5cb2521e3b8c42aae17fe787f63b16ab715ba00
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 947ef1d31bec..8d814266873f 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,7 +11,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 S=${WORKDIR}
 
@@ -26,6 +25,5 @@ src_compile() {
 
 src_install() {
 	dobin ${PN}
-	insinto /etc/env.d
-	echo "MANPAGER=manpager" | newins - 00manpager
+	echo "MANPAGER=manpager" | newenvd - 00manpager
 }
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 2745a6413036..5c110c63932d 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,9 @@
 DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
 DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
 DIST master-pdf-editor-5.6.80-qt5.x86_64.tar.gz 15996548 BLAKE2B a2e8ad77d3cb107786b9dcb152a399b60ed87da02c052d992105f541a948d8fa05116af7be2c935ec21f642d21483d1166ddfe5d2ab8f41caee2ce26856f63c3 SHA512 c722c055e86dfdb1d0821e5e25635646fe5905ae8e13451f1cad3f1f71e4332ddb5ebb661cdefee89b186bd4647593cf2e149326fd4b7ec3433bfc17fb1c76ff
+DIST master-pdf-editor-5.7.08-qt5.x86_64.tar.gz 16029448 BLAKE2B c37491e43d49ee6e3db223c878f49c4becb06f1d780f66918d8da132f83fb6e6a299aeefca670aab0e0b4f7ee159b3d042cb8a4492456660a2c020424ec60ed3 SHA512 fced1b551ced646a4ed52167cc856a251cb976d522433cf7bb3020c566a40c5564ab712d298d539f36e4af8ea147245477aab52f29aabc21a0d33542c8326afd
 EBUILD master-pdf-editor-5.3.22.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
 EBUILD master-pdf-editor-5.4.38-r1.ebuild 1585 BLAKE2B 7f8ef524fda232910acb17f42f90aac4781070bb841976616c50cd6a7d2cd5c5529647b59927ee8a75f9be09f5112cc516f0c75387a1e17802be6398d14c7c26 SHA512 1a9f0e9d6ed6935ea1c02f7badd19206c0d7b3ba9a59ea6949e858bfcc9d23c942fab255a312c18b37b781b0f3f80b92d371483319be011244dd1a563d7a3639
 EBUILD master-pdf-editor-5.6.80.ebuild 1189 BLAKE2B d67c9a3d9fd5e5b4df10b8f1aaefed1db2083e60d977d75d8f8a9aa1eec773796569d49822f9691193111321a87f3565bda1745d4d0806294e2b3ba460f74348 SHA512 8e0c0ad14900b871278098a9f6a5afedb9d61f48fe1957c088542fd70c39f657060bbf6969a94d7eebccf44588a32d9c8b7a157aa3b766029812dcfe132dad5f
+EBUILD master-pdf-editor-5.7.08.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.7.08.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.7.08.ebuild
new file mode 100644
index 000000000000..1300656eb4a5
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.7.08.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	dev-libs/nss
+	>=dev-qt/qtcore-5.12.9:5
+	>=dev-qt/qtgui-5.12.9:5
+	>=dev-qt/qtnetwork-5.12.9:5
+	>=dev-qt/qtprintsupport-5.12.9:5
+	>=dev-qt/qtsvg-5.12.9:5
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 06af22136398..3dade61968c0 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,15 +1,10 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
-AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
 AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
-AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
-AUX mupdf-1.17.0-cross-fixes.patch 4554 BLAKE2B 7956aea05180adc50805f56c000b0704cbaf1eb538889f1569e9f536984fb11581c36956edabb704f519285513aad01cbe0ba5a107838996937c2efa398a9c07 SHA512 0fc71632744a5fe15cace6c7b185b108e78b6676c03f204ba52e90826e7be17039b427a50697004798d51ea357828035e897d2d3ce91da95ea0f2a1a0c668fba
 AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e
 AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
-DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.17.0.ebuild 4369 BLAKE2B c4adf900b26b5a9cae62d270afbc7a574e15a8163aa7408a8b6af6d5f6ac1f64ae53a1d681f82015a5e095ef7b18f15097a99a74da9df6eb282000cf3609dcc4 SHA512 ea083a9a8d1f50e07fa0e2787a75aeede44a912e1de3297c2e0c9553faa6df526cb13e0d161a2e89d00c774a691802f44edf065375a7de552610053f16640653
 EBUILD mupdf-1.18.0-r2.ebuild 4122 BLAKE2B e8bf328f63f9b469a4e1a561ef97c029252fa69776ebbc0a4677ad6668757ee26c083842e78cac6807c86932b04437ed025b5e6a82b4492c6f898a04bf7dea3f SHA512 537ce8ff3f792ce0eca92f7a209d1984158b44f7ad214fa7d941a80ff19288b4ffce80e5a83508bff156aa287f100a8304c504d60a4831284fba7f46320520c3
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/files/mupdf-1.15-Makefile.patch b/app-text/mupdf/files/mupdf-1.15-Makefile.patch
deleted file mode 100644
index cff348d95e42..000000000000
--- a/app-text/mupdf/files/mupdf-1.15-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a9539342..e76b2c61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT
-@@ -187,13 +187,15 @@ generate: source/pdf/js/util.js.h
- 
- # --- Library ---
- 
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB = 
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
-+	$(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- 
-@@ -322,7 +324,7 @@ install: libs apps
- 
- 	install -d $(DESTDIR)$(docdir)
- 	install -d $(DESTDIR)$(docdir)/examples
--	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
-+	install -m 644 README CHANGES $(DESTDIR)$(docdir)
- 	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
- 	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
- 
diff --git a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch
deleted file mode 100644
index c9c37e2efac2..000000000000
--- a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 21 Jan 2020 22:33:49 +0000
-Subject: [PATCH] fg_gl2: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-[ 31%] Linking C executable bin/Lorenz_static
-/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1
-/usr/lib/ccache/bin/cc  -Wall -pedantic  -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
-   -o bin/Lorenz_static  -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
-ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
-  multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
-ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
-  multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
-```
-
-Note: duplicate definition comes here from 'fg_gl2.h'.
-The fix is to move declaration to a 'fg_gl2.c' file.
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Bug: https://bugs.gentoo.org/705840
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- freeglut/freeglut/src/fg_gl2.c | 12 ++++++++++++
- freeglut/freeglut/src/fg_gl2.h | 14 +++++++-------
- 2 files changed, 19 insertions(+), 7 deletions(-)
-
---- a/thirdparty/freeglut/src/fg_gl2.c
-+++ b/thirdparty/freeglut/src/fg_gl2.c
-@@ -27,6 +27,18 @@
- #include "fg_internal.h"
- #include "fg_gl2.h"
- 
-+#ifdef GL_ES_VERSION_2_0
-+/* Use existing functions on GLES 2.0 */
-+#else
-+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+#endif
-+
- void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
-   if (fgStructure.CurrentWindow != NULL)
-     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
---- a/thirdparty/freeglut/src/fg_gl2.h
-+++ b/thirdparty/freeglut/src/fg_gl2.h
-@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
- typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
- typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
- 
--FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
--FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
--FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
--FGH_PFNGLBUFFERDATAPROC fghBufferData;
--FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
--FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
--FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
- 
- #    endif
- 
--- 
-2.25.0
-
diff --git a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
deleted file mode 100644
index ae14f9bb5e49..000000000000
--- a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Refreshed patches based on:
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
---- a/Makefile
-+++ b/Makefile
-@@ -134,6 +134,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
- 
- HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
- 
-+$(HEXDUMP_EXE): scripts/hexdump.c
-+	$(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
-+
- FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
- FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
- FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
---- a/Makerules
-+++ b/Makerules
-@@ -15,6 +15,9 @@ OS := $(OS:MSYS%=MINGW)
- OS := $(OS:Windows_NT=MINGW)
- OS := $(OS:Darwin=MACOS)
- 
-+PKG_CONFIG ?= pkg-config
-+CC_FOR_BUILD ?= $(CC)
-+
- ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
-   # clang does not support these in combination with -fembed-bitcode
-   CFLAGS += -ffunction-sections -fdata-sections
-@@ -101,35 +104,35 @@ else ifeq ($(OS),MACOS)
- else ifeq ($(OS),Linux)
-   HAVE_OBJCOPY := yes
- 
--  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
--	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
--	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
-+	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
-+	SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
-   endif
--  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
--	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
--	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-+  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
-+	SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
-+	SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
-   endif
--  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
--	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
--	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
-+	SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
-+	SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
-   endif
--  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
--	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
--	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
-+  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
-+	SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
-+	SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
-   endif
--  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
--	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
--	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
-+  ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
-+	SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
-+	SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
-   endif
--  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
--	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
--	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-+  ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
-+	SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
-+	SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
-   endif
- 
--  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+  HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
-   ifeq ($(HAVE_SYS_CURL),yes)
--	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
--	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+	SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
-+	SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
-   endif
- 
-   HAVE_GLUT := yes
-@@ -140,14 +143,14 @@ else ifeq ($(OS),Linux)
- 
-   HAVE_X11 := not-unless-portage-tells-me
-   ifeq ($(HAVE_X11),yes)
--	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
--	X11_LIBS := $(shell pkg-config --libs x11 xext)
-+	X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
-+	X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
-   endif
- 
-   HAVE_LIBCRYPTO := not-unless-portage-tells-me
-   ifeq ($(HAVE_LIBCRYPTO),yes)
--	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
--	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+	LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
-+	LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
-   endif
- 
-   HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild
deleted file mode 100644
index 7841103a97a2..000000000000
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="X +javascript libressl opengl ssl static-libs"
-
-# 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.
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	>=dev-lang/mujs-1.0.7:=[static-libs?]
-	media-libs/freetype:2=[static-libs?]
-	media-libs/harfbuzz:=[static-libs?,truetype]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	>=media-libs/openjpeg-2.1:2=[static-libs?]
-	virtual/jpeg[static-libs?]
-	opengl? ( >=media-libs/freeglut-3.0.0:= )
-	ssl? (
-		libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] )
-		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
-	)
-	X? (
-		x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?]
-	)"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="opengl? ( !static-libs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.15-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-	# See bugs #662352
-	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
-	"${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
-	# General cross fixes from Debian (refreshed)
-	"${FILESDIR}"/${PN}-1.17.0-cross-fixes.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	use hppa && append-cflags -ffunction-sections
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h || die
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-		-i Makerules || die
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-
-	# 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
-
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl) \
-		HAVE_LIBCRYPTO=$(usex ssl) \
-		HAVE_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=yes \
-		USE_SYSTEM_GLUT=no \
-		HAVE_OBJCOPY=no \
-		"$@"
-}
-
-src_compile() {
-	_emake XCFLAGS="-fpic"
-
-	use static-libs && \
-		_emake build/debug/lib${PN}.a
-}
-
-src_install() {
-	if use X || use opengl ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1 || die
-	fi
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a build/debug/lib${PN}.a
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-
-	# Respect libdir (bug #734898)
-	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 2372e73cb7a8..276880d741e6 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,4 +1,5 @@
 AUX openjade-1.3.2-acinclude.m4 1922 BLAKE2B 1fe4500e45ffa14774b1c20257907732b9ff593c2a31146929859bc16cd9ac66619093a725bc60e1e7c1af812d4d1f87ab2742c737a424f95b43c3fd4e15aaca SHA512 76915d34e746f85eb15d2c79cc7a030070e5d266e3b2520d2321195f19c13aebc9a28fc4298006ab90a73148baebda568b3dc29517505224b78a8c244c2c0fdb
+AUX openjade-1.3.2-autoconf-2.70.patch 833 BLAKE2B 3cbb5c0582167663761e165711e0836f8da614f3c886f7ed39c50e2f313a423c56f3f16647604228d577448f454b39f066b8e6ec4b107c74848b72e9c77c076a SHA512 97e312d971671f15bf419e98afbe91a79af1ac840c489ae6b1a1c090b8afca90da9f84897c67bfa31bc1d9fad253e71e2ede7e03c1c825158efd9a2f217f6904
 AUX openjade-1.3.2-chmod.patch 311 BLAKE2B db74402d322ad11f1c4c5688df7db3c0b097182ca44518228cd29bbcd1bebce75da171ef460172153c88de7e19efeac2f2710499983d056fe702fcbf81210873 SHA512 90968a6ba70dfb75060859229e2ce8507bab9f9a5045f9b379ac810aaac6c99d7d229d988924254722b168007e6c72dbd38025ebd470095f2d0f5b11e2422f11
 AUX openjade-1.3.2-deplibs.patch 1506 BLAKE2B 44b81cd550202a21489bf14a1ddf6be2f27f3675671e644ddbec8580394d956a76f5d6d82cc4be7bd7bbf8d180c278675c0274cc79431553e7123b9448db3e07 SHA512 4a7df423c8b8ad15a1a39900c1bb6882157534c981a9c0679b2c6d71a435b6bf3adf27052799a9eb1dd4f6ecd7e19be72889d9a55c7511ffde9dd11f4c558d9e
 AUX openjade-1.3.2-gcc46.patch 2164 BLAKE2B 08d9ac31c20e3b2a27c92a0b14141404d7508a9cc269ca28e4af6405e7be560866df51e34270a98603b363aefc7ee1b0c7a3d6f882f0ec2f246bef4ab3a0b623 SHA512 df222938e4a04d27618540592e61b8d71fe42caaa4d8aeb90bfcd338efb1ff7903ea860dc460b65a69adf1ccf300a7d67459ff4950a35d9a35569fb8b3ed1438
@@ -10,5 +11,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r9.ebuild 4320 BLAKE2B be2066693ee8d272002d079206af78115987064aa470998915203bf67c9002d29146015930f069206cc50eac180e5314779c7e097b19b0b178dc352f12f57caf SHA512 f73682d2f7047b76aa391b0cd63690f88ccd8a1e9b511b002d8273ed4554fc534ed942d22820c634889727b2d9220a3214911428754b0c8565c6919457661cf5
+EBUILD openjade-1.3.2-r9.ebuild 4375 BLAKE2B 78353a8803b959ca267c6fea1743a2c30a8692b99d1b46d93473dcbafcc555de39bba9537f46bc16a4f2c625fab04c7b12dd2654295bd496003d19159bd4b6a4 SHA512 c36552c1ed71751f5dd220fc5177e3086aedd37bdb5ba6d8609e28c64d97fa8c1123648885e4a9fd2cf24cba38d7c5730b285ec9d77182555c186dfa8f4317d2
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch b/app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch
new file mode 100644
index 000000000000..07e1f629d8f7
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-autoconf-2.70.patch
@@ -0,0 +1,30 @@
+diff --git a/config/configure.in b/config/configure.in
+index 466c4ee..5af1de5 100644
+--- a/config/configure.in
++++ b/config/configure.in
+@@ -12,9 +12,8 @@ dnl
+ dnl  Credits: this autoconf script was largely "inspired" <g> by the
+ dnl  autoconf script around SP made by Henry Thompson.
+ dnl
+-AC_INIT(dsssl)
++AC_INIT(openjade, 1.3.2)
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE( openjade, 1.3.2)
+ TOP=`pwd`
+ AC_SUBST(TOP)
+ dnl
+diff --git a/include/config.h.in b/include/config.h.in
+index 2a6fd39..f8ccf1c 100644
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -18,8 +18,8 @@
+ #endif
+ #endif
+ 
+-#define OPENJADE_PACKAGE PACKAGE
+-#define OPENJADE_VERSION VERSION
++#define OPENJADE_PACKAGE "@PACKAGE_NAME@"
++#define OPENJADE_VERSION "@PACKAGE_VERSION@"
+ #ifndef OPENJADE_MESSAGE_DOMAIN
+ #define OPENJADE_MESSAGE_DOMAIN ""
+ #endif
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index de8ea2dace28..407f7b7a435b 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-no-undefined.patch
 	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
 	eapply "${FILESDIR}"/${P}-chmod.patch #487218
+	eapply "${FILESDIR}"/${P}-autoconf-2.70.patch #765034
 
 	# Please note!  Opts are disabled.  If you know what you're doing
 	# feel free to remove this line.  It may cause problems with
diff --git a/app-text/ots/Manifest b/app-text/ots/Manifest
deleted file mode 100644
index cf20fb470e33..000000000000
--- a/app-text/ots/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ots-0.5.0-automake-1.13.patch 435 BLAKE2B a4ea226fa489a0d42f73c1f2bc936b10dd875067190f0f1f2c824209ad38511beb7baf471438408564e5e66af7980714e64a1345fc5b7b27bfe7df9394860c63 SHA512 9ff7d9117ea12917b967c386054afbc25c2c9a9e85d9930fa7ecdf9e0c230a64a6f3689d22c94a796f00d13cd652fd6d7bcfe21c7ccc1649ee58f68ca5f89a11
-AUX ots-0.5.0-fix-installation.patch 514 BLAKE2B 932a241591dcc23b9a57070e23422f9ae8077061f812ab262d63ed069bac1d7984a66169d47640359dfbb41ed779928470d81b604b6695b9a8fbf5c6291c2104 SHA512 490974d43f3001220505fe9b77830b57f0ffc8faf0ab262c3de8f50c4ada75df64588441f20810e6958ed78de5a2e898c889cb686eddeeccfe497f42cbfa4664
-AUX ots-0.5.0-fix-underlinking.patch 863 BLAKE2B a85d3c6d4c004a3105935e013705e10e26159500f7dd95c2edf6fcccf1af9bfd1a1f8854feba37ed7b8473e8c272d355367eb795486cc65b820c264a4dd32ed6 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6
-AUX ots-0.5.0-math.patch 402 BLAKE2B 647dd793323f1eb6a470015053c066593a6fc4da95c3b36f3e0c7926e38ebd75997fd3482dffa3bda850f70fac5a8a65ad19cb6e725fd514d4e9d4b366d9fec1 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918
-DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
-EBUILD ots-0.5.0-r1.ebuild 1138 BLAKE2B 8eb53441c6d769f69da5432363c4702077808edb5b451e58ff4f3cb0d3591805eb2367cabd97220994c7888dad472cf3083bbc375d12f4a3fac85eba433d73a3 SHA512 5db848ddded743c7f6a4fbf79d3e0c6299f917d80d435ca624c32975bd5e557a6a88170f7d0a499a699bf8bd32b426f006d177c1763c1dfcbef3ed0a5c835512
-MISC metadata.xml 243 BLAKE2B aa2c4e92961faa40826e16a92582bb02cacbe1a10bd1e6e8d169560472923ce521ec642b1b0175ad5beac315e575d65c9a23466b08cc95eb9605ed2376af50d1 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774
diff --git a/app-text/ots/files/ots-0.5.0-automake-1.13.patch b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
deleted file mode 100644
index 074eb0e53a83..000000000000
--- a/app-text/ots/files/ots-0.5.0-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ots-0.5.0/configure.in.automake-1_13 ots-0.5.0/configure.in
---- ots-0.5.0/configure.in.automake-1_13	2007-04-08 20:12:42.000000000 +0200
-+++ ots-0.5.0/configure.in	2013-01-09 02:31:52.690211708 +0100
-@@ -34,7 +34,7 @@ PACKAGE=ots
- 
- dnl Specify a configuration file
- dnl Initialize automake stuff
--AM_CONFIG_HEADER(ots-config.h)
-+AC_CONFIG_HEADERS(ots-config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $OTS_VERSION)
- AM_MAINTAINER_MODE
- 
diff --git a/app-text/ots/files/ots-0.5.0-fix-installation.patch b/app-text/ots/files/ots-0.5.0-fix-installation.patch
deleted file mode 100644
index 757f4f86b80b..000000000000
--- a/app-text/ots/files/ots-0.5.0-fix-installation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dic/Makefile.am~	2003-07-22 16:56:03.000000000 +0200
-+++ dic/Makefile.am	2009-06-01 00:40:17.000000000 +0200
-@@ -1,7 +1,7 @@
- DICTS=bg.xml ca.xml cs.xml cy.xml da.xml de.xml el.xml en.xml eo.xml es.xml \
-       et.xml eu.xml fi.xml fr.xml ga.xml gl.xml he.xml hu.xml ia.xml id.xml \
-       is.xml it.xml lv.xml mi.xml ms.xml mt.xml nl.xml nn.xml pl.xml pt.xml \
--      ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml en.xml
-+      ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml
- 
- pkgdata_DATA = $(DICTS)
- 
diff --git a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
deleted file mode 100644
index dd9295930c33..000000000000
--- a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig	2007-04-08 20:17:23.000000000 +0200
-+++ src/Makefile.in	2008-07-05 02:16:42.000000000 +0200
-@@ -108,7 +108,7 @@
- 
- lib_LTLIBRARIES = libots-1.la
- 
--libots_1_la_LIBADD = $(OTS_LIBS)
-+libots_1_la_LIBADD = $(OTS_LIBS) -lm
- libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
- libots_1_la_SOURCES =  	libots.h			article.c			dictionary.c			grader.c			grader-tf.c			grader-tc.c			grader-tc.h			html.c				parser.c 			text.c				stemmer.c			highlighter.c			wordlist.c			relations.c
- 
---- src/Makefile.am~	2007-04-08 18:21:51.000000000 +0200
-+++ src/Makefile.am	2009-06-01 00:28:53.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- lib_LTLIBRARIES = libots-1.la
- 
--libots_1_la_LIBADD  = $(OTS_LIBS)
-+libots_1_la_LIBADD  = $(OTS_LIBS) -lm
- libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
- libots_1_la_SOURCES =		\
- 	libots.h		\
diff --git a/app-text/ots/files/ots-0.5.0-math.patch b/app-text/ots/files/ots-0.5.0-math.patch
deleted file mode 100644
index da964c25f612..000000000000
--- a/app-text/ots/files/ots-0.5.0-math.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude='*~' -Naur ots-0.5.0.orig/src/grader-tf.c ots-0.5.0/src/grader-tf.c
---- ots-0.5.0.orig/src/grader-tf.c	2008-05-17 12:17:23.000000000 +0000
-+++ ots-0.5.0/src/grader-tf.c	2008-05-17 12:17:37.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "libots.h"
-+#include <math.h>
- 
- /*Grader - using the Term frequency algorithm. Will give each line a score*/
- 
diff --git a/app-text/ots/metadata.xml b/app-text/ots/metadata.xml
deleted file mode 100644
index 88f5ac008b4a..000000000000
--- a/app-text/ots/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">libots</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
deleted file mode 100644
index 0dd8f38da851..000000000000
--- a/app-text/ots/ots-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Open source Text Summarizer, as used in newer releases of abiword and kword"
-HOMEPAGE="http://libots.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/popt-1.5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-src_prepare() {
-	# ugly ugly hack, kick upstream to fix its packaging
-	touch "${S}"/gtk-doc.make
-
-	epatch "${FILESDIR}"/${P}-math.patch
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-	epatch "${FILESDIR}"/${P}-fix-installation.patch
-	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	# bug 97448
-	econf \
-		--disable-gtk-doc \
-		--disable-static
-}
-
-src_compile() {
-	# parallel make fails, bug 112932
-	emake -j1
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	rm -rf "${D}"/usr/share/doc/libots
-}
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 3c80bbe2b259..a0280f082d9f 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,3 +1,5 @@
+DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
 DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
+EBUILD pandoc-2.11.3.1.ebuild 6170 BLAKE2B 097a59b21710bb75bb17f3d93cca07918a041eecc9517d0e8476c44af174f5f6b227d9bc9065d705b552841a12d3068c40e0ac9a64bb36c9c0ee2a0988df3fb5 SHA512 5a2a9266d3285952688af54ed71f7d34eeb0612cf2c1b0d147597132e3393411edc73393759f5389496378d66b27d2e3e5241dcf920121bde8f750486ae9a21c
 EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
 MISC metadata.xml 941 BLAKE2B 04e284ba78b78c6a88999705ce10650fbe854fd5154bc197b938de1e7b12689382c0c19b04c522366fb51c50f7f0b03d7cdb875ee6840816613bfc96f7d1d7c6 SHA512 2cb5cdae868ec8345655e18303a9fe1bae9c4eef4ee2b2da3f302b2e520af70095f06f78cbf0de1cbed524ddccb43742a73a5ce0e3710876ce83d25f4f19f77f
diff --git a/app-text/pandoc/pandoc-2.11.3.1.ebuild b/app-text/pandoc/pandoc-2.11.3.1.ebuild
new file mode 100644
index 000000000000..d51982085be4
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.11.3.1.ebuild
@@ -0,0 +1,114 @@
+# 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/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 247496ab72f8..fd7604f94a3f 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -3,5 +3,5 @@ DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633f
 DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
 EBUILD pdfarranger-1.3.1.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
 EBUILD pdfarranger-1.5.3-r1.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
-EBUILD pdfarranger-1.6.2.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
+EBUILD pdfarranger-1.6.2.ebuild 1211 BLAKE2B 493036de2cb2802329cc3c33144fcfc084e23c8c33ba0718f8ca714832b009f62d99e7591bf202a74ead4769a6fc0fb131255c4181bcb3dfa72a884a9f059ed1 SHA512 980edb6863241bbe83129d2916f7285fb14e793b5c28ac4a9531d68e92f1075b5a2d6fccf2d2e94e490b2695ea51333da2fece276ea2ba8e71d31db3e0f95480
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
index ca5563883b52..f3d0a8fa4fe9 100644
--- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
@@ -1,34 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 optfeature xdg-utils desktop
 
 DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
 HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
 SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+
+RDEPEND="
+	app-text/poppler[introspection,cairo]
+	dev-python/pikepdf[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
-	app-text/poppler[introspection,cairo]"
+"
 DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
 
 src_install() {
 	distutils-r1_src_install
-	insinto /usr/share/icons
-	doins -r data/icons/hicolor
+	for x in 16 32 48 256 scalable
+	do doicon -s ${x} data/icons/hicolor/${x}*/*
+	done
 }
 
 pkg_postinst() {
+	elog "Optional dependency:"
+	optfeature "image file import" media-gfx/img2pdf
+
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
diff --git a/app-text/peg-markdown/Manifest b/app-text/peg-markdown/Manifest
deleted file mode 100644
index 221a0c31a3c4..000000000000
--- a/app-text/peg-markdown/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST peg-markdown-0.4.14.tar.gz 85692 BLAKE2B a52b894a03921595850d460ced20257096b5a4afb00fca5849c64f7506fd2f39946f2ad13bec50f5032610669bdb14d4f789ceb509b533040a90f228fc443879 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e
-EBUILD peg-markdown-0.4.14.ebuild 946 BLAKE2B 769b8c31dc317274d3a6bf0dda8671896ca16ff3b6d3961ef9c19a114ceedb8a99123f0f8e05396b6933361052fed42fad62071f0a2fea5211644f25787bdd91 SHA512 73ae050e4802e26b89e1ffea93b361f472cd2f4a438b76438328e571beab421337e632d29d3baa35e776ccb371df2d507604c93fd8637e4fc0568fa38183d04d
-MISC metadata.xml 248 BLAKE2B 7ddf3697339e74ac175d16fb1ccf731dc8ff6c0db6d848f0b8d51904bbfb025d6e98efa8f7805f2814d6007417521fae18599808ac35e4f97911168d17c9cae7 SHA512 6d524d79b42983177d572f1628dcaa6ca09a5e0530c4a80b8bda70ea0d893413d99ccd23dfc4aada2454a5e231c0791364ba4fc5403740a816ee40bcb6a95ec1
diff --git a/app-text/peg-markdown/metadata.xml b/app-text/peg-markdown/metadata.xml
deleted file mode 100644
index e22fa2dfac69..000000000000
--- a/app-text/peg-markdown/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">jgm/peg-markdown</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
deleted file mode 100644
index 66f95d01bb91..000000000000
--- a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Implementation of markdown in C, using a PEG grammar"
-HOMEPAGE="https://github.com/jgm/peg-markdown"
-SRC_URI="https://github.com/jgm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	dev-util/peg
-	test? (
-		dev-lang/perl
-		virtual/perl-Getopt-Long
-		app-text/htmltidy )"
-
-src_prepare() {
-	rm -rf peg-* || die "rm failed"
-	sed -i \
-		-e 's/^PROGRAM=markdown/PROGRAM=peg-markdown/' \
-		-e 's/$(CC) `/$(CC) $(LDFLAGS) `/g' \
-		-e 's/^\t$(LEG)/\tleg/' \
-		-e 's/^$(PEGDIR):/dummy:/' \
-		-e '/$(PEGDIR)/d' \
-		-e 's/$(LEG) //g' \
-			Makefile || die 'sed failed'
-	sed -i \
-		-e '/strdup/d' markdown_peg.h || die 'sed .h failed'
-}
-
-src_install() {
-	dobin peg-markdown
-	dodoc README.markdown
-}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 2d21dd8c9ec9..1eb098b8ee5a 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,11 +1,5 @@
-DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb544c48be8c36ba201ba1420168a7f32ebfe2e5754e8af679557df29093e0fd550c991b5201e4246be827952b3d3 SHA512 b73c0839b08905052d90ed78645cc9fb4fda4a0fa803db7b46f3d77a2c2f7e8cec52173834b1e1f008f3a3475a7d913362d22e1ebece11187a90c9035b81de94
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
-DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
-DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
-EBUILD qpdf-10.0.1-r2.ebuild 1336 BLAKE2B af9deec49e7152963e27e1eb9991459e5fc69894bfb3bfd46042a6dc4e96937adfc871d119155fa2bb53a037aa4450b1bd41f428dc537254063225fb3b501fb2 SHA512 a0e6b234899a8c812d6f5e913d4a67f4c3b859d1efa9d39c5bbe5a7ffb879326b6c9db1a732dcd5b1a4542f99747eb7d68953d3c25632ec0d146b0a680e1216e
 EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
 EBUILD qpdf-10.1.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
-EBUILD qpdf-9.0.2-r1.ebuild 1267 BLAKE2B 244e8677ebb6b50dc68c67cc2d873d30635276305a39bd6025d90c6309fdc8f225a14f1c35ac30ec76b10ed92d6e8a9635b86844ca360a5eaceb2643bdf3a71c SHA512 0f8dfc725276b465723fcf92a6901a8dd8f5dab868dcd08e81dc38697d5cf88add2bc5dc9c8a25ee28466ba31a6e8d661b703f4cc7b4be8b3fc04db425478b7a
-EBUILD qpdf-9.1.1-r2.ebuild 1201 BLAKE2B 958fdeaf58417998a807966981c86e3a9631fffb56f3147b63ef09b191fd1678b7e3aa32596b654b936b2cfe406172677c9388a3029ee1b4ed7284f35f456aba SHA512 061a807368bd0a0680fff293b8bbb2561a4563ae4b62dfc67b96514b6ffe261ba8dd45cd8098046df7af26c127143f45617680d699a8c67a37f1d2a194289f8c
-MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
+MISC metadata.xml 394 BLAKE2B 9f082b9d232876cce300488a5e4edd5ac46390af0a5cd21639093571b95ffde9771d74eb1ae664522796f6250c6e9c49e23f5e37e9819454dcd5b99ec97ba798 SHA512 b194bf416b11f76e04f300e0d3b6748302c9cfbda1f949f6caf9da07f297c26edbb65ada5edad820fa16c9fd971ebdc8202ad4f273ae5de3d01136f2cd95f6af
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index fda6f880d912..f203b11e95cd 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -5,9 +5,6 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
-	<use>
-		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:qpdf_project:qpdf</remote-id>
 		<remote-id type="sourceforge">qpdf</remote-id>
diff --git a/app-text/qpdf/qpdf-10.0.1-r2.ebuild b/app-text/qpdf/qpdf-10.0.1-r2.ebuild
deleted file mode 100644
index 0fbefc46fb5a..000000000000
--- a/app-text/qpdf/qpdf-10.0.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/28"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples libressl ssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff(+)]
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		$(use_enable ssl crypto-openssl)
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL="/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-9.0.2-r1.ebuild b/app-text/qpdf/qpdf-9.0.2-r1.ebuild
deleted file mode 100644
index 81bb26e22d5c..000000000000
--- a/app-text/qpdf/qpdf-9.0.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/26"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff(+)]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-9.1.1-r2.ebuild b/app-text/qpdf/qpdf-9.1.1-r2.ebuild
deleted file mode 100644
index 38db2a1d0318..000000000000
--- a/app-text/qpdf/qpdf-9.1.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/26"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/gnutls:0=
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff(+)]
-	)
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-implicit-crypto
-		--enable-crypto-gnutls
-		--enable-crypto-native
-		--with-default-crypto=gnutls
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 703d411ff9d2..169fc93714f1 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,6 +1,6 @@
 AUX qpdfview-0.4.18-qt-5.15.patch 342 BLAKE2B 34ecd868ba9f38f43433f425c173b5cf07c0c9a2c7097e62d0af1b85bf49a3ef2f68064be88a12f300356633471ea8f04b69b66f9874cb5a8dbae3962021402b SHA512 ac6a742b957eb192117aece45cef8f2a9d76fe45d4cc87246dba8e52a15ac11c6892175fd73c8af3bd22a34ff36645828a5f12d66c240b6305d9621387fc3261
 DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
 DIST qpdfview-0.4.18_p1.tar.bz2 448818 BLAKE2B 690f93c7f0af376e2b60d69a9802cdb159a97eb66b572a913badcd7ce3b9303d69bf8fbb359b5aa09ad1c63b1b6865e3602c8dc9cdad2506a43273d410a64d89 SHA512 41152596e39e6084e4e46c1aca28dfa4c619bf31068ee3272c6119793da5d99c58868ecf682ed0dc81e740f20193372e2780cf7d7fb917545662c93e6a2a1b4a
-EBUILD qpdfview-0.4.18.ebuild 2259 BLAKE2B f36c70e222fe667853016cd5a4b35c086b2224ea1b65ee23c5d84e6e4baaef395f5cb865b3b8b16a6f217a50f955426e84eef5a33395e2a1ada12c889c74fba9 SHA512 ef3481e73d7bd71965712604cdddfb3d3257f9440aa5eedb1bb348ad95072054b2474a322befdc37c7802846732ff308bd3d882fbf4c36d51e24af4d44ce04b5
-EBUILD qpdfview-0.4.18_p1.ebuild 2204 BLAKE2B b90c8b9bade168972e39f6d3565252c94749d5121163aaeb1abf7f1e2a717ad6eedba35f389e56593277f4f414d5d65460e717ac38409dca728c7211e2e50760 SHA512 c010cb9689608e032893ed2fd0de134d6451dc635749bfaeaa149f5d6dbc63546c955fb016390c659e6afdce8797709d6c4f3bac9b528a2ba121fc7a4d9f3df2
+EBUILD qpdfview-0.4.18.ebuild 2259 BLAKE2B 4ef4c7f26903e1023a994906e37cdac704917ca93faebbf49954f668ba50b98d6bfa93f0cbd790aface623178da599a06f8c8e335fe6dcebc36c81ce3b638c98 SHA512 a104887cc16e4e36d087c462033c48ffebec60ac647019c48e8e81c07095330d23e2b4893399907cdc4a478061923d62975fe3f84eab40cde9dd8defd856a9b1
+EBUILD qpdfview-0.4.18_p1.ebuild 2204 BLAKE2B dc2999067507e3d0eda29812be4cc738f3ea0f46253b835970a8ffc0008893bdf8f13feeae42897a20aaa087ba39b567ef5ce72696866bd1ceb6aa1aacef00f2 SHA512 8a9126fffa6e382f63dc29303d4d672affdf2c68c11c7b6be98d9d01c68681bdb6bf6d097f148b43ed6f95acd8f128327943cebdc5a9fca45c3e9da1b8dc6e2c
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18.ebuild b/app-text/qpdfview/qpdfview-0.4.18.ebuild
index de52c7c7b922..4b30af5a4a67 100644
--- a/app-text/qpdfview/qpdfview-0.4.18.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18.ebuild
@@ -75,7 +75,7 @@ src_configure() {
 
 	local myqmakeargs=(
 		qpdfview.pro
-		CONFIG+="${myconfig[@]}"
+		CONFIG+="${myconfig[*]}"
 		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
 	)
 	eqmake5 "${myqmakeargs[@]}"
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
index e7a36da831a8..7587ade6b21b 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 
 	local myqmakeargs=(
 		qpdfview.pro
-		CONFIG+="${myconfig[@]}"
+		CONFIG+="${myconfig[*]}"
 		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
 	)
 	eqmake5 "${myqmakeargs[@]}"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 20d66d9b8c5b..fb3f3e21698c 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -3,5 +3,5 @@ AUX sword-1.8.1-icu61.diff 4838 BLAKE2B d0ea686e4fedd8a6cfe242d1048f85b047d41442
 DIST sword-1.8.1.tar.gz 2449503 BLAKE2B 4cc130ade49211dd4def6d9410ad6a0f01b35d11df246e26bb7fd0ee5c27ef02ee06ed3ec33c7becd140fa303b4fb4b3d4ba4d62de78b86be343949d5fcf7c6d SHA512 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
 DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
 EBUILD sword-1.8.1-r1.ebuild 1818 BLAKE2B bfb01f3537feccb057fd34fc0784af7ea955164e2b6f195ad10f85f0a5759ba14e3626895d11f4ed31f43ecb3c0d479330c75bbf9e5622b522827390f76c72d4 SHA512 05577095fb4cede4cb549dc18af636937523bf6089fa70e0c73b91464799e2eb134ab0179c293fa5ec2acb5ee8e328fd5c3e19aef5b298abb2757d15841f2cf4
-EBUILD sword-1.9.0-r1.ebuild 1057 BLAKE2B 2b50b4de24835408d11622eff9d9e6fa0c36537bffacfb9966d821e6f20334d86bd8398b08459cd53bba49cac2d50aec3e72ecca5b247aa3e6a3538569f2eb18 SHA512 50ec3ede9472a835b0549c69dcd8c3c344f5bd6173a9c7a1d9f5a16567cf1da976250a30e39b9900f8e82bbc8ddff55f3ed4f152062ac19085209a77bdc70aa3
+EBUILD sword-1.9.0-r1.ebuild 1056 BLAKE2B 9c02924e068469f1d1a8d25d255f2c51865405a8b2eb342c2f0e01773fbee6d846c153721c9dafc1a3dba53d669c32c46cb73737a5360ecadce4b0240d8b83b9 SHA512 e55a53f40063e1797485161b6eb957fb8325bd661062a9b4bf55ac24bd164e135a9439ccd7ad311428e493abcd621e9930826e12888f197e7ef111fec446456e
 MISC metadata.xml 593 BLAKE2B 945677f76cbe16a77999ede8bd2c7ee6926c2aade70dbc1a8125fa30c73130601f21a47e4ec34a70121ea7b61c98c10748ec17933bde0d98d7d32cd5e28cb37b SHA512 4c11d1b66bb60f21d8706f25f4541147ece1a75f5a1676c75d7be39b8af982bb35fd743fe040204415c3a89f8729c7bb6e83e3bd66ccd5114b4d3739b876a4d8
diff --git a/app-text/sword/sword-1.9.0-r1.ebuild b/app-text/sword/sword-1.9.0-r1.ebuild
index edd796fc48f7..2b00098f030a 100644
--- a/app-text/sword/sword-1.9.0-r1.ebuild
+++ b/app-text/sword/sword-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~ppc-macos"
 IUSE="clucene curl debug doc icu"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 0555a3f7ee61..74ad11177929 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,4 +1,6 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
+DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
+EBUILD teckit-2.5.10.ebuild 1042 BLAKE2B 6631e857edeb2de8e95fd9aac560adbc75460f42fb8b43e6927e38a1dda2523f5cba292c57ed355048b92c076dafc2a27337c41ec56744c5ccc90b26f6bb8db2 SHA512 10bc8ad67e0547961179a386c570208e5f0cab284fb2641c925c823a6711cf8cc2534fc8cdac81cb06fc3bf5f082fc8ffea991e5f7efee59d3f320db2ff1223f
 EBUILD teckit-2.5.6.ebuild 1098 BLAKE2B 9436882972ea3e20da426aae4bb5c68864bb339287cc71fd78f53ea1bc1b04b6ef7dbcfb067adbf96cf494efb0d82b852e66062449feed67f52d2873e072eaec SHA512 bad1481c8080d3639edaddea4d698d4fd45138e8aea40c21ce51fe86799f21e610460bc749cdbaba6376031a3a5b2ee3ba5672525507fa4f689ba28024545da2
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
new file mode 100644
index 000000000000..17421130f81a
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Text Encoding Conversion toolkit"
+HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
+SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-libs/expat
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	rm -f configure || die
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_test() {
+	cd "${S}/test" || die
+	chmod +x dotests.pl || die
+	./dotests.pl || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index a2c22d11f588..506d493d6e20 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,4 +1,4 @@
 AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
 EBUILD wgetpaste-2.29-r1.ebuild 689 BLAKE2B 3f803efebbe86ace4e41a78f358d820f2609f534b6b976cecebef1223754be95ec1301f4c7d03e50579a7a2e7586f7092deab40a224a660a2c2c86b38ea8ec81 SHA512 4818b22025d7b3e985479596558a3832371df3df2e5f9862c08eba3011d3bb022a87c3131ac6e421e99381a3bfb09468be133394e1b5470907f21396311bae13
-MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
+MISC metadata.xml 388 BLAKE2B 62b99789c15efdac7b00312ab6fec1964398d4adb5b75f495490a7bbf970f1f42acb5b151ed9c093c31e909cfd2ad124795240aefb1ee672776282ef0f8fc0a1 SHA512 1e9aa5b9d8a6d02926fbbe31421d62f00fa1d1e0ad6063a356c49068a7541ee267b8168b04d5a954e3c79138103ca551be41e289346e67fb0348717b8aea694e
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 1aa3c4c3cd76..582546ac73ce 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 232135943ee8..85eb096a38ae 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,8 +2,10 @@ DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b139
 DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
 DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
 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
 EBUILD xapian-omega-1.4.14.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
+EBUILD xapian-omega-1.4.18.ebuild 1161 BLAKE2B 744676b9a717d1c3959fc0d1b896a95e1d6bf5004f141fb46445f3053df7813d3da20abf9bf59246e4e4bdc03af74a76ae573e7821043227d256f72bc05e5cd5 SHA512 76d476db67cb3f0f35c3e8465126aaf3e9be968d1a5e480318864d5c1d69333af2aef1125cb7b1e8cb53bb697543e91cee721265b724f5c778dd492ec4ee30ce
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
new file mode 100644
index 000000000000..5225e3e64c6c
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index aa7c8deb4097..666c218b5f29 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,5 +1,7 @@
 AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e
 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
+DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
 EBUILD xournalpp-1.0.18-r1.ebuild 911 BLAKE2B a00d8ba904bfa33a5323d8dc8a80c457886263e08240e364423f99b26b4278e4d6f54532207e7a33a122b8b7bd9b7dac2083697e4f756277bf616824b88cb2ab SHA512 019fabd488c5418652583c15aa0e06f13a3d68eec69b4dce656ca27c5d464201307c31c45c501e96ef86021de8b6ca8e93e386dc5abc56d61fee2e5c6e84110f
-EBUILD xournalpp-9999.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
+EBUILD xournalpp-1.0.20.ebuild 908 BLAKE2B f37fa2a3ef97ecd6aec6423cdef367b08512076e004a3199b4bda0fbe383be825a4568fa8163a28b408d47a6ff5cecbbbc7518c78ab10a47a7537485bb0b3c6b SHA512 f976e319e282a470af98f460f8727bac5686fcd892576b3c1b4a912f02142b459cd7ba10ca076d4609f5918ebcf1c833dd2aab6b36829df319ce3035f63e48fe
+EBUILD xournalpp-9999.ebuild 840 BLAKE2B e05e8c13c6c3af5a29b49bc98e6e25194dd8a4ec86e5a850b1112ed67fad99a9beed3789a42261d3c54c040e0f08ea1e7fd0dcc6fad8e60b0542ad621ed02c2b SHA512 bec39a5bb6b87ec47fdf8afc1602ea5239d2a5d0c416538419fa4434eeaa4ffc1210132a0b1a75d963216675c6f83b8433cee825ff186e216e53c85cc4e35572
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/app-text/xournalpp/xournalpp-1.0.20.ebuild b/app-text/xournalpp/xournalpp-1.0.20.ebuild
new file mode 100644
index 000000000000..8d5be9b04fe0
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.0.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	media-libs/portaudio
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.18-nostrip.patch" # bug 745255
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 7057d336d41d..6ef5cab3894d 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -41,5 +41,5 @@ BDEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /app-text
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)