gentoo resync : 04.05.2019

4 files changed, 2 insertions, 95 deletions

diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 364feb77f8e7..b222de9bdd2a 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,4 @@
-AUX zathura-find-libm.patch 896 BLAKE2B f28a1a967d274b0840f64bc94b7179bbcc5cfcb025b8450604c2e928cd4199e78a190e7766a33dd5b513d128f6567be45e667c75605397892745997b97c3b9ce SHA512 664440b3ca4e241f4d2072be5dbc52b00d962c264d5698649d7843e5ea54479a114a8c6ce731f4471fd600603898f4e571d23979aecd0447f592f0d3ebc51f2a
-DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
-EBUILD zathura-0.4.1-r2.ebuild 1420 BLAKE2B 8d0dfd67bd584180927b14f4e0ff003416753475252424e30a5b229eb11a681b5234e3c63f4c562f870312da7367ce208ee04d63186d38e6139e5411b65844d5 SHA512 c14052854ac312e13d6a2a33ee4898a99eef2486737bef411c5b8a509f3474da07e23231395b47387ee4f64fc7deddd498ca4140193da0006fe3c95724f66fb2
-EBUILD zathura-0.4.3.ebuild 1336 BLAKE2B 434c74612bd50d5b7776a5df443ece98b6ebf683fd7ae485eb57497cc46ee7bdbb96f0278513a352dba45256090e2715f30052539bf11022336ffe97adfa74d6 SHA512 61fb8fcf6671dfcfdc4e561f6dd94d543996bc7edb037a371a29f9f152d9e9f5ea4593ca2416864c4a549dfdc32639c91119b254b8da95d676716699edc8112e
+EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
 EBUILD zathura-9999.ebuild 1374 BLAKE2B b1935313606001d9dac20406d05fde7fe1720afd0380885577fbf4ae88e78e989226f01651f59279fe863c67b552f0e4b9e6b8dcc00dbbee2b06e80622e8acc7 SHA512 a904dacf3ac21794e27aa8ebc84c2faf7cfbecde519a52936a91ec7d0d317552fd64ef95d0481ef2eb43ca19183e14075b6dc442ca2732ca6958e17cb2fde2c6
 MISC metadata.xml 827 BLAKE2B ce7ca0240a5fc4caca62988ca9d849aa2c010ff36f9ca542f45c49d47a04669e66cd6e1c891f3ef1c36b5eed690d7a6bc134d7130be7ee7e0ee987a428eaeecf SHA512 fba70c39e525376da98422f05601a327e68cb7bc904688ebb3b17854b1123e8baf066cae45d82d3c91d9ccf24b64241a6541484cfcd342fecb2a5f7ca44af02f
diff --git a/app-text/zathura/files/zathura-find-libm.patch b/app-text/zathura/files/zathura-find-libm.patch
deleted file mode 100644
index 4995238fb8da..000000000000
--- a/app-text/zathura/files/zathura-find-libm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cc99b8d3491ce0cd30ba56decc33d811478bab0c Mon Sep 17 00:00:00 2001
-From: Sebastian Ramacher <sebastian@ramacher.at>
-Date: Tue, 30 Oct 2018 00:39:19 +0100
-Subject: [PATCH] Search for m instead of libm (fixes #757)
-
-Thanks to Franz Trischberger for the fix.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index f54f104..afe9ae8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -36,7 +36,7 @@ dbusinterfacesdir = join_paths(datadir, 'dbus-1', 'interfaces')
- plugindir = join_paths(get_option('libdir'), 'zathura')
- 
- # required dependencies
--libm = cc.find_library('libm', required: false)
-+libm = cc.find_library('m', required: false)
- girara = dependency('girara-gtk3', version: '>=0.2.9')
- glib = dependency('glib-2.0', version: '>=2.50')
- gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows')
--- 
-2.18.0
-
diff --git a/app-text/zathura/zathura-0.4.1-r2.ebuild b/app-text/zathura/zathura-0.4.1-r2.ebuild
deleted file mode 100644
index f6972544584a..000000000000
--- a/app-text/zathura/zathura-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson virtualx xdg-utils
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic seccomp sqlite synctex test"
-
-PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch )
-
-RDEPEND=">=dev-libs/girara-0.3.1
-	>=dev-libs/glib-2.50:2
-	dev-python/sphinx
-	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
-	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
-	synctex? ( app-text/texlive-core )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-Denable-magic=$(usex magic true false)
-		-Denable-seccomp=$(usex seccomp true false)
-		-Denable-sqlite=$(usex sqlite true false)
-		-Denable-synctex=$(usex synctex true false)
-		)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
index 19b0aaae81e4..26887b29c3f2 100644
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ b/app-text/zathura/zathura-0.4.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"