From 4b04c56030a41d0809b63290f00f9eb864712566 Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Mon, 21 Sep 2015 12:51:11 -0400 Subject: [PATCH] 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 --- .../nvidia-cg-toolkit-3.1.0013-r3.ebuild | 3 +- ...d => nvidia-cg-toolkit-3.1.0013-r5.ebuild} | 29 ++++++------------- profiles/arch/amd64/package.use | 1 - 3 files changed, 10 insertions(+), 23 deletions(-) rename media-gfx/nvidia-cg-toolkit/{nvidia-cg-toolkit-3.1.0013-r4.ebuild => nvidia-cg-toolkit-3.1.0013-r5.ebuild} (82%) 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 16db91518c10..c7f829aac65a 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 similarity index 82% rename from media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild rename to media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild index 69a5820be548..730700260fd8 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="" diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use index 2c0a9b2dae2d..8450b571df6f 100644 --- a/profiles/arch/amd64/package.use +++ b/profiles/arch/amd64/package.use @@ -8,7 +8,6 @@ media-video/mpv lua luajit # Michał Górny (28 Jun 2014) # Packages that should be multilib by default. -media-gfx/nvidia-cg-toolkit abi_x86_32 x11-drivers/ati-drivers abi_x86_32 x11-drivers/nvidia-drivers abi_x86_32 -- 2.26.2