Version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

3 files changed, 84 insertions, 10 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index e3186b405e20..fa5526601dcb 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # 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.120 2012/10/24 17:55:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.121 2012/11/24 00:25:59 idl0r Exp $
+
+*nvidia-settings-310.19 (24 Nov 2012)
+
+  24 Nov 2012; Christian Ruppert <idl0r@gentoo.org>
+  +nvidia-settings-310.19.ebuild:
+  Version bump
 
 *nvidia-settings-304.60 (24 Oct 2012)
 
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 21a53d44c8f1..2defd955d829 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX 0001-Makefile-improvements.patch 5269 SHA256 c7dddefa196f4b06a96592e27a903bc969580ed74291f76faf213f1f3276d4b7 SHA512 8236b126b4785bd98035d446182fb7b615e073a8a81d3f4ad203f20653c4f68fc5a5f56420a7ad58cd0eb0f7fb2068266ff108253a814518127568e04ab16ded WHIRLPOOL 67108d2a8477b91cdf1304811207c41b5b6ee60465ac815554e090051ebf71669110e8468be221013a2bec17b1a7c2f9d76f66bcf571aee2fb819ef732ddca85
 AUX 0002-Build-libNVCtrl-with-PIC.patch 578 SHA256 1492edfdbfd682b16e5f26be41bc61ab7320478c37f92730ff2b1ef1c520ceb2 SHA512 d2c7a0928a3604e60c8a658bab2e87d88dbbebc393d506fa6ebdbd23590f9ce3ccffffa7afaeffd0c390ae012bed1d8fcb6dc5e7e13167ee7895f7da61704300 WHIRLPOOL fca7167947bf8bfc53e334a8a3bd13ffd63f629259022d24abac0bce2a482db870b79ef11110e986360667e68b6aba3eeb887ef129b2d95b04f50ec9ed4700a5
 AUX nvidia-settings-173.14.31-Makefile.patch 3138 SHA256 05ed03a0fce667a9245dfa31953d37779f32874cbbe6089c2417a997cdc3f2f9 SHA512 e6d6717f602d3a040ae25cb48051a0877c4adb46632db2225461b471a8900c224d43f95359ff6518068acc412111564b7ab3a21e871dd65e463807173805d976 WHIRLPOOL da4e036304b42d45ea6a9597f33739b01641ea45b3d5f5eba19e368bc69c759361eefaca55e8fc9cf5292fbd68bbf1fe5725c78293b7340f6d8be90b080a3e95
-DIST nvidia-settings-173.14.31.tar.gz 1301584 SHA256 0798bfd154daec49d8d79354d055325976179b502bbe2879620f82a0583882b2
+DIST nvidia-settings-173.14.31.tar.gz 1301584 SHA256 0798bfd154daec49d8d79354d055325976179b502bbe2879620f82a0583882b2 SHA512 24f79e4bc775e037f58ba2b517427877fa6d978cd4cf50eedb9276fc6f9403e2616359f2ce38e3fdba37103e8a777e1205fda28569e9336652845990a9e65ef7 WHIRLPOOL 8b1dc255de48caf66ba07cb2b287e0f45d897b8b588aedc756ccac9eb6e35d38d6a0f916b794b50beb848a64f6fada87fc0158d09b4701d8174f63396f940a12
 DIST nvidia-settings-260.19.29.tar.bz2 1536011 SHA256 60dc2e2693ac1950301f3a3f837e5ca6470087b1509efa54c26b6bd5544974f5
 DIST nvidia-settings-275.43.tar.bz2 1542739 SHA256 32018f8bb6431264ffe07eeb7f05ac0967cdfe09827a93f85c32b8e6c458b739
 DIST nvidia-settings-290.10.tar.bz2 1544400 SHA256 c20dac225e5c67135d0d3f784ee058ce6337687a4232e20335997061f1ec5e26
