[patch] nvidia-settings dependency (+consistency) patch (option 1)

nvidia-settings.diff (text/plain), 4.48 KB, created by Maciej Mrozowski on 2012-05-05 13:04:14 UTC

Index: nvidia-settings-173.14.31.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 nvidia-settings-173.14.31.ebuild
--- nvidia-settings-173.14.31.ebuild	25 Apr 2012 04:27:06 -0000	1.1
+++ nvidia-settings-173.14.31.ebuild	5 May 2012 13:00:59 -0000
@@ -28,7 +28,7 @@
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="=x11-drivers/nvidia-drivers-173.14*
+RDEPEND="=x11-drivers/nvidia-drivers-173.14*[-gtk]
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
Index: nvidia-settings-260.19.29.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-260.19.29.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 nvidia-settings-260.19.29.ebuild
--- nvidia-settings-260.19.29.ebuild	25 Apr 2012 04:27:06 -0000	1.6
+++ nvidia-settings-260.19.29.ebuild	5 May 2012 13:00:59 -0000
@@ -33,7 +33,7 @@
 	x11-base/xorg-server
 	x11-libs/libXt
 	x11-libs/pango[X]
-	=x11-drivers/nvidia-drivers-2*"
+	=x11-drivers/nvidia-drivers-2*[-gtk]"
 
 src_prepare() {
 	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk
@@ -47,13 +47,13 @@
 	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
 	filter-flags -fPIC
 
-	# cd "${S}"
-	#einfo "Building nVidia-Settings..."
-	#emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
+	cd "${S}"
+	einfo "Building nVidia-Settings..."
+	emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
 }
 
 src_install() {
-	#emake STRIP_CMD=/bin/true install || die
+	emake STRIP_CMD=/bin/true install || die
 
 	# Install libXNVCtrl and headers
 	insinto "/usr/$(get_libdir)"
@@ -62,8 +62,8 @@
 	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
 
 	# Install icon and .desktop entry
-	#doicon "${FILESDIR}/icon/${PN}.png"
-	#domenu "${FILESDIR}/icon/${PN}.desktop"
+	doicon "${FILESDIR}/icon/${PN}.png"
+	domenu "${FILESDIR}/icon/${PN}.desktop"
 
 	# Now install documentation
 	dodoc doc/*.txt
Index: nvidia-settings-275.43.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 nvidia-settings-275.43.ebuild
--- nvidia-settings-275.43.ebuild	25 Apr 2012 02:43:16 -0000	1.6
+++ nvidia-settings-275.43.ebuild	5 May 2012 13:00:59 -0000
@@ -26,7 +26,7 @@
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="=x11-drivers/nvidia-drivers-2*
+RDEPEND="=x11-drivers/nvidia-drivers-2*[-gtk]
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
Index: nvidia-settings-290.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v
retrieving revision 1.8
diff -u -B -r1.8 nvidia-settings-290.10.ebuild
--- nvidia-settings-290.10.ebuild	25 Apr 2012 04:27:06 -0000	1.8
+++ nvidia-settings-290.10.ebuild	5 May 2012 13:00:59 -0000
@@ -26,7 +26,7 @@
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="=x11-drivers/nvidia-drivers-2*
+RDEPEND="=x11-drivers/nvidia-drivers-2*[-gtk]
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
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.8
diff -u -B -r1.8 nvidia-settings-295.20.ebuild
--- nvidia-settings-295.20.ebuild	2 May 2012 17:20:07 -0000	1.8
+++ nvidia-settings-295.20.ebuild	5 May 2012 13:00:59 -0000
@@ -26,7 +26,7 @@
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="=x11-drivers/nvidia-drivers-2*
+RDEPEND="=x11-drivers/nvidia-drivers-2*[-gtk]
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
Index: nvidia-settings-295.40.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v
retrieving revision 1.6
diff -u -B -r1.6 nvidia-settings-295.40.ebuild
--- nvidia-settings-295.40.ebuild	25 Apr 2012 04:27:06 -0000	1.6
+++ nvidia-settings-295.40.ebuild	5 May 2012 13:00:59 -0000
@@ -26,7 +26,7 @@
 	x11-libs/libXrandr
 	dev-libs/glib:2"
 
-RDEPEND="=x11-drivers/nvidia-drivers-2*
+RDEPEND="=x11-drivers/nvidia-drivers-2*[-gtk]
 	${COMMON_DEPEND}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig