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

[David Seifert]

commit:     3b82b5dba3af6fd0e14fb3d23aaddfd8b6639688
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:44:59 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:16:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b82b5db

app-text/zathura-pdf-mupdf: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../zathura-pdf-mupdf-0.3.1.ebuild                 | 20 ++++++++++----------
 .../zathura-pdf-mupdf-9999.ebuild                  | 22 ++++++++++------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild 
b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
index 28291c0f627..afb28a916db 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.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-mupdf.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/zathura-pdf-poppler
@@ -31,7 +31,7 @@ RDEPEND="!app-text/zathura-pdf-poppler
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"

diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild 
b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 4f2eef4d170..9b166e7d5b5 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -4,23 +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-mupdf.git";
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="~amd64 ~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 ~x86"
-else
-KEYWORDS=""
-fi
 IUSE=""
 
 RDEPEND="!app-text/zathura-pdf-poppler
@@ -33,7 +31,7 @@ RDEPEND="!app-text/zathura-pdf-poppler
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"