Workaround slow startup by disabling the fontpath-cache thanks to jokey and ferdy, also closes bug 125253, also readd some languages that were dropped before

(Portage version: 2.1_pre5-r4)

4 files changed, 183 insertions, 1 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 0d3ac81c54de..c3c4e04008e1 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/acroread
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.69 2006/02/22 09:11:53 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.70 2006/03/06 21:42:23 genstef Exp $
+
+*acroread-7.0.5-r2 (06 Mar 2006)
+
+  06 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/acroread-low-startup-fontissue.patch, +acroread-7.0.5-r2.ebuild:
+  Workaround slow startup by disabling the fontpath-cache thanks to jokey and
+  ferdy, also closes bug 125253, also readd some languages that were dropped
+  before
 
   22 Feb 2006; Joshua Jackson <tsunam@gentoo.org> acroread-7.0.5-r1.ebuild:
   Stable on x86 thanks for testing Segin; bug #123344
diff --git a/app-text/acroread/acroread-7.0.5-r2.ebuild b/app-text/acroread/acroread-7.0.5-r2.ebuild
new file mode 100644
index 000000000000..f48341bb18cf
--- /dev/null
+++ b/app-text/acroread/acroread-7.0.5-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.5-r2.ebuild,v 1.1 2006/03/06 21:42:24 genstef Exp $
+
+inherit eutils nsplugins rpm versionator
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/acrobat/"
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5"
+SRC_FOOT="-$(replace_version_separator 3 "-")-1.i386.rpm"
+SRC_URI="nls? ( linguas_de? ( ${SRC_HEAD}/deu/AdobeReader_deu${SRC_FOOT} )
+	!linguas_de? ( linguas_fr? ( ${SRC_HEAD}/fra/AdobeReader_fra${SRC_FOOT} )
+	!linguas_fr? ( linguas_sv? ( ${SRC_HEAD}/sve/AdobeReader_sve${SRC_FOOT} )
+	!linguas_sv? ( linguas_es? ( ${SRC_HEAD}/esp/AdobeReader_esp${SRC_FOOT} )
+	!linguas_es? ( linguas_pt? ( ${SRC_HEAD}/ptb/AdobeReader_ptb${SRC_FOOT} )
+	!linguas_pt? ( linguas_no? ( ${SRC_HEAD}/nor/AdobeReader_nor${SRC_FOOT} )
+	!linguas_no? ( linguas_it? ( ${SRC_HEAD}/ita/AdobeReader_ita${SRC_FOOT} )
+	!linguas_it? ( linguas_fi? ( ${SRC_HEAD}/suo/AdobeReader_suo${SRC_FOOT} )
+	!linguas_fi? ( linguas_nl? ( ${SRC_HEAD}/nld/AdobeReader_nld${SRC_FOOT} )
+	!linguas_nl? ( linguas_da? ( ${SRC_HEAD}/dan/AdobeReader_dan${SRC_FOOT} )
+	!linguas_da? ( linguas_ja? ( ${SRC_HEAD}/jpn/AdobeReader_jpn${SRC_FOOT} )
+	!linguas_ja? ( linguas_ko? ( ${SRC_HEAD}/kor/AdobeReader_kor${SRC_FOOT} )
+	!linguas_ko? ( linguas_zh_CN? ( ${SRC_HEAD}/chs/AdobeReader_chs${SRC_FOOT} )
+	!linguas_zh_CN? ( linguas_zh_TW? ( ${SRC_HEAD}/cht/AdobeReader_cht${SRC_FOOT} )
+	!linguas_zh_TW? ( ${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT} ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
+	!nls? ( ${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT} )
+	x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )"
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups ldap nsplugin nls"
+RESTRICT="nostrip nomirror"
+
+RDEPEND="virtual/libc
+	x86? ( >=x11-libs/gtk+-2.0
+			cups? ( net-print/cups )
+			ldap? ( net-nds/openldap ) )
+	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2
+			>=app-emulation/emul-linux-x86-gtklibs-2.0 )"
+PROVIDE="virtual/pdfviewer"
+
+INSTALLDIR=/opt/Acrobat7
+
+S=${WORKDIR}/usr/local/Adobe/Acrobat7.0
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
+	has_multilib_profile && ABI="x86"
+}
+
+src_unpack() {
+	rpm_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/acroread-scim.patch
+	epatch ${FILESDIR}/acroread-low-startup-fontissue.patch
+}
+
+src_install() {
+	local i
+
+	cp Resource/Support/AdobeReader_KDE.desktop AdobeReader.desktop
+	domenu AdobeReader.desktop
+	doicon Resource/Icons/AdobeReader.png
+
+	dodir ${INSTALLDIR}
+	DIRS="Reader Resource"
+	for i in ${DIRS}
+	do
+		if [ -d ${i} ] ; then
+			chown -R --dereference -L root:0 ${i}
+			mv ${i} ${D}${INSTALLDIR}
+		fi
+	done
+
+	exeinto ${INSTALLDIR}
+	doexe bin/acroread || die "doexe failed"
+	# The Browser_Plugin_HowTo.txt is now in a subdirectory, which
+	# is named according to the language the user is using.
+	# Ie. for German, it is in a DEU directory.	See bug #118015
+	#dodoc Browser/${LANG_TAG}/Browser_Plugin_HowTo.txt
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Browser/intellinux/nppdf.so
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	if ! use ldap ; then
+		rm ${D}${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api
+	fi
+
+	# libcups is needed for printing support (bug 118417)
+	if use x86 && ! use cups ; then
+		mv ${WORKDIR}/libcups.so-i386 ${WORKDIR}/libcups.so.2
+		exeinto ${INSTALLDIR}/Reader/intellinux/lib
+		doexe ${WORKDIR}/libcups.so.2
+		dosym libcups.so.2 ${INSTALLDIR}/Reader/intellinux/lib/libcups.so
+	fi
+
+	dodir /usr/bin
+	dosym ${INSTALLDIR}/acroread /usr/bin/acroread
+}
+
+pkg_postinst () {
+	# fix wrong directory permissions (bug #25931)
+	find ${INSTALLDIR}/. -type d | xargs chmod 755 || die
+
+	einfo "The Acrobat(TM) Security Plugin will be enabled with USE=ldap"
+	einfo "The Acrobat(TM) Browser Plugin will be enabled with USE=nsplugin"
+}
diff --git a/app-text/acroread/files/acroread-low-startup-fontissue.patch b/app-text/acroread/files/acroread-low-startup-fontissue.patch
new file mode 100644
index 000000000000..0ee790995303
--- /dev/null
+++ b/app-text/acroread/files/acroread-low-startup-fontissue.patch
@@ -0,0 +1,15 @@
+This patch was diffed by me, thanks to ferdy, jokey
+and some others for their IRC-Help.
+
+
+--- Acrobat7.0/bin/acroread	2005-05-18 09:05:35.000000000 +0200
++++ Acrobat7.0/bin/acroread	2005-05-18 09:06:29.000000000 +0200
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ #
+ 
++FC=~/.adobe/Acrobat/7.0/Cache/UnixFnt07.lst
++[ -s ${FC} ] && rm ${FC} && touch ${FC}
+ 
+ setLangDEU()
+ {
diff --git a/app-text/acroread/files/digest-acroread-7.0.5-r2 b/app-text/acroread/files/digest-acroread-7.0.5-r2
new file mode 100644
index 000000000000..7b84f309546f
--- /dev/null
+++ b/app-text/acroread/files/digest-acroread-7.0.5-r2
@@ -0,0 +1,48 @@
+MD5 e0c21aa21e89aa37d0e794757c6e82ca AdobeReader_chs-7.0.5-1.i386.rpm 55594372
+RMD160 a322414c22eb01f1d832a6b82d03b9e1b8ff3a3e AdobeReader_chs-7.0.5-1.i386.rpm 55594372
+SHA256 cb9cf60bdcc78821d5bfc137d59cba1707c3e1f0b2e9327d52869556a1342c9a AdobeReader_chs-7.0.5-1.i386.rpm 55594372
+MD5 26ac13e1597d3f87329ab6bd591868be AdobeReader_cht-7.0.5-1.i386.rpm 51256274
+RMD160 997527831d7e86ea484144122f53fa2ed9b71a79 AdobeReader_cht-7.0.5-1.i386.rpm 51256274
+SHA256 3f8ba894ebf66b1531e76c0d530010d4464dd380d64c185276f73124c48aa46b AdobeReader_cht-7.0.5-1.i386.rpm 51256274
+MD5 7f06f4f036dd948ec33dd228940c7719 AdobeReader_dan-7.0.5-1.i386.rpm 42937279
+RMD160 f8646cc1aad91564b82815119a59cb2b72640a72 AdobeReader_dan-7.0.5-1.i386.rpm 42937279
+SHA256 c1a1b79813e2fc7f1784c854480579fb683f711a8e40de9499e4e48471d27911 AdobeReader_dan-7.0.5-1.i386.rpm 42937279
+MD5 d3066743e14de81a92e6728e83a3c79f AdobeReader_deu-7.0.5-1.i386.rpm 43768693
+RMD160 258c05317dcc8c26d28c4827b1ae86d2b3c38c16 AdobeReader_deu-7.0.5-1.i386.rpm 43768693
+SHA256 1726d7a3076a8f06509f46a3d039bc49fa94a6d1608aa4205dc61b79f255ca94 AdobeReader_deu-7.0.5-1.i386.rpm 43768693
+MD5 f5a59ea1b7f46c347e6932d045a17f8c AdobeReader_enu-7.0.5-1.i386.rpm 38774864
+RMD160 6d4090c0c5ba6ff6223165a5b2525d2b6ca48b03 AdobeReader_enu-7.0.5-1.i386.rpm 38774864
+SHA256 74a21c13e28479d29145147947dfdefd5d7148968d724a1e5e44bcfc7df81c58 AdobeReader_enu-7.0.5-1.i386.rpm 38774864
+MD5 91577aef6643da37d55e677a590df3f9 AdobeReader_esp-7.0.5-1.i386.rpm 43044817
+RMD160 293d8851e6d7fa6eb767c13cdde7331523fdea1c AdobeReader_esp-7.0.5-1.i386.rpm 43044817
+SHA256 c135eb5b8615bc48fabdee26b0c5474225a4c94d526eee916ed6a38cda865ee4 AdobeReader_esp-7.0.5-1.i386.rpm 43044817
+MD5 4c76496f85c30025d9dddcd3318c4e39 AdobeReader_fra-7.0.5-1.i386.rpm 43326070
+RMD160 a0f5312e68d941e98f2ef127ad1b679d4605fb10 AdobeReader_fra-7.0.5-1.i386.rpm 43326070
+SHA256 399319393f738b5ad6fabf220c0020c53dceb5c7ea50c7adc5717deccf50a545 AdobeReader_fra-7.0.5-1.i386.rpm 43326070
+MD5 b92c42d8e5e41c0c296734c992b04ac4 AdobeReader_ita-7.0.5-1.i386.rpm 42831816
+RMD160 76cbf07fb921cce4a17723aaf3417af7f66cbd6b AdobeReader_ita-7.0.5-1.i386.rpm 42831816
+SHA256 a147395b0ff49de325c5bf153f79a3dc62500b90056dba4c658ebb5566e00ef7 AdobeReader_ita-7.0.5-1.i386.rpm 42831816
+MD5 105e5c27ece8d7d46b84cc1eaf5afdd2 AdobeReader_jpn-7.0.5-1.i386.rpm 52437779
+RMD160 ba6c83a1600d85705a71041835db5a274933609a AdobeReader_jpn-7.0.5-1.i386.rpm 52437779
+SHA256 c4af173554a0a62f0a5a2d3d535671cebecf43bf2c23abdaeaa3a3d9a67ab559 AdobeReader_jpn-7.0.5-1.i386.rpm 52437779
+MD5 d612c2f38e07a68ba46e3383cbd16e23 AdobeReader_kor-7.0.5-1.i386.rpm 47343485
+RMD160 01bb4c6c02e86cbaf89dbb0318c712d230230aca AdobeReader_kor-7.0.5-1.i386.rpm 47343485
+SHA256 7d5a213a421cd78e2bce6d45ff6ec572c83c43564c0344fe44f16fd3c7e52532 AdobeReader_kor-7.0.5-1.i386.rpm 47343485
+MD5 be0ef63ab14ed41ed052eab8b67a9833 AdobeReader_nld-7.0.5-1.i386.rpm 43165238
+RMD160 823e2ef28d47cc463725978e6ba25acfc9e861f4 AdobeReader_nld-7.0.5-1.i386.rpm 43165238
+SHA256 b723c5528bc4781f10ae63c61027c94d5b640cbb5302ae208bfa99d3bb6e7513 AdobeReader_nld-7.0.5-1.i386.rpm 43165238
+MD5 0dd67a697babbfff66c40d37bbd74e43 AdobeReader_nor-7.0.5-1.i386.rpm 43145452
+RMD160 58b02200a48890b2c3a3d42d5e606c5b52e33dd5 AdobeReader_nor-7.0.5-1.i386.rpm 43145452
+SHA256 538d49d138dd66e24312dfa68da39d0b20948f9cc1079bfb7e1502f86e060c4c AdobeReader_nor-7.0.5-1.i386.rpm 43145452
+MD5 076f2d301adcf2cd0cba4ef2fa8d6313 AdobeReader_ptb-7.0.5-1.i386.rpm 42991588
+RMD160 63892362bc478b025fb7a1925e68e132b8883078 AdobeReader_ptb-7.0.5-1.i386.rpm 42991588
+SHA256 a2cf21f8b9f2c84f31bc8f9b602ba41b84d4a77a27753c0f16e09d38e15c7923 AdobeReader_ptb-7.0.5-1.i386.rpm 42991588
+MD5 e6a4a0208d854e514293dee934ca8623 AdobeReader_suo-7.0.5-1.i386.rpm 43071488
+RMD160 807830e0ade479fd5b0ad96768b8c0c89d273523 AdobeReader_suo-7.0.5-1.i386.rpm 43071488
+SHA256 05e257328ce60876474bbbc80d6dfbf872093488ced7fccb85ba8f93aa83f23e AdobeReader_suo-7.0.5-1.i386.rpm 43071488
+MD5 c47748cddae624329213aa3700561e08 AdobeReader_sve-7.0.5-1.i386.rpm 43983930
+RMD160 cdf2364536f325f0766c11ce65b896a6fcbd1422 AdobeReader_sve-7.0.5-1.i386.rpm 43983930
+SHA256 a5e69fd5bf60f0a522c4fece967f6c804388f26b2bb23c2622b506c7019eed0d AdobeReader_sve-7.0.5-1.i386.rpm 43983930
+MD5 262fe0ef8f6de053c410e175aafa25b9 libcups.so-i386.bz2 50564
+RMD160 a8bedc7151eb1d547616124bfdd4844699a33c15 libcups.so-i386.bz2 50564
+SHA256 77eb5cd6aeab630812f7e911db04b6042cd6dee6aa7b9d8cf7756dca14e24b38 libcups.so-i386.bz2 50564