Fix crashes, bug 199827 thanks to Thomas Kreuzer <thomas.kreuzer@rwth-aachen.de>

Package-Manager: portage-2.1.3.19

4 files changed, 123 insertions, 5 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index d3d83b590e96..d9d0fd980723 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.164 2007/11/18 20:31:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.165 2007/11/21 21:40:23 genstef Exp $
+
+*xpdf-3.02-r1 (21 Nov 2007)
+
+  21 Nov 2007; Stefan Schweizer <genstef@gentoo.org> +xpdf-3.02-r1.ebuild:
+  Fix crashes, bug 199827 thanks to Thomas Kreuzer
+  <thomas.kreuzer@rwth-aachen.de>
 
   18 Nov 2007; Raúl Porcel <armin76@gentoo.org> xpdf-3.02.ebuild:
   alpha/ia64 stable wrt security #196735
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 0aa93a927ca2..8649b5918cbb 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -23,6 +23,7 @@ MD5 8a195ee9cc0dfd9ff967681dd9056816 files/xpdfrc.5 17548
 RMD160 215ed02d4653b5aaf3dc6b4d029bd5434343e619 files/xpdfrc.5 17548
 SHA256 645d58cf1266ac7037af5288d9b02a6b9eb40bb3fa49516612f3e6fb0d9960d5 files/xpdfrc.5 17548
 DIST xpdf-3.01-poppler.tar.bz2 82831 RMD160 3bb63e7f6cbc52ab4f77ea9cfab53d7cc9316a8d SHA1 faee643604e898c8dfeff06ee87ecaeeacc51fef SHA256 3463535f65db8eeb71ef1ec3c185ccd1941af66ec783aa50577cd065f79e5629
+DIST xpdf-3.02-poppler-20071121.tar.bz2 107935 RMD160 faf276c824ef12f44609ef7610dc309c87ee3c96 SHA1 bb548689ca2107e99e51b48060e0b583ed9e10ed SHA256 5e04476110ef9ec122e5aa427b4be5e79a003d2740ec8c65b32f526a03b52ed5
 DIST xpdf-3.02-poppler.tar.bz2 105940 RMD160 d006705d3bb5f61fa71c6bb6dfb97008f8a909c5 SHA1 c292a2bc91608cac1893ffc0dce7d4a72000fb10 SHA256 1683cbc66d8ebc2d0ad43f0f57a85e2d837f6ad6b7aaa18c00c9dad2b6546661
 DIST xpdf-arabic-2003-feb-16.tar.gz 1058 RMD160 5790c247333125a1ed1df0cbcacf0ffd876c9f58 SHA1 abcd48c6f4226320a76c6bb8ae1550a410cab573 SHA256 b196448a54bcbf7d8af551c75299ed95ccf1bb304208f23479ae3dcc6e84e1fc
 DIST xpdf-chinese-simplified-2004-jul-27.tar.gz 835960 RMD160 6241d2ff1270566f74ee6b98b1b96a50d2e4b41d SHA1 c873db6d74b3b455f794dd7c9804a63dcf68d547 SHA256 ac886f7bccdc7c70fcfcbd9916ea907a93f0fe698ff7ca81da8f312c7fab07d7
@@ -39,14 +40,18 @@ EBUILD xpdf-3.01-r8.ebuild 2731 RMD160 eddd46997eebd53ebc6b06f9a0df31b22b1005a8
 MD5 9da9693739704b884c98e90cbd07c951 xpdf-3.01-r8.ebuild 2731
 RMD160 eddd46997eebd53ebc6b06f9a0df31b22b1005a8 xpdf-3.01-r8.ebuild 2731
 SHA256 146b326af06678960a40b6c2558bb0c3931c3e21e4fd9099c91e810c4b2e516d xpdf-3.01-r8.ebuild 2731
+EBUILD xpdf-3.02-r1.ebuild 2619 RMD160 12a720cccf5392b49ba82e2c7600f84660766169 SHA1 03d711c8c366af0d4420b8f4e6646eb445dede7c SHA256 f1d5d704676db77f838ec2a712e514c4dcf149be1ca739da084d147e0e156bd3
+MD5 f214d4e0720bce994414a9d67d439163 xpdf-3.02-r1.ebuild 2619
+RMD160 12a720cccf5392b49ba82e2c7600f84660766169 xpdf-3.02-r1.ebuild 2619
+SHA256 f1d5d704676db77f838ec2a712e514c4dcf149be1ca739da084d147e0e156bd3 xpdf-3.02-r1.ebuild 2619
 EBUILD xpdf-3.02.ebuild 2605 RMD160 1c4d6b6e672497d70ea2e71b1f041bf0ca95d930 SHA1 db99c4661c81ffc0d992bcbf53d94492b8645e9d SHA256 cc42b83c0c64248fd39e0a6399a74c55fd821e737e9246b3b137b35bedb22fa5
 MD5 4413fbe665d3f8cfa28cd1c9c7e7c38e xpdf-3.02.ebuild 2605
 RMD160 1c4d6b6e672497d70ea2e71b1f041bf0ca95d930 xpdf-3.02.ebuild 2605
 SHA256 cc42b83c0c64248fd39e0a6399a74c55fd821e737e9246b3b137b35bedb22fa5 xpdf-3.02.ebuild 2605
