summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/nvidia-settings/ChangeLog7
-rw-r--r--media-video/nvidia-settings/nvidia-settings-275.43.ebuild6
-rw-r--r--media-video/nvidia-settings/nvidia-settings-290.10.ebuild6
-rw-r--r--media-video/nvidia-settings/nvidia-settings-295.20.ebuild6
-rw-r--r--media-video/nvidia-settings/nvidia-settings-295.40.ebuild4
5 files changed, 17 insertions, 12 deletions
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 79eb43b1a528..79b8f9c64afd 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/nvidia-settings
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.110 2012/04/24 13:45:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.111 2012/04/25 02:43:16 idl0r Exp $
+
+ 25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+ nvidia-settings-275.43.ebuild, nvidia-settings-290.10.ebuild,
+ nvidia-settings-295.20.ebuild, nvidia-settings-295.40.ebuild:
+ Fix nvidia-drivers dependency and more FreeBSD build fixes
24 Apr 2012; Alexis Ballier <aballier@gentoo.org>
nvidia-settings-295.40.ebuild:
diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
index 4773a0fb2fa3..c20c46dd34b2 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.5 2012/04/18 22:21:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.6 2012/04/25 02:43:16 idl0r Exp $
EAPI=4
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
x11-libs/libXrandr
dev-libs/glib:2"
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
${COMMON_DEPEND}"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -46,7 +46,7 @@ src_compile() {
emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
einfo "Building nvidia-settings..."
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
}
src_install() {
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index e68f5a7caed4..056e1a2365dc 100644
--- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.6 2012/04/18 22:21:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.7 2012/04/25 02:43:16 idl0r Exp $
EAPI=4
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
x11-libs/libXrandr
dev-libs/glib:2"
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
${COMMON_DEPEND}"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -46,7 +46,7 @@ src_compile() {
emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
einfo "Building nvidia-settings..."
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
}
src_install() {
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
index e0796aca1a62..bbba30b5b268 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.5 2012/04/18 22:21:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.6 2012/04/25 02:43:16 idl0r Exp $
EAPI=4
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
x11-libs/libXrandr
dev-libs/glib:2"
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
${COMMON_DEPEND}"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -46,7 +46,7 @@ src_compile() {
emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
einfo "Building nvidia-settings..."
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
}
src_install() {
diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
index 57776f1f96af..6ec38e8dcc3e 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.4 2012/04/24 13:45:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.5 2012/04/25 02:43:16 idl0r Exp $
EAPI=4
@@ -26,7 +26,7 @@ COMMON_DEPEND="x11-libs/libX11
x11-libs/libXrandr
dev-libs/glib:2"
-RDEPEND="x11-drivers/nvidia-drivers
+RDEPEND="=x11-drivers/nvidia-drivers-2*
${COMMON_DEPEND}"
DEPEND="${RDEPEND}
dev-util/pkgconfig