gentoo resync : 22.10.2018

6 files changed, 72 insertions, 108 deletions

diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 489a8b11ab5d..4faecd68d540 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,6 @@
-AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b8663404b4ea990dba509a64ce36d4921944a361b83e9ce83705b21aaa75b40441687c9b9e7d7d12634a47de99106 SHA512 8c1190b9511495328b841dd90500265e123fa4510e0660ca30510961b9222adcc72ad74f2e6a51d0710b9a86fb88d382c1f92739396804675a5b93cc78a941ca
-DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
 DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
-EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
-EBUILD zathura-0.3.8.ebuild 1414 BLAKE2B f84bbb42bf21f125cf80f0b6304917002d956fcc46a5c14ba02ad8ac9baf7124a97e25b0e492b77a9724d9a6aa06a0d8a1538b2adb3913c82377722eb39dab0d SHA512 f32f5c67abc780518c4355642a40c8e5c0d4690223bee60efaa5988846b452b9fbb872331c38267825218ebc7160c1767c403b9f62cc3f12a17820c11c1062d5
-EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
+DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
+EBUILD zathura-0.3.8.ebuild 1410 BLAKE2B 78e227aaf7716eadc6fc448b8f5d8bd0b1e2ab2f90914474270a7ef3700fe89225b8220cb46f617687d669b38c76d77f87dcd9f68858e79d5b16b593fcb89b1d SHA512 6148c69fd47e0342124ba49a6792422baaf4e9644a04473c42229f2e20c4f3559143f115703dde1d70e380a65b95f394acc19929ab59bb276c640c1d5e0697c1
+EBUILD zathura-0.4.1.ebuild 1425 BLAKE2B 389bf013932b8e990b85ce274159a4033852b1b39acdfb796452ecd6d99ff5506f8d2fd2f3c70d39019dffb9f285eb8a9e79813d082b305e3e2c08e369e2086f SHA512 f396dd3221ba19a8e9e666be3d21efa4f1ea684460de67177ee0d07781b77a830ff1c6fd42c42700c8811eec754f0dcff11b3b5b5f6fefd7ad666baabf63f4e0
+EBUILD zathura-9999.ebuild 1408 BLAKE2B 54b2855111b07b5901be97b75bc355bea4408fb4d56e3fc93f8adb8e79b5063ea80fbc2311e2849e52deb409cd1f4b43419c09027dfbaa88ee8ad306ccaf29d0 SHA512 87673c67c76d98776116a57ef204ff53dbc9ad3bf6d5fe2c37b4fe534994143c4626d7721977078af01bf36ace5e8691a686a6da66cb0ad199572739d5d951b4
 MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/files/zathura-0.3.7-tests.patch b/app-text/zathura/files/zathura-0.3.7-tests.patch
deleted file mode 100644
index 77321445c6a6..000000000000
--- a/app-text/zathura/files/zathura-0.3.7-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- zathura-0.3.7/tests/Makefile
-+++ zathura-0.3.7/tests/Makefile
-@@ -7,7 +7,11 @@
- include config.mk
- 
- PROJECT = tests
--SOURCE  = tests.c $(wildcard test_*.c)
-+ifneq (${WITH_SQLITE},0)
-+	SOURCE  = tests.c $(wildcard test_*.c)
-+else
-+	SOURCE  = $(filter-out database-sqlite.c,tests.c $(wildcard test_*.c))
-+endif
- OBJECTS       = $(addprefix ${BUILDDIR_RELEASE}/,${SOURCE:.c=.o})
- OBJECTS_DEBUG = $(addprefix ${BUILDDIR_DEBUG}/,${SOURCE:.c=.o})
- OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o})
-@@ -23,8 +27,6 @@
- INCS     += $(SQLITE_INC)
- LIBS     += $(SQLITE_LIB)
- CPPFLAGS += -DWITH_SQLITE
--else
--SOURCE = $(filter-out database-sqlite.c,$(OSOURCE))
- endif
- 
- ifneq ($(WITH_MAGIC),0)
diff --git a/app-text/zathura/zathura-0.3.7.ebuild b/app-text/zathura/zathura-0.3.7.ebuild
deleted file mode 100644
index 8281cf21819d..000000000000
--- a/app-text/zathura/zathura-0.3.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs virtualx xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic sqlite synctex test"
-
-RDEPEND=">=dev-libs/girara-0.2.7:3=
-	>=dev-libs/glib-2.32:2=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.6:3
-	magic? ( sys-apps/file:= )
-	sqlite? ( dev-db/sqlite:3= )
-	synctex? ( >=app-text/texlive-core-2015 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tests.patch
-
-	epatch_user
-}
-
-src_configure() {
-	myzathuraconf=(
-		WITH_MAGIC=$(usex magic 1 0)
-		WITH_SQLITE=$(usex sqlite 1 0)
-		WITH_SYNCTEX=$(usex synctex 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_test() {
-	Xemake "${myzathuraconf[@]}" test
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
index 3bbbd76e6463..77c3802a951a 100644
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.2.8:3=
+RDEPEND=">=dev-libs/girara-0.2.8:=
 	>=dev-libs/glib-2.32:2=
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.6:3
diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1.ebuild
new file mode 100644
index 000000000000..1b9071f73e74
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 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"
+
+RDEPEND="dev-libs/appstream
+	>=dev-libs/girara-0.3.1
+	>=dev-libs/glib-2.50:2
+	dev-util/desktop-file-utils
+	dev-python/sphinx
+	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=(
+		--libdir=/usr/$(get_libdir)
+		-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-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 70f20b7aed63..89006688f4d4 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.2.7:3=
+RDEPEND=">=dev-libs/girara-0.2.7:=
 	>=dev-libs/glib-2.32:2=
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.6:3