summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/nvidia-settings/nvidia-settings-290.10.ebuild')
-rw-r--r--media-video/nvidia-settings/nvidia-settings-290.10.ebuild49
1 files changed, 23 insertions, 26 deletions
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index a4c7767f5c97..e35df65eb221 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.3 2012/02/21 21:38:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.4 2012/04/18 18:42:27 idl0r Exp $
EAPI=4
@@ -15,26 +15,23 @@ SLOT="0"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
IUSE="examples"
-#COMMON_DEPEND="x11-libs/libX11
-# x11-libs/libXext
-# x11-libs/libXxf86vm
-# x11-libs/gtk+:2
-# x11-libs/gdk-pixbuf[X]
-# media-libs/mesa
-# x11-libs/pango[X]
-# x11-libs/libXv
-# x11-libs/libXrandr
-# dev-libs/glib:2"
-
-#RDEPEND="x11-drivers/nvidia-drivers
-# ${COMMON_DEPEND}"
-#DEPEND="${RDEPEND}
-# dev-util/pkgconfig
-# x11-proto/xproto"
-
-DEPEND="x11-libs/libX11
- x11-libs/libXext"
-RDEPEND=""
+COMMON_DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ x11-libs/gtk+:2
+ x11-libs/gdk-pixbuf[X]
+ media-libs/mesa
+ x11-libs/pango[X]
+ x11-libs/libXv
+ x11-libs/libXrandr
+ dev-libs/glib:2"
+
+RDEPEND="x11-drivers/nvidia-drivers
+ ${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ x11-proto/xproto"
+
src_prepare() {
epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -49,12 +46,12 @@ src_compile() {
emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
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
+ einfo "Building nvidia-settings..."
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
}
src_install() {
-# emake DESTDIR="${D}" PREFIX=/usr install
+ emake DESTDIR="${D}" PREFIX=/usr install
# Install libXNVCtrl and headers
insinto /usr/$(get_libdir)
@@ -64,8 +61,8 @@ src_install() {
doins src/libXNVCtrl/*.h
# Install icon and .desktop entry
-# doicon doc/${PN}.png
-# make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+# doicon doc/${PN}.png # Installed through nvidia-drivers
+ make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
# Now install documentation
dodoc doc/*.txt