From 70775af9cdbfa2719a57a212cafe76c22f840634 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 6 Oct 2011 00:55:11 -0700 Subject: [PATCH] nvidia-drivers version bump --- x11-drivers/nvidia-drivers/Manifest | 9 ++++---- x11-drivers/nvidia-drivers/ebuild.diff | 23 +++++++++++++++++++ ...ebuild => nvidia-drivers-285.05.09.ebuild} | 10 ++++---- 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 x11-drivers/nvidia-drivers/ebuild.diff rename x11-drivers/nvidia-drivers/{nvidia-drivers-285.03.ebuild => nvidia-drivers-285.05.09.ebuild} (97%) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 3d0744f..b2cf53e 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -2,7 +2,8 @@ AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860 AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 AUX nvidia-drivers-275.19-pax-const.patch 833 RMD160 100c36ed4c7db0f30c0680b276a708cd5ed75749 SHA1 b336665366340fec6bd400f36d3e4b9de86473f5 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 AUX nvidia-drivers-285.03-pax-usercopy.patch 2043 RMD160 08453cfed4d50622709f47bdce44ad7c828ad5d1 SHA1 374b228cb7ae766f4c19875a5d8395f2da7d63f8 SHA256 8b0055fd6ba86531f968ee67f3c026d6fda05f0f3288371f23c4c5cc34ca53de -DIST NVIDIA-FreeBSD-x86-285.03.tar.gz 30736992 RMD160 96e35fb251a65b27d8aa358bdc9d814e8fd90f72 SHA1 cfc4ce1b864580dc7221a479ba48fb798af4551d SHA256 872de331825e8d0326785a5559e49cd34b5c902be8a2f43cc4c342511807e30b -DIST NVIDIA-Linux-x86-285.03.run 33556616 RMD160 0b44943a1eea4c44ccf252ad92814665355deb95 SHA1 2487321c609679980bd63ce91a058d29d7175c9b SHA256 4cdc31f0edfa3e8cc67fb3d0388d908fb22f9505a1066ce1be79820cbc93b4f8 -DIST NVIDIA-Linux-x86_64-285.03.run 56689227 RMD160 d8f387619d70bf9535c87370376622b5bd3fc94e SHA1 f301677f66d7d92d11654c8ec97a3c8d53ae429f SHA256 fc1e895635b9ea7171f4e7c549e6502f3853838cb4cc254a190b004579a1f919 -EBUILD nvidia-drivers-285.03.ebuild 16749 RMD160 2ec13b28ccc191e337320680934bfdc030d59eae SHA1 1c942abb11251e5e45f87966a39d0b2aae559f6e SHA256 04a8e5adaffdce102f1c4c01a61b47e92ed02da55eea49445784c4cd6687a164 +DIST NVIDIA-FreeBSD-x86-285.05.09.tar.gz 30697710 RMD160 e08981374a67a8e9e9bff42d5cbb5f5ecef0568c SHA1 d3e4cb6cac7af0392d0f294cf67b029456a48100 SHA256 d3ad51145cd57c70678ee659112a0973187b1b02e3062addadd0fe094b3c46fb +DIST NVIDIA-Linux-x86-285.05.09.run 33592492 RMD160 e5fb559c3eb6f928649a94bfd73d80d0b1561dd3 SHA1 e42112d15ba217fc1c16afbae45f0493f795966c SHA256 ce03fa99b62081b52bd5dae3594ac5942413ed530cda3d76a82f4ab0afd36f96 +DIST NVIDIA-Linux-x86_64-285.05.09.run 56674677 RMD160 e178cc5109bbf254c80eb123acd6276bf34d7790 SHA1 26c99d119f39a9201943a4f44cdc110988ec2349 SHA256 7159a1f7e898b50dd49ea2273ac6facb870546ad5496bf70c6fbe1642d2c4970 +EBUILD nvidia-drivers-285.05.09.ebuild 16740 RMD160 02a822f274d1d343edd37ffe651501600c6d286e SHA1 8780ef60d1248485378019249435f9541e9fd471 SHA256 6795c481f758f55876e8187c24f83dc836872a4ef8f03d8f82309a08ed9f9c29 +MISC ebuild.diff 736 RMD160 b0c43ad9d4f2dbbd35a195b22b2bea698dbbafcd SHA1 753ad14db964fe133936e497aaed56b8e04256d2 SHA256 5ca532e00bec17cd5193a19a6fcae5231d3fe0b8c68f3b2e8dd480ac0dc1f67e diff --git a/x11-drivers/nvidia-drivers/ebuild.diff b/x11-drivers/nvidia-drivers/ebuild.diff new file mode 100644 index 0000000..27e9fe5 --- /dev/null +++ b/x11-drivers/nvidia-drivers/ebuild.diff @@ -0,0 +1,23 @@ +--- ../../../../portage/x11-drivers/nvidia-drivers/nvidia-drivers-285.03.ebuild 2011-09-13 08:22:54.000000000 -0700 ++++ nvidia-drivers-285.03.ebuild 2011-09-28 19:09:57.144454056 -0700 +@@ -19,7 +19,7 @@ + LICENSE="NVIDIA" + SLOT="0" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" +-IUSE="acpi custom-cflags gtk multilib kernel_linux" ++IUSE="acpi custom-cflags gtk multilib kernel_linux hardened" + RESTRICT="strip" + EMULTILIB_PKG="true" + +@@ -288,6 +288,11 @@ + # If greater than 2.6.5 use M= instead of SUBDIR= + convert_to_m "${NV_SRC}"/Makefile.kbuild + fi ++ ++ if use hardened; then ++ epatch "${FILESDIR}"/nvidia-drivers-275.19-pax-const.patch ++ # epatch "${FILESDIR}"/nvidia-drivers-285.03-pax-usercopy.patch ++ fi + } + + src_compile() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-285.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-285.05.09.ebuild similarity index 97% rename from x11-drivers/nvidia-drivers/nvidia-drivers-285.03.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-285.05.09.ebuild index 1dfb438..92ec13c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-285.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-285.05.09.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-285.03.ebuild,v 1.1 2011/09/13 15:22:54 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-285.05.09.ebuild,v 1.1 2011/10/04 15:04:55 cardoe Exp $ EAPI="2" @@ -12,9 +12,9 @@ X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" DESCRIPTION="NVIDIA X11 driver and GLX libraries" HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) - amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) - x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" +SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) + amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) + x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" LICENSE="NVIDIA" SLOT="0" @@ -23,7 +23,7 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux hardened" RESTRICT="strip" EMULTILIB_PKG="true" -COMMON="