From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IbKM4-0004BG-Jy for garchives@archives.gentoo.org; Fri, 28 Sep 2007 18:14:25 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.1/8.14.0) with SMTP id l8SI5lpb025681; Fri, 28 Sep 2007 18:05:47 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.1/8.14.0) with ESMTP id l8SI5jwG025676 for ; Fri, 28 Sep 2007 18:05:46 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 87C3964504 for ; Fri, 28 Sep 2007 18:05:45 +0000 (UTC) Received: from kevquinn by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IbKDg-0000OQ-IW for gentoo-commits@lists.gentoo.org; Fri, 28 Sep 2007 18:05:44 +0000 From: "Kevin F. Quinn (kevquinn)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, kevquinn@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-text/acroread: acroread-8.1.1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: acroread-8.1.1.ebuild ChangeLog X-VCS-Directories: app-text/acroread X-VCS-Committer: kevquinn X-VCS-Committer-Name: Kevin F. Quinn Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: "Kevin F. Quinn" Date: Fri, 28 Sep 2007 18:05:44 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 7b8fc767-99ab-4da9-a022-e31c70cda564 X-Archives-Hash: 33027cae12fd908a151a393e26dd6e8a kevquinn 07/09/28 18:05:44 Modified: acroread-8.1.1.ebuild ChangeLog Log: Use XulRunner if present; setup /etc/gre.d/gre.conf if only mozilla-firefox is present - follow-up for bug #192527 (Portage version: 2.1.3.9) Revision Changes Path 1.3 app-text/acroread/acroread-8.1.1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?r1=1.2&r2=1.3 Index: acroread-8.1.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- acroread-8.1.1.ebuild 28 Sep 2007 07:19:50 -0000 1.2 +++ acroread-8.1.1.ebuild 28 Sep 2007 18:05:43 -0000 1.3 @@ -1,6 +1,6 @@ # 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-8.1.1.ebuild,v 1.2 2007/09/28 07:19:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v 1.3 2007/09/28 18:05:43 kevquinn Exp $ inherit eutils nsplugins @@ -33,15 +33,17 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="strip mirror" -# Firefox is needed for libgtkembedmoz.so which is used to render files with -# HTML. +# 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 ) ) + 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 ) - || ( www-client/mozilla-firefox - www-client/mozilla-firefox-bin )" + >=app-emulation/emul-linux-x86-gtklibs-2.0 )" QA_TEXTRELS="opt/Acrobat8/Reader/intellinux/plug_ins/PPKLite.api opt/Adobe/Adobe/Reader8/Browser/intellinux/nppdf.so opt/netscape/plugins/nppdf.so" @@ -208,6 +210,20 @@ 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 + einfo "Acrobat Reader depends on libgtkembedmoz.so, which I've found" + einfo "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 || @@ -223,11 +239,14 @@ elog "version is installed). Users may need to remove their preferences in" elog "~/.adobe to switch languages." fi - ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which comes" - ewarn "with Mozilla Firefox. The first time you start acroread, it will" - ewarn "complain about this, telling you to add the path to it to your" - ewarn "preferences. Clear the error dialog, close the Beyond Acrobat" - ewarn "Reader dialog, go to Edit -> Preferences -> Internet, and set" - ewarn "the libgtkembedmoz directory to /usr/lib/mozilla-firefox, then" - ewarn "close and restart acroread." + 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 } 1.102 app-text/acroread/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.102&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.102&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?r1=1.101&r2=1.102 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- ChangeLog 27 Sep 2007 21:13:17 -0000 1.101 +++ ChangeLog 28 Sep 2007 18:05:43 -0000 1.102 @@ -1,6 +1,10 @@ # ChangeLog for app-text/acroread # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.101 2007/09/27 21:13:17 kevquinn Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.102 2007/09/28 18:05:43 kevquinn Exp $ + + 28 Sep 2007; Kevin F. Quinn acroread-8.1.1.ebuild: + Use XULRunner if available; also set /etc/gre.d/gre.conf for mozilla-firefox + so that acroread can find libgtkembedmoz.so without setting preferences. *acroread-8.1.1 (27 Sep 2007) -- gentoo-commits@gentoo.org mailing list