summaryrefslogtreecommitdiff
path: root/app-text
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/Manifest.gzbin51052 -> 51213 bytes
-rw-r--r--app-text/ansifilter/Manifest2
-rw-r--r--app-text/ansifilter/ansifilter-2.16.ebuild2
-rw-r--r--app-text/asciidoc/Manifest4
-rw-r--r--app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild2
-rw-r--r--app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild2
-rw-r--r--app-text/cherrytree/Manifest5
-rw-r--r--app-text/cherrytree/cherrytree-0.37.0-r1.ebuild54
-rw-r--r--app-text/cherrytree/cherrytree-0.38.9-r1.ebuild56
-rw-r--r--app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch17
-rw-r--r--app-text/convmv/Manifest2
-rw-r--r--app-text/convmv/convmv-2.05-r1.ebuild38
-rw-r--r--app-text/convmv/files/convmv-2.05-manpage_nocompress.patch16
-rw-r--r--app-text/discount/Manifest3
-rw-r--r--app-text/discount/discount-2.2.6.ebuild2
-rw-r--r--app-text/discount/files/gethopt-undefined.patch12
-rw-r--r--app-text/djview/Manifest2
-rw-r--r--app-text/djview/djview-4.10.6-r2.ebuild (renamed from app-text/djview/djview-4.10.6-r1.ebuild)14
-rw-r--r--app-text/djvu/Manifest4
-rw-r--r--app-text/djvu/djvu-3.5.27-r1.ebuild68
-rw-r--r--app-text/djvu/djvu-3.5.27-r2.ebuild4
-rw-r--r--app-text/flpsed/Manifest2
-rw-r--r--app-text/flpsed/flpsed-0.7.3.ebuild4
-rw-r--r--app-text/grip/Manifest2
-rw-r--r--app-text/grip/grip-4.2.0.ebuild27
-rw-r--r--app-text/highlight/Manifest5
-rw-r--r--app-text/highlight/files/highlight-3.42-qmake-fix.patch32
-rw-r--r--app-text/highlight/highlight-3.42-r1.ebuild91
-rw-r--r--app-text/highlight/highlight-3.57.ebuild2
-rw-r--r--app-text/htmlmin/Manifest4
-rw-r--r--app-text/htmlmin/htmlmin-0.1.12.ebuild18
-rw-r--r--app-text/hunspell/Manifest2
-rw-r--r--app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch22
-rw-r--r--app-text/hunspell/hunspell-1.7.0-r2.ebuild89
-rw-r--r--app-text/libspectre/Manifest4
-rw-r--r--app-text/libspectre/libspectre-0.2.8.ebuild50
-rw-r--r--app-text/libspectre/libspectre-0.2.9.ebuild4
-rw-r--r--app-text/podofo/Manifest4
-rw-r--r--app-text/podofo/podofo-0.9.6_p20190928.ebuild (renamed from app-text/podofo/podofo-0.9.6_p20200526.ebuild)15
-rw-r--r--app-text/q-text-as-data/Manifest4
-rw-r--r--app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild (renamed from app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild)23
-rw-r--r--app-text/recode/Manifest3
-rw-r--r--app-text/recode/files/recode-3.6-recode.texi.patch11
-rw-r--r--app-text/recode/recode-3.6_p20-r1.ebuild3
-rw-r--r--app-text/scdoc/Manifest2
-rw-r--r--app-text/scdoc/scdoc-1.11.0.ebuild44
-rw-r--r--app-text/texlive/Manifest2
-rw-r--r--app-text/texlive/texlive-2020-r3.ebuild (renamed from app-text/texlive/texlive-2020-r1.ebuild)13
-rw-r--r--app-text/txt2man/Manifest2
-rw-r--r--app-text/txt2man/txt2man-1.7.1.ebuild25
-rw-r--r--app-text/vgrep/Manifest3
-rw-r--r--app-text/vgrep/metadata.xml12
-rw-r--r--app-text/vgrep/vgrep-2.3.1.ebuild33
-rw-r--r--app-text/xapers/Manifest3
-rw-r--r--app-text/xapers/metadata.xml3
-rw-r--r--app-text/xapers/xapers-0.8.2-r1.ebuild34
-rw-r--r--app-text/xiphos/Manifest4
-rw-r--r--app-text/xiphos/xiphos-4.0.6a-r2.ebuild2
-rw-r--r--app-text/xiphos/xiphos-4.1.0-r2.ebuild2
-rw-r--r--app-text/zathura/Manifest8
-rw-r--r--app-text/zathura/zathura-0.4.3.ebuild4
-rw-r--r--app-text/zathura/zathura-0.4.4.ebuild4
-rw-r--r--app-text/zathura/zathura-0.4.5.ebuild2
-rw-r--r--app-text/zathura/zathura-9999.ebuild4
64 files changed, 443 insertions, 493 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e51c26e04faa..b82900d4008d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
Binary files differ
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index a94bd67f3145..3ca5f22f58bd 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
-EBUILD ansifilter-2.16.ebuild 1004 BLAKE2B f80c1c12d0e25bc8596b4432bc8c1c72129650a2377d11d57b022fe17d67a1bdf1a957121bc88b0402f94b87a23f2f12f32bdb0cbf10dfdb2fe3d98fe5955b35 SHA512 411f165414fea2f9832135a2b9702e1f9d41cf41f00968e801cff6864ca3b2a34944eec63362c6eec0815def4094b124ba79dc05538db1a53486019eb89b4d01
+EBUILD ansifilter-2.16.ebuild 1009 BLAKE2B ee7751cce471e0093badb09bf41e5369cebaf6a17542c019d06a5a37f70b5ba6ccc6d94e6d3fece85ba24b1cb8e08e0b68e4634ea018608ad5947b72842fea5d SHA512 ca385e86a7c2b698369f939498fa85fd50e03d6ac5eee42acffca46e5650b24b93c724da4fb248df3a45ec6458b968dffd1245fe04eb3440c84301e002e4a0ce
MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
index 0481ddcea6a1..d6ef6e4cc8c8 100644
--- a/app-text/ansifilter/ansifilter-2.16.ebuild
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
IUSE="qt5"
RDEPEND="
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index e545342fb9eb..d20c2bf7afe8 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3
-EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2619 BLAKE2B f0ae58d358cd1399aedac9776787d2a0e28261521d31b0bf6ca9fc02777469cbf5ac8d992eb51eb82a968510a1abb33dba35a24a9e9faa196acc172d60434db3 SHA512 9756d4447b3d8e77a21a182dbb865ce8ce1af6c523258aabb4b5aa7daedd49e7d446cca88654f8197d61e8b7157d2db631a1c08fdfc7f36b920d4f5cea33a183
-EBUILD asciidoc-9.0.0_rc2.ebuild 2717 BLAKE2B af40448addb4dc1cab464a8770573a63d185024a64eec0cb3c3fede736e8918e27d81896e9511b63979a3eecb44bae416011e011fa1166555f711abcd77e60d0 SHA512 cc6e444bbc783d2f4ef336c41caeab9ee76895beafc9ed72088ab6cbaa4716865245acca901500d5552e470eb5de6aae0638247e31a0c0669d902aa5d8705eba
+EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B e29260b9b80ccd796662ea0ce4d207a66c4b99ffc371ff7ad02e38350ae9564a21c98740d4de7fb967ebb17cba1ff243e19e51e575ddcf08fa32e34549b2e255 SHA512 21e1a6e7d72d96265be242b2234faff0aa777f22895a4b051fab26be6e36c0d0b9a91463097e87c485cde39168e3ed4bc0033d9eaa164407f051db806281ad58
+EBUILD asciidoc-9.0.0_rc2.ebuild 2718 BLAKE2B 7663a75927e76607a54d7ab8d22b27feb041881cb229f66fafaff69848fbcb725ded0bed61f18252160bf323f4b448fbe0896f2ba65d260fa266672db22bdd45 SHA512 7108bca1b61ac986342c6b8f513ce4cedb6e82913078a6971fbfebea8e4917eee13bb68eb922f20feecdaa409d62b4573b12abe40ea5eacf5deea0e58f17c2d6
MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
index 8d8cc443b8dc..df890701933c 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7} pypy3 )
inherit autotools python-single-r1 readme.gentoo-r1
DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
index c32f51787ff6..a9c28a003493 100644
--- a/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.0_rc2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
inherit autotools eutils python-single-r1 readme.gentoo-r1
DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 7fb34c532e59..c4405ad6162d 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,9 +1,4 @@
-AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
-DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
-DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
-EBUILD cherrytree-0.37.0-r1.ebuild 1189 BLAKE2B 3f56b8ab0077d13fc2bdabccdb44a07cedf5de5308aee8f0a4a7122856f2341762fca3d7e8f354c19ded1387458f22f90a87dca8ef39cf22bbf5d37cc152c787 SHA512 928f4b904c7047936caa78239615895a1365a76ee3b1260e5db1cce3688ce1627438f7c5cc87f3825210b3be736a155f9be847c91c07fbc1879f7e6f1699ec80
-EBUILD cherrytree-0.38.9-r1.ebuild 1279 BLAKE2B 4eabfb8f4c185c614cd17e7310199fc6b18acae898b3c286f2e458e6a7c34c663526c059df1ea4a227ace16be5d2ce463f936cfd4671472c9e365e4b30148481 SHA512 97b0318bb9270fe1c18cf85b7330437633375f72933dae02f9918a5848bf388bd409fd8d8c639a874280341c4a739a1897cab253c8d38530db5f6482af9b688d
EBUILD cherrytree-0.99.0_p20200523.ebuild 2084 BLAKE2B 1992fe81d385769e086f1a00b00074f156e7496b43c5bd785fe8e25cd4a9dbc0e987e417354e00af1aec7ff71b18da5bae6d9516984bcfaad16a18b8078c5f35 SHA512 1d774275218de66e367f5e1bb871691a9ada75a43376e71bfac7fc7a4f4c4b74ed460e55bd3615b695f40574fc7e7b44963e4f20b66c0bb8b5c2570dc7f1233a
EBUILD cherrytree-9999.ebuild 2084 BLAKE2B 1992fe81d385769e086f1a00b00074f156e7496b43c5bd785fe8e25cd4a9dbc0e987e417354e00af1aec7ff71b18da5bae6d9516984bcfaad16a18b8078c5f35 SHA512 1d774275218de66e367f5e1bb871691a9ada75a43376e71bfac7fc7a4f4c4b74ed460e55bd3615b695f40574fc7e7b44963e4f20b66c0bb8b5c2570dc7f1233a
MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
deleted file mode 100644
index 1e0aa58e0412..000000000000
--- a/app-text/cherrytree/cherrytree-0.37.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=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="nls"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
- dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
- dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
- ')"
-
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-python_prepare_all() {
- sed -r -i \
- -e '/\bupdate-desktop-database\b/d' \
- setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- use nls || mydistutilsargs+=( --without-gettext )
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
deleted file mode 100644
index 3451ffc2b7e6..000000000000
--- a/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="nls"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
- dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
- dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
- dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- ')"
-
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch )
-
-python_configure_all() {
- use nls || mydistutilsargs+=( --without-gettext )
-}
-
-src_install() {
- distutils-r1_src_install
- python_optimize "${D}/usr/share/${PN}/modules"
-
- dodoc README.md changelog.txt
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
deleted file mode 100644
index aad93f93a154..000000000000
--- a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur a/setup.py b/setup.py
---- a/setup.py 2019-08-17 14:23:16.000000000 +0300
-+++ b/setup.py 2019-11-17 15:33:44.243070851 +0300
-@@ -195,7 +195,7 @@
- ("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]),
- ("share/application-registry", ["linux/cherrytree.applications"]),
- ("share/metainfo", ["linux/cherrytree.appdata.xml"]),
-- ("share/man/man1", ["linux/cherrytree.1.gz"])
-+ ("share/man/man1", ["linux/cherrytree.1"])
- ],
- cmdclass={
- 'build': BuildData,
-@@ -205,4 +205,3 @@
- },
- distclass=CherryTreeDist
- )
-- subprocess.call("update-desktop-database")
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index 71d216c0d17d..faf8cd79e36b 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,5 +1,7 @@
+AUX convmv-2.05-manpage_nocompress.patch 495 BLAKE2B e1f3b981d99cbd44aca2cac0d18165caf8be9771ba99acd3edb349225c05a7fa56e40707b234cdd1ffa0a82b5d05ed2191df00dcf7c12b45c19bcf0810fa8b4d SHA512 b57ede3b3b8982630d66ab5d21fce22b975e75941d9c2c5e4d33fd1c5ad8f9acfc893605d89bd7f11706d11f0afb3f6eb40d923fd5818a0bbbf8b93dcaccfc1a
DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
EBUILD convmv-2.04.ebuild 696 BLAKE2B 4b4bcd977727970df9ad3f760e7612b4fb39f55ea60bfd30a973a21f65864ab2470ae7222ad015aaf8ac66b57b8520285e7b87d8b37be22309c7c822bc81dbba SHA512 f69f37a90cce7e27142523d2124d2708706387a0c034435972ecc4af2e8d1f80615c9b0855adb6907234a719205b61b7354fde5394cdd47438c71c7dd242ca74
+EBUILD convmv-2.05-r1.ebuild 801 BLAKE2B 3b6d6da040354faac8599cf483751f1d009fb8a00ec6f9b307b872f9327a768c9cc8040ddf011a4ca5704be991a368a9e44061693142b3da8841d1bf65c140f6 SHA512 0e828ac5896b76a7404ee3cfd16c057f1e2d03b1f68968100a4baf2bf0cd701765ff1217b90eb489d5e11fb10b2c9a7c2c47746c18292e2994a643da8a97b100
EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild
new file mode 100644
index 000000000000..3384fadada92
--- /dev/null
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.05-manpage_nocompress.patch" #729544
+)
+
+src_prepare() {
+ default
+ sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+ unpack ./testsuite.tar
+
+ cd "${S}"/suite || die
+ ./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
new file mode 100644
index 000000000000..02f0c41032ee
--- /dev/null
+++ b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
@@ -0,0 +1,16 @@
+--- convmv-2.05/Makefile
++++ convmv-2.05/Makefile
+@@ -10,11 +10,11 @@
+ install: all
+ mkdir -p $(DESTDIR)$(MANDIR)/man1/
+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
+- cp convmv.1.gz $(DESTDIR)$(MANDIR)/man1/
++ cp convmv.1 $(DESTDIR)$(MANDIR)/man1/
+ install -m 755 convmv $(DESTDIR)$(PREFIX)/bin/
+
+ manpage:
+- pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz
++ pod2man --section 1 --center=" " convmv > convmv.1
+
+ clean:
+ rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 795c80feeb75..63f3c1957d62 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,6 @@
+AUX gethopt-undefined.patch 518 BLAKE2B aedc512451453d3e09d8572bbd3d2304947487553ba02b61b365f954b8cedd3ecc6a4ab2a5e35ef08985fbdf28d1a31894c38ad5916b83794c31c1bad37c882b SHA512 39f3eea0b1c9e1e0b4d34a09ef2aebb787088608b078c593fd02ca7ba715cf6cf114e8ae9ebc263945ebc8d9d1ef6fc00c9e749481d637a884d3ded3f7712af3
DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
EBUILD discount-2.2.4.ebuild 1821 BLAKE2B f4a6861947e64cff3200ecddbc162543df545cc6b06fb87394c6f5a64d1637c11cafea16db2417352e33600ff6e946e5250bf0feb15c29c6cea130dee72eb663 SHA512 0a73f39f35c11fb0dc7f5321ee754516db1f24e4b1c9dbf831dd9cc3be248ede956093c1b04360b11edca04f5d33f5ee45c18537cefbe3f9ff9b5ac39cafc75f
-EBUILD discount-2.2.6.ebuild 1644 BLAKE2B cae59787e6c97ee3b5dcbffdd230e19269ae2a980350ff934aa03df176890fcf89888b53e5376ae7c428f3bcad97e091ce784afe9ed8af304e58146120fac427 SHA512 fba1613daea073dfa0da73df18721b677513ea1bf5067bbec2688c051743cb69adffca37f76422741fb11568725d55fd479991b4dcac18ac5c55443f8b68510a
+EBUILD discount-2.2.6.ebuild 1695 BLAKE2B cfbbb57f39a7da1c13a3aa259ad7cf104c5878eed9fe693e43abd0b755a218f203ed4feb25c8f226159d6ae2b3d3ff6a41a04c9c9570d81acd8a166bc278ef89 SHA512 1e15684ee950a536168ac56806138e49dc473d2f5e525dde90dd4bb7113340a6e9022f38a72690e24b852d5f1db80768f203e33b8f43410c5bf794a2878ccdcc
MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.6.ebuild b/app-text/discount/discount-2.2.6.ebuild
index 9e5705492517..9cb5d5ea9f15 100644
--- a/app-text/discount/discount-2.2.6.ebuild
+++ b/app-text/discount/discount-2.2.6.ebuild
@@ -15,6 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="minimal test"
RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
+
src_prepare() {
default
diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
new file mode 100644
index 000000000000..5b081877a7a2
--- /dev/null
+++ b/app-text/discount/files/gethopt-undefined.patch
@@ -0,0 +1,12 @@
+diff -aur discount-2.2.6/Makefile.in discount-2.2.6-new/Makefile.in
+--- discount-2.2.6/Makefile.in 2019-04-16 03:28:20.000000000 +1200
++++ discount-2.2.6-new/Makefile.in 2020-06-21 07:39:32.256757588 +1200
+@@ -139,7 +139,7 @@
+
+ pandoc_headers.o: tools/pandoc_headers.c config.h
+ $(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
+-pandoc_headers: pandoc_headers.o
++pandoc_headers: pandoc_headers.o $(MKDLIB)
+ $(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown
+
+ branch.o: tools/branch.c config.h
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 89ebb78cbd85..d5bbf05b098d 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -1,4 +1,4 @@
AUX djview-4.10.6-hidpi.patch 2313 BLAKE2B 4d3356baa36cf830a8e01314f6fbf081c0b8fe8b6a43b2e14e4966fab2d07932088c66e1f68802282537d490503586a528c2a4b86eea26615fc8eefbf6b7d058 SHA512 922b0c321edaeed3a76ee206fa4353366e3d744dd30612d034070c251ecfca6bc18a2ddaf110cfbc811ea47426f2d9e370d5a58cce41b396b793ba27223bb881
DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8
-EBUILD djview-4.10.6-r1.ebuild 2087 BLAKE2B 742ec6af8b08b40bf5951e79bbfcb4ac5ecd6a6f1727d57f700166e9a47d00f0c40add3c29e7fe79290fe7b4179cbdf7dd5b526936ee5e5d67bc92512867553e SHA512 b3745bd57c512a6926b90266fce1281971209bb853c4ef2ccbb4a8286f9b21977b3482381a8e69782fdf04efd45f599c2867c6ff8c61031580679a8dc9077278
+EBUILD djview-4.10.6-r2.ebuild 2043 BLAKE2B 9885dfdf080ebe6c466416f043e6f3dc27e14af98816c4ac591dcd8c31069ef4558f2afc4b59e8e1e305dcd12d935bab66f05ee611b299fc42a97e2518e44ff3 SHA512 d37aa3ade52eb1c18ade20eea3134ce4f8b3319b6dc90c8fc29a42e2e98618bdeb10f9fc8f05a2af0126bec5b156325d07bee0229017970927da29a6b39110ce
MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r2.ebuild
index 8bb483e12649..89ea0c6b9f2b 100644
--- a/app-text/djview/djview-4.10.6-r1.ebuild
+++ b/app-text/djview/djview-4.10.6-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools flag-o-matic nsplugins qmake-utils toolchain-funcs xdg-utils
+inherit autotools desktop flag-o-matic qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="Portable DjVu viewer using Qt"
HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="debug nsplugin"
+IUSE="debug"
RDEPEND="
>=app-text/djvu-3.5.22-r1
@@ -22,11 +22,11 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-qt/linguist-tools:5
>=sys-devel/autoconf-2.67
- virtual/pkgconfig
- nsplugin? ( dev-libs/glib:2 )"
+ virtual/pkgconfig"
DOCS=( README NEWS )
@@ -50,7 +50,7 @@ src_configure() {
econf \
--with-x \
--disable-desktopfiles \
- $(use_enable nsplugin nsdejavu)
+ --disable-nsdejavu
}
src_compile() {
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index fd9efc3b6c2e..9d249528470d 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,4 @@
AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
-DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-EBUILD djvu-3.5.27-r1.ebuild 1574 BLAKE2B aa47ac7501b211d0f56a90cd4d82f33d287cb575216c78f27603d7d81a7b585637ee02ba81c5e9a918421dabac9d23f338a60bec5377821ed35f750140568481 SHA512 9bcc71de91a7cb092b635fb9b6456966faa03ef25154f145307da888fb219c419e6907517280c0dc85673de5b9d7914829d3ebf505f2333156e859ac9a0bbeb1
-EBUILD djvu-3.5.27-r2.ebuild 1698 BLAKE2B a774bee0b263b3f166f98dc5b22ebcdbd37746d67ec33fc23e5172d89003be0c9d18e69f4fdab137a3b2e3c2f77b03ffe51acc18840225dde58bbd2671120b6e SHA512 d627b593fa6cf288b4fb89eb16230cf09fe6b44fc8a4d2d83c43d5250d4e4c40a35af379b3045aedc8c8ea3bc44f1eaac4ef8d20f7ecf345b5cf55907725a395
+EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B 1543bc005f55a9ecf74f95295a29aed25100f056da963b5ed75fcde148928ef10e4fa05830b6ad8c17d2e8bc07a0daef3baa1fddc4bc085fb343b667a8edb33a SHA512 30dbaf5409bdf414fcc53246882f6dda413dc25d1689bd489e383a05a39699b2efcaa5eb3d24ec3fc8949a169f51a3642a8552911579e34c8f4970b12c56d945
MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild
deleted file mode 100644
index 607b51c18958..000000000000
--- a/app-text/djvu/djvu-3.5.27-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils flag-o-matic xdg-utils
-
-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"
-
-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"
-
-PATCHES=( "${FILESDIR}"/fix-CVE-2019-18804.patch )
-
-RDEPEND="jpeg? ( virtual/jpeg:0 )
- tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
- || ( gnome-base/librsvg media-gfx/inkscape )"
-
-S=${WORKDIR}/${MY_P%%.3}
-
-src_configure() {
- use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
-
- # We install all desktop files by hand.
- econf \
- $(use_enable xml xmltools) \
- $(use_with jpeg) \
- $(use_with tiff) \
- --disable-desktopfiles
-}
-
-DOCS=( NEWS README )
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -delete || die
-
- use doc && dodoc -r doc
-
- # Install desktop files.
- cd desktopfiles
- for i in {22,32,48,64}; do
- insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
- newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
- done
- insinto /usr/share/mime/packages
- doins djvulibre-mime.xml
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- has_version app-text/djview || \
- optfeature "For djviewer or browser plugin" app-text/djview
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
index ed3eea609053..e5debec50dbb 100644
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -10,11 +10,11 @@ MY_P="${PN}-${PN}libre-git-${COMMIT}"
DESCRIPTION="DjVu viewers, encoders and utilities"
HOMEPAGE="http://djvu.sourceforge.net/"
-SRC_URI="https://sourceforge.net/code-snapshots/git/d/dj/djvu/djvulibre-git.git/${MY_P}.zip -> ${P}.zip"
+SRC_URI="https://ajakk.github.io/${P}-${COMMIT}.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+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 )
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
index 19a250017638..c0748af315e7 100644
--- a/app-text/flpsed/Manifest
+++ b/app-text/flpsed/Manifest
@@ -1,4 +1,4 @@
AUX flpsed-0.7.2-desktop.patch 247 BLAKE2B 2b1269b3c3ca1fb451db11f0a0b310ccea40612226227574dd4eab020aff348fcfd8c82f3908b253148a5e5135cd3a29a8306ac480c53e3410f19701290b79ca SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f
DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321
-EBUILD flpsed-0.7.3.ebuild 587 BLAKE2B b80e1ecdfc2850a3bff1c645140fdeb5170696419e646590e91c201191f7d3a07df76bd107af1117e92276529df877dbd01a8c75d9edfe1734fbe20ce50ab4e4 SHA512 4a302416b5cd54eb596199f0d612600fac0294b00a0da0083d3c22cff139f901e149f294e9635fa94da5f31a4c7237e6c48d1f2216e9f9ad1606f1523decdf12
+EBUILD flpsed-0.7.3.ebuild 589 BLAKE2B ceb75d5abcb17569aeff307c9457ec35f7d8bb0386bd5fc735c9a35a46a75bc3f08c7625f9d5319c150d1824397f7284ea34dd43637078298019231a4d68c18c SHA512 69890343f5d72b20be15921a38cdc7c9294111fe0388c35c3aaeb6e75524d04065d7d43b06389e2c8e68d2fd3508860a805aa0f9a8d5b7d6ed74d10b966fe644
MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index 71ddce38048f..d5c909badb01 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
inherit desktop
DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
+HOMEPAGE="https://flpsed.org/flpsed.html"
+SRC_URI="https://flpsed.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index bc06ccb2a376..0f2cb537bda5 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,5 +1,3 @@
-DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.2.0.ebuild 606 BLAKE2B 09cea289c7779aaeeca02b13987d9939529119c1eee9a349ffb9fde1e6af4173e5b6197a13b244d71280db33d2ae9cd67a5f54f133691bf459cfae7fc10d7f05 SHA512 22d97f6c35814a9ac395a5214422f7a3b9e20b4ad82c65d549d042becf621bb4603feb2b37ce0cbe05ff96375131677f33b827f1b672a76800e0ad0d29f98a7d
EBUILD grip-4.5.2.ebuild 640 BLAKE2B f7f32f0b1b72a158dbc5916278d224d8bb46a8806f23b1e4cfb706c0ec8b0d32d8035c27496ccbf58549a3aae33838e927de218f3171d89a9f0710719b2728b8 SHA512 4ea96de40e3926ad990d342d9f10a21b5a0e7267f69ed87af0d9f54c5b874efcfd9ace24ae66f0923df758226aeab313cb5088872a53c456b3120811a34ab637
MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
deleted file mode 100644
index d5e458d1fbb6..000000000000
--- a/app-text/grip/grip-4.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
-HOMEPAGE="https://github.com/joeyespo/grip"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-KEYWORDS="~amd64"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
- >=dev-python/docopt-0.6.2
- >=dev-python/flask-0.10.1
- >=dev-python/markdown-2.5.1
- >=dev-python/path-and-address-1.0.0
- >=dev-python/pygments-1.6
- >=dev-python/requests-2.4.1
-"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index ad9c358bd492..a733ebd11e9f 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,6 +1,3 @@
-AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
-DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.42-r1.ebuild 2202 BLAKE2B 0b5d44fa0a2a9075e5b55ccb8c09f80dfd6bf0f00b0df7e21ea61d620db70442cb06ae5f0890fd0ee834673975255b9131cb77fff5d316109bd876f81c40e55e SHA512 24666e1693f84bf9f3f285f2fd0130769890ebce3fd67dce262cd9411a3c5d35d5b1cd28115d38269f1811f14322d676bd07f1cc521a529206408681326bc0e4
-EBUILD highlight-3.57.ebuild 2188 BLAKE2B 849955be9504de05df9edaafc02f2af7b598c9934c257b1bf7ee9046e910e2f77e9377b2899942fd20f9fda04919d9d9a53dc5728f5e5383447156450191dfd7 SHA512 92e151a33d1eda74cfcd374af26cea251ba81793507995241ab06bbc3958ba33139d51cabda92a31291867c65d2801a5595b6cfa41f0efc34db5a9a960b5dfda
+EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
deleted file mode 100644
index 31970057d9a6..000000000000
--- a/app-text/highlight/files/highlight-3.42-qmake-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Fri, 2 Mar 2018 19:15:35 +0000
-Subject: [PATCH] fix directories passed to qmake being ignored
-
-contains() matches the whole value, add regular expressions for the path
-components.
----
- src/gui-qt/highlight.pro | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
-index bae8d7c..0380a90 100644
---- a/src/gui-qt/highlight.pro
-+++ b/src/gui-qt/highlight.pro
-@@ -43,13 +43,13 @@ unix {
- PKGCONFIG += lua
-
- # to make it run within Qt Creator
-- !contains(DEFINES, DATA_DIR) {
-+ !contains(DEFINES, DATA_DIR.*) {
- DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\"
- }
-- !contains(DEFINES, CONFIG_DIR) {
-+ !contains(DEFINES, CONFIG_DIR.*) {
- DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\"
- }
-- !contains(DEFINES, DOC_DIR) {
-+ !contains(DEFINES, DOC_DIR.*) {
- DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\"
- }
- }
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
deleted file mode 100644
index 513d088c6f28..000000000000
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples qt5"
-
-RDEPEND="
- dev-lang/lua:0=
- qt5? (
- dev-libs/double-conversion:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-myhlopts=(
- "CXX=$(tc-getCXX)"
- "AR=$(tc-getAR)"
- "LDFLAGS=${LDFLAGS}"
- "CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
- "DESTDIR=${D}"
- "PREFIX=${EPREFIX}/usr"
- "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
- "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
- "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
- "conf_dir=${EPREFIX}/etc/highlight/"
-)
-
-PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398
-
-src_prepare() {
- default
-
- sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
- -i src/core/datadir.cpp || die
-
- if has_version "<dev-lang/lua-5.2"; then
- sed -e "s/-DUSE_LUA52//" -i src/makefile || die
- fi
-
- # We set it via eqmake5, otherwise it forces clang...
- sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
- -e "s/QMAKE_CXX /#QMAKE_CXX /g" \
- -i src/gui-qt/highlight.pro || die
-}
-
-src_configure() {
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- eqmake5 \
- 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- emake -f makefile "${myhlopts[@]}"
- if use qt5 ; then
- pushd src/gui-qt > /dev/null || die
- emake
- popd > /dev/null || die
- fi
-}
-
-src_install() {
- emake -f makefile "${myhlopts[@]}" install
- if use qt5; then
- emake -f makefile "${myhlopts[@]}" install-gui
- docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
- fi
-
- if ! use examples ; then
- rm -r "${ED}"/usr/share/doc/${PF}/extras || die
- fi
-}
diff --git a/app-text/highlight/highlight-3.57.ebuild b/app-text/highlight/highlight-3.57.ebuild
index 90bd4a859636..f1f062f7d23e 100644
--- a/app-text/highlight/highlight-3.57.ebuild
+++ b/app-text/highlight/highlight-3.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples qt5"
RDEPEND="
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 224a83783247..08d0ba1cc046 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,3 @@
-DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
-EBUILD htmlmin-0.1.12.ebuild 502 BLAKE2B 153cbfaaf0ad87a086a7a3d699eaa8db44d492af5f3b54e3933e59f097cdf26f6c76e5ea502455606a1a53185951f70cebb9fa4522abb65713f03910c46e7d99 SHA512 d03810cfb4d4d71bbd69c89edaecd72a9b8a9e546e9f8a9f172c9c52d7441aa90824317729fc2b9ce959642de525570d7fb5623b854560469e11208994a89bd6
+DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
+EBUILD htmlmin-0.1.12.ebuild 687 BLAKE2B e16da15d3ca3b741f324db20f52f09cc6a57471863068908c54635fa26ec84f99fd30043f03dcd14d11072a5c06734c86263461da77b8ac8de486ea54daf4953 SHA512 df59d6c9f9eb20b9db4eb4b4547c68607964f9abd9b5be4fbb0fc85cf5afe446241237031234c6c30f608ed2d56471eb024072ff83a793ceae94c0ec62e68c13
MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index fc8e480e3b33..080c078b2222 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,25 +1,29 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1
+# upstream doesn't do tags much
+EGIT_COMMIT=220b1d16442eb4b6fafed338ee3b61f698a01e63
DESCRIPTION="A configurable HTML Minifier with safety features"
HOMEPAGE="https://github.com/mankyd/htmlmin"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+ https://github.com/mankyd/htmlmin/archive/${EGIT_COMMIT}.tar.gz
+ -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
LICENSE="BSD"
-
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests setup.py
src_prepare() {
sed '/prune/d' -i MANIFEST.in || die
- default
+ distutils-r1_src_prepare
}
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 940dc60712ed..e582c67e5a89 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,5 +1,7 @@
+AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb8847b070a37eb7fd6858f2e5180a19f4aff9f8ce007c5a948c6caa3b0de8454f3f87953bbe2c18a2ea43aaea3504d4d3c460 SHA512 e7674819a9da4c3d742d34338d68d137d8613f97be2d25bf20db5219d4dd626f59a63ed4757b92f34307f499f2d687014065cdea97b55c98db295a8290300d2d
AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
EBUILD hunspell-1.7.0-r1.ebuild 2317 BLAKE2B 9557168fd901afe16a8402a682cf06cb97f6a6fd367caef811e31acc92f04f2b77a907d409e9d77b6389425eaad901a0084bb8d38d69935648da4bda9ae6ac47 SHA512 e2926c1860838c46fcddb6bb7c05462d6908fb188791ddcc677243394cf46902ed01198c53e137f7860c418c27c20ac59de21d4033fc624c168fdd60c104c69b
+EBUILD hunspell-1.7.0-r2.ebuild 2372 BLAKE2B b65efc24aa4e71a043e86a747a3d5ec257a6ad584129fb540aa2003c6d31656b6b3d96d0c53c47baec5538df71d187a2719e7699aa31c1435a1b65e209020ef2 SHA512 d40ad309340d7822093aff140760d189f6e54061951c32e5c168df83a2f4b42541cd8e485021c5a18efd2e0f13c2ae1defb426bc348c0d8069452a457b4c7d3c
MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
new file mode 100644
index 000000000000..649eef5b293d
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch
@@ -0,0 +1,22 @@
+From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Tue, 12 Nov 2019 20:03:15 +0000
+Subject: [PATCH] invalid read memory access #624
+
+---
+ src/hunspell/suggestmgr.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx
+index dba084e9..c23f165a 100644
+--- a/src/hunspell/suggestmgr.cxx
++++ b/src/hunspell/suggestmgr.cxx
+@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring(
+ int l2 = su2.size();
+ // decapitalize dictionary word
+ if (complexprefixes) {
+- if (su1[l1 - 1] == su2[l2 - 1])
++ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1])
+ return 1;
+ } else {
+ unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l;
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..209dab4e6da2
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ ncurses? ( sys-libs/ncurses:0= )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+ IUSE+=" l10n_${lang}"
+ case ${lang} in
+ de-1901) dict="de_1901" ;;
+ pt-BR) dict="pt-br" ;;
+ *) dict="${lang}" ;;
+ esac
+ PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+ AUTHORS ChangeLog NEWS THANKS license.hunspell
+ license.myspell README.md
+)
+
+PATCHES=(
+ # Upstream package creates some executables which names are too generic
+ # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+ # It modifies a Makefile.am file, hence eautoreconf.
+ "${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+
+ "${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
+ "${FILESDIR}/${PN}-1.7.0-CVE-2019-16707.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # missing somehow, and I am too lazy to fix it properly
+ [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+ # I wanted to put the include files in /usr/include/hunspell.
+ # You can do that, libreoffice can find them anywhere, just
+ # ping me when you do so ; -- scarabeus
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with ncurses ui)
+ $(use_with readline readline)
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ #342449
+ pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+ ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+ popd >/dev/null
+}
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 273f631876f1..20f276a1e572 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,6 +1,4 @@
AUX libspectre-0.2.0-interix.patch 654 BLAKE2B 5be37013c202c2191c8169ebd5b769737a361ab8adde830ffc4bf8487faaf5b1875e1eeb1baae0af0150001a784dad2449e4c6d2259e570dfcd9578e1dae0f00 SHA512 9ccb697cc2cce7798bfff799f7e041d02967af49832a692a3dc7292b52a31f1ebe37fe3b2f02b4908f7e38aaee11028b9e949512fbf02bfb4c8886fd5a7a3bba
-DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
-EBUILD libspectre-0.2.8.ebuild 1089 BLAKE2B ee022b1c6cb7ca03c227c14a230e2275c07ef04c68fa58e140d250a2280d344949f8f2d1afed6ac78a12e9fa622ab34878dc017a647ef2bc89e8bdb8b97461f0 SHA512 c610aaca45b156d883188f1fc661cf0972d9fbba3bbac5c2535ed41c9692713d49a6691410d4d0e4ca44c6fe987a2d04d81d459ecf7b1d90e9e06f92acc4f9c1
-EBUILD libspectre-0.2.9.ebuild 1136 BLAKE2B 193aecdd217e2b1d6c06216ece1f22a3f001a3c8873e4ab77499e8fba209a2aa3c029eeeea0a695acb4e046d8afc5faaf29baced0f4aad4897b4fc3fb469e978 SHA512 3c705f4bd1e41180ad02d51d4e84fe9f9270e163247a1a64ac228152e1f129b75e967ebec92eac8a930fcead7a31e7027016238945e891f20dc1a42d0567fc1e
+EBUILD libspectre-0.2.9.ebuild 1137 BLAKE2B 1c6c7b6c96cef12d9648e7d9dc93d8e7807d541fa2a129f17979012ded7d89880198588625f6b96cc649a277fff934230b83ada5682163b23254f90622e08c27 SHA512 ecf738dc31d6fbfb0a51d6bca863c5875b9a327fafe176de85ab266bf4425610556536b7b72bd68db9b6375840b2978396d139fbe714bd7d9c7b0c03b85a1fa5
MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
deleted file mode 100644
index 0de9370f91ef..000000000000
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="A library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc static-libs"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.62"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-src_prepare() {
- default
- eapply "${FILESDIR}"/${PN}-0.2.0-interix.patch
- eautoreconf # need new libtool for interix
-}
-
-src_configure() {
- econf \
- $(use_enable debug asserts) \
- $(use_enable debug checks) \
- $(use_enable static-libs static) \
- --disable-test
-}
-
-src_compile() {
- emake
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- default
- use doc && dohtml -r doc/html/*
- prune_libtool_files
-}
diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
index 0d295f6fe89e..d8a1a897bd0e 100644
--- a/app-text/libspectre/libspectre-0.2.9.ebuild
+++ b/app-text/libspectre/libspectre-0.2.9.ebuild
@@ -11,14 +11,14 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="debug doc"
BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
-RDEPEND=">=app-text/ghostscript-gpl-9.24"
+RDEPEND=">=app-text/ghostscript-gpl-9.24:="
DEPEND="${RDEPEND}"
# does not actually test anything, see bug 362557
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 3e55718a7bf8..0d3c1c12eee5 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +1,5 @@
DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
-DIST podofo-0.9.6_p20200526.tar.xz 752264 BLAKE2B 52eb40a63e8462b6d1f975c76c2112b93ae98c19ad6cb65906bef018e99a3d92e26781cee9d4ef1c4de74779db7eca6589c320849be84b70c20d5c7d988c0a49 SHA512 7baa58c9a524ccc5aa954bd5fe891b9add8b8f4ec29e3ebbc1c8a467d2787e6c3f9e4652db08e50cb4c28a73691215947940634975e292ec01fb57e2e45efbe4
+DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
EBUILD podofo-0.9.6_p20180715.ebuild 4661 BLAKE2B c5e6616218c01a583ef3bcd8e93a80edd060b9fe010cf9f91372a5ce3e9f34d592d69fe20cc8e9ba02dceefa6ac70679c5d66783580fd7d70b40cc2f74c5a85d SHA512 b6b6a274d5ee92d13d4b573844cd0d1629f13b552f5d8257e884a0c555ba1d14425abe3fab1be9e01d27c5c1da9eae07519ad0916862569a0495808d2719449f
-EBUILD podofo-0.9.6_p20200526.ebuild 4591 BLAKE2B 14522471c08143d9adbee39ec8301e705169a48fc2557b44707432ce25c26e0e2eab8b822bc188f11795f55092e8c85ebc22384ac747e1285098aa20ed722f62 SHA512 ad7feded62a43adfd9d807087109816ef637d8e2ce7046a9dc0eebce27b7aee6cda9c93059aedcc999828b6cc13455899bc9a80de30bfc1ce2cd90f366da3e7b
+EBUILD podofo-0.9.6_p20190928.ebuild 4670 BLAKE2B df7e653e7251ee6a8c82f45cff91ab7703aa73045d1dd16b7bdaf0ba10d9475e5736566411600d473f1b4ba79df8742e96f616e8d1b45b524382d569b568b2b8 SHA512 f0d481bbf173348d0da77ac046aa4fafa5301e91fb888107f6bad455ee366edd1a7fbfa56a1b8533e9f72c1a9cf27ff45668769b86c6820e99c84d266746f19a
MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20200526.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index 058f8499ab01..0c3c7b2bd809 100644
--- a/app-text/podofo/podofo-0.9.6_p20200526.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -2,17 +2,17 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils flag-o-matic multilib toolchain-funcs
+inherit cmake flag-o-matic multilib toolchain-funcs
DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
HOMEPAGE="https://sourceforge.net/projects/podofo/"
-SRC_URI="https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20200526.tar.xz"
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/${PV%_*}"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="+boost idn libressl debug test +tools"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( tools )"
RDEPEND="dev-lang/lua:=
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog TODO"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
local x sed_args
if use libressl; then
@@ -136,6 +136,11 @@ src_configure() {
-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
)
- cmake-utils_src_configure
+ cmake_src_configure
mkdir -p "${S}/test/TokenizerTest/objects" || die
}
+
+src_test() {
+ cd "${BUILD_DIR}"/test/unit || die
+ ./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
index 86a4ef761ea6..d118a0f829d9 100644
--- a/app-text/q-text-as-data/Manifest
+++ b/app-text/q-text-as-data/Manifest
@@ -1,3 +1,3 @@
-DIST q-1.5.0.tar.gz 58746 BLAKE2B a35f7ea605a42e81be1ee4899ed9e8c2b4e81e896b6e4c1eb6045b64cc7fa3ffdf6f754be168b3ebe25faa4c8b80f63e2ffff3174231357260263acf335b8d5c SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55
-EBUILD q-text-as-data-1.5.0.ebuild 989 BLAKE2B 75751694983c2558990cfb4e3cb595185f1093f81e173e60a39c6c6eee2ab5831d037ea31436afb52004d11d138b5ff190079e2170561e6271b5669d0f708095 SHA512 0061a746a1432124970ff40722fd756938f9e50b63ed916d21a814aea7beaece049df2c5ccb9308824972928f4c9ac5fdaf31497731acf9609c8d5453809a7f4
+DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
+EBUILD q-text-as-data-2.0.10.ebuild 1112 BLAKE2B 1d1965e6f65978d209a8248165c46f296a3c1fc0f4d9b0668d4b16eb0727b843b95e7b77316f80fafc0eb1c4dd7b34ee1b3f7682d795c6c3857ffe968a77eaa8 SHA512 f778dee4e4177edd6682a64ec56b3afc410a519f4b9d42db3ee5f2e88083b220af418f33ebd7dfed4e94cf5c8615bd6d023b1039a676f91b99e79deb49270f1f
MISC metadata.xml 300 BLAKE2B 57b125311f9ec6ca94d329e91209e85c77c3c739c2e2ca885dbe4a8c3d9a13627fcd4b64c79c9c672d30c0265eab241fb57114e0c23b46e01c60fb969d7d6f9c SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa
diff --git a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
index 3441091a9944..f3c988259f1b 100644
--- a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
+++ b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-# Does not yet support py3
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
PYTHON_REQ_USE="sqlite"
inherit python-r1
@@ -18,15 +17,23 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# No dependencies other than python >= 2.5
-# http://harelba.github.io/q/requirements.html
-RDEPEND="${PYTHON_DEPS}"
-DEPEND=""
+# Upstream is wrong
+# http://harelba.github.io/q/#requirements
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ ')"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
+src_compile() {
+ : # Do not use the Makefile
+}
+
q_install() {
- python_newexe bin/q q-text-as-data
+ python_newexe bin/q.py q-text-as-data
}
src_install() {
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 84185121d2b6..2bf36a47156b 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,9 @@
AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
+AUX recode-3.6-recode.texi.patch 445 BLAKE2B d612b6b513908fdd7756cf3b0d8bf2730071d71acd91d330f32b149bb42fcdc2da353f00bd77e5d39d87abfce3ecb917b97c5471ceb79f6777778f36854fcd9d SHA512 bb25c3d36e77e415577518561f1c4060e923c0f2a992eaa4cf561cc27372820810e7bc8ae3db70dcbf20dc1ba7384370a51c6072a71b1a22c4b71d5a1369fcdb
DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1639 BLAKE2B df12bfe979aa5b6cedaec6ca58148d972e8ab71905088cbccecaf8ebb516c6fffe53ac96d7a266c5e32756ac2207892219c9634ad540d9a6c88554d13d717f78 SHA512 b0afd29e6b220be63f88ffe9cccc00bed68582ea01b7486490a9ae90f8dc094b3427b15cdb7cb6b0505489782231bc002a7e8a77d41af73cbdaa4e3193cda3d2
+EBUILD recode-3.6_p20-r1.ebuild 1683 BLAKE2B 41458adc86e9e77bf02c0ad8aa3405024efd4ea808f61cda13842ba82f5e4740af30a37432c0a9d332c4c64bfbe027cab73b4a5f7410fe6d40e0d63e9866254b SHA512 d96dfcb1094e9a7b8af27c1b8c42637b59aa3a1a0113787ba19fe0fae3f69b3ef6cf16ccee0e098752da4263e5c4b86b98223ada5741a1cfff65af1e04274050
EBUILD recode-3.7.6-r1.ebuild 1024 BLAKE2B ecc79b0cc686ea88b765bb1fa035d7c41fd908496daf094dd2c11573a94843faeef067d91ecac570f0058ed81d645c0ab58e4d5fbe6809288e7bb25eaec4dee9 SHA512 a9ed1b358366995d2905796458379ad713bea5ef1e7a807b708b4a22869841b27a14f46adc4af300635dec1333c7bba786259be3546c96602f3977bf42e7da3e
MISC metadata.xml 346 BLAKE2B 0a6af84d8b6ea322f62bf1f741e332892a60eee2704265685615240a178ddd965f524586179882867e609cef66ef021cfc56950581d1c0915f04a2a669dea9ba SHA512 6c5caba02d69998dc08954f52c9e126db6546eaa0d0f4abc166e96896fdfa8e73371f1206318fa00ebd0f266600c79105d43d5e300c07e7f7b0c3645f9537b2e
diff --git a/app-text/recode/files/recode-3.6-recode.texi.patch b/app-text/recode/files/recode-3.6-recode.texi.patch
new file mode 100644
index 000000000000..bb5b1bcc274d
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-recode.texi.patch
@@ -0,0 +1,11 @@
+--- a/doc/recode.texi 2020-06-23 07:43:20.959074594 -0000
++++ a/doc/recode.texi 2020-06-23 07:43:32.262338563 -0000
+@@ -3713,7 +3713,7 @@
+ between HTML and various other charsets.
+
+ Here is a list of those HTML variants which @code{recode} supports.
+-Some notes have been provided by François Yergeau @email{yergeau@@alis.com}.
++Some notes have been provided by Francois Yergeau @email{yergeau@@alis.com}.
+
+ @table @code
+ @item XML-standalone
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 5c5b4edfe9e0..6157d48a39db 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -35,8 +35,9 @@ src_prepare() {
rm "${WORKDIR}"/debian/patches/series || die
epatch \
+ "${FILESDIR}/${MY_P}-recode.texi.patch" \
"${FILESDIR}/${MY_P}-gettextfix.diff" \
- "${FILESDIR}"/${MY_P}-as-if.patch \
+ "${FILESDIR}/${MY_P}-as-if.patch" \
"${WORKDIR}"/debian/patches/*
sed -i '1i#include <stdlib.h>' src/argmatch.c || die
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 65c2c453456c..298bb2add157 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,8 +1,10 @@
DIST scdoc-1.10.0.tar.gz 12414 BLAKE2B 3111b3ace102aca2f7da86e510e00f552874817b6b9d754770bd94f9482e4e444a4bc4d44a8317376a6c374bb7363eae96a49281fefd95dd663134087123034b SHA512 546743376380d84aa9c8be65529dbbe1634e574203220ce1c057341436bd3a15297f393ca79d29372cb125bf457cfc00f64ba2867b8d2e910ca6531acb552e97
DIST scdoc-1.10.1.tar.gz 12422 BLAKE2B 4aa5b28994cd03f5d3fc9fff253a02f1052653d25d41225665219ebb6322ebe69f2671d91c5cfe201fd7f9b1ac06f38db3dd126492da06fef0b692fc040300d5 SHA512 356aee85c4676a1fbd7367c6087dd7f6f4d33793be0f3fef74803ceb93c0a9e45c78022d219dc08a7d79d71c393849fa3113c36a85d5d60ed474b62bf5f89743
+DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
EBUILD scdoc-1.10.0.ebuild 1165 BLAKE2B aa225065ba9decac9e3a4beb0331f740c3d1513e2d775d0e74e7d619609c474915d75b3b18b84284a353eaf197681a050e68eae0c0cbf5fe6d82dea0fc6e7738 SHA512 ddd56e88a5e19c0282252035b653512bd62cec03de42b6311e443954f86708440d8488522c0dc0d3e575513ceff313c6b630914d746eedc4582bb8ba00fe076d
EBUILD scdoc-1.10.1.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
+EBUILD scdoc-1.11.0.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
EBUILD scdoc-1.9.3-r1.ebuild 1165 BLAKE2B acddab79253fec1c4e2c59f8ee70b9ab0d86c4fea2784a41afe94aa62909af7b2664e20f69b610484452aaeaf1ed597567439af8b4aa12e0462226b9c8108522 SHA512 9e8bf612cf40478c23dae4fa2934a09115f9ee813d2a9eb904710c638b605ad28a9938a7f90a0e6da024e0338e7dfbce66cf79f3e202c992a1140a0bc0b10eba
EBUILD scdoc-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
diff --git a/app-text/scdoc/scdoc-1.11.0.ebuild b/app-text/scdoc/scdoc-1.11.0.ebuild
new file mode 100644
index 000000000000..15ecbe1b112a
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.11.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+ inherit git-r3
+else
+ SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+ default
+
+ sed -e 's/-Werror//' \
+ -i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+ local MY_HS="./scdoc"
+ if tc-is-cross-compiler; then
+ tc-export_build_env
+ MY_HS="./hostscdoc"
+ emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+ CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+ mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+ fi
+ emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+ PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 8ceee5037055..113ff209b5b7 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2020-r1.ebuild 7176 BLAKE2B 4c2b8a642956e537d8d285680addb2d5753d01b0627c1dc910e4f4b3740b5afdc3d14ad0fba94213eab23d63045716487f5859b45d738288305afb00ac17ec4f SHA512 80f64b08b905c05c392207c9a98cb1c72c0c59cf2f2595d1ffdc50f68eb1569611b7a212fe0e5fb71ee70f0478fddad1e9ff56548e8e34b381cadbd83b82f88c
+EBUILD texlive-2020-r3.ebuild 6984 BLAKE2B 4e5eff7a8c961922a2ba012a65d8d6ce239e11d9137839ac6fcc39a7f892e0c14c348941c69cea86b0fc8d4e0a229ec9a2658aac3016de2c8e02eb201b3b84ad SHA512 5b65064c1ff7b810e1a606a89321bb513bd18427c6ab13c9fe214e29e0f40243207b2a73d61cdbd51f3f1416eb91410ad4176c97ecc74715af2f8c283e2e71e3
MISC metadata.xml 2321 BLAKE2B fc9c387d08100e543a6752ee7644f878c9430db5f2f66b5d16991dc292cf8ac01fc80bb6d805a8d6694edabffb68bc23f031974eece051114809c90deaa32941 SHA512 ca224c87c1bae60752d3d77b62b5a54632bd42379551523f479d8b470ad61c91ac34ddd4c7539f4bd667ae4f60f08d10726f31329b7fc194a24b6d4c642ab536
diff --git a/app-text/texlive/texlive-2020-r1.ebuild b/app-text/texlive/texlive-2020-r3.ebuild
index 37295dbf78dd..a75573b772d6 100644
--- a/app-text/texlive/texlive-2020-r1.ebuild
+++ b/app-text/texlive/texlive-2020-r3.ebuild
@@ -56,18 +56,11 @@ RDEPEND="${DEPEND}
>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
- >=${TEXLIVE_CAT}/texlive-latexextra-${PV}
- >=dev-tex/glossaries-2.07
- >=dev-tex/leaflet-20041222
- >=dev-tex/currvita-0.9i-r1
- >=dev-tex/g-brief-4.0.2
- >=dev-tex/envlab-1.2-r1
- >=dev-tex/europecv-20060424-r1
- >=dev-tex/svninfo-0.7.3-r1
+ >=${TEXLIVE_CAT}/texlive-latexextra-${PV}-r2
+ >=dev-tex/glossaries-2.07
)
xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
- graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
- dev-tex/dot2texi )
+ graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}-r2 )
epspdf? ( app-text/epspdf )
science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 8bf0eca7df60..9fb73b95190d 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,5 +1,7 @@
DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e6ca54cc816cc89e29e9ad65b5b9d36e94fb107139d4d4afd400f0b33c35eb824a0ca66dd7ec66b6b4eb25f7d SHA512 55cc51d32bbc47f3ec1b33aeb733fdbf4194d5cc8ed124a3f3f4afa90ed6f025a7684a8c1babdb5b5a65f716eb76ea2a6628261523b00110406b94f922ba825a
+DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
+EBUILD txt2man-1.7.1.ebuild 602 BLAKE2B 623ab5c12b5e67319fcc11bb43a44aca60e01f581842f0aad6cff719eba6551e2f35e9b716d7f60dc5b4a5b99e761d7fd2652e541cce1779328c8d5fbc32f5c8 SHA512 74c78ac586d3a8dd930853de88dfa429ceba69f4dfb58d166dfe8d601b88248d97e5f308468345b1396261b11d064aabe880ec8bcd29cee30c8d917e5545e211
MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
new file mode 100644
index 000000000000..bc21fe17a3aa
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="https://github.com/mvertes/txt2man"
+SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash
+ sys-apps/gawk"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=( Changelog README )
+
+src_install() {
+ emake prefix="${ED}/usr" install
+ einstalldocs
+}
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
new file mode 100644
index 000000000000..8ff2f50aeda1
--- /dev/null
+++ b/app-text/vgrep/Manifest
@@ -0,0 +1,3 @@
+DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
+EBUILD vgrep-2.3.1.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
+MISC metadata.xml 394 BLAKE2B 52d95eb8f47c5002203258b8077e0104423472b1f4bdae387fa8194b5056fd4986a9b795d0bbaa7939497ce45ff2ee0ca90e1c44ebeaf31b40725b36ddf1390a SHA512 9f44f00b50a654d27819e20172dc338d3dac8abcdac3933df88153156871612e1c414dcc5b0590795eb58c972302c3b54546b7dbbd539ca60737bcfa5a8989f3
diff --git a/app-text/vgrep/metadata.xml b/app-text/vgrep/metadata.xml
new file mode 100644
index 000000000000..4965843d0e80
--- /dev/null
+++ b/app-text/vgrep/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>whissi@gentoo.org</email>
+ <name>Thomas Deutschmann</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/vrothberg/vgrep/issues</bugs-to>
+ <remote-id type="github">vrothberg/vgrep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-text/vgrep/vgrep-2.3.1.ebuild b/app-text/vgrep/vgrep-2.3.1.ebuild
new file mode 100644
index 000000000000..f50049ccd32f
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+ emake build
+}
+
+src_install() {
+ local prefix="${D}/usr"
+ mkdir -p "${prefix}"/bin || die
+
+ emake PREFIX="${prefix}" install
+}
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 6595defbca3b..2f81c2f80b66 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,3 +1,4 @@
DIST xapers-0.8.2.tar.gz 160938 BLAKE2B cb21d04146f0cca39f1a706641e4cd2a83a796cbf4eb096379367203d91811c20798638a27215e9fdd9ffb32de908a389b0af57200f19bf4d2c8477a9c82ca93 SHA512 cdf1d4791dd48f579f9ee019492c26d10c9855c1ceef2c15bdc81dfdab0f1d74f54db453bb60a9d297a155a55d73cd26ff192875b4ee2b80d8f9f5d35a4bbcc9
+EBUILD xapers-0.8.2-r1.ebuild 753 BLAKE2B 56018b0006954269ce43a991bb2c80a0fcb8bdba21437bc36b522b33209c565b961539830eb038b7858bc73cc041d1b4d1c0e2ee7f6dd43b5817bb5474e0ab7e SHA512 52a5b97d1f454e8ddd90a2b5342f91e09dbce32aa63a4ad31211c4638615def445bc0ac317fc67d6c650270e8c4f0e55e6aa14e557e15b0c296e6e8e390da3ed
EBUILD xapers-0.8.2.ebuild 665 BLAKE2B 74ded3c69b277243be799924fe3abd57f517dbb2075f01c67ab955f88cfdd4c050c8fb9d5df415c60917d24973c6d9f567ede69038a0f13f74b6fc34d2cd5330 SHA512 f9d2eb51bd7a2c33c1ff1e44a1f2b3c04a205856c2adefaa03096e1fc4652ca4d282e2b112fb5bb414f657faa7489054a3c53258ca6ba96f2652f2bdfc3dbc67
-MISC metadata.xml 687 BLAKE2B b94d3d3f42be513d61d5e594ed9fbf13e83f3141d4dab74c48f396b411994c512a6aeb401e884b4891e17ac45f0329f52672dd3513420084e524a2548337bd26 SHA512 15bc8e58aec03907425c6d2ed011223b1e0b5925329e137f4f4ce0ff92b3ead2b22a3988a417164d51546c01c36172969bb6cd50fbd36a21f6dd99db1b89a944
+MISC metadata.xml 553 BLAKE2B 94c65255d3a407dd26f92c44f904dbf5e3d5a969a0e93203c11d68c92766060bdfd62615513cff9f1bd74ba7e124b066b6eec2a8fc434c564ec7c5486ecb728c SHA512 41a492b7a1c2e33d2ea0c44bdd480027e7e578139faf00da7f1e0226b3011d03963dcd7b221e5d065c762797a24f8c04c8a34c16dbe92c70ee7aa30764423758
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
index b2b0bbc66d70..5b6ab9a1eabd 100644
--- a/app-text/xapers/metadata.xml
+++ b/app-text/xapers/metadata.xml
@@ -9,9 +9,6 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy maintainers</name>
</maintainer>
- <longdescription>
- Xapers is a personal document indexing system, geared towards academic journal articles.
- </longdescription>
<upstream>
<maintainer status="active">
<name>Jameson Graef Rollins</name>
diff --git a/app-text/xapers/xapers-0.8.2-r1.ebuild b/app-text/xapers/xapers-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..808db0ee8572
--- /dev/null
+++ b/app-text/xapers/xapers-0.8.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Personal document indexing system"
+HOMEPAGE="https://finestructure.net/xapers/"
+SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/poppler[utils]
+ dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
+ dev-python/pybtex[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xdg-utils"
+
+BDEPEND="test? ( ${RDEPEND} )"
+
+src_test() {
+ cd test || die
+ ./all || die
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 21a8b93b91ae..4a6d2eebb3aa 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,5 +1,5 @@
DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
-EBUILD xiphos-4.0.6a-r2.ebuild 2052 BLAKE2B f3f70ce614ebcf02b6111d1c04d6a9a644132e53cdd1c685db721ebb21fef1d9c2ff58c549e74d46ed6000446965a2c64eef991fbc7d33d1b040bd9f72a4dd19 SHA512 cff5d3d6b097e1ec7ee6b48db0bc06dcefc35e2b202384624d8b0c2426237839b676fc0eb84b927441dfe96727c576c78a4d7f26e121d8a198e35571d22181ff
-EBUILD xiphos-4.1.0-r2.ebuild 2005 BLAKE2B 5510d77d42d30c111a5b94b7126ceb36810d33cfe054df99c8be7e41b8354ff6f5cb06b3d91419ff6fe62ee847e2805ab4e852c81f4b851fa14399cef4f69812 SHA512 9b61fe086183c8710bdebe616ad6f6ea6b6b231e9c70eb8a9877efc66d8dab5110e5162925d0a5e7b13f9eb0b0e789aafdfa93ed23d568097ee9914074c90384
+EBUILD xiphos-4.0.6a-r2.ebuild 2053 BLAKE2B b9bd97ee6e3da5a10b98db3eaf45e6d5a746e852e4b7762e9fafca1213c471794035170fb9b43563144e7666709e749aa8748701435331e399d647441ca12ec6 SHA512 1a9b16294c1013f4b35da37c3bd3c6169e3e067f95f8d9505ab1042294df1c5d4877eb9353018f1ff71843e915c676127157b4c4a8d27ac77a4ee42f64c629d5
+EBUILD xiphos-4.1.0-r2.ebuild 2006 BLAKE2B 2c54a0561b481fffd95e5a88257b19033725c970c21e45fcb579ef1cded0506d5b08bbbdb91486cfff6709798b541f9978cc164c7458a7267c9417e55335c0b4 SHA512 a8fec9304f9136dcc9be657bbde58871ce4f2433a94919a769dba56dc1992278cc3906c5817812343504a47cfedbc514b9a0b5f3519fa3be5cd4ce8d58c35964
MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index dd5177d45fa9..7521fa24db4e 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
MY_PV="${PV}-20170820"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
+HOMEPAGE="https://xiphos.org/"
SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 24314a606c49..49bfe5394fce 100644
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
+HOMEPAGE="https://xiphos.org/"
SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index e4ed970e2dd3..89c7facbf300 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,8 +1,8 @@
DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
-EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
-EBUILD zathura-0.4.4.ebuild 1346 BLAKE2B bc8eae75f9e3c766eafbfd96e692cf5733d82c502159b0d56007f8dcb0238b13aed2543e23e3737419fc54b5dfe1ed4ac83b1c27bdeffc05ae18940517a7377f SHA512 d241a6f6daa64522e99f188c17b87dd0d89473800d487dcb50fda99942f05c58d66f2a551bb314e82bb2f691ea88e4efa27c715fc3d3163dd7e5818c20012337
-EBUILD zathura-0.4.5.ebuild 1349 BLAKE2B eb2974163405117618ac3fd188b48270ae117d519206e71aa10fb675ae26009a5d8966a81ed5484ff266cd96a1bccdb3a9166d1a207d12f87457841a87be43cb SHA512 1e9c6535854d0b17dd49165097fa30bb52b34e95806e9df9387e9f183d88af85c883249f215322091c23d02fc4df64abba9bf91427b838b3fa664ffe7aade14b
-EBUILD zathura-9999.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
+EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
+EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
+EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
+EBUILD zathura-9999.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
index 26887b29c3f2..b73544c83c5c 100644
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ b/app-text/zathura/zathura-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-text/zathura/zathura-0.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild
index 1167454be534..cccc28f4066c 100644
--- a/app-text/zathura/zathura-0.4.4.ebuild
+++ b/app-text/zathura/zathura-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-text/zathura/zathura-0.4.5.ebuild b/app-text/zathura/zathura-0.4.5.ebuild
index 4a62e043c71b..08b6a2a8e21d 100644
--- a/app-text/zathura/zathura-0.4.5.ebuild
+++ b/app-text/zathura/zathura-0.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 83ead1f313eb..08b6a2a8e21d 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3