Add patch from Fedora so we do not wrap nonexistant API, gentoo bug #377063.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

6 files changed, 135 insertions, 6 deletions

diff --git a/dev-python/python-poppler/ChangeLog b/dev-python/python-poppler/ChangeLog
index 3669f84e2335..6f178e2860fb 100644
--- a/dev-python/python-poppler/ChangeLog
+++ b/dev-python/python-poppler/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/python-poppler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/ChangeLog,v 1.18 2012/02/24 08:08:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/ChangeLog,v 1.19 2012/02/28 21:41:58 marienz Exp $
+
+*python-poppler-0.12.1-r3 (28 Feb 2012)
+
+  28 Feb 2012; Marien Zwart <marienz@gentoo.org>
+  +files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch,
+  +python-poppler-0.12.1-r3.ebuild, python-poppler-0.12.1-r1.ebuild,
+  python-poppler-0.12.1-r2.ebuild:
+  Add patch from Fedora so we do not wrap nonexistant API, gentoo bug #377063.
 
   24 Feb 2012; Patrick Lauer <patrick@gentoo.org>
   python-poppler-0.12.1-r1.ebuild, python-poppler-0.12.1-r2.ebuild:
diff --git a/dev-python/python-poppler/Manifest b/dev-python/python-poppler/Manifest
index 0322ba583f9f..8ca7023f9dc4 100644
--- a/dev-python/python-poppler/Manifest
+++ b/dev-python/python-poppler/Manifest
@@ -1,9 +1,11 @@
 AUX python-poppler-0.12.1-75_74.diff 1814 RMD160 17a29ecc170b9e5677eb4effc7fd6848803bb771 SHA1 923484b9d95efbf10f594345d1f0d2017048363f SHA256 3df92cfdbc3f3b3868d9d52a44074e6d970aed84cbb6cdab88ab499cce61142f
 AUX python-poppler-0.12.1-76_75.diff 2456 RMD160 5a511fe99ccabf070fc3bbd08e8041c4768b1966 SHA1 1f65d08f3fdbfeec81e0a91db6e248efe370b6d7 SHA256 08c01dff77985881ef1d9b90946d3c04e204688d6267154f5ca28ab2e4527bfb
 AUX python-poppler-0.12.1-79_78.diff 1434 RMD160 2a4fd081808e8e749b458413af485d61c6d8a09c SHA1 da7244a5bb68bd47933f781721a9a35193fec9ef SHA256 d95a50df3f46d3a86f1ac2e60a179b336e0523435fa92180abfa7966dde8eb9a
+AUX python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch 1667 RMD160 d91e79d3096cab1a3977745832f359a196a26b32 SHA1 7a5c8cbb9d8c0ed0d5b8a60ea46d0db5c70d985b SHA256 e2c60e30eb65d11c01c68ec31e6c1642c9297938cf642228ddc8be423388d40e
 AUX python-poppler-0.12.1-poppler0.15.0-changes.patch 1415 RMD160 77c4b4c650b3f6e3cb2e3814c6b56c833d0a2cad SHA1 6b9e5274282e2e4eaf55ad1f61dab30097a0e7b6 SHA256 e216bf0dc6edba4e414ace0b1911e3e07d06bea5711ecd4378ec2df062b7d532
 DIST pypoppler-0.12.1.tar.gz 318142 RMD160 d6c196d6bbbaa9ef96c2ea3a38eb6a89308bab15 SHA1 a8a92039911a7c4bbd995a46f88a1877bf88ab5c SHA256 322f183d24798a056f3005d1ab8e3ac27d8cfbbf0982725b323bbfec1bab5355