@@ -12,6 +12,7 @@ DIST nvidia-settings-295.20.tar.bz2 1545451 SHA256 92a8f32d20bdf62c0d7c71b176ff4
 DIST nvidia-settings-295.40.tar.bz2 1545625 SHA256 68e8da979ef69b487a5ef237d7cc0f6d1d1cf3e027ffa2e90fa2501dc793d909
 DIST nvidia-settings-302.11.tar.bz2 1477555 SHA256 b8020021554ec58cb36877c29f6936b2efeb8499029dc4be309fe929297c17ba SHA512 5ad3cb65c88b2e1b9b662b944c96919f20b30dec6b9416197af62396cb09ac8d91c35d26c16b165610322d103324098e28e41ad848c34ee24f977debbc462cdd WHIRLPOOL 0169dde9f18f6a7de4ad73f698402edaa6912052941499a589e8c1992cd2dce60db376434098e0d81bf9a4c80a82e4a278e6a0cb2d234f43f10e88c84a35ce98
 DIST nvidia-settings-304.60.tar.bz2 1479772 SHA256 96f0f984d2d4e37c3e492476c3506283f5666d952ae94ddc79d7e16b047a9b36 SHA512 7b55621b97c39f3905d6368151c344a3914b0855951f92b4ff479ba94e92fca715505692d8ad72b9dca33b93eb45d5e3342b569c898d837053686ebce71b14bc WHIRLPOOL 9c63088ec558d55469764422ef26e2697663b3d4bfb9c075b17c4c90ec90b5fee9ff42fbc711c7f1e22a102f2bf1e3ec696923531b54ac374283318594f89ff5
+DIST nvidia-settings-310.19.tar.bz2 1482012 SHA256 1af2cd902c2adf261a6951b1d729523e515f37e45f86785675404fc58ec1c03a SHA512 fd3e376f6518e9e844e0fe7f2aecce18c03da0ebdfa67e41bc566614c89f9b284251e2e0841aa486ac8cb429c246e0b19c77773929ec1393f986bc267556ae84 WHIRLPOOL 2d3ff4a08d44a2abc31679e2779514b95de429cd1ec9e5ca865ef193ce64985dbe192e1e303f17c96dd84df2fa81eeabe1c7120945220ad17c26dc38e9e90f5a
 EBUILD nvidia-settings-173.14.31.ebuild 1658 SHA256 e05ab38e5d1dd2d14fe4c11704819b3ed0018fb2c76ca871fcd91a9847b847f4 SHA512 e77c766ae00ac695cca7b543b6fce7e478bf39bf3dcc671e5389a386b0de585c2a79677836502c4abed58f5def5f30026a235a8be39b3cdbf71985b0e449689f WHIRLPOOL ad1961d77df7eb8ffffeff29f132e81906e4e0fb250eb4221f1e978765ec9faf9ea039a18c7e5b32de882e634e9c4f2374db9e54f2c10834d6e04681595b9b6a
 EBUILD nvidia-settings-260.19.29.ebuild 1950 SHA256 0a6c5ff52df885214126f7ebe3b22199c464e4defaaa5623eb8cff72e02b63c9 SHA512 c405e0dbbaf2886c8cb30d30519a388198eb12067a5483dbc4b2e223d0cfa65cc75891d684d4d236d812592190d6861c55ec538edfcd3748a9dfc78891f7ce65 WHIRLPOOL 393698ab2fd3da204abd58ff6aa0747aeb16b6dcfeb2511a504354f8f020c0794fdf76ad25b2e7034700ce721c21a0ba5f2c6854efad9485cbf4bf9c8610237c
 EBUILD nvidia-settings-275.43.ebuild 2052 SHA256 a2dfb44110a8256b0cf901154241df386d5b4d61e3dfab3df22b6f830a0cea68 SHA512 a55ca517b3dbd6f9714321c49944b8a5fa3b2bf5545cf591bbc25cd1d4fe6dc8bab5dcd6aac98315ae00878ea25600c572d15cf973a9f934b0f24901e0a84afd WHIRLPOOL 7da16275a142f0eeb76ee69d0574933d38d31eeccda1d35b0207382bab9c64b98e324af71763585f9ee7cf1cf83a55985dc205c62afa310bbb8ce102d46f4edf
