[gentoo-commits] repo/gentoo:master commit in: app-text/zathura-pdf-poppler/

[David Seifert]

commit:     856c865faa4cde2418cf80d34e1943545b004602
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:49:25 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:16:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=856c865f

app-text/zathura-pdf-poppler: Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../zathura-pdf-poppler-0.2.5.ebuild               | 24 ++++++++++------------
 .../zathura-pdf-poppler-0.2.7.ebuild               | 20 +++++++++---------
 .../zathura-pdf-poppler-9999.ebuild                | 24 ++++++++++------------
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild 
b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
index b7895c830dc..1538318d967 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git";
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="amd64 arm x86"
+       SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/";
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
-fi
-EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND="app-text/poppler:=[cairo]
@@ -29,7 +27,7 @@ RDEPEND="app-text/poppler:=[cairo]
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"

diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild 
b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
index d7e55949435..1538318d967 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
@@ -4,21 +4,21 @@
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git";
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="amd64 arm x86"
+       SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/";
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git";
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="amd64 arm x86"
-fi
 IUSE=""
 
 RDEPEND="app-text/poppler:=[cairo]
@@ -27,7 +27,7 @@ RDEPEND="app-text/poppler:=[cairo]
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"

diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild 
b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 90dadc2acad..adeffb64415 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git";
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="~amd64 ~arm ~x86"
+       SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
+fi
 
 DESCRIPTION="PDF plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/";
-if ! [[ ${PV} == 9999* ]]; then
-SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
-fi
-EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git";
-EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
-if ! [[ ${PV} == 9999* ]]; then
-KEYWORDS="~amd64 ~arm ~x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND="app-text/poppler:=[cairo]
@@ -29,7 +27,7 @@ RDEPEND="app-text/poppler:=[cairo]
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"