From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E48C1138334 for ; Tue, 5 Jun 2018 08:50:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD8B8E0A9E; Tue, 5 Jun 2018 08:50:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E108E0A9E for ; Tue, 5 Jun 2018 08:50:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF4B6335C7E for ; Tue, 5 Jun 2018 08:50:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA1BB296 for ; Tue, 5 Jun 2018 08:50:28 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1528188614.58abaeabe3948f5c5953f2fbf6fe36cc2481add9.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 58abaeabe3948f5c5953f2fbf6fe36cc2481add9 X-VCS-Branch: master Date: Tue, 5 Jun 2018 08:50:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 826d627a-b473-40fa-87b0-c64c83a9c74b X-Archives-Hash: d4d6294d81afa277ceb9d4a98243d4ee commit: 58abaeabe3948f5c5953f2fbf6fe36cc2481add9 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Jun 5 08:50:14 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Jun 5 08:50:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58abaeab x11-drivers/nvidia-drivers: Drop x86 (bug #657378). Package-Manager: Portage-2.3.40, Repoman-2.3.9 x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild index e0f496c1f92..1b079e349ca 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.24.ebuild @@ -11,8 +11,6 @@ HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx" AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}" AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" NV_URI="http://us.download.nvidia.com/XFree86/" SRC_URI=" @@ -25,7 +23,7 @@ SRC_URI=" LICENSE="GPL-2 NVIDIA-r2" SLOT="0/${PV%.*}" -KEYWORDS="-* amd64 x86 ~amd64-fbsd" +KEYWORDS="-* amd64 ~amd64-fbsd" RESTRICT="bindist mirror" EMULTILIB_PKG="true" @@ -110,7 +108,6 @@ nvidia_drivers_versions_check() { # Kernel features/options to check for CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP" - use x86 && CONFIG_CHECK+=" ~HIGHMEM" # Now do the above checks use kernel_linux && check_extra_config @@ -153,7 +150,6 @@ pkg_setup() { # set variables to where files are in the package structure if use kernel_FreeBSD; then - use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}" use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}" NV_DOC="${S}/doc" NV_OBJ="${S}/obj" @@ -454,10 +450,6 @@ src_install-libs() { local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia" local nv_libdir="${NV_OBJ}" - if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then - nv_libdir="${NV_OBJ}"/32 - fi - if use X; then NV_GLX_LIBRARIES=( "libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"