gentoo resync : 20.03.2022

4 files changed, 8 insertions, 116 deletions

diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 16ea9d8aa6aa..0b35c188a809 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,5 @@
-DIST gscan2pdf-2.12.3.tar.xz 504168 BLAKE2B f3c8b27903db733163114c5c8ea93b10969791fbe04fb2111d1e090e8c627127150cd418eed693d3c61d18e8e6ecf08ddaeebc2ee5b5bc7b49dd633391480f12 SHA512 bb7c9bfd485ae24bbd56a5ca98682455e07fa44d02784a0f3b4b2d3995d704beb0ad146297e92e838dddf8bbdbc37b391e88bf50c98efcd3dfe6b10e761a0693
 DIST gscan2pdf-2.12.4.tar.xz 503792 BLAKE2B e5b54158b5b47bd2f255c3529e132695c1735e9da92d6a426f7f5b9a9e880bd2d1a0655faf065385224892abe992156c667e50aea1f1091ac6d872b8c163c92f SHA512 f904e2fe3ec0ed829eb9166a42c7c10b56e99e1a7558c7d0014efc530d5f4d3873e9097f28372412073cbb6040bd00570f1acbb6582f5ea87485f0a0ace6f486
-DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
-EBUILD gscan2pdf-2.12.3.ebuild 2981 BLAKE2B 72ddfd255baa1aedfee6a3a51faf8d71d5732f47cc3ec55a3a4c6a2f4688c332064377c9935e097b649ce4326a2dc60c96836af3abf2412590a5ee76318d759a SHA512 2726e25fed0a753a083462540e9e69a221de079fe28adf5bb679ade98d007a34c9766991fdf29a750e6ed933dcbcd0d306d82a98c55caf1c10460ac0b1b69f20
-EBUILD gscan2pdf-2.12.4.ebuild 2988 BLAKE2B 2307b5bb8396119e2f3af93ce1ad27adfaaf0597e8d97c9756faee7665727fc73f2f83b1200bd592c18950a47faa35883905debfd815b0ed1adf91eaaa3572fd SHA512 15757344d557b417a86404b54838b196232430ddbf1612d3430fdb216b062cc7bfbd27914921923b5f62c4e83f837edfff67d6505aee7b0bc6b259b6759e69e0
-EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
+DIST gscan2pdf-2.12.5.tar.xz 502636 BLAKE2B 5fb92a4e5dfdbd985119058ed86ca015a58e97fd73edae4d46279e482351f9b5514045a60bb67ca2bfb58fa1e4315bc03ca67a2f2e3ed0cd2c941d8ae755fdfa SHA512 eeeec0940ef4a40b8cb7e961758e9688c94d980842ab36c4e52384099d1e28773f2967a75eb7c024ab713b880c2538d8395021bfabd68cffa7b334fdd35d773b
+EBUILD gscan2pdf-2.12.4.ebuild 2995 BLAKE2B 96336de1a27929613f0734fd8013031cd8f6fd239f8c344d6f35fbc5385b1d280266d587e45714d4a5c740e2dc03df7ac28b07593f5b376729c041d4591cac92 SHA512 d5e143d4f92ff01ff47d8d8a7cb4d0147e11ec3dfaf3eb323638670faf5f105b5af222b312bf39f2984be36b51c4dbf809ad498c311ba2a0a1baa54f543cce3b
+EBUILD gscan2pdf-2.12.5.ebuild 2995 BLAKE2B 96336de1a27929613f0734fd8013031cd8f6fd239f8c344d6f35fbc5385b1d280266d587e45714d4a5c740e2dc03df7ac28b07593f5b376729c041d4591cac92 SHA512 d5e143d4f92ff01ff47d8d8a7cb4d0147e11ec3dfaf3eb323638670faf5f105b5af222b312bf39f2984be36b51c4dbf809ad498c311ba2a0a1baa54f543cce3b
 MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
index f821ad0cbd97..a9f6ec537bcc 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.5.ebuild
index c8c914513d5a..a9f6ec537bcc 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -60,7 +60,7 @@ BDEPEND="
 		app-text/poppler[utils]
 		app-text/tesseract[-opencl,osd(+),png,tiff]
 		app-text/unpaper
-		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript]
+		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
 		media-gfx/sane-backends[sane_backends_test]
 		media-gfx/sane-frontends
 	)"
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
deleted file mode 100644
index b25b14de3434..000000000000
--- a/media-gfx/gscan2pdf/gscan2pdf-2.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_TEST="do"
-
-inherit optfeature perl-module virtualx xdg-utils
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Data-UUID
-	dev-perl/Date-Calc
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/GooCanvas2
-	dev-perl/Gtk3
-	dev-perl/Gtk3-SimpleList
-	dev-perl/HTML-Parser
-	dev-perl/Image-Sane
-	dev-perl/List-MoreUtils
-	dev-perl/Locale-Codes
-	dev-perl/Locale-gettext
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-perl/Sub-Override
-		media-libs/fontconfig
-
-		app-text/djvu[jpeg,tiff]
-		app-text/poppler[utils]
-		app-text/tesseract[-opencl,osd(+),png,tiff]
-		app-text/unpaper
-		media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript]
-		media-gfx/sane-backends[sane_backends_test]
-		media-gfx/sane-frontends
-	)"
-
-PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
-
-mydoc="History"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "encrypting PDFs" app-text/pdftk
-	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
-	optfeature "adding to an existing PDF" app-text/poppler[utils]
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
-src_test() {
-	echo "Using:"
-	echo "  $(best_version app-text/djvu)"
-	echo "  $(best_version app-text/poppler)"
-	echo "  $(best_version app-text/tesseract)"
-	echo "  $(best_version dev-perl/Image-Sane)"
-	echo "  $(best_version media-gfx/imagemagick)"
-	echo "  $(best_version media-gfx/sane-backends)"
-	echo "  $(best_version media-libs/tiff)"
-
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-	NO_AT_BRIDGE=1 virtx perl-module_src_test
-}