Cleanup and bumps.

(Portage version: 2.1.10.44/cvs/Linux i686)

1 files changed, 40 insertions, 38 deletions

diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index 765ce604a562..80c7d5f99299 100644
--- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/12/04 13:54:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.2 2012/02/17 19:49:41 idl0r Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="NVIDIA Linux X11 Settings Utility"
 HOMEPAGE="http://www.nvidia.com/"
@@ -13,60 +13,62 @@ SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND="
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/gtk+:2
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-libs/pango[X]
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
+IUSE="examples"
 
-RDEPEND="
-	x11-base/xorg-server
+COMMON_DEPEND="x11-libs/libXxf86vm
+	x11-libs/libX11
+	x11-libs/libXext
 	x11-libs/gtk+:2
-	x11-libs/libXt
+	x11-libs/gdk-pixbuf[X]
+	media-libs/mesa
 	x11-libs/pango[X]
-	x11-drivers/nvidia-drivers"
+	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() {
-	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk || die
+	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
+	epatch "${FILESDIR}/0002-Build-libNVCtrl-with-PIC.patch"
+
+	# The PM does it for us
+	sed -i -e 's:^\(MANPAGE_GZIP ?=\) 1:\1 0:' Makefile || die
 }
 
 src_compile() {
 	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	emake clean
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a
-	filter-flags -fPIC
-
-	# cd "${S}"
-	#einfo "Building nVidia-Settings..."
-	#emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
+	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
 }
 
 src_install() {
-	#emake STRIP_CMD=/bin/true install || die
+	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
+	insinto /usr/$(get_libdir)
 	doins src/libXNVCtrl/libXNVCtrl.a
+
 	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
+	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-	#doicon "${FILESDIR}/icon/${PN}.png"
-	#domenu "${FILESDIR}/icon/${PN}.desktop"
+	doicon doc/${PN}.png
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
 }