-MISC ChangeLog 20901 RMD160 3d2e0f01905ab7dee6972dec43e52cf491f5589c SHA1 e27a02467b017964536ffa1e4d97469269eec188 SHA256 4cea1edc1f3884371ccc1999359c8e203ee4949aa5dc1ccb086f1c496802f47f
-MD5 a8f6b166ca3a118690c1db4e8eac94d5 ChangeLog 20901
-RMD160 3d2e0f01905ab7dee6972dec43e52cf491f5589c ChangeLog 20901
-SHA256 4cea1edc1f3884371ccc1999359c8e203ee4949aa5dc1ccb086f1c496802f47f ChangeLog 20901
+MISC ChangeLog 21091 RMD160 6e7bc7cc4a2578c5b6aeddc9ea32ac154f0d6c56 SHA1 176a8571d8970ecd2a218a660fd0d91fd9645ff2 SHA256 87ab578672e9e1535112c4e954eada3788b00bbf3215827978e79367bd1a835c
+MD5 ff20a76c5ba52066e9bc4584951a780e ChangeLog 21091
+RMD160 6e7bc7cc4a2578c5b6aeddc9ea32ac154f0d6c56 ChangeLog 21091
+SHA256 87ab578672e9e1535112c4e954eada3788b00bbf3215827978e79367bd1a835c ChangeLog 21091
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -57,3 +62,6 @@ SHA256 32d43b0cf6988bc708a72234563992f5852a9a19ff5d7fc9286330a4b46592de files/di
 MD5 95476c848634be722cb138bdcbe7b286 files/digest-xpdf-3.02 3276
 RMD160 c2745a2094e141002bddf49be776aa9b8a122515 files/digest-xpdf-3.02 3276
 SHA256 731bc8dc80b544800e024f02d5fc5e02ddb463f9431c350c4752ace7ca2c36c7 files/digest-xpdf-3.02 3276
