commit: a64edc83fe2ad2c085aa55f608afbe0077bc12b4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 17:33:14 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:16:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64edc83
app-text/zathura-cb: [QA] Port to git-r3
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/zathura-cb/zathura-cb-0.1.2.ebuild | 24 +++++++++++------------
app-text/zathura-cb/zathura-cb-0.1.6.ebuild | 28 +++++++++++++--------------
app-text/zathura-cb/zathura-cb-9999.ebuild | 30 ++++++++++++++---------------
3 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
b/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
index 82427371fee..c9d8877d490 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.2.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-cb.git";
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 ~arm x86"
+ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
+fi
DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip
support"
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=""
COMMON_DEPEND=">=app-text/zathura-0.2.7
@@ -35,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
-pkg_setup() {
+src_configure() {
myzathuraconf=(
CC="$(tc-getCC)"
LD="$(tc-getLD)"
diff --git a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
index f7465379776..ff2cb89529c 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
@@ -4,21 +4,21 @@
EAPI=5
inherit eutils toolchain-funcs readme.gentoo-r1
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git";
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="amd64 arm x86"
+ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
+fi
DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip
support"
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-0.3.1
@@ -29,7 +29,7 @@ RDEPEND=">=app-text/zathura-0.3.1
DEPEND="${RDEPEND}
virtual/pkgconfig"
-pkg_setup() {
+src_configure() {
myzathuraconf=(
CC="$(tc-getCC)"
LD="$(tc-getLD)"
@@ -45,13 +45,13 @@ src_compile() {
src_install() {
emake "${myzathuraconf[@]}" install
dodoc AUTHORS
+
+ FORCE_PRINT_ELOG=1
+ local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar
app-arch/unrar
+ app-arch/unzip for additional file support."
readme.gentoo_create_doc
}
pkg_postinst() {
readme.gentoo_print_elog
}
-
-FORCE_PRINT_ELOG=1
-DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-app-arch/unzip for additional file support."
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild
b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 227a2188c27..32698cdd593 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -4,23 +4,21 @@
EAPI=5
inherit eutils toolchain-funcs readme.gentoo-r1
-[[ ${PV} == 9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git";
+ EGIT_BRANCH="develop"
+else
+ KEYWORDS="~amd64 ~arm ~x86"
+ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz";
+fi
DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip
support"
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/zathura-0.3.1
@@ -31,7 +29,7 @@ RDEPEND=">=app-text/zathura-0.3.1
DEPEND="${RDEPEND}
virtual/pkgconfig"
-pkg_setup() {
+src_configure() {
myzathuraconf=(
CC="$(tc-getCC)"
LD="$(tc-getLD)"
@@ -47,13 +45,13 @@ src_compile() {
src_install() {
emake "${myzathuraconf[@]}" install
dodoc AUTHORS
+
+ FORCE_PRINT_ELOG=1
+ local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar
app-arch/unrar
+ app-arch/unzip for additional file support."
readme.gentoo_create_doc
}
pkg_postinst() {
readme.gentoo_print_elog
}
-
-FORCE_PRINT_ELOG=1
-DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-app-arch/unzip for additional file support."
