gentoo auto-resync : 26:07:2022 - 08:58:19

4 files changed, 53 insertions, 23 deletions

diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 6b41da75345d..c186c975491f 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,4 +1,6 @@
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
+DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484
 EBUILD unpaper-6.1-r1.ebuild 823 BLAKE2B 318fda0b47ddcc8eaab88966f880bf358821e4df02a1bc0addf983e5be9c133dcdf70d0721c032d3775a8955f6febea884cb978921994fe7095d2f180c1558a5 SHA512 1a4052031ce06b27c637dc516a49d09808d10022fb972ae6c554339a89ab2aa2af5b8e4a1ff7db4454b844a08e0a5c8c9837bc37ff6018b270f63accc6d93564
-EBUILD unpaper-9999.ebuild 818 BLAKE2B dc5c7a2ce9088a035f8008076c4c4e259560188bf97da9dfd8a8936738c54ae675db870aca245b2afbf9b015d215cc6778e3ee58ac0faa452f3a4fc3db9690b4 SHA512 53c0ec0cee2048193a3954eb9f2bd8bf06872dda4cccae54d1594bc3c2d13a1ba7e416f0752b96c18b62e47a16d44d201828d08c95897d1781df5ae261686ab9
-MISC metadata.xml 320 BLAKE2B c844f3f7eff324b61dff5a96c72ba23a86fde18e40a6fa0bc3362101114198c64ee93f7e24b5bf3452bd605485530098e58352d1b1a2d6c07efcb3ffc94e41cd SHA512 9cb1be315b8af9e4478a6bf13ba7e76c75fe8b7e70b5673c487d0ff6144ae715851d658d924d37f1c74d0b22e553d388cf0bd1597e84cce75a687f544ccfd853
+EBUILD unpaper-7.0.0.ebuild 692 BLAKE2B 04e6815d89126048c6b41bb98eb31260b827932311261d2c6992f7362c648d0a581c0487c0d37da4c722f174b989c548ac86ef0b2c4d98891be3332e128fca3e SHA512 a270959652502c83502a5c4aa004b78017378c1d5d2f93d4d14b46016dac4a50c44978c495d09750f1ca4072e5842f37d12fb2c2daf248c460f462f046079604
+EBUILD unpaper-9999.ebuild 692 BLAKE2B 04e6815d89126048c6b41bb98eb31260b827932311261d2c6992f7362c648d0a581c0487c0d37da4c722f174b989c548ac86ef0b2c4d98891be3332e128fca3e SHA512 a270959652502c83502a5c4aa004b78017378c1d5d2f93d4d14b46016dac4a50c44978c495d09750f1ca4072e5842f37d12fb2c2daf248c460f462f046079604
+MISC metadata.xml 309 BLAKE2B 56e5f343e13cbb687775cfafea22f6f9bcd783aa8a1f6291f61a640ef9cfbf9940d888769e86d7be39e420c3eab54a8e2c90cc705357bf7761adad620f1dda7b SHA512 cad7f3c104c6b07142c90c0f61d72ca1eb20063e63927850ee4519b245bf2239a5f1c2e24a979d4b66f65f061b4f3a8750e9c367387677d51bff70bc067eb58b
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
index b31f89c81133..e62ed22a3e73 100644
--- a/app-text/unpaper/metadata.xml
+++ b/app-text/unpaper/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="github">Flameeyes/unpaper</remote-id>
-    <bugs-to>https://github.com/Flameeyes/unpaper/issues</bugs-to>
-  </upstream>
+	<!--maintainer-needed-->
+	<upstream>
+		<remote-id type="github">unpaper/unpaper</remote-id>
+		<bugs-to>https://github.com/unpaper/unpaper/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
new file mode 100644
index 000000000000..a26b83763386
--- /dev/null
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Post-processor for scanned and photocopied book pages"
+HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-ns-stylesheets
+	dev-libs/libxslt
+	dev-python/sphinx
+	test? ( dev-python/pytest )
+"
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index cb59b6c27de1..a26b83763386 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit meson
 
 if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"
@@ -17,18 +19,13 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
-DEPEND="dev-libs/libxslt
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xsl-ns-stylesheets
-	virtual/pkgconfig
-	${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
+	dev-libs/libxslt
+	dev-python/sphinx
+	test? ( dev-python/pytest )
+"