Remove bundled libraries, bug 340527

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

3 files changed, 287 insertions, 7 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index bc37c629b800..1a33659d7ebb 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/acroread
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.168 2011/06/25 07:40:18 zmedico Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.169 2012/01/22 22:16:24 dilfridge Exp $
+
+*acroread-9.4.2-r1 (22 Jan 2012)
+
+  22 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +acroread-9.4.2-r1.ebuild:
+  Remove bundled libraries, bug 340527
 
   25 Jun 2011; Zac Medico <zmedico@gentoo.org> acroread-9.4.2.ebuild:
   Fix firefox dep for rename from mozilla-firefox.
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 0c8c37c8f133..5aa4660d76c3 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX gentoo_config 356 RMD160 fde2e1f78d39d39611ea91fc94f8c31bc8634425 SHA1 ce38b7160e842d970804216e156d5edbcbfd3e1d SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f
 DIST AdbeRdr9.4.2-1_i486linux_deu.tar.bz2 65981114 RMD160 d21c2079400e0fec175cdb1173068648dda79358 SHA1 110df6c6b884fc5e09df7f8f5854ff5cd354155f SHA256 4e19e8794e0830a16e6dab41a91fc5efc1bbca4528d4107843e81ba354993949
 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
+EBUILD acroread-9.4.2-r1.ebuild 8100 RMD160 57852cca23f9d4cae7fe18e36abd7f91c8593a5d SHA1 169b377637d315754dae78de718a90c5a83869fb SHA256 74938c291d68cdd4d0ab65fc39f5710134a9acd2afb7f02095ae82096deee74b
 EBUILD acroread-9.4.2.ebuild 8063 RMD160 9885aff353e488e8cb4ed6267a58eede9b3cebe1 SHA1 b18f9cb8ac1e9a3498fc1b5bef6d60de45e6e46f SHA256 741410bdb062a1a2cbfa9bd88c775cf3fb21c14e10ac696244e36ad019808bec
-MISC ChangeLog 28626 RMD160 2f86dc01e4bf0652740e19586c484165dc7a68c3 SHA1 77ef5dce2f9bcfc009b1bd4d0602387227fbe313 SHA256 96cdc86e68007de15ba9be09ed588f10bb68bf254ae1a75f68d81bbdb365cf10
+MISC ChangeLog 28788 RMD160 cbcb4659b7d2ee79497f47a44dcb6bc14ed7fc47 SHA1 b1b3c1a681de0029a5cb8364a0fda2f75695bd53 SHA256 9b3abeba2ebb02b507e90c5f9ce063188039c88a593f3274423c9e777c031e57
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4FkNQACgkQ/ejvha5XGaN7lACgqsXkZDUx5TCz98lNzZDeJrgZ
-6WwAoJ50qYnTPKcxaMtZ54Vy7We0wy/f
-=cm2v
+iQIcBAEBCgAGBQJPHIr5AAoJENwGBM22xffeHi8P/3LdA0USJ/RlH3xo0qNmvgD9
+dJ7L0nMI+OXlMcrBM28xbA0UlgIepdbVMS2WiK4PxzPzL/sD6laGWditGMCz++57
+aKk6lv2UWl4byFYSmi9ZHUe/QHF3lm6Q8jqMdjb+ATzOlfAaHQg2Yc/Aaygud6TB
+a3YVqM+rWaYQ4nfVeZIIu5cOIGes8YvvXWuRECbQ+rKuRmD7mS8gD59NDqO+JqHL
+5iAj8snCRYEOXRL1SfcFvkVftg4tscSfaPe7YlgbXMKsML9XLgnmzTXLBH2R+D2X
+bbuGuOOrU5hGhIvNV1C6zUTRxicXjLp6Qi/mrU9IpfjAGtv3nP/Do+0vZlN44W+r
+x2hBnu61gy6kUNS6WFSIFYV6nbs56vYtJunQeW+EEaLDFH6lIAxBhEYPCQs3vRrJ
+xW8OlMZuc4EcUESrB1u4AllSiRoef6tK8Jb3H3Xo4JZmGuLOwknSU8fjz0kFDYNH
+idNmK4fjsfUgQWtAoHTLYxDHqfc2SZOfgUaNRWdaixMAIraenqU1jWu3K28QRk0b
+ZAlthqPirERR9zkKq0hzHHccYDPRdFtYkobgRopdO6YtiWwkofXhZ1cdMmvbFHVx
+v3CFvA6T+z01rknJydB9UrhdCUnW/CRe7qXrYNN9XP8lQvUAmScylk/8kPyFjHQj
+c5ZvA245dSb6FlM8DTSN
+=mEab
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-9.4.2-r1.ebuild b/app-text/acroread/acroread-9.4.2-r1.ebuild
new file mode 100644
index 000000000000..fdd8d8e6ac39
--- /dev/null
+++ b/app-text/acroread/acroread-9.4.2-r1.ebuild
@@ -0,0 +1,263 @@
+# 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.2-r1.ebuild,v 1.1 2012/01/22 22:16:23 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
+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
+	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
+}
+
+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
+}