gentoo resync : 24.12.2018

4 files changed, 20 insertions, 69 deletions

diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 34f9c8f42966..ffb1ef22683e 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
 DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
-EBUILD zathura-djvu-0.2.7.ebuild 873 BLAKE2B c7329a9562bcd883ba1cfc042bea476d9a40a243f9d493704fd7655362c1e8c4a4fe6aeae5b509014db4a7a3d8e7323565d727aacc64a2ecdbc8271dcab53444 SHA512 616e7310f5bd94394546dd4cb624ee5c0a9b384064593a6d3098d11cc8669c3417e999e9adfc2c4b1f5a55256535f1633b8d6f644ce9772dd70b967a144bc32f
-EBUILD zathura-djvu-0.2.8.ebuild 792 BLAKE2B 6e99063a0e15746bd9a51df200afec243a24b7c1ae6c25dea998e8f807de14986a9bef66712de5175150e1d1bcdb2e6f1ef1b62c5035b58c60d4ee77e726bdeb SHA512 fba19cbad4e425ac85c54c6613a243e36d069f5d9ea8a00bebe170919e3200ad531d01d0451bcf256df65293be649a435583a66ccf1f2e5428ecfd519161fe8d
+EBUILD zathura-djvu-0.2.8.ebuild 790 BLAKE2B e1d46cea20f9449006092e2ff44263b0d9bb9e8a269801a850dc7182e014c17c12f1fa23dddab820b05a158e03e322a8e9fe3d99e82e6c2ca5ae8b8e3a0bc72e SHA512 4c9809b8a22db671ab492204a30493daa74aed5f86d2b3b7642057a73114c8fc9e556e8f22717e8b82f52a92c4d660c1e2831016dbecd810083d5f129a6d286e
 EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B bee22309631b879837dab88c8d70954ca4ceb4272c7b3074ccc4bdd58f249e709f98252d9d90acd0354529556fa3df019077b5b1863a7daf2092a87111a49989 SHA512 f11599dc27c6b6dec3f66c7af1774a9dcd9790e0f2d38d7ff517a54e630e08031ff23023459c9c554577b38b17602314f67e52a02efa7c3bcc04025d0d85f437
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index b7ed6eb4ffbe..9e0907fe1628 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/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-djvu/zathura-djvu-0.2.7.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
deleted file mode 100644
index 528afa9e57d9..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-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/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/djvu-3.5.24-r1:=
-	>=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-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
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
index 76fcffdc1adc..2a891acd222b 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi