Version bump, bug 403581 and partially bug 257765.

Package-Manager: portage-2.1.10.44/cvs/Linux i686

5 files changed, 278 insertions, 9 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 5284ab8fe9f0..fce79fe68d5b 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,13 @@
 # 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.104 2012/02/17 04:58:21 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.105 2012/02/17 17:33:27 idl0r Exp $
+
+*nvidia-settings-295.20 (17 Feb 2012)
+
+  17 Feb 2012; Christian Ruppert <idl0r@gentoo.org>
+  +nvidia-settings-295.20.ebuild, +files/0001-Makefile-improvements.patch,
+  +files/0002-Build-libNVCtrl-with-PIC.patch:
+  Version bump, bug 403581 and partially bug 257765.
 
   17 Feb 2012; Christian Ruppert <idl0r@gentoo.org> metadata.xml:
   Take maintainership
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 06dd5f43688b..f0654dcfd62b 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Makefile-improvements.patch 5269 RMD160 c80118b3aa18f3f1d90f7aff0974b7f9df08939c SHA1 8b24d0307eecd84382b3009e9ba2ce115176234f SHA256 c7dddefa196f4b06a96592e27a903bc969580ed74291f76faf213f1f3276d4b7
+AUX 0002-Build-libNVCtrl-with-PIC.patch 578 RMD160 168a9b38d1c743798eb0e2b7e8de2efd60cf7c32 SHA1 49d6d4847621034de6624d388f71703abc6e42a4 SHA256 1492edfdbfd682b16e5f26be41bc61ab7320478c37f92730ff2b1ef1c520ceb2
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
 AUX nvidia-settings-169.04-no-display.patch 3365 RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 SHA1 8474ba73681e393b26155d7bd1b7041d66733cf9 SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7
@@ -21,6 +23,7 @@ DIST nvidia-settings-260.19.44.tar.bz2 1535853 RMD160 a7457ad8e6723d1da416709221
 DIST nvidia-settings-270.41.03.tar.bz2 1541983 RMD160 a03552e4ab80089875df7659a42255f9e21ef12b SHA1 a1f611b4d5945e6df90658e172efd541923dc7c0 SHA256 97571aecdd37387336ec51eaf7553b82ea084068ca95cb7a3117e624dafff956
 DIST nvidia-settings-270.41.06.tar.bz2 1542669 RMD160 005bcff4bbaa7897af764a8fc883effdfd1995d6 SHA1 6ac463a00383daa39a48b4e4e42855d0ef58783f SHA256 54787e3f91521c930c1969524ed5d4ee7f9b55e97903f3ba9c91dbdc4a8d3e99
 DIST nvidia-settings-290.10.tar.bz2 1544400 RMD160 d114a1441dac0b178922ac3b7736e32af1d55f94 SHA1 92acce8ed9816b55edc5a8ffc3090c258ce58f38 SHA256 c20dac225e5c67135d0d3f784ee058ce6337687a4232e20335997061f1ec5e26
+DIST nvidia-settings-295.20.tar.bz2 1545451 RMD160 d9de1231cf7e48f0c285ec0a30b8a78a0a1d58da SHA1 621095bcbd7cd5f75d22488d4f750993172845f5 SHA256 92a8f32d20bdf62c0d7c71b176ff4e5d8ad848492d5411aadef4cee0a2d45595
 EBUILD nvidia-settings-173.14.25.ebuild 1928 RMD160 9dec24d603a6042142ba5669169eb7023d24e292 SHA1 d3aea444ee654be0c03a6a341bdcf7c1ded82d5a SHA256 7384d8bd6bd69d8e02db120f64312407339a2ff9799bba3c3240e9eb63d45633
 EBUILD nvidia-settings-173.14.27.ebuild 1928 RMD160 52ca73f7d5c0664596fbc3a263be037a9488bc72 SHA1 7829113bc78d88cf777bccc4d4dc3e16a1dde8ee SHA256 bacd77fa4d994574fb594e5cf1a8376e0a80b3d8e0c988425f3905d15d5533a0
 EBUILD nvidia-settings-173.14.30.ebuild 1923 RMD160 cc355c3bc90b009e1605b919fcf7201456e70b5d SHA1 8e34fbe918868f2b8c6ef1a88ba753f2ed885104 SHA256 da4dd758eb8cc27d0b842cefc3599b36535c35d5c946558b40644cc0b7097599
