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

Package-Manager: portage-2.1.1_pre1

5 files changed, 194 insertions, 5 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/Manifest b/app-text/acroread/Manifest
index 31e898f59193..41e7e8f4023a 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,3 +1,7 @@
+AUX acroread-expr.patch 959 RMD160 8ccb8bed1f96b0f75453963b40ae5f8ca198be79 SHA1 d00decfaaefa8d2679c5ab16a3731f4bb7df01c2 SHA256 2ee1362347f32d25fd0c7abdcd017d5fd997e4724ca7f58ac81fee715202261e
+MD5 2d25638bfc8501de70f92062e7573bc0 files/acroread-expr.patch 959
+RMD160 8ccb8bed1f96b0f75453963b40ae5f8ca198be79 files/acroread-expr.patch 959
+SHA256 2ee1362347f32d25fd0c7abdcd017d5fd997e4724ca7f58ac81fee715202261e files/acroread-expr.patch 959
 AUX acroread-langpack.patch 549 RMD160 350f8a60144d1554dd2644efc5f6db064b7b13d6 SHA1 b2ab8499455a5e46fc2fee7d44c740a11745f786 SHA256 2c0654d7911841e7889c5d216cc0c6d6bcd240749287abc09222baa8e1f38fde
 MD5 fb71711a0e13c7ca9892e1fd568e6ff9 files/acroread-langpack.patch 549
 RMD160 350f8a60144d1554dd2644efc5f6db064b7b13d6 files/acroread-langpack.patch 549
@@ -15,6 +19,7 @@ DIST AdobeReader_cht-7.0.5-1.i386.rpm 51256274 RMD160 997527831d7e86ea484144122f
 DIST AdobeReader_dan-7.0.5-1.i386.rpm 42937279 RMD160 f8646cc1aad91564b82815119a59cb2b72640a72 SHA256 c1a1b79813e2fc7f1784c854480579fb683f711a8e40de9499e4e48471d27911
 DIST AdobeReader_deu-7.0.5-1.i386.rpm 43768693 RMD160 258c05317dcc8c26d28c4827b1ae86d2b3c38c16 SHA1 182835b633b5ebc512f104e174755db5d3d2b91f SHA256 1726d7a3076a8f06509f46a3d039bc49fa94a6d1608aa4205dc61b79f255ca94
 DIST AdobeReader_enu-7.0.5-1.i386.rpm 38774864 RMD160 6d4090c0c5ba6ff6223165a5b2525d2b6ca48b03 SHA256 74a21c13e28479d29145147947dfdefd5d7148968d724a1e5e44bcfc7df81c58
+DIST AdobeReader_enu-7.0.8-1.i386.tar.gz 44150042 RMD160 22c51f70bcafcd0f0b2fc2b0f0cd3c3aa42ed983 SHA1 ed3f955a0e9ba252fcb45263de00a37e392b7b72 SHA256 eb4a883910733ad63a93b168f20b9c2ca8f21d7174b0aedd6eba1ee6c2a2746f
 DIST AdobeReader_esp-7.0.5-1.i386.rpm 43044817 RMD160 293d8851e6d7fa6eb767c13cdde7331523fdea1c SHA256 c135eb5b8615bc48fabdee26b0c5474225a4c94d526eee916ed6a38cda865ee4
 DIST AdobeReader_fra-7.0.5-1.i386.rpm 43326070 RMD160 a0f5312e68d941e98f2ef127ad1b679d4605fb10 SHA256 399319393f738b5ad6fabf220c0020c53dceb5c7ea50c7adc5717deccf50a545
 DIST AdobeReader_ita-7.0.5-1.i386.rpm 42831816 RMD160 76cbf07fb921cce4a17723aaf3417af7f66cbd6b SHA256 a147395b0ff49de325c5bf153f79a3dc62500b90056dba4c658ebb5566e00ef7
@@ -39,10 +44,14 @@ EBUILD acroread-7.0.5-r3.ebuild 5852 RMD160 e8dd285953aebbec43c446e4636ecd81871e
 MD5 29555ba7594252ebc64c23984ad57a38 acroread-7.0.5-r3.ebuild 5852
 RMD160 e8dd285953aebbec43c446e4636ecd81871e51b1 acroread-7.0.5-r3.ebuild 5852
 SHA256 3f19a15cf6cff0ebc039228a9e9a754dd4d1c6c3ea0937c771123d75055683b0 acroread-7.0.5-r3.ebuild 5852
-MISC ChangeLog 14143 RMD160 b68a4cef506864922e1d651609fc66c57b079c68 SHA1 8d368a1384f14991958a4ebdaf275af402875c03 SHA256 0b52c095e5c54c88d8bd707ddd24b2cae9e542facef39318e0d1feafb50b708e
-MD5 5fd1c7bf16d8f01d2cf451eec51d6896 ChangeLog 14143
-RMD160 b68a4cef506864922e1d651609fc66c57b079c68 ChangeLog 14143
-SHA256 0b52c095e5c54c88d8bd707ddd24b2cae9e542facef39318e0d1feafb50b708e ChangeLog 14143
+EBUILD acroread-7.0.8.ebuild 4957 RMD160 d614374d0698e809e2da2fe16ab194667e44e6bf SHA1 e53609d0a608a4eb7b4ecf55ac9a7b95a2e22406 SHA256 a0faa1d420dba71b5e07e94006ecd3b5a232659b0e10ffcf69cf647dfb6bff66
+MD5 ffb2221befe40b99c460c966b9c487d2 acroread-7.0.8.ebuild 4957
+RMD160 d614374d0698e809e2da2fe16ab194667e44e6bf acroread-7.0.8.ebuild 4957
+SHA256 a0faa1d420dba71b5e07e94006ecd3b5a232659b0e10ffcf69cf647dfb6bff66 acroread-7.0.8.ebuild 4957
+MISC ChangeLog 14342 RMD160 b7263dd2077126bcf905fb762c5027df222ec3c6 SHA1 ad3a1a730009d718c3a0d3fdfb7302ee0c08b38e SHA256 516afd42ad8d36555290c3f92dbc0d612ff166af9c6bcebdbf976c4c7b75f400
+MD5 a09c4866c8a23988a5861efd95c6a6ee ChangeLog 14342
+RMD160 b7263dd2077126bcf905fb762c5027df222ec3c6 ChangeLog 14342
+SHA256 516afd42ad8d36555290c3f92dbc0d612ff166af9c6bcebdbf976c4c7b75f400 ChangeLog 14342
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -56,3 +65,6 @@ SHA256 4491fdea8b5adc7334667841e526f6d88dd5107db730e5f910f06cc1cd11623a files/di
 MD5 aa2f4981a0dde9c6c52cd2b96330d09f files/digest-acroread-7.0.5-r3 4480
 RMD160 fa4e5b9892cfacfda33bebd7ab49734fe93fba50 files/digest-acroread-7.0.5-r3 4480
 SHA256 66ac279619beba5ad6069acf229adfcbd15ef1c9bff9710363c75577f6930d93 files/digest-acroread-7.0.5-r3 4480
+MD5 94b3b540c9bc451d28c835137ced1266 files/digest-acroread-7.0.8 527
+RMD160 8e06577fb4bd69a8f6d0a8585e8ed67092d21a50 files/digest-acroread-7.0.8 527
+SHA256 bb4254a9a8c3eb699c38d05ec03518c5e0a37b6ca40be0af9f3b07a3e727039f files/digest-acroread-7.0.8 527
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