Synchronize 0.2.2 with 9999 and punt ref.s to USE="deprecated" since zathura >= 0.2.7 removed support for gtk+-2.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 45 insertions, 32 deletions

diff --git a/app-text/zathura-ps/ChangeLog b/app-text/zathura-ps/ChangeLog
index 1adbd29a2675..359fecd363ee 100644
--- a/app-text/zathura-ps/ChangeLog
+++ b/app-text/zathura-ps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/zathura-ps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/ChangeLog,v 1.22 2014/03/30 15:58:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/ChangeLog,v 1.23 2014/04/04 21:17:52 ssuominen Exp $
+
+  04 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml,
+  zathura-ps-0.2.2.ebuild, zathura-ps-9999.ebuild:
+  Synchronize 0.2.2 with 9999 and punt ref.s to USE="deprecated" since zathura
+  >= 0.2.7 removed support for gtk+-2.
 
   30 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> zathura-ps-0.2.2.ebuild:
   Revert back to ~arch because arch stabilization can't be trusted due to the
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 597990b49fdc..a7f784b9163e 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 DIST zathura-ps-0.2.2.tar.gz 5793 SHA256 e6546261db03b0b6b6499a8e109dc9ff3b8eb8b154ce45f5c6284c1e76d1d7a8 SHA512 4cedd614127b995ad834d5913dd5d9b3dff6172ac31cf42e8d43941815ac03a4872f41d7766c325f435feffa63364c9c377f760cd0540d2f36753e7df1c4c49e WHIRLPOOL 246f7cede9096474efab0c1b4f25bbd4b908eeb1a3a995d390939c02b79ca2adcce86582fd4129189b20e9028f6c0e9079c674cc1beebc59844b8b3d5597b76c
-EBUILD zathura-ps-0.2.2.ebuild 947 SHA256 63a01c72d85a508f471a2546c1bcb0163b465ade8ffacf67989730187b3f28bc SHA512 674c8db7f403b2d44771aad5d062cb5c2ae7ce75742485d8d7b323bf61d4321cc13701a239948b5ef03abc92b02e50ee579df5b29cca7c16ddfa9c9ed1f15b24 WHIRLPOOL 959d38fd84f51598be70ab0e6debbadad6dcb8b60094b9ea19d8040bfbcc8f78d030527440a461cf3be7b94f62f3d0d76bb7a5778479f5adbb5c6e9774dde258
-EBUILD zathura-ps-9999.ebuild 929 SHA256 e5b57a394d659ef149e04e5ed3714d38080fc4d7e93126a9e3a305e032e32ba7 SHA512 a2152f7a49b2d6411739354bd079b5c6704d30db4f2dac7893690cdfbbade0a2568d2a737895c858aff90fc9b7fbeaf3a7d8bf336179dc8554f672cc1e11ded3 WHIRLPOOL 396b39a3c284ce408b2a2b4ff1a8d2618290044dfb9cd75dab97f28268782e1ae2059edc410f150fc4f451c9ed55b5ac75f5428e0986524dab4d103ffb055f35
-MISC ChangeLog 3115 SHA256 2aa772f58b83ad29f99cd657e3e7203e9c5b09c1bbf883ca46a973dee4428113 SHA512 78c2fc7409692e3a9b1ab0a98b78dc72f14c2752ab0e23d2f227ff76cc00f70b6230e16f141b92cbc95bcf7f5dcac4914b8e0660760d37ef48214f5095bc4c25 WHIRLPOOL 63da3d634dcfdc779d983a61cc2d87ed287ec1db81f05db6b0b1149b807de19d52816f36fc6c77aeda4492c9d43a6e146d4a07bc84938083af9b4efea69f7b1f
-MISC metadata.xml 891 SHA256 fd8cff830b610de908d5d60fb0e639498bc67a7bb65bb779127bc3d41fdc14a2 SHA512 bc8dc04bad036aecbb1b83885b03806b6cd17ae55c434b18e72f948ccf0c6bd9ce6b7f80dbe49fd86ff8a46934f97114ef0b49cc352dc9949d0b38ee909d23d5 WHIRLPOOL d89d27afe35561405540752d0d70bdbcfaf9e927adf23663f207716e6de5f30017ed024e2903bb04f5b1d2bb53190085e6efe65a9dc33f6192f318965e495744
+EBUILD zathura-ps-0.2.2.ebuild 1073 SHA256 562a4e863733af23c4772e1cbcf1c501c727626a86d9d1ad98bf7903f0683a5b SHA512 617269d7626584e1689548fbf9767a6804e43591a8e03e8a35a86375d0a56a655ad62f87fa818c51728259be7d894dc022e4d80029b94ff272363a22907f9e9f WHIRLPOOL e32d0cae342efbf60575d2d6a9cd88000525835c3bb7b7490e6ad99d50a37198f24fdffa697169cc813c698c6e2518f96123c9c4d609c67f8214437cc964c53b
+EBUILD zathura-ps-9999.ebuild 1072 SHA256 1c042a3eca3c62e7ad628454277bf781bdef331eb6cfe6c53b2b5a216633c313 SHA512 20766e4edab4fa165dec28140f656e7aa965c3bbf61a597dc4587320a86e2251a3bb7920eb5b809c7ccc59027476f91ff1a79b55c45aeed755a4bba9f1a974d5 WHIRLPOOL 453a53408447ba025c53cd61111df62d24780fd8eeaa2c5cf195c429e3b8a449a792aa7bc2cfa945bfb21700278f657f4e7b4842787e95b6135eaff4fa4b84ae
+MISC ChangeLog 3353 SHA256 8538f5fd150895f43d3587bac5f64c522db8553a8e104f25538de19e4e928665 SHA512 04fa1710d0e563bc858b30c93c3e754e50a630e9766b36313ab165c10eed1e1d59c6f3ffdebd85b3a1e58e1847800962f4d3520258bab94b9f0b6635d830f708 WHIRLPOOL 232df8410942084ae41980301da789e435c2948245638cf6890b2585227a2c9143f61bd1933137b69491cf779577012f008239e2238d32d32fb0c9c207c6cda3
+MISC metadata.xml 792 SHA256 34611a880defaaaa12f93fb91186e6b302733dac7b65d1e107e55536b916cd45 SHA512 cb3b1a3727d5d43dd5cadf975ead8a37931ee4809879af28ada6d8d2a0d6a71243ec1fe17c1c4f3f20580ce24e13b750007a2144c8bb184eb726ad0877e85198 WHIRLPOOL c4b9034f5d60c8a1f67fe5a53f8fa36c3ffd8c2776eff655e0a62065bc3e33394f765e25fa4a081aba06b61f56abbf4e652796955711b119d0fc5c902965ab4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTOD3TAAoJEEdUh39IaPFNOUUH/As0Iycv8JldeBQU0Ial/jm7
-McZWWeICbJPN3lPMm6PvNnixx0E8qfl1zDMZHZw+vI7eW+mubRmuCaNAdBDGKLca
-0E64Q9jPeuXFfeRS2PHf2vCcXJ5viGgPUddDVHodAG3a6zxH+yjSoukMU8vAevAN
-NSxCLT4aLh1UpegJq3fLf2HitjVt716UnpOWo7e4R9JPlsqFVKQp1UN/+QE3Rb9I
-MFIEhernXap+wtB+LajNcglCtP53NDcnBiOmhwTWVhvraJ6sDdhRhxqpazJl3Kqq
-58n5v8S0GEabl9Qok3nWJAWrcXgjip5c8WwGzX3jBGyKzYN79WLI0+oSDhdzPGE=
-=VC1q
+iQEcBAEBCAAGBQJTPyAsAAoJEEdUh39IaPFNPakH/A0tj9FqAzjCE52A9FWrjjHi
+7O25qzU0iWVh/2kQaf8pssOnKK9xzXD0aGuyd1Ygwnzyofsde0LIr6VZRMUNvtU6
+PorA/f6qWcCe/fYD+6rATnI7tbCm/NHJ1ru3WmGQCeW2dAUC4IKhB94kJt6AMPNO
+jrTQQ4JEEGQUT5JhlzHZk89OAlQih4t/Avv74lTQBZzwRedVWwIK35saXH1cannF
+BN0iZO1nguoWgbkmApTgef3OA22LbMofFl6ydtx8pGiNWrf5tBV21ZHNphZtaSXc
+fMPxA5/IwAcmQ5WlVmj0mLBalhrNA/8/XI9ltFjNOx4ik1Su4HSE6hEDN13BQxY=
+=ZW7U
 -----END PGP SIGNATURE-----
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index b5f17efa767d..e21ab424480f 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -9,9 +9,6 @@
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
-  <use>
-    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
-  </use>
   <upstream>
     <maintainer status="active">
       <email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
