Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for consistency. Delete old.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

6 files changed, 32 insertions, 82 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index 65052a636b52..40bbd2d186ee 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/xpdf
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.179 2009/04/07 10:07:45 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.180 2009/05/14 19:54:42 loki_val Exp $
+
+  14 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/poppler-0.10.0.patch, -xpdf-3.02-r1.ebuild, xpdf-3.02-r2.ebuild,
+  +files/xpdf-3.02-poppler-0.10.0.patch,
+  +files/xpdf-3.02-poppler-0.11.0.patch:
+  Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the
+  magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for
+  consistency. Delete old.
 
   02 Apr 2009; Markus Meier <maekke@gentoo.org> xpdf-3.02-r2.ebuild:
   amd64 stable (bug #242930)
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 6887528b7cf5..d5e8c464dd6a 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,6 +1,7 @@
-AUX poppler-0.10.0.patch 1590 RMD160 343cdc65c065c37352fb50fbb123bec3a8a0f8ed SHA1 3072d67a302b3d80289fd64cf8d40228a90891f5 SHA256 0be3e858f06e2f130b1705094fb76bb4ea65f4d5ad6fd31fb40bb843aa3858b5
 AUX sample-xpdfrc 3619 RMD160 336b60e59a5aadaeb0c93c4edf315103ea76d8ee SHA1 4a20a0289357d84bd5e32ec5eab63cffe8d9bea0 SHA256 1c5cf49e7241b741a46b1851dcf3d845ee036bdecb4faf1c60dbac77565ca2f7
 AUX xpdf-3.02-as-needed.patch 398 RMD160 b27967e9c14f8522508da8e22351acbfadf189e2 SHA1 0d124338be45e51b3fa52d401e3d92442ec3de50 SHA256 328715e47d95d867e9fb8fe3d632d8a40370ff056bd57cf8f4cf21f4bab49509
+AUX xpdf-3.02-poppler-0.10.0.patch 1590 RMD160 343cdc65c065c37352fb50fbb123bec3a8a0f8ed SHA1 3072d67a302b3d80289fd64cf8d40228a90891f5 SHA256 0be3e858f06e2f130b1705094fb76bb4ea65f4d5ad6fd31fb40bb843aa3858b5
+AUX xpdf-3.02-poppler-0.11.0.patch 314 RMD160 20806826221797a5026b9e706bd17af1b9e1530c SHA1 52baf1491066c759338db952fd64bc6cc03ac2ab SHA256 4fabf222c3064b20ea86e4a60f64ee9b7639f50ac9e276d9621c2a9bfe2dc404
 AUX xpdf-3.02-poppler-nodrm.patch 1633 RMD160 707bd5287e05b1d7469431c9fa67aba6bb4bd27e SHA1 5fa0e0790b85843c91d64f2b9cd1df91bf8507a1 SHA256 515a89af7c097f7d6b373e27be870d25b897444e31cf5f3af5a840c144ddd84c
 AUX xpdfrc.5 17548 RMD160 215ed02d4653b5aaf3dc6b4d029bd5434343e619 SHA1 0fe82390a85c2c37313390c8a1bb79069bcc249b SHA256 645d58cf1266ac7037af5288d9b02a6b9eb40bb3fa49516612f3e6fb0d9960d5
 DIST xpdf-3.02-poppler-20071121.tar.bz2 107935 RMD160 faf276c824ef12f44609ef7610dc309c87ee3c96 SHA1 bb548689ca2107e99e51b48060e0b583ed9e10ed SHA256 5e04476110ef9ec122e5aa427b4be5e79a003d2740ec8c65b32f526a03b52ed5
@@ -15,7 +16,6 @@ DIST xpdf-korean-2005-jul-07.tar.gz 470455 RMD160 9e5bab5f0f8bcdc7fa5506f7311b70
 DIST xpdf-latin2-2002-oct-22.tar.gz 1435 RMD160 7dd1f32d0e857789983d64ee71fedfde13123947 SHA1 e5fbf01c758c670973a34e67d56790c0b9e9eda4 SHA256 f74eab0a8d5b5b77becd344910be5218666aba06b9c02554549d2e6c1ae42643
 DIST xpdf-thai-2002-jan-16.tar.gz 1873 RMD160 5bb942b4a50cf1ff9758dbfbb9cd6e3310c059c3 SHA1 93de04cb2211a7451d6e8f62ddef1748d2fa37f4 SHA256 9708a88ed37150ecdbba3abb01cf86f1a8a75192a758af729a59f7162722e931
 DIST xpdf-turkish-2002-apr-10.tar.gz 1140 RMD160 25e49dd17c93d6904372f1223c2204543ddbf22d SHA1 2a225c726ebef40f63902081604064bd8b4ae117 SHA256 25b992d294e2e135e2b1b3d93010d97f33b3e2cd9437aa903d2795016a10e6c7
-EBUILD xpdf-3.02-r1.ebuild 2750 RMD160 1386dd30e6b0d95a23675e48433ecfd4b3e685a8 SHA1 aafbd19d0bc8872a8c2bbb056e278f3ac557c37a SHA256 7c1443df7c485be42cebff508a8203f194f7225483b3a75342acd590773b604d
-EBUILD xpdf-3.02-r2.ebuild 2833 RMD160 b33d8f01a85b6b93af20b80555ea0d63dd8de41a SHA1 b3c63bd20333a69c7816e7472567755bc032c7d0 SHA256 6806a34bb773609e20de3c6a5bd024e25531edf0ba9d7cf3751113e452e5e601
-MISC ChangeLog 23195 RMD160 335e6b0ddf35779e12b5b3547d3919f554166657 SHA1 7f4d19375f42b2a238afcbfc9e7e0c35b9d1aae0 SHA256 d63ecd0c478e66a7b4253aaae3b43c6f80f71de7a9f4123a3d7eeccc8d5962f6
+EBUILD xpdf-3.02-r2.ebuild 2930 RMD160 fddcbace75a46afd715a534243f930c9e8fafc62 SHA1 55cd16424c639bdace6f4151fa99d1b1c02c35b4 SHA256 9411416df39c31cd1e4a87d8b110ee70a61f71ac489c8555616c027a1aa62205
+MISC ChangeLog 23584 RMD160 88c61814af661fd76c0fbd0b8e5da80a22ac910e SHA1 b6ec6c2ae7d7507f14ff96b528e5af255558e54e SHA256 64fe6c6b9bce3637fcea0c59ccce0822d997cd3d8313ad5111c185f39544e43e
 MISC metadata.xml 234 RMD160 553d24231ed003084bcef961dccbd659d67e03d9 SHA1 34590aace0d52fd29fc6e1511c30a898826fe414 SHA256 7014fa9f87f6eedd08a265737c2884aafcb4ca673bfcec5b0a3f9fabbe5ef194
diff --git a/app-text/xpdf/files/poppler-0.10.0.patch b/app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch
index fcf0d7f06195..fcf0d7f06195 100644
--- a/app-text/xpdf/files/poppler-0.10.0.patch
+++ b/app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch
diff --git a/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch b/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch
new file mode 100644
index 000000000000..4545a4dce446
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch
@@ -0,0 +1,13 @@
+Index: xpdf-3.02-poppler/PDFCore.cc
+===================================================================
+--- xpdf-3.02-poppler.orig/PDFCore.cc
++++ xpdf-3.02-poppler/PDFCore.cc
+@@ -49,7 +49,7 @@ PDFCorePage::~PDFCorePage() {
+     delete links;
+   }
+   if (text) {
+-    delete text;
++    text->decRefCnt();
+   }
+ }
+ 
diff --git a/app-text/xpdf/xpdf-3.02-r1.ebuild b/app-text/xpdf/xpdf-3.02-r1.ebuild
deleted file mode 100644
index d9bf04c2245d..000000000000
--- a/app-text/xpdf/xpdf-3.02-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r1.ebuild,v 1.7 2009/03/30 02:06:40 loki_val Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An X Viewer for PDF Files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}-poppler-20071121.tar.bz2
-	linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2003-feb-16.tar.gz )
-	linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz )
-	linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz )
-	linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic-2003-jun-28.tar.gz )
-	linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek-2003-jun-28.tar.gz )
-	linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew-2003-feb-16.tar.gz )
-	linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz )
-	linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz )
-	linguas_la? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2-2002-oct-22.tar.gz )
-	linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2002-jan-16.tar.gz )
-	linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish-2002-apr-10.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="nodrm linguas_ar linguas_zh_CN linguas_zh_TW linguas_ru linguas_el
-linguas_he linguas_ja linguas_ko linguas_la linguas_th linguas_tr"
-
-RDEPEND=">=virtual/poppler-0.6.1
-	x11-libs/openmotif
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P}-poppler
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use nodrm && \
-		epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
-	has_version '>=virtual/poppler-0.10.0' && \
-		epatch "${FILESDIR}"/poppler-0.10.0.patch
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_install() {
-	dobin xpdf
-	doman xpdf.1 ${FILESDIR}/xpdfrc.5
-	insinto /etc
-	newins ${FILESDIR}/sample-xpdfrc xpdfrc
-	dodoc README ANNOUNCE CHANGES
-
-	use linguas_ar && install_lang arabic
-	use linguas_zh_CN && install_lang chinese-simplified
-	use linguas_zh_TW && install_lang chinese-traditional
-	use linguas_ru && install_lang cyrillic
-	use linguas_el && install_lang greek
-	use linguas_he && install_lang hebrew
-	use linguas_ja && install_lang japanese
-	use linguas_ko && install_lang korean
-	use linguas_la && install_lang latin2
-	use linguas_th && install_lang thai
-	use linguas_tr && install_lang turkish
-}
-
-install_lang() {
-	cd ../xpdf-$1
-	sed 's,/usr/local/share/xpdf/,/usr/share/xpdf/,g' add-to-xpdfrc >> ${D}/etc/xpdfrc
-	insinto /usr/share/xpdf/$1
-	doins -r *.unicodeMap *ToUnicode CMap
-}
diff --git a/app-text/xpdf/xpdf-3.02-r2.ebuild b/app-text/xpdf/xpdf-3.02-r2.ebuild
index 38e1b95a07a1..02b524ba7ef8 100644
--- a/app-text/xpdf/xpdf-3.02-r2.ebuild
+++ b/app-text/xpdf/xpdf-3.02-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v 1.7 2009/04/02 21:56:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v 1.8 2009/05/14 19:54:42 loki_val Exp $
 
 EAPI=2
 
@@ -40,10 +40,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use nodrm && \
-		epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
+	use nodrm && epatch "${FILESDIR}/${P}-poppler-nodrm.patch"
 	has_version '>=virtual/poppler-0.10.0' && \
-		epatch "${FILESDIR}"/poppler-0.10.0.patch
+		epatch "${FILESDIR}/${P}-poppler-0.10.0.patch"
+	has_version '>=virtual/poppler-0.11.0' && \
+		epatch "${FILESDIR}/${P}-poppler-0.11.0.patch"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 }