@@ -20,16 +21,17 @@ EBUILD nvidia-settings-295.20.ebuild 1958 SHA256 2b2080cc78f7b71b3ca949973fa5b55
 EBUILD nvidia-settings-295.40.ebuild 1954 SHA256 b7a29e16d9446b13c6ce786a6f97b38e7a2080a11ee0e0c8b9c7a089df131e77 SHA512 849aa504fc7301ff34f62f870144c5127d3cab98a6fd159f088afd8f5ffa23de5f6c5ddb152e9781a6f56fb756abce0e8d0a68f7da3264864a3edd273c9187e1 WHIRLPOOL e94fc18b707bf6f03f8bacb2ea470667c1c6c23f0c525eccb32ea5e61c10492338f51a0f96e3e143f6984ec4e6dfc350d32529c562f9c1c482d4212743b4cd84
 EBUILD nvidia-settings-302.11.ebuild 1664 SHA256 c0ed0173f72005f72affb62cde2581d498f8e142fe19f30f53b308370166d224 SHA512 3978469c18c157eb4d0ae7668e55eb18a2054178355bb774bc0ba3d26fd74ee03da02cbfdce837d735e88d2e41ab80e146d786b63ef0c7a20e62cf961b046bd6 WHIRLPOOL ce77911dc89314eba6f14969dc9e1fa49e6050b857cb8d286327be921aa545be0e746d4d1505955ce0d1b3cf10eac9742dea4d6fc4ddf6b8a29c7d2f323add24
 EBUILD nvidia-settings-304.60.ebuild 1664 SHA256 151ecaeb74e7c23deb291c71e077eea280aa0aae686073c2ec286e9c8ea723d7 SHA512 8f04062f6c3c7678f7b74be5acc39e1a7444b57708f9e47f90f4638df90bad199e2a794f2652039da38978bba307f9db15ffc0d70678ef2cad88e80a95cecc97 WHIRLPOOL 79cc6a57d49f52110a06e6db8097577b5ff6fa20fa32784c27dd6bdf58e3d9bb00b038196b6113b77297b875757957091636a6606d4fdcb158b9b13574587d7a
-MISC ChangeLog 24245 SHA256 b1716e252b74a5ff849c9d058ebc6c49ecf8d68e13287382ceda659d7ebe0f80 SHA512 6c4a5b62626652450e79fe137556ff617a9844a2a0d751cf3ab40d2e70acf64ba65c3284349f4e804261c3e47aa43ec4c3d38c07d3bdf30369eb0e427433bf35 WHIRLPOOL 40fbc0fc1cd65ecdc265d4bc9631758dfe01d1ae641808f0f84dd3cec3ae06e53c92c6923697367992686235c7f9fe7b7e2969bd02576a889959b188df678c3f
+EBUILD nvidia-settings-310.19.ebuild 1664 SHA256 7bc109460d7ef85f2742a0ab5b6832c9cca4334d56723091b15c7ac1a1d501a7 SHA512 2fe4736bfb4267a9653aef72d8892a5c27c7cdae954109f95adffb217c3f55f466fe8ff3928b3463f1552c037172417f76347ec5d602d48afc14d60da5595e80 WHIRLPOOL e8403424b41ee73e17b1c3c2bcfd16361723294fba5a630b903bdfd67d3011c9a1eda2d950593ea1b4d9bfeb21b7a307b3a166390324e393acc897d6e7db62e7
+MISC ChangeLog 24386 SHA256 8378d8cbe0a9dc86bc24bfbba5488b20042894edb8e993aef7cf8e60810d84be SHA512 23903ea9c6d5a685aee92351d6409c587bf41402a3d35ad92372fe13e37e4d11b8d8065c4360a1afd8a7062e44a1426bc46bc8f2d82be62d6546b7ace1ee6fee WHIRLPOOL c931d79d240ad244c89116037b793a8bc184cc4562160352535240f8c82b3a4a5a213275756d0161c0abd8e49c6900b8f21c8d4bf3d4ea3d7863e310cdd46115
 MISC metadata.xml 235 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991 SHA512 0f45c3328380643ee0ef6bccc13ca318f26525fbcf9669527745a51e5c910532f1b5aef64247f5cf019a7515df659909427a76e3691edb878f5c31b172d9b4e1 WHIRLPOOL 0b2b4c1e5917851d05a390f05eaad3cd094439b542857e42fc6c4183cf65664b2f8b153d2d11b465494523925bcaf1215c4d485a63f4c9443df769e05c0a9e9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEbBAEBCAAGBQJQiCuZAAoJEMOx0zmdw4Z1DBYH91XeI8p+THHDdlyU9xyPm7ON
-txGK8KpoTO8gYQZzrymanf0ksQguq9KI9Q4qGoZsmG/iRGmLU3108W94DmSNMCcz
-Vauopid3tC+DNu6vVDpQVHjEiL2pvEqb1QGLjoIYqtKZ5V8We3jVU3lWNPkxfAmg
-HVPG43AuPtJH2RcCTpAe5qNNX1AdQjEvlC2XiL9MLFL3k9yZ3nn5UdXQzV+aUex3
-l4XqmQuO7h7bLoCjGZEkDg38bwpPh4Vo7Vuh6A4DMof286fY7N59h5znq6pSGi31
-0OuDUOhWEyLFZix88fOvChGeni78cpD1slUS9QsfGO7m4/oGm3RzX+SHVqD0Og==
-=E/ka
+iQEcBAEBCAAGBQJQsBQbAAoJEMOx0zmdw4Z10IYH/3/l024L/TFaytaijsyo7H0H
+U0mAZJjS58qoVmwxRCw9twuNrUYuUKJwrClujce05iUdAhRRNmq7qhr1Z9JwsdEH
++v9C7hGW0/vY0Rss9ra6juThMHMKcOEmfQH6DyIJc5zFwa62xBViUg2mHHNvq6wn
+69forkfHu4p70IPmmOLGzjUolAnluxWp6G+yJ/AXEvNVHHGqCVLaPF+oHldx/G0Z
+fiywR5x+GX7d9JnXWsrWt5HxsWLJoPDII6Sd8z5voE1jAColBUdQXwxqPuT3o0/2
+uRJ8tJvq0wzriM/HoR42GAK2ImL1Wzn8M4TjkUiA27CVmneO54nKvXJjfKS1aZE=
+=ipsw
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/nvidia-settings-310.19.ebuild b/media-video/nvidia-settings/nvidia-settings-310.19.ebuild
new file mode 100644
index 000000000000..349a7274173b
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-310.19.ebuild
@@ -0,0 +1,66 @@
+# 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-310.19.ebuild,v 1.1 2012/11/24 00:25:59 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/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-3*
+	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+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 -C src/ CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
+}
+
+src_install() {
+	emake -C src/ DESTDIR="${D}" PREFIX=/usr install
+
+	insinto /usr/$(get_libdir)
+	doins src/libXNVCtrl/libXNVCtrl.a
+
+	insinto /usr/include/NVCtrl
+	doins src/libXNVCtrl/*.h
+
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
+
+	# bug 412569 - Installed through nvidia-drivers
+#	rm -rf "${D}"/usr/share/man
+
+	dodoc doc/*.txt
+
+	if use examples; then
+		docinto examples/
+		dodoc samples/*.c
+		dodoc samples/README
+	fi
+}