index b6e939983cd2..e1e6531518fa 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
@@ -1,32 +1,38 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.2.ebuild,v 1.7 2014/03/30 15:58:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.2.ebuild,v 1.8 2014/04/04 21:17:52 ssuominen Exp $
 
 EAPI=5
 
 inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="PostScript plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
 SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
 IUSE=""
 
-RDEPEND=">=app-text/libspectre-0.2.6
-	>=app-text/zathura-0.2.0
-	dev-libs/glib:2
+RDEPEND=">=app-text/libspectre-0.2.6:=
+	>=app-text/zathura-0.2.7
+	dev-libs/glib:2=
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	#does not render w/o cairo
 	myzathuraconf=(
-		PREFIX="${EPREFIX}"/usr
-		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 9e6295bfbce6..3c243314e909 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,33 +1,38 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-9999.ebuild,v 1.2 2013/08/14 11:15:04 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-9999.ebuild,v 1.3 2014/04/04 21:17:52 ssuominen Exp $
 
 EAPI=5
 
-inherit eutils git-2 toolchain-funcs
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="PostScript plug-in for zathura"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
 EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
 EGIT_BRANCH="develop"
 
 LICENSE="ZLIB"
 SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
 KEYWORDS=""
-IUSE="+deprecated"
+fi
+IUSE=""
 
-RDEPEND=">=app-text/libspectre-0.2.6
-	>=app-text/zathura-0.2.0[deprecated=]
-	dev-libs/glib:2
+RDEPEND=">=app-text/libspectre-0.2.6:=
+	>=app-text/zathura-0.2.7
+	dev-libs/glib:2=
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	#does not render w/o cairo
 	myzathuraconf=(
-		PREFIX="${EPREFIX}"/usr
-		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1