Version bump, unfortunately only english so far

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 291 insertions, 15 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 75f2c88972ff..133fc9543a5a 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/acroread
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.170 2012/01/28 19:33:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.171 2012/01/28 20:05:02 dilfridge Exp $
+
+*acroread-9.4.7 (28 Jan 2012)
+
+  28 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +acroread-9.4.7.ebuild:
+  Version bump, unfortunately only english so far
 
 *acroread-9.4.2-r2 (28 Jan 2012)
 
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index da159985ff20..62aee8ee53e2 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -6,25 +6,27 @@ DIST AdbeRdr9.4.2-1_i486linux_deu.tar.bz2 65981114 RMD160 d21c2079400e0fec175cdb
 DIST AdbeRdr9.4.2-1_i486linux_enu.tar.bz2 60286782 RMD160 8b1c442044409cdb78eb3c59c393135b058ad81d SHA1 2ed2032c9d055af9611e8a8e0de355c2e9cdd815 SHA256 10ec272ae12a52a06ae88e1e7737423742160f172f789a22ed906a7af2b3a876
 DIST AdbeRdr9.4.2-1_i486linux_fra.tar.bz2 64485671 RMD160 64a32bbc7516e3322fe86fa86728dd2bc237a66c SHA1 b08bd541cdbaf6c8949b16dc8a85522125bf8783 SHA256 b5d017859057ea1ff2ea6c238a33cb7f5f4ab404c06b0a91d9c9ae41baa1e051
 DIST AdbeRdr9.4.2-1_i486linux_jpn.tar.bz2 68341985 RMD160 537f2ee58936f920b91ec53a8e8fefdfed6ecf47 SHA1 6ba11402ae91964c847fa820d95f329301dfd6cb SHA256 228bc45f59c587b9bea0652aa36b0add10a340ba022347ee9205931214d017ba
+DIST AdbeRdr9.4.7-1_i486linux_enu.tar.bz2 57112529 RMD160 fcbb3397a063387eaee0af02f89f844a51c9f0fd SHA1 83ff5262523216a087206cb6f8e9815eaa1ac35e SHA256 65b91a1d925d5690050515d233fadeb47f52c692103904a72c7125c6590efd2f
 EBUILD acroread-9.4.2-r1.ebuild 8099 RMD160 af618cf1f8d78ddddb05151db0b970ae36703552 SHA1 7919eb3e3538708eeafe4fb2abe35d9650025d47 SHA256 8ff49a064f4cb27f9dcbb8529e707de7ee3f010372afc97704842705704f9538
 EBUILD acroread-9.4.2-r2.ebuild 8299 RMD160 30155e6256a007a3b3637ccb6934814f9ff3a53c SHA1 33596651f944c5632e50a2af4792609f30776fad SHA256 a7710d2e96c1d632afd758b1c03bcf2059d0bb8e3c7802beb0cffbc36a75ed75
 EBUILD acroread-9.4.2.ebuild 8063 RMD160 9885aff353e488e8cb4ed6267a58eede9b3cebe1 SHA1 b18f9cb8ac1e9a3498fc1b5bef6d60de45e6e46f SHA256 741410bdb062a1a2cbfa9bd88c775cf3fb21c14e10ac696244e36ad019808bec
