Rework to support multiple languages; resolve long-standing default language problem; bug #125366

(Portage version: 2.1.2_rc2-r1)

3 files changed, 284 insertions, 3 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index fbe4bc8c51a9..496ed20c9628 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,9 +1,16 @@
 # 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.86 2006/11/18 11:16:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.87 2006/11/22 00:58:48 kevquinn Exp $
+
+*acroread-7.0.8-r1 (22 Nov 2006)
+
+  22 Nov 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  +acroread-7.0.8-r1.ebuild:
+  Rework to support multiple languages; resolve long-standing default language
+  problem - see bug #125366
 
   18 Nov 2006; Stefan Schweizer <genstef@gentoo.org> acroread-7.0.8.ebuild:
-  Use linguas_nb instead of no thanks to Alexander Nicolaysen Sørnes
+  Use linguas_nb instead of no thanks to Alexander Nicolaysen SÞrnes
   <alex@thehandofagony.com> in bug 152671
 
   01 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
@@ -127,7 +134,7 @@
   Version Bump Fix Security bug #102730. Removed mozilla use flag and added
   nsplugin local use flag to fix bug #101165.
 
-  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> acroread-5.10.ebuild,
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> acroread-5.10.ebuild,
   acroread-7.0.0.2-r2.ebuild:
   Call has_multilib_profile from pkg_setup instead of global scope.
 
