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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/unpaper/unpaper-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
index 945ae6370e42fe2223cca45765b6c862319c3332..37edf751413c3a9b5b1e1227b8d40621543f5bc6 100644 (file)
--- 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 aed3c7c6ab3fd8e973930094056c79235fe60fda..e2d4212348de44e0f6a2411402e116a0676016ad 100644 (file)
--- 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 068f014b1ee91b83a51bb8a5c3b7986c94d8feaf..710f894a8ffa6810fefcc9b8f67990d24b81db47 100644 (file)
--- 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 aed3c7c6ab3fd8e973930094056c79235fe60fda..e2d4212348de44e0f6a2411402e116a0676016ad 100644 (file)
--- 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
+}