@@ -36,16 +39,17 @@ EBUILD nvidia-settings-260.19.44.ebuild 1946 RMD160 250f2b38b0df4543e4e20bd1aa71
 EBUILD nvidia-settings-270.41.03.ebuild 1946 RMD160 8d605a1c38a5ac35cfdcbc553af41c6de94c30ed SHA1 113ff214499680f0c2ced331f2eaa913509d7e43 SHA256 dc0010679134b881e11ce528b7a0a011657481cdf689b33d7959e872779d4e41
 EBUILD nvidia-settings-270.41.06.ebuild 1946 RMD160 f78bd687c5b4b50c15560f4e445b3be256c8c60e SHA1 225cd75f286305ba188a8f6d84266a7381d2d5aa SHA256 8b2897892cba68a82dd6fe520f9298be7d98dca8dbed7b4a65510682f10302c7
 EBUILD nvidia-settings-290.10.ebuild 1878 RMD160 5fbc8bb2337b428b315dd20add2483d087ff9bd3 SHA1 224629b044563cdfae819baeb83695aa6ddd422c SHA256 7a58d854445a7ce4fc2a988f4e4c84942d63271d54bb74777e8e38e93d778d5b
-MISC ChangeLog 19738 RMD160 cc58f3d6e5e181ae92b6fc4ea814a2fccab644f6 SHA1 7a23e6cf82970295068580f48e2c907c44fecc1a SHA256 d85e658170b5e8cd7860c22092ef233f279e61610291f92ec3ff2f45e532fbee
+EBUILD nvidia-settings-295.20.ebuild 1828 RMD160 ec76f0a998c60aafd223f4c34c2231f7507c1155 SHA1 c1f77715b6e3449cd372d27cf00b92160f951a53 SHA256 4d0959258019a44ab2df746ee57d4959616c1fb2e276624a893191d525ba907c
+MISC ChangeLog 20004 RMD160 1f71d0b5cc64b872307451bcf91b4c97b7ac7c76 SHA1 21a3e92c423c3f4aa310364a4256da0b930f5dc3 SHA256 ef3a9937fc06a7d4e3d3f610f44b107f919ce68597d9c0c6e03906572fac7530
 MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPPd5yAAoJEMOx0zmdw4Z1V6sH/iVC9h7Q7UROCLoaZHBWiV1u
