fix font path, bug #60097; add copy&past patch, bug #62513; add multiple language support, bug #40047

6 files changed, 171 insertions, 6 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index f686b88ddabf..40b7bf118307 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.36 2004/09/01 19:58:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.37 2004/09/29 13:12:55 lanius Exp $
+
+*xpdf-3.00-r2 (29 Sep 2004)
+
+  29 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +files/xpdfrc.1,
+  +xpdf-3.00-r2.ebuild:
+  fix font path, bug #60097; add copy&past patch, bug #62513; add multiple
+  language support, bug #40047
 
   01 Sep 2004; Luca Barbato <lu_zero@gentoo.org> xpdf-3.00-r1.ebuild:
   Cosmetic fix
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index df4e78378bbb..9e87c4c968a5 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,12 +1,16 @@
+MD5 da4e42aa1b0307c9a605711650025436 xpdf-3.00-r1.ebuild 951
+MD5 78e8623c972db9014d5ed698031c9189 xpdf-2.02.1.ebuild 1127
 MD5 6077c4fa36327883ebb4aaa2ed20023e xpdf-3.00.ebuild 835
+MD5 20393774ee0cd9cceee1cc9112f4c2cd xpdf-3.00-r2.ebuild 2652
 MD5 e72ff64a0feb9484ea01864bd308c13c xpdf-2.03.ebuild 1128
-MD5 da4e42aa1b0307c9a605711650025436 xpdf-3.00-r1.ebuild 951
-MD5 7021a10e904f7b0b7ab49fe5ef6ec38b ChangeLog 4392
+MD5 7b62d7f1687a01d86daf37dc79a9d63f ChangeLog 4619
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 78e8623c972db9014d5ed698031c9189 xpdf-2.02.1.ebuild 1127
+MD5 263f91efedaa87e4597ab0a83407137d files/xpdfrc.1 1593
+MD5 f200f24c7cfa6061337dc6c0e03f36b9 files/xpdf-3.00-nodrm.diff 1049
 MD5 d2fc1b3562bfee9f9c7fb5beaa741084 files/xpdf-3.00-truetype.diff.gz 3288
+MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
+MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00 61
 MD5 7c0787e730fecfb5b6ebc5a7a69cd64e files/xpdfrc 1092
 MD5 5b8ecf36053280853d55ea04143da297 files/digest-xpdf-2.02.1 64
-MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00 61
-MD5 87cd94ef77a9e99ca1fac42c32270d39 files/digest-xpdf-2.03 61
 MD5 fd6eaa6f4bb5d94506718515cf20ac26 files/digest-xpdf-3.00-r1 61
