* [gentoo-commits] gentoo-x86 commit in app-text/acroread: acroread-8.1.1.ebuild ChangeLog
@ 2007-09-28 18:05 Kevin F. Quinn (kevquinn)
0 siblings, 0 replies; 2+ messages in thread
From: Kevin F. Quinn (kevquinn) @ 2007-09-28 18:05 UTC (permalink / raw
To: gentoo-commits
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 <kevquinn@gentoo.org> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/acroread: acroread-8.1.1.ebuild ChangeLog
@ 2008-01-14 23:24 Timo Gurr (tgurr)
0 siblings, 0 replies; 2+ messages in thread
From: Timo Gurr (tgurr) @ 2008-01-14 23:24 UTC (permalink / raw
To: gentoo-commits
tgurr 08/01/14 23:24:05
Modified: acroread-8.1.1.ebuild ChangeLog
Log:
Enable more languages, fix some quoting. Still more work on it needed though.
(Portage version: 2.1.4)
Revision Changes Path
1.4 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.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild?r1=1.3&r2=1.4
Index: acroread-8.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- acroread-8.1.1.ebuild 28 Sep 2007 18:05:43 -0000 1.3
+++ acroread-8.1.1.ebuild 14 Jan 2008 23:24:05 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.3 2007/09/28 18:05:43 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-8.1.1.ebuild,v 1.4 2008/01/14 23:24:05 tgurr Exp $
inherit eutils nsplugins
@@ -11,9 +11,7 @@
SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}"
SRC_FOOT="-${PV}-1.i486.tar.bz2"
-#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"
-LINGUA_LIST="en:enu"
-SRC_URI=
+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/:*}"
@@ -56,7 +54,7 @@
INSTALLDIR=/opt/Adobe
-S=${WORKDIR}/AdobeReader
+S="${WORKDIR}/AdobeReader"
# Actually, ahv segfaults when run standalone so presumably
# it isn't intended for direct use - so the only launcher is
@@ -91,9 +89,9 @@
# Unpack all into the same place; overwrite common files.
fl=""
for pkg in ${A}; do
- cd ${WORKDIR}
+ cd "${WORKDIR}"
unpack ${pkg}
- cd ${S}
+ cd "${S}"
if [[ ${pkg} =~ ^AdobeReader_ ]]; then
tar xf ILINXR.TAR ||
die "Failed to unpack ILINXR.TAR; is distfile corrupt?"
@@ -173,7 +171,7 @@
dodir /opt
chown -R --dereference -L root:0 Adobe
- cp -dpR Adobe ${D}opt/
+ 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.
@@ -188,14 +186,14 @@
fi
if ! use ldap ; then
- rm ${D}${INSTALLDIR}/Reader8/Reader/intellinux/plug_ins/PPKLite.api
+ rm "${D}"${INSTALLDIR}/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
+ mv "${WORKDIR}"/libcups.so-i386 "${WORKDIR}"/libcups.so.2
exeinto ${INSTALLDIR}/Reader8/Reader/intellinux/lib
- doexe ${WORKDIR}/libcups.so.2
+ doexe "${WORKDIR}"/libcups.so.2
dosym libcups.so.2 ${INSTALLDIR}/Reader8/Reader/intellinux/lib/libcups.so
fi
@@ -218,8 +216,8 @@
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"
+ 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
1.103 app-text/acroread/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?r1=1.102&r2=1.103
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog 28 Sep 2007 18:05:43 -0000 1.102
+++ ChangeLog 14 Jan 2008 23:24:05 -0000 1.103
@@ -1,6 +1,9 @@
# 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.102 2007/09/28 18:05:43 kevquinn Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.103 2008/01/14 23:24:05 tgurr Exp $
+
+ 14 Jan 2008; Timo Gurr <tgurr@gentoo.org> acroread-8.1.1.ebuild:
+ Enable more languages, fix some quoting. Still more work on it needed though.
28 Sep 2007; Kevin F. Quinn <kevquinn@gentoo.org> acroread-8.1.1.ebuild:
Use XULRunner if available; also set /etc/gre.d/gre.conf for mozilla-firefox
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-14 23:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-28 18:05 [gentoo-commits] gentoo-x86 commit in app-text/acroread: acroread-8.1.1.ebuild ChangeLog Kevin F. Quinn (kevquinn)
-- strict thread matches above, loose matches on Subject: below --
2008-01-14 23:24 Timo Gurr (tgurr)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox