commit: 6669f519744d5e777f758f156c6242b6dd64f7e1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:37:46 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:16:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6669f519
app-text/zathura-djvu: [QA] Port to git-r3
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild | 24 +++++++++++-------------
app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild | 20 ++++++++++----------
app-text/zathura-djvu/zathura-djvu-9999.ebuild | 24 +++++++++++-------------
3 files changed, 32 insertions(+), 36 deletions(-)
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 a73fd153f5a..b02dee3dc61 100644
--- 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 e6ef493fc4f..2de3b88232f 100644
--- 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 0cec0327dc8..810861d8da9 100644
--- 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)"
