From b7d2dc58648335617769e2acda30d86f5e4837f6 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Tue, 15 Jun 2010 13:59:24 +0000
Subject: [PATCH] Use python_clean_installation_image() instead of manually
 deleting .la files. Package-Manager: portage-HEAD/cvs/Linux x86_64

---
 dev-python/python-poppler/Manifest            |  2 +-
 .../python-poppler-0.12.1.ebuild              | 25 ++++++++++---------
 dev-python/rst2pdf/Manifest                   |  4 +--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/dev-python/python-poppler/Manifest b/dev-python/python-poppler/Manifest
index 88a4b346827a..2367cc151e98 100644
--- a/dev-python/python-poppler/Manifest
+++ b/dev-python/python-poppler/Manifest
@@ -1,4 +1,4 @@
 DIST pypoppler-0.12.1.tar.gz 318142 RMD160 d6c196d6bbbaa9ef96c2ea3a38eb6a89308bab15 SHA1 a8a92039911a7c4bbd995a46f88a1877bf88ab5c SHA256 322f183d24798a056f3005d1ab8e3ac27d8cfbbf0982725b323bbfec1bab5355
-EBUILD python-poppler-0.12.1.ebuild 1125 RMD160 b7da1494d3376aeac3b94d7f72a0eddc6a4e2757 SHA1 7b38c6f6c847c005efeb0faafc8ccd94187a496f SHA256 e5e41702c6916ea454d1bd1cf425edea7ff941675c867ef4daa0fd3fddbd8b8d
+EBUILD python-poppler-0.12.1.ebuild 1102 RMD160 499bc231217b477e25587d2585bf2288ca359333 SHA1 27ef92db05a0f5a70b6d8970a7f4e85ca2f7483f SHA256 ce3552ea1b281a60fd479d572cd566afa173ab9fa7d9c8e7eab70770a0b5c7b9
 MISC ChangeLog 1650 RMD160 427e34f8b0e9da6ec99945ac4dfc206903c98003 SHA1 b4473dd8311ccca54a2ba7499d019ba606c58f54 SHA256 f39fbbf8fc29943c716f32b752d4b01ac2a71a075cfb147e0fcb973a60b422ee
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/python-poppler/python-poppler-0.12.1.ebuild b/dev-python/python-poppler/python-poppler-0.12.1.ebuild
index 3028bb099f9c..0507aa7a437c 100644
--- a/dev-python/python-poppler/python-poppler-0.12.1.ebuild
+++ b/dev-python/python-poppler/python-poppler-0.12.1.ebuild
@@ -1,33 +1,32 @@
 # Copyright 1999-2010 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.ebuild,v 1.6 2010/05/18 13:00:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1.ebuild,v 1.7 2010/06/15 13:59:24 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2:2.6"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
 inherit libtool python
 
 DESCRIPTION="Python bindings to the Poppler PDF library"
-SRC_URI="http://launchpad.net/poppler-python/trunk/development/+download/pypoppler-${PV}.tar.gz"
 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"
 IUSE="examples"
 
-S=${WORKDIR}/pypoppler-${PV}
+S="${WORKDIR}/pypoppler-${PV}"
 
 RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
+	>=dev-python/pycairo-1.8.4
 	dev-python/pygobject:2
-	dev-python/pygtk:2
-	>=dev-python/pycairo-1.8.4"
+	dev-python/pygtk:2"
 DEPEND="${RDEPEND}"
 
-RESTRICT_PYTHON_ABIS="2.4 2.5 3*"
-
 src_prepare() {
 	elibtoolize
 	python_copy_sources
@@ -35,10 +34,12 @@ src_prepare() {
 
 src_install() {
 	python_src_install
-	find "${D}" -name '*.la' -type f -exec rm -f '{}' ';' || die "Removing .la files failed"
-	dodoc NEWS || die
+	python_clean_installation_image
+
+	dodoc NEWS || die "dodoc failed"
+
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins demo/demo-poppler.py || die
+		doins demo/demo-poppler.py || die "doins failed"
 	fi
 }
diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest
index aeadf552292f..eec40de8c0ce 100644
--- a/dev-python/rst2pdf/Manifest
+++ b/dev-python/rst2pdf/Manifest
@@ -2,5 +2,5 @@ DIST rst2pdf-0.14.2.tar.gz 1178510 RMD160 218b69f0b7052f61f4f7a08ebb97675322b93f
 DIST rst2pdf-0.15.tar.gz 1221967 RMD160 a875adaaeea42069c6a962e0d6f49278c04fc873 SHA1 caa1091ea2ca146e4c17bdde7cca3def9d136d44 SHA256 b11ea168cb55c35c5abe25f4147f5ab878e2adc34661a99650cb558b0d669bd0
 EBUILD rst2pdf-0.14.2.ebuild 1518 RMD160 78c52f5a12e0dfcabe5dc82175d28d9fd155817e SHA1 4607c891071f30614afa5670d46765cfd7253834 SHA256 44da8b9e643fba3d6cc8de8bb32bc5068652b0fbde45c225938446b5fc229504
 EBUILD rst2pdf-0.15.ebuild 1493 RMD160 37b5b601b12241cb7c9f3f456916457acff67363 SHA1 d4f537d6be56b931844294ce66e8c20e28f352e7 SHA256 9b1ee63dfc9798df8cefdb00ca1a767d564efa8eee0fdef2ea4a1d2326488a5c
-MISC ChangeLog 1454 RMD160 b1422dd7ca68f867e7ff0139680c3f2a62afc33d SHA1 f29553139d12e0dfd7a841221c1d8880a0bb161c SHA256 6efca14ba3289792c482f278a5233e8fd29fef91e84d91ba71c9241ac8b1262c
-MISC metadata.xml 252 RMD160 3a9c85cb4b886bd4c3ef6f94777f425d8d84f050 SHA1 5bd7d98a5876e82fe8444e5c8cbfa12a322fda28 SHA256 6107e3397419f4c9e53b5663ba3dd8bbff44d5e67f6519c9abf5a01bf159f354
+MISC ChangeLog 1547 RMD160 2c31e05687841a58a74b2c14429de8c524180429 SHA1 a1678c9b0f83553b09e5f7aefe363b94b2c7d1dd SHA256 f0311eaf16ff57e300f083b83a6cf7ba6e60dec79bd59e84d246b77d9c5e3ff8
+MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
-- 
2.26.2