gentoo resync : 26.12.2017

4 files changed, 42 insertions, 46 deletions

diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 579434a761ad..0454fad7c168 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 DIST zathura-cb-0.1.2.tar.gz 6636 BLAKE2B 8ebf69deb8f78752661df4bee5f0c9f32cad4b3cec335d63fcd3a238e5b4daaa20659c4be7accf8187fa8c8caa6534260bff7ae69936f5180bdc733407610325 SHA512 bc2c8c846e40ee17aa9df989ca019382d1e4b3074376431c1a2f8190607c4d200ed159de161b8cbb1800bd1f494a770691fec803bc8ce661fe317cf753efc4b7
 DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
-EBUILD zathura-cb-0.1.2.ebuild 1055 BLAKE2B a25c044fbd86f991f90312989a3f963660788f3ad0272496bb3c0e6372742932cf80ecab7a74545da06326ff99913c93c9188efa671989ad6217a57fbe67b1d1 SHA512 1417187fec7a17d179f5f8347d8a96ed0094fb3513d7f405aa9566bc01ae859880fb785abd1776817ab64dac1b04bfb115f49eed0ad8802012e98b82b01b970f
-EBUILD zathura-cb-0.1.6.ebuild 1197 BLAKE2B 49af6ebecbc1f85e3205503629308de07447bb896f54c36aac19b950486421f2bedff5336d1a80f989325ebc2723e27beb0902343051cd1ab6a3d278d45e5ef2 SHA512 0355265692e55d470503503a1a6dffa7fc2c52a6c5abfd2132fd5a73900d7bbfd2a8ec82a779bf784d6054cf25262d4a5230397306213c9ef97fab41f25fd098
-EBUILD zathura-cb-9999.ebuild 1217 BLAKE2B c65c80ba93fb01368329abfd464de03009f30261945aadc749dc3ff274f44a984129b37b96665b6acd4ae3bf065f0c1a6dc31bb4f90971451be8d809e5b2a6fd SHA512 9b56596bfaa0194fb273c724f13a4c88368d10e94d3b32a44aee318ad7eb750d8c6809861e7f91afbec51fa48acf470a40ad6a7cb484eb0fb88d4d0bd64041be
+EBUILD zathura-cb-0.1.2.ebuild 1005 BLAKE2B 9bbeaf8c14f894ebfedc8e1716cbf32fd3e2ca78bf5866fb0fa5bd4bf6371aa946aa4bbae3dee5ab3c417e92a8d54fbd093c60b6c81b46967f3410b8f98d4a7c SHA512 2378f349f16a3e41f65a97a3c420de6b4240a6acd3935b0a0c149d8dac19649b64634b5140a74b08ec548c479a2a9636d40dccf24aeba3471e9349c8deb6d2f6
+EBUILD zathura-cb-0.1.6.ebuild 1167 BLAKE2B 7fd39375ad96f761bd5122bfafb12c1c4510f914759540b71bc6bbe5f8932b3204ad63ef44749982568bba07478fe47bad309e97b16e18e7cb902457366b34bb SHA512 d6066874e0b39ef1fbeed2b41a3c8e6c9954ccef71d5fa60c7ccb4c25cbfbdff3629b1dad4b406304d5f176ffb0fcd37a85eb1f5261ef89d5e6509076de980aa
+EBUILD zathura-cb-9999.ebuild 1170 BLAKE2B 2a96186c1ca27d3affbd6554920f3ec2ba265fd8086578330a11d09a4bd668fd0c81f229fb6fa19aaf6d7730787b69d351f389cb3ed5b038a445ca366cad8051 SHA512 65b2e3b329088629f30ad7152cd27230df51808ca371f233296824657a8bfd596093e922f342c2a80a4ff6fb0f01c2df33b6ddd3d666d76d82fa3f41b4835f2b
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 82427371fee7..c9d8877d490c 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 f7465379776a..ff2cb89529c1 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 227a2188c278..32698cdd593e 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."