gentoo resync : 24.12.2018

4 files changed, 20 insertions, 70 deletions

diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index c3037701f7aa..21322046fe96 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
-EBUILD zathura-ps-0.2.5.ebuild 931 BLAKE2B da60bdb706487c8e464285a963722cdcac0d979913b65ede2aa1d7d0bb3cfde63927f84aa729bff86f8a8380e245360689c6df6a6219d93fe4c224b7162ce41f SHA512 64e3ca1aead820f3c49c4d65d06b5f7ba3a39f44f0585efcf5daa4a7d4aea01bd59735e6f0132688cd0c5246d41c7feebd9d76c083255a2b5048aa616231f1c1
-EBUILD zathura-ps-0.2.6.ebuild 674 BLAKE2B 3e5a6aaf7d9a6c6afde939c7fc744c3bd7a8671b432b94eb9655fbefc7446e037a1e8edf0d45b4073aa59c539756b7b5805d65163414a43c6225cb14d647fce4 SHA512 540a3a38e5260b0d7266a050f13cd051e7b4fb744b51dc6d21389fe5dc0b5c68fb93cd57039414d7ce5e1f958f96e8cf6f394c73d3a36c0fd35deaa3473a7a5e
+EBUILD zathura-ps-0.2.6.ebuild 672 BLAKE2B f5eb15d1e5892617a8167a5fb56cc5f13c32f7218e51a769409497156ffd954277a99213c6afaff6a69cd88dbf5a71289e50d3d7fc4775e1ba55a57503128efa SHA512 359a2ec673a1278c13ea285fc5cf199081746361bd92d6ab7efa7d2e6fa56a71751e347ad9d566e817966d7f8416f5454f6d248334c583540ad79d284e42c1c8
 EBUILD zathura-ps-9999.ebuild 675 BLAKE2B e9c7f67fc8d86bd307acb311d28f04a181511d70509ae777b2e096af40dd6518f7382468c423dcd368a3ae3fbec0c71bed17a6dc02b4807694a46d0df42066cd SHA512 e821086cbf8442d13bf4c08ec7cdb59d4eec41d2c2d09fb63a1281c8a5eed2e9daa7af5d9d618b405d7ae613f50ede25f1eece6638c96edf09f85741b6eb15ad
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index b7ed6eb4ffbe..9e0907fe1628 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/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-ps/zathura-ps-0.2.5.ebuild b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
deleted file mode 100644
index bd1db8d44519..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
+++ /dev/null
@@ -1,48 +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-ps.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/libspectre-0.2.6:=
-	>=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}"
-		PREFIX="${EPREFIX}/usr"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
index f9203d17899e..94dab249fb7a 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi