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

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
index a73fd153f5a2bd7b8c9cf4f3100156a6f6636e33..b02dee3dc6149a06d7824958a3b2917db7b0a712 100644 (file)
--- a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.3.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-djvu.git"
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="amd64 arm x86"
+       SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="DjVu 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/djvu-3.5.24-r1:=
@@ -30,7 +28,7 @@ RDEPEND=">=app-text/djvu-3.5.24-r1:=
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"

diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
index e6ef493fc4ff5076894b79df1dc0fbc425af8497..2de3b88232f75cca56bdec337e01ff04840b2fff 100644 (file)
--- a/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.6.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-djvu.git"
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="amd64 arm x86"
+       SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="DjVu 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/djvu-3.5.24-r1:=
@@ -28,7 +28,7 @@ RDEPEND=">=app-text/djvu-3.5.24-r1:=
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"

diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 0cec0327dc88f3ece7e478671d4acdba48c976fc..810861d8da93bd3234b49da5a3c00a992554c9c3 100644 (file)
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-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-djvu.git"
+       EGIT_BRANCH="develop"
+else
+       KEYWORDS="~amd64 ~arm ~x86"
+       SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 
 DESCRIPTION="DjVu 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/djvu-3.5.24-r1:=
@@ -30,7 +28,7 @@ RDEPEND=">=app-text/djvu-3.5.24-r1:=
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
        myzathuraconf=(
                CC="$(tc-getCC)"
                LD="$(tc-getLD)"