1 |
tgurr 08/01/30 20:31:14 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: acroread-8.1.1-r2.ebuild |
5 |
Log: |
6 |
Add acroread-8.1.1-r2.ebuild, providing working amd64 dependencies. Also fixing bug #206554. |
7 |
(Portage version: 2.1.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.105 app-text/acroread/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.105&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?rev=1.105&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/ChangeLog?r1=1.104&r2=1.105 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v |
19 |
retrieving revision 1.104 |
20 |
retrieving revision 1.105 |
21 |
diff -u -r1.104 -r1.105 |
22 |
--- ChangeLog 18 Jan 2008 03:03:19 -0000 1.104 |
23 |
+++ ChangeLog 30 Jan 2008 20:31:13 -0000 1.105 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for app-text/acroread |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.104 2008/01/18 03:03:19 tgurr Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.105 2008/01/30 20:31:13 tgurr Exp $ |
29 |
+ |
30 |
+*acroread-8.1.1-r2 (30 Jan 2008) |
31 |
+ |
32 |
+ 30 Jan 2008; Timo Gurr <tgurr@g.o> metadata.xml, |
33 |
+ +acroread-8.1.1-r2.ebuild: |
34 |
+ Add acroread-8.1.1-r2.ebuild, providing working amd64 dependencies. Also |
35 |
+ fixing bug #206554. |
36 |
|
37 |
*acroread-8.1.1-r1 (18 Jan 2008) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.5 app-text/acroread/metadata.xml |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/metadata.xml?rev=1.5&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/metadata.xml?rev=1.5&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/metadata.xml?r1=1.4&r2=1.5 |
47 |
|
48 |
Index: metadata.xml |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/app-text/acroread/metadata.xml,v |
51 |
retrieving revision 1.4 |
52 |
retrieving revision 1.5 |
53 |
diff -u -r1.4 -r1.5 |
54 |
--- metadata.xml 27 Mar 2007 10:00:59 -0000 1.4 |
55 |
+++ metadata.xml 30 Jan 2008 20:31:13 -0000 1.5 |
56 |
@@ -2,9 +2,4 @@ |
57 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
58 |
<pkgmetadata> |
59 |
<herd>printing</herd> |
60 |
-<maintainer> |
61 |
- <email>kevquinn@g.o</email> |
62 |
- <name>Kevin F. Quinn</name> |
63 |
- <description>Backup maintainer :)</description> |
64 |
-</maintainer> |
65 |
</pkgmetadata> |
66 |
|
67 |
|
68 |
|
69 |
1.1 app-text/acroread/acroread-8.1.1-r2.ebuild |
70 |
|
71 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1-r2.ebuild?rev=1.1&view=markup |
72 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/acroread/acroread-8.1.1-r2.ebuild?rev=1.1&content-type=text/plain |
73 |
|
74 |
Index: acroread-8.1.1-r2.ebuild |
75 |
=================================================================== |
76 |
# Copyright 1999-2008 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
# $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 $ |
79 |
|
80 |
inherit eutils nsplugins |
81 |
|
82 |
DESCRIPTION="Adobe's PDF reader" |
83 |
HOMEPAGE="http://www.adobe.com/products/acrobat/" |
84 |
IUSE="cups ldap nsplugin" |
85 |
|
86 |
SRC_HEAD="http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PV}" |
87 |
SRC_FOOT="-${PV}-1.i486.tar.bz2" |
88 |
|
89 |
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" |
90 |
DEFAULT_URI="${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT}" |
91 |
for ll in ${LINGUA_LIST} ; do |
92 |
iuse_l="linguas_${ll/:*}" |
93 |
src_l=${ll/*:} |
94 |
IUSE="${IUSE} ${iuse_l}" |
95 |
DEFAULT_URI="!${iuse_l}? ( ${DEFAULT_URI} )" |
96 |
SRC_URI="${SRC_URI} |
97 |
${iuse_l}? ( ${SRC_HEAD}/${src_l}/AdobeReader_${src_l}${SRC_FOOT} )" |
98 |
done |
99 |
SRC_URI="${SRC_URI} |
100 |
${DEFAULT_URI} |
101 |
x86? ( !cups? ( mirror://gentoo/libcups.so-i386.bz2 ) )" |
102 |
|
103 |
LICENSE="Adobe" |
104 |
SLOT="0" |
105 |
KEYWORDS="-* ~amd64 ~x86" |
106 |
RESTRICT="strip mirror" |
107 |
|
108 |
# Needs libgtkembedmoz.so, which can come from xulrunner, mozilla-firefox or |
109 |
# seamonkey. In the case of mozilla-firefox and seamonkey, we need to create |
110 |
# /etc/gre.d/gre.conf with GRE_PATH set. On amd64 currently only seamonkey-bin |
111 |
# provides a 32bit libgtkembedmoz.so. |
112 |
RDEPEND="x86? ( >=x11-libs/gtk+-2.0 |
113 |
cups? ( net-print/cups ) |
114 |
ldap? ( net-nds/openldap ) |
115 |
|| ( net-libs/xulrunner |
116 |
www-client/mozilla-firefox |
117 |
www-client/seamonkey |
118 |
www-client/seamonkey-bin ) ) |
119 |
amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.4.2 |
120 |
>=app-emulation/emul-linux-x86-gtklibs-2.0 |
121 |
>=www-client/seamonkey-bin-1.1.7 )" |
122 |
QA_TEXTRELS="opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api |
123 |
opt/Adobe/Reader8/Browser/intellinux/nppdf.so |
124 |
opt/netscape/plugins/nppdf.so" |
125 |
QA_EXECSTACK="opt/Adobe/Reader8/Reader/intellinux/plug_ins/Annots.api |
126 |
opt/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api |
127 |
opt/Adobe/Reader8/Reader/intellinux/bin/acroread |
128 |
opt/Adobe/Reader8/Reader/intellinux/bin/SynchronizerApp-binary |
129 |
opt/Adobe/Reader8/Reader/intellinux/lib/libsccore.so |
130 |
opt/Adobe/Reader8/Reader/intellinux/lib/libcrypto.so.0.9.7" |
131 |
|
132 |
INSTALLDIR=/opt |
133 |
|
134 |
S="${WORKDIR}/AdobeReader" |
135 |
|
136 |
# Actually, ahv segfaults when run standalone so presumably |
137 |
# it isn't intended for direct use - so the only launcher is |
138 |
# acroread after all. |
139 |
LAUNCHERS="Adobe/Reader8/bin/acroread" |
140 |
# Adobe/HelpViewer/1.0/intellinux/bin/ahv" |
141 |
|
142 |
pkg_setup() { |
143 |
# x86 binary package, ABI=x86 |
144 |
# Danny van Dyk <kugelfang@g.o> 2005/03/25 |
145 |
has_multilib_profile && ABI="x86" |
146 |
} |
147 |
|
148 |
# Determine lingua from filename |
149 |
acroread_get_ll() { |
150 |
local f_src_l ll lingua src_l |
151 |
f_src_l=${1/${SRC_FOOT}} |
152 |
f_src_l=${f_src_l/*_} |
153 |
for ll in ${LINGUA_LIST} ; do |
154 |
lingua=${ll/:*} |
155 |
src_l=${ll/*:} |
156 |
if [[ ${src_l} == ${f_src_l} ]] ; then |
157 |
echo ${lingua} |
158 |
return |
159 |
fi |
160 |
done |
161 |
die "Failed to match file $1 to a LINGUA; please report" |
162 |
} |
163 |
|
164 |
src_unpack() { |
165 |
local ll linguas fl launcher |
166 |
# Unpack all into the same place; overwrite common files. |
167 |
fl="" |
168 |
for pkg in ${A} ; do |
169 |
cd "${WORKDIR}" |
170 |
unpack ${pkg} |
171 |
cd "${S}" |
172 |
if [[ ${pkg} =~ ^AdobeReader_ ]] ; then |
173 |
tar xf ILINXR.TAR || |
174 |
die "Failed to unpack ILINXR.TAR; is distfile corrupt?" |
175 |
tar xf COMMON.TAR || |
176 |
die "Failed to unpack COMMON.TAR; is distfile corrupt?" |
177 |
ll=$(acroread_get_ll ${pkg}) |
178 |
for launcher in ${LAUNCHERS} ; do |
179 |
mv ${launcher} ${launcher}.${ll} |
180 |
done |
181 |
if [[ -z ${fl} ]] ; then |
182 |
fl=${ll} |
183 |
linguas="${ll}" |
184 |
else |
185 |
linguas="${linguas} ${ll}" |
186 |
fi |
187 |
fi |
188 |
done |
189 |
if [[ ${linguas} == ${fl} ]] ; then |
190 |
# Only one lingua selected - skip building the wrappers |
191 |
for launcher in ${LAUNCHERS} ; do |
192 |
mv ${launcher}.${fl} ${launcher} || |
193 |
die "Failed to put ${launcher}.${fl} back to ${launcher}; please report" |
194 |
done |
195 |
else |
196 |
# Build wrappers. Launch the acroread for the environment variable |
197 |
# LANG (matched with a trailing * so that for example 'de_DE' matches |
198 |
# 'de', 'en_GB' matches 'en' etc). |
199 |
# |
200 |
# This is a bit premature at the moment on 8.1.1, for two reasons: |
201 |
# 1) The only language issued so far by Adobe is English, and the |
202 |
# provided launcher doesn't bring out its strings separately |
203 |
# (indicating internationalisation hasn't yet begin for 8.1.1) |
204 |
# 2) HelpViewer is new - I don't know if Adobe are likely to |
205 |
# internationalise it or not. |
206 |
for launcher in ${LAUNCHERS} ; do |
207 |
cat > ${launcher} <<-EOF |
208 |
#!/bin/bash |
209 |
# Copyright 1999-2007 Gentoo Foundation |
210 |
# Distributed under the terms of the GNU General Public License v2 |
211 |
# |
212 |
# Automatically generated by ${CATEGORY}/${PF} |
213 |
|
214 |
# Exec the acroread script for the language chosen in |
215 |
# LC_ALL/LC_MESSAGES/LANG (first found takes precedence, as in glibc) |
216 |
L=\${LC_ALL} |
217 |
L=\${L:-\${LC_MESSAGES}} |
218 |
L=\${L:-\${LANG}} |
219 |
case \${L} in |
220 |
EOF |
221 |
for ll in ${linguas} ; do |
222 |
echo "${ll}*) exec ${INSTALLDIR}/${launcher}.${ll} \"\$@\";;" >> ${launcher} |
223 |
done |
224 |
# default to English (in particualr for LANG=C) |
225 |
cat >> ${launcher} <<-EOF |
226 |
*) exec ${INSTALLDIR}/${launcher}.${fl} "\$@";; |
227 |
esac |
228 |
EOF |
229 |
chmod 755 ${launcher} |
230 |
done |
231 |
fi |
232 |
} |
233 |
|
234 |
src_install() { |
235 |
local dir |
236 |
|
237 |
# Install desktop files |
238 |
domenu Adobe/Reader8/Resource/Support |
239 |
# Install Icons - choose 48x48 since that's what the previous versions |
240 |
# supplied. |
241 |
doicon Adobe/Reader8/Resource/Icons/48x48 |
242 |
|
243 |
dodir /opt |
244 |
chown -R --dereference -L root:0 Adobe |
245 |
cp -dpR Adobe "${D}"opt/ |
246 |
|
247 |
# The Browser_Plugin_HowTo.txt is now in a subdirectory, which |
248 |
# is named according to the language the user is using. |
249 |
# Ie. for German, it is in a DEU directory. See bug #118015 |
250 |
dodoc Adobe/Reader8/Browser/HowTo/*/Browser_Plugin_HowTo.txt |
251 |
|
252 |
if use nsplugin ; then |
253 |
exeinto /opt/netscape/plugins |
254 |
doexe Adobe/Reader8/Browser/intellinux/nppdf.so |
255 |
inst_plugin /opt/netscape/plugins/nppdf.so |
256 |
fi |
257 |
|
258 |
if ! use ldap ; then |
259 |
rm "${D}"${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/plug_ins/PPKLite.api |
260 |
fi |
261 |
|
262 |
# libcups is needed for printing support (bug 118417) |
263 |
if use x86 && ! use cups ; then |
264 |
mv "${WORKDIR}"/libcups.so-i386 "${WORKDIR}"/libcups.so.2 |
265 |
exeinto ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib |
266 |
doexe "${WORKDIR}"/libcups.so.2 |
267 |
dosym libcups.so.2 ${INSTALLDIR}/Adobe/Reader8/Reader/intellinux/lib/libcups.so |
268 |
fi |
269 |
|
270 |
dodir /opt/bin |
271 |
for launcher in ${LAUNCHERS} ; do |
272 |
dosym /opt/${launcher} /opt/bin/${launcher/*bin\/} |
273 |
done |
274 |
} |
275 |
|
276 |
pkg_postinst () { |
277 |
local ll lc |
278 |
grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null |
279 |
if [[ $? != "0" ]] ; then |
280 |
if use x86 ; then |
281 |
for lib in /opt/seamonkey /usr/lib/seamonkey /usr/lib/mozilla-firefox ; do |
282 |
if [[ -f ${lib}/libgtkembedmoz.so ]] ; then |
283 |
mkdir -p /etc/gre.d |
284 |
cat > /etc/gre.d/gre.conf <<-EOF |
285 |
GRE_PATH=${lib} |
286 |
EOF |
287 |
elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found" |
288 |
elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf" |
289 |
break # don't search any more libraries |
290 |
fi |
291 |
done |
292 |
fi |
293 |
if use amd64 ; then |
294 |
for lib in /opt/seamonkey ; do |
295 |
if [[ -f ${lib}/libgtkembedmoz.so ]] ; then |
296 |
mkdir -p /etc/gre.d |
297 |
cat > /etc/gre.d/gre.conf <<-EOF |
298 |
GRE_PATH=${lib} |
299 |
EOF |
300 |
elog "Acrobat Reader depends on libgtkembedmoz.so, which I've found" |
301 |
elog "on your system in ${lib}, and configured in /etc/gre.d/gre.conf" |
302 |
break # don't search any more libraries |
303 |
fi |
304 |
done |
305 |
fi |
306 |
fi |
307 |
|
308 |
use ldap || |
309 |
elog "The Acrobat(TM) Security Plugin can be enabled with USE=ldap" |
310 |
|
311 |
use nsplugin || |
312 |
elog "The Acrobat(TM) Browser Plugin can be enabled with USE=nsplugin" |
313 |
|
314 |
lc=0 |
315 |
for ll in ${LINGUA_LIST} ; do |
316 |
use linguas_${ll/:*} && (( lc = ${lc} + 1 )) |
317 |
done |
318 |
if [[ ${lc} > 1 ]] ; then |
319 |
elog "Multiple languages have been installed, selected via a wrapper script." |
320 |
elog "The language is selected according to the LANG environment variable" |
321 |
elog "(defaulting to English if LANG is not set, or no matching language" |
322 |
elog "version is installed). Users may need to remove their preferences in" |
323 |
elog "~/.adobe to switch languages." |
324 |
fi |
325 |
|
326 |
grep -q GRE_PATH= /etc/gre.d/* 2> /dev/null |
327 |
if [[ $? != "0" ]] ; then |
328 |
ewarn "Acrobat Reader depends dynamically on libgtkembedmoz.so, which should" |
329 |
ewarn "come with Mozilla Firefox, XULRunner or Seamonkey, however it couldn't" |
330 |
ewarn "be found. The first time you start acroread, it will complain about this," |
331 |
ewarn "telling you to add the path to it to your preferences. Clear the error" |
332 |
ewarn "dialog, close the Beyond Acrobat Reader dialog, go to" |
333 |
ewarn "Edit -> Preferences -> Internet and set the libgtkembedmoz directory to" |
334 |
ewarn "the place where it exists, then close and restart acroread." |
335 |
fi |
336 |
} |
337 |
|
338 |
|
339 |
|
340 |
-- |
341 |
gentoo-commits@l.g.o mailing list |