From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 328EF139084 for ; Mon, 25 Dec 2017 19:17:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 491BCE0D1A; Mon, 25 Dec 2017 19:17:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A187E0D1A for ; Mon, 25 Dec 2017 19:17:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B69C33BF01 for ; Mon, 25 Dec 2017 19:17:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26F14AE8B for ; Mon, 25 Dec 2017 19:17:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1514229340.20eee95d714d1b25653426ee3446c7fce08913c2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/unpaper/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/unpaper/unpaper-5.1.ebuild app-text/unpaper/unpaper-6.1-r1.ebuild app-text/unpaper/unpaper-6.1.ebuild app-text/unpaper/unpaper-9999.ebuild X-VCS-Directories: app-text/unpaper/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 20eee95d714d1b25653426ee3446c7fce08913c2 X-VCS-Branch: master Date: Mon, 25 Dec 2017 19:17:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 023e838b-6316-4baf-9f9d-8e4d6b913887 X-Archives-Hash: ec9ab148a7364168a4f318346604f2f6 commit: 20eee95d714d1b25653426ee3446c7fce08913c2 Author: David Seifert gentoo org> AuthorDate: Mon Dec 25 16:35:50 2017 +0000 Commit: David Seifert gentoo 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 +}