Version bump, bug 136415, expr patch bug 133934, thanks to Walter Meinl <wuno@lsvw.de>

(Portage version: 2.1.1_pre1)

4 files changed, 178 insertions, 1 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 4c8eeca7bf6a..1d2e706b0a7a 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,11 @@
 # 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.76 2006/06/01 18:30:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.77 2006/06/18 02:43:08 genstef Exp $
+
+  18 Jun 2006; Stefan Schweizer <genstef@gentoo.org> +acroread-7.0.8.ebuild,
+  +files/acroread-expr.patch:
+  Version bump, bug 136415, expr patch bug 133934, thanks to Walter Meinl
+  <wuno@lsvw.de>
 
   01 Jun 2006; Stefan Schweizer <genstef@gentoo.org> acroread-5.10.ebuild,
   -acroread-7.0.1.1.ebuild, -acroread-7.0.5.ebuild,
diff --git a/app-text/acroread/acroread-7.0.8.ebuild b/app-text/acroread/acroread-7.0.8.ebuild
new file mode 100644
index 000000000000..16c28dbc9a74
--- /dev/null
+++ b/app-text/acroread/acroread-7.0.8.ebuild
@@ -0,0 +1,145 @@
+# 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.8.ebuild,v 1.1 2006/06/18 02:43:08 genstef Exp $
+
+inherit eutils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/acrobat/"
+IUSE="cups ldap nsplugin nls"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/7x/${PV}"
+SRC_FOOT="-${PV}-1.i386.tar.gz"
+LINS=("de" "fr" "sv" "es" "pt" "no" "it" "fi" "nl" "da" "ja" "ko" "zh_CN"
+	"zh_TW")
+SRCS=("deu" "fra" "sve" "esp" "ptb" "nor" "ita" "suo" "nld" "dan" "jpn" "kor"
+	"chs" "cht")
+
+SRC_URI="nls? ( "
+# no translations yet :(
+#for ((i=0;i<${#LINS[@]};i++)) do
+#	IUSE="${IUSE} linguas_${LINS[$i]}"
+#	SRC_URI="${SRC_URI} linguas_${LINS[$i]}? ( ${SRC_HEAD}/${SRCS[$i]}/AdobeReader_${SRCS[$i]}${SRC_FOOT} ) !linguas_${LINS[$i]}? ("
+#	[ "$[ ${#LINS[@]} - 1 ]" -eq "${i}" ] && \
+		SRC_URI="${SRC_URI} ${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}"
+#	SRC_END="${SRC_END} )"
+#done
+SRC_URI="${SRC_URI}${SRC_END} )
+	!nls? ( ${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT} )
+	x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )"
+
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+RESTRICT="strip mirror"
+
+RDEPEND="~virtual/libstdc++-3.3
+	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 )"
+QA_TEXTRELS_x86="opt/Acrobat7/Reader/intellinux/lib/libCoolType.so.5.01
+	opt/Acrobat7/Reader/intellinux/lib/libcrypto.so.0.9.6
+	opt/Acrobat7/Reader/intellinux/lib/libJP2K.so
+	opt/Acrobat7/Reader/intellinux/lib/libAXSLE.so
+	opt/Acrobat7/Reader/intellinux/lib/librt3d.so
+	opt/Acrobat7/Reader/intellinux/SPPlugins/ADMPlugin.apl
+	opt/Acrobat7/Reader/intellinux/plug_ins3d/tesselate.x3d
+	opt/Acrobat7/Reader/intellinux/plug_ins3d/drvSOFT.x3d
+	opt/Acrobat7/Reader/intellinux/plug_ins3d/3difr.x3d
+	opt/Acrobat7/Reader/intellinux/plug_ins3d/drvOpenGL.x3d
+	opt/Acrobat7/Reader/intellinux/plug_ins3d/2d.x3d
+	opt/Acrobat7/Reader/intellinux/plug_ins/checkers.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/EFS.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/MakeAccessible.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/DigSig.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/wwwlink.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/SaveAsRTF.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/PPKLite.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/ewh.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/PDDom.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/SOAP.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/SendMail.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/Annots.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/SearchFind.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/Spelling.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/Accessibility.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/EScript.api
+	opt/Acrobat7/Reader/intellinux/plug_ins/AcroForm.api
+	opt/netscape/plugins/nppdf.so"
+
+INSTALLDIR=/opt/Acrobat7
+
+S=${WORKDIR}/AdobeReader
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
+	has_multilib_profile && ABI="x86"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	tar xf ILINXR.TAR
+	tar xf COMMON.TAR
+	epatch ${FILESDIR}/acroread-scim.patch
+	epatch ${FILESDIR}/acroread-low-startup-fontissue.patch
+	epatch ${FILESDIR}/acroread-expr.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
+	dodoc Browser/HowTo/*/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 /opt/bin
+	dosym ${INSTALLDIR}/acroread /opt/bin/acroread
+
+	# fix wrong directory permissions (bug #25931)
+	find ${D}${INSTALLDIR}/. -type d | xargs chmod 755 || die
+}
+
+pkg_postinst () {
+	einfo "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
+	einfo "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin"
+}
diff --git a/app-text/acroread/files/acroread-expr.patch b/app-text/acroread/files/acroread-expr.patch
new file mode 100644
index 000000000000..247cc37a4315
--- /dev/null
+++ b/app-text/acroread/files/acroread-expr.patch
@@ -0,0 +1,21 @@
+--- Acrobat7.0/bin/acroread.orig	2006-05-21 11:21:23.000000000 +0200
++++ Acrobat7.0/bin/acroread	2006-05-21 11:30:06.000000000 +0200
+@@ -424,13 +424,13 @@
+             continue
+         fi
+ 
+-        len_version=`expr length $version`
+-        base_version=`expr substr "${base_version}0000000000" 1 $len_version`
+-        len_base_version=`expr length $base_version`
++        len_version=`expr length "$version"`
++        base_version=`expr substr "${base_version}0000000000" 1 "$len_version"`
++        len_base_version=`expr length "$base_version"`
+ 
+         while [ $len_version -gt $len_base_version ]; do
+-            base_version=`expr substr "${base_version}0000000000" 1 $len_version`
+-            len_base_version=`expr length $base_version`
++            base_version=`expr substr "${base_version}0000000000" 1 "$len_version"`
++            len_base_version=`expr length "$base_version"`
+         done
+ 
+     	if [ $version -ge $base_version ]; then
diff --git a/app-text/acroread/files/digest-acroread-7.0.8 b/app-text/acroread/files/digest-acroread-7.0.8
new file mode 100644
index 000000000000..1a3fc1fb610c
--- /dev/null
+++ b/app-text/acroread/files/digest-acroread-7.0.8
@@ -0,0 +1,6 @@
+MD5 4834f13ee45c7b1be263fb89aa49d212 AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+RMD160 22c51f70bcafcd0f0b2fc2b0f0cd3c3aa42ed983 AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+SHA256 eb4a883910733ad63a93b168f20b9c2ca8f21d7174b0aedd6eba1ee6c2a2746f AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042
+MD5 262fe0ef8f6de053c410e175aafa25b9 libcups.so-i386.bz2 50564
+RMD160 a8bedc7151eb1d547616124bfdd4844699a33c15 libcups.so-i386.bz2 50564
+SHA256 77eb5cd6aeab630812f7e911db04b6042cd6dee6aa7b9d8cf7756dca14e24b38 libcups.so-i386.bz2 50564