From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OqC3J-0007fe-Gd for garchives@archives.gentoo.org; Mon, 30 Aug 2010 21:38:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D6ABE1311; Mon, 30 Aug 2010 21:38:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 183F3E1311 for ; Mon, 30 Aug 2010 21:38:04 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A2741B403F for ; Mon, 30 Aug 2010 21:38:03 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 543) id 06C7B20051; Mon, 30 Aug 2010 21:38:02 +0000 (UTC) From: "Doug Goldstein (cardoe)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, cardoe@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: ChangeLog nvidia-drivers-256.52.ebuild nvidia-drivers-256.44-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog nvidia-drivers-256.52.ebuild nvidia-drivers-256.44-r1.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein Content-Type: text/plain; charset=utf8 Message-Id: <20100830213802.06C7B20051@flycatcher.gentoo.org> Date: Mon, 30 Aug 2010 21:38:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d4f8b79f-a621-453f-b7da-63aba5ec19f6 X-Archives-Hash: c166693daba3a276c2421fd8965401b6 cardoe 10/08/30 21:38:02 Modified: ChangeLog nvidia-drivers-256.52.ebuild nvidia-drivers-256.44-r1.ebuild Log: Implement installing nvidia-settings when USE=3Dgtk is enabled as discu= ssed in bug #304255 (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.249 x11-drivers/nvidia-drivers/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/ChangeLog?rev=3D1.249&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/ChangeLog?rev=3D1.249&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/ChangeLog?r1=3D1.248&r2=3D1.249 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- ChangeLog 30 Aug 2010 20:36:12 -0000 1.248 +++ ChangeLog 30 Aug 2010 21:38:01 -0000 1.249 @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,= v 1.248 2010/08/30 20:36:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,= v 1.249 2010/08/30 21:38:01 cardoe Exp $ + + 30 Aug 2010; Doug Goldstein + nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild: + Implement installing nvidia-settings when USE=3Dgtk is enabled as disc= ussed + in bug #304255 =20 30 Aug 2010; Doug Goldstein nvidia-drivers-256.52.ebuild: 1.4 x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebu= ild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-256.52.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-256.52.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-256.52.ebuild?r1=3D1.3&r2=3D1.4 Index: nvidia-drivers-256.52.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drive= rs-256.52.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nvidia-drivers-256.52.ebuild 30 Aug 2010 20:36:12 -0000 1.3 +++ nvidia-drivers-256.52.ebuild 30 Aug 2010 21:38:01 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-dri= vers-256.52.ebuild,v 1.3 2010/08/30 20:36:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-dri= vers-256.52.ebuild,v 1.4 2010/08/30 21:38:01 cardoe Exp $ =20 EAPI=3D"2" =20 @@ -26,7 +26,8 @@ COMMON=3D"=3Dsys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=3Dapp-admin/eselect-opengl-1.0.9" + >=3Dapp-admin/eselect-opengl-1.0.9 + !media-video/nvidia-settings" DEPEND=3D"${COMMON} kernel_linux? ( virtual/linux-sources )" RDEPEND=3D"${COMMON} @@ -92,7 +93,8 @@ usr/lib64/libOpenCL.so.1.0.0 usr/lib64/xorg/modules/drivers/nvidia_drv.so usr/bin/nvidia-smi - usr/bin/nvidia-xconfig" + usr/bin/nvidia-xconfig + usr/bin/nvidia-settings" =20 QA_WX_LOAD_x86=3D"usr/lib/libnvidia-glcore.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} @@ -131,7 +133,8 @@ usr/lib64/libOpenCL.so.1.0.0 usr/lib64/libnvidia-compiler.so.${PV} usr/bin/nvidia-smi - usr/bin/nvidia-xconfig" + usr/bin/nvidia-xconfig + usr/bin/nvidia-settings" =20 QA_DT_HASH_x86=3D"usr/lib/libcuda.so.${PV} usr/lib/libnvidia-cfg.so.${PV} @@ -145,7 +148,8 @@ usr/lib/libOpenCL.so.1.0.0 usr/lib/libnvidia-compiler.so.${PV} usr/bin/nvidia-smi - usr/bin/nvidia-xconfig" + usr/bin/nvidia-xconfig + usr/bin/nvidia-settings" =20 S=3D"${WORKDIR}/" =20 @@ -360,21 +364,38 @@ if use x86-fbsd; then dodoc "${NV_DOC}/README" doman "${NV_MAN}/nvidia-xconfig.1" + use gtk && doman "${NV_MAN}/nvidia-settings.1" else # Docs newdoc "${NV_DOC}/README.txt" README dodoc "${NV_DOC}/NVIDIA_Changelog" doman "${NV_MAN}/nvidia-smi.1.gz" doman "${NV_MAN}/nvidia-xconfig.1.gz" + use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" fi =20 # Helper Apps dobin ${NV_EXEC}/nvidia-xconfig || die + use gtk && ( dobin ${NV_EXEC}/nvidia-settings || die ) dobin ${NV_EXEC}/nvidia-bug-report.sh || die if use kernel_linux; then dobin ${NV_EXEC}/nvidia-smi || die fi =20 + # Desktop entries for nvidia-settings + if use gtk; then + dodir /usr/share/applications/ + insinto /usr/share/applications/ + doins ${NV_EXEC}/nvidia-settings.desktop + sed -e 's:__UTILS_PATH__:/usr/bin:' \ + -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ + -i "${D}"/usr/share/applications/nvidia-settings.desktop + + dodir /usr/share/pixmaps/ + insinto /usr/share/pixmaps/ + doins ${NV_EXEC}/nvidia-settings.png + fi + if has_multilib_profile ; then local OABI=3D${ABI} for ABI in $(get_install_abis) ; do 1.3 x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.= ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-256.44-r1.ebuild?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-256.44-r1.ebuild?rev=3D1.3&content-type=3Dtext/pl= ain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia= -drivers/nvidia-drivers-256.44-r1.ebuild?r1=3D1.2&r2=3D1.3 Index: nvidia-drivers-256.44-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drive= rs-256.44-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nvidia-drivers-256.44-r1.ebuild 30 Aug 2010 01:53:21 -0000 1.2 +++ nvidia-drivers-256.44-r1.ebuild 30 Aug 2010 21:38:01 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-dri= vers-256.44-r1.ebuild,v 1.2 2010/08/30 01:53:21 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-dri= vers-256.44-r1.ebuild,v 1.3 2010/08/30 21:38:01 cardoe Exp $ =20 EAPI=3D"2" =20 @@ -23,10 +23,11 @@ RESTRICT=3D"strip" EMULTILIB_PKG=3D"true" =20 -COMMON=3D"=3Dsys-libs/glibc-2.6.1 ) multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=3Dapp-admin/eselect-opengl-1.0.9" + >=3Dapp-admin/eselect-opengl-1.0.9 + !media-video/nvidia-settings" DEPEND=3D"${COMMON} kernel_linux? ( virtual/linux-sources )" RDEPEND=3D"${COMMON} @@ -92,7 +93,8 @@ usr/lib64/libOpenCL.so.1.0.0 usr/lib64/xorg/modules/drivers/nvidia_drv.so usr/bin/nvidia-smi - usr/bin/nvidia-xconfig" + usr/bin/nvidia-xconfig + usr/bin/nvidia-settings" =20 QA_WX_LOAD_x86=3D"usr/lib/libnvidia-glcore.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} @@ -131,7 +133,8 @@ usr/lib64/libOpenCL.so.1.0.0 usr/lib64/libnvidia-compiler.so.${PV} usr/bin/nvidia-smi - usr/bin/nvidia-xconfig" + usr/bin/nvidia-xconfig + usr/bin/nvidia-settings" =20 QA_DT_HASH_x86=3D"usr/lib/libcuda.so.${PV} usr/lib/libnvidia-cfg.so.${PV} @@ -145,7 +148,8 @@ usr/lib/libOpenCL.so.1.0.0 usr/lib/libnvidia-compiler.so.${PV} usr/bin/nvidia-smi - usr/bin/nvidia-xconfig" + usr/bin/nvidia-xconfig + usr/bin/nvidia-settings" =20 S=3D"${WORKDIR}/" =20 @@ -360,21 +364,38 @@ if use x86-fbsd; then dodoc "${NV_DOC}/README" doman "${NV_MAN}/nvidia-xconfig.1" + use gtk && doman "${NV_MAN}/nvidia-settings.1" else # Docs newdoc "${NV_DOC}/README.txt" README dodoc "${NV_DOC}/NVIDIA_Changelog" doman "${NV_MAN}/nvidia-smi.1.gz" doman "${NV_MAN}/nvidia-xconfig.1.gz" + use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" fi =20 # Helper Apps dobin ${NV_EXEC}/nvidia-xconfig || die + use gtk && ( dobin ${NV_EXEC}/nvidia-settings || die ) dobin ${NV_EXEC}/nvidia-bug-report.sh || die if use kernel_linux; then dobin ${NV_EXEC}/nvidia-smi || die fi =20 + # Desktop entries for nvidia-settings + if use gtk; then + dodir /usr/share/applications/ + insinto /usr/share/applications/ + doins ${NV_EXEC}/nvidia-settings.desktop + sed -e 's:__UTILS_PATH__:/usr/bin:' \ + -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ + -i "${D}"/usr/share/applications/nvidia-settings.desktop + + dodir /usr/share/pixmaps/ + insinto /usr/share/pixmaps/ + doins ${NV_EXEC}/nvidia-settings.png + fi + if has_multilib_profile ; then local OABI=3D${ABI} for ABI in $(get_install_abis) ; do