1 |
commit: 4b04c56030a41d0809b63290f00f9eb864712566 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 21 16:51:11 2015 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 30 14:34:20 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b04c560 |
7 |
|
8 |
media-gfx/nvidia-cg-toolkit: drop unnecessary IUSE=multilib |
9 |
|
10 |
As nvidia-cg-toolkit has long been migrated to using abi_x86_* to handle |
11 |
multilib installation, and as there are actually very few things in the |
12 |
gentoo repo that need this package to be built with +abi_x86_32 on |
13 |
amd64 multilib systems, this commit drops the multilib flag from IUSE |
14 |
and removes the default-enabled abi_x86_32 flag from the multilib amd64 |
15 |
profile (which was there to prevent users on multilib profiles from needing |
16 |
to explicitly add it whenever they just wanted to emerge the package) |
17 |
|
18 |
Gentoo-Bug: 560868 |
19 |
|
20 |
Package-Manager: portage-2.2.20.1 |
21 |
|
22 |
.../nvidia-cg-toolkit-3.1.0013-r3.ebuild | 3 +-- |
23 |
...ebuild => nvidia-cg-toolkit-3.1.0013-r5.ebuild} | 29 +++++++--------------- |
24 |
profiles/arch/amd64/package.use | 1 - |
25 |
3 files changed, 10 insertions(+), 23 deletions(-) |
26 |
|
27 |
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild |
28 |
index 16db915..c7f829a 100644 |
29 |
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild |
30 |
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild |
31 |
@@ -23,9 +23,8 @@ SRC_URI=" |
32 |
LICENSE="NVIDIA-r1" |
33 |
SLOT="0" |
34 |
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
35 |
-IUSE="doc examples multilib" |
36 |
+IUSE="doc examples" |
37 |
|
38 |
-REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )" |
39 |
RESTRICT="strip" |
40 |
|
41 |
RDEPEND=" |
42 |
|
43 |
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild |
44 |
similarity index 82% |
45 |
rename from media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild |
46 |
rename to media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild |
47 |
index 69a5820..7307002 100644 |
48 |
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild |
49 |
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild |
50 |
@@ -26,32 +26,21 @@ SLOT="0" |
51 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
52 |
IUSE="doc examples multilib" |
53 |
|
54 |
-REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )" |
55 |
- |
56 |
RESTRICT="strip" |
57 |
|
58 |
RDEPEND=" |
59 |
- media-libs/glu |
60 |
- x11-libs/libICE |
61 |
- x11-libs/libSM |
62 |
- x11-libs/libX11 |
63 |
- x11-libs/libXext |
64 |
- x11-libs/libXi |
65 |
- x11-libs/libXmu |
66 |
- x11-libs/libXt |
67 |
- virtual/opengl |
68 |
+ >=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}] |
69 |
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] |
70 |
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] |
71 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
72 |
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
73 |
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
74 |
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] |
75 |
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] |
76 |
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
77 |
amd64? ( |
78 |
abi_x86_32? ( |
79 |
>=media-libs/freeglut-2.8.1[abi_x86_32(-)] |
80 |
- >=media-libs/glu-9.0.0-r1[abi_x86_32(-)] |
81 |
- >=virtual/opengl-7.0-r1[abi_x86_32(-)] |
82 |
- >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] |
83 |
- >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] |
84 |
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)] |
85 |
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)] |
86 |
- >=x11-libs/libXi-1.7.2[abi_x86_32(-)] |
87 |
- >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)] |
88 |
- >=x11-libs/libXt-1.1.4[abi_x86_32(-)] |
89 |
) |
90 |
)" |
91 |
DEPEND="" |
92 |
|
93 |
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use |
94 |
index 2c0a9b2..8450b57 100644 |
95 |
--- a/profiles/arch/amd64/package.use |
96 |
+++ b/profiles/arch/amd64/package.use |
97 |
@@ -8,7 +8,6 @@ media-video/mpv lua luajit |
98 |
|
99 |
# Michał Górny <mgorny@g.o> (28 Jun 2014) |
100 |
# Packages that should be multilib by default. |
101 |
-media-gfx/nvidia-cg-toolkit abi_x86_32 |
102 |
x11-drivers/ati-drivers abi_x86_32 |
103 |
x11-drivers/nvidia-drivers abi_x86_32 |