diff options
7 files changed, 37 insertions, 13 deletions
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index c0af3c57a711..8b71d40ed879 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.115 2012/05/05 08:58:51 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.116 2012/05/05 14:37:26 idl0r Exp $ + + 05 May 2012; Christian Ruppert <idl0r@gentoo.org> + nvidia-settings-173.14.31.ebuild, nvidia-settings-275.43.ebuild, + nvidia-settings-290.10.ebuild, nvidia-settings-295.20.ebuild, + nvidia-settings-295.40.ebuild: + Adjust dependencies, bug 404335. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> nvidia-settings-173.14.31.ebuild, nvidia-settings-260.19.29.ebuild, diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest index b5378041f9db..fb5597efdda6 100644 --- a/media-video/nvidia-settings/Manifest +++ b/media-video/nvidia-settings/Manifest @@ -1,3 +1,6 @@ +-----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 nvidia-settings-173.14.31-Makefile.patch 3138 RMD160 da3cf1ec37c13b0657524a50854562495e0d6066 SHA1 55f2414cee969106009d6e5c9d6545af49204125 SHA256 05ed03a0fce667a9245dfa31953d37779f32874cbbe6089c2417a997cdc3f2f9 @@ -7,11 +10,22 @@ DIST nvidia-settings-275.43.tar.bz2 1542739 RMD160 759a7891e101e269e1592638c2060 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 DIST nvidia-settings-295.40.tar.bz2 1545625 RMD160 c2075ffb84fa6662e390b2b6baaccce733eedefc SHA1 6fb8c496210a3c0a0f669613014b92930a3d432b SHA256 68e8da979ef69b487a5ef237d7cc0f6d1d1cf3e027ffa2e90fa2501dc793d909 -EBUILD nvidia-settings-173.14.31.ebuild 1651 RMD160 88fc09e0e4ee35af1e83e4ed51a2ec1d7b34fd56 SHA1 3af8e67dd331221e63260963c9eda7f84dbc01a0 SHA256 cb9e30d26f4b72a9ebe92ed857dabe21c7fc8b3ef11d03d0738f0b5a1676b21a +EBUILD nvidia-settings-173.14.31.ebuild 1656 RMD160 afa7e40b5304b7cdd9a403b7a49ae240d9f958b2 SHA1 e58ca320653b3442a1edfde677f873440439e68b SHA256 63f032ea8b4db46fea7077481f81fad6fa6d28d40cee77bce45bd5fd7ddef950 EBUILD nvidia-settings-260.19.29.ebuild 1950 RMD160 4894a84d3013aadf7b69031b927586324e9863c1 SHA1 c6e5abf926c8be49da8e3762671cb443de36433e SHA256 0a6c5ff52df885214126f7ebe3b22199c464e4defaaa5623eb8cff72e02b63c9 -EBUILD nvidia-settings-275.43.ebuild 1968 RMD160 937eea805ce837ff2d333d5efb3c872e116afc3e SHA1 e28d87a391c68f4797ba547d846d07d1ab11fc54 SHA256 ae7ff08dd934d7178d93fbbe509e0d061f9d72ff22bf7d14d997db076af92c6a -EBUILD nvidia-settings-290.10.ebuild 1870 RMD160 67a401afdca9757fe009ef0e5c8e07b59449e16d SHA1 dc2cabce337b08551d97c2a7365db599eb698cb4 SHA256 39543a064cb8b6ccb88d5c1e4984a31b2f5c47de0330b9f827d354cb59b39ef4 -EBUILD nvidia-settings-295.20.ebuild 1869 RMD160 5d0198ee973a7c0d067464c3fe02c05c21173b9a SHA1 7a54d1276a4d3fffd9301424aeb4b06d3edb1449 SHA256 e2b9cb76cf8ce6cc3458aceae48063f2f784e5a0247600d020c222e1c05f0275 -EBUILD nvidia-settings-295.40.ebuild 1870 RMD160 6b60c1b1cfc8395af340083ee9cbe745bcd771a1 SHA1 9cb6ebeba85cedcd20019c158088ae5a707ee321 SHA256 77950fbd027e396fa6f5804cf58d50a52e6f98f7cca5dcc32677b2b50bcf03d5 -MISC ChangeLog 23445 RMD160 919c836c1da629a77e4a08f57bcb9dbac9cfa59a SHA1 da392c3a534684c314ef43dda9c10c00f269e372 SHA256 9d2d552cb6bcc4f5538066fa3bc4903c7693a8cf68a3884ffb0ab5ffa0e13140 +EBUILD nvidia-settings-275.43.ebuild 2052 RMD160 c06167bc85dae97998fb7d296af085022a580ca0 SHA1 280b310dbb752f79c2be9d693a8f351ab74e98a6 SHA256 a2dfb44110a8256b0cf901154241df386d5b4d61e3dfab3df22b6f830a0cea68 +EBUILD nvidia-settings-290.10.ebuild 1955 RMD160 df90b4c720a4fea65c5644bb98a443e8596007c3 SHA1 43de6c2b874c9641e63f63be4e99b549a6b65598 SHA256 8426b357d770df283abcd6d9db98d4dd9e075f73a4bc502067d042bc842e18bc +EBUILD nvidia-settings-295.20.ebuild 1954 RMD160 31f6be4c4ab90f502925bfa2a8db940094bb7b11 SHA1 aace9631cec8017369fd6b32f0db2a5ccb78661f SHA256 a0e9f0e12b04118f24a2a1d6a2e7cfa44ebf57bb34cc10c620e3cbc958ba5d89 +EBUILD nvidia-settings-295.40.ebuild 1954 RMD160 b332d4c16e8364645e201aae263a3ef7ba58920c SHA1 bc27666031d302ffe5a3de23b07f0fc2a6b2b34e SHA256 b7a29e16d9446b13c6ce786a6f97b38e7a2080a11ee0e0c8b9c7a089df131e77 +MISC ChangeLog 23696 RMD160 00aa5fc8071d514e349239ea12d90e3edf0bd612 SHA1 fb27744b2ebec7c5a33c0b1ac53ac6a9e9a96d04 SHA256 62a610771c852d956b91ebc13c9375d0063a7651c242ab94092b2c09b1f191fc MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQEcBAEBCAAGBQJPpTsuAAoJEMOx0zmdw4Z1dZEIAJ4CLNUvRHzJ1jsdXeR8RoAT +I6QXZMw3A8gIEHZqztFSkmQXzm6yGqD7r5OdYQvnbvYccum+w6zjBuVk55PCPWSK +3jkQID9hum+gkLmAAzIWxdQnILOu9E20PUzkgfoKm2uHeKcSHhGYbIT7qgatU9Hd +v1gdwgvPWo2wgs6/YhyAVo78yP8Mjq6g5+O1bYHWR45qeGQ21SPX90Cfy8VDySxe +GQmSz0EI3RRpCp4Cvr3GXT6diNvljNCynrFbgFj0Yns3eg9U8JA3WKacP952oC/Z +tnHQKzYnawXtdrv+uh3oJBGbZBMx5/MF0uR7ElEIdx1Zdzfv2RAbph0hifMwkDU= +=3zoM +-----END PGP SIGNATURE----- diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild index d5c4d1d49acb..63994ba7bd7b 100644 --- a/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild @@ -1,6 +1,6 @@ # 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-173.14.31.ebuild,v 1.2 2012/05/05 08:58:51 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.31.ebuild,v 1.3 2012/05/05 14:37:26 idl0r Exp $ EAPI=4 @@ -28,7 +28,7 @@ COMMON_DEPEND="x11-libs/libX11 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} virtual/pkgconfig diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild index 139f1e51ca40..9ae8bc950207 100644 --- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild @@ -1,6 +1,6 @@ # 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-275.43.ebuild,v 1.7 2012/05/05 08:58:51 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.8 2012/05/05 14:37:26 idl0r Exp $ EAPI=4 @@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11 dev-libs/glib:2" RDEPEND="=x11-drivers/nvidia-drivers-2* + || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) ${COMMON_DEPEND}" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild index 5978a86a9bba..8431d5faaa3c 100644 --- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild @@ -1,6 +1,6 @@ # 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.9 2012/05/05 08:58:51 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.10 2012/05/05 14:37:26 idl0r Exp $ EAPI=4 @@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11 dev-libs/glib:2" RDEPEND="=x11-drivers/nvidia-drivers-2* + || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) ${COMMON_DEPEND}" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild index bf9103e86d73..4fbb9d6ea020 100644 --- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild @@ -1,6 +1,6 @@ # 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.9 2012/05/05 08:58:51 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.10 2012/05/05 14:37:26 idl0r Exp $ EAPI=4 @@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11 dev-libs/glib:2" RDEPEND="=x11-drivers/nvidia-drivers-2* + || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) ${COMMON_DEPEND}" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild index c1e01dd8b27a..5cf0eed07a44 100644 --- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild @@ -1,6 +1,6 @@ # 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.40.ebuild,v 1.7 2012/05/05 08:58:51 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.8 2012/05/05 14:37:26 idl0r Exp $ EAPI=4 @@ -27,6 +27,7 @@ COMMON_DEPEND="x11-libs/libX11 dev-libs/glib:2" RDEPEND="=x11-drivers/nvidia-drivers-2* + || ( >=x11-drivers/nvidia-drivers-295.33 <x11-drivers/nvidia-drivers-295.33[-gtk] ) ${COMMON_DEPEND}" DEPEND="${RDEPEND} virtual/pkgconfig |