+MD5 36b521d0408d11075c1e6536e91265f2 files/digest-xpdf-3.00-r2 767
diff --git a/app-text/xpdf/files/digest-xpdf-3.00-r2 b/app-text/xpdf/files/digest-xpdf-3.00-r2
new file mode 100644
index 000000000000..b34171ad26f4
--- /dev/null
+++ b/app-text/xpdf/files/digest-xpdf-3.00-r2
@@ -0,0 +1,12 @@
+MD5 95294cef3031dd68e65f331e8750b2c2 xpdf-3.00.tar.gz 534697
+MD5 67f05f65bc64bf022b36138c7c26746d xpdf-arabic.tar.gz 1058
+MD5 713659f0282b9e3d169390e246e5eb74 xpdf-chinese-simplified.tar.gz 756127
+MD5 5be730b859f8b01de569eb1bad188426 xpdf-chinese-traditional.tar.gz 698902
+MD5 21f57122247e2e2a63bfed4dc4f6c199 xpdf-cyrillic.tar.gz 1286
+MD5 2240a364b9c28ce09fd8c3107784ce40 xpdf-greek.tar.gz 1124
+MD5 438dd417517641cbb78a94facf2d938e xpdf-hebrew.tar.gz 1314
+MD5 57bb9359437583479b6670e75fa06c31 xpdf-japanese.tar.gz 430478
+MD5 10cd92e4eef065a6a26341d9a2a1b5c2 xpdf-korean.tar.gz 419081
+MD5 b305d44eb5d2b8e1da291b577017945e xpdf-latin2.tar.gz 1440
+MD5 9af495766ee4eaf3411d1fa74560f0ec xpdf-thai.tar.gz 1876
+MD5 f9233880805e3d8d2cf15a4fe679f25b xpdf-turkish.tar.gz 1140
diff --git a/app-text/xpdf/files/xpdf-3.00-nodrm.diff b/app-text/xpdf/files/xpdf-3.00-nodrm.diff
new file mode 100644
index 000000000000..8abf09f45aba
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.00-nodrm.diff
@@ -0,0 +1,39 @@
+diff -uNr xpdf-3.00-old/xpdf/XRef.cc xpdf-3.00/xpdf/XRef.cc
+--- xpdf-3.00-old/xpdf/XRef.cc	2004-01-22 02:26:45.000000000 +0100
++++ xpdf-3.00/xpdf/XRef.cc	2004-09-01 16:11:32.410396128 +0200
+@@ -822,7 +822,7 @@
+ 
+ GBool XRef::okToPrint(GBool ignoreOwnerPW) {
+ #ifndef NO_DECRYPTION
+-  return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permPrint);
++  return gTrue;
+ #else
+   return gTrue;
+ #endif
+@@ -830,7 +830,7 @@
+ 
+ GBool XRef::okToChange(GBool ignoreOwnerPW) {
+ #ifndef NO_DECRYPTION
+-  return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permChange);
++  return gTrue;
+ #else
+   return gTrue;
+ #endif
+@@ -838,7 +838,7 @@
+ 
+ GBool XRef::okToCopy(GBool ignoreOwnerPW) {
+ #ifndef NO_DECRYPTION
+-  return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permCopy);
++  return gTrue;
+ #else
+   return gTrue;
+ #endif
+@@ -846,7 +846,7 @@
+ 
+ GBool XRef::okToAddNotes(GBool ignoreOwnerPW) {
+ #ifndef NO_DECRYPTION
+-  return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permNotes);
++  return gTrue;
+ #else
+   return gTrue;
+ #endif
diff --git a/app-text/xpdf/files/xpdfrc.1 b/app-text/xpdf/files/xpdfrc.1
new file mode 100644
index 000000000000..8c823f235ba8
--- /dev/null
+++ b/app-text/xpdf/files/xpdfrc.1
@@ -0,0 +1,20 @@
+displayFontT1 Times-Roman           /usr/share/fonts/default/ghostscript/n021003l.pfb
+displayFontT1 Times-Italic          /usr/share/fonts/default/ghostscript/n021023l.pfb
+displayFontT1 Times-Bold            /usr/share/fonts/default/ghostscript/n021004l.pfb
+displayFontT1 Times-BoldItalic      /usr/share/fonts/default/ghostscript/n021024l.pfb
+displayFontT1 Helvetica             /usr/share/fonts/default/ghostscript/n019003l.pfb
+displayFontT1 Helvetica-Oblique     /usr/share/fonts/default/ghostscript/n019023l.pfb
+displayFontT1 Helvetica-Bold        /usr/share/fonts/default/ghostscript/n019004l.pfb
+displayFontT1 Helvetica-BoldOblique /usr/share/fonts/default/ghostscript/n019024l.pfb
+displayFontT1 Courier               /usr/share/fonts/default/ghostscript/n022003l.pfb
+displayFontT1 Courier-Oblique       /usr/share/fonts/default/ghostscript/n022023l.pfb
+displayFontT1 Courier-Bold          /usr/share/fonts/default/ghostscript/n022004l.pfb
+displayFontT1 Courier-BoldOblique   /usr/share/fonts/default/ghostscript/n022024l.pfb
+displayFontT1 Symbol                /usr/share/fonts/default/ghostscript/s050000l.pfb
+displayFontT1 ZapfDingbats          /usr/share/fonts/default/ghostscript/d050000l.pfb
+
+displayCIDFontTT Adobe-Japan1 "/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf"
+displayCIDFontTT Adobe-CNS1 "/usr/share/fonts/ttf/zh_TW/bkai00mp.ttf"
+displayCIDFontTT Adobe-GB1 "/usr/share/fonts/ttf/zh_CN/gkai00mp.ttf"
+displayCIDFontTT Adobe-Korea1 "/usr/share/fonts/ttf/korean/baekmuk/batang.ttf"
+displayCIDFontTT Unidocs-Korea1 "/usr/share/fonts/ttf/korean/baekmuk/batang.ttf"
diff --git a/app-text/xpdf/xpdf-3.00-r2.ebuild b/app-text/xpdf/xpdf-3.00-r2.ebuild
new file mode 100644
index 000000000000..89309f0a9315
--- /dev/null
+++ b/app-text/xpdf/xpdf-3.00-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.00-r2.ebuild,v 1.1 2004/09/29 13:12:55 lanius Exp $
+
+inherit eutils
+
+DESCRIPTION="An X Viewer for PDF Files"
+HOMEPAGE="http://www.foolabs.com/xpdf/"
+SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz
+	linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic.tar.gz )
+	linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz )
+	linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz )
+	linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic.tar.gz )
+	linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek.tar.gz )
+	linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew.tar.gz )
+	linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz )
+	linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean.tar.gz )
+	linguas_la? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz )
+	linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai.tar.gz )
+	linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+
+DEPEND="motif? ( virtual/x11
+	x11-libs/openmotif )
+	>=media-libs/freetype-2.0.5
+	>=media-libs/t1lib-1.3
+	virtual/ghostscript
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_zh_TW? ( media-fonts/arphicfonts )
+	linguas_ko? ( media-fonts/baekmuk-fonts )"
+
+IUSE="motif"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xpdf-3.00-truetype.diff.gz
+	epatch ${FILESDIR}/xpdf-3.00-nodrm.diff
+}
+
+src_compile() {
+	econf \
+		--enable-freetype2 \
+		--with-freetype2-includes=/usr/include/freetype2 || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	prepallman
+	dodoc README ANNOUNCE CHANGES
+	insinto /etc
+	newins ${FILESDIR}/xpdfrc.1 xpdfrc
+
+	# install languages
+	use linguas_ar && install_lang turkish
+	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 *.unicodeMap
+	doins *.cid*
+	insinto /usr/share/xpdf/$1/CMap
+	doins CMap/*
+}