-EBUILD python-poppler-0.12.1-r1.ebuild 1332 RMD160 782c0d0b5e66ee5bccbe2920a2cb383ead94857a SHA1 a842ef3c9fad879ddb5da550a913cfbe40a58dae SHA256 6a2ac1dbdd8e7530fd2093f87193eb7c0e4213876fb02d85828b81bed45eb148
-EBUILD python-poppler-0.12.1-r2.ebuild 1300 RMD160 0033f02224c49b5833dce0770d88607b1a2f8f56 SHA1 b2b0b352f6dc054e89fff914d2a6715d3c1e05e0 SHA256 88be53d844fafe0ddd87c698d3e9649839291ec29eb444ebd51c4895f167f52c
-MISC ChangeLog 3163 RMD160 dcb4922ee1abfb5e8a795f8fcdf961dde226a172 SHA1 8a3a42c51712770b6f310d035ba862f0697f3c5c SHA256 cb1755eaff6feb0cf91aa425bbfc289d9c44e78ce4a2c4cc77199d6a87d90f26
+EBUILD python-poppler-0.12.1-r1.ebuild 1356 RMD160 64025d98274e8540bf5a042bf8c28b419f35bbd8 SHA1 b950b4789243a8b3d943b90998d1355da5258971 SHA256 2796f52abeac460bc7b45f280b854a059a7605df6edce9cb1785df77764dec37
+EBUILD python-poppler-0.12.1-r2.ebuild 1324 RMD160 ae8437d2ffc3829536388374f4ec1a263ad27bd8 SHA1 4e85a0a4c51f527dd75b61ca55e161b041e699de SHA256 b4d2d321c87f241902b92d35ba7751a9b3cd893e86b7f3fc23f8571dbbbd35f3
+EBUILD python-poppler-0.12.1-r3.ebuild 1356 RMD160 4e558d221ba00d5de2af5fcbf894d6a4cf5aa78b SHA1 ec54ca6378775174f427b883d184dbba89344404 SHA256 1ca52ed3a3da2a0f0ea4071d66f6183cdf4498d1ee6635bf54122230086aa985
+MISC ChangeLog 3502 RMD160 7ed0bff3d03021d4095dd44baae759021d6e2d9c SHA1 82abde80c2de09605e9ac157af2240307e349f6f SHA256 b45b963ceef1c60e1e1d63f34f0833b1b5085d9af774d2195880a75dae4f12f5
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch
new file mode 100644
index 000000000000..2099e0af11f8
--- /dev/null
+++ b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch
@@ -0,0 +1,65 @@
+--- pypoppler-0.12.1/poppler.defs	2011-10-24 11:57:35.000000000 +0200
++++ pypoppler-0.12.1/poppler.defs	2011-10-24 12:01:28.000000000 +0200
+@@ -1646,62 +1646,6 @@
+   (return-type "GType")
+ )
+ 
+-(define-method render_to_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_to_pixbuf")
+-  (return-type "none")
+-  (unblock-threads #t)
+-  (parameters
+-    '("int" "src_x")
+-    '("int" "src_y")
+-    '("int" "src_width")
+-    '("int" "src_height")
+-    '("double" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method render_to_pixbuf_for_printing
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_to_pixbuf_for_printing")
+-  (return-type "none")
+-  (unblock-threads #t)
+-  (parameters
+-    '("int" "src_x")
+-    '("int" "src_y")
+-    '("int" "src_width")
+-    '("int" "src_height")
+-    '("double" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method get_thumbnail_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_get_thumbnail_pixbuf")
+-  (return-type "GdkPixbuf*")
+-  (unblock-threads #t)
+-)
+-
+-(define-method render_selection_to_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_selection_to_pixbuf")
+-  (return-type "none")
+-  (unblock-threads #t)
+-  (parameters
+-    '("gdouble" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-    '("PopplerRectangle*" "selection")
+-    '("PopplerRectangle*" "old_selection")
+-    '("PopplerSelectionStyle" "style")
+-    '("GdkColor*" "glyph_color")
+-    '("GdkColor*" "background_color")
+-  )
+-)
+-
+ (define-method render
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render")
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r1.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r1.ebuild
index b015c5456b85..3f695f78f98d 100644
--- a/dev-python/python-poppler/python-poppler-0.12.1-r1.ebuild
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1-r1.ebuild,v 1.6 2012/02/24 08:08:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1-r1.ebuild,v 1.7 2012/02/28 21:41:58 marienz Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -22,6 +22,7 @@ IUSE="examples"
 S=${WORKDIR}/pypoppler-${PV}
 
 RDEPEND=">=app-text/poppler-0.15.0[cairo]
+	<app-text/poppler-0.18
 	>=dev-python/pycairo-1.8.4
 	dev-python/pygobject:2
 	dev-python/pygtk:2"
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r2.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r2.ebuild
index 91d71324799f..d9bd996b4b80 100644
--- a/dev-python/python-poppler/python-poppler-0.12.1-r2.ebuild
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1-r2.ebuild,v 1.2 2012/02/24 08:08:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1-r2.ebuild,v 1.3 2012/02/28 21:41:58 marienz Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -22,6 +22,7 @@ IUSE="examples"
 S=${WORKDIR}/pypoppler-${PV}
 
 RDEPEND=">=app-text/poppler-0.15.0[cairo]
+	<app-text/poppler-0.18
 	>=dev-python/pycairo-1.8.4
 	dev-python/pygobject:2
 	dev-python/pygtk:2"
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild
new file mode 100644
index 000000000000..3f42f67fa5ff
--- /dev/null
+++ b/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild,v 1.1 2012/02/28 21:41:58 marienz Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+
+inherit eutils libtool python
+
+DESCRIPTION="Python bindings to the Poppler PDF library"
+HOMEPAGE="http://launchpad.net/poppler-python"
+SRC_URI="http://launchpad.net/poppler-python/trunk/development/+download/pypoppler-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="examples"
+
+S=${WORKDIR}/pypoppler-${PV}
+
+RDEPEND=">=app-text/poppler-0.15.0[cairo]
+	>=dev-python/pycairo-1.8.4
+	dev-python/pygobject:2
+	dev-python/pygtk:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=tree
+	epatch \
+		"${FILESDIR}"/${P}-75_74.diff \
+		"${FILESDIR}"/${P}-79_78.diff \
+		"${FILESDIR}"/${P}-poppler0.15.0-changes.patch \
+		"${FILESDIR}"/${P}-poppler-0.18.0-minimal-fix.patch
+
+	elibtoolize
+	python_copy_sources
+}
+
+src_install() {
+	python_src_install
+	python_clean_installation_image
+
+	dodoc NEWS || die
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demo/demo-poppler.py || die
+	fi
+}