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