-MISC ChangeLog 28957 RMD160 b4bf94a7c7746aa75dc1c193876a2ebd81ffab63 SHA1 a4c5dd3621858cca1c7fdf0bcd731a80a1c9cc39 SHA256 1f8f1b0bf08bd462b5b508119c790a94c81bb53c20ab0bae52e2f290e7193dc1
+EBUILD acroread-9.4.7.ebuild 8296 RMD160 73b94913e13f61b63d5642749c33e2387aac51b7 SHA1 d7ff6551eb8fcb81265f051674c65880e90fb685 SHA256 a74553fd1cafd7087d67bdc87a74253beedd1eeadb259ad90fb15a4ddbf4e014
+MISC ChangeLog 29122 RMD160 d1b4976ff85f15077d6c9dc224537b4c9b485fba SHA1 c22f5bc3f53beb8178a67c96b7d28c05dcba26c5 SHA256 603622fa4b44e96c23b1b1bfbd729e075ab2cd97e10cbe4cf7a7368e8728d145
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPJE4HAAoJENwGBM22xffeT5QP/2dPjGySrczCDtCWzdiRfzM9
-/WU3dEaGtKLG/SZrUYoDEpmt7Gs5WX9yJEY4YvIwiToa2gRD1hMEvOYQJ6+n21ud
-UWgN4PdaOVzb7PDbeeuHmHmpZ9WDzm8+4d8UzcSC7yk7sDCFymKVkhU+qWHn+es3
-3uS4ktFBFWAIs4heAE9tBbl6ZT3njF4AMih2EQz1sbu6B/C/Umc+QHbEamU5xZ0t
-itf0EDtwxe9pZSogJtmltk+Dlo3t29ud7YDYv1BEnyukyeHKO+soPAr7TRMLOshu
-fS15mn57CpCaLrg6yYa5Lae+UTiNSl1X0y0SLG5ktBHSkwiXk71IHiKjLdj+f4ot
-f7ScRCRISf6keWmt78TxjypKcrQGkIynqLE2ZLrn1FpX7sZ0kqBjseRGCDjc3FbA
-dYlQWJUVJstzSSG4n+KV6PkXzsjcZmDBDqesppKF0weqZ/RPSt0vz1ftADrIgms3
-jzyBLcwZb2MkNjRXryhFspdKRT7As73anQC1dWbpAD+8LO8GF8lR5bBRuDXIbPQ7
-NIXHRtFm9XMaty4yN36lFeMY1IbJXToreLhilExT90ztSSR8bAlPs5CI4MI4bMVG
-ErnPSV3FCPYUWAzTq6AEiszGoZQ4l7nK5VrvMgh0Pe+t3KqiFrR9WouN6ynL13RW
-iNB4/sQ+MoZKh03wSt4J
-=Czbd
+iQIcBAEBCgAGBQJPJFU9AAoJENwGBM22xffe/acP/2L6bwP8NjVkhXAh+ZgVzJjK
+qSfSjjzx6Ts9+yB+XzpZ4AWVPX433PvcOiKvmGRv+DXeB8N/GuCsEfOJC2t4SAYE
+EPrpF4aTfIsgn8TyrJCKjbLfyi5+TP/oQgkbR0QAlntiidKH5h9I1Ntop7uN1ft4
+fWKjU368/2879kFJEMnt+fbRoC/Y25c5+0q/pJr5EZGOVksD2fg+AqaHsIc98aNp
+WGblaDmpY0rfwqkL9IHrV9M4IV75sxMpG5+kdUb6cDYbXyd6dJPHUR5DXlus8wub
+vAcstHHk3t3xOY9Mfraa5zaHxQOVCBrvXhkvoT0vEdU/P70WX7NjXnRzqIeJWx2L
+pQFW7JnLKYE5nhKee8dLebCaU2MFqBvVSwPiUFOljGTs8CEXJOiTHI/eK8+89HDX
+T0w9BrPWBC6JdF4NIiOsD5ixGOpxznH7S28NwUb/5MjRJ5UyiVeiw/ZhxpmERHuZ
+q8J19EkovWx1Z3nSmX+cQnXmS/IJPTqL17rjiIAGvUEVfYKMk+gx2tjRn6w0Rcat
+Z1aewdxaoABGj2qmO81PIMUyERxOpr5PFu2+WqWUR4blPLV2rdWJegZqcAlQDnak
+lo19/gMx63yQjp0767L87zKA83Jo+YHUKCM1k7AXhBB9OwqK8g/mgIDLAIZJIUeV
+1JfacfRffUAVlcK2Z5gD
+=XrWo
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.4.7.ebuild b/app-text/acroread/acroread-9.4.7.ebuild
new file mode 100644
index 000000000000..cf6aad53911f
--- /dev/null
+++ b/app-text/acroread/acroread-9.4.7.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.4.7.ebuild,v 1.1 2012/01/28 20:05:02 dilfridge Exp $
+
+EAPI=4
+
+inherit eutils gnome2-utils nsplugins
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/reader/"
+IUSE="cups ldap minimal nsplugin"
+
+SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PV}"
+SRC_FOOT=".tar.bz2"
+
+# languages not available yet: it:ita es:esp pt:ptb sv:sve zh_CN:chs zh_TW:cht fi:suo nb:nor nl:nld ko:kor da:dan de:deu fr:fra ja:jpn
+LINGUA_LIST="en:enu"
+DEFAULT_URI="${SRC_HEAD}/enu/AdbeRdr${PV}-1_i486linux_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}/AdbeRdr${PV}-1_i486linux_${src_l}${SRC_FOOT} )"
+done
+SRC_URI="${SRC_URI}
+	${DEFAULT_URI}"
+
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip mirror"
+
+# mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
+RDEPEND="media-libs/fontconfig
+	x86? ( =dev-libs/openssl-0.9.8* )
+	cups? ( net-print/cups )
+	x86? ( x11-libs/gtk+:2
+			ldap? ( net-nds/openldap )
+			!minimal? ( || ( net-libs/xulrunner
+						www-client/firefox
+						www-client/seamonkey ) ) )
+	amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs )"
+
+QA_EXECSTACK="opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/lib/libauthplay.so.0.0.0
+	opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.so
+	opt/Adobe/Reader9/Reader/intellinux/lib/libcrypto.so.0.9.8
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/PPKLite.api"
+
+QA_DT_HASH="opt/Adobe/Reader9/Reader/intellinux/plug_ins3d/.*.x3d
+	opt/Adobe/Reader9/Reader/intellinux/lib/lib.*
+	opt/Adobe/Reader9/Reader/intellinux/bin/SynchronizerApp-binary
+	opt/Adobe/Reader9/Reader/intellinux/bin/acroread
+	opt/Adobe/Reader9/Reader/intellinux/bin/xdg-user-dirs-update
+	opt/Adobe/Reader9/Reader/intellinux/SPPlugins/ADMPlugin.apl
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/AcroForm/PMP/.*.pmp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/Multimedia/MPP/.*.mpp
+	opt/Adobe/Reader9/Reader/intellinux/plug_ins/.*.api
+	opt/Adobe/Reader9/Reader/intellinux/sidecars/.*.DEU
+	opt/Adobe/Reader9/Browser/intellinux/nppdf.so
+	opt/netscape/plugins/nppdf.so"
+
+INSTALLDIR=/opt
+
+S="${WORKDIR}/AdobeReader"
+
+# Actually, ahv segfaults when run standalone so presumably
+# it isn't intended for direct use - so the only launcher is
+# acroread after all.
+LAUNCHERS="Adobe/Reader9/bin/acroread"
+#	Adobe/HelpViewer/1.0/intellinux/bin/ahv"
+
+# remove bundled libs to force use of system version, bug 340527
+REMOVELIBS="libcrypto libssl"
+
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	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 launcher
+	# Unpack all into the same place; overwrite common files.
+	fl=""
+	for pkg in ${A} ; do
+		cd "${WORKDIR}"
+		unpack ${pkg}
+		cd "${S}"
+		tar xf ILINXR.TAR || die "Failed to unpack ILINXR.TAR."
+		tar xf COMMON.TAR || die "Failed to unpack COMMON.TAR."
+		ll=$(acroread_get_ll ${pkg})
+		for launcher in ${LAUNCHERS} ; do
+			mv ${launcher} ${launcher}.${ll}
+		done
+		if [[ -z ${fl} ]] ; then
+			fl=${ll}
+			linguas="${ll}"
+		else
+			linguas="${linguas} ${ll}"
+		fi
+	done
+	if [[ ${linguas} == ${fl} ]] ; then
+		# Only one lingua selected - skip building the wrappers
+		for launcher in ${LAUNCHERS} ; do
+			mv ${launcher}.${fl} ${launcher} ||
+				die "Failed to put ${launcher}.${fl} back to ${launcher}; please report."
+		done
+	else
+		# Build wrappers.  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).
+		#
+		# HelpViewer is new - We don't know if Adobe are likely to
+		# internationalize it or not.
+		for launcher in ${LAUNCHERS} ; do
+			cat > ${launcher} <<-EOF
+				#!/bin/bash
+				# Copyright 1999-2009 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}/${launcher}.${ll} \"\$@\";;" >> ${launcher}
+			done
+			# default to English (in particular for LANG=C)
+			cat >> ${launcher} <<-EOF
+				*) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
+				esac
+			EOF
+			chmod 755 ${launcher}
+		done
+	fi
+
+	# remove cruft
+	rm "${S}"/Adobe/Reader9/bin/UNINSTALL
+	rm "${S}"/Adobe/Reader9/Browser/install_browser_plugin
+	rm "${S}"/Adobe/Reader9/Resource/Support/vnd.*.desktop
+
+	# replace some configuration sections
+	for binfile in "${S}"/Adobe/Reader9/bin/* ; do
+		sed -i -e '/Font-config/,+9d' \
+			-e "/acrogre.conf/r ${FILESDIR}/gentoo_config" -e //N \
+			"${binfile}" || die "sed configuration settings failed."
+	done
+
+	# fix erroneous Exec entry in .desktop
+	sed -i -e 's/^Exec=acroread[[:space:]]*$/Exec=acroread %U/' \
+		"${S}"/Adobe/Reader9/Resource/Support/AdobeReader.desktop \
+		||die "sed .desktop fix failed"
+}
+
+src_install() {
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader9/Resource/Icons/${res}/*
+	done
+
+	dodir /opt
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${D}"opt/ || die
+
+	# remove some bundled libs
+	for mylib in ${REMOVELIBS} ; do
+		einfo Removing bundled ${mylib}
+		rm -v "${D}"/opt/Adobe/Reader9/Reader/intellinux/lib/${mylib}*
+	done
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin
+	for launcher in ${LAUNCHERS} ; do
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
+	done
+
+	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
+	# they don't install a configuration file for libgtkembedmoz.so
+	# detection in /etc/gre.d/ like xulrunner does.
+	if ! use minimal ; then
+		if use x86 ; then
+			for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+				if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+					echo "MOZILLA_COMP_PATH=${lib}" >> "${D}"${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config
+					elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+					elog "your system in ${lib}, and configured in ${INSTALLDIR}/Adobe/Reader9/Reader/GlobalPrefs/mozilla_config."
+					break # don't search any more libraries
+				fi
+			done
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst () {
+	local ll lc
+	lc=0
+	for ll in ${LINGUA_LIST} ; do
+		use linguas_${ll/:*} && (( lc = ${lc} + 1 ))
+	done
+	if [[ ${lc} > 1 ]] ; then
+		echo
+		elog "Multiple languages have been installed, selected via a wrapper script."
+		elog "The language is selected according to the LANG environment variable"
+		elog "(defaulting to English if LANG is not set, or no matching language"
+		elog "version is installed). Users may need to remove their preferences in"
+		elog "~/.adobe to switch languages."
+		echo
+	fi
+
+	if use minimal ; then
+		echo
+		ewarn "If you want html support and/or view the Adobe Reader help you have"
+		ewarn "to re-emerge acroread with USE=\"-minimal\"."
+		echo
+	fi
+
+	if use nsplugin ; then
+		echo
+		elog "If you're running a 64bit browser you may also want to install"
+		elog "\"www-plugins/nspluginwrapper\" to be able to use the Adobe Reader"
+		elog "browser plugin."
+		echo
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}