diff --git a/app-text/acroread/acroread-7.0.8-r1.ebuild b/app-text/acroread/acroread-7.0.8-r1.ebuild
new file mode 100644
index 000000000000..a04c055e519d
--- /dev/null
+++ b/app-text/acroread/acroread-7.0.8-r1.ebuild
@@ -0,0 +1,226 @@
+# 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-r1.ebuild,v 1.1 2006/11/22 00:58:48 kevquinn Exp $
+
+inherit eutils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/acrobat/"
+IUSE="cups ldap nsplugin"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/7x/${PV}"
+SRC_FOOT="-${PV}-1.i386.tar.gz"
+
+LINGUA_LIST="en:enu de:deu fr:fra sv:sve es:esp pt:ptb nb:nor it:ita fi:suo nl:nld da:dan ja:jpn ko:kor zh_CN:chs zh_TW:cht"
+SRC_URI=
+DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}"
+for ll in ${LINGUA_LIST}; do
+	iuse_l="linguas_${ll/:*}"
+	src_l=${ll/*:}
+	IUSE="${IUSE} ${iuse_l}"
+	DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )"
+	SRC_URI="${SRC_URI}
+		${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdobeReader_${src_l}${SRC_FOOT} )"
+done
+SRC_URI="${SRC_URI}
+	${DEFAULT_URI}
+	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
+	opt/Acrobat7/Reader/intellinux/sidecars/RdLang32*"
+
+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"
+}
+
+# Determine lingua from filename
+acroread_get_ll() {
+	local f_src_l ll lingua src_l
+	f_src_l=${1/${SRC_FOOT}}
+	f_src_l=${f_src_l/*_}
+	for ll in ${LINGUA_LIST}; do
+		lingua=${ll/:*}
+		src_l=${ll/*:}
+		if [[ ${src_l} == ${f_src_l} ]]; then
+			echo ${lingua}
+			return
+		fi
+	done
+	die "Failed to match file $1 to a LINGUA; please report"
+}
+
+src_unpack() {
+	local ll linguas fl
+	# Unpack all into the same place; overwrite common files.
+	fl=""
+	for pkg in ${A}; do
+		cd ${WORKDIR}
+		unpack ${pkg}
+		if [[ ${pkg} =~ "^AdobeReader_" ]]; then
+			cd ${S}
+			tar xf ILINXR.TAR ||
+				die "Failed to unpack ILINXR.TAR; is distfile corrupt?"
+			tar xf COMMON.TAR ||
+				die "Failed to unpack COMMON.TAR; is distfile corrupt?"
+			epatch ${FILESDIR}/acroread-scim.patch
+			epatch ${FILESDIR}/acroread-low-startup-fontissue.patch
+			epatch ${FILESDIR}/acroread-expr.patch
+			ll=$(acroread_get_ll ${pkg})
+			mv bin/acroread bin/acroread.${ll}
+			if [[ -z ${fl} ]]; then
+				fl=${ll}
+				linguas="${ll}"
+			else
+				linguas="${linguas} ${ll}"
+			fi
+		fi
+	done
+	if [[ ${linguas} == ${fl} ]]; then
+		# Only one lingua selected - skip building the wrapper
+		mv ${S}/bin/acroread.${fl} ${S}/bin/acroread ||
+			die "Failed to put acroread.${fl} back to acroread; please report"
+	else
+		# Build wrapper.  Launch the acroread for the environment variable
+		# LANG (matched with a trailing * so that for example 'de_DE' matches
+		# 'de', 'en_GB' matches 'en' etc).
+		cat > bin/acroread <<-EOF
+			#!/bin/bash
+			# Copyright 1999-2006 Gentoo Foundation
+			# Distributed under the terms of the GNU General Public License v2
+			#
+			# Automatically generated by ${CATEGORY}/${PF}
+
+			# Exec the acroread script for the language chosen in
+			# LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc)
+			L=\${LC_ALL}
+			L=\${L:-\${LC_MESSAGES}}
+			L=\${L:-\${LANG}}
+			case \${L} in
+		EOF
+		for ll in ${linguas}; do
+			echo "${ll}*) exec ${INSTALLDIR}/acroread.${ll} ;;" >> bin/acroread
+		done
+		# default to English (in particualr for LANG=C)
+		cat >> bin/acroread <<-EOF
+			*) exec ${INSTALLDIR}/acroread.${fl} ;;
+			esac
+		EOF
+		chmod 755 bin/acroread
+	fi
+}
+
+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}
+	for exe in bin/acroread*; do
+		doexe ${exe} || die "doexe failed"
+	done
+	# 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 () {
+	local ll lc
+	use ldap ||
+		einfo "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
+	use nsplugin ||
+		einfo "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin"
+	lc=0
+	for ll in ${LINGUA_LIST}; do
+		use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
+	done
+	if [[ ${lc} > 1 ]]; then
+		einfo "Multiple languages have been installed, selected via a wrapper script."
+		einfo "The language is selected according to the LANG environment variable"
+		einfo "(defaulting to English if LANG is not set, or no matching language"
+		einfo "version is installed).  Users may need to remove their preferences in"
+		einfo "~/.adobe to switch languages."
+	fi
+}
diff --git a/app-text/acroread/files/digest-acroread-7.0.8-r1 b/app-text/acroread/files/digest-acroread-7.0.8-r1
new file mode 100644
index 000000000000..7bcc5d2f5e74
--- /dev/null
+++ b/app-text/acroread/files/digest-acroread-7.0.8-r1
@@ -0,0 +1,48 @@
+MD5 68fcd94a844182e29940b21cf8cf7c3b AdobeReader_chs-7.0.8-1.i386.tar.gz 61037822
+RMD160 f06ce32be2eb881dd9b3bb0c25edbd3f9b89bbc3 AdobeReader_chs-7.0.8-1.i386.tar.gz 61037822
+SHA256 27676b998c7730f8408a7557c57ea9a5be0db68d235226c79b525fc1dd47b209 AdobeReader_chs-7.0.8-1.i386.tar.gz 61037822
+MD5 963c2832c0efc0d1c9bdfa1ffafbe49f AdobeReader_cht-7.0.8-1.i386.tar.gz 56699976
+RMD160 a096052ebb350ee1bdeed48018f64eb7cefe295b AdobeReader_cht-7.0.8-1.i386.tar.gz 56699976
+SHA256 1d80ea465190d9d9fea969494819708a0687869fdf74c2f1c6552095287bd1bf AdobeReader_cht-7.0.8-1.i386.tar.gz 56699976
+MD5 c9332504ccd4c7836a287f48542edae3 AdobeReader_dan-7.0.8-1.i386.tar.gz 48116001
+RMD160 2add95edbe5be6cfcb3966d33971a3357ca36c78 AdobeReader_dan-7.0.8-1.i386.tar.gz 48116001
+SHA256 993342c1ece81902f1b9770528df12bdadbc4f1035646b444d336f53e4a939b5 AdobeReader_dan-7.0.8-1.i386.tar.gz 48116001
+MD5 4a4f4225e873a32165311b09f2264d3d AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
+RMD160 1a79cf1fad25e4bc515967214c1c34b85736d9f6 AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
+SHA256 329a688ad9d27c40064ea7b0c10cd6d10cfbf067c39a31a4913ce67add634af8 AdobeReader_deu-7.0.8-1.i386.tar.gz 49371428
+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 00151ce5b920870c05746c2a54a7feb2 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
+RMD160 bba9c7fecb8c5404976fada7dbdede5871c6c3e4 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
+SHA256 807cad63709f3f53af7f46bfa002c640d5c77cae3be923faa2cd18a695a89f31 AdobeReader_esp-7.0.8-1.i386.tar.gz 48221122
+MD5 e9a3544b392c292549815b0594899f35 AdobeReader_fra-7.0.8-1.i386.tar.gz 48506996
+RMD160 e4a0b67a8594bb316944cc8ee55c559352fe403f AdobeReader_fra-7.0.8-1.i386.tar.gz 48506996
+SHA256 1b7235a6c549d34008fc08677b4f398da1d05f6d712ccf6c75088816e65853a3 AdobeReader_fra-7.0.8-1.i386.tar.gz 48506996
+MD5 ed901cc4bb89e88642fbd00842304452 AdobeReader_ita-7.0.8-1.i386.tar.gz 48020971
+RMD160 d8f6558d64dc3c43833165c4ad5bdaf6f431c49b AdobeReader_ita-7.0.8-1.i386.tar.gz 48020971
+SHA256 17bf8f6e831085279c3ec808338f5b22852eda84a401e5a63bafe72e2e08120a AdobeReader_ita-7.0.8-1.i386.tar.gz 48020971
+MD5 abd39cdc17bb23a54b323c01d086888e AdobeReader_jpn-7.0.8-1.i386.tar.gz 57908025
+RMD160 a610b5ba814eae3c98f9814f4281f7958f6092be AdobeReader_jpn-7.0.8-1.i386.tar.gz 57908025
+SHA256 90fde50a5a60afc70e6e32c222eaf7e172386b36d412e9d9a4a0103beb66964a AdobeReader_jpn-7.0.8-1.i386.tar.gz 57908025
+MD5 3f83c9267a72e67286a09b884371f686 AdobeReader_kor-7.0.8-1.i386.tar.gz 52801200
+RMD160 d534b35e0d3ca05af1ce39ea92d45ff9983ba7ff AdobeReader_kor-7.0.8-1.i386.tar.gz 52801200
+SHA256 a924f0967b3d869f7afadbfcff879879ed353972effc97cf57b436341fb6f811 AdobeReader_kor-7.0.8-1.i386.tar.gz 52801200
+MD5 ee3e0ac2b99583534711408cf8d025ec AdobeReader_nld-7.0.8-1.i386.tar.gz 48343452
+RMD160 4106450ce5bf6afc14ea355876de29a64d32c00c AdobeReader_nld-7.0.8-1.i386.tar.gz 48343452
+SHA256 15b188095f5de5aeb48f82d05cdc22a0222ae9d1b8a53b3c6ea0708e4610a097 AdobeReader_nld-7.0.8-1.i386.tar.gz 48343452
+MD5 e4682371a2621d88c6e0ace3ce121d68 AdobeReader_nor-7.0.8-1.i386.tar.gz 48329913
+RMD160 da35b11359c3b15abe87ce7443bb026bd8305a75 AdobeReader_nor-7.0.8-1.i386.tar.gz 48329913
+SHA256 30fbaed0fd5113903d3d72fab6621d7d1d6e5321178965148d06fc1544d1a269 AdobeReader_nor-7.0.8-1.i386.tar.gz 48329913
+MD5 4be9ea360a33de24ef887074b6002654 AdobeReader_ptb-7.0.8-1.i386.tar.gz 48183826
+RMD160 1b47a8329a65a128b098671932386658f1e2b222 AdobeReader_ptb-7.0.8-1.i386.tar.gz 48183826
+SHA256 ff1cf589da1ea6ab0adb5fdafd10cfb81210d774f46a7dd15b7f518f7f3d6093 AdobeReader_ptb-7.0.8-1.i386.tar.gz 48183826
+MD5 5a26470fc481b8acbfacafa88ca1e903 AdobeReader_suo-7.0.8-1.i386.tar.gz 48240289
+RMD160 21f4c7627d57448c18a4fd80ef9c1b8567fe82cc AdobeReader_suo-7.0.8-1.i386.tar.gz 48240289
+SHA256 4a13136924519166fde26b34f39b1101f1acaee768f704c9c5fca8d3385b4e39 AdobeReader_suo-7.0.8-1.i386.tar.gz 48240289
+MD5 d84a80c805854c16282d4f466c0bc728 AdobeReader_sve-7.0.8-1.i386.tar.gz 49181229
+RMD160 210335f85ac392ccb5f915e3e19b4a4e75fe2602 AdobeReader_sve-7.0.8-1.i386.tar.gz 49181229
+SHA256 d8c519900f3b2a9936af218891ae4781c5dbe32143c2cb054ee20332c5dcc4ae AdobeReader_sve-7.0.8-1.i386.tar.gz 49181229
+MD5 262fe0ef8f6de053c410e175aafa25b9 libcups.so-i386.bz2 50564
+RMD160 a8bedc7151eb1d547616124bfdd4844699a33c15 libcups.so-i386.bz2 50564
+SHA256 77eb5cd6aeab630812f7e911db04b6042cd6dee6aa7b9d8cf7756dca14e24b38 libcups.so-i386.bz2 50564