Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 485724 | Differences between
and this patch

Collapse All | Expand All

(-)../../../../../portage/x11-drivers/nvidia-drivers/nvidia-drivers-346.47.ebuild (-36 / +7 lines)
Lines 4-10 Link Here
4
4
5
EAPI=5
5
EAPI=5
6
6
7
inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
7
MULTILIB_COMPAT=( abi_x86_{32,64} )
8
inherit eutils flag-o-matic linux-info linux-mod multilib-build nvidia-driver \
8
	portability toolchain-funcs unpacker user udev
9
	portability toolchain-funcs unpacker user udev
9
10
10
NV_URI="http://us.download.nvidia.com/XFree86/"
11
NV_URI="http://us.download.nvidia.com/XFree86/"
Lines 26-34 Link Here
26
SLOT="0"
27
SLOT="0"
27
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
28
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
28
RESTRICT="bindist mirror strip"
29
RESTRICT="bindist mirror strip"
29
EMULTILIB_PKG="true"
30
30
31
IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
31
IUSE="acpi kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
32
REQUIRED_USE="
32
REQUIRED_USE="
33
	tools? ( X || ( gtk2 gtk3 ) )
33
	tools? ( X || ( gtk2 gtk3 ) )
34
"
34
"
Lines 61-73 Link Here
61
	X? (
61
	X? (
62
		<x11-base/xorg-server-1.17.99:=
62
		<x11-base/xorg-server-1.17.99:=
63
		>=x11-libs/libvdpau-0.3-r1
63
		>=x11-libs/libvdpau-0.3-r1
64
		multilib? (
64
		abi_x86_32? (
65
			|| (
65
			|| (
66
				 (
66
				 (
67
					>=x11-libs/libX11-1.6.2[abi_x86_32]
67
					>=x11-libs/libX11-1.6.2[abi_x86_32]
68
					>=x11-libs/libXext-1.3.2[abi_x86_32]
68
					>=x11-libs/libXext-1.3.2[abi_x86_32]
69
				 )
69
				 )
70
				app-emulation/emul-linux-x86-xlibs
70
				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
71
			)
71
			)
72
		)
72
		)
73
	)
73
	)
Lines 78-89 Link Here
78
S=${WORKDIR}/
78
S=${WORKDIR}/
79
79
80
pkg_pretend() {
80
pkg_pretend() {
81
	if use amd64 && has_multilib_profile && \
82
		[ "${DEFAULT_ABI}" != "amd64" ]; then
83
		eerror "This ebuild doesn't currently support changing your default ABI"
84
		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
85
	fi
86
87
	if use kernel_linux && kernel_is ge 3 20 ; then
81
	if use kernel_linux && kernel_is ge 3 20 ; then
88
		ewarn "Gentoo supports kernels which are supported by NVIDIA"
82
		ewarn "Gentoo supports kernels which are supported by NVIDIA"
89
		ewarn "which are limited to the following kernels:"
83
		ewarn "which are limited to the following kernels:"
Lines 160-174 Link Here
160
src_prepare() {
154
src_prepare() {
161
	# Please add a brief description for every added patch
155
	# Please add a brief description for every added patch
162
156
163
	if use kernel_linux; then
164
		if kernel_is lt 2 6 9 ; then
165
			eerror "You must build this against 2.6.9 or higher kernels."
166
		fi
167
168
		# If greater than 2.6.5 use M= instead of SUBDIR=
169
#		convert_to_m "${NV_SRC}"/Makefile.kbuild
170
	fi
171
172
	if use pax_kernel; then
157
	if use pax_kernel; then
173
		ewarn "Using PAX patches is not supported. You will be asked to"
158
		ewarn "Using PAX patches is not supported. You will be asked to"
174
		ewarn "use a standard kernel should you have issues. Should you"
159
		ewarn "use a standard kernel should you have issues. Should you"
Lines 363-382 Link Here
363
		doexe "${FILESDIR}"/95-nvidia-settings
348
		doexe "${FILESDIR}"/95-nvidia-settings
364
	fi
349
	fi
365
350
366
	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
351
	multilib_foreach_abi src_install-libs
367
368
	if has_multilib_profile && use multilib ; then
369
		local OABI=${ABI}
370
		for ABI in $(get_install_abis) ; do
371
			src_install-libs
372
		done
373
		ABI=${OABI}
374
		unset OABI
375
	else
376
		src_install-libs
377
	fi
378
379
	is_final_abi || die "failed to iterate through all ABIs"
380
352
381
	readme.gentoo_create_doc
353
	readme.gentoo_create_doc
382
}
354
}
Lines 387-394 Link Here
387
	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
359
	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
388
	local libdir=${NV_OBJ}
360
	local libdir=${NV_OBJ}
389
361
390
	if use kernel_linux && has_multilib_profile && \
362
	if use kernel_linux && ! multilib_is_native_abi; then
391
			[[ ${ABI} == "x86" ]] ; then
392
		libdir=${NV_OBJ}/32
363
		libdir=${NV_OBJ}/32
393
	fi
364
	fi
394
365

Return to bug 485724