gentoo resync : 24.12.2018

4 files changed, 20 insertions, 80 deletions

diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 4666e80694dd..fec106ff0a7c 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
-EBUILD zathura-cb-0.1.7.ebuild 1191 BLAKE2B 12a7784c95acc44a25ad571fa203063c332ad91af7d8c8b1533b0a9dc84350c4e9a07ba1fb81b37bf78178d4ea3b01e267185a3dba8a4a10d3dacc98bd3868b7 SHA512 8d1d8fbdc1e54f4238fa8e31df10c71662c194ec60b63eea32085276b86b9de115c9539c5f6260aadfc88a95bee1b6c3116badf83eb6e1e2c4d0603bfc256220
-EBUILD zathura-cb-0.1.8.ebuild 656 BLAKE2B 6aa2ffbf504a2a5570b8a18c380319bb44a75cc1663275bc6ed0192422f2b1d4e781933012d416a4228b4848ddde1b1f824d9d39c077837940f22372b37eefc7 SHA512 2bed50a0662a4a7d19a7258cfdf858b5e26ac0dfc3fe42e81e521c288af868272e8d54ad2399c482933b7960c2ebfa4590377318acb981b5d67eef1254ce0df8
+EBUILD zathura-cb-0.1.8.ebuild 654 BLAKE2B 24002517066047c86d4e716bc27bad39890193376ce5a3e205614ec161dfe8d04aea57ee8f8ec97e89d1a7bc93ea02e129aa48582a8ab26e3a42e18e23420741 SHA512 f7756d761c06f0f1451759cae82a535c3fe70e202a09d0327c6825417df0100e8bb561bfef0db62ee2aba5e13f04ca2de7775e38de592310628af132d1583a96
 EBUILD zathura-cb-9999.ebuild 657 BLAKE2B 0836100ed329f8b153dfe4382ba22f9175c09812d62964eacdd628061758297e90a4a2c477176e02b13a95d5036072efc5be568873e4efb8f257e87dc0288a42 SHA512 bc0e52634152a0606b9107c9e0e825375b13fcf284ed7108552210a0bc3942e12d75c36f70f8e8a574927bfd0634a516cf7f8b6024e7d5e323687a339a3f5d8a
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index b7ed6eb4ffbe..9e0907fe1628 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+		<email>mlq@pwmt.org</email>
+		<name>Moritz Lipp</name>
+	</maintainer>
+	<maintainer status="active">
+		<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+	</maintainer>
+	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
deleted file mode 100644
index 1fff9b735815..000000000000
--- a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs readme.gentoo-r1 xdg
-
-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="https://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="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	app-arch/libarchive:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-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() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
index 3e5717e543fe..2fad557959ce 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi