1 |
commit: 2ddac07f7d84b23d01f9d883d95c35500af64112 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 20 23:30:12 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 1 12:27:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddac07f |
7 |
|
8 |
profiles: Move amd64-specific masks to amd64 where they belong |
9 |
|
10 |
Move the amd64-specific masks from features/64bit-native to |
11 |
arch/amd64/no-multilib. There is no reason to apply them to non-x86 |
12 |
architectures really. NFC, confirmed with profile-dumper. |
13 |
|
14 |
profiles/arch/amd64/no-multilib/package.mask | 15 +++ |
15 |
profiles/arch/amd64/no-multilib/package.use.mask | 10 +- |
16 |
profiles/features/64bit-native/package.mask | 150 ----------------------- |
17 |
profiles/features/64bit-native/package.use.mask | 23 ---- |
18 |
profiles/features/64bit-native/use.mask | 18 +-- |
19 |
5 files changed, 25 insertions(+), 191 deletions(-) |
20 |
|
21 |
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask |
22 |
index 3e615cc..2aa8bca 100644 |
23 |
--- a/profiles/arch/amd64/no-multilib/package.mask |
24 |
+++ b/profiles/arch/amd64/no-multilib/package.mask |
25 |
@@ -2,6 +2,18 @@ |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
# $Id$ |
28 |
|
29 |
+# James Le Cuirot <chewi@g.o> (13 Aug 2016) |
30 |
+# Steam requires amd64 multilib. These are steam-overlay packages. |
31 |
+dev-util/adobe-air-runtime |
32 |
+games-util/steam-client-meta |
33 |
+games-util/steam-games-meta |
34 |
+games-util/steam-launcher |
35 |
+games-util/steam-meta |
36 |
+ |
37 |
+# Andreas K. Huettel <dilfridge@g.o> |
38 |
+# Novell Groupwise Client sadly needs a 32bit java vm (bundled) |
39 |
+mail-client/novell-groupwise-client |
40 |
+ |
41 |
# AMD64 Team <amd64@g.o> |
42 |
# Mask packages that rely on amd64 multilib |
43 |
=app-editors/emacs-18* |
44 |
@@ -26,6 +38,7 @@ dev-lang/idb |
45 |
dev-lang/ifc |
46 |
dev-perl/Archive-Rar |
47 |
dev-python/skype4py |
48 |
+dev-util/android-ndk |
49 |
dev-util/android-sdk-update-manager |
50 |
dev-util/android-studio |
51 |
dev-util/biew |
52 |
@@ -38,6 +51,7 @@ games-action/heretic2 |
53 |
games-action/heretic2-demo |
54 |
games-action/hotline-miami |
55 |
games-action/intrusion2 |
56 |
+games-action/lugaru |
57 |
games-action/mutantstorm-demo |
58 |
games-action/phobiaii |
59 |
games-action/rune |
60 |
@@ -116,6 +130,7 @@ games-rpg/nwn-data |
61 |
games-rpg/nwn-penultima |
62 |
games-rpg/nwn-penultimarerolled |
63 |
games-rpg/nwn-shadowlordsdreamcatcherdemon |
64 |
+games-rpg/penumbra-collection |
65 |
games-rpg/wasteland2 |
66 |
games-server/etqw-ded |
67 |
games-server/nwn-ded |
68 |
|
69 |
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask |
70 |
index 705dbb6..c97f8e7 100644 |
71 |
--- a/profiles/arch/amd64/no-multilib/package.use.mask |
72 |
+++ b/profiles/arch/amd64/no-multilib/package.use.mask |
73 |
@@ -1,7 +1,11 @@ |
74 |
-# Copyright 1999-2015 Gentoo Foundation |
75 |
+# Copyright 1999-2017 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
# $Id$ |
78 |
|
79 |
+# Mike Frysinger <vapier@g.o> (12 Aug 2016) |
80 |
+# Requires sys-boot/grub:0 which is masked here. |
81 |
+sys-apps/memtest86+ floppy |
82 |
+ |
83 |
# Alexandre Rostovtsev <tetromino@g.o> (24 Jun 2012) |
84 |
# Disable 32-bit parts of wine, bug #351436 |
85 |
app-emulation/wine mono |
86 |
@@ -20,3 +24,7 @@ net-im/skype apulse |
87 |
# Tim Harder <radhermit@g.o> (17 Jan 2016) |
88 |
# Skype requires multilib support |
89 |
net-im/bitlbee skype |
90 |
+ |
91 |
+# Alexis Ballier <aballier@g.o> (13 Aug 2009) |
92 |
+# Requires wine |
93 |
+media-sound/lmms vst |
94 |
|
95 |
diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask |
96 |
deleted file mode 100644 |
97 |
index 05215b1..00000000 |
98 |
--- a/profiles/features/64bit-native/package.mask |
99 |
+++ /dev/null |
100 |
@@ -1,150 +0,0 @@ |
101 |
-# Copyright 1999-2017 Gentoo Foundation |
102 |
-# Distributed under the terms of the GNU General Public License v2 |
103 |
-# $Id$ |
104 |
- |
105 |
-# James Le Cuirot <chewi@g.o> (13 Aug 2016) |
106 |
-# Steam requires amd64 multilib. These are steam-overlay packages. |
107 |
-dev-util/adobe-air-runtime |
108 |
-games-util/steam-client-meta |
109 |
-games-util/steam-games-meta |
110 |
-games-util/steam-launcher |
111 |
-games-util/steam-meta |
112 |
- |
113 |
-# Andreas K. Huettel <dilfridge@g.o> |
114 |
-# Novell Groupwise Client sadly needs a 32bit java vm (bundled) |
115 |
-mail-client/novell-groupwise-client |
116 |
- |
117 |
-# AMD64 Team <amd64@g.o> |
118 |
-# Mask packages that rely on amd64 multilib |
119 |
-app-accessibility/mbrola |
120 |
-app-accessibility/perlbox-voice |
121 |
-app-arch/stuffit |
122 |
-app-benchmarks/cpuburn |
123 |
-=app-editors/emacs-18* |
124 |
-app-emulation/crossover-bin |
125 |
-app-emulation/crossover-office-bin |
126 |
-app-emulation/crossover-office-pro-bin |
127 |
-app-emulation/playonlinux |
128 |
-app-emulation/q4wine |
129 |
->=app-i18n/atokx3-3.0.0 |
130 |
-app-office/ooextras |
131 |
-app-emulation/winetricks |
132 |
-app-text/acroread |
133 |
-dev-embedded/libftd2xx |
134 |
-dev-embedded/openocd |
135 |
-dev-lang/icc |
136 |
-dev-lang/idb |
137 |
-dev-lang/ifc |
138 |
-dev-perl/Archive-Rar |
139 |
-dev-python/skype4py |
140 |
-dev-util/android-sdk-update-manager |
141 |
-dev-util/android-ndk |
142 |
-dev-util/biew |
143 |
-games-action/cs2d |
144 |
-games-action/descent3 |
145 |
-games-action/descent3-demo |
146 |
-games-action/heretic2 |
147 |
-games-action/heretic2-demo |
148 |
-games-action/lugaru |
149 |
-games-action/mutantstorm-demo |
150 |
-games-action/phobiaii |
151 |
-games-action/rune |
152 |
-games-action/spacetripper-demo |
153 |
-games-arcade/aquaria |
154 |
-games-arcade/barbarian-bin |
155 |
-games-arcade/jardinains |
156 |
-games-arcade/gish-demo |
157 |
-games-emulation/caps |
158 |
-games-emulation/nestra |
159 |
-games-emulation/zinc |
160 |
-games-emulation/zsnes |
161 |
-games-fps/avp |
162 |
-games-fps/doom3-cdoom |
163 |
-games-fps/doom3-chextrek |
164 |
-games-fps/doom3-data |
165 |
-games-fps/doom3-demo |
166 |
-games-fps/doom3-ducttape |
167 |
-games-fps/doom3-eventhorizon |
168 |
-games-fps/doom3-hellcampaign |
169 |
-games-fps/doom3-inhell |
170 |
-games-fps/doom3-lms |
171 |
-games-fps/doom3-mitm |
172 |
-games-fps/doom3-roe |
173 |
-games-fps/doom3 |
174 |
-games-fps/enemy-territory-etpro |
175 |
-games-fps/enemy-territory-omnibot |
176 |
-games-fps/enemy-territory-truecombat |
177 |
-games-fps/enemy-territory |
178 |
-games-fps/etqw-bin |
179 |
-games-fps/etqw-data |
180 |
-games-fps/etqw-demo |
181 |
-games-fps/glxquake-bin |
182 |
-games-fps/legends |
183 |
-games-fps/postal2 |
184 |
-games-fps/postal2mp-demo |
185 |
-games-fps/quake3-bin |
186 |
-games-fps/quake3-demo |
187 |
-games-fps/quake3-ra3 |
188 |
-games-fps/quake4-bin |
189 |
-games-fps/quake4-data |
190 |
-games-fps/quake4-demo |
191 |
-games-fps/rtcw |
192 |
-games-fps/rtcwmp-demo |
193 |
-games-fps/rtcwsp-demo |
194 |
-games-fps/sauerbraten |
195 |
-games-fps/serious-sam-tfe |
196 |
-games-fps/serious-sam-tse |
197 |
-games-fps/soldieroffortune |
198 |
-games-fps/soldieroffortune-demo |
199 |
-games-fps/unreal-tournament |
200 |
-games-fps/ut2003 |
201 |
-games-fps/ut2003-demo |
202 |
-games-fps/ut2004-demo |
203 |
-games-puzzle/hoh-bin |
204 |
-games-roguelike/adom |
205 |
-games-rpg/eschalon-book-1-demo |
206 |
-games-rpg/nwmouse |
207 |
-games-rpg/nwmovies |
208 |
-games-rpg/nwn |
209 |
-games-rpg/nwn-cep |
210 |
-games-rpg/nwn-data |
211 |
-games-rpg/nwn-penultima |
212 |
-games-rpg/nwn-penultimarerolled |
213 |
-games-rpg/nwn-shadowlordsdreamcatcherdemon |
214 |
-games-rpg/penumbra-collection |
215 |
-games-server/etqw-ded |
216 |
-games-server/nwn-ded |
217 |
-games-server/ut2003-ded |
218 |
-games-simulation/bcs-demo |
219 |
-games-strategy/darwinia |
220 |
-games-strategy/darwinia-demo |
221 |
-games-strategy/defcon-demo |
222 |
-games-strategy/dominions2 |
223 |
-games-strategy/heroes3 |
224 |
-games-strategy/heroes3-demo |
225 |
-games-strategy/majesty-demo |
226 |
-games-strategy/smac |
227 |
-games-strategy/spaz |
228 |
-media-fonts/acroread-asianfonts |
229 |
-media-sound/ventrilo-server-bin |
230 |
-media-video/binkplayer |
231 |
-media-video/tsmuxer |
232 |
-net-im/skype |
233 |
-net-im/skypetab-ng |
234 |
-net-print/cndrvcups-common-lb |
235 |
-net-print/cndrvcups-lb |
236 |
-net-misc/icaclient |
237 |
-net-misc/ps3mediaserver |
238 |
-sci-biology/foldingathome |
239 |
-sci-electronics/eagle |
240 |
-sci-chemistry/cara-bin |
241 |
-sci-chemistry/cyana |
242 |
-sci-chemistry/icm |
243 |
-sci-chemistry/mars |
244 |
-sci-libs/ipp |
245 |
-sys-libs/lib-compat-loki |
246 |
-www-plugins/nspluginwrapper |
247 |
- |
248 |
-# AMD64 Team; <amd64@g.o> |
249 |
-# grub-1 is not available on no-multilib-profiles; |
250 |
-<sys-boot/grub-1.99 |
251 |
|
252 |
diff --git a/profiles/features/64bit-native/package.use.mask b/profiles/features/64bit-native/package.use.mask |
253 |
deleted file mode 100644 |
254 |
index c778ad6..00000000 |
255 |
--- a/profiles/features/64bit-native/package.use.mask |
256 |
+++ /dev/null |
257 |
@@ -1,23 +0,0 @@ |
258 |
-# Copyright 1999-2015 Gentoo Foundation |
259 |
-# Distributed under the terms of the GNU General Public License v2 |
260 |
-# $Id$ |
261 |
- |
262 |
-# Mike Frysinger <vapier@g.o> (12 Aug 2016) |
263 |
-# Requires sys-boot/grub:0 which is masked here. |
264 |
-sys-apps/memtest86+ floppy |
265 |
- |
266 |
-# Alexandre Rostovtsev <tetromino@g.o> (04 Jul 2012) |
267 |
-# Disable 32-bit parts of wine, bug #351436 |
268 |
-app-emulation/wine mono |
269 |
- |
270 |
-# Apr 28, 2008 Sébastien Fabbro <bicatali@g.o> |
271 |
-# ifc masked |
272 |
-sci-libs/acml ifc |
273 |
- |
274 |
-# Alexis Ballier <aballier@g.o> (13 Aug 2009) |
275 |
-# Requires wine |
276 |
-media-sound/lmms vst |
277 |
- |
278 |
-# Tomas Chvatal <scarabeus@g.o> (13 Nov 2014) |
279 |
-# The apulse is 32b used there only |
280 |
-net-im/skype apulse |
281 |
|
282 |
diff --git a/profiles/features/64bit-native/use.mask b/profiles/features/64bit-native/use.mask |
283 |
index 6ad7395..25c2457 100644 |
284 |
--- a/profiles/features/64bit-native/use.mask |
285 |
+++ b/profiles/features/64bit-native/use.mask |
286 |
@@ -1,25 +1,9 @@ |
287 |
-# Copyright 1999-2013 Gentoo Foundation |
288 |
+# Copyright 1999-2017 Gentoo Foundation |
289 |
# Distributed under the terms of the GNU General Public License v2 |
290 |
# $Id$ |
291 |
|
292 |
# USE flags masked because providing packages require a 32-bit ABI |
293 |
|
294 |
-# 2007/08/29 Christoph Mende <angelos@g.o> |
295 |
-# app-accessibility/mbrola is x86 only |
296 |
-mbrola |
297 |
- |
298 |
-# 2007/08/24 Michael Marineau <marineam@g.o> |
299 |
-# Xen HVM support requires building 32-bit binaries. |
300 |
-hvm |
301 |
- |
302 |
# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o> |
303 |
# Mask multilib, since we cannot use it. |
304 |
multilib |
305 |
- |
306 |
-# 2009/05/11 Doug Goldstein <cardoe@g.o> |
307 |
-# Mask 32bit since this will always require emulation packages |
308 |
-32bit |
309 |
- |
310 |
-# Michał Górny <mgorny@g.o> (26 Jan 2013) |
311 |
-# Mask the multilib flags back for non-multilib profile. |
312 |
-abi_x86_32 |