gentoo resync : 18.11.2018

3 files changed, 18 insertions, 36 deletions

diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 65f3d7857f01..c3037701f7aa 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 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 698 BLAKE2B 9fc5ef9ce7fe4592fa34b38b45b3d0cb67d6af3afbbadad41bf77900d84c7e9fcdf5262523ea26aa6927390fe68e387a6540d1f0ac8413cc57feb085c0fc2470 SHA512 1c7f95999fdb23daff98d731e83e9097afc1a123c2c26550ff0ce49f54a8aa573f305671212ca7736425a66751cb3c34aa62d1410b395e135eb450a9ee1f9e98
-EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
+EBUILD zathura-ps-0.2.6.ebuild 674 BLAKE2B 3e5a6aaf7d9a6c6afde939c7fc744c3bd7a8671b432b94eb9655fbefc7446e037a1e8edf0d45b4073aa59c539756b7b5805d65163414a43c6225cb14d647fce4 SHA512 540a3a38e5260b0d7266a050f13cd051e7b4fb744b51dc6d21389fe5dc0b5c68fb93cd57039414d7ce5e1f958f96e8cf6f394c73d3a36c0fd35deaa3473a7a5e
+EBUILD zathura-ps-9999.ebuild 675 BLAKE2B e9c7f67fc8d86bd307acb311d28f04a181511d70509ae777b2e096af40dd6518f7382468c423dcd368a3ae3fbec0c71bed17a6dc02b4807694a46d0df42066cd SHA512 e821086cbf8442d13bf4c08ec7cdb59d4eec41d2c2d09fb63a1281c8a5eed2e9daa7af5d9d618b405d7ae613f50ede25f1eece6638c96edf09f85741b6eb15ad
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 9a5fded445c1..f9203d17899e 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
 
@@ -19,7 +19,6 @@ 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
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 305bfa827e75..16e0d2d5ba33 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs xdg
+inherit meson
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -11,38 +11,21 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	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/"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
 
 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
-}
+
+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"