Add (conditional) patch to build against poppler 0.5.1. Closes bug #124881.

(Portage version: 2.1_pre5-r4)

4 files changed, 24 insertions, 9 deletions

diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index aaedddfb0d8a..7333456fc8ce 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.81 2006/02/10 17:19:47 config Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.82 2006/03/05 15:30:40 flameeyes Exp $
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> kpdf-3.5.1-r2.ebuild:
+  Add (conditional) patch to build against poppler 0.5.1. Closes bug #124881.
 
   10 Feb 2006; Benjamin Schindler <config@gentoo.org>
   kpdf-3.4.3-r4.ebuild:
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index 4dc3bbd1a44a..70cb615cb810 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -46,9 +46,9 @@ SHA256 a09f9dc50f9ce50cd9793223c6e7bde8efbd3ccb79e11470c484a91746347df3 files/di
 MD5 caced8d9ad43d51ee9d60fa05a53ed52 files/digest-kpdf-3.5.1-r1 71
 RMD160 56996a7e7e46b1511adf94f0de9f5a6c5c8c2b2a files/digest-kpdf-3.5.1-r1 71
 SHA256 a09f9dc50f9ce50cd9793223c6e7bde8efbd3ccb79e11470c484a91746347df3 files/digest-kpdf-3.5.1-r1 71
-MD5 d821d1fcc03c6b77d538d64c96c8838b files/digest-kpdf-3.5.1-r2 524
-RMD160 c9a3226eafd3373096b88a359ef7ef926b5a3562 files/digest-kpdf-3.5.1-r2 524
-SHA256 97baa752bbf18c532a93e1f167956b8c9218831559d8bc9faf9223de1446c530 files/digest-kpdf-3.5.1-r2 524
+MD5 1d063cbae27a0b87d132108f1165daf5 files/digest-kpdf-3.5.1-r2 801
+RMD160 494e5b8241a60dbac871d622f934c326cf87e7f8 files/digest-kpdf-3.5.1-r2 801
+SHA256 febbad83c4ca50226d4c0c7d7466a5d582a095428f2d9f8344978da5cd28db21 files/digest-kpdf-3.5.1-r2 801
 MD5 653bd55a1e87c51731d0b0512051774e files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
 RMD160 0a28706eebe96636d063ecfc2960dfe01666ec43 files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
 SHA256 97c82623aca3131364e2d66b02b95a7ca2c5b6eacd17c4d15ea5a9890049b536 files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
@@ -121,9 +121,9 @@ SHA256 83539b5af5227e980cfabddb4d0f748dbf192bf5fa6726ba9054b6972fa62f94 kpdf-3.5
 MD5 d6fe1d2b278b94465006ad9054206a18 kpdf-3.5.1-r1.ebuild 1047
 RMD160 d6565fd9a838fe5c277895a4789322653f166bc8 kpdf-3.5.1-r1.ebuild 1047
 SHA256 f5d0355e54f06b3826846040d49da1083c0ac2656a4dfef9788c732d9c7ab30e kpdf-3.5.1-r1.ebuild 1047
-MD5 216357bfbc9cc9a9df4774d461c5e6ab kpdf-3.5.1-r2.ebuild 1126
-RMD160 5dc97fafe0c2662100ed9ff96777fa5b6aa9ca2b kpdf-3.5.1-r2.ebuild 1126
-SHA256 06df923fbfe88b366c41c0f45529e7447efe9e589a1e655892fe1328e786b11f kpdf-3.5.1-r2.ebuild 1126
+MD5 cd977cc79c5f399fa719cfc81260bf3e kpdf-3.5.1-r2.ebuild 1364
+RMD160 badb7116d857ab4188cbc5ef194f0d75b57fa32a kpdf-3.5.1-r2.ebuild 1364
+SHA256 8e67bfd859ce29b33fa3f37afc6781ca9d0e5dae2339a59c2986937d25c11871 kpdf-3.5.1-r2.ebuild 1364
 MD5 b71520405927b5861fa74ecca94abc04 kpdf-3.5.1.ebuild 993
 RMD160 9e25987ff1d37e5698d3481c2e1d0df7aeac7987 kpdf-3.5.1.ebuild 993
 SHA256 95f38c1f1202e356473e9cddf642462ca7e57ab99bf41e88a5473d6d6f5e28ac kpdf-3.5.1.ebuild 993
diff --git a/kde-base/kpdf/files/digest-kpdf-3.5.1-r2 b/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
index f1974bb28694..c067c6a38f1d 100644
--- a/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
+++ b/kde-base/kpdf/files/digest-kpdf-3.5.1-r2
@@ -1,6 +1,9 @@
 MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
 RMD160 a8b2b94c0378c689c9be808a1f57e93ecef54418 kdegraphics-3.5.1.tar.bz2 7315482
 SHA256 d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6 kdegraphics-3.5.1.tar.bz2 7315482
+MD5 7d247b1d0a5d5a6374bce1bd78d6693f kpdf-3.5.1-poppler-0.5.1.patch.bz2 1858
+RMD160 3055440f4d32f431a33a2f444153082990d591f8 kpdf-3.5.1-poppler-0.5.1.patch.bz2 1858
+SHA256 d2318c18e807c4ffde6baee60032d38a247355c8a1e94b12ae276b3d1e688d0d kpdf-3.5.1-poppler-0.5.1.patch.bz2 1858
 MD5 357d6f2afde33c2dcb3e07d7ce74b216 kpdf-3.5.1-poppler-2.patch.bz2 5847
 RMD160 2351c506ccd34dade7cd7fdfdabaa4561fa7226e kpdf-3.5.1-poppler-2.patch.bz2 5847
 SHA256 3daf7caec19b6060eeb454dd668986fda28f1ad2faea9d91cdc89bf8e4e3a58e kpdf-3.5.1-poppler-2.patch.bz2 5847
diff --git a/kde-base/kpdf/kpdf-3.5.1-r2.ebuild b/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
index 7178ea5f810b..e7a98c925623 100644
--- a/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.1-r2.ebuild,v 1.3 2006/02/05 12:29:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.1-r2.ebuild,v 1.4 2006/03/05 15:30:40 flameeyes Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -18,7 +18,8 @@ DEPEND=">=media-libs/freetype-2.0.5
 	>=app-text/poppler-bindings-0.5.0"
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-poppler-2.patch.bz2"
+	mirror://gentoo/${P}-poppler-2.patch.bz2
+	mirror://gentoo/${P}-poppler-0.5.1.patch.bz2"
 
 PATCHES="${FILESDIR}/${P}-saveas.patch
 	${DISTDIR}/${P}-poppler-2.patch.bz2"
@@ -31,6 +32,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	kde-meta_src_unpack
+
+	# Lovely when libraries changes API in micro releases.
+	has_version ">=app-text/poppler-0.5.1" && \
+		epatch "${DISTDIR}/${P}-poppler-0.5.1.patch.bz2"
+}
+
 src_compile() {
 	local myconf="--with-poppler"
 	replace-flags "-Os" "-O2" # see bug 114822