summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-02-18 12:01:12 +0000
committerJeroen Roovers <jer@gentoo.org>2014-02-18 12:01:12 +0000
commit131abfd4a8aa298ca4733ad5fd5bd9c62a6d668f (patch)
treec86010b292befd408cae5d45ebbbbcdb6596fbda /x11-drivers/nvidia-drivers
parentsci-geosciences/qlandkartegt: Drop user agent string patch and follow upstream (diff)
downloadhistorical-131abfd4a8aa298ca4733ad5fd5bd9c62a6d668f.tar.gz
historical-131abfd4a8aa298ca4733ad5fd5bd9c62a6d668f.tar.bz2
historical-131abfd4a8aa298ca4733ad5fd5bd9c62a6d668f.zip
Run linux-mod_pkg_setup after MODULE_NAMES but before BUILD_PARAMS is set (bug #501676 by Olivier Huber).
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-drivers/nvidia-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog9
-rw-r--r--x11-drivers/nvidia-drivers/Manifest10
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild)9
3 files changed, 19 insertions, 9 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 816badb57e82..295fca917dad 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.528 2014/02/17 20:14:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.529 2014/02/18 12:01:11 jer Exp $
+
+*nvidia-drivers-334.16-r7 (18 Feb 2014)
+
+ 18 Feb 2014; Jeroen Roovers <jer@gentoo.org>
+ -nvidia-drivers-334.16-r6.ebuild, +nvidia-drivers-334.16-r7.ebuild:
+ Run linux-mod_pkg_setup after MODULE_NAMES but before BUILD_PARAMS is set
+ (bug #501676 by Olivier Huber).
17 Feb 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-334.16-r6.ebuild:
Whitespace.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d3ae99cffefa..6afbd993b4c2 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -34,15 +34,15 @@ DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbd
EBUILD nvidia-drivers-173.14.39.ebuild 16615 SHA256 df85299032940da5c09757185accdfdfc65c9beaa6e07a5ab7224122cbf62521 SHA512 c939a4d4f8e945ef5f90a7842e7110eb18ea5df1b1c9ff08e703b7d744206e0fa49e833f5780cb3f3435652f5e3b5743c74d0d44b7804caab6364236cd5ae6d2 WHIRLPOOL 8df9736aa00dbe6e2f75cb7994e9cfbef635d8c7c451a3d4248929e0b73bd8e73d1b316a5971757b56b1aa40ae3794b093a3adbd7eb840c568410406d9e85c6d
EBUILD nvidia-drivers-304.119.ebuild 12594 SHA256 41d33636ae72cfb306ae9c2e561218cc06bc79ed6e1ab76e38eb36e9ded0c9a3 SHA512 ef197812a62068ff473e67c732a3def3c71edc4613dde5a6ba27ef64323ecc19f83924c2b2b72250fd2271811d00d51fec913c0fedb1091523674b15c108a1cc WHIRLPOOL e6b7851feacd09bfb94d01f90916a9fa46653e3200f5b7cc2227b3b98bf612245d9bda7f278f7489025b453802c6d2450f400d24d9087f09259dfa257d68cd12
EBUILD nvidia-drivers-331.38.ebuild 12282 SHA256 1ae32d474538e98e868e314c667d10a70d9f963dde9479e074bbf51be0003ea1 SHA512 4867db76669a90d26a75eb0f15c4c50d270fa47418d223672429eb2ad48e8343f9984ac718de8d07aca11f21e781609c7c2b3a61fcf588d2837ed1e832fb8597 WHIRLPOOL 09572a65a59eb20276f92ec8f610d73bc4a0d563afc6729c0db666f788ac1679c4f05ba9ab864e8e95b118d1150af006df1881cfb0cdac77da53cb2a9f3f0a9c
-EBUILD nvidia-drivers-334.16-r6.ebuild 13083 SHA256 d58400aa1cc7b76f8c81c97daa62a1911d922e533ff6af4b25dd554ab1035a0b SHA512 36f778f89a722417388f22f879d2a69c6a4db435f29f0334691ca6ff9ef803859125efd5987e0844afd234c4f480943fe19c8d02b2fb69d11e31ea7dc7a0c835 WHIRLPOOL 3ca3fa94014b1a0e7b5128763119e9227c1e855c03610db79a85668b5fdad08ca5f8b4cfa158afcc397d1f15bbbc5ca0c89c60a7c0b448a8d0ca5ce426038b2f
+EBUILD nvidia-drivers-334.16-r7.ebuild 13267 SHA256 232aab19b572770b7a10fc1129020c2dbc53b755980fdfa926ad339be23e0aae SHA512 a85424708e9049f4a61ccf6a8fc8b5342ab05e948a446eb2f38f7bb49433dd62b74aaec2750ac1ecfb6945640439933a5fb50521a0819b16ec8a465297d3424b WHIRLPOOL b8ee9275ebdb6ddce90ace7849ed66a4e7eb6da44bc121b7a38bb75db70ca6f539dcec5fdfac7be9909e6d949772f401709125972da4d522f8affbdd01928502
EBUILD nvidia-drivers-96.43.23.ebuild 14882 SHA256 f113d8f0155e54f35ba9ae96e9190c9c0c008f53422bc4e4b07d20ac25efa917 SHA512 6fce1ad80cacf25c9c28638255c304c6218d91f13c7b5f3741cf0a10636aa449fb6241ddce211b8be92005a719f6d1e8cb28315a9900c4774c6420e3fbd5eecd WHIRLPOOL b87d4b6618b0cd355c5f9884eea353c1f0741b71b3b4cbb5e5ad985d1121db44fc2e77bffa361e82d7ab761eefe4b78c40498aa987a7ce5927a80bd868c4d53d
-MISC ChangeLog 3244 SHA256 501f5981b865ceaf0a259ef12015f6e40c9b01efaf063775633d578e89362446 SHA512 493ce112f2fe27af5163fbff1b87a8da14edf98708b5496cd8ee4c997f41d835adaa2ea07965537bb4e5f06f2f6c2d1f2c5abc5e8dc764f4a3b0677b00c7e796 WHIRLPOOL c6fc92b9a77e0289c64207bfebde24a492a59df91576b4e74e005dce02c9ef160af43a269f928e85c952c81532652e9a4a0826c9bc57f660357914e8e3c2eb87
+MISC ChangeLog 3513 SHA256 7398b6f92f89b170af56eb7e7c49c4cf357fd18aecc45e74bdae783e56c457fd SHA512 b5704db59c656cac5295cca6ad711a726b2a073a5617e5caf138a878abd84eb2b1b6c40b5bee6f3a2e40a4e8d67335ca21b9327c77a285ab4cab871614f5c604 WHIRLPOOL ceeffc8cf8de83cdb5fb877c374fdd44b5f2e8538b16f4adab3376f923ce92e5eeeb36f007952bb3577510dfde022abadaff9c29344e54deaf65e1687611e39e
MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
MISC metadata.xml 787 SHA256 33a56a587e0681ce738990ea68443d02b094a71063d62f7c76c0f0576e2b2eea SHA512 f90c8a563c98ab47131141261a2934e0db2cdf2fd06f2fa05967c7e68745ffff72ea1ecf2e6865423006c1ca787c3e02bff7bcfafe8f5b343b4d0231bff0b290 WHIRLPOOL 2d8c24530d35c510963e1219fddde15810eb9a851f85842360d80f70dfd9e8f71891d3fa3bba663691080f31cbb70ff4503f727d1a72af0efc6ccf5c1502e58a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlMCbZ0ACgkQVWmRsqeSphNMiACePK+4Km2YgQ5Lp+beP4kJIsxy
-62cAn1BXKGRI8tIVi76/JV84MBLbishf
-=PJV3
+iEYEAREIAAYFAlMDS4gACgkQVWmRsqeSphMfAQCfcTSnF1VbQuX6iVzb0XrBLKMC
+igAAn25eoWb7ZSR3SMTGz5zZl+Cseqnr
+=1tnf
-----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild
index 9c11dc0f1e2c..120f114e8e29 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r6.ebuild,v 1.2 2014/02/17 20:14:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.16-r7.ebuild,v 1.1 2014/02/18 12:01:11 jer Exp $
EAPI=5
@@ -121,6 +121,11 @@ pkg_setup() {
use uvm && MODULE_NAMES="nvidia-uvm(video:${S}/kernel/uvm)"
MODULE_NAMES+=" nvidia(video:${S}/kernel)"
+ # This needs to run after MODULE_NAMES (so that the eclass checks
+ # whether the kernel supports loadable modules) but before BUILD_PARAMS
+ # is set (so that KV_DIR is populated).
+ linux-mod_pkg_setup
+
BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
@@ -129,8 +134,6 @@ pkg_setup() {
# expects x86_64 or i386 and then converts it to x86
# later on in the build process
BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-
- linux-mod_pkg_setup
fi
# set variables to where files are in the package structure