[patch] diff against original ebuild

nvidia-settings-295.20.diff (text/plain), 2.11 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2012-02-25 10:46:20 UTC

Index: nvidia-settings-295.20.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 nvidia-settings-295.20.ebuild
--- nvidia-settings-295.20.ebuild	21 Feb 2012 21:38:23 -0000	1.2
+++ nvidia-settings-295.20.ebuild	25 Feb 2012 10:42:53 -0000
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
+IUSE="examples static-libs"
 
 #COMMON_DEPEND="x11-libs/libX11
 #	x11-libs/libXext
@@ -36,43 +36,35 @@
 	x11-libs/libXext"
 RDEPEND=""
 
+pkg_setup() {
+	tc-export CC LD RANLIB
+}
+
 src_prepare() {
-	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
-	epatch "${FILESDIR}/0002-Build-libNVCtrl-with-PIC.patch"
+	epatch "${FILESDIR}"/0001-Makefile-improvements.patch \
+		"${FILESDIR}"/0002-Build-libNVCtrl-with-PIC.patch \
+		"${FILESDIR}"/0003-Build-and-link-shared-libXNVCtrl.patch
 
 	# The PM does it for us
 	sed -i -e 's:^\(MANPAGE_GZIP ?=\) 1:\1 0:' Makefile || die
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
+	use static-libs && export STATIC_XNVC=1
+	export STRIP_CMD=/bin/true
+	
 	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 DESTDIR="${D}" PREFIX=/usr install
-
-	# Install libXNVCtrl and headers
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
+	emake DESTDIR="${D}" PREFIX=/usr libdir=$(get_libdir) install
 
 	# Install icon and .desktop entry
-#	doicon doc/${PN}.png
-#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+	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
+		dodoc samples/{*.c,README}
 	fi
 }