Version bump wrt security bug #259992. Also incorporates suggestion from bug #253059, thanks to Keith Gable. Remove old.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 302 insertions, 31 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index fcc7faff0cb5..7065660c9760 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/acroread
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.122 2008/11/08 13:36:42 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.123 2009/04/06 22:25:41 tgurr Exp $
+
+*acroread-9.1.0 (06 Apr 2009)
+*acroread-8.1.4 (06 Apr 2009)
+
+  06 Apr 2009; Timo Gurr <tgurr@gentoo.org> -acroread-8.1.2-r3.ebuild,
+  +acroread-8.1.4.ebuild, +acroread-9.1.0.ebuild:
+  Version bump wrt security bug #259992. Also incorporates suggestion from
+  bug #253059, thanks to Keith Gable. Remove old.
 
   08 Nov 2008; Markus Meier <maekke@gentoo.org> acroread-8.1.3.ebuild:
   x86 stable, bug #225483
diff --git a/app-text/acroread/acroread-8.1.2-r3.ebuild b/app-text/acroread/acroread-8.1.4.ebuild
index c1e2cfcc09bd..94123ab3943e 100644
--- a/app-text/acroread/acroread-8.1.2-r3.ebuild
+++ b/app-text/acroread/acroread-8.1.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2-r3.ebuild,v 1.4 2008/10/05 20:32:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.4.ebuild,v 1.1 2009/04/06 22:25:41 tgurr Exp $
 
-inherit eutils nsplugins
+inherit eutils gnome2-utils nsplugins
 
 DESCRIPTION="Adobe's PDF reader"
-HOMEPAGE="http://www.adobe.com/products/acrobat/"
+HOMEPAGE="http://www.adobe.com/products/reader/"
 IUSE="cups ldap minimal nsplugin"
 
 SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}"
-SRC_FOOT="-${PV}_SU1-1.i486.tar.bz2"
+SRC_FOOT="-${PV}-1.i486.tar.bz2"
 
 LINGUA_LIST="da:dan de:deu en:enu es:esp fi:suo fr:fra it:ita ja:jpn ko:kor nb:nor nl:nld pt:ptb sv:sve zh_CN:chs zh_TW:cht"
 DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}"
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="Adobe"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip mirror"
 
 # mozilla-firefox-bin won't work because it doesn't have gtkembedmoz.so
@@ -65,7 +65,6 @@ LAUNCHERS="Adobe/Reader8/bin/acroread"
 
 pkg_setup() {
 	# x86 binary package, ABI=x86
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
 	has_multilib_profile && ABI="x86"
 }
 
@@ -126,7 +125,7 @@ src_unpack() {
 		for launcher in ${LAUNCHERS} ; do
 			cat > ${launcher} <<-EOF
 				#!/bin/bash
-				# Copyright 1999-2008 Gentoo Foundation
+				# Copyright 1999-2009 Gentoo Foundation
 				# Distributed under the terms of the GNU General Public License v2
 				#
 				# Automatically generated by ${CATEGORY}/${PF}
@@ -163,36 +162,33 @@ src_unpack() {
 }
 
 src_install() {
-	local dir
-
 	# Install desktop files
-	domenu Adobe/Reader8/Resource/Support
-	# Install Icons - choose 48x48 since that's what the previous versions
-	# supplied.
-	doicon Adobe/Reader8/Resource/Icons/48x48
+	domenu Adobe/Reader8/Resource/Support || die "Installing desktop files failed."
+
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins Adobe/Reader8/Resource/Icons/${res}/* || die "Installing icons failed."
+	done
 
-	dodir /opt
+	dodir /opt || die "Creating directoy failed."
 	chown -R --dereference -L root:0 Adobe
 	cp -dpR Adobe "${D}"opt/
 
 	# 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 Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt
+	dodoc Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt || die "Installing docs failed."
 
 	if use nsplugin ; then
 		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader8/Browser/intellinux/nppdf.so
+		doexe Adobe/Reader8/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
 		inst_plugin /opt/netscape/plugins/nppdf.so
 	fi
 
-	if ! use ldap ; then
-		rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
-	fi
-
-	dodir /opt/bin
+	dodir /opt/bin || die "Creating directory failed."
 	for launcher in ${LAUNCHERS} ; do
-		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} || die "Installing launcher symlinks failed."
 	done
 
 	# We need to set a MOZILLA_COMP_PATH for seamonkey and firefox since
@@ -222,28 +218,43 @@ src_install() {
 	fi
 }
 
-pkg_postinst () {
-	use ldap ||
-		elog "The Adobe Reader security plugin can be enabled with USE=\"ldap\"."
-
-	use nsplugin ||
-		elog "The Adobe Reader browser plugin can be enabled with USE=\"nsplugin\"."
+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 "\"net-www/nspluginwrapper\" to be able to use the Adobe Reader browser plugin."
+		echo
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/app-text/acroread/acroread-9.1.0.ebuild b/app-text/acroread/acroread-9.1.0.ebuild
new file mode 100644
index 000000000000..0416a76e7735
--- /dev/null
+++ b/app-text/acroread/acroread-9.1.0.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-9.1.0.ebuild,v 1.1 2009/04/06 22:25:41 tgurr Exp $
+
+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/9.1"
+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
+LINGUA_LIST="de:deu en:enu fr:fra ja:jpn"
+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
+	cups? ( net-print/cups )
+	x86? ( >=x11-libs/gtk+-2.0
+			ldap? ( net-nds/openldap )
+			!minimal? ( || ( net-libs/xulrunner
+						net-libs/xulrunner-bin
+						www-client/mozilla-firefox
+						www-client/seamonkey
+						www-client/seamonkey-bin ) ) )
+	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2
+			>=app-emulation/emul-linux-x86-gtklibs-2.0
+			!minimal? ( || ( net-libs/xulrunner-bin
+						www-client/seamonkey-bin ) ) )"
+
+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"
+
+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"
+
+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
+}
+
+src_install() {
+	# Install desktop files
+	domenu Adobe/Reader9/Resource/Support/AdobeReader.desktop || die "Installing desktop files failed."
+
+	# 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}/* || die "Installing icons failed."
+	done
+
+	dodir /opt || die "Creating directoy failed."
+	chown -R --dereference -L root:0 Adobe
+	cp -dpR Adobe "${D}"opt/
+
+	doman Adobe/Reader9/Resource/Shell/acroread.1.gz || die "Installing manpage failed."
+
+	if use nsplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Adobe/Reader9/Browser/intellinux/nppdf.so || die "Installing the browser plugin failed."
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	dodir /opt/bin || die "Creating directory failed."
+	for launcher in ${LAUNCHERS} ; do
+		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} || die "Installing launcher symlinks failed."
+	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
+		if use amd64 ; then
+			for lib in /opt/seamonkey ; 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 "\"net-www/nspluginwrapper\" to be able to use the Adobe Reader browser plugin."
+		echo
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}