Add acroread-8.1.2-r1.ebuild, fixes bug #209401 and security bug #212367. Also introduce a minimal USE flag. Remove old versions.

(Portage version: 2.1.4.4)

7 files changed, 78 insertions, 591 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index dc8a2c37c0f7..4cadf05b8363 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,15 @@
 # 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.108 2008/02/10 23:04:57 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.109 2008/03/07 20:57:51 tgurr Exp $
+
+*acroread-8.1.2-r1 (07 Mar 2008)
+
+  07 Mar 2008; Timo Gurr <tgurr@gentoo.org> -files/acroread-expr.patch,
+  -files/acroread-low-startup-fontissue.patch, -files/acroread-scim.patch,
+  -acroread-7.0.9-r1.ebuild, -acroread-8.1.1-r1.ebuild,
+  -acroread-8.1.1-r2.ebuild, +acroread-8.1.2-r1.ebuild:
+  Add acroread-8.1.2-r1.ebuild, fixes bug #209401 and security bug #212367.
+  Also introduce a minimal USE flag. Remove old versions.
 
   10 Feb 2008; Dawid Węgliński <cla@gentoo.org> acroread-8.1.2.ebuild:
   Stable on x86 (bug #170177)
diff --git a/app-text/acroread/acroread-7.0.9-r1.ebuild b/app-text/acroread/acroread-7.0.9-r1.ebuild
deleted file mode 100644
index 4e2ebf5c7005..000000000000
--- a/app-text/acroread/acroread-7.0.9-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.9-r1.ebuild,v 1.6 2007/04/07 14:48:46 genstef 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="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="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}
-		cd ${S}
-		# Note; bash-3.2_p9 doesn't like quotes on the rhs of =~
-		# Seems inconsistent to me; this works for now, awaiting
-		# upstream response.
-		if [[ ${pkg} =~ ^AdobeReader_ ]]; then
-			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 bin/acroread.${fl} 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-2007 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 ||
-		elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
-	use nsplugin ||
-		elog "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
-		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."
-	fi
-}
diff --git a/app-text/acroread/acroread-8.1.1-r1.ebuild b/app-text/acroread/acroread-8.1.1-r1.ebuild
deleted file mode 100644
index 946a7e3ea3a4..000000000000
--- a/app-text/acroread/acroread-8.1.1-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1-r1.ebuild,v 1.1 2008/01/18 03:03:19 tgurr 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/8.x/${PV}"
-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}"
-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"
-# NOTE - Do not go stable until all language variants are released for this version
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip mirror"
-
-# Needs libgtkembedmoz.so, which can come from xulrunner or mozilla-firefox.
-# In the case of mozilla-firefox, need to create /etc/gre.d/gre.conf with
-# GRE_PATH set to the /usr/lib/mozilla-firefox
-# TODO: sort out libgtkembedmoz.so for amd64.
-RDEPEND="x86? ( >=x11-libs/gtk+-2.0
-			cups? ( net-print/cups )
-			ldap? ( net-nds/openldap )
-			|| ( net-libs/xulrunner
-				www-client/mozilla-firefox ) )
-	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2
-			>=app-emulation/emul-linux-x86-gtklibs-2.0 )"
-QA_TEXTRELS="opt/Acrobat8/Reader/intellinux/plug_ins/PPKLite.api
-	opt/Adobe/Reader8/Browser/intellinux/nppdf.so
-	opt/netscape/plugins/nppdf.so"
-QA_EXECSTACK="opt/Adobe/Reader8/Reader/intellinux/plug_ins/Annots.api
-	opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
-	opt/Adobe/Reader8/Reader/intellinux/bin/acroread
-	opt/Adobe/Reader8/Reader/intellinux/bin/SynchronizerApp-binary
-	opt/Adobe/Reader8/Reader/intellinux/lib/libsccore.so
-	opt/Adobe/Reader8/Reader/intellinux/lib/libcrypto.so.0.9.7"
-
-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/Reader8/bin/acroread"
-#	Adobe/HelpViewer/1.0/intellinux/bin/ahv"
-
-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 launcher
-	# Unpack all into the same place; overwrite common files.
-	fl=""
-	for pkg in ${A}; do
-		cd "${WORKDIR}"
-		unpack ${pkg}
-		cd "${S}"
-		if [[ ${pkg} =~ ^AdobeReader_ ]]; then
-			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?"
-			# Don't know if this is still necessary or not...
-			#epatch ${FILESDIR}/acroread-scim.patch
-			# Don't know if this is still necessary or not...
-			#epatch ${FILESDIR}/acroread-low-startup-fontissue.patch
-			# Old under-quoted expr functions no longer appear
-			#epatch ${FILESDIR}/acroread-expr.patch
-			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
-		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).
-		#
-		# This is a bit premature at the moment on 8.1.1, for two reasons:
-		# 1) The only language issued so far by Adobe is English, and the
-		#    provided launcher doesn't bring out its strings separately
-		#    (indicating internationalisation hasn't yet begin for 8.1.1)
-		# 2) HelpViewer is new - I don't know if Adobe are likely to
-		#    internationalise it or not.
-		for launcher in ${LAUNCHERS}; do
-			cat > ${launcher} <<-EOF
-				#!/bin/bash
-				# Copyright 1999-2007 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 particualr for LANG=C)
-			cat >> ${launcher} <<-EOF
-				*) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";;
-				esac
-			EOF
-			chmod 755 ${launcher}
-		done
-	fi
-}
-
-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
-
-	dodir /opt
-	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 Browser/${LANG_TAG}/Browser_Plugin_HowTo.txt
-	dodoc Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt
-
-	if use nsplugin ; then
-		exeinto /opt/netscape/plugins
-		doexe Adobe/Reader8/Browser/intellinux/nppdf.so
-		inst_plugin /opt/netscape/plugins/nppdf.so
-	fi
-
-	if ! use ldap ; then
-		rm "${D}"${INSTALLDIR}/Adobe/Reader8/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}/Adobe/Reader8/Reader/intellinux/lib
-		doexe "${WORKDIR}"/libcups.so.2
-		dosym libcups.so.2 ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib/libcups.so
-	fi
-
-	dodir /opt/bin
-	for launcher in ${LAUNCHERS}; do
-		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
-	done
-
-#	# fix wrong directory permissions (bug #25931)
-#	find ${D}${INSTALLDIR}/. -type d | xargs chmod 755 || die
-}
-
-pkg_postinst () {
-	local ll lc
-	grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-	if [[ $? != "0" ]]; then
-		for lib in /usr/lib/mozilla-firefox; do
-			if [[ -f ${lib}/libgtkembedmoz.so ]]; then
-				mkdir -p /etc/gre.d
-				cat > /etc/gre.d/gre.conf <<-EOF
-					GRE_PATH=${lib}
-				EOF
-				elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found"
-				elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf"
-				break # don't search any more libraries
-			fi
-		done
-	fi
-	use ldap ||
-		elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
-	use nsplugin ||
-		elog "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
-		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."
-	fi
-	grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-	if [[ $? != "0" ]]; then
-		ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which should"
-		ewarn "come with Mozilla Firefox or XULRunner, however it couldn't be found."
-		ewarn "The first time you start acroread, it will complain about this, telling"
-		ewarn "you to add the path to it to your preferences.  Clear the error dialog,"
-		ewarn "close the Beyond Acrobat Reader dialog, go to Edit -> Preferences -> Internet"
-		ewarn "and set the libgtkembedmoz directory to the place where it exists,"
-		ewarn "then close and restart acroread."
-	fi
-}
diff --git a/app-text/acroread/acroread-8.1.1-r2.ebuild b/app-text/acroread/acroread-8.1.2-r1.ebuild
index 5bcd4699ba35..a1c69abfc105 100644
--- a/app-text/acroread/acroread-8.1.1-r2.ebuild
+++ b/app-text/acroread/acroread-8.1.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1-r2.ebuild,v 1.1 2008/01/30 20:31:13 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.2-r1.ebuild,v 1.1 2008/03/07 20:57:51 tgurr Exp $
 
 inherit eutils nsplugins
 
 DESCRIPTION="Adobe's PDF reader"
 HOMEPAGE="http://www.adobe.com/products/acrobat/"
