diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2012-06-03 20:29:43 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2012-06-03 20:29:43 +0000 |
commit | 8a7f0f2efe4366fe972e465bdf1be41804f43518 (patch) | |
tree | ff7854066d42724347c97ed104cff931221747f5 /app-text | |
parent | old (diff) | |
download | historical-8a7f0f2efe4366fe972e465bdf1be41804f43518.tar.gz historical-8a7f0f2efe4366fe972e465bdf1be41804f43518.tar.bz2 historical-8a7f0f2efe4366fe972e465bdf1be41804f43518.zip |
Patch C:\nppdf32Log\debuglog.txt sillyness into /dev/null. Bug 412051
Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/acroread/ChangeLog | 8 | ||||
-rw-r--r-- | app-text/acroread/Manifest | 29 | ||||
-rw-r--r-- | app-text/acroread/acroread-9.5.1-r1.ebuild | 293 |
3 files changed, 315 insertions, 15 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 8c949b1487d7..1a4e0b8653dd 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.184 2012/04/18 23:01:11 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.185 2012/06/03 20:29:43 dilfridge Exp $ + +*acroread-9.5.1-r1 (03 Jun 2012) + + 03 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> + +acroread-9.5.1-r1.ebuild: + Patch C:\nppdf32Log\debuglog.txt sillyness into /dev/null. Bug 412051 18 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> acroread-9.5.1.ebuild: It seems like it now also works with firefox-bin, bug 412467 diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest index 4393d250ca25..f2b5c3667fb5 100644 --- a/app-text/acroread/Manifest +++ b/app-text/acroread/Manifest @@ -3,23 +3,24 @@ Hash: SHA512 AUX gentoo_config 356 RMD160 fde2e1f78d39d39611ea91fc94f8c31bc8634425 SHA1 ce38b7160e842d970804216e156d5edbcbfd3e1d SHA256 f7742c4df12cf080fbd763a78cb367b1015b57b58a00896b12931c0416bfc68f DIST AdbeRdr9.5.1-1_i486linux_enu.tar.bz2 57138807 RMD160 ba457c98384af6223a4bc11c28e8b5ce8a542325 SHA1 02985c18abbe7f530f7a29e76061c5bd362f5e42 SHA256 a6bcb881d5de4fb58c00fe24c3541122123881a3148a9feb0f62eda8dd82bca6 +EBUILD acroread-9.5.1-r1.ebuild 9503 RMD160 251fd712aca8d407c5c3377c83e484319c01c4e2 SHA1 7c197e96f5c05f3fa5d73ef16de8879a5c2738bf SHA256 bb7ba867254e9284856d59af4e7247a4817097e69e043488c284afb8fccddfa9 EBUILD acroread-9.5.1.ebuild 8777 RMD160 8341ab6d11a6a1f9be7964a1aa2390aa0cfdb0ce SHA1 0dc174791aee18b81392d549bbcf1b4b0b83c325 SHA256 c9e2c8e590dcdf06965ea933203541d7fde0b0eaf065d76f51eec7644c863531 -MISC ChangeLog 30740 RMD160 bb39bb25ff6430241ad8e3b7746d36495f9ff3a9 SHA1 f8380c9ed8ff84138df56a35a968817c7427048f SHA256 e49e3c78f75b45e68e0fda596381484dba6850de0ce8d00f92e6ccc58e7e8f3d +MISC ChangeLog 30933 RMD160 c6013a0893baa476f29fabe33591ead943a7af53 SHA1 e252ee553d4d831ec7243ed2f1fc9ff5d1b325e9 SHA256 cec1f32ce3298ca319314ee56263ce43ecc92610374b3b51d8e90baa5cbc4fdf MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJPj0fKAAoJENwGBM22xffeN1AP/2wnCmHO5X4C3kDzR1SK0S59 -uIid4S6QUYqU5fSC+K9ZHFlC1rt6r1ooOeKHE1fMbGOsJnd4+Heu2fZI0QFKov1f -YIfVrdT1yN8oxDwgfnEj36uOlxwKq1n8BkQ97ZWHanY3z5ncKHmWhuDcfbBbdpc8 -mze8jopd+8nsMMDcl2Uhp4DPfVg/FJPzy4Qd2WqQR7tYpwa8W+iHF3+q9es2g7Gh -EnJZdCMTcpFut3j+Pi+yoWwO4GP+hUWuts7yC5Hp5k+9oWdDzM0QUTva0zDWmd0M -fsT1NZOPii3wVfdAUF+2UrMA8z+N06Qb2kwGMCgWKQpgYsAoSHjCkpc3qzO8sJty -XfSLTqzXqsFc8Zxqjx45pQqCzRFuC8FCrmcd6H6d/owGuGwTKcNKG+fMSdeSvcTO -yXyOabKhBqxOLTQDeHyIYWQGmt+12B3eqFoyurEw04bWGzq9VAlHyFdj3AXegKWi -9e6oJ59I15tZIFxGO5r1faYyTcO74a309Fjw4yjtwZkI1R6HzT5CObCjodyXxhoR -TxPbzs34zej3ZDTar1t7mBCxdlBcMQnLTwyMxa/25oES2caXgF0xFfm3rrSkSJh4 -JxVKjfqyliJk6CXgHpTW79ZKwkd8gp1ZUu2BPU2FMYoTgMd+D6hQhtKbEHFEZdUJ -pg/uUHibSPkBubn8X0Lh -=hW26 +iQIcBAEBCgAGBQJPy8l/AAoJENwGBM22xffeUlkQAJFpRcG83O1QEv4Z7COmer+a +oXjBMqj8ozwlrbuD6GG3k+cD7dKOv2sLwVs3AKM/Bl3ssWVlYaSa4q43wMbRpBe1 +CCTZ0RSCZdzKtwpT0PTmeKuC4gTML27qNqBg9l0BcVdfQoVShxQLXBkN/wwM8c9r +cSmPNFD4meKH+dL1lPjR3liaOeRxP6xB/twRxSLkbBmCGl6oQe4wy8+fT8WIvk2c +cSq4jkDJhPVejKWaPrZZ4251nsBNRom3GO9ChpY+Ef0kzr9No2T/zP0JPC2FPehy +XPS6E0blGXv00G552AuJSgjfr/NwlWF32UBOWt26wXNTyLDE8DbuLY0kns74dyVU +v+Pvn+X4wrRlYUtKDnOZceSVyL1yqbQcLB51yhL5jOl6+HFBx+6+YoAbR0iAfWen +Gzz+CuTEr8KuC1WT/BEPqQ8T38dWOY/rzedEFHy63UbrR8Vb+CdB8eCXItmGyU2H +gDKDixzNeJa1+nIw/wWw7pBih6XfMsqY3me6tmo5oE+1H2VL4S+2SjrmirSvT0Xq +pyn3MWHYNe4rg3jTLHtiqnv5mMOcP9IFc06idNd1cqY40+dJfjDkzYdi89peeJBt +4jTsM78yf9/vpCCNPi5xUbYsJmpGJOfWZB4Jiz8pJng+S6nQSRBchZQ8zU7yHePb +QdyXyzrvuWY+DAuoTG8/ +=HKe0 -----END PGP SIGNATURE----- diff --git a/app-text/acroread/acroread-9.5.1-r1.ebuild b/app-text/acroread/acroread-9.5.1-r1.ebuild new file mode 100644 index 000000000000..be03b8a6732d --- /dev/null +++ b/app-text/acroread/acroread-9.5.1-r1.ebuild @@ -0,0 +1,293 @@ +# 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.5.1-r1.ebuild,v 1.1 2012/06/03 20:29:43 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 +# asian fonts are handled separately +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 + +# asian fonts from separate package: +IUSE="${IUSE} linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" + +SRC_URI="${SRC_URI} + ${DEFAULT_URI}" + +LICENSE="Adobe" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="strip mirror" + +DEPEND="dev-util/bsdiff" + +# 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 net-dns/libidn + ldap? ( net-nds/openldap ) + !minimal? ( || ( www-client/firefox + www-client/firefox-bin + www-client/seamonkey ) ) ) + amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-baselibs ) + linguas_zh_CN? ( media-fonts/acroread-asianfonts[linguas_zh_CN] ) + linguas_ja? ( media-fonts/acroread-asianfonts[linguas_ja] ) + linguas_zh_TW? ( media-fonts/acroread-asianfonts[linguas_zh_TW] ) + linguas_ko? ( media-fonts/acroread-asianfonts[linguas_ko] )" + +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" + +QA_TEXTRELS="opt/Adobe/Reader9/Reader/intellinux/lib/libsccore.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" + + # fix braindead error in nppdf.so (bug 412051) + base64 -d > ${WORKDIR}/nppdf.so.patch << ENDOFFILE +QlNESUZGNDBIAAAAAAAAAC8AAAAAAAAAYL0CAAAAAABCWmg5MUFZJlNZFBL6EAAAFvBh+DwgDAgQ +QAAAEABAIAAgACICaGjJtQoaaYAFPzpGDIjiUXSFYEuGy1ix8XckU4UJAUEvoQBCWmg5MUFZJlNZ +jrYrlQABYGAAwAAIAAAIIAAwzAUppgKbECni7kinChIR1sVyoEJaaDkxQVkmU1kzGPRGAAAAEYAA +AIYFAwAgACIHqbUIYAdBF8XckU4UJAzGPRGA +ENDOFFILE + einfo "Patching nppdf.so" + mv Adobe/Reader9/Browser/intellinux/nppdf.so Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die + bspatch Adobe/Reader9/Browser/intellinux/nppdf.so.orig Adobe/Reader9/Browser/intellinux/nppdf.so ${WORKDIR}/nppdf.so.patch || die + rm Adobe/Reader9/Browser/intellinux/nppdf.so.orig || die +} + +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 did. + 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 +} |