[gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/

["David Seifert" <soap@gentoo.org>]

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
+}