-IUSE="cups ldap nsplugin"
+IUSE="cups ldap minimal nsplugin"
 
 SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}"
 SRC_FOOT="-${PV}-1.i486.tar.bz2"
@@ -22,8 +22,7 @@ for ll in ${LINGUA_LIST} ; do
 		${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 ) )"
+	${DEFAULT_URI}"
 
 LICENSE="Adobe"
 SLOT="0"
@@ -34,16 +33,16 @@ RESTRICT="strip mirror"
 # seamonkey. In the case of mozilla-firefox and seamonkey, we need to create
 # /etc/gre.d/gre.conf with GRE_PATH set. On amd64 currently only seamonkey-bin
 # provides a 32bit libgtkembedmoz.so.
-RDEPEND="x86? ( >=x11-libs/gtk+-2.0
-			cups? ( net-print/cups )
+RDEPEND="cups? ( net-print/cups )
+	x86? ( >=x11-libs/gtk+-2.0
 			ldap? ( net-nds/openldap )
-			|| ( net-libs/xulrunner
-				www-client/mozilla-firefox
-				www-client/seamonkey
-				www-client/seamonkey-bin ) )
+			!minimal? ( || ( net-libs/xulrunner
+						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
-			>=www-client/seamonkey-bin-1.1.7 )"
+			!minimal? ( >=www-client/seamonkey-bin-1.1.7 ) )"
 QA_TEXTRELS="opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api
 	opt/Adobe/Reader8/Browser/intellinux/nppdf.so
 	opt/netscape/plugins/nppdf.so"
