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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 35 insertions, 20 deletions

diff --git a/app-text/zathura-djvu/ChangeLog b/app-text/zathura-djvu/ChangeLog
index b489dd21cd27..73ce0ff4b761 100644
--- a/app-text/zathura-djvu/ChangeLog
+++ b/app-text/zathura-djvu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/zathura-djvu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/ChangeLog,v 1.25 2014/03/30 15:55:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/ChangeLog,v 1.26 2014/04/04 21:08:46 ssuominen Exp $
+
+  04 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml,
+  zathura-djvu-0.2.3.ebuild, zathura-djvu-9999.ebuild:
+  Synchronize 0.2.3 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-djvu-0.2.3.ebuild:
   Revert back to ~arch because arch stabilization can't be trusted due to the
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index b5f17efa767d..e21ab424480f 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/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-djvu/zathura-djvu-0.2.3.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
index b1b84b36e667..9a5bacd8f156 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
@@ -1,36 +1,43 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild,v 1.5 2014/03/30 15:55:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild,v 1.6 2014/04/04 21:08:46 ssuominen Exp $
 
 EAPI=5
 
 inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="DjVu 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"
+else
+KEYWORDS=""
+fi
 IUSE=""
 
-RDEPEND=">=app-text/djvu-3.5.24-r1
-	>=app-text/zathura-0.2.0
-	dev-libs/glib:2
+RDEPEND=">=app-text/djvu-3.5.24-r1:=
+	>=app-text/zathura-0.2.7
+	dev-libs/glib:2=
 	x11-libs/cairo:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	#rendering failed w/o cairo
 	myzathuraconf=(
-		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
 		DESTDIR="${D}"
-		)
+	)
 }
 
 src_compile() {
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index c47657a93435..25a3c0fa5b23 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,32 +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-djvu/zathura-djvu-9999.ebuild,v 1.1 2013/06/23 12:41:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/zathura-djvu-9999.ebuild,v 1.2 2014/04/04 21:08:46 ssuominen Exp $
 
 EAPI=5
 
-inherit eutils git-2 toolchain-funcs
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
 
 DESCRIPTION="DjVu 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"
+else
 KEYWORDS=""
-IUSE="+deprecated"
+fi
+IUSE=""
 
-RDEPEND=">=app-text/djvu-3.5.24-r1
-	>=app-text/zathura-0.2.0[deprecated=]
-	dev-libs/glib:2
+RDEPEND=">=app-text/djvu-3.5.24-r1:=
+	>=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=(
-		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1