1 |
lack 09/02/26 14:00:56 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
netscape-flash-10.0.22.87.ebuild |
5 |
Log: |
6 |
Added new '32-bit' local USE flag which specifies whether amd64-multilib platforms get both 32- and 64-bit plugins, or just the 64-bit one. |
7 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 net-www/netscape-flash/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/metadata.xml?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/metadata.xml?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/metadata.xml?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-www/netscape-flash/metadata.xml,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- metadata.xml 19 Jul 2007 16:48:16 -0000 1.2 |
23 |
+++ metadata.xml 26 Feb 2009 14:00:56 -0000 1.3 |
24 |
@@ -6,4 +6,8 @@ |
25 |
<email>lack@g.o</email> |
26 |
<name>Jim Ramsay</name> |
27 |
</maintainer> |
28 |
+ <use> |
29 |
+ <flag name='32bit'>For amd64-multilib, installs the 32-bit plugin |
30 |
+ alongside the native 64-bit plugin</flag> |
31 |
+ </use> |
32 |
</pkgmetadata> |
33 |
|
34 |
|
35 |
|
36 |
1.90 net-www/netscape-flash/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/ChangeLog?rev=1.90&view=markup |
39 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/ChangeLog?rev=1.90&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/ChangeLog?r1=1.89&r2=1.90 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v |
45 |
retrieving revision 1.89 |
46 |
retrieving revision 1.90 |
47 |
diff -u -r1.89 -r1.90 |
48 |
--- ChangeLog 25 Feb 2009 19:41:34 -0000 1.89 |
49 |
+++ ChangeLog 26 Feb 2009 14:00:56 -0000 1.90 |
50 |
@@ -1,6 +1,11 @@ |
51 |
# ChangeLog for net-www/netscape-flash |
52 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.89 2009/02/25 19:41:34 lack Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.90 2009/02/26 14:00:56 lack Exp $ |
55 |
+ |
56 |
+ 26 Feb 2009; Jim Ramsay <lack@g.o> metadata.xml, |
57 |
+ netscape-flash-10.0.22.87.ebuild: |
58 |
+ Added new '32-bit' local USE flag which specifies whether amd64-multilib |
59 |
+ platforms get both 32- and 64-bit plugins, or just the 64-bit one. |
60 |
|
61 |
*netscape-flash-9.0.159.0 (25 Feb 2009) |
62 |
|
63 |
|
64 |
|
65 |
|
66 |
1.2 net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild |
67 |
|
68 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild?rev=1.2&view=markup |
69 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild?rev=1.2&content-type=text/plain |
70 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild?r1=1.1&r2=1.2 |
71 |
|
72 |
Index: netscape-flash-10.0.22.87.ebuild |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild,v |
75 |
retrieving revision 1.1 |
76 |
retrieving revision 1.2 |
77 |
diff -u -r1.1 -r1.2 |
78 |
--- netscape-flash-10.0.22.87.ebuild 25 Feb 2009 19:32:09 -0000 1.1 |
79 |
+++ netscape-flash-10.0.22.87.ebuild 26 Feb 2009 14:00:56 -0000 1.2 |
80 |
@@ -1,6 +1,6 @@ |
81 |
# Copyright 1999-2009 Gentoo Foundation |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild,v 1.1 2009/02/25 19:32:09 lack Exp $ |
84 |
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-10.0.22.87.ebuild,v 1.2 2009/02/26 14:00:56 lack Exp $ |
85 |
|
86 |
EAPI=1 |
87 |
inherit nsplugins rpm multilib |
88 |
@@ -11,10 +11,12 @@ |
89 |
DESCRIPTION="Adobe Flash Player" |
90 |
SRC_URI="x86? ( ${MY_32B_URI} ) |
91 |
amd64? ( ${MY_64B_URI} |
92 |
- multilib? ( ${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2 ) |
93 |
+ multilib? ( 32bit? ( |
94 |
+ ${MY_32B_URI} mirror://gentoo/flash-libcompat-0.2.tar.bz2 |
95 |
+ ) ) |
96 |
)" |
97 |
HOMEPAGE="http://www.adobe.com/" |
98 |
-IUSE="multilib" |
99 |
+IUSE="multilib +32bit" |
100 |
SLOT="0" |
101 |
|
102 |
KEYWORDS="-* ~amd64 ~x86" |
103 |
@@ -30,12 +32,12 @@ |
104 |
>=sys-libs/glibc-2.4 |
105 |
|| ( media-fonts/freefont-ttf media-fonts/corefonts ) |
106 |
amd64? ( |
107 |
- multilib? ( |
108 |
+ multilib? ( 32bit? ( |
109 |
app-emulation/emul-linux-x86-baselibs |
110 |
app-emulation/emul-linux-x86-gtklibs |
111 |
app-emulation/emul-linux-x86-soundlibs |
112 |
app-emulation/emul-linux-x86-xlibs |
113 |
- ) |
114 |
+ ) ) |
115 |
) |
116 |
" |
117 |
|
118 |
@@ -59,7 +61,7 @@ |
119 |
# 64b tarball has no readme file. |
120 |
use x86 && dodoc "${S}/usr/share/doc/flash-plugin-${PV}/readme.txt" |
121 |
|
122 |
- if use amd64 && has_multilib_profile; then |
123 |
+ if use amd64 && has_multilib_profile && use 32bit; then |
124 |
oldabi="${ABI}" |
125 |
ABI="x86" |