public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2022-09-01 19:14 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-09-01 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     e1150827157dc32dbb6a2b5506ed1ff8aa1227cb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 19:12:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 19:12:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1150827

app-text/unpaper: Stabilize 7.0.0 x86, #867910

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/unpaper/unpaper-7.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
index 86d62c9d0488..77d0a4fbc40a 100644
--- a/app-text/unpaper/unpaper-7.0.0.ebuild
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2022-09-02 18:10 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-09-02 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     617833eb72f1256dc805dba9d52ec93092a56a50
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 18:05:20 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 18:07:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=617833eb

app-text/unpaper: drop 6.1-r1

Closes: https://bugs.gentoo.org/867910
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/unpaper/Manifest              |  1 -
 app-text/unpaper/unpaper-6.1-r1.ebuild | 34 ----------------------------------
 2 files changed, 35 deletions(-)

diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 4f3ac2e27f19..371e03985fd8 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,2 +1 @@
-DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
 DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484

diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
deleted file mode 100644
index 91982d16e2cb..000000000000
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-r3 autotools
-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"
-
-RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
-DEPEND="dev-libs/libxslt
-	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
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2022-09-01 19:14 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-09-01 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     77c178aea00e812c9ff83043af714dbc32b48c7b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 19:11:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 19:11:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c178ae

app-text/unpaper: Stabilize 7.0.0 amd64, #867910

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/unpaper/unpaper-7.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/unpaper/unpaper-7.0.0.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
index a26b83763386..86d62c9d0488 100644
--- a/app-text/unpaper/unpaper-7.0.0.ebuild
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2022-07-26  6:22 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-07-26  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     0b177bffbd1b8761d82fc12437f9c85ea48a195a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 06:05:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 06:22:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b177bff

app-text/unpaper: update upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/unpaper/metadata.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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>


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2022-07-26  6:22 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-07-26  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     880bd1a2cac26d7a969819e2f3b7180276c53c73
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 06:04:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 06:22:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880bd1a2

app-text/unpaper: add 7.0.0

Closes: https://bugs.gentoo.org/831607
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/unpaper/Manifest                          |  1 +
 .../{unpaper-9999.ebuild => unpaper-7.0.0.ebuild}  | 29 ++++++++++------------
 app-text/unpaper/unpaper-9999.ebuild               | 29 ++++++++++------------
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index 17c2bd98c4ee..4f3ac2e27f19 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1 +1,2 @@
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
+DIST unpaper-7.0.0.tar.xz 4430572 BLAKE2B 4ab27df9f859b9238ce866c65b7e2d4214a96883be35259494db0115594804a8bc76dc0c60324f147d76865c2cedaaffa70f7a2785fdad2e5c103ca66fa49ea3 SHA512 58da969e773bf16ffee98b96f903ac5347f66d9a93c63bdb9131f5d45f4d7973c09f364ac2f27f8cb61f75de0421c6b01aa248fa9619fbdbde30fcebc76aa484

diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-7.0.0.ebuild
similarity index 56%
copy from app-text/unpaper/unpaper-9999.ebuild
copy to app-text/unpaper/unpaper-7.0.0.ebuild
index cb59b6c27de1..a26b83763386 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-7.0.0.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit meson
 
 if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"
@@ -17,18 +19,13 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
-DEPEND="dev-libs/libxslt
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xsl-ns-stylesheets
-	virtual/pkgconfig
-	${RDEPEND}"
-
-# gcc can generate slightly different code that leads to slightly different
-# images. Wait until we get a better testsuite.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
+	dev-libs/libxslt
+	dev-python/sphinx
+	test? ( dev-python/pytest )
+"

diff --git a/app-text/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 )
+"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2022-02-07  6:33 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-02-07  6:33 UTC (permalink / raw
  To: gentoo-commits

commit:     8c3d66f2c79f7b5fd6a005880e9ad11e16647e2a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 06:33:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 06:33:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3d66f2

app-text/unpaper: Keyword 6.1-r1 arm64, #823161

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/unpaper/unpaper-6.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index 7b1433f52f43..91982d16e2cb 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 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"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2020-06-09 13:53 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2020-06-09 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     85640b6ac370198a65b5699e1f2eb9debd84f999
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 13:52:51 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 13:52:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85640b6a

app-text/unpaper: x86 stable wrt bug #727538

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/unpaper/unpaper-6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index 2a037b6e730..7b1433f52f4 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2020-06-09 13:45 Agostino Sarubbo
  0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2020-06-09 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ce10104fadcffe8ba452bdb6fd4b9df3aefd8f2f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  9 13:44:31 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 13:44:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce10104f

app-text/unpaper: amd64 stable wrt bug #727538

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/unpaper/unpaper-6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index cb59b6c27de..2a037b6e730 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Post-processor for scanned and photocopied book pages"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2020-04-25 18:13 Mikle Kolyada
  0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2020-04-25 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     fc329cd81c11d2e126948e6373a05686109fa76c
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 18:13:23 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 18:13:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc329cd8

app-text/unpaper: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-text/unpaper/unpaper-6.1-r1.ebuild | 8 +++-----
 app-text/unpaper/unpaper-9999.ebuild   | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index e2d4212348d..cb59b6c27de 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,11 +16,9 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="libav test"
