Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jim Ramsay (lack)" <lack@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: ChangeLog adobe-flash-10.2.161.23_pre20100927.ebuild
Date: Sat, 09 Oct 2010 20:04:30
Message-Id: 20101009195019.17AE52004C@flycatcher.gentoo.org
1 lack 10/10/09 19:50:19
2
3 Modified: ChangeLog
4 adobe-flash-10.2.161.23_pre20100927.ebuild
5 Log:
6 Fixed some logic and messages in pkg_postinst, thanks to report in Bug #338050
7
8 (Portage version: 2.1.9.14/cvs/Linux i686)
9
10 Revision Changes Path
11 1.50 www-plugins/adobe-flash/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.50&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.50&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.49&r2=1.50
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
20 retrieving revision 1.49
21 retrieving revision 1.50
22 diff -u -r1.49 -r1.50
23 --- ChangeLog 9 Oct 2010 19:31:40 -0000 1.49
24 +++ ChangeLog 9 Oct 2010 19:50:18 -0000 1.50
25 @@ -1,6 +1,11 @@
26 # ChangeLog for www-plugins/adobe-flash
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.49 2010/10/09 19:31:40 lack Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.50 2010/10/09 19:50:18 lack Exp $
30 +
31 + 09 Oct 2010; Jim Ramsay <lack@g.o>
32 + adobe-flash-10.2.161.23_pre20100927.ebuild:
33 + Fixed some logic and messages in pkg_postinst, thanks to report in Bug
34 + #338050
35
36 *adobe-flash-10.2.161.23_pre20100927 (09 Oct 2010)
37
38
39
40
41 1.2 www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild?rev=1.2&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild?rev=1.2&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild?r1=1.1&r2=1.2
46
47 Index: adobe-flash-10.2.161.23_pre20100927.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild,v
50 retrieving revision 1.1
51 retrieving revision 1.2
52 diff -u -r1.1 -r1.2
53 --- adobe-flash-10.2.161.23_pre20100927.ebuild 9 Oct 2010 19:31:40 -0000 1.1
54 +++ adobe-flash-10.2.161.23_pre20100927.ebuild 9 Oct 2010 19:50:18 -0000 1.2
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild,v 1.1 2010/10/09 19:31:40 lack Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.2.161.23_pre20100927.ebuild,v 1.2 2010/10/09 19:50:18 lack Exp $
60
61 EAPI=3
62 inherit nsplugins multilib toolchain-funcs versionator
63 @@ -85,17 +85,16 @@
64 fi
65
66 if use multilib && ! use 32bit && ! use 64bit; then
67 - eerror "You must select at least one library USE flag (32bit or 64bit)"
68 + eerror "You must select at least one architecture USE flag (32bit or 64bit)"
69 die "No library version selected [-32bit -64bit]"
70 fi
71
72 + unset need_lahf_wrapper
73 if [[ $native_install ]]; then
74 # 64bit flash requires the 'lahf' instruction (bug #268336)
75 # Also, check if *any* of the processors are affected (bug #286159)
76 if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
77 export need_lahf_wrapper=1
78 - else
79 - unset need_lahf_wrapper
80 fi
81 fi
82 fi
83 @@ -161,6 +160,14 @@
84
85 pkg_postinst() {
86 if use amd64; then
87 + if [[ $need_lahf_wrapper ]]; then
88 + ewarn "Your processor does not support the 'lahf' instruction which is used"
89 + ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
90 + ewarn "should allow this plugin to run. If you encounter problems, please"
91 + ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
92 + ewarn " ${CATEGORY}/$PN[+32bit -64bit]"
93 + elog
94 + fi
95 if has_version 'www-plugins/nspluginwrapper'; then
96 if [[ $native_install ]]; then
97 # TODO: Perhaps parse the output of 'nspluginwrapper -l'
98 @@ -171,27 +178,13 @@
99 einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
100 nspluginwrapper -r "${FLASH_WRAPPER}"
101 fi
102 - if [[ $need_lahf_wrapper ]]; then
103 - ewarn "Your processor does not support the 'lahf' instruction which is used"
104 - ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
105 - ewarn "should allow this plugin to run. If you encounter problems, please"
106 - ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
107 - ewarn " ${CATEGORY}/$PN[+32bit -64bit]"
108 - elog
109 - fi
110 - fi
111 - if [[ $amd64_32bit ]]; then
112 + else
113 einfo "nspluginwrapper detected: Installing plugin wrapper"
114 local oldabi="${ABI}"
115 ABI="x86"
116 local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
117 nspluginwrapper -i "${FLASH_SOURCE}"
118 ABI="${oldabi}"
119 - ewarn "Using adobe-flash-10.1 in a 64-bit browser is unstable:"
120 - ewarn " http://bugs.gentoo.org/324365"
121 - ewarn "The recommended configuration is to use the 32-bit plugin"
122 - ewarn "in a 32-bit browser such as www-client/firefox-bin"
123 - elog
124 fi
125 elif [[ ! $native_install ]]; then
126 elog "To use the 32-bit flash player in a native 64-bit browser,"
Report Message
Find on MARC Find on Google Groups