diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2012-07-23 16:35:28 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2012-07-23 16:35:28 +0000 |
| commit | eaa2e209159b9478313afc1a0de2caaa2a4bc927 (patch) | |
| tree | d4b2aa20670ccd8fba7cd296fb816a38d376a64a /x11-drivers | |
| parent | Do not call python_convert_shebangs() on files, which are not Python scripts.... (diff) | |
| download | gentoo-2-eaa2e209159b9478313afc1a0de2caaa2a4bc927.tar.gz gentoo-2-eaa2e209159b9478313afc1a0de2caaa2a4bc927.tar.bz2 gentoo-2-eaa2e209159b9478313afc1a0de2caaa2a4bc927.zip | |
Fix issue with icon/menu entry and dohtml. bug #427720
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop | 2 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 33fa0acb795d..20603061e23b 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.368 2012/07/22 22:32:26 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.369 2012/07/23 16:35:28 cardoe Exp $ + + 23 Jul 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-304.22.ebuild, + files/nvidia-drivers-settings.desktop: + Fix issue with icon/menu entry and dohtml. bug #427720 22 Jul 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-304.22.ebuild, metadata.xml: diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop b/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop index 1ccb1b5c79e4..773a5af24668 100644 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop @@ -3,5 +3,5 @@ Type=Application Name=NVIDIA X Server Settings Comment=Configure NVIDIA X Server Settings Exec=/opt/bin/nvidia-settings -Icon=nvidia-driver-settings +Icon=nvidia-drivers-settings Categories=System;Settings; diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild index 7a89f20447df..c4d1e0302e71 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild,v 1.6 2012/07/23 00:26:10 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.22.ebuild,v 1.7 2012/07/23 16:35:28 cardoe Exp $ -EAPI="4" +EAPI=4 inherit eutils unpacker multilib portability versionator \ linux-mod flag-o-matic nvidia-driver linux-info @@ -397,7 +397,6 @@ src_install() { dodoc "${NV_DOC}/README" use X && doman "${NV_MAN}/nvidia-xconfig.1" use tools && doman "${NV_MAN}/nvidia-settings.1" - dohtml "${NV_DOC}/html/*" else # Docs newdoc "${NV_DOC}/README.txt" README @@ -406,7 +405,6 @@ src_install() { use X && doman "${NV_MAN}/nvidia-xconfig.1.gz" use tools && doman "${NV_MAN}/nvidia-settings.1.gz" doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz" - dohtml "${NV_DOC}/html/*" fi # Helper Apps @@ -433,8 +431,8 @@ src_install() { # Desktop entries for nvidia-settings if use tools ; then - newicon ${NV_OBJ}/nvidia-settings.png nvidia-driver-settings.png - domenu "${FILESDIR}"/nvidia-driver-settings.desktop + newicon ${NV_OBJ}/nvidia-settings.png nvidia-drivers-settings.png + domenu "${FILESDIR}"/nvidia-drivers-settings.desktop insinto /etc/xdg/autostart doins "${FILESDIR}"/nvidia-autostart.desktop fi |