+IUSE="test"
 
-RDEPEND="
-	libav? ( >=media-video/libav-10:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2:0=[encode] )"
+RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
 DEPEND="dev-libs/libxslt
 	app-text/docbook-xsl-ns-stylesheets
 	virtual/pkgconfig

diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index e2d4212348d..cb59b6c27de 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,11 +16,9 @@ HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="libav test"
+IUSE="test"
 
-RDEPEND="
-	libav? ( >=media-video/libav-10:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2:0=[encode] )"
+RDEPEND=">=media-video/ffmpeg-2:0=[encode]"
 DEPEND="dev-libs/libxslt
 	app-text/docbook-xsl-ns-stylesheets
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2017-12-25 19:17 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2017-12-25 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b3af08c03d3c77ba9f845745c62881a6fe6d3a67
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 16:36:39 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:15:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3af08c0

app-text/unpaper: Remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/unpaper/Manifest           |  1 -
 app-text/unpaper/unpaper-5.1.ebuild | 37 -----------------------------------
 app-text/unpaper/unpaper-6.1.ebuild | 39 -------------------------------------
 3 files changed, 77 deletions(-)

diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
index a0a37f6dbd4..17c2bd98c4e 100644
--- a/app-text/unpaper/Manifest
+++ b/app-text/unpaper/Manifest
@@ -1,2 +1 @@
-DIST unpaper-5.1.tar.xz 2861432 BLAKE2B 4f07af2ff86181f6941f924cb0a06c8268c5b50fbff3a25faea5ae9657b965277f9d33ff7fbcff29cff7c799fe9861c50dc3a7f583a1620ee6e92fdf42410165 SHA512 5ccd90c4c92774085df6cee5552d72d538d3ee553f95ca3d2bea850975ac6e728be97aa7dca194ba44ef8156c26c19d61d051c4581100f8c553998d9a86cefdf
 DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c

diff --git a/app-text/unpaper/unpaper-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
deleted file mode 100644
index 37edf751413..00000000000
--- a/app-text/unpaper/unpaper-5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~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"
-
-DEPEND="test? ( media-libs/netpbm[png] )
-	dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets"
-RDEPEND=""
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-	}
-fi
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-}

diff --git a/app-text/unpaper/unpaper-6.1.ebuild b/app-text/unpaper/unpaper-6.1.ebuild
deleted file mode 100644
index 710f894a8ff..00000000000
--- a/app-text/unpaper/unpaper-6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~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"
-
-RDEPEND="|| ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[encode] )"
-DEPEND="dev-libs/libxslt
-	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"
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/
@ 2017-12-25 19:17 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2017-12-25 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     20eee95d714d1b25653426ee3446c7fce08913c2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 16:35:50 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:15:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20eee95d

app-text/unpaper: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/unpaper/unpaper-5.1.ebuild    |  6 +++---
 app-text/unpaper/unpaper-6.1-r1.ebuild | 21 ++++++++-------------
 app-text/unpaper/unpaper-6.1.ebuild    |  6 +++---
 app-text/unpaper/unpaper-9999.ebuild   | 21 ++++++++-------------
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/app-text/unpaper/unpaper-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
index 945ae6370e4..37edf751413 100644
--- a/app-text/unpaper/unpaper-5.1.ebuild
+++ b/app-text/unpaper/unpaper-5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"

diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
index aed3c7c6ab3..e2d4212348d 100644
--- a/app-text/unpaper/unpaper-6.1-r1.ebuild
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,7 +15,6 @@ DESCRIPTION="Post-processor for scanned and photocopied book pages"
 HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="libav test"
 
@@ -33,9 +30,7 @@ DEPEND="dev-libs/libxslt
 # images. Wait until we get a better testsuite.
 RESTRICT="test"
 
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}

diff --git a/app-text/unpaper/unpaper-6.1.ebuild b/app-text/unpaper/unpaper-6.1.ebuild
index 068f014b1ee..710f894a8ff 100644
--- a/app-text/unpaper/unpaper-6.1.ebuild
+++ b/app-text/unpaper/unpaper-6.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit autotools-utils
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"

diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
index aed3c7c6ab3..e2d4212348d 100644
--- a/app-text/unpaper/unpaper-9999.ebuild
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils
-
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
-	inherit git-2 autotools
+	inherit git-r3 autotools
 else
 	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -17,7 +15,6 @@ DESCRIPTION="Post-processor for scanned and photocopied book pages"
 HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 IUSE="libav test"
 
@@ -33,9 +30,7 @@ DEPEND="dev-libs/libxslt
 # images. Wait until we get a better testsuite.
 RESTRICT="test"
 
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		eautoreconf
-		autotools-utils_src_prepare
-	}
-fi
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-09-02 18:10 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-01 19:14 [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-09-02 18:10 Andreas Sturmlechner
2022-09-01 19:14 Sam James
2022-07-26  6:22 Sam James
2022-07-26  6:22 Sam James
2022-02-07  6:33 Sam James
2020-06-09 13:53 Agostino Sarubbo
2020-06-09 13:45 Agostino Sarubbo
2020-04-25 18:13 Mikle Kolyada
2017-12-25 19:17 David Seifert
2017-12-25 19:17 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox