synchronize 0.2.6 and 9999 for maintainability

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

4 files changed, 41 insertions, 21 deletions

diff --git a/app-text/zathura/ChangeLog b/app-text/zathura/ChangeLog
index d2bacc86c096..b03f3124ef38 100644
--- a/app-text/zathura/ChangeLog
+++ b/app-text/zathura/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for app-text/zathura
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.53 2013/11/27 10:12:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/ChangeLog,v 1.54 2013/11/27 10:31:45 ssuominen Exp $
 
 *zathura-0.2.6 (27 Nov 2013)
 
   27 Nov 2013; Samuli Suominen <ssuominen@gentoo.org> +zathura-0.2.6.ebuild,
-  metadata.xml:
+  zathura-9999.ebuild, metadata.xml:
   Version bump wrt #483268 by Petr Pisar
 
 *zathura-9999 (22 Jun 2013)
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 43fd721616ff..66af7b15a121 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -8,18 +8,18 @@ DIST zathura-0.2.6.tar.gz 134021 SHA256 ac529507350f148dcaa27fd266ad5973c2205066
 EBUILD zathura-0.2.1.ebuild 1409 SHA256 29593b13f89c438899544407e1e3d32a7cfa112e5ec4af6244e5821b62a7a78c SHA512 5cc2218891b2e90cc6e17c4090c067131a4eb2537f44ca3cca3f60449293b5692daf5c3c536b3a62e46a1e08372053625a05c828ab609f9f77d9648f09d64ebd WHIRLPOOL fbd50ecc1da6fffc4503315bdd57153c719e0d8278b3bba7b198857b30ac0cd4af6d8a7f8e1d920bd091693708a0c40ac7a29ea7be4579eda93765f6b70b8cdd
 EBUILD zathura-0.2.2.ebuild 1309 SHA256 2703b6dda2d6307b3c664b1b443a3e736a20279b8dfb048744686b939a506e8c SHA512 460e9a5df284a8d2350752e5fd1aea1f962a6d4f0dce9cce64041ebc0892eb7a8973235cb2d067046095c63605e759cf334fd1db9a71586e8a6f95cd973eb891 WHIRLPOOL 4734c9822c823b797ae9a7778f10c5dc3b1765c4340050d8e3df8f1a9ef8ec57ef535747ec711f677eacfb0dcfdf5b447c32d1b52a7460a7b94e8490037c3df0
 EBUILD zathura-0.2.3.ebuild 1309 SHA256 2cbd498a31c93b23eacc8e2ea266a0dbb8781bbc4cc8817743fcabffdbc1fc8c SHA512 8cb660bbe4f08d2b8d2fad193be8fe5fc950c2b745b43d35721953e7a03d8233a64db1cc3878ff6373243d39b54624d434df77a74e53cf31b3cd50f9db7252f4 WHIRLPOOL f88d6d8b2e9db9f58ff1badf7691a2bc4776d6c1cbbb5e6acaf2b2ea296247473d32e51b9453ec6428888b76713b487fe94eebbc531d4984702f941e1dee5470
-EBUILD zathura-0.2.6.ebuild 1385 SHA256 d6b05b4dd1ad75baad24a0705800f3915a723f26fd04fdef53ce4c5a5c1d7425 SHA512 a11b16b2d4ce1d76dc5147ec0ac3dff0e7618144ad1d99a6519019af950ad23c89ebda755712b2cf8004a703e6866c5a998f5d75532028ee77db2b30704bed69 WHIRLPOOL 581101b915dd4f7a5eac1f6ccb2e474bde6babc8270bb6cdec91c04301e7d8889f7a8b1667340e63cac458b35a98a373086a1defeeec9dc0f7035eb0740dfdfc
-EBUILD zathura-9999.ebuild 1374 SHA256 522404db4d35604f412b7e56b40bf9a3a87903004d80c2bd5ec0d5d359407763 SHA512 b44b89e093ebedf6c1b8bf9da8a3b107cbe72db84dbf192d881e59932628d783eaf7c860af1e96a0222f3f9e90324f0e772ae72434ddeb43845fbd1383dac267 WHIRLPOOL c3f8779b4497d67c192c6d5db2a0701870e2bba331a9d5e1c44dfc260b56b37c70385640ef918588b86a995a8ebbc0ad0646a305cb7edb52a92114b6a52d5a41
-MISC ChangeLog 7250 SHA256 7ae5fdbb3a80ffb9d5cfdcb65d38d82d0ea16d797da3a2d9b174f7a647848036 SHA512 034508b2c28b9293934f5254edfcc56dd19367603dbb73bfef49f01f8e2f54f06d1520c498d7169c214a0a7ec2a4ff6a0bf19d1976df6d0644c44ffec34f2f59 WHIRLPOOL 46288bd1caf420671339c23b182467faaf089c91c00044353d80a4b8daf88c259fc0b00d88088df312db4e1dc71d9e5b94e9cafdbcb0fe4e46285514eba58723
+EBUILD zathura-0.2.6.ebuild 1665 SHA256 c6000b18249928802a3f6e1c1fa807cf6f7159d2973c8503353cdf98b65ca35b SHA512 51f8a23dd7fad35118e671969c81745f90edcbab0da417b32cf94b29680f0e95b5022ee7ece4e429d8033a619dc469c6995cc3dbf6216b5be85b2578cfd50a2f WHIRLPOOL b22ee6b8846975790c5e52ca3a068541f1204507da4b98cf24806615e82e7c5cca4d08d2b84ba878857d2ac41fff74823a5b4919521f6b9520ef42ac00fd0850
+EBUILD zathura-9999.ebuild 1664 SHA256 0bf89bf243719674f6407a6a41c1d9dcf9eaeb50d1893afbfb3fc60229d03cd2 SHA512 0bb30cd51697e208fd5a7fe864ce247288b8e5525310c96afc6563b4ff94f6dc0d5f42381246440802236d05e6d9f2e5d7cef511cd06146857845a3dada13e61 WHIRLPOOL d03a4ef2be89d64c4e6954f5df40506ec26359b3ffb697b15022d7497fa60ec6037fe2eceecda65907de7c8af5b7deeaaf8cdd03d7af89820c3627187b7da9b4
+MISC ChangeLog 7271 SHA256 38fac252de9362f4100c9ae4df0ffb6d115939efde7d58efef020946f086debc SHA512 1c9d3851e2df08944dac5b1c21ac81481a430bce7f11a296f8aa92b52802b7a94746b9b619a511906ac139de4c5ac61a0c28a86888162c131f7919f7f7a22a5f WHIRLPOOL 34467ce7fd5cb732171068f5e570c61671f5551b04a098ceef0b9a88e75d52c95e6d410ed4de842082249e813d57286f045e15b34f84ac0381af0c6b23b015c5
 MISC metadata.xml 954 SHA256 1b80a8ab78e64d80ad926e10b138fcde74b83fc1778bccb3726005e160272190 SHA512 14467be806531ae31ba80232a874ee89e45b2688afd0593acbb3df14260fa6db5bdb2080898e28e95e62f457333ab1d0e04f5cbb6ccd29a07f8aa5154f531aaa WHIRLPOOL 99b4c08a1ab1067a6c9c4152aa48b24a08051117352de546edd1f67c97e605a1d109de091ed03b364dfd2c77a9adc0289a09a748c8f61ad987431412e9fe8021
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEbBAEBCAAGBQJSlcUJAAoJEEdUh39IaPFNwmoH9R43JbiMDFuY3OOvPdalewzI
-vovoI9piq9Z1OlQB/AUZypTdCRUhDCaU9MlryWLTtpYtu2dBX5H+QhKbSsTfgJKl
-qea0mRh+ksSr2Vg9cqmOFw3EWBmvzKlJMALZP0VfPUxcpBEHKtjX4zugAQT7Cdlr
-fpzEsAl1/c8DVmApf5fZxTLNahY2GbcanMXYt72zrOx3adKYJJAEO98awu3M6rd4
-O7+vzOnyCQNt73Uq/IIj9+Y33ksxwPXt2FdE4rPWfvWGXH6sZYhSUKtuo4kKF9Do
-udhQmawxuMJITL372/3ReC/yF4Q4qdwQt86Tlh/v+xKdipMNQHgAO8oCMn2XQg==
-=1vVk
+iQEcBAEBCAAGBQJSlcmoAAoJEEdUh39IaPFNPvAH/3jBi+hsBlaPbxb/BQCfif5f
+75WKF9nj/LPxoRtkWE0aEv/ELmYpRusI6FLd9b3OJe6J6qZsDXL0OZrgrCzXw/jf
+iAdPC8pa5HQ0d2Qu+v3sbWUQbcXB/Dq/fXr/axmi1U2At/p0exFLyqj4I6EGvHFC
+K04UVfd6vzwUlyhAyZHV4UUq157IiqHCzwsW0Y0EI5wG6+g/KuikfZArVmzPWBCY
+rsTfZPIFcQ7q4tog3FSR977LcgUJcI/xv8UMjqWqBDM9O3OgmSinzuLTwdkqkuUO
+w09ayLuCk15bZkUMrfSZxSwOJHVGj9OCl8EPiAb7fV+rRwjIpLyO3tX4yX9VMLs=
+=tTle
 -----END PGP SIGNATURE-----
diff --git a/app-text/zathura/zathura-0.2.6.ebuild b/app-text/zathura/zathura-0.2.6.ebuild
index afd3c64a23f7..6ef7d2778d4f 100644
--- a/app-text/zathura/zathura-0.2.6.ebuild
+++ b/app-text/zathura/zathura-0.2.6.ebuild
@@ -1,23 +1,33 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.6.ebuild,v 1.1 2013/11/27 10:12:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.6.ebuild,v 1.2 2013/11/27 10:31:45 ssuominen Exp $
 
 EAPI=5
 
 inherit eutils fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
 SRC_URI="http://pwmt.org/projects/${PN}/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"
-IUSE="+doc magic sqlite test"
+else
+KEYWORDS=""
+fi
+IUSE="+doc +deprecated magic sqlite test"
 
-RDEPEND=">=dev-libs/girara-0.1.8:2
-	>=dev-libs/glib-2.28:2
-	x11-libs/cairo
+RDEPEND="dev-libs/glib:2
+	x11-libs/cairo:=
+	deprecated? ( >=dev-libs/girara-0.1.6:2 )
+	!deprecated? ( >=dev-libs/girara-0.1.6:3 )
 	magic? ( sys-apps/file )
 	sqlite? ( dev-db/sqlite:3 )"
 DEPEND="${RDEPEND}
@@ -28,7 +38,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	myzathuraconf=(
-		ZATHURA_GTK_VERSION=2
+		ZATHURA_GTK_VERSION=$(usex deprecated 2 3)
 		WITH_MAGIC=$(usex magic 1 0)
 		WITH_SQLITE=$(usex sqlite 1 0)
 		PREFIX="${EPREFIX}"/usr
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 015c412a287d..df4a5ff8de0a 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,25 +1,34 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-9999.ebuild,v 1.1 2013/06/22 13:05:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-9999.ebuild,v 1.2 2013/11/27 10:31:45 ssuominen Exp $
 
 EAPI=5
 
-inherit eutils fdo-mime git-2 multilib toolchain-funcs virtualx
+inherit eutils fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/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="+doc +deprecated sqlite test"
+fi
+IUSE="+doc +deprecated magic sqlite test"
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/cairo:=
 	deprecated? ( >=dev-libs/girara-0.1.6:2 )
 	!deprecated? ( >=dev-libs/girara-0.1.6:3 )
+	magic? ( sys-apps/file )
 	sqlite? ( dev-db/sqlite:3 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
@@ -30,6 +39,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	myzathuraconf=(
 		ZATHURA_GTK_VERSION=$(usex deprecated 2 3)
+		WITH_MAGIC=$(usex magic 1 0)
 		WITH_SQLITE=$(usex sqlite 1 0)
 		PREFIX="${EPREFIX}"/usr
 		LIBDIR='${PREFIX}'/$(get_libdir)