-U7XApJrK7XFJCvFyVDpjJl3qN8BwPlUukeyk2wOAC3abnU5b8o0V+uiDuk9qMrNg
-CXgzA8yBcOqmlVLjH6lcZG2mI4RvFXzhS95jXja5x2T5Rm+Exj+zSLtOD7bzUuxF
-88Zg0pVSjOgC4Mmu3q9D0FZV4PJdcykEuwr+dRCHFLTACRai/2jGjPBj6hzarx1y
-HXtcr5ghLqMnmUW/MF1D1cenHP8gIFcudIENFJvxdqPYA1bexpkCKYjJEyjBRSg9
-A67H+jJXaiCBLm2wkLNLUB8TpLNV2J5vqZjdamXpqYAgqLGf1vS86RX76mG0oL4=
-=c3gU
+iQEcBAEBCAAGBQJPPo9sAAoJEMOx0zmdw4Z1aF8H/2ULOvwMZ7KnXXNvkVca9A9I
+BMGbD3UuY05xo0MtOHdIDUb3UhprLUPynRWL5NyhuHW8XNOkBEgmEi43pJ9x2aOX
+qCJlCF3DTUFjuwbcYk5quzVgsZBzmowInEo7GZLV5Ln8BsIybcOpobc+AI+O1Wxp
+AI4Eg3Vf+22IgUaHDDCVOKDZVvpWtBIYErkDpIONC23zEWfTxsE+6ghrCqOCWZUe
+mqUj6w+8C5lTmI9AJPSTBoK3VLWSN7l8yHm1F0kXZPY1ZKPd/aLP5WbdsYBiVnob
+pu59WiyOe5xTxKA87D2LEqZa1od/U2C2juGQnhnjIq6IAGIvsVSgwqILWiIPu+U=
+=SOP6
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/files/0001-Makefile-improvements.patch b/media-video/nvidia-settings/files/0001-Makefile-improvements.patch
new file mode 100644
index 000000000000..66ba5e2eec8a
--- /dev/null
+++ b/media-video/nvidia-settings/files/0001-Makefile-improvements.patch
@@ -0,0 +1,160 @@
+From a396eaa80e13c0397c7802ce628715d8daa581f4 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Fri, 17 Feb 2012 05:40:53 +0100
+Subject: [PATCH] Makefile improvements
+
+Do not abuse LDFLAGS.
+Fix *FLAGS order, *FLAGS before objects and LIBS behind objects.
+Capitalize MANDIR, BINDIR and PREFIX.
+---
+ Makefile         |   29 ++++++++++++++++-------------
+ samples/Makefile |    4 ++--
+ utils.mk         |   18 ++++++++----------
+ 3 files changed, 26 insertions(+), 25 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a1f5235..60314f0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -49,7 +49,11 @@ ifndef GTK_CFLAGS
+ endif
+ 
+ ifndef GTK_LDFLAGS
+-  GTK_LDFLAGS         := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
++  GTK_LDFLAGS      := $(shell $(PKG_CONFIG) --libs-only-L gtk+-2.0)
++endif
++
++ifndef GTK_LIBS
++  GTK_LIBS         := $(shell $(PKG_CONFIG) --libs-only-l gtk+-2.0)
+ endif
+ 
+ 
+@@ -93,14 +97,13 @@ LDFLAGS += $(X_LDFLAGS)
+ # when building nvidia-settings within the NVIDIA driver build, but
+ # dynamically link against libXxf86vm in the public builds.
+ ifdef NV_LINK_LIBXXF86VM_STATICALLY
+-    LDFLAGS += -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic
++    LIBS += -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic
+ else
+-    LDFLAGS += -lXxf86vm
++    LIBS += -lXxf86vm
+ endif
+ 
+-LDFLAGS += -lX11 -lXext -lm
++LIBS += -lX11 -lXext -lm $(GTK_LIBS) $(LIBDL_LIBS)
+ LDFLAGS += $(GTK_LDFLAGS)
+-LDFLAGS += $(LIBDL_LDFLAGS)
+ 
+ MANPAGE_GZIP ?= 1
+ 
+@@ -152,16 +155,16 @@ all: $(NVIDIA_SETTINGS) $(MANPAGE)
+ install: NVIDIA_SETTINGS_install MANPAGE_install
+ 
+ NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
+-	$(MKDIR) $(bindir)
+-	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(bindir)/$(notdir $<)
++	$(MKDIR) $(BINDIR)
++	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
+ 
+ MANPAGE_install: $(MANPAGE)
+-	$(MKDIR) $(mandir)
+-	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(mandir)/$(notdir $<)
++	$(MKDIR) $(MANDIR)
++	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(MANDIR)/$(notdir $<)
+ 
+ $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
+-	$(call quiet_cmd,LINK) -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) \
+-		$(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS)
++	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
++		$(XNVCTRL_ARCHIVE) $(LIBS)
+ 	$(call quiet_cmd,STRIP_CMD) $@
+ 
+ # define the rule to build each object file
+@@ -193,8 +196,8 @@ GEN_MANPAGE_OPTS_OBJS = \
+ 	$(call BUILD_MANPAGE_OBJECT_LIST,$(GEN_MANPAGE_OPTS_SRC))
+ 
+ $(GEN_MANPAGE_OPTS): $(GEN_MANPAGE_OPTS_OBJS)
+-	$(call quiet_cmd,HOST_LINK) $(GEN_MANPAGE_OPTS_OBJS) -o $@ \
+-		$(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_BIN_LDFLAGS)
++	$(call quiet_cmd,HOST_LINK) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_BIN_LDFLAGS) \
++		$(GEN_MANPAGE_OPTS_OBJS) -o $@
+ 
+ # define a rule to build each GEN_MANPAGE_OPTS object file
+ $(foreach src,$(GEN_MANPAGE_OPTS_SRC),\
+diff --git a/samples/Makefile b/samples/Makefile
+index 35be348..ea67106 100644
+--- a/samples/Makefile
++++ b/samples/Makefile
+@@ -55,7 +55,7 @@ CFLAGS                += -I $(LIBXNVCTRL_DIR)
+ 
+ LDFLAGS               += $(X_LDFLAGS)
+ LDFLAGS               += -L $(LIBXNVCTRL_DIR)
+-LDFLAGS               += -lXNVCtrl -lXext -lX11
++LIBS                  += -lXNVCtrl -lXext -lX11
+ 
+ 
+ ##############################################################################
+@@ -84,7 +84,7 @@ $(foreach src, $(SAMPLE_SOURCES), $(eval $(call DEFINE_OBJECT_RULE,CC,$(src))))
+ # define the rule to link each sample app from its corresponding object file
+ define link_sample_from_object
+   $$(OUTPUTDIR)/$(1:.c=): $$(call BUILD_OBJECT_LIST,$(1))
+-	$$(call quiet_cmd,LINK) $$(CFLAGS) -o $$@ $$< $$(LDFLAGS) $$(BIN_LDFLAGS)
++	$$(call quiet_cmd,LINK) $$(CFLAGS) $$(LDFLAGS) $$(BIN_LDFLAGS) -o $$@ $$< $$(LIBS)
+   all:: $$(OUTPUTDIR)/$(1:.c=)
+   SAMPLES += $$(OUTPUTDIR)/$(1:.c=)
+ endef
+diff --git a/utils.mk b/utils.mk
+index 32014a3..4c13b6a 100644
+--- a/utils.mk
++++ b/utils.mk
+@@ -28,9 +28,8 @@
+ 
+ CC                    ?= gcc
+ LD                    ?= ld
+-CFLAGS                ?=
+-CFLAGS                += -Wall -fno-strict-aliasing -Wno-unused-parameter
+-CFLAGS                += -O2 -fno-omit-frame-pointer
++CFLAGS                ?= -Wall -Wno-unused-parameter -O2
++CFLAGS                += -fno-strict-aliasing -fno-omit-frame-pointer
+ CC_ONLY_CFLAGS        ?=
+ LDFLAGS               ?=
+ BIN_LDFLAGS           ?=
+@@ -93,9 +92,9 @@ ifndef TARGET_ARCH
+ endif
+ 
+ ifeq ($(TARGET_OS),Linux)
+-  LIBDL_LDFLAGS = -ldl
++  LIBDL_LIBS = -ldl
+ else
+-  LIBDL_LDFLAGS =
++  LIBDL_LIBS =
+ endif
+ 
+ OUTPUTDIR             ?= _out/$(TARGET_OS)_$(TARGET_ARCH)
+@@ -124,11 +123,10 @@ endif
+ # the source tarball
+ ##############################################################################
+ 
+-prefix = /usr/local
++PREFIX ?= /usr/local
+ 
+-exec_prefix = $(prefix)
+-bindir = $(exec_prefix)/bin
+-mandir = $(exec_prefix)/share/man/man1
++BINDIR = $(DESTDIR)$(PREFIX)/bin
++MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
+ 
+ 
+ ##############################################################################
+@@ -260,7 +258,7 @@ BUILD_DEPENDENCY_LIST = \
+ define DEFINE_OBJECT_RULE_WITH_OBJECT_NAME
+   $(3): $(2)
+ 	@$(MKDIR) $(OUTPUTDIR)
+-	$$(call quiet_cmd,$(1)) -c $$< -o $$@ $$(CFLAGS) \
++	$$(call quiet_cmd,$(1)) $$(CFLAGS) -c $$< -o $$@ \
+ 	  $(call AUTO_DEP_CMD,$(1),$(2),$(3))
+ 
+   -include $$(call BUILD_DEPENDENCY_LIST,$(3))
+-- 
+1.7.3.4
+
diff --git a/media-video/nvidia-settings/files/0002-Build-libNVCtrl-with-PIC.patch b/media-video/nvidia-settings/files/0002-Build-libNVCtrl-with-PIC.patch
new file mode 100644
index 000000000000..b62ddf9f5a48
--- /dev/null
+++ b/media-video/nvidia-settings/files/0002-Build-libNVCtrl-with-PIC.patch
@@ -0,0 +1,24 @@
+From c307d4878e17be16c1dcc1a6e15231d8e984b259 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Fri, 17 Feb 2012 18:01:43 +0100
+Subject: [PATCH 2/2] Build libNVCtrl with PIC
+
+---
+ src/libXNVCtrl/Makefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/libXNVCtrl/Makefile b/src/libXNVCtrl/Makefile
+index 15b03cc..d40ec01 100644
+--- a/src/libXNVCtrl/Makefile
++++ b/src/libXNVCtrl/Makefile
+@@ -20,6 +20,7 @@
+ # SOFTWARE.
+ 
+ RANLIB ?= ranlib
++CFLAGS += -fPIC
+ 
+ libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
+ 	$(RANLIB) $@
+-- 
+1.7.3.4
+
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
new file mode 100644
index 000000000000..dcd4cff8a631
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2012/02/17 17:33:27 idl0r Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="examples"
+
+COMMON_DEPEND="x11-libs/libXxf86vm
+	x11-libs/libX11
+	x11-libs/libXext
+	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"
+	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..."
+	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
+
+	# Install icon and .desktop entry
+	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
+}