Add USE=+deprecated for gtk2 dependency, add live ebuild for gtk3 development.

(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 35 insertions, 6 deletions

diff --git a/app-text/zathura-pdf-mupdf/ChangeLog b/app-text/zathura-pdf-mupdf/ChangeLog
index 6301a9caf4c0..f70085bed56f 100644
--- a/app-text/zathura-pdf-mupdf/ChangeLog
+++ b/app-text/zathura-pdf-mupdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/zathura-pdf-mupdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.8 2013/06/20 11:25:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.9 2013/06/23 12:43:39 xmw Exp $
+
+  23 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch, metadata.xml,
+  zathura-pdf-mupdf-9999.ebuild:
+  Add USE=+deprecated for gtk2 dependency, add live ebuild for gtk3 development.
 
   20 Jun 2013; Michael Weber <xmw@gentoo.org>
   +files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch,
diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch
new file mode 100644
index 000000000000..3581028c2052
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch
@@ -0,0 +1,20 @@
+--- zathura-pdf-mupdf-9999/pdf.c
++++ zathura-pdf-mupdf-9999/pdf.c
+@@ -506,7 +506,7 @@
+   }
+ 
+   fz_drop_pixmap(mupdf_page->ctx, pixmap);
+-  fz_free_display_list(mupdf_page->ctx, display_list);
++  fz_drop_display_list(mupdf_page->ctx, display_list);
+ 
+   return image_buffer;
+ }
+@@ -580,7 +580,7 @@
+   }
+ 
+   fz_drop_pixmap(mupdf_page->ctx, pixmap);
+-  fz_free_display_list(mupdf_page->ctx, display_list);
++  fz_drop_display_list(mupdf_page->ctx, display_list);
+ 
+   return ZATHURA_ERROR_OK;;
+ }
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index e21ab424480f..b5f17efa767d 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -9,6 +9,9 @@
     <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-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index ab7f4058ea86..2dacd63357a1 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.4 2013/06/20 11:25:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.5 2013/06/23 12:43:39 xmw Exp $
 
 EAPI=5
 
@@ -14,11 +14,11 @@ EGIT_BRANCH="mupdf-git"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+deprecated"
 
 RDEPEND="!app-text/zathura-pdf-poppler
 	>=app-text/mupdf-9999:=
-	>=app-text/zathura-0.2.0
+	>=app-text/zathura-0.2.0[deprecated=]
 	media-libs/jbig2dec
 	media-libs/openjpeg:2
 	virtual/jpeg
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	# does not render w/o cairo
+	#does not render w/o cairo
 	myzathuraconf=(
 		WITH_CAIRO=1
 		CC="$(tc-getCC)"
@@ -41,7 +41,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-mupdf-fz_new_text_page.patch \
 		"${FILESDIR}"/${P}-mupdf-pkgconfig.patch \
-		"${FILESDIR}"/${P}-mupdf-split-headers.patch
+		"${FILESDIR}"/${P}-mupdf-split-headers.patch \
+		"${FILESDIR}"/${P}-fz_drop_display_list.patch
 }
 
 src_compile() {