gentoo resync : 22.10.2018

3 files changed, 34 insertions, 50 deletions

diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index c9a818132347..65f3d7857f01 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
-DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
 DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
-EBUILD zathura-ps-0.2.4.ebuild 927 BLAKE2B 28da921678d723a5a7039f80458e38b81e156ee9f1d6c2e472c70b69a66ea247e0e15b29f5218011f7585fa37a066223a6d3fe819063d244252bedc5dc1abd28 SHA512 ba7fbe161e87d476ed6413c44bc63d72ffe1ad79b5f555e9b01db19e7a06a772809b842ccd9e83e1ae98eede115cf9bcd97af005151510d2f2758f186841c837
+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 698 BLAKE2B 9fc5ef9ce7fe4592fa34b38b45b3d0cb67d6af3afbbadad41bf77900d84c7e9fcdf5262523ea26aa6927390fe68e387a6540d1f0ac8413cc57feb085c0fc2470 SHA512 1c7f95999fdb23daff98d731e83e9097afc1a123c2c26550ff0ce49f54a8aa573f305671212ca7736425a66751cb3c34aa62d1410b395e135eb450a9ee1f9e98
 EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
deleted file mode 100644
index f05771182caf..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-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.2.7
-	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
new file mode 100644
index 000000000000..9a5fded445c1
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+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.xz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/libspectre
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"