@@ -154,6 +153,18 @@ src_unpack() {
 			chmod 755 ${launcher}
 		done
 	fi
+
+	# remove cruft
+	rm "${S}"/Adobe/Reader8/bin/UNINSTALL
+	rm "${S}"/Adobe/Reader8/Resource/Support/vnd.*.desktop
+
+	# fix CVE-2008-0883 the sed way, see bug #212367
+	local binfile
+	for binfile in "${S}"/Adobe/Reader8/bin/* ; do
+	sed -i -e '/MkTemp()/,+17d' \
+		-e 's/MkTemp/mktemp/g' \
+		"${binfile}" || die "sed failed"
+	done
 }
 
 src_install() {
@@ -184,14 +195,6 @@ src_install() {
 		rm "${D}"${INSTALLDIR}/Adobe/Reader8/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}/Adobe/Reader8/Reader/intellinux/lib
-		doexe "${WORKDIR}"/libcups.so.2
-		dosym libcups.so.2 ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib/libcups.so
-	fi
-
 	dodir /opt/bin
 	for launcher in ${LAUNCHERS} ; do
 		dosym /opt/${launcher} /opt/bin/${launcher/*bin\/}
@@ -199,42 +202,44 @@ src_install() {
 }
 
 pkg_postinst () {
-	local ll lc
-	grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-	if [[ $? != "0" ]] ; then
-		if use x86 ; then
-			for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
-				if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
-					mkdir -p /etc/gre.d
-					cat > /etc/gre.d/gre.conf <<-EOF
-						GRE_PATH=${lib}
-					EOF
-					elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found"
-					elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf"
-					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
-					mkdir -p /etc/gre.d
-					cat > /etc/gre.d/gre.conf <<-EOF
-						GRE_PATH=${lib}
-					EOF
-					elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found"
-					elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf"
-					break # don't search any more libraries
-				fi
-			done
+	if ! use minimal ; then
+		local ll lc
+		grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
+		if [[ $? != "0" ]] ; then
+			if use x86 ; then
+				for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do
+					if [[ -f ${lib}/libgtkembedmoz.so ]] ; then
+						mkdir -p /etc/gre.d
+						cat > /etc/gre.d/gre.conf <<-EOF
+							GRE_PATH=${lib}
+						EOF
+						elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+						elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf."
+						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
+						mkdir -p /etc/gre.d
+						cat > /etc/gre.d/gre.conf <<-EOF
+							GRE_PATH=${lib}
+						EOF
+						elog "Adobe Reader depends on libgtkembedmoz.so, which I've found on"
+						elog "your system in ${lib}, and configured in /etc/gre.d/gre.conf."
+						break # don't search any more libraries
+					fi
+				done
+			fi
 		fi
 	fi
 
 	use ldap ||
-		elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap"
+		elog "The Adobe Reader security plugin can be enabled with USE=ldap"
 
 	use nsplugin ||
-		elog "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin"
+		elog "The Adobe Reader browser plugin can be enabled with USE=nsplugin"
 
 	lc=0
 	for ll in ${LINGUA_LIST} ; do
@@ -248,14 +253,19 @@ pkg_postinst () {
 		elog "~/.adobe to switch languages."
 	fi
 
-	grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
-	if [[ $? != "0" ]] ; then
-		ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which should"
-		ewarn "come with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't"
-		ewarn "be found. The first time you start acroread, it will complain about this,"
-		ewarn "telling you to add the path to it to your preferences. Clear the error"
-		ewarn "dialog, close the Beyond Acrobat Reader dialog, go to"
-		ewarn "Edit -> Preferences -> Internet and set the libgtkembedmoz directory to"
-		ewarn "the place where it exists, then close and restart acroread."
+	if ! use minimal ; then
+		grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null
+		if [[ $? != "0" ]] ; then
+			ewarn "Adobe Reader depends dynamically on libgtkembedmoz.so, which should come"
+			ewarn "with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't be found."
+			ewarn "The first time you start acroread, it will complain about this, telling you"
+			ewarn "to add the path to it to your preferences. Clear the error dialog, close the"
+			ewarn "beyond Adobe Reader dialog, go to Edit -> Preferences -> Internet and set the"
+			ewarn "libgtkembedmoz directory to the place where it exists, then close and restart"
+			ewarn "acroread."
+		fi
+	else
+		ewarn "If you want html support and/or view the help you have to re-emerge"
+		ewarn "acroread with USE=\"-minimal\"."
 	fi
 }
diff --git a/app-text/acroread/files/acroread-expr.patch b/app-text/acroread/files/acroread-expr.patch
deleted file mode 100644
index 247cc37a4315..000000000000
--- a/app-text/acroread/files/acroread-expr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/acroread-low-startup-fontissue.patch b/app-text/acroread/files/acroread-low-startup-fontissue.patch
deleted file mode 100644
index 0ee790995303..000000000000
--- a/app-text/acroread/files/acroread-low-startup-fontissue.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch was diffed by me, thanks to ferdy, jokey
-and some others for their IRC-Help.
-
-
---- Acrobat7.0/bin/acroread	2005-05-18 09:05:35.000000000 +0200
-+++ Acrobat7.0/bin/acroread	2005-05-18 09:06:29.000000000 +0200
-@@ -1,6 +1,8 @@
- #!/bin/sh
- #
- 
-+FC=~/.adobe/Acrobat/7.0/Cache/UnixFnt07.lst
-+[ -s ${FC} ] && rm ${FC} && touch ${FC}
- 
- setLangDEU()
- {
diff --git a/app-text/acroread/files/acroread-scim.patch b/app-text/acroread/files/acroread-scim.patch
deleted file mode 100644
index 518d7b306603..000000000000
--- a/app-text/acroread/files/acroread-scim.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch was taken from http://bugs.gentoo.org/show_bug.cgi?id=89766#c6
-
-It fixes startup with scim thanks to Clement Siuchung Cheung <sccheung@umich.edu>
-
---- Acrobat7.0/bin/acroread	2005-05-18 09:05:35.000000000 +0200
-+++ Acrobat7.0/bin/acroread	2005-05-18 09:06:29.000000000 +0200
-@@ -255,6 +255,11 @@
- 	fi
- fi
- 
-+if [ "$GTK_IM_MODULE" = "scim" ]; then
-+	GTK_IM_MODULE=xim
-+	export GTK_IM_MODULE
-+fi
-+
- if [ "$1" = "-DEBUG" ] ; then
-   if [ $# = 1 ] ; then
-     export ACRO_EXEC_CMD