summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2015-09-21 12:51:11 -0400
committerIan Stakenvicius <axs@gentoo.org>2015-09-30 10:34:20 -0400
commit4b04c56030a41d0809b63290f00f9eb864712566 (patch)
tree3a38f75afc54597cfb8b7c3ff69366aac714b039 /media-gfx
parentAdd missing 32bit-only games to amd64/no-multilib/package.mask (diff)
downloadgentoo-4b04c56030a41d0809b63290f00f9eb864712566.tar.gz
gentoo-4b04c56030a41d0809b63290f00f9eb864712566.tar.bz2
gentoo-4b04c56030a41d0809b63290f00f9eb864712566.zip
media-gfx/nvidia-cg-toolkit: drop unnecessary IUSE=multilib
As nvidia-cg-toolkit has long been migrated to using abi_x86_* to handle multilib installation, and as there are actually very few things in the gentoo repo that need this package to be built with +abi_x86_32 on amd64 multilib systems, this commit drops the multilib flag from IUSE and removes the default-enabled abi_x86_32 flag from the multilib amd64 profile (which was there to prevent users on multilib profiles from needing to explicitly add it whenever they just wanted to emerge the package) Gentoo-Bug: 560868 Package-Manager: portage-2.2.20.1
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild3
-rw-r--r--media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild (renamed from media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild)29
2 files changed, 10 insertions, 22 deletions
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
index 16db91518c1..c7f829aac65 100644
--- 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
@@ -23,9 +23,8 @@ SRC_URI="
LICENSE="NVIDIA-r1"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples multilib"
+IUSE="doc examples"
-REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )"
RESTRICT="strip"
RDEPEND="
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
index 69a5820be54..730700260fd 100644
--- 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
@@ -26,32 +26,21 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples multilib"
-REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )"
-
RESTRICT="strip"
RDEPEND="
- media-libs/glu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXt
- virtual/opengl
+ >=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
amd64? (
abi_x86_32? (
>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
- >=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
- >=virtual/opengl-7.0-r1[abi_x86_32(-)]
- >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
- >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
- >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
- >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
- >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
- >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
- >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
)
)"
DEPEND=""