+MD5 f3990e133e4a7eaa9c80a99344ef106a files/digest-xpdf-3.02-r1 3303
+RMD160 13858904ff298d5daab7fbfdbf8f233460bcd834 files/digest-xpdf-3.02-r1 3303
+SHA256 dd38f08bb18915498a7877baecfd3ab37f845b7a689074ec6b20f44fe43ab906 files/digest-xpdf-3.02-r1 3303
diff --git a/app-text/xpdf/files/digest-xpdf-3.02-r1 b/app-text/xpdf/files/digest-xpdf-3.02-r1
new file mode 100644
index 000000000000..8f657a63d684
--- /dev/null
+++ b/app-text/xpdf/files/digest-xpdf-3.02-r1
@@ -0,0 +1,36 @@
+MD5 dac5994e391d56203167080df3bb7f09 xpdf-3.02-poppler-20071121.tar.bz2 107935
+RMD160 faf276c824ef12f44609ef7610dc309c87ee3c96 xpdf-3.02-poppler-20071121.tar.bz2 107935
+SHA256 5e04476110ef9ec122e5aa427b4be5e79a003d2740ec8c65b32f526a03b52ed5 xpdf-3.02-poppler-20071121.tar.bz2 107935
+MD5 67f05f65bc64bf022b36138c7c26746d xpdf-arabic-2003-feb-16.tar.gz 1058
+RMD160 5790c247333125a1ed1df0cbcacf0ffd876c9f58 xpdf-arabic-2003-feb-16.tar.gz 1058
+SHA256 b196448a54bcbf7d8af551c75299ed95ccf1bb304208f23479ae3dcc6e84e1fc xpdf-arabic-2003-feb-16.tar.gz 1058
+MD5 6c3b04008000948e62530b8582e7f37c xpdf-chinese-simplified-2004-jul-27.tar.gz 835960
+RMD160 6241d2ff1270566f74ee6b98b1b96a50d2e4b41d xpdf-chinese-simplified-2004-jul-27.tar.gz 835960
+SHA256 ac886f7bccdc7c70fcfcbd9916ea907a93f0fe698ff7ca81da8f312c7fab07d7 xpdf-chinese-simplified-2004-jul-27.tar.gz 835960
+MD5 b7fa7f1850f7cfa28498701507079abb xpdf-chinese-traditional-2004-jul-27.tar.gz 794604
+RMD160 fdf9c84db84e85daa048f96e67039d41ae5027a5 xpdf-chinese-traditional-2004-jul-27.tar.gz 794604
+SHA256 49269682ac4b5af2b54763dd2fe7f539ba0ec2452f0545980f4927ffa2a5f2ed xpdf-chinese-traditional-2004-jul-27.tar.gz 794604
+MD5 7b22f31289ce0812d2ec77014e7b0cdf xpdf-cyrillic-2003-jun-28.tar.gz 1660
+RMD160 3010d686fdd46d5282a679aacfd02d95acb15c5e xpdf-cyrillic-2003-jun-28.tar.gz 1660
+SHA256 a5c6e151107d246995a0f73c7d33a611a8cc03192cc498a3e550a8f7d67e98de xpdf-cyrillic-2003-jun-28.tar.gz 1660
+MD5 dacacda02b84b1184235a5fab072fbd8 xpdf-greek-2003-jun-28.tar.gz 1263
+RMD160 95c8abaab369a302b857d95f9f1d139d91b066ff xpdf-greek-2003-jun-28.tar.gz 1263
+SHA256 57f0a188e8a01f72fdb1352e8769c45fe101ac5ae82cb5a1446bd807408eb45b xpdf-greek-2003-jun-28.tar.gz 1263
+MD5 438dd417517641cbb78a94facf2d938e xpdf-hebrew-2003-feb-16.tar.gz 1314
+RMD160 77f33aadf3602767ba2a2ed3c9b5c38ab00988c5 xpdf-hebrew-2003-feb-16.tar.gz 1314
+SHA256 890d209fc55eaea6df6b0e18a3d26a505690309b44b02da4f447f405252302ff xpdf-hebrew-2003-feb-16.tar.gz 1314
+MD5 a11ee6476d0f381983664fc614f7a95e xpdf-japanese-2004-jul-27.tar.gz 494803
+RMD160 dbc2b4feb6141a5f9f3663717c807faca64580ff xpdf-japanese-2004-jul-27.tar.gz 494803
+SHA256 b7419fc10d078628a407e5966146450acbe81d9a5e7f63448916536f0ac6432f xpdf-japanese-2004-jul-27.tar.gz 494803
+MD5 3c1e00f3b9d5fa713df8a3d763d12f3a xpdf-korean-2005-jul-07.tar.gz 470455
+RMD160 9e5bab5f0f8bcdc7fa5506f7311b7044e374c33f xpdf-korean-2005-jul-07.tar.gz 470455
+SHA256 ee8ae069ae613a24c7f500666a1a50cc5783f253feba61ebdbe2ef458232974f xpdf-korean-2005-jul-07.tar.gz 470455
+MD5 ac19ef990cd63afd2837c10dc7e1c3ab xpdf-latin2-2002-oct-22.tar.gz 1435
+RMD160 7dd1f32d0e857789983d64ee71fedfde13123947 xpdf-latin2-2002-oct-22.tar.gz 1435
+SHA256 f74eab0a8d5b5b77becd344910be5218666aba06b9c02554549d2e6c1ae42643 xpdf-latin2-2002-oct-22.tar.gz 1435
+MD5 96e058c1b0429ae1ba0b50f1784b0985 xpdf-thai-2002-jan-16.tar.gz 1873
+RMD160 5bb942b4a50cf1ff9758dbfbb9cd6e3310c059c3 xpdf-thai-2002-jan-16.tar.gz 1873
+SHA256 9708a88ed37150ecdbba3abb01cf86f1a8a75192a758af729a59f7162722e931 xpdf-thai-2002-jan-16.tar.gz 1873
+MD5 511758c86e21328a241adc8590834ea2 xpdf-turkish-2002-apr-10.tar.gz 1140
+RMD160 25e49dd17c93d6904372f1223c2204543ddbf22d xpdf-turkish-2002-apr-10.tar.gz 1140
+SHA256 25b992d294e2e135e2b1b3d93010d97f33b3e2cd9437aa903d2795016a10e6c7 xpdf-turkish-2002-apr-10.tar.gz 1140
diff --git a/app-text/xpdf/xpdf-3.02-r1.ebuild b/app-text/xpdf/xpdf-3.02-r1.ebuild
new file mode 100644
index 000000000000..5033ba7f7cfa
--- /dev/null
+++ b/app-text/xpdf/xpdf-3.02-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 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.1 2007/11/21 21:40:23 genstef 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=">=app-text/poppler-0.6.1
+	virtual/motif
+